Several fixes for wxAffineMatrix2D transformations.

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

diff --git a/include/wx/dfb/dcmemory.h b/include/wx/dfb/dcmemory.h
index d5b1a72d9b7a1a865f74f55a69bef8fcea23e342..4ff01bd564f61580184c45ddbdd9a122009452c1 100644 (file)
--- a/include/wx/dfb/dcmemory.h
+++ b/include/wx/dfb/dcmemory.h
@@ -11,21 +11,19 @@
 #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, public wxMemoryDCBase
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxDFBDCImpl

 {
 public:
 {
 public:

-    wxMemoryDC() { Init(); }
-    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
-    wxMemoryDC(wxDC *dc); // create compatible DC
+    wxMemoryDCImpl(wxMemoryDC *owner);
+    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap);
+    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc); // create compatible DC

 
 

-    // implementation from now on:
-
-    wxBitmap GetSelectedObject() const { return m_bmp; }
-
-protected:
+    // 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:
     virtual void DoSelect(const wxBitmap& bitmap);
 
 private:


@@ -33,7 +31,7 @@ private:
 
     wxBitmap m_bmp;
 
 
     wxBitmap m_bmp;
 

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)

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