changed wxDC::GetTextExtent() and related methods to take const wxFont pointer, for consistency with wxWindow::GetTextExtent() and because it generally doesn't need a non-const font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -210,11 +210,13 @@ wxMetafileDC::~wxMetafileDC()
|
||||
}
|
||||
|
||||
void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
|
||||
long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
|
||||
long *descent, long *externalLeading,
|
||||
const wxFont *theFont,
|
||||
bool WXUNUSED(use16bit)) const
|
||||
{
|
||||
wxFont *fontToUse = theFont;
|
||||
const wxFont *fontToUse = theFont;
|
||||
if (!fontToUse)
|
||||
fontToUse = (wxFont*) &m_font;
|
||||
fontToUse = &m_font;
|
||||
|
||||
HDC dc = GetDC(NULL);
|
||||
|
||||
|
Reference in New Issue
Block a user