don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

[wxWidgets.git] / include / wx / os2 / dcmemory.h

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index 85191f6e45ae4c107043508dfe8215d579ce405b..07927df52c99eb43cce26017beef2904ff6f3a08 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -14,18 +14,28 @@
 
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxDC
+class WXDLLEXPORT wxMemoryDC: public wxDC, public wxMemoryDCBase
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+public:
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }
+    wxMemoryDC(wxDC* pDC); // Create compatible DC
 
-  public:
-    wxMemoryDC(void);
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
+protected:
+    // override some base class virtuals
+    virtual void DoGetSize( int* pWidth
+                           ,int* pHeight
+                          ) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
 
-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    virtual void DoGetSize( int *width, int *height ) const;
-};
+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC* pDC);
+
+    // initialize the newly created DC
+    void Init(void);
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+}; // end of CLASS wxMemoryDC
 
 #endif
     // _WX_DCMEMORY_H_