projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tons of wxFTP fixes and compilation fix for wxBase
[wxWidgets.git]
/
include
/
wx
/
os2
/
dcmemory.h
diff --git
a/include/wx/os2/dcmemory.h
b/include/wx/os2/dcmemory.h
index f2db0f212c9b556a0329ecefd0e13eb92e48e463..85191f6e45ae4c107043508dfe8215d579ce405b 100644
(file)
--- a/
include/wx/os2/dcmemory.h
+++ b/
include/wx/os2/dcmemory.h
@@
-12,13
+12,9
@@
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-
#include "wx/dcclient.h"
#include "wx/dcclient.h"
-class WXDLLEXPORT wxMemoryDC: public wx
Paint
DC
+class WXDLLEXPORT wxMemoryDC: public wxDC
{
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
{
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
@@
-28,11
+24,7
@@
class WXDLLEXPORT wxMemoryDC: public wxPaintDC
~wxMemoryDC(void);
virtual void SelectObject( const wxBitmap& bitmap );
~wxMemoryDC(void);
virtual void SelectObject( const wxBitmap& bitmap );
- void GetSize( int *width, int *height ) const;
-
- private:
- friend wxPaintDC;
- wxBitmap m_selected;
+ virtual void DoGetSize( int *width, int *height ) const;
};
#endif
};
#endif