Compilation fix for STL build in wxGtkCollatableString code.

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

diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index 96ad1a3c1ccc3a18d28703b3f80ae7e1fc1b9b5e..9ec0e6fd0f9d1011938078133d5c0fff250b7eed 100644 (file)
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_DCMEMORY_H__
 #define __WX_DCMEMORY_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcmemory.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/dcclient.h"
 
@@ -22,19 +17,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMemoryDC : public wxDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC, public wxMemoryDCBase
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC(wxDC *dc); // Create compatible DC
-    ~wxMemoryDC();
-    virtual void SelectObject(const wxBitmap& bitmap);
+    virtual ~wxMemoryDC();
 
     // these get reimplemented for mono-bitmaps to behave
     // more like their Win32 couterparts. They now interpret
@@ -47,10 +42,15 @@ public:
 
     // implementation
     wxBitmap  m_selected;
-    
+
     wxBitmap GetSelectedObject() const { return m_selected; }
 
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 private:
+    void Init();
+
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };