X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/gtk/dcmemory.h?ds=sidebyside

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 8658a250eb..ff470015c8 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,35 +7,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_DCMEMORY_H_
+#define _WX_GTK_DCMEMORY_H_
 
-#ifndef __GTKDCMEMORYH__
-#define __GTKDCMEMORYH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/dcclient.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMemoryDC;
+#include "wx/dcmemory.h"
+#include "wx/gtk/dcclient.h"
 
 //-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-class 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 );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
+    
+    virtual ~wxMemoryDCImpl();
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
@@ -47,13 +36,24 @@ public:
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
 
-    // implementation
-    wxBitmap  m_selected;
+    // overridden from wxDCImpl
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
+
+    // overridden for wxMemoryDC Impl
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    wxBitmap  m_selected;
+    
+    void Init();
+
+    DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 
-#endif
-    // __GTKDCMEMORYH__
+#endif 
+    // _WX_GTK_DCMEMORY_H_