compilation fixes after the last commit

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index c7c6bd43b06f2c309fd6a006e3a52045fa5ea876..9a280522c9a4cb6f9c19e1e963699e2931d9da91 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


@@ -16,12 +16,14 @@
 #pragma interface "window.h"
 #endif
 
 #pragma interface "window.h"
 #endif
 

+#include <wx/brush.h>

 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxScrollBar;
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxScrollBar;

+class WXDLLEXPORT wxTopLevelWindowMac;

 
 // ---------------------------------------------------------------------------
 // constants
 
 // ---------------------------------------------------------------------------
 // constants


@@ -34,26 +36,18 @@ 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;
 
 public:
 
   friend class wxDC;
   friend class wxPaintDC;
 
 public:

-       typedef struct MacWindowData
-       {
-                       SInt16                                                          m_macWindowBackgroundTheme ;
-                       WindowRef                                                       m_macWindow ;
-                       ControlHandle                                   m_macRootControl ;
-                       wxWindow*                                                       m_macFocus ;
-       } 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 +58,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,18 +80,15 @@ public:
 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 

-

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

-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();

 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Clear();
 
     virtual bool SetCursor( const wxCursor &cursor );
 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Clear();
 
     virtual bool SetCursor( const wxCursor &cursor );

-    virtual bool SetFont( const wxFont &font );
-
+    virtual bool SetFont(const wxFont& font)
+           { return wxWindowBase::SetFont(font); }

     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,


@@ -134,7 +125,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 +145,18 @@ 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 ;

-
+       void MacWindowToRootWindow( int *x , int *y ) const ;
+       void MacRootWindowToWindow( int *x , int *y ) const ;
+       
+       virtual wxString MacGetToolTipString( wxPoint &where ) ;

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


@@ -177,6 +171,8 @@ public:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

+       void OnSetFocus(wxFocusEvent& event) ;
+    void OnNcPaint(wxNcPaintEvent& 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 ) ;


@@ -188,12 +184,8 @@ public:
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;
 
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;
 

-    // Makes an adjustment to the window position (for example, a frame that has
-    // 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,


@@ -218,50 +210,48 @@ public:
     bool IsUserEnabled() const { return IsEnabled(); }
 #endif // WXWIN_COMPATIBILITY
 
     bool IsUserEnabled() const { return IsEnabled(); }
 #endif // WXWIN_COMPATIBILITY
 

-    // 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                                            MacActivate( EventRecord *ev , bool inIsActivating ) ;
-       virtual void                                            MacUpdate( EventRecord *ev ) ;
-       virtual void                                            MacUpdateImmediately() ;
-       virtual void                                            MacRedraw( RgnHandle updatergn , long time) ;
-       virtual void                                            MacMouseDown( EventRecord *ev , short windowPart ) ;
-       virtual void                                            MacMouseUp( EventRecord *ev , short windowPart ) ;
-       virtual void                                            MacMouseMoved( EventRecord *ev , short windowPart ) ;
-       virtual void                                            MacKeyDown( EventRecord *ev ) ;
+       static bool                                                     MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;
+       virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
+       virtual void                                            MacRedraw( WXHRGN updatergn , long time , bool erase) ;

        virtual bool                                            MacCanFocus() const { return true ; }
 
        virtual bool                                            MacCanFocus() const { return true ; }
 

-       virtual void                                            MacFireMouseEvent( EventRecord *ev ) ;

        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;

-       virtual void                                            MacEraseBackground( Rect *rect ) ;
-       WindowRef                                                               GetMacRootWindow() const  ;

 
 

-       virtual ControlHandle   MacGetContainerForEmbedding() ;
-       virtual void                                            MacSuperChangedPosition() ;
+       virtual void                                            MacPaintBorders( int left , int top ) ;
+       WXWindow                                                    MacGetRootWindow() const  ;
+       wxTopLevelWindowMac*                MacGetTopLevelWindow() const ;

 
 

-       bool                                                                            MacSetupFocusPort() ;
-       bool                                                                            MacSetupDrawingPort() ;
-       bool                                                                            MacSetupFocusClientPort() ;
-       bool                                                                            MacSetupDrawingClientPort() ;
+       virtual WXWidget                                    MacGetContainerForEmbedding() ;

        
        

-       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 long                                            MacGetLeftBorderSize() const ;
+       virtual long                                            MacGetRightBorderSize() const ;
+       virtual long                                            MacGetTopBorderSize() const ;
+       virtual long                                            MacGetBottomBorderSize() const ;

 
 

-       virtual void                                            MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) ;
-       virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
-       MacWindowData*                                          MacGetWindowData() { return m_macWindowData ; }
-       static WindowRef                                        MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
+       static long                                                     MacRemoveBordersFromStyle( long style ) ;
+       virtual void                                            MacSuperChangedPosition() ;
+       virtual void                        MacTopLevelWindowChangedPosition() ;
+       virtual void                                            MacSuperShown( bool show ) ;
+       virtual void                        MacSuperEnabled( bool enable ) ;
+       bool                                                            MacIsReallyShown() const ;
+       virtual void                        Update() ;
+       // for compatibility
+       void                                MacUpdateImmediately() { Update() ; }
+       
+//     virtual bool                                            MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
+//     virtual void                                            MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
+//     virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) ;
+       const wxBrush&                      MacGetBackgroundBrush() ;
+    const wxRegion&                     MacGetVisibleRegion() ;

        bool                                                            MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
        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 ) ;

 protected:
 protected:

-
-       MacWindowData*                          m_macWindowData ;
-       static WindowRef                        s_macWindowInUpdate ;
-
+//     RgnHandle                                       m_macUpdateRgn ;
+//     bool                                            m_macEraseOnRedraw ;
+    wxBrush                                 m_macBackgroundBrush ;
+    wxRegion                                m_macVisibleRegion ;

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


@@ -298,6 +288,9 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 

+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+

     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange


@@ -312,69 +305,9 @@ 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()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-// associate mac windows with wx counterparts
-
-wxWindow* wxFindWinFromMacWindow( WindowRef inWindow ) ;
-void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindow *win) ;
-void wxRemoveMacWindowAssociation(wxWindow *win) ;
-
-class wxMacFocusHelper
-{
-public :
-       wxMacFocusHelper( wxWindow * theWindow ) ;
-       ~wxMacFocusHelper() ;
-       bool Ok() { return m_ok ; }
-
-private :
-       GrafPtr         m_formerPort ;
-       GrafPtr         m_currentPort ;
-       bool                    m_ok ;
-} ;
-
-class wxMacDrawingHelper
-{
-public :
-       wxMacDrawingHelper( wxWindow * theWindow ) ;
-       ~wxMacDrawingHelper() ;
-       bool Ok() { return m_ok ; }
-
-private :
-       GrafPtr         m_formerPort ;
-       GrafPtr         m_currentPort ;
-       PenState        m_savedPenState ;
-       bool                    m_ok ;
-} ;
-
-class wxMacFocusClientHelper
-{
-public :
-       wxMacFocusClientHelper( wxWindow * theWindow ) ;
-       ~wxMacFocusClientHelper() ;
-       bool Ok() { return m_ok ; }
-
-private :
-       GrafPtr         m_formerPort ;
-       GrafPtr         m_currentPort ;
-       bool                    m_ok ;
-} ;
-
-class wxMacDrawingClientHelper
-{
-public :
-       wxMacDrawingClientHelper( wxWindow * theWindow ) ;
-       ~wxMacDrawingClientHelper() ;
-       bool Ok() { return m_ok ; }
-
-private :
-       GrafPtr         m_formerPort ;
-       GrafPtr         m_currentPort ;
-       PenState        m_savedPenState ;
-       bool                    m_ok ;
-} ;
-

 #endif
     // _WX_WINDOW_H_
 #endif
     // _WX_WINDOW_H_