[ 1936700 ] wxCAL_SHOW_WEEK_NUMBERS, slightly modified

[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 9e1045c8bd9110123c0b459b4732ca1c72375495..c42c6544e7e11f8eef7df2d1dafbfe5f0747b896 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -12,24 +12,34 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#include "wx/dcclient.h"
+#include "wx/mac/carbon/dcclient.h"

 
 

-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+public:
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); 
+    
+    virtual ~wxMemoryDCImpl();

 
 

-  public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    virtual ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-        wxBitmap    GetSelectedObject() { return m_selected ; }
-
-protected:

     virtual void DoGetSize( int *width, int *height ) const;
     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);
+
+    virtual const wxBitmap& GetSelectedBitmap() const
+        { return m_selected; }
+    virtual wxBitmap& GetSelectedBitmap()
+        { return m_selected; }
+    
+private:
+    void Init();

 
 

-  private:

     wxBitmap  m_selected;
     wxBitmap  m_selected;

+    
+    DECLARE_CLASS(wxMemoryDCImpl)
+    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)

 };
 
 #endif
 };
 
 #endif