Fix/hack 1.

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index c7c6bd43b06f2c309fd6a006e3a52045fa5ea876..bd6c9cec427618e2e094ee8c2290eaf4641d4819 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -86,7 +86,6 @@ public:
 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 

-

     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();
     virtual void ReleaseMouse();
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();
     virtual void ReleaseMouse();


@@ -162,7 +161,8 @@ public:
 
        void MacClientToRootWindow( int *x , int *y ) const ;
        void MacRootWindowToClient( int *x , int *y ) const ;
 
        void MacClientToRootWindow( int *x , int *y ) const ;
        void MacRootWindowToClient( int *x , int *y ) const ;

-
+       
+       virtual wxString MacGetToolTipString( wxPoint &where ) ;

 
     // simple accessors
     // ----------------
 
     // simple accessors
     // ----------------


@@ -177,6 +177,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 ) ;


@@ -220,8 +221,12 @@ public:
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);

-

 public :
 public :

+       virtual void                                            MacCreateRealWindow( const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxString& name ) ;

        static bool                                                     MacGetWindowFromPoint( const wxPoint &point , wxWindow** outWin ) ;
        virtual void                                            MacActivate( EventRecord *ev , bool inIsActivating ) ;
        virtual void                                            MacUpdate( EventRecord *ev ) ;
        static bool                                                     MacGetWindowFromPoint( const wxPoint &point , wxWindow** outWin ) ;
        virtual void                                            MacActivate( EventRecord *ev , bool inIsActivating ) ;
        virtual void                                            MacUpdate( EventRecord *ev ) ;


@@ -236,23 +241,35 @@ public :
        virtual void                                            MacFireMouseEvent( EventRecord *ev ) ;
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;
        virtual void                                            MacEraseBackground( Rect *rect ) ;
        virtual void                                            MacFireMouseEvent( EventRecord *ev ) ;
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;
        virtual void                                            MacEraseBackground( Rect *rect ) ;

-       WindowRef                                                               GetMacRootWindow() const  ;
+       virtual void                                            MacPaintBorders() ;
+       // obsolete : only for link compatibility
+       virtual void                                            MacPaint( wxPaintEvent &event ) ;
+       WindowRef                                                       GetMacRootWindow() const  ;

 
 

-       virtual ControlHandle   MacGetContainerForEmbedding() ;
-       virtual void                                            MacSuperChangedPosition() ;
+       virtual ControlHandle                           MacGetContainerForEmbedding() ;
+       
+       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() ;
        bool                                                                            MacSetupFocusClientPort() ;
        bool                                                                            MacSetupDrawingClientPort() ;
        bool                                                                            MacSetupFocusPort() ;
        bool                                                                            MacSetupDrawingPort() ;
        bool                                                                            MacSetupFocusClientPort() ;
        bool                                                                            MacSetupDrawingClientPort() ;

-       
+*/     

        virtual bool                                            MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin )  ;
        virtual bool                                            MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin )  ;
 
        virtual void                                            MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) ;
        virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
        virtual bool                                            MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin )  ;
        virtual bool                                            MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin )  ;
 
        virtual void                                            MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) ;
        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 ; }
        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:
        bool                                                            MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
        static wxWindow*                                        s_lastMouseWindow ;
 private:


@@ -260,7 +277,7 @@ private:
 protected:
 
        MacWindowData*                          m_macWindowData ;
 protected:
 
        MacWindowData*                          m_macWindowData ;

-       static WindowRef                        s_macWindowInUpdate ;
+       RgnHandle                                       m_macUpdateRgn ;

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


@@ -322,6 +339,7 @@ wxWindow* wxFindWinFromMacWindow( WindowRef inWindow ) ;
 void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindow *win) ;
 void wxRemoveMacWindowAssociation(wxWindow *win) ;
 
 void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindow *win) ;
 void wxRemoveMacWindowAssociation(wxWindow *win) ;
 

+/*

 class wxMacFocusHelper
 {
 public :
 class wxMacFocusHelper
 {
 public :


@@ -334,6 +352,7 @@ private :
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;

+*/

 
 class wxMacDrawingHelper
 {
 
 class wxMacDrawingHelper
 {


@@ -348,7 +367,7 @@ private :
        PenState        m_savedPenState ;
        bool                    m_ok ;
 } ;
        PenState        m_savedPenState ;
        bool                    m_ok ;
 } ;

-
+/*

 class wxMacFocusClientHelper
 {
 public :
 class wxMacFocusClientHelper
 {
 public :


@@ -361,7 +380,7 @@ private :
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;

-
+*/

 class wxMacDrawingClientHelper
 {
 public :
 class wxMacDrawingClientHelper
 {
 public :