wxBORDER_THEME now means 'use an appropriate themed border' on all plaforms

[wxWidgets.git] / include / wx / gtk1 / dcmemory.h

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index ba5b573e5fde8d32cbde7e5641ee78fd0d8b75fc..8ea483e3bae7b85bfc9780324b797b1813253dbd 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -17,19 +17,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
 {
 public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
-    virtual void SelectObject( const wxBitmap& bitmap );
     void DoGetSize( int *width, int *height ) const;
 
     // these get reimplemented for mono-bitmaps to behave
@@ -45,7 +45,12 @@ public:
     // implementation
     wxBitmap  m_selected;
 
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 private:
+    void Init();
+
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };