X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fea35690f171f9677bd9f949c0af3dc16d1a9576..c23b255ab4b2867efbaf4721311c4c8265dd6098:/include/wx/x11/dcmemory.h diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h index 0a86134f66..687fea8ffa 100644 --- a/include/wx/x11/dcmemory.h +++ b/include/wx/x11/dcmemory.h @@ -12,16 +12,21 @@ #ifndef _WX_DCMEMORY_H_ #define _WX_DCMEMORY_H_ -#include "wx/dcclient.h" +#include "wx/dc.h" +#include "wx/dcmemory.h" +#include "wx/x11/dcclient.h" -class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase +class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl { public: - wxMemoryDC() { Init(); } - wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); } - wxMemoryDC( wxDC *dc ); // Create compatible DC - virtual ~wxMemoryDC(); - + wxMemoryDCImpl( wxDC* owner ); + wxMemoryDCImpl( wxDC* owner, wxBitmap& bitmap); + wxMemoryDCImpl( wxDC* owner, wxDC *dc ); + virtual ~wxMemoryDCImpl(); + + virtual const wxBitmap& GetSelectedBitmap() const; + virtual wxBitmap& GetSelectedBitmap(); + // implementation wxBitmap m_selected; @@ -32,7 +37,8 @@ protected: private: void Init(); - DECLARE_DYNAMIC_CLASS(wxMemoryDC) +private: + DECLARE_CLASS(wxMemoryDCImpl) }; #endif