IMHO these are the correct flags for borland

[wxWidgets.git] / src / msw / metafile.cpp

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 4a7b28900fcd01cb4e7c4d5c5c8efa167e6c3136..635537b662cf03bb1054b9f9bb95d73869e5224e 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -202,10 +202,14 @@ void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
 
   ReleaseDC(NULL, dc);
 
 
   ReleaseDC(NULL, dc);
 

-  *x = XDEV2LOGREL(sizeRect.cx);
-  *y = YDEV2LOGREL(sizeRect.cy);
-  if (descent) *descent = tm.tmDescent;
-  if (externalLeading) *externalLeading = tm.tmExternalLeading;
+  if ( x )
+      *x = sizeRect.cx;
+  if ( y )
+    *y = sizeRect.cy;
+  if ( descent )
+      *descent = tm.tmDescent;
+  if ( externalLeading )
+      *externalLeading = tm.tmExternalLeading;

 }
 
 wxMetafile *wxMetafileDC::Close(void)
 }
 
 wxMetafile *wxMetafileDC::Close(void)