From 4e4ea166d76da40eaa5fdcf9e958d93521f72fba Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 15 May 1999 23:40:42 +0000 Subject: [PATCH] DC change header change for wxMemoryDC and wxPostscriptDC. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/dcpsg.h | 4 ++-- include/wx/gtk/dcmemory.h | 2 +- include/wx/gtk1/dcmemory.h | 2 +- src/generic/dcpsg.cpp | 4 ++-- src/gtk/dcmemory.cpp | 2 +- src/gtk1/dcmemory.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index 5638e228a5..a0d0c51cc6 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -113,8 +113,8 @@ public: long *externalLeading = (long *) NULL, wxFont *theFont = (wxFont *) NULL ) const; - void GetSize(int* width, int* height) const; - void GetSizeMM(int *width, int *height) const; + void DoGetSize(int* width, int* height) const; + void DoGetSizeMM(int *width, int *height) const; // Resolution in pixels per logical inch wxSize GetPPI(void) const; diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index ea4a1f1571..982dee3119 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -37,7 +37,7 @@ public: wxMemoryDC( wxDC *dc ); // Create compatible DC ~wxMemoryDC(); virtual void SelectObject( const wxBitmap& bitmap ); - void GetSize( int *width, int *height ) const; + void DoGetSize( int *width, int *height ) const; // implementation diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h index ea4a1f1571..982dee3119 100644 --- a/include/wx/gtk1/dcmemory.h +++ b/include/wx/gtk1/dcmemory.h @@ -37,7 +37,7 @@ public: wxMemoryDC( wxDC *dc ); // Create compatible DC ~wxMemoryDC(); virtual void SelectObject( const wxBitmap& bitmap ); - void GetSize( int *width, int *height ) const; + void DoGetSize( int *width, int *height ) const; // implementation diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 93655b14eb..c6f1a559f4 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -1230,7 +1230,7 @@ void wxPostScriptDC::SetDeviceOrigin( long x, long y ) wxDC::SetDeviceOrigin( x, h-y ); } -void wxPostScriptDC::GetSize(int* width, int* height) const +void wxPostScriptDC::DoGetSize(int* width, int* height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1250,7 +1250,7 @@ void wxPostScriptDC::GetSize(int* width, int* height) const } } -void wxPostScriptDC::GetSizeMM(int *width, int *height) const +void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const { wxPaperSize id = m_printData.GetPaperId(); diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index 139438b215..6e6365b3ea 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -66,7 +66,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) } } -void wxMemoryDC::GetSize( int *width, int *height ) const +void wxMemoryDC::DoGetSize( int *width, int *height ) const { if (m_selected.Ok()) { diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 139438b215..6e6365b3ea 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -66,7 +66,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) } } -void wxMemoryDC::GetSize( int *width, int *height ) const +void wxMemoryDC::DoGetSize( int *width, int *height ) const { if (m_selected.Ok()) { -- 2.45.2