X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/osx/dcmemory.h diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h index 7c69b01f79..9725026777 100644 --- a/include/wx/osx/dcmemory.h +++ b/include/wx/osx/dcmemory.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.h +// Name: wx/osx/dcmemory.h // Purpose: wxMemoryDC class // Author: Stefan Csomor // Modified by: @@ -12,19 +12,19 @@ #ifndef _WX_DCMEMORY_H_ #define _WX_DCMEMORY_H_ -#include "wx/osx/carbon/dcclient.h" +#include "wx/osx/dcclient.h" class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl { public: wxMemoryDCImpl( wxMemoryDC *owner ); wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); - wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); - + wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); + virtual ~wxMemoryDCImpl(); virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } virtual void DoSelect(const wxBitmap& bitmap); @@ -32,14 +32,14 @@ public: { return m_selected; } virtual wxBitmap& GetSelectedBitmap() { return m_selected; } - + private: void Init(); wxBitmap m_selected; - + DECLARE_CLASS(wxMemoryDCImpl) - DECLARE_NO_COPY_CLASS(wxMemoryDCImpl) + wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); }; #endif