diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h index def0ad4cc3..4fc84defdd 100644 --- a/include/wx/mac/carbon/dcclient.h +++ b/include/wx/mac/carbon/dcclient.h @@ -36,6 +36,11 @@ class WXDLLEXPORT wxWindowDC: public wxDC protected : virtual void DoGetSize( int *width, int *height ) const; wxWindow *m_window; +#if wxMAC_USE_CORE_GRAPHICS + bool m_release; + int m_width; + int m_height; +#endif }; @@ -52,7 +57,9 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC virtual ~wxClientDC(void); protected: +#if !wxMAC_USE_CORE_GRAPHICS virtual void DoGetSize( int *width, int *height ) const; +#endif }; class WXDLLEXPORT wxPaintDC: public wxWindowDC @@ -68,7 +75,9 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC virtual ~wxPaintDC(void); protected: +#if !wxMAC_USE_CORE_GRAPHICS virtual void DoGetSize( int *width, int *height ) const; +#endif }; #endif diff --git a/include/wx/mac/carbon/dcscreen.h b/include/wx/mac/carbon/dcscreen.h index 4e2ed0511f..891444cbf4 100644 --- a/include/wx/mac/carbon/dcscreen.h +++ b/include/wx/mac/carbon/dcscreen.h @@ -28,6 +28,10 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; } static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; } static bool EndDrawingOnTop() { return TRUE; } + private: +#if wxMAC_USE_CORE_GRAPHICS + wxUint32 m_displayId; +#endif }; #endif