Added project files for wxUniv under MSW

[wxWidgets.git] / include / wx / mac / window.h

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index bd6c9cec427618e2e094ee8c2290eaf4641d4819..76be482a0083e69edc16f65d93b3ce5abb7de0b2 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -48,6 +48,7 @@ public:
                        WindowRef                                                       m_macWindow ;
                        ControlHandle                                   m_macRootControl ;
                        wxWindow*                                                       m_macFocus ;
+                       bool                                m_macHasReceivedFirstActivate ;
        } MacWindowData ;
        
        
@@ -270,14 +271,16 @@ public :
        virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
        virtual void                                            MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
        MacWindowData*                                          MacGetWindowData() { return m_macWindowData ; }
+       static WindowRef                                        MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
        bool                                                            MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
        static wxWindow*                                        s_lastMouseWindow ;
 private:
        virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
 protected:
-
        MacWindowData*                          m_macWindowData ;
+       static WindowRef                        s_macWindowInUpdate ;
        RgnHandle                                       m_macUpdateRgn ;
+       bool                                            m_macEraseOnRedraw ;
 
        int                                                                     m_x ;
        int                                                                     m_y ;   
@@ -329,7 +332,7 @@ private:
     // common part of all ctors
     void Init();
 
-    DECLARE_NO_COPY_CLASS(wxWindow);
+    DECLARE_NO_COPY_CLASS(wxWindow)
     DECLARE_EVENT_TABLE()
 };