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
This commit is contained in:
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
|
|||||||
|
|
||||||
~wxMemoryDC(void);
|
~wxMemoryDC(void);
|
||||||
virtual void SelectObject(const wxBitmap& bitmap);
|
virtual void SelectObject(const wxBitmap& bitmap);
|
||||||
virtual void GetSize(int* width, int* height) const;
|
virtual void DoGetSize(int* width, int* height) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -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())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user