X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..687b91d266990129fbbb8c21d92fa4298b458352:/include/wx/mac/carbon/dcmemory.h diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h index c8ea44e5ad..cc6d459e54 100644 --- a/include/wx/mac/carbon/dcmemory.h +++ b/include/wx/mac/carbon/dcmemory.h @@ -12,10 +12,6 @@ #ifndef _WX_DCMEMORY_H_ #define _WX_DCMEMORY_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "dcmemory.h" -#endif - #include "wx/dcclient.h" class WXDLLEXPORT wxMemoryDC: public wxPaintDC @@ -23,12 +19,16 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC DECLARE_DYNAMIC_CLASS(wxMemoryDC) public: - wxMemoryDC(void); + wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap ); wxMemoryDC( wxDC *dc ); // Create compatible DC - ~wxMemoryDC(void); + virtual ~wxMemoryDC(void); virtual void SelectObject( const wxBitmap& bitmap ); + wxBitmap GetSelectedBitmap() { return m_selected ; } + wxBitmap GetSelectedObject() { return GetSelectedBitmap() ; } + +protected: virtual void DoGetSize( int *width, int *height ) const; - wxBitmap GetSelectedObject() { return m_selected ; } + private: wxBitmap m_selected; };