From d1ae263893419a87f0e7a67bbcbaf86c350ffdfe Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 18 May 2007 15:02:17 +0000
Subject: [PATCH] override DoGetTextExtent instead of redefining GetTextExtent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/msw/metafile.h | 8 +++++---
src/msw/metafile.cpp | 8 ++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index de7eda4124..c37eefa682 100644
--- 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 5b3e574c4d..cca6815690 100644
--- 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)
--
2.49.0