X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f98bd6d6cf33f0475b5d737a2968b42b7ea0009f..48aaa7b651c1c80a7f081bb239c363279bb34e3b:/include/wx/gtk/dcmemory.h

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index b4e6be4c82..4afeaf4bce 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -23,13 +23,13 @@ class WXDLLIMPEXP_CORE wxMemoryDC;
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC() : wxWindowDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) : wxWindowDC() { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
-    virtual void SelectObject( const wxBitmap& bitmap );
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
@@ -47,6 +47,12 @@ public:
 
 protected:
     void DoGetSize( int *width, int *height ) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    void Init();
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };