Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

override DoGetTextExtent instead of redefining GetTextExtent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-18 15:02:17 +00:00
parent 81df6af392
commit d1ae263893
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/metafile.h
View File

@@ -88,9 +88,11 @@ public:
// Should be called at end of drawing // Should be called at end of drawing
virtual wxMetafile *Close(); virtual wxMetafile *Close();
virtual void SetMapMode(int mode); virtual void SetMapMode(int mode);
virtual void GetTextExtent(const wxString& string, long *x, long *y, virtual void DoGetTextExtent(const wxString& string,
long *descent = NULL, long *externalLeading = NULL, wxCoord *x, wxCoord *y,
const wxFont *theFont = NULL, bool use16bit = false) const; wxCoord *descent = NULL,
wxCoord *externalLeading = NULL,
const wxFont *theFont = NULL) const;
// Implementation // Implementation
wxMetafile *GetMetaFile() const { return m_metaFile; } wxMetafile *GetMetaFile() const { return m_metaFile; }

8
src/msw/metafile.cpp
View File

@@ -209,10 +209,10 @@ wxMetafileDC::~wxMetafileDC()
m_hDC = 0; m_hDC = 0;
} }
void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y, void wxMetafileDC::DoGetTextExtent(const wxString& string,
long *descent, long *externalLeading, wxCoord *x, wxCoord *y,
const wxFont *theFont, wxCoord *descent, wxCoord *externalLeading,
bool WXUNUSED(use16bit)) const const wxFont *theFont) const
{ {
const wxFont *fontToUse = theFont; const wxFont *fontToUse = theFont;
if (!fontToUse) if (!fontToUse)