mac cgcolor changes & cleanup

[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 4fc84defdd661af82bc8a6c6e65183723aa8d720..448d6b4322412460163bba40925893afd8e8cd30 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -18,8 +18,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPaintDC;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {
@@ -35,12 +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
+
 };
 
 
@@ -57,9 +58,6 @@ 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
@@ -75,9 +73,6 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   virtual ~wxPaintDC(void);
 
 protected:
-#if !wxMAC_USE_CORE_GRAPHICS
-  virtual void DoGetSize( int *width, int *height ) const;
-#endif
 };
 
 #endif