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 a62be04d310b255eed6e360fa4cef755a62e0102..448d6b4322412460163bba40925893afd8e8cd30 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -18,8 +18,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPaintDC;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {
 
 class WXDLLEXPORT wxWindowDC: public wxDC
 {


@@ -32,9 +32,16 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   wxWindowDC(wxWindow *win);
 
   virtual ~wxWindowDC(void);
   wxWindowDC(wxWindow *win);
 
   virtual ~wxWindowDC(void);

+  wxWindow *GetWindow() const { return m_window; }

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

+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; 

     wxWindow     *m_window;
     wxWindow     *m_window;

+
+       bool            m_release;
+       int                     m_width;
+       int                     m_height;
+

 };
 
 
 };
 
 


@@ -51,7 +58,6 @@ class WXDLLEXPORT wxClientDC: public wxWindowDC
   virtual ~wxClientDC(void);
 
 protected:
   virtual ~wxClientDC(void);
 
 protected:

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

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


@@ -67,7 +73,6 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   virtual ~wxPaintDC(void);
 
 protected:
   virtual ~wxPaintDC(void);
 
 protected:

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

 };
 
 #endif
 };
 
 #endif