added operators for comparing wxString to wxCStrData

[wxWidgets.git] / include / wx / mac / carbon / dcmemory.h

diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h
index cc6d459e541c93b1f1f6214d7c3f1942762edd69..d2eb3d4acc3527d585dd444a0b339da2cca5c60a 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -14,22 +14,30 @@
 
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLEXPORT wxMemoryDC: public wxPaintDC, public wxMemoryDCBase
 {
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
-  public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+public:
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-       wxBitmap    GetSelectedBitmap() { return m_selected ; }
+
+    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;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    void Init();
 
-  private:
     wxBitmap  m_selected;
 };