reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index 8bda585ff4ab37b2fcc3a7b765eb8535597db485..7bd0f9ce85413122732fa9e85937500eb24b36a3 100644 (file)
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@@ -17,19 +17,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMemoryDC : public wxDC
+class WXDLLEXPORT wxMemoryDC : public wxDC, public wxMemoryDCBase

 {
 public:
 {
 public:

-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { 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


@@ -45,7 +45,12 @@ public:
     
     wxBitmap GetSelectedObject() const { return m_selected; }
 
     
     wxBitmap GetSelectedObject() const { return m_selected; }
 

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

 private:
 private:

+    void Init();
+

     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };