clipboard implementation generalized

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 3692c3cfb83e86fbd3e8a65b702f0c5a51ebcbfd..df3b0b102db8140381c377f98bdc1c5fed320800 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 ;
                        WindowRef                                                       m_macWindow ;
                        ControlHandle                                   m_macRootControl ;
                        wxWindow*                                                       m_macFocus ;

+                       bool                                m_macHasReceivedFirstActivate ;

        } MacWindowData ;
        
        
        } MacWindowData ;
        
        


@@ -177,6 +178,7 @@ public:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

+       void OnSetFocus(wxFocusEvent& event) ;

     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void MacOnScroll(wxScrollEvent&event ) ;
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void MacOnScroll(wxScrollEvent&event ) ;


@@ -255,6 +257,7 @@ public :
        static long                                                     MacRemoveBordersFromStyle( long style ) ;
        virtual void                                            MacSuperChangedPosition() ;
        virtual void                                            MacSuperShown( bool show ) ;
        static long                                                     MacRemoveBordersFromStyle( long style ) ;
        virtual void                                            MacSuperChangedPosition() ;
        virtual void                                            MacSuperShown( bool show ) ;

+       bool                                                            MacIsReallyShown() const ;

 /*
        bool                                                                            MacSetupFocusPort() ;
        bool                                                                            MacSetupDrawingPort() ;
 /*
        bool                                                                            MacSetupFocusPort() ;
        bool                                                                            MacSetupDrawingPort() ;


@@ -274,10 +277,10 @@ public :
 private:
        virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
 protected:
 private:
        virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
 protected:

-

        MacWindowData*                          m_macWindowData ;
        static WindowRef                        s_macWindowInUpdate ;
        RgnHandle                                       m_macUpdateRgn ;
        MacWindowData*                          m_macWindowData ;
        static WindowRef                        s_macWindowInUpdate ;
        RgnHandle                                       m_macUpdateRgn ;

+       bool                                            m_macEraseOnRedraw ;

 
        int                                                                     m_x ;
        int                                                                     m_y ;   
 
        int                                                                     m_x ;
        int                                                                     m_y ;