added wxWeakRef<T> (slightly modified patch 1860953)

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

diff --git a/include/wx/dfb/dcmemory.h b/include/wx/dfb/dcmemory.h
index 86ce650a72be3e07e83c961c1e3c598012dfd0f5..b7dd9c2d816c6889b00281a3c258560c48d5a094 100644 (file)
--- a/include/wx/dfb/dcmemory.h
+++ b/include/wx/dfb/dcmemory.h
@@ -11,25 +11,38 @@
 #ifndef _WX_DFB_DCMEMORY_H_
 #define _WX_DFB_DCMEMORY_H_
 
 #ifndef _WX_DFB_DCMEMORY_H_
 #define _WX_DFB_DCMEMORY_H_
 

-#include "wx/dc.h"
+#include "wx/dfb/dc.h"

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

-class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxDFBDCImpl

 {
 public:
 {
 public:

-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
-    wxMemoryDC(wxDC *dc); // create compatible DC
-
-    virtual void SelectObject(const wxBitmap& bitmap);
-
-    // implementation from now on:
-
-    wxBitmap GetSelectedObject() const { return m_bmp; }
+    wxMemoryDCImpl(wxMemoryDC *owner)
+        : wxDFBDCImpl(owner)
+    {
+        Init();
+    }
+
+    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+        : wxDFBDCImpl(owner)
+    {
+        Init();
+        DoSelect(bitmap);
+    }
+
+    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc); // create compatible DC
+
+    // override wxMemoryDC-specific base class virtual methods
+    virtual const wxBitmap& GetSelectedBitmap() const { return m_bmp; }
+    virtual wxBitmap& GetSelectedBitmap() { return m_bmp; }
+    virtual void DoSelect(const wxBitmap& bitmap);

 
 private:
 
 private:

+    void Init();
+

     wxBitmap m_bmp;
 
     wxBitmap m_bmp;
 

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)

 };
 
 #endif // _WX_DFB_DCMEMORY_H_
 };
 
 #endif // _WX_DFB_DCMEMORY_H_