default name of wxStaticLine should be wxStaticLineNameStr, not wxStaticTextNameStr

[wxWidgets.git] / include / wx / mac / carbon / dcclient.h

diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index def0ad4cc3e410c97fd1676eeba07eed5d381670..b743ea79180aeda92c6b903cb1815b7434a8d990 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -35,7 +35,13 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   wxWindow *GetWindow() const { return m_window; }
   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
 };
 
 
@@ -52,7 +58,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 +76,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