override DoGetTextExtent instead of redefining GetTextExtent

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index de7eda41247b4de85d1d81cee1a61a184887454c..c37eefa6820920fe25b2b1c63203cb755b2bbe2b 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -88,9 +88,11 @@ public:
     // Should be called at end of drawing
     virtual wxMetafile *Close();
     virtual void SetMapMode(int mode);
-    virtual void GetTextExtent(const wxString& string, long *x, long *y,
-            long *descent = NULL, long *externalLeading = NULL,
-            const wxFont *theFont = NULL, bool use16bit = false) const;
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 const wxFont *theFont = NULL) const;
 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 5b3e574c4d6ae9945e3da5d7c278b69d48ccdec1..cca6815690841db997c113d15bf7cb32c08e1abd 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -209,10 +209,10 @@ wxMetafileDC::~wxMetafileDC()
     m_hDC = 0;
 }
 
-void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
-                                 long *descent, long *externalLeading,
-                                 const wxFont *theFont,
-                                 bool WXUNUSED(use16bit)) const
+void wxMetafileDC::DoGetTextExtent(const wxString& string,
+                                   wxCoord *x, wxCoord *y,
+                                   wxCoord *descent, wxCoord *externalLeading,
+                                   const wxFont *theFont) const
 {
     const wxFont *fontToUse = theFont;
     if (!fontToUse)