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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 5638e228a560826afa3d165c7d4fd4fd419e5155..a0d0c51cc6a4cc4ab91cdc4450f9853a61aed793 100644 (file)
--- 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;
 
                      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;
 
   // 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 ea4a1f157100baf9ad95c456b0385006e46527a2..982dee3119854f803c17091ec162c570821d8d73 100644 (file)
--- 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 );
   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
 
 
   // implementation
 

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index ea4a1f157100baf9ad95c456b0385006e46527a2..982dee3119854f803c17091ec162c570821d8d73 100644 (file)
--- 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 );
   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
 
 
   // implementation
 

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 93655b14eb6bd874db459ff50dfec7cf1cb7294d..c6f1a559f43dd234ae63ad91083087ba97368137 100644 (file)
--- 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 );
 }
 
     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();
 
 {
     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();
 
 {
     wxPaperSize id = m_printData.GetPaperId();
 

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 139438b21552b35e2781b7f49b5b0ca6e0889eac..6e6365b3ea92c7c3d9e21b64566597d4d36cae9d 100644 (file)
--- 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())
     {
 {
     if (m_selected.Ok())
     {

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 139438b21552b35e2781b7f49b5b0ca6e0889eac..6e6365b3ea92c7c3d9e21b64566597d4d36cae9d 100644 (file)
--- 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())
     {
 {
     if (m_selected.Ok())
     {