X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..8a540c887cd30960c77e6c171ecabe30273321a8:/include/wx/mgl/dcmemory.h?ds=inline diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h index 96ad1a3c1c..39804f20f1 100644 --- a/include/wx/mgl/dcmemory.h +++ b/include/wx/mgl/dcmemory.h @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_DCMEMORY_H__ #define __WX_DCMEMORY_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "dcmemory.h" -#endif - #include "wx/defs.h" #include "wx/dcclient.h" @@ -28,13 +23,13 @@ class WXDLLEXPORT wxMemoryDC; // wxMemoryDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMemoryDC : public wxDC +class WXDLLEXPORT wxMemoryDC : public wxDC, public wxMemoryDCBase { public: - wxMemoryDC(); + wxMemoryDC() { Init(); } + wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); } wxMemoryDC(wxDC *dc); // Create compatible DC - ~wxMemoryDC(); - virtual void SelectObject(const wxBitmap& bitmap); + virtual ~wxMemoryDC(); // these get reimplemented for mono-bitmaps to behave // more like their Win32 couterparts. They now interpret @@ -50,7 +45,12 @@ public: wxBitmap GetSelectedObject() const { return m_selected; } +protected: + virtual void DoSelect(const wxBitmap& bitmap); + private: + void Init(); + DECLARE_DYNAMIC_CLASS(wxMemoryDC) };