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:
@@ -1835,11 +1835,11 @@ wxCoord wxPostScriptDC::GetCharHeight() const
|
||||
void wxPostScriptDC::DoGetTextExtent(const wxString& string,
|
||||
wxCoord *x, wxCoord *y,
|
||||
wxCoord *descent, wxCoord *externalLeading,
|
||||
wxFont *theFont ) const
|
||||
const wxFont *theFont ) const
|
||||
{
|
||||
wxFont *fontToUse = theFont;
|
||||
const wxFont *fontToUse = theFont;
|
||||
|
||||
if (!fontToUse) fontToUse = (wxFont*) &m_font;
|
||||
if (!fontToUse) fontToUse = &m_font;
|
||||
|
||||
wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
|
||||
|
||||
|
Reference in New Issue
Block a user