move to newer tex2rtf

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

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 0092107a7c6306b666c73aed7846819a30cec94d..2186f3ef18e5d9573aea35645638bdc04b12380f 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -189,9 +189,9 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;

-    if ( !file.empty() && wxFileExists(file))
+    if ( !file.empty() && wxFileExists(file) )

         wxRemoveFile(file);
         wxRemoveFile(file);

-    m_hDC = (WXHDC) CreateMetaFile(file);
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.wx_str());

 
     m_ok = true;
 
 
     m_ok = true;
 


@@ -209,21 +209,22 @@ wxMetafileDC::~wxMetafileDC()
     m_hDC = 0;
 }
 
     m_hDC = 0;
 }
 

-void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
-                                 long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
+void wxMetafileDC::DoGetTextExtent(const wxString& string,
+                                   wxCoord *x, wxCoord *y,
+                                   wxCoord *descent, wxCoord *externalLeading,
+                                   const wxFont *theFont) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

     if (!fontToUse)
     if (!fontToUse)

-        fontToUse = (wxFont*) &m_font;
+        fontToUse = &m_font;

 
 

-    HDC dc = GetDC(NULL);
+    ScreenHDC dc;
+    SelectInHDC selFont(dc, GetHfontOf(*fontToUse));

 
     SIZE sizeRect;
     TEXTMETRIC tm;
     ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
 
     SIZE sizeRect;
     TEXTMETRIC tm;
     ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);

-    GetTextMetrics(dc, &tm);
-
-    ReleaseDC(NULL, dc);
+    ::GetTextMetrics(dc, &tm);

 
     if ( x )
         *x = sizeRect.cx;
 
     if ( x )
         *x = sizeRect.cx;