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:
@@ -258,7 +258,7 @@ protected:
|
||||
void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
|
||||
wxCoord *descent = (wxCoord *) NULL,
|
||||
wxCoord *externalLeading = (wxCoord *) NULL,
|
||||
wxFont *theFont = (wxFont *) NULL ) const;
|
||||
const wxFont *theFont = (wxFont *) NULL ) const;
|
||||
void DoGetSize(int* width, int* height) const;
|
||||
void DoGetSizeMM(int *width, int *height) const;
|
||||
|
||||
@@ -277,7 +277,7 @@ private:
|
||||
unsigned char m_currentRed;
|
||||
unsigned char m_currentGreen;
|
||||
unsigned char m_currentBlue;
|
||||
|
||||
|
||||
int m_deviceOffsetY;
|
||||
|
||||
wxGnomePrinter *m_printer;
|
||||
@@ -285,7 +285,7 @@ private:
|
||||
GnomePrintJob* m_job; // only used and destroyed when created with wxPrintData
|
||||
|
||||
void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
|
||||
|
||||
|
||||
private:
|
||||
wxCoord XDEV2LOG(wxCoord x) const
|
||||
{
|
||||
|
Reference in New Issue
Block a user