X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f37154e988c597e32a840e43783cf0b23e5f8b4..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/dcmemory.h diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h index 12eef132aa..b104fc55ba 100644 --- a/include/wx/dcmemory.h +++ b/include/wx/dcmemory.h @@ -15,9 +15,6 @@ #include "wx/dc.h" #include "wx/bitmap.h" - -#if wxUSE_NEW_DC - //----------------------------------------------------------------------------- // wxMemoryDC //----------------------------------------------------------------------------- @@ -28,13 +25,13 @@ public: wxMemoryDC(); wxMemoryDC( wxBitmap& bitmap ); wxMemoryDC( wxDC *dc ); - + // select the given bitmap to draw on it void SelectObject(wxBitmap& bmp); // select the given bitmap for read-only void SelectObjectAsSource(const wxBitmap& bmp); - + // get selected bitmap const wxBitmap& GetSelectedBitmap() const; wxBitmap& GetSelectedBitmap(); @@ -42,72 +39,7 @@ public: private: DECLARE_DYNAMIC_CLASS(wxMemoryDC) }; - - - -#else - -// 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 WXDLLEXPORT wxMemoryDCBase -{ -public: - wxMemoryDCBase() { } - - // avoid warnings about having virtual functions but non virtual dtor - virtual ~wxMemoryDCBase() { } - - // 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); - } - - // select the given bitmap for read-only - virtual void SelectObjectAsSource(const wxBitmap& bmp) - { - DoSelect(bmp); - } - -protected: - virtual void DoSelect(const wxBitmap& bmp) = 0; -}; -#endif - - -#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_