X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..fba05595e6cca40763f8ead119c7ad61cb01e0e4:/include/wx/mac/carbon/dcmemory.h diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h index bc6f99ee3a..d2eb3d4acc 100644 --- a/include/wx/mac/carbon/dcmemory.h +++ b/include/wx/mac/carbon/dcmemory.h @@ -14,21 +14,30 @@ #include "wx/dcclient.h" -class WXDLLEXPORT wxMemoryDC: public wxPaintDC +class WXDLLEXPORT wxMemoryDC: public wxPaintDC, public wxMemoryDCBase { DECLARE_DYNAMIC_CLASS(wxMemoryDC) - public: - wxMemoryDC(void); +public: + wxMemoryDC() { Init(); } + wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); } wxMemoryDC( wxDC *dc ); // Create compatible DC virtual ~wxMemoryDC(void); - virtual void SelectObject( const wxBitmap& bitmap ); - wxBitmap GetSelectedObject() { return m_selected ; } + + const wxBitmap& GetSelectedBitmap() const { return m_selected; } + wxBitmap GetSelectedBitmap() { return m_selected; } + + wxBitmap GetSelectedObject() { return GetSelectedBitmap() ; } protected: virtual void DoGetSize( int *width, int *height ) const; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const + { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } + virtual void DoSelect(const wxBitmap& bitmap); + +private: + void Init(); - private: wxBitmap m_selected; };