compilation warning (and possible bug) fix

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index ba8b50315f183f1d4ba1b95b9a4821e1e8345d5f..f4d36dd7cb54b7d434cbdbae943bcd0f1d3076dd 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        window.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        window.h

-// Purpose:     wxWindow class
+// Purpose:     wxWindowMac class

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -34,9 +34,9 @@ enum
     wxKEY_CTRL  = 2
 };
 
     wxKEY_CTRL  = 2
 };
 

-class WXDLLEXPORT wxWindow: public wxWindowBase
+class WXDLLEXPORT wxWindowMac: public wxWindowBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxWindow);
+  DECLARE_DYNAMIC_CLASS(wxWindowMac);

 
   friend class wxDC;
   friend class wxPaintDC;
 
   friend class wxDC;
   friend class wxPaintDC;


@@ -47,13 +47,14 @@ public:
                        SInt16                                                          m_macWindowBackgroundTheme ;
                        WindowRef                                                       m_macWindow ;
                        ControlHandle                                   m_macRootControl ;
                        SInt16                                                          m_macWindowBackgroundTheme ;
                        WindowRef                                                       m_macWindow ;
                        ControlHandle                                   m_macRootControl ;

-                       wxWindow*                                                       m_macFocus ;
+                       wxWindowMac*                                                    m_macFocus ;
+                       bool                                m_macHasReceivedFirstActivate ;

        } MacWindowData ;
        
        
        } MacWindowData ;
        
        

-    wxWindow() { Init(); }
+    wxWindowMac() { Init(); }

 
 

-    wxWindow(wxWindow *parent,
+    wxWindowMac(wxWindowMac *parent,

              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,


@@ -64,9 +65,9 @@ public:
         Create(parent, id, pos, size, style, name);
     }
 
         Create(parent, id, pos, size, style, name);
     }
 

-    virtual ~wxWindow();
+    virtual ~wxWindowMac();

 
 

-    bool Create(wxWindow *parent,
+    bool Create(wxWindowMac *parent,

                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,


@@ -86,7 +87,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();


@@ -134,7 +134,7 @@ public:
 
     // event handlers
         // Handle a control command
 
     // event handlers
         // Handle a control command

-    virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
+    virtual void OnCommand(wxWindowMac& win, wxCommandEvent& event);

 
         // Override to define new behaviour for default action (e.g. double
         // clicking on a listbox)
 
         // Override to define new behaviour for default action (e.g. double
         // clicking on a listbox)


@@ -154,15 +154,16 @@ public:
 
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?
 
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?

-    wxWindow* GetWindowChild1(wxWindowID id);
-    wxWindow* GetWindowChild(wxWindowID id);
+    wxWindowMac* GetWindowChild1(wxWindowID id);
+    wxWindowMac* GetWindowChild(wxWindowID id);

 
     // implementation from now on
     // --------------------------
 
        void MacClientToRootWindow( int *x , int *y ) const ;
        void MacRootWindowToClient( int *x , int *y ) const ;
 
     // implementation from now on
     // --------------------------
 
        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 +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 ) ;


@@ -192,8 +194,8 @@ public:
     // a toolbar that it manages itself).
     virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);
 
     // a toolbar that it manages itself).
     virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);
 

-    wxWindow *FindItem(long id) const;
-    wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const;
+    wxWindowMac *FindItem(long id) const;
+    wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const;

 
     // Make a Windows extended style from the given wxWindows window style
     static WXDWORD MakeExtendedStyle(long style,
 
     // Make a Windows extended style from the given wxWindows window style
     static WXDWORD MakeExtendedStyle(long style,


@@ -220,9 +222,13 @@ 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 :

-       static bool                                                     MacGetWindowFromPoint( const wxPoint &point , wxWindow** outWin ) ;
+       virtual void                                            MacCreateRealWindow( const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxString& name ) ;
+       static bool                                                     MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;

        virtual void                                            MacActivate( EventRecord *ev , bool inIsActivating ) ;
        virtual void                                            MacUpdate( EventRecord *ev ) ;
        virtual void                                            MacUpdateImmediately() ;
        virtual void                                            MacActivate( EventRecord *ev , bool inIsActivating ) ;
        virtual void                                            MacUpdate( EventRecord *ev ) ;
        virtual void                                            MacUpdateImmediately() ;


@@ -236,33 +242,46 @@ 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 ) ;

+       virtual void                                            MacPaintBorders() ;
+       // obsolete : only for link compatibility

        virtual void                                            MacPaint( wxPaintEvent &event ) ;
        virtual void                                            MacPaint( wxPaintEvent &event ) ;

-       WindowRef                                                               GetMacRootWindow() const  ;
+       WindowRef                                                       GetMacRootWindow() const  ;
+
+       virtual ControlHandle                           MacGetContainerForEmbedding() ;
+       
+       virtual long                                            MacGetLeftBorderSize() const ;
+       virtual long                                            MacGetRightBorderSize() const ;
+       virtual long                                            MacGetTopBorderSize() const ;
+       virtual long                                            MacGetBottomBorderSize() const ;

 
 

-       virtual ControlHandle   MacGetContainerForEmbedding() ;
+       static long                                                     MacRemoveBordersFromStyle( long style ) ;

        virtual void                                            MacSuperChangedPosition() ;
        virtual void                                            MacSuperChangedPosition() ;

+       virtual void                        MacTopLevelWindowChangedPosition() ;

        virtual void                                            MacSuperShown( bool show ) ;
        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 bool                                            MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
+       virtual bool                                            MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* 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                                            MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
+       virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) ;
+       virtual void                                            MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) ;

        MacWindowData*                                          MacGetWindowData() { return m_macWindowData ; }
        static WindowRef                                        MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
        bool                                                            MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
        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 ;
+       static wxWindowMac*                                     s_lastMouseWindow ;

 private:
 private:

-       virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
+       virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;

 protected:
 protected:

-

        MacWindowData*                          m_macWindowData ;
        static WindowRef                        s_macWindowInUpdate ;
        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 ;   


@@ -314,20 +333,21 @@ private:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    DECLARE_NO_COPY_CLASS(wxWindow);
+    DECLARE_NO_COPY_CLASS(wxWindowMac)

     DECLARE_EVENT_TABLE()
 };
 
 // associate mac windows with wx counterparts
 
     DECLARE_EVENT_TABLE()
 };
 
 // associate mac windows with wx counterparts
 

-wxWindow* wxFindWinFromMacWindow( WindowRef inWindow ) ;
-void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindow *win) ;
-void wxRemoveMacWindowAssociation(wxWindow *win) ;
+wxWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
+void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindowMac *win) ;
+void wxRemoveMacWindowAssociation(wxWindowMac *win) ;

 
 

+/*

 class wxMacFocusHelper
 {
 public :
 class wxMacFocusHelper
 {
 public :

-       wxMacFocusHelper( wxWindow * theWindow ) ;
+       wxMacFocusHelper( wxWindowMac * theWindow ) ;

        ~wxMacFocusHelper() ;
        bool Ok() { return m_ok ; }
 
        ~wxMacFocusHelper() ;
        bool Ok() { return m_ok ; }
 


@@ -336,11 +356,12 @@ private :
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;

+*/

 
 class wxMacDrawingHelper
 {
 public :
 
 class wxMacDrawingHelper
 {
 public :

-       wxMacDrawingHelper( wxWindow * theWindow ) ;
+       wxMacDrawingHelper( wxWindowMac * theWindow ) ;

        ~wxMacDrawingHelper() ;
        bool Ok() { return m_ok ; }
 
        ~wxMacDrawingHelper() ;
        bool Ok() { return m_ok ; }
 


@@ -350,11 +371,11 @@ private :
        PenState        m_savedPenState ;
        bool                    m_ok ;
 } ;
        PenState        m_savedPenState ;
        bool                    m_ok ;
 } ;

-
+/*

 class wxMacFocusClientHelper
 {
 public :
 class wxMacFocusClientHelper
 {
 public :

-       wxMacFocusClientHelper( wxWindow * theWindow ) ;
+       wxMacFocusClientHelper( wxWindowMac * theWindow ) ;

        ~wxMacFocusClientHelper() ;
        bool Ok() { return m_ok ; }
 
        ~wxMacFocusClientHelper() ;
        bool Ok() { return m_ok ; }
 


@@ -363,11 +384,11 @@ private :
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;
        GrafPtr         m_currentPort ;
        bool                    m_ok ;
 } ;

-
+*/

 class wxMacDrawingClientHelper
 {
 public :
 class wxMacDrawingClientHelper
 {
 public :

-       wxMacDrawingClientHelper( wxWindow * theWindow ) ;
+       wxMacDrawingClientHelper( wxWindowMac * theWindow ) ;

        ~wxMacDrawingClientHelper() ;
        bool Ok() { return m_ok ; }
 
        ~wxMacDrawingClientHelper() ;
        bool Ok() { return m_ok ; }