set eol-style

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

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index fa9e983e1b0f59567935c46165c9192734c7f168..07927df52c99eb43cce26017beef2904ff6f3a08 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -14,19 +14,27 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

-class WXDLLEXPORT wxMemoryDC: public wxDC
+class WXDLLEXPORT wxMemoryDC: public wxDC, public wxMemoryDCBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-

 public:
 public:

-    wxMemoryDC(void);
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }

     wxMemoryDC(wxDC* pDC); // Create compatible DC
 
     wxMemoryDC(wxDC* pDC); // Create compatible DC
 

-    ~wxMemoryDC(void);
-    virtual void SelectObject(const wxBitmap& rBitmap);
+protected:
+    // override some base class virtuals

     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
                           ) const;
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
                           ) const;

+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    // 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
 }; // end of CLASS wxMemoryDC
 
 #endif