X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41fbc84101e7fc1a3e658f1d3f01664289637f01..905e090500ab0e80bb22508a04f8c77e37748e52:/include/wx/gtk/dcmemory.h

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 12f106dac6..b987d4609d 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -7,35 +7,36 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_DCMEMORY_H_
+#define _WX_GTK_DCMEMORY_H_
 
-#ifndef __GTKDCMEMORYH__
-#define __GTKDCMEMORYH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
 #include "wx/dcclient.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMemoryDC;
-
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class wxMemoryDC : public wxWindowDC
+
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKMemoryImplDC : public wxGTKWindowImplDC
+#else
+#define wxGTKMemoryImplDC wxMemoryDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
+#endif
 {
 public:
+
+#if wxUSE_NEW_DC
+    wxGTKMemoryImplDC( wxMemoryDC *owner );
+    wxGTKMemoryImplDC( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxGTKMemoryImplDC( wxMemoryDC *owner, wxDC *dc );
+#else
     wxMemoryDC();
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC();
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void DoGetSize( int *width, int *height ) const;
+    wxMemoryDC(wxBitmap& bitmap);
+    wxMemoryDC( wxDC *dc );
+#endif
+    
+    virtual ~wxGTKMemoryImplDC();
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
@@ -43,16 +44,29 @@ public:
     // and everything else as drawing 1.
     virtual void SetPen( const wxPen &pen );
     virtual void SetBrush( const wxBrush &brush );
+    virtual void SetBackground( const wxBrush &brush );
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );
 
-    // implementation
-    wxBitmap  m_selected;
+protected:
+    // overridden from wxImplDC
+    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);
+
+public:
+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-};
+    wxBitmap  m_selected;
+    
+private:
+    void Init();
 
-#endif
-    // __GTKDCMEMORYH__
+    DECLARE_ABSTRACT_CLASS(wxGTKMemoryImplDC)
+};
 
+#endif // _WX_GTK_DCMEMORY_H_