Add class factories for filter streams. Also filters now follow the convention

[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 800dae556ec90efe3aff1ffb116c8bd097583d2a..cc6d459e541c93b1f1f6214d7c3f1942762edd69 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -19,12 +19,16 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
   public:
-    wxMemoryDC(void);
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
+    virtual ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
+       wxBitmap    GetSelectedBitmap() { return m_selected ; }
+       wxBitmap    GetSelectedObject() { return GetSelectedBitmap() ; }
+
+protected:
     virtual void DoGetSize( int *width, int *height ) const;
-        wxBitmap    GetSelectedObject() { return m_selected ; }
+
   private:
     wxBitmap  m_selected;
 };