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 c8ea44e5ad388c43556d2a92bca99125f46edff6..d2eb3d4acc3527d585dd444a0b339da2cca5c60a 100644 (file)
--- 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_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcmemory.h"
-#endif
-

 #include "wx/dcclient.h"
 
 #include "wx/dcclient.h"
 

-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLEXPORT wxMemoryDC: public wxPaintDC, public wxMemoryDCBase

 {
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
 {
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 

-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }

     wxMemoryDC( wxDC *dc ); // Create compatible DC
     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;
     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;
 };
 
     wxBitmap  m_selected;
 };