added missing WXDLLIMPEXP_CORE for wxGetDisplay() for wxGTK

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

diff --git a/include/wx/dfb/dcmemory.h b/include/wx/dfb/dcmemory.h
index 86ce650a72be3e07e83c961c1e3c598012dfd0f5..d5b1a72d9b7a1a865f74f55a69bef8fcea23e342 100644 (file)
--- a/include/wx/dfb/dcmemory.h
+++ b/include/wx/dfb/dcmemory.h
@@ -14,19 +14,23 @@
 #include "wx/dc.h"
 #include "wx/bitmap.h"
 
-class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC, public wxMemoryDCBase
 {
 public:
-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC(wxDC *dc); // create compatible DC
 
-    virtual void SelectObject(const wxBitmap& bitmap);
-
     // implementation from now on:
 
     wxBitmap GetSelectedObject() const { return m_bmp; }
 
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 private:
+    void Init();
+
     wxBitmap m_bmp;
 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)