mac cgcolor changes

[wxWidgets.git] / include / wx / dfb / dcclient.h

diff --git a/include/wx/dfb/dcclient.h b/include/wx/dfb/dcclient.h
index a4006f9cc0d490cb192b6a9c83d90f2520a00ce2..6eae9c4aa92000c8afa4a11fdaba11ef03f6eb13 100644 (file)
--- a/include/wx/dfb/dcclient.h
+++ b/include/wx/dfb/dcclient.h
@@ -13,7 +13,7 @@
 
 #include "wx/dc.h"
 
 
 #include "wx/dc.h"
 

-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 
 //-----------------------------------------------------------------------------
 // wxWindowDC


@@ -22,17 +22,24 @@ class WXDLLIMPEXP_CORE wxWindow;
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:

-    wxWindowDC() : m_win(NULL) {}
+    wxWindowDC() : m_shouldFlip(false) {}

     wxWindowDC(wxWindow *win);
     virtual ~wxWindowDC();
 
     wxWindowDC(wxWindow *win);
     virtual ~wxWindowDC();
 

+    virtual wxWindow *GetWindow() const { return m_win; }
+

 protected:
     // initializes the DC for painting on given window; if rect!=NULL, then
     // for painting only on the given region of the window
     void InitForWin(wxWindow *win, const wxRect *rect);
 
 private:
 protected:
     // initializes the DC for painting on given window; if rect!=NULL, then
     // for painting only on the given region of the window
     void InitForWin(wxWindow *win, const wxRect *rect);
 
 private:

-    wxWindow *m_win; // the window the DC paints on
+    wxWindow *m_win;
+    wxRect    m_winRect; // rectangle of the window being painted
+
+    bool m_shouldFlip; // flip the surface when done?
+
+    friend class wxOverlayImpl; // for m_shouldFlip;

 
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
     DECLARE_NO_COPY_CLASS(wxWindowDC)
 
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
     DECLARE_NO_COPY_CLASS(wxWindowDC)