add a header placeholder

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index a8d6434ad39e65e083357b39d0ec0f2f7205bf18..4afeaf4bceff8b154a7ce7b8244108cd3dbf74eb 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -23,13 +23,13 @@ class WXDLLIMPEXP_CORE wxMemoryDC;
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase

 {
 public:
 {
 public:

-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC() : wxWindowDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) : wxWindowDC() { Init(); SelectObject(bitmap); }

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

-    virtual void SelectObject( const wxBitmap& bitmap );

 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret


@@ -47,6 +47,10 @@ public:
 
 protected:
     void DoGetSize( int *width, int *height ) const;
 
 protected:
     void DoGetSize( int *width, int *height ) const;

+    virtual void DoSelect(const wxBitmap& bitmap);
+
+private:
+    void Init();

     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
 
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }