fix warnings in EventsSuppressor ctor from gcc with -O option

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

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index f2db0f212c9b556a0329ecefd0e13eb92e48e463..07927df52c99eb43cce26017beef2904ff6f3a08 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -12,28 +12,30 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLEXPORT wxMemoryDC: public wxDC, public wxMemoryDCBase
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-
-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
-
-  private:
-    friend wxPaintDC;
-    wxBitmap  m_selected;
-};
+public:
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }
+    wxMemoryDC(wxDC* pDC); // Create compatible DC
+
+protected:
+    // override some base class virtuals
+    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
     // _WX_DCMEMORY_H_