wxChar -> char

[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 58a26fee28292f9bd947039c8ec32ae2a1af510d..d2eb3d4acc3527d585dd444a0b339da2cca5c60a 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -14,15 +14,16 @@
 
 #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( const wxBitmap& bitmap = wxNullBitmap );
+public:
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }

     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);

-    virtual void SelectObject( const wxBitmap& bitmap );
+

     const wxBitmap& GetSelectedBitmap() const { return m_selected; }
     wxBitmap    GetSelectedBitmap() { return m_selected; }
 
     const wxBitmap& GetSelectedBitmap() const { return m_selected; }
     wxBitmap    GetSelectedBitmap() { return m_selected; }
 


@@ -32,8 +33,11 @@ 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 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;
 };
 
     wxBitmap  m_selected;
 };