X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..5d0fac27c4b2151b1ff3689cdb602bbaf10a4003:/include/wx/mac/carbon/dcmemory.h?ds=inline

diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h
index c8ea44e5ad..d2eb3d4acc 100644
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -12,24 +12,32 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcmemory.h"
-#endif
-
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLEXPORT wxMemoryDC: public wxPaintDC, public wxMemoryDCBase
 {
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
+    virtual ~wxMemoryDC(void);
+
+    const wxBitmap& GetSelectedBitmap() const { return m_selected; }
+    wxBitmap    GetSelectedBitmap() { return m_selected; }
+
+	wxBitmap    GetSelectedObject() { return GetSelectedBitmap() ; }
+
+protected:
     virtual void DoGetSize( int *width, int *height ) const;
-        wxBitmap    GetSelectedObject() { return m_selected ; }
-  private:
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    void Init();
+
     wxBitmap  m_selected;
 };