Changed GetSize to DoGetSize so virtual GetSize works right.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index f278bc447ec82f3c2a043aa2324415504676536d..5ba8eb59e85441b8ce675fdcda7bfd04df3f0ca0 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
 
   ~wxMemoryDC(void);
   virtual void SelectObject(const wxBitmap& bitmap);
 
   ~wxMemoryDC(void);
   virtual void SelectObject(const wxBitmap& bitmap);

-  virtual void GetSize(int* width, int* height) const;
+  virtual void DoGetSize(int* width, int* height) const;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 573cfa02e014d3d7411435b79e0327d46f2cfe57..60bbb50735c0f9ddee71baed659b8da2870ad71b 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -116,7 +116,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
     m_oldBitmap = (WXHBITMAP) bm;
 }
 
     m_oldBitmap = (WXHBITMAP) bm;
 }
 

-void wxMemoryDC::GetSize(int *width, int *height) const
+void wxMemoryDC::DoGetSize(int *width, int *height) const

 {
   if (!m_selectedBitmap.Ok())
   {
 {
   if (!m_selectedBitmap.Ok())
   {