X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e766c8a9ad51ecf73e8f1641992f1007ee9e5e0a..91a64dfd31f2b144260556755a2d52ecbbb0a85f:/include/wx/mac/window.h?ds=sidebyside diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h index 9c449c2413..9a280522c9 100644 --- a/include/wx/mac/window.h +++ b/include/wx/mac/window.h @@ -16,12 +16,14 @@ #pragma interface "window.h" #endif +#include // --------------------------------------------------------------------------- // forward declarations // --------------------------------------------------------------------------- class WXDLLEXPORT wxButton; class WXDLLEXPORT wxScrollBar; +class WXDLLEXPORT wxTopLevelWindowMac; // --------------------------------------------------------------------------- // constants @@ -42,15 +44,6 @@ class WXDLLEXPORT wxWindowMac: public wxWindowBase friend class wxPaintDC; public: - typedef struct MacWindowData - { - SInt16 m_macWindowBackgroundTheme ; - WindowRef m_macWindow ; - ControlHandle m_macRootControl ; - wxWindowMac* m_macFocus ; - bool m_macHasReceivedFirstActivate ; - } MacWindowData ; - wxWindowMac() { Init(); } @@ -88,16 +81,14 @@ public: virtual void SetFocus(); 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 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, @@ -162,6 +153,8 @@ public: 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 ) ; @@ -179,6 +172,7 @@ public: // event handlers // -------------- void OnSetFocus(wxFocusEvent& event) ; + void OnNcPaint(wxNcPaintEvent& event); void OnEraseBackground(wxEraseEvent& event); void OnIdle(wxIdleEvent& event); void MacOnScroll(wxScrollEvent&event ) ; @@ -190,10 +184,6 @@ public: // 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); - wxWindowMac *FindItem(long id) const; wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const; @@ -220,34 +210,19 @@ public: bool IsUserEnabled() const { return IsEnabled(); } #endif // WXWIN_COMPATIBILITY - // Responds to colour changes: passes event on to children. - void OnSysColourChanged(wxSysColourChangedEvent& event); public : - 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 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 ) ; + virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ; + virtual void MacRedraw( WXHRGN updatergn , long time , bool erase) ; virtual bool MacCanFocus() const { return true ; } - 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 ) ; - WindowRef GetMacRootWindow() const ; - virtual ControlHandle MacGetContainerForEmbedding() ; + virtual void MacPaintBorders( int left , int top ) ; + WXWindow MacGetRootWindow() const ; + wxTopLevelWindowMac* MacGetTopLevelWindow() const ; + + virtual WXWidget MacGetContainerForEmbedding() ; virtual long MacGetLeftBorderSize() const ; virtual long MacGetRightBorderSize() const ; @@ -256,32 +231,27 @@ public : static long MacRemoveBordersFromStyle( long style ) ; virtual void MacSuperChangedPosition() ; + virtual void MacTopLevelWindowChangedPosition() ; virtual void MacSuperShown( bool show ) ; + virtual void MacSuperEnabled( bool enable ) ; bool MacIsReallyShown() const ; -/* - bool MacSetupFocusPort() ; - bool MacSetupDrawingPort() ; - bool MacSetupFocusClientPort() ; - bool MacSetupDrawingClientPort() ; -*/ - 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 , 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 ; } + 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) ; } static wxWindowMac* s_lastMouseWindow ; private: - virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ; protected: - MacWindowData* m_macWindowData ; - static WindowRef s_macWindowInUpdate ; - RgnHandle m_macUpdateRgn ; - bool m_macEraseOnRedraw ; - +// RgnHandle m_macUpdateRgn ; +// bool m_macEraseOnRedraw ; + wxBrush m_macBackgroundBrush ; + wxRegion m_macVisibleRegion ; int m_x ; int m_y ; int m_width ; @@ -318,6 +288,9 @@ protected: 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 @@ -336,67 +309,5 @@ private: DECLARE_EVENT_TABLE() }; -// associate mac windows with wx counterparts - -wxWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ; -void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindowMac *win) ; -void wxRemoveMacWindowAssociation(wxWindowMac *win) ; - -/* -class wxMacFocusHelper -{ -public : - wxMacFocusHelper( wxWindowMac * theWindow ) ; - ~wxMacFocusHelper() ; - bool Ok() { return m_ok ; } - -private : - GrafPtr m_formerPort ; - GrafPtr m_currentPort ; - bool m_ok ; -} ; -*/ - -class wxMacDrawingHelper -{ -public : - wxMacDrawingHelper( wxWindowMac * theWindow ) ; - ~wxMacDrawingHelper() ; - bool Ok() { return m_ok ; } - -private : - GrafPtr m_formerPort ; - GrafPtr m_currentPort ; - PenState m_savedPenState ; - bool m_ok ; -} ; -/* -class wxMacFocusClientHelper -{ -public : - wxMacFocusClientHelper( wxWindowMac * theWindow ) ; - ~wxMacFocusClientHelper() ; - bool Ok() { return m_ok ; } - -private : - GrafPtr m_formerPort ; - GrafPtr m_currentPort ; - bool m_ok ; -} ; -*/ -class wxMacDrawingClientHelper -{ -public : - wxMacDrawingClientHelper( wxWindowMac * theWindow ) ; - ~wxMacDrawingClientHelper() ; - bool Ok() { return m_ok ; } - -private : - GrafPtr m_formerPort ; - GrafPtr m_currentPort ; - PenState m_savedPenState ; - bool m_ok ; -} ; - #endif // _WX_WINDOW_H_