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 98bccb03249808cb3797536d50186a297229be1d..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 ;
        
        
@@ -177,6 +178,7 @@ public:
 
     // event handlers
     // --------------
+       void OnSetFocus(wxFocusEvent& event) ;
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void MacOnScroll(wxScrollEvent&event ) ;
@@ -246,10 +248,16 @@ public :
        WindowRef                                                       GetMacRootWindow() const  ;
 
        virtual ControlHandle                           MacGetContainerForEmbedding() ;
-       virtual long                                            MacGetBorderSize() const ;
+       
+       virtual long                                            MacGetLeftBorderSize() const ;
+       virtual long                                            MacGetRightBorderSize() const ;
+       virtual long                                            MacGetTopBorderSize() const ;
+       virtual long                                            MacGetBottomBorderSize() const ;
+
        static long                                                     MacRemoveBordersFromStyle( long style ) ;
        virtual void                                            MacSuperChangedPosition() ;
        virtual void                                            MacSuperShown( bool show ) ;
+       bool                                                            MacIsReallyShown() const ;
 /*
        bool                                                                            MacSetupFocusPort() ;
        bool                                                                            MacSetupDrawingPort() ;
@@ -269,10 +277,10 @@ public :
 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 ;   
@@ -324,7 +332,7 @@ private:
     // common part of all ctors
     void Init();
 
-    DECLARE_NO_COPY_CLASS(wxWindow);
+    DECLARE_NO_COPY_CLASS(wxWindow)
     DECLARE_EVENT_TABLE()
 };