using subclass as impl ptr, common code in macro because mix-in are not possible...

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

diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index 61c1db674a389d2af18b3784f4699cfc3d480041..c02989c3ce41d5d880c99780b381d49c694fb129 100644 (file)
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@@ -4,17 +4,12 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// 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
@@ -50,7 +45,12 @@ public:
     
     wxBitmap GetSelectedObject() const { return m_selected; }
 
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 private:
+    void Init();
+
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };