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 a7d6b87240126be3d622e254978c293e71cd02f8..448d6b4322412460163bba40925893afd8e8cd30 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -6,24 +6,20 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcclient.h"
-#endif
-
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPaintDC;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {
@@ -35,10 +31,17 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   // Create a DC corresponding to a canvas
   wxWindowDC(wxWindow *win);
 
-  ~wxWindowDC(void);
-  virtual void DoGetSize( int *width, int *height ) const;
+  virtual ~wxWindowDC(void);
+  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;
+
+       bool            m_release;
+       int                     m_width;
+       int                     m_height;
+
 };
 
 
@@ -52,8 +55,9 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
   // Create a DC corresponding to a canvas
   wxClientDC(wxWindow *win);
 
-  ~wxClientDC(void);
-  virtual void DoGetSize( int *width, int *height ) const;
+  virtual ~wxClientDC(void);
+
+protected:
 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
@@ -66,8 +70,9 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   // Create a DC corresponding to a canvas
   wxPaintDC(wxWindow *win);
 
-  ~wxPaintDC(void);
-  virtual void DoGetSize( int *width, int *height ) const;
+  virtual ~wxPaintDC(void);
+
+protected:
 };
 
 #endif