X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/dcclient.h?ds=sidebyside diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h index b3b42f4e2e..6bb45e4a73 100644 --- a/include/wx/mac/carbon/dcclient.h +++ b/include/wx/mac/carbon/dcclient.h @@ -13,6 +13,7 @@ #define _WX_DCCLIENT_H_ #include "wx/dc.h" +#include "wx/dcgraph.h" //----------------------------------------------------------------------------- // classes @@ -21,65 +22,52 @@ class WXDLLIMPEXP_FWD_CORE wxPaintDC; class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLEXPORT wxWindowDC: public wxDC +class WXDLLEXPORT wxWindowDCImpl: public wxGCDCImpl { - DECLARE_DYNAMIC_CLASS(wxWindowDC) - - public: - wxWindowDC(void); - - // Create a DC corresponding to a canvas - wxWindowDC(wxWindow *win); - - virtual ~wxWindowDC(void); - wxWindow *GetWindow() const { return m_window; } - protected : +public: + wxWindowDCImpl( wxDC *owner ); + wxWindowDCImpl( wxDC *owner, wxWindow *window ); + virtual ~wxWindowDCImpl(); + +protected : virtual void DoGetSize( int *width, int *height ) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; - wxWindow *m_window; -#if wxMAC_USE_CORE_GRAPHICS - bool m_release; - int m_width; - int m_height; -#endif -}; - - -class WXDLLEXPORT wxClientDC: public wxWindowDC -{ - DECLARE_DYNAMIC_CLASS(wxClientDC) - - public: - wxClientDC(void); - // Create a DC corresponding to a canvas - wxClientDC(wxWindow *win); + bool m_release; + int m_width; + int m_height; - virtual ~wxClientDC(void); - -protected: -#if !wxMAC_USE_CORE_GRAPHICS - virtual void DoGetSize( int *width, int *height ) const; -#endif +private: + DECLARE_CLASS(wxWindowDCImpl) + DECLARE_NO_COPY_CLASS(wxWindowDCImpl) }; -class WXDLLEXPORT wxPaintDC: public wxWindowDC -{ - DECLARE_DYNAMIC_CLASS(wxPaintDC) - public: - wxPaintDC(void); +class WXDLLEXPORT wxClientDCImpl: public wxWindowDCImpl +{ +public: + wxClientDCImpl( wxDC *owner ); + wxClientDCImpl( wxDC *owner, wxWindow *window ); + virtual ~wxClientDCImpl(); + +private: + DECLARE_CLASS(wxClientDCImpl) + DECLARE_NO_COPY_CLASS(wxClientDCImpl) +}; - // Create a DC corresponding to a canvas - wxPaintDC(wxWindow *win); - virtual ~wxPaintDC(void); +class WXDLLEXPORT wxPaintDCImpl: public wxWindowDCImpl +{ +public: + wxPaintDCImpl( wxDC *owner ); + wxPaintDCImpl( wxDC *owner, wxWindow *win ); + virtual ~wxPaintDCImpl(); protected: -#if !wxMAC_USE_CORE_GRAPHICS - virtual void DoGetSize( int *width, int *height ) const; -#endif + DECLARE_CLASS(wxPaintDCImpl) + DECLARE_NO_COPY_CLASS(wxPaintDCImpl) }; + #endif // _WX_DCCLIENT_H_