diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index ac32e35d32..75325852c8 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -54,81 +54,81 @@ public: long style = 0, const wxString& name = wxPanelNameStr ); - virtual void SendSizeEvent(int flags = 0); + virtual void SendSizeEvent(int flags = 0) wxOVERRIDE; // implement base class pure virtuals - virtual void SetLabel( const wxString& label ); - virtual wxString GetLabel() const; + virtual void SetLabel( const wxString& label ) wxOVERRIDE; + virtual wxString GetLabel() const wxOVERRIDE; - virtual void Raise(); - virtual void Lower(); + virtual void Raise() wxOVERRIDE; + virtual void Lower() wxOVERRIDE; - virtual bool Show( bool show = true ); + virtual bool Show( bool show = true ) wxOVERRIDE; virtual bool ShowWithEffect(wxShowEffect effect, - unsigned timeout = 0) + unsigned timeout = 0) wxOVERRIDE { return OSXShowWithEffect(true, effect, timeout); } virtual bool HideWithEffect(wxShowEffect effect, - unsigned timeout = 0) + unsigned timeout = 0) wxOVERRIDE { return OSXShowWithEffect(false, effect, timeout); } - virtual bool IsShownOnScreen() const; + virtual bool IsShownOnScreen() const wxOVERRIDE; - virtual void SetFocus(); + virtual void SetFocus() wxOVERRIDE; - virtual void WarpPointer( int x, int y ); + virtual void WarpPointer( int x, int y ) wxOVERRIDE; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = NULL ); + const wxRect *rect = NULL ) wxOVERRIDE; - virtual void Update() ; - virtual void ClearBackground(); + virtual void Update() wxOVERRIDE; + virtual void ClearBackground() wxOVERRIDE; - virtual bool SetCursor( const wxCursor &cursor ); - virtual bool SetFont( const wxFont &font ); - virtual bool SetBackgroundColour( const wxColour &colour ); - virtual bool SetForegroundColour( const wxColour &colour ); + virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetBackgroundStyle(wxBackgroundStyle style); + virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; + virtual int GetCharHeight() const wxOVERRIDE; + virtual int GetCharWidth() const wxOVERRIDE; public: virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ); - virtual void SetScrollPos( int orient, int pos, bool refresh = true ); - virtual int GetScrollPos( int orient ) const; - virtual int GetScrollThumb( int orient ) const; - virtual int GetScrollRange( int orient ) const; + int range, bool refresh = true ) wxOVERRIDE; + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE; + virtual int GetScrollPos( int orient ) const wxOVERRIDE; + virtual int GetScrollThumb( int orient ) const wxOVERRIDE; + virtual int GetScrollRange( int orient ) const wxOVERRIDE; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ); - virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true); - virtual bool IsScrollbarAlwaysShown(int orient) const + const wxRect* rect = NULL ) wxOVERRIDE; + virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true) wxOVERRIDE; + virtual bool IsScrollbarAlwaysShown(int orient) const wxOVERRIDE { return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown : m_vScrollBarAlwaysShown; } - virtual bool Reparent( wxWindowBase *newParent ); + virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON // hot keys (system wide accelerators) // ----------------------------------- - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); - virtual bool UnregisterHotKey(int hotkeyId); + virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE; + virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE; #endif // wxUSE_HOTKEY #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); + virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; #endif // Accept files for dragging - virtual void DragAcceptFiles( bool accept ); + virtual void DragAcceptFiles( bool accept ) wxOVERRIDE; // implementation from now on // -------------------------- @@ -144,11 +144,11 @@ public: // simple accessors // ---------------- - virtual WXWidget GetHandle() const; + virtual WXWidget GetHandle() const wxOVERRIDE; - virtual bool SetTransparent(wxByte alpha); - virtual bool CanSetTransparent(); - virtual wxByte GetTransparent() const ; + virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; + virtual bool CanSetTransparent() wxOVERRIDE; + virtual wxByte GetTransparent() const; // event handlers // -------------- @@ -157,17 +157,17 @@ public: void MacOnScroll( wxScrollEvent&event ); - virtual bool AcceptsFocus() const; + virtual bool AcceptsFocus() const wxOVERRIDE; - virtual bool IsDoubleBuffered() const { return true; } + virtual bool IsDoubleBuffered() const wxOVERRIDE { return true; } public: - static long MacRemoveBordersFromStyle( long style ) ; + static long MacRemoveBordersFromStyle( long style ); public: // For implementation purposes: // sometimes decorations make the client area smaller - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; wxWindowMac *FindItem(long id) const; wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; @@ -175,7 +175,7 @@ public: virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; // this should not be overridden in classes above wxWindowMac // because it is called from its destructor via DeleteChildren - virtual void RemoveChild( wxWindowBase *child ); + virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; virtual bool MacDoRedraw( long time ) ; virtual void MacPaintChildrenBorders(); @@ -236,7 +236,7 @@ public: virtual bool MacClipGrandChildren() const { return false ; } bool MacIsWindowScrollbar( const wxWindow* sb ) const { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; } - virtual bool IsClientAreaChild(const wxWindow *child) const + virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE { return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) && wxWindowBase::IsClientAreaChild(child); @@ -291,7 +291,7 @@ public: bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; } - double GetContentScaleFactor() const ; + double GetContentScaleFactor() const wxOVERRIDE; // internal response to size events virtual void MacOnInternalSize() {} @@ -346,40 +346,40 @@ protected: int *x, int *y, int *descent = NULL, int *externalLeading = NULL, - const wxFont *theFont = NULL ) const; + const wxFont *theFont = NULL ) const wxOVERRIDE; - virtual void DoEnable( bool enable ); + virtual void DoEnable( bool enable ) wxOVERRIDE; #if wxUSE_MENUS - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; #endif - virtual void DoFreeze(); - virtual void DoThaw(); + virtual void DoFreeze() wxOVERRIDE; + virtual void DoThaw() wxOVERRIDE; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const; - virtual void DoClientToScreen( int *x, int *y ) const; - virtual void DoScreenToClient( int *x, int *y ) const; - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetClientSize( int *width, int *height ) const; + virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE; + virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE; + virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); + virtual void DoCaptureMouse() wxOVERRIDE; + virtual void DoReleaseMouse() wxOVERRIDE; // 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 // themselves inside the given rectangle - virtual void DoMoveWindow( int x, int y, int width, int height ); - virtual void DoSetWindowVariant( wxWindowVariant variant ); + virtual void DoMoveWindow( int x, int y, int width, int height ) wxOVERRIDE; + virtual void DoSetWindowVariant( wxWindowVariant variant ) wxOVERRIDE; #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); + virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; #endif // common part of Show/HideWithEffect()