X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/gtk1/dcmemory.h?ds=sidebyside

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 93bfb09883..f3744dfdf9 100644
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/gtk1/dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -10,27 +10,41 @@
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
-#include "wx/defs.h"
-#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/gtk1/dcclient.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDCImpl;
 
 //-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
 {
 public:
-    wxMemoryDC();
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC();
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void DoGetSize( int *width, int *height ) const;
+    wxMemoryDCImpl(wxMemoryDC *owner)
+        : wxWindowDCImpl(owner)
+    {
+        Init();
+    }
+
+    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+        : wxWindowDCImpl(owner)
+    {
+        Init();
+
+        DoSelect(bitmap);
+    }
+
+    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc);
+    virtual ~wxMemoryDCImpl();
+
+    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual void DoGetSize( int *width, int *height ) const;
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
@@ -46,9 +60,10 @@ public:
     wxBitmap  m_selected;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
 };
 
-#endif
-    // __GTKDCMEMORYH__
+#endif // __GTKDCMEMORYH__