From: Robin Dunn Date: Tue, 8 Jun 1999 06:58:57 +0000 (+0000) Subject: Changed GetSize to DoGetSize so virtual GetSize works right. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/953ccd3da935af4f03732ef87a0dba214c802e65 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 f278bc447e..5ba8eb59e8 100644 --- 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); - virtual void GetSize(int* width, int* height) const; + virtual void DoGetSize(int* width, int* height) const; }; #endif diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp index 573cfa02e0..60bbb50735 100644 --- a/src/msw/dcmemory.cpp +++ b/src/msw/dcmemory.cpp @@ -116,7 +116,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap) m_oldBitmap = (WXHBITMAP) bm; } -void wxMemoryDC::GetSize(int *width, int *height) const +void wxMemoryDC::DoGetSize(int *width, int *height) const { if (!m_selectedBitmap.Ok()) {