Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 55e6724e95946b413e3922f9e1c8916678dc88f7..b104fc55ba18bedfb3e97baa1d8c9c381b279da7 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -12,64 +12,34 @@
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
-#include "wx/defs.h"
+#include "wx/dc.h"
+#include "wx/bitmap.h"
 
-// NOTE: different native implementations of wxMemoryDC will derive from
-//       different wxDC classes (wxPaintDC, wxWindowDC, etc), so that
-//       we cannot derive wxMemoryDCBase from wxDC and then use it as the
-//       only base class for native impl of wxMemoryDC...
-class wxMemoryDCBase
+//-----------------------------------------------------------------------------
+// wxMemoryDC
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxMemoryDC: public wxDC
 {
 public:
-    wxMemoryDCBase() { }
-
-    // avoid warnings about having virtual functions but non virtual dtor
-    virtual ~wxMemoryDCBase() { }
+    wxMemoryDC();
+    wxMemoryDC( wxBitmap& bitmap );
+    wxMemoryDC( wxDC *dc );
 
     // select the given bitmap to draw on it
-    void SelectObject(wxBitmap& bmp)
-    {
-        // make sure that the given wxBitmap is not sharing its data with other
-        // wxBitmap instances as its contents will be modified by any drawing
-        // operation done on this DC
-        if (bmp.IsOk())
-            bmp.UnShare();
-
-        DoSelect(bmp);
-    }
+    void SelectObject(wxBitmap& bmp);
 
     // select the given bitmap for read-only
-    virtual void SelectObjectAsSource(const wxBitmap& bmp)
-    {
-        DoSelect(bmp);
-    }
+    void SelectObjectAsSource(const wxBitmap& bmp);
 
-    virtual void DoSelect(const wxBitmap& bmp) = 0;
+    // get selected bitmap
+    const wxBitmap& GetSelectedBitmap() const;
+    wxBitmap& GetSelectedBitmap();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
-#if defined(__WXPALMOS__)
-#include "wx/palmos/dcmemory.h"
-#elif defined(__WXMSW__)
-#include "wx/msw/dcmemory.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/dcmemory.h"
-#elif defined(__WXGTK20__)
-#include "wx/gtk/dcmemory.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk1/dcmemory.h"
-#elif defined(__WXX11__)
-#include "wx/x11/dcmemory.h"
-#elif defined(__WXMGL__)
-#include "wx/mgl/dcmemory.h"
-#elif defined(__WXDFB__)
-#include "wx/dfb/dcmemory.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/dcmemory.h"
-#elif defined(__WXCOCOA__)
-#include "wx/cocoa/dcmemory.h"
-#elif defined(__WXPM__)
-#include "wx/os2/dcmemory.h"
-#endif
 
 #endif
     // _WX_DCMEMORY_H_BASE_