replacing old core graphics with new graphics context implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index def0ad4cc3e410c97fd1676eeba07eed5d381670..4fc84defdd661af82bc8a6c6e65183723aa8d720 100644 (file)
--- 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;
   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:
   virtual ~wxClientDC(void);
 
 protected:

+#if !wxMAC_USE_CORE_GRAPHICS

   virtual void DoGetSize( int *width, int *height ) const;
   virtual void DoGetSize( int *width, int *height ) const;

+#endif

 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC


@@ -68,7 +75,9 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   virtual ~wxPaintDC(void);
 
 protected:
   virtual ~wxPaintDC(void);
 
 protected:

+#if !wxMAC_USE_CORE_GRAPHICS

   virtual void DoGetSize( int *width, int *height ) const;
   virtual void DoGetSize( int *width, int *height ) const;

+#endif

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/mac/carbon/dcscreen.h b/include/wx/mac/carbon/dcscreen.h
index 4e2ed0511f5a928d1b7bb41a2cf3b2e3ca4a646e..891444cbf4d9afe1c60d5a5f30ddb88bc0f94980 100644 (file)
--- 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; }
   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
 };
 
 #endif