diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index e625a43903..c9773f44fb 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -95,23 +95,23 @@ public: ~wxAnimationCtrl(); public: - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual void Stop(); - virtual bool Play() + virtual void Stop() wxOVERRIDE; + virtual bool Play() wxOVERRIDE { return Play(true /* looped */); } - virtual bool IsPlaying() const + virtual bool IsPlaying() const wxOVERRIDE { return m_isPlaying; } - void SetAnimation(const wxAnimation &animation); - wxAnimation GetAnimation() const + void SetAnimation(const wxAnimation &animation) wxOVERRIDE; + wxAnimation GetAnimation() const wxOVERRIDE { return m_animation; } - virtual void SetInactiveBitmap(const wxBitmap &bmp); + virtual void SetInactiveBitmap(const wxBitmap &bmp) wxOVERRIDE; // override base class method - virtual bool SetBackgroundColour(const wxColour& col); + virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; public: // event handlers @@ -153,8 +153,8 @@ protected: // internal utilities bool RebuildBackingStoreUpToFrame(unsigned int); void DrawFrame(wxDC &dc, unsigned int); - virtual void DisplayStaticImage(); - virtual wxSize DoGetBestSize() const; + virtual void DisplayStaticImage() wxOVERRIDE; + virtual wxSize DoGetBestSize() const wxOVERRIDE; protected: unsigned int m_currentFrame; // Current frame diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h index 1b246d3220..4630a29a72 100644 --- a/include/wx/generic/bmpcbox.h +++ b/include/wx/generic/bmpcbox.h @@ -98,30 +98,30 @@ public: unsigned int pos, wxClientData *clientData); // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); - virtual bool SetFont(const wxFont& font); + virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) wxOVERRIDE; protected: - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const; - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const; - virtual wxCoord OnMeasureItem(size_t item) const; - virtual wxCoord OnMeasureItemWidth(size_t item) const; + virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE; + virtual wxCoord OnMeasureItem(size_t item) const wxOVERRIDE; + virtual wxCoord OnMeasureItemWidth(size_t item) const wxOVERRIDE; // Event handlers void OnSize(wxSizeEvent& event); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxItemContainer* GetItemContainer() { return this; } - virtual wxWindow* GetControl() { return this; } + virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; } + virtual wxWindow* GetControl() wxOVERRIDE { return this; } // wxItemContainer implementation virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + void **clientData, wxClientDataType type) wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; private: bool m_inResize; diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h index c0e9365eb5..7b14cc1b0e 100644 --- a/include/wx/generic/collpaneg.h +++ b/include/wx/generic/collpaneg.h @@ -53,16 +53,16 @@ public: const wxString& name = wxCollapsiblePaneNameStr); // public wxCollapsiblePane API - virtual void Collapse(bool collapse = true); - virtual void SetLabel(const wxString &label); + virtual void Collapse(bool collapse = true) wxOVERRIDE; + virtual void SetLabel(const wxString &label) wxOVERRIDE; - virtual bool IsCollapsed() const + virtual bool IsCollapsed() const wxOVERRIDE { return m_pPane==NULL || !m_pPane->IsShown(); } - virtual wxWindow *GetPane() const + virtual wxWindow *GetPane() const wxOVERRIDE { return m_pPane; } - virtual wxString GetLabel() const; + virtual wxString GetLabel() const wxOVERRIDE; - virtual bool Layout(); + virtual bool Layout() wxOVERRIDE; // for the generic collapsible pane only: @@ -74,7 +74,7 @@ public: protected: // overridden methods - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; int GetBorder() const; diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 086ce5b25b..b6bfa86143 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -38,7 +38,7 @@ public: wxColourData &GetColourData() { return m_colourData; } - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; // Internal functions void OnMouseEvent(wxMouseEvent& event); diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index cd614daeee..61a4ad18c9 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -82,7 +82,7 @@ private: void OnFocus(wxFocusEvent& event); #ifdef __WXOSX_COCOA__ - virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { } + virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) wxOVERRIDE { } #endif wxComboCtrl* m_combo; diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 9d6569f23b..85038afe23 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -54,12 +54,12 @@ public: const wxString& name = wxDirDialogNameStr); //// Accessors - void SetPath(const wxString& path); - wxString GetPath() const; + void SetPath(const wxString& path) wxOVERRIDE; + wxString GetPath() const wxOVERRIDE; //// Overrides - virtual int ShowModal(); - virtual void EndModal(int retCode); + virtual int ShowModal() wxOVERRIDE; + virtual void EndModal(int retCode) wxOVERRIDE; // this one is specific to wxGenericDirDialog wxTextCtrl* GetInputCtrl() const { return m_input; } diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index dc335927af..6c00f2020f 100644 --- a/include/wx/generic/filedlgg.h +++ b/include/wx/generic/filedlgg.h @@ -60,39 +60,39 @@ public: virtual ~wxGenericFileDialog(); - virtual void SetDirectory(const wxString& dir) + virtual void SetDirectory(const wxString& dir) wxOVERRIDE { m_filectrl->SetDirectory(dir); } - virtual void SetFilename(const wxString& name) + virtual void SetFilename(const wxString& name) wxOVERRIDE { m_filectrl->SetFilename(name); } - virtual void SetMessage(const wxString& message) { SetTitle(message); } - virtual void SetPath(const wxString& path) + virtual void SetMessage(const wxString& message) wxOVERRIDE { SetTitle(message); } + virtual void SetPath(const wxString& path) wxOVERRIDE { m_filectrl->SetPath(path); } - virtual void SetFilterIndex(int filterIndex) + virtual void SetFilterIndex(int filterIndex) wxOVERRIDE { m_filectrl->SetFilterIndex(filterIndex); } - virtual void SetWildcard(const wxString& wildCard) + virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE { m_filectrl->SetWildcard(wildCard); } - virtual wxString GetPath() const + virtual wxString GetPath() const wxOVERRIDE { return m_filectrl->GetPath(); } - virtual void GetPaths(wxArrayString& paths) const + virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE { m_filectrl->GetPaths(paths); } - virtual wxString GetDirectory() const + virtual wxString GetDirectory() const wxOVERRIDE { return m_filectrl->GetDirectory(); } - virtual wxString GetFilename() const + virtual wxString GetFilename() const wxOVERRIDE { return m_filectrl->GetFilename(); } - virtual void GetFilenames(wxArrayString& files) const + virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE { m_filectrl->GetFilenames(files); } - virtual wxString GetWildcard() const + virtual wxString GetWildcard() const wxOVERRIDE { return m_filectrl->GetWildcard(); } - virtual int GetFilterIndex() const + virtual int GetFilterIndex() const wxOVERRIDE { return m_filectrl->GetFilterIndex(); } - virtual bool SupportsExtraControl() const { return true; } + virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } // implementation only from now on // ------------------------------- - virtual int ShowModal(); - virtual bool Show( bool show = true ); + virtual int ShowModal() wxOVERRIDE; + virtual bool Show( bool show = true ) wxOVERRIDE; void OnList( wxCommandEvent &event ); void OnReport( wxCommandEvent &event ); diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index 7116be77d9..4d01c899e4 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -45,7 +45,7 @@ public: : wxFontDialogBase(parent, data) { Init(); } virtual ~wxGenericFontDialog(); - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; // Internal functions void OnCloseWindow(wxCloseEvent& event); @@ -61,7 +61,7 @@ public: protected: - virtual bool DoCreate(wxWindow *parent); + virtual bool DoCreate(wxWindow *parent) wxOVERRIDE; private: diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 0f09abd5d7..b8c1c73a22 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -64,27 +64,27 @@ public: // T GetMin() const // T GetMax() const // T GetIncrement() const - virtual bool GetSnapToTicks() const { return m_snap_to_ticks; } + virtual bool GetSnapToTicks() const wxOVERRIDE { return m_snap_to_ticks; } // unsigned GetDigits() const - wxSpinCtrlDouble only // operations - virtual void SetValue(const wxString& text); + virtual void SetValue(const wxString& text) wxOVERRIDE; // void SetValue(T val) // void SetRange(T minVal, T maxVal) // void SetIncrement(T inc) - virtual void SetSnapToTicks(bool snap_to_ticks); + virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE; // void SetDigits(unsigned digits) - wxSpinCtrlDouble only // Select text in the textctrl - void SetSelection(long from, long to); + void SetSelection(long from, long to) wxOVERRIDE; // implementation from now on // forward these functions to all subcontrols - virtual bool Enable(bool enable = true); - virtual bool Show(bool show = true); + virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour); + virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; // get the subcontrols wxTextCtrl *GetText() const { return m_textCtrl; } @@ -98,16 +98,16 @@ public: // this window itself is used only as a container for its sub windows so it // shouldn't accept the focus at all and any attempts to explicitly set // focus to it should give focus to its text constol part - virtual bool AcceptsFocus() const { return false; } - virtual void SetFocus(); + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual void SetFocus() wxOVERRIDE; friend class wxSpinCtrlTextGeneric; protected: // override the base class virtuals involved into geometry calculations - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - virtual void DoMoveWindow(int x, int y, int width, int height); + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; #ifdef __WXMSW__ // and, for MSW, enabling this window itself @@ -165,7 +165,7 @@ private: void Init(); // Implement pure virtual function inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const; + virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; wxDECLARE_EVENT_TABLE(); }; diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index f864be424a..d45cf54eb7 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -217,7 +217,7 @@ public: virtual void SizeWindows(); #ifdef __WXMAC__ - virtual bool MacClipGrandChildren() const { return true ; } + virtual bool MacClipGrandChildren() const wxOVERRIDE { return true ; } #endif // Sets the sash size: this doesn't do anything and shouldn't be used at diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 63c366e481..cfc210470e 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -87,9 +87,9 @@ public: int GetScrollPos(); // don't hide base class virtuals - virtual void SetScrollPos( int orient, int pos, bool refresh = true ) + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE { return wxControl::SetScrollPos(orient, pos, refresh); } - virtual int GetScrollPos( int orient ) const + virtual int GetScrollPos( int orient ) const wxOVERRIDE { return wxControl::GetScrollPos(orient); } //we need to resize the webview when the control size changes @@ -98,7 +98,7 @@ public: void OnMouseEvents(wxMouseEvent &event); protected: wxDECLARE_EVENT_TABLE(); - void MacVisibilityChanged(); + void MacVisibilityChanged() wxOVERRIDE; private: wxWindow *m_parent; diff --git a/include/wx/osx/anybutton.h b/include/wx/osx/anybutton.h index f86b03ef70..31b579a440 100644 --- a/include/wx/osx/anybutton.h +++ b/include/wx/osx/anybutton.h @@ -18,19 +18,19 @@ public: static wxSize GetDefaultSize(); - virtual void SetLabel(const wxString& label); + virtual void SetLabel(const wxString& label) wxOVERRIDE; protected: - virtual wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const wxOVERRIDE; void OnEnterWindow( wxMouseEvent& event); void OnLeaveWindow( wxMouseEvent& event); - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); + virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE; + virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; - virtual void DoSetBitmapMargins(int x, int y) + virtual void DoSetBitmapMargins(int x, int y) wxOVERRIDE { m_marginX = x; m_marginY = y; @@ -38,7 +38,7 @@ protected: } #if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup); + virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; #endif // wxUSE_MARKUP && wxOSX_USE_COCOA diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h index 66c98e9d0e..0ee149a6fd 100644 --- a/include/wx/osx/app.h +++ b/include/wx/osx/app.h @@ -38,21 +38,21 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase wxApp(); virtual ~wxApp(); - virtual void WakeUpIdle(); + virtual void WakeUpIdle() wxOVERRIDE; - virtual void SetPrintMode(int mode) { m_printMode = mode; } + virtual void SetPrintMode(int mode) wxOVERRIDE { m_printMode = mode; } virtual int GetPrintMode() const { return m_printMode; } // calling OnInit with an auto-release pool ready ... - virtual bool CallOnInit(); + virtual bool CallOnInit() wxOVERRIDE; #if wxUSE_GUI // setting up all MacOS Specific Event-Handlers etc - virtual bool OnInitGui(); + virtual bool OnInitGui() wxOVERRIDE; #endif // wxUSE_GUI - virtual int OnRun(); + virtual int OnRun() wxOVERRIDE; - virtual bool ProcessIdle(); + virtual bool ProcessIdle() wxOVERRIDE; // implementation only void OnIdle(wxIdleEvent& event); @@ -67,8 +67,8 @@ public: static bool sm_isEmbedded; // Implementation - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); + virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; + virtual void CleanUp() wxOVERRIDE; // the installed application event handler WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h index 334e2ffdb4..3039639a54 100644 --- a/include/wx/osx/checklst.h +++ b/include/wx/osx/checklst.h @@ -64,19 +64,19 @@ public: const wxString& name = wxListBoxNameStr); // items may be checked - bool IsChecked(unsigned int uiIndex) const; - void Check(unsigned int uiIndex, bool bCheck = true); + bool IsChecked(unsigned int uiIndex) const wxOVERRIDE; + void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE; // data callbacks - virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); + virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; + virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; protected: // override all methods which add/delete items to update m_checks array as // well - virtual void OnItemInserted(unsigned int pos); - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual void OnItemInserted(unsigned int pos) wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; // the array containing the checked status of the items wxArrayInt m_checks; diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 60c7924787..b952b40d58 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -200,74 +200,74 @@ public : virtual ~wxNonOwnedWindowCocoaImpl(); - virtual void WillBeDestroyed() ; + virtual void WillBeDestroyed() wxOVERRIDE; void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name ) ; + long style, long extraStyle, const wxString& name ) wxOVERRIDE; void Create( wxWindow* parent, WXWindow nativeWindow ); - WXWindow GetWXWindow() const; - void Raise(); - void Lower(); - bool Show(bool show); + WXWindow GetWXWindow() const wxOVERRIDE; + void Raise() wxOVERRIDE; + void Lower() wxOVERRIDE; + bool Show(bool show) wxOVERRIDE; virtual bool ShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout); + unsigned timeout) wxOVERRIDE; - void Update(); - bool SetTransparent(wxByte alpha); - bool SetBackgroundColour(const wxColour& col ); - void SetExtraStyle( long exStyle ); - void SetWindowStyleFlag( long style ); - bool SetBackgroundStyle(wxBackgroundStyle style); - bool CanSetTransparent(); + void Update() wxOVERRIDE; + bool SetTransparent(wxByte alpha) wxOVERRIDE; + bool SetBackgroundColour(const wxColour& col ) wxOVERRIDE; + void SetExtraStyle( long exStyle ) wxOVERRIDE; + void SetWindowStyleFlag( long style ) wxOVERRIDE; + bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; + bool CanSetTransparent() wxOVERRIDE; - void MoveWindow(int x, int y, int width, int height); - void GetPosition( int &x, int &y ) const; - void GetSize( int &width, int &height ) const; + void MoveWindow(int x, int y, int width, int height) wxOVERRIDE; + void GetPosition( int &x, int &y ) const wxOVERRIDE; + void GetSize( int &width, int &height ) const wxOVERRIDE; - void GetContentArea( int &left , int &top , int &width , int &height ) const; - bool SetShape(const wxRegion& region); + void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE; + bool SetShape(const wxRegion& region) wxOVERRIDE; - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; + virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE; virtual bool EnableCloseButton(bool enable) wxOVERRIDE; virtual bool EnableMaximizeButton(bool enable) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable) wxOVERRIDE; - virtual bool IsMaximized() const; + virtual bool IsMaximized() const wxOVERRIDE; - virtual bool IsIconized() const; + virtual bool IsIconized() const wxOVERRIDE; - virtual void Iconize( bool iconize ); + virtual void Iconize( bool iconize ) wxOVERRIDE; - virtual void Maximize(bool maximize); + virtual void Maximize(bool maximize) wxOVERRIDE; - virtual bool IsFullScreen() const; + virtual bool IsFullScreen() const wxOVERRIDE; bool EnableFullScreenView(bool enable) wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style); + virtual bool ShowFullScreen(bool show, long style) wxOVERRIDE; - virtual void ShowWithoutActivating(); + virtual void ShowWithoutActivating() wxOVERRIDE; - virtual void RequestUserAttention(int flags); + virtual void RequestUserAttention(int flags) wxOVERRIDE; - virtual void ScreenToWindow( int *x, int *y ); + virtual void ScreenToWindow( int *x, int *y ) wxOVERRIDE; - virtual void WindowToScreen( int *x, int *y ); + virtual void WindowToScreen( int *x, int *y ) wxOVERRIDE; - virtual bool IsActive(); + virtual bool IsActive() wxOVERRIDE; - virtual void SetModified(bool modified); - virtual bool IsModified() const; + virtual void SetModified(bool modified) wxOVERRIDE; + virtual bool IsModified() const wxOVERRIDE; - virtual void SetRepresentedFilename(const wxString& filename); + virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } - CGWindowLevel GetWindowLevel() const { return m_macWindowLevel; } - void RestoreWindowLevel(); + CGWindowLevel GetWindowLevel() const wxOVERRIDE { return m_macWindowLevel; } + void RestoreWindowLevel() wxOVERRIDE; static WX_NSResponder GetNextFirstResponder() ; static WX_NSResponder GetFormerFirstResponder() ; diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h index d9af0a3384..2f7261cc1f 100644 --- a/include/wx/osx/dataview.h +++ b/include/wx/osx/dataview.h @@ -155,39 +155,39 @@ public: } // inherited methods from wxDataViewCtrlBase: - virtual bool AssociateModel(wxDataViewModel* model); + virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE; - virtual bool AppendColumn (wxDataViewColumn* columnPtr); - virtual bool ClearColumns (); - virtual bool DeleteColumn (wxDataViewColumn* columnPtr); - virtual wxDataViewColumn* GetColumn (unsigned int pos) const; - virtual unsigned int GetColumnCount () const; - virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const; - virtual wxDataViewColumn* GetSortingColumn () const; - virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col); - virtual bool PrependColumn (wxDataViewColumn* columnPtr); + virtual bool AppendColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; + virtual bool ClearColumns () wxOVERRIDE; + virtual bool DeleteColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; + virtual wxDataViewColumn* GetColumn (unsigned int pos) const wxOVERRIDE; + virtual unsigned int GetColumnCount () const wxOVERRIDE; + virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const wxOVERRIDE; + virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE; + virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col) wxOVERRIDE; + virtual bool PrependColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual void Collapse( const wxDataViewItem& item); - virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL); - virtual void Expand(const wxDataViewItem& item); - virtual bool IsExpanded(const wxDataViewItem & item) const; + virtual void Collapse( const wxDataViewItem& item) wxOVERRIDE; + virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL) wxOVERRIDE; + virtual void Expand(const wxDataViewItem& item) wxOVERRIDE; + virtual bool IsExpanded(const wxDataViewItem & item) const wxOVERRIDE; virtual unsigned int GetCount() const; virtual wxRect GetItemRect(const wxDataViewItem& item, - const wxDataViewColumn* columnPtr = NULL) const; - virtual int GetSelectedItemsCount() const; - virtual int GetSelections(wxDataViewItemArray& sel) const; + const wxDataViewColumn* columnPtr = NULL) const wxOVERRIDE; + virtual int GetSelectedItemsCount() const wxOVERRIDE; + virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE; - virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; + virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const wxOVERRIDE; - virtual bool IsSelected(const wxDataViewItem& item) const; + virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE; - virtual void SelectAll(); - virtual void Select(const wxDataViewItem& item); - virtual void SetSelections(const wxDataViewItemArray& sel); + virtual void SelectAll() wxOVERRIDE; + virtual void Select(const wxDataViewItem& item) wxOVERRIDE; + virtual void SetSelections(const wxDataViewItemArray& sel) wxOVERRIDE; - virtual void Unselect(const wxDataViewItem& item); - virtual void UnselectAll(); + virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE; + virtual void UnselectAll() wxOVERRIDE; // // implementation @@ -201,7 +201,7 @@ public: // finishes editing of custom items; if no custom item is currently edited the method does nothing void FinishCustomItemEditing(); - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; // returns the n-th pointer to a column; // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th @@ -256,9 +256,9 @@ public: m_Deleting = deleting; } - virtual wxDataViewColumn *GetCurrentColumn() const; + virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -268,10 +268,10 @@ public: protected: // inherited methods from wxDataViewCtrlBase - virtual void DoSetExpanderColumn(); - virtual void DoSetIndent(); + virtual void DoSetExpanderColumn() wxOVERRIDE; + virtual void DoSetIndent() wxOVERRIDE; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // event handling void OnSize(wxSizeEvent &event); @@ -281,8 +281,8 @@ private: // initializing of local variables: void Init(); - virtual wxDataViewItem DoGetCurrentItem() const; - virtual void DoSetCurrentItem(const wxDataViewItem& item); + virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; + virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; // // variables diff --git a/include/wx/osx/dvrenderer.h b/include/wx/osx/dvrenderer.h index ce7cec14e8..6ef28ed39e 100644 --- a/include/wx/osx/dvrenderer.h +++ b/include/wx/osx/dvrenderer.h @@ -31,31 +31,31 @@ public: // inherited methods from wxDataViewRendererBase // --------------------------------------------- - virtual int GetAlignment() const + virtual int GetAlignment() const wxOVERRIDE { return m_alignment; } - virtual wxDataViewCellMode GetMode() const + virtual wxDataViewCellMode GetMode() const wxOVERRIDE { return m_mode; } - virtual bool GetValue(wxVariant& value) const + virtual bool GetValue(wxVariant& value) const wxOVERRIDE { value = m_value; return true; } // NB: in Carbon this is always identical to the header alignment - virtual void SetAlignment(int align); - virtual void SetMode(wxDataViewCellMode mode); - virtual bool SetValue(const wxVariant& newValue) + virtual void SetAlignment(int align) wxOVERRIDE; + virtual void SetMode(wxDataViewCellMode mode) wxOVERRIDE; + virtual bool SetValue(const wxVariant& newValue) wxOVERRIDE { m_value = newValue; return true; } - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE); - virtual wxEllipsizeMode GetEllipsizeMode() const; + virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE; + virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE; // implementation // -------------- diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index 5727144eeb..14bab22241 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -48,10 +48,10 @@ public: // get the origin of the client area (which may be different from (0, 0) // if the frame has a toolbar) in client coordinates - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // override some more virtuals - virtual bool Enable(bool enable = true) ; + virtual bool Enable(bool enable = true) wxOVERRIDE; // event handlers void OnActivate(wxActivateEvent& event); @@ -61,9 +61,9 @@ public: #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = -1, - const wxString& name = wxToolBarNameStr); + const wxString& name = wxToolBarNameStr) wxOVERRIDE; - virtual void SetToolBar(wxToolBar *toolbar); + virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; #endif // wxUSE_TOOLBAR // Status bar @@ -71,7 +71,7 @@ public: virtual wxStatusBar* OnCreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); + const wxString& name = wxStatusLineNameStr) wxOVERRIDE; #endif // wxUSE_STATUSBAR // called by wxWindow whenever it gets focus @@ -81,32 +81,32 @@ public: void PositionBars(); // internal response to size events - virtual void MacOnInternalSize() { PositionBars(); } + virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); } protected: // common part of all ctors void Init(); #if wxUSE_TOOLBAR - virtual void PositionToolBar(); + virtual void PositionToolBar() wxOVERRIDE; #endif #if wxUSE_STATUSBAR - virtual void PositionStatusBar(); + virtual void PositionStatusBar() wxOVERRIDE; #endif // override base class virtuals - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int height); + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; #if wxUSE_MENUS - virtual void DetachMenuBar(); - virtual void AttachMenuBar(wxMenuBar *menubar); + virtual void DetachMenuBar() wxOVERRIDE; + virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; #endif // the last focused child: we restore focus to it on activation wxWindow *m_winLastFocused; - virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; + virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE; wxDECLARE_EVENT_TABLE(); wxDECLARE_DYNAMIC_CLASS(wxFrame); diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h index 3bc6e1c5ce..03c122412f 100644 --- a/include/wx/osx/glcanvas.h +++ b/include/wx/osx/glcanvas.h @@ -73,7 +73,7 @@ public: virtual ~wxGLCanvas(); // implement wxGLCanvasBase methods - virtual bool SwapBuffers(); + virtual bool SwapBuffers() wxOVERRIDE; // Mac-specific functions diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h index c717ee0521..cbcee7b539 100644 --- a/include/wx/osx/listbox.h +++ b/include/wx/osx/listbox.h @@ -91,24 +91,24 @@ public: virtual ~wxListBox(); // implement base class pure virtuals - virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); + virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; + virtual unsigned int GetCount() const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; // data callbacks virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - virtual bool IsSelected(int n) const; - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; + virtual bool IsSelected(int n) const wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; + virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; - virtual void EnsureVisible(int n); + virtual void EnsureVisible(int n) wxOVERRIDE; - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -127,27 +127,27 @@ protected: // at a certain line - which cannot be predetermined for sorted list data virtual void OnItemInserted(unsigned int pos); - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; // from wxItemContainer virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type); + void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; + virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; + virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; // from wxListBoxBase - virtual void DoSetSelection(int n, bool select); - virtual void DoSetFirstItem(int n); - virtual int DoListHitTest(const wxPoint& point) const; + virtual void DoSetSelection(int n, bool select) wxOVERRIDE; + virtual void DoSetFirstItem(int n) wxOVERRIDE; + virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; // free memory (common part of Clear() and dtor) // prevent collision with some BSD definitions of macro Free() void FreeData(); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; bool m_blockEvents; diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h index 8945cea51c..2bca063802 100644 --- a/include/wx/osx/mdi.h +++ b/include/wx/osx/mdi.h @@ -43,29 +43,29 @@ public: static bool IsTDI() { return false; } - virtual void AddChild(wxWindowBase *child); - virtual void RemoveChild(wxWindowBase *child); + virtual void AddChild(wxWindowBase *child) wxOVERRIDE; + virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; - virtual void ActivateNext() { /* TODO */ } - virtual void ActivatePrevious() { /* TODO */ } + virtual void ActivateNext() wxOVERRIDE { /* TODO */ } + virtual void ActivatePrevious() wxOVERRIDE { /* TODO */ } - virtual bool Show(bool show = true); + virtual bool Show(bool show = true) wxOVERRIDE; // Mac-specific implementation from now on // --------------------------------------- // Mac OS activate event - virtual void MacActivate(long timestamp, bool activating); + virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE; // wxWidgets activate event void OnActivate(wxActivateEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); - void SetMenuBar(wxMenuBar *menu_bar); + void SetMenuBar(wxMenuBar *menu_bar) wxOVERRIDE; // Get rect to be used to center top-level children - virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h); + virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) wxOVERRIDE; protected: // common part of all ctors diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h index e0e91b8e33..c8e706f080 100644 --- a/include/wx/osx/notebook.h +++ b/include/wx/osx/notebook.h @@ -57,44 +57,44 @@ public: // set the currently selected page, return the index of the previously // selected one (or wxNOT_FOUND on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } + int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } // changes selected page without sending events - int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } + int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; + bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; + wxString GetPageText(size_t nPage) const wxOVERRIDE; // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); + int GetPageImage(size_t nPage) const wxOVERRIDE; + bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; // control the appearance of the notebook pages // set the size (the same for all pages) - virtual void SetPageSize(const wxSize& size); + virtual void SetPageSize(const wxSize& size) wxOVERRIDE; // set the padding between tabs (in pixels) - virtual void SetPadding(const wxSize& padding); + virtual void SetPadding(const wxSize& padding) wxOVERRIDE; // sets the size of the tabs (assumes all tabs are the same size) - virtual void SetTabSize(const wxSize& sz); + virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; // hit test - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; // calculate size for wxNotebookSizer - wxSize CalcSizeFromPage(const wxSize& sizePage) const; - wxRect GetPageRect() const ; + wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; + wxRect GetPageRect() const wxOVERRIDE; // operations // ---------- // remove all pages - bool DeleteAllPages(); + bool DeleteAllPages() wxOVERRIDE; // the same as AddPage(), but adds it at the specified position bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = NO_IMAGE); + int imageId = NO_IMAGE) wxOVERRIDE; // callbacks // --------- @@ -106,20 +106,20 @@ public: // -------------- #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = true); - virtual bool DoPhase(int nPhase); + virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE; + virtual bool DoPhase(int nPhase) wxOVERRIDE; #endif // base class virtuals // ------------------- - virtual void Command(wxCommandEvent& event); + virtual void Command(wxCommandEvent& event) wxOVERRIDE; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; protected: - virtual wxNotebookPage *DoRemovePage(size_t page) ; + virtual wxNotebookPage *DoRemovePage(size_t page) wxOVERRIDE; // common part of all ctors void Init(); @@ -127,7 +127,7 @@ protected: void ChangePage(int nOldSel, int nSel); // change pages void MacSetupTabs(); - int DoSetSelection(size_t nPage, int flags = 0); + int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; // the icon indices wxArrayInt m_images; diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h index e340745f06..bbf61a7b37 100644 --- a/include/wx/osx/radiobox.h +++ b/include/wx/osx/radiobox.h @@ -54,32 +54,32 @@ public: const wxString& name = wxRadioBoxNameStr); // Enabling - virtual bool Enable(bool enable = true); - virtual bool Enable(unsigned int item, bool enable = true); - virtual bool IsItemEnabled(unsigned int item) const; + virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Enable(unsigned int item, bool enable = true) wxOVERRIDE; + virtual bool IsItemEnabled(unsigned int item) const wxOVERRIDE; // Showing - virtual bool Show(bool show = true); - virtual bool Show(unsigned int item, bool show = true); - virtual bool IsItemShown(unsigned int item) const; + virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(unsigned int item, bool show = true) wxOVERRIDE; + virtual bool IsItemShown(unsigned int item) const wxOVERRIDE; // Specific functions (in wxWidgets2 reference) - virtual void SetSelection(int item); - virtual int GetSelection() const; + virtual void SetSelection(int item) wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; - virtual unsigned int GetCount() const { return m_noItems; } + virtual unsigned int GetCount() const wxOVERRIDE { return m_noItems; } - virtual wxString GetString(unsigned int item) const; - virtual void SetString(unsigned int item, const wxString& label); + virtual wxString GetString(unsigned int item) const wxOVERRIDE; + virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE; - virtual wxString GetLabel() const; - virtual void SetLabel(const wxString& label) ; + virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) wxOVERRIDE; // protect native font of box - virtual bool SetFont( const wxFont &font ); + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; // Other external functions - void Command(wxCommandEvent& event); - void SetFocus(); + void Command(wxCommandEvent& event) wxOVERRIDE; + void SetFocus() wxOVERRIDE; // Other variable access functions int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } @@ -89,7 +89,7 @@ public: protected: // resolve ambiguity in base classes - virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); } wxRadioButton *m_radioButtonCycle; @@ -97,10 +97,10 @@ protected: int m_noRowsOrCols; // Internal functions - virtual wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; wxDECLARE_EVENT_TABLE(); }; diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h index 296c4b5b8b..fdfc105d97 100644 --- a/include/wx/osx/scrolbar.h +++ b/include/wx/osx/scrolbar.h @@ -36,14 +36,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr); - virtual int GetThumbPosition() const ; - virtual int GetThumbSize() const { return m_viewSize; } - virtual int GetPageSize() const { return m_pageSize; } - virtual int GetRange() const { return m_objectSize; } + virtual int GetThumbPosition() const wxOVERRIDE; + virtual int GetThumbSize() const wxOVERRIDE { return m_viewSize; } + virtual int GetPageSize() const wxOVERRIDE { return m_pageSize; } + virtual int GetRange() const wxOVERRIDE { return m_objectSize; } - virtual void SetThumbPosition(int viewStart); + virtual void SetThumbPosition(int viewStart) wxOVERRIDE; virtual void SetScrollbar(int position, int thumbSize, int range, - int pageSize, bool refresh = true); + int pageSize, bool refresh = true) wxOVERRIDE; // needed for RTTI void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } @@ -51,11 +51,11 @@ public: void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } // implementation only from now on - void Command(wxCommandEvent& event); - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; - virtual bool OSXHandleClicked( double timestampsec ); + void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; int m_pageSize; int m_viewSize; diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h index e0ce8eb438..fffde4d3ee 100644 --- a/include/wx/osx/slider.h +++ b/include/wx/osx/slider.h @@ -43,53 +43,53 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxSliderNameStr); - virtual int GetValue() const ; - virtual void SetValue(int); + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int) wxOVERRIDE; - void SetRange(int minValue, int maxValue); + void SetRange(int minValue, int maxValue) wxOVERRIDE; - int GetMin() const { return m_rangeMin; } - int GetMax() const { return m_rangeMax; } + int GetMin() const wxOVERRIDE { return m_rangeMin; } + int GetMax() const wxOVERRIDE { return m_rangeMax; } void SetMin(int minValue) { SetRange(minValue, m_rangeMax); } void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } // For trackbars only - int GetTickFreq() const { return m_tickFreq; } - void SetPageSize(int pageSize); - int GetPageSize() const ; - void ClearSel() ; - void ClearTicks() ; - void SetLineSize(int lineSize); - int GetLineSize() const ; - int GetSelEnd() const ; - int GetSelStart() const ; - void SetSelection(int minPos, int maxPos); - void SetThumbLength(int len) ; - int GetThumbLength() const ; - void SetTick(int tickPos) ; + int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } + void SetPageSize(int pageSize) wxOVERRIDE; + int GetPageSize() const wxOVERRIDE; + void ClearSel() wxOVERRIDE; + void ClearTicks() wxOVERRIDE; + void SetLineSize(int lineSize) wxOVERRIDE; + int GetLineSize() const wxOVERRIDE; + int GetSelEnd() const wxOVERRIDE; + int GetSelStart() const wxOVERRIDE; + void SetSelection(int minPos, int maxPos) wxOVERRIDE; + void SetThumbLength(int len) wxOVERRIDE; + int GetThumbLength() const wxOVERRIDE; + void SetTick(int tickPos) wxOVERRIDE; - void Command(wxCommandEvent& event); + void Command(wxCommandEvent& event) wxOVERRIDE; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; protected: // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq); + virtual void DoSetTickFreq(int freq) wxOVERRIDE; - virtual wxSize DoGetBestSize() const; - virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags); - virtual void DoMoveWindow(int x, int y, int w, int h); + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE; // set min/max size of the slider virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH); + int incW, int incH) wxOVERRIDE; // Common processing to invert slider values based on wxSL_INVERSE - virtual int ValueInvertOrNot(int value) const; + virtual int ValueInvertOrNot(int value) const wxOVERRIDE; wxStaticText* m_macMinimumStatic ; wxStaticText* m_macMaximumStatic ; diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h index abdddcdf5f..4a4d88af47 100644 --- a/include/wx/osx/srchctrl.h +++ b/include/wx/osx/srchctrl.h @@ -42,17 +42,17 @@ public: #if wxUSE_MENUS // get/set search button menu // -------------------------- - virtual void SetMenu( wxMenu* menu ); - virtual wxMenu* GetMenu(); + virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; + virtual wxMenu* GetMenu() wxOVERRIDE; #endif // wxUSE_MENUS // get/set search options // ---------------------- - virtual void ShowSearchButton( bool show ); - virtual bool IsSearchButtonVisible() const; + virtual void ShowSearchButton( bool show ) wxOVERRIDE; + virtual bool IsSearchButtonVisible() const wxOVERRIDE; - virtual void ShowCancelButton( bool show ); - virtual bool IsCancelButtonVisible() const; + virtual void ShowCancelButton( bool show ) wxOVERRIDE; + virtual bool IsCancelButtonVisible() const wxOVERRIDE; // TODO: In 2.9 these should probably be virtual, and declared in the base class... void SetDescriptiveText(const wxString& text); @@ -65,7 +65,7 @@ public: protected: - wxSize DoGetBestSize() const; + wxSize DoGetBestSize() const wxOVERRIDE; void Init(); diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h index 57f738118d..76d6bbaebd 100644 --- a/include/wx/osx/statusbr.h +++ b/include/wx/osx/statusbr.h @@ -27,13 +27,13 @@ public: const wxString& name = wxStatusBarNameStr); // Implementation - virtual void MacHiliteChanged(); + virtual void MacHiliteChanged() wxOVERRIDE; void OnPaint(wxPaintEvent& event); protected: - virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight); - virtual void DrawField(wxDC& dc, int i, int textHeight); - virtual void DoUpdateStatusText(int number = 0); + virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight) wxOVERRIDE; + virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE; + virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac); wxDECLARE_EVENT_TABLE(); diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index 439e93d000..31892a77c6 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -60,46 +60,46 @@ public: // accessors // --------- - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; + virtual int GetLineLength(long lineNo) const wxOVERRIDE; + virtual wxString GetLineText(long lineNo) const wxOVERRIDE; + virtual int GetNumberOfLines() const wxOVERRIDE; - virtual bool IsModified() const; + virtual bool IsModified() const wxOVERRIDE; // operations // ---------- // sets/clears the dirty flag - virtual void MarkDirty(); - virtual void DiscardEdits(); + virtual void MarkDirty() wxOVERRIDE; + virtual void DiscardEdits() wxOVERRIDE; // text control under some platforms supports the text styles: these // methods apply the given text style to the given selection or to // set/get the style which will be used for all appended text - virtual bool SetFont( const wxFont &font ); - virtual bool GetStyle(long position, wxTextAttr& style); - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - virtual bool SetDefaultStyle(const wxTextAttr& style); + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; + virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; // translate between the position (which is just an index into the textctrl // considering all its contents as a single strings) and (x, y) coordinates // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; + virtual long XYToPosition(long x, long y) const wxOVERRIDE; + virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - virtual void ShowPosition(long pos); + virtual void ShowPosition(long pos) wxOVERRIDE; // overrides so that we can send text updated events - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); + virtual void Copy() wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; // Implementation // -------------- - virtual void Command(wxCommandEvent& event); + virtual void Command(wxCommandEvent& event) wxOVERRIDE; - virtual bool AcceptsFocus() const; + virtual bool AcceptsFocus() const wxOVERRIDE; // callbacks void OnDropFiles(wxDropFilesEvent& event); @@ -124,22 +124,22 @@ public: void OnContextMenu(wxContextMenuEvent& event); - virtual bool MacSetupCursor( const wxPoint& pt ); + virtual bool MacSetupCursor( const wxPoint& pt ) wxOVERRIDE; - virtual void MacVisibilityChanged(); - virtual void MacSuperChangedPosition(); + virtual void MacVisibilityChanged() wxOVERRIDE; + virtual void MacSuperChangedPosition() wxOVERRIDE; virtual void MacCheckSpelling(bool check); protected: // common part of all ctors void Init(); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // flag is set to true when the user edits the controls contents bool m_dirty; - virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) + virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) wxOVERRIDE { // nothing to do here as the events are never generated when we change // the controls value programmatically anyhow diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h index 3efd810467..70a33f77a7 100644 --- a/include/wx/osx/toolbar.h +++ b/include/wx/osx/toolbar.h @@ -40,34 +40,34 @@ public: long style = wxTB_DEFAULT_STYLE, const wxString& name = wxToolBarNameStr); - virtual void SetWindowStyleFlag(long style); + virtual void SetWindowStyleFlag(long style) wxOVERRIDE; - virtual bool Destroy(); + virtual bool Destroy() wxOVERRIDE; // override/implement base class virtuals - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; #ifndef __WXOSX_IPHONE__ - virtual bool Show(bool show = true); - virtual bool IsShown() const; + virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool IsShown() const wxOVERRIDE; #endif - virtual bool Realize(); + virtual bool Realize() wxOVERRIDE; - virtual void SetToolBitmapSize(const wxSize& size); - virtual wxSize GetToolSize() const; + virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE; + virtual wxSize GetToolSize() const wxOVERRIDE; - virtual void SetRows(int nRows); + virtual void SetRows(int nRows) wxOVERRIDE; - virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); - virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); + virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; + virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; #ifndef __WXOSX_IPHONE__ // Add all the buttons - virtual wxString MacGetToolTipString( wxPoint &where ) ; + virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE; void OnPaint(wxPaintEvent& event) ; void OnMouse(wxMouseEvent& event) ; - virtual void MacSuperChangedPosition() ; + virtual void MacSuperChangedPosition() wxOVERRIDE; #endif #if wxOSX_USE_NATIVE_TOOLBAR @@ -88,9 +88,9 @@ public: wxItemKind kind = wxITEM_NORMAL, wxObject *clientData = NULL, const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString); + const wxString& longHelp = wxEmptyString) wxOVERRIDE; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); + const wxString& label) wxOVERRIDE; protected: // common part of all ctors @@ -98,21 +98,21 @@ protected: void DoLayout(); - void DoSetSize(int x, int y, int width, int height, int sizeFlags); + void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; #ifndef __WXOSX_IPHONE__ - virtual void DoGetSize(int *width, int *height) const; - virtual wxSize DoGetBestSize() const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const wxOVERRIDE; #endif #ifdef __WXOSX_COCOA__ - virtual void DoGetPosition(int*x, int *y) const; + virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE; #endif - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; wxDECLARE_EVENT_TABLE(); #if wxOSX_USE_NATIVE_TOOLBAR diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h index e82711a861..72f58c98a6 100644 --- a/include/wx/osx/toplevel.h +++ b/include/wx/osx/toplevel.h @@ -46,33 +46,33 @@ public: bool Create(wxWindow *parent, WXWindow nativeWindow); - virtual bool Destroy(); + virtual bool Destroy() wxOVERRIDE; - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // Attracts the users attention to this window if the application is // inactive (should be called when a background event occurs) - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void Restore(); + virtual void Maximize(bool maximize = true) wxOVERRIDE; + virtual bool IsMaximized() const wxOVERRIDE; + virtual void Iconize(bool iconize = true) wxOVERRIDE; + virtual bool IsIconized() const wxOVERRIDE; + virtual void Restore() wxOVERRIDE; - virtual bool IsActive(); + virtual bool IsActive() wxOVERRIDE; - virtual void ShowWithoutActivating(); + virtual void ShowWithoutActivating() wxOVERRIDE; bool EnableFullScreenView(bool enable = true) wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ; - virtual bool IsFullScreen() const ; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + virtual bool IsFullScreen() const wxOVERRIDE; // implementation from now on // -------------------------- - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; + virtual void SetTitle( const wxString& title) wxOVERRIDE; + virtual wxString GetTitle() const wxOVERRIDE; // EnableCloseButton(false) used to disable the "Close" // button on the title bar @@ -80,13 +80,13 @@ public: virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; - virtual void SetLabel(const wxString& label) { SetTitle( label ); } - virtual wxString GetLabel() const { return GetTitle(); } + virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } + virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } - virtual void OSXSetModified(bool modified); - virtual bool OSXIsModified() const; + virtual void OSXSetModified(bool modified) wxOVERRIDE; + virtual bool OSXIsModified() const wxOVERRIDE; - virtual void SetRepresentedFilename(const wxString& filename); + virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; // do *not* call this to iconize the frame, this is a private function! void OSXSetIconizeState(bool iconic); diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index c05f81702e..14b566966f 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -45,47 +45,47 @@ public: const wxString& strURL = wxWebViewDefaultURLStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr); + const wxString& name = wxWebViewNameStr) wxOVERRIDE; virtual ~wxWebViewWebKit(); - virtual bool CanGoBack() const; - virtual bool CanGoForward() const; - virtual void GoBack(); - virtual void GoForward(); - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT); - virtual void Stop(); - virtual wxString GetPageSource() const; - virtual wxString GetPageText() const; + virtual bool CanGoBack() const wxOVERRIDE; + virtual bool CanGoForward() const wxOVERRIDE; + virtual void GoBack() wxOVERRIDE; + virtual void GoForward() wxOVERRIDE; + virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; + virtual void Stop() wxOVERRIDE; + virtual wxString GetPageSource() const wxOVERRIDE; + virtual wxString GetPageText() const wxOVERRIDE; - virtual void Print(); + virtual void Print() wxOVERRIDE; - virtual void LoadURL(const wxString& url); - virtual wxString GetCurrentURL() const; - virtual wxString GetCurrentTitle() const; - virtual wxWebViewZoom GetZoom() const; - virtual void SetZoom(wxWebViewZoom zoom); + virtual void LoadURL(const wxString& url) wxOVERRIDE; + virtual wxString GetCurrentURL() const wxOVERRIDE; + virtual wxString GetCurrentTitle() const wxOVERRIDE; + virtual wxWebViewZoom GetZoom() const wxOVERRIDE; + virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE; - virtual void SetZoomType(wxWebViewZoomType zoomType); - virtual wxWebViewZoomType GetZoomType() const; - virtual bool CanSetZoomType(wxWebViewZoomType type) const; + virtual void SetZoomType(wxWebViewZoomType zoomType) wxOVERRIDE; + virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE; + virtual bool CanSetZoomType(wxWebViewZoomType type) const wxOVERRIDE; - virtual bool IsBusy() const { return m_busy; } + virtual bool IsBusy() const wxOVERRIDE { return m_busy; } //History functions - virtual void ClearHistory(); - virtual void EnableHistory(bool enable = true); - virtual wxVector > GetBackwardHistory(); - virtual wxVector > GetForwardHistory(); - virtual void LoadHistoryItem(wxSharedPtr item); + virtual void ClearHistory() wxOVERRIDE; + virtual void EnableHistory(bool enable = true) wxOVERRIDE; + virtual wxVector > GetBackwardHistory() wxOVERRIDE; + virtual wxVector > GetForwardHistory() wxOVERRIDE; + virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; //Undo / redo functionality - virtual bool CanUndo() const; - virtual bool CanRedo() const; - virtual void Undo(); - virtual void Redo(); + virtual bool CanUndo() const wxOVERRIDE; + virtual bool CanRedo() const wxOVERRIDE; + virtual void Undo() wxOVERRIDE; + virtual void Redo() wxOVERRIDE; //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) + virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE { wxUnusedVar(text); wxUnusedVar(flags); @@ -93,31 +93,31 @@ public: } //Clipboard functions - virtual bool CanCut() const { return true; } - virtual bool CanCopy() const { return true; } - virtual bool CanPaste() const { return true; } - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); + virtual bool CanCut() const wxOVERRIDE { return true; } + virtual bool CanCopy() const wxOVERRIDE { return true; } + virtual bool CanPaste() const wxOVERRIDE { return true; } + virtual void Cut() wxOVERRIDE; + virtual void Copy() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; //Editing functions - virtual void SetEditable(bool enable = true); - virtual bool IsEditable() const; + virtual void SetEditable(bool enable = true) wxOVERRIDE; + virtual bool IsEditable() const wxOVERRIDE; //Selection - virtual void DeleteSelection(); - virtual bool HasSelection() const; - virtual void SelectAll(); - virtual wxString GetSelectedText() const; - virtual wxString GetSelectedSource() const; - virtual void ClearSelection(); + virtual void DeleteSelection() wxOVERRIDE; + virtual bool HasSelection() const wxOVERRIDE; + virtual void SelectAll() wxOVERRIDE; + virtual wxString GetSelectedText() const wxOVERRIDE; + virtual wxString GetSelectedSource() const wxOVERRIDE; + virtual void ClearSelection() wxOVERRIDE; - void RunScript(const wxString& javascript); + void RunScript(const wxString& javascript) wxOVERRIDE; //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler); + virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; - virtual void* GetNativeBackend() const { return m_webView; } + virtual void* GetNativeBackend() const wxOVERRIDE { return m_webView; } // ---- methods not from the parent (common) interface bool CanGetPageSource() const; @@ -134,9 +134,9 @@ public: void SetWebkitZoom(float zoom); // don't hide base class virtuals - virtual void SetScrollPos( int orient, int pos, bool refresh = true ) + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE { return wxControl::SetScrollPos(orient, pos, refresh); } - virtual int GetScrollPos( int orient ) const + virtual int GetScrollPos( int orient ) const wxOVERRIDE { return wxControl::GetScrollPos(orient); } //we need to resize the webview when the control size changes @@ -148,10 +148,10 @@ public: bool m_nextNavigationIsNewWindow; protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl); + virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; wxDECLARE_EVENT_TABLE(); - void MacVisibilityChanged(); + void MacVisibilityChanged() wxOVERRIDE; private: wxWindow *m_parent; 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() diff --git a/include/wx/preferences.h b/include/wx/preferences.h index 5055011b35..40dac7a0bd 100644 --- a/include/wx/preferences.h +++ b/include/wx/preferences.h @@ -81,7 +81,7 @@ public: virtual wxString GetName() const wxOVERRIDE; #ifdef __WXOSX_COCOA__ - virtual wxBitmap GetLargeIcon() const; + virtual wxBitmap GetLargeIcon() const wxOVERRIDE; #endif private: diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index abc8de19bc..0e74afce34 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -2794,14 +2794,14 @@ public: int GetStyleAt(int pos) const; // Redoes the next action on the undo history. - void Redo(); + void Redo() wxOVERRIDE; // Choose between collecting actions into the undo // history and discarding them. void SetUndoCollection(bool collectUndo); // Select all the text in the document. - void SelectAll(); + void SelectAll() wxOVERRIDE; // Remember the current position in the undo history as the position // at which the document was saved. @@ -2811,7 +2811,7 @@ public: wxMemoryBuffer GetStyledText(int startPos, int endPos); // Are there any redoable actions in the undo history? - bool CanRedo() const; + bool CanRedo() const wxOVERRIDE; // Retrieve the line number at which a particular marker is located. int MarkerLineFromHandle(int handle); @@ -3462,28 +3462,28 @@ public: void SetReadOnly(bool readOnly); // Will a paste succeed? - bool CanPaste() const; + bool CanPaste() const wxOVERRIDE; // Are there any undoable actions in the undo history? - bool CanUndo() const; + bool CanUndo() const wxOVERRIDE; // Delete the undo history. void EmptyUndoBuffer(); // Undo one action in the undo history. - void Undo(); + void Undo() wxOVERRIDE; // Cut the selection to the clipboard. - void Cut(); + void Cut() wxOVERRIDE; // Copy the selection to the clipboard. - void Copy(); + void Copy() wxOVERRIDE; // Paste the contents of the clipboard into the document replacing the selection. - void Paste(); + void Paste() wxOVERRIDE; // Clear the selection. - void Clear(); + void Clear() wxOVERRIDE; // Replace the contents of the document with the argument text. void SetText(const wxString& text); @@ -3751,7 +3751,7 @@ public: bool GetUseVerticalScrollBar() const; // Append a string to the end of the document without changing the selection. - void AppendText(const wxString& text); + void AppendText(const wxString& text) wxOVERRIDE; // Is drawing done in two phases with backgrounds drawn before foregrounds? bool GetTwoPhaseDraw() const; @@ -4957,16 +4957,16 @@ public: // implement wxTextEntryBase pure virtual methods // ---------------------------------------------- - virtual void WriteText(const wxString& text) + virtual void WriteText(const wxString& text) wxOVERRIDE { ReplaceSelection(text); } - virtual void Remove(long from, long to) + virtual void Remove(long from, long to) wxOVERRIDE { Replace(from, to, ""); } - virtual void Replace(long from, long to, const wxString& text) + virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE { SetTargetStart((int)from); SetTargetEnd((int)to); @@ -4988,14 +4988,14 @@ public: */ - virtual void SetInsertionPoint(long pos) + virtual void SetInsertionPoint(long pos) wxOVERRIDE { SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos)); } - virtual long GetInsertionPoint() const { return GetCurrentPos(); } - virtual long GetLastPosition() const { return GetTextLength(); } + virtual long GetInsertionPoint() const wxOVERRIDE { return GetCurrentPos(); } + virtual long GetLastPosition() const wxOVERRIDE { return GetTextLength(); } - virtual void SetSelection(long from, long to) + virtual void SetSelection(long from, long to) wxOVERRIDE { if ( from == -1 && to == -1 ) { @@ -5008,7 +5008,7 @@ public: } } - virtual void SelectNone() + virtual void SelectNone() wxOVERRIDE { ClearSelections(); } @@ -5016,7 +5016,7 @@ public: #ifdef SWIG void GetSelection(long* OUTPUT, long* OUTPUT) const; #else - virtual void GetSelection(long *from, long *to) const + virtual void GetSelection(long *from, long *to) const wxOVERRIDE { if ( from ) *from = GetSelectionStart(); @@ -5036,14 +5036,14 @@ public: } #endif - virtual bool IsEditable() const { return !GetReadOnly(); } - virtual void SetEditable(bool editable) { SetReadOnly(!editable); } + virtual bool IsEditable() const wxOVERRIDE { return !GetReadOnly(); } + virtual void SetEditable(bool editable) wxOVERRIDE { SetReadOnly(!editable); } // implement wxTextAreaBase pure virtual methods // --------------------------------------------- - virtual int GetLineLength(long lineNo) const { return static_cast(GetLineText(lineNo).length()); } - virtual wxString GetLineText(long lineNo) const + virtual int GetLineLength(long lineNo) const wxOVERRIDE { return static_cast(GetLineText(lineNo).length()); } + virtual wxString GetLineText(long lineNo) const wxOVERRIDE { wxString text = GetLine(static_cast(lineNo)); size_t lastNewLine = text.find_last_not_of(wxS("\r\n")); @@ -5054,42 +5054,42 @@ public: text.clear(); return text; } - virtual int GetNumberOfLines() const { return GetLineCount(); } + virtual int GetNumberOfLines() const wxOVERRIDE { return GetLineCount(); } - virtual bool IsModified() const { return GetModify(); } - virtual void MarkDirty() { wxFAIL_MSG("not implemented"); } - virtual void DiscardEdits() { SetSavePoint(); } + virtual bool IsModified() const wxOVERRIDE { return GetModify(); } + virtual void MarkDirty() wxOVERRIDE { wxFAIL_MSG("not implemented"); } + virtual void DiscardEdits() wxOVERRIDE { SetSavePoint(); } virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end), - const wxTextAttr& WXUNUSED(style)) + const wxTextAttr& WXUNUSED(style)) wxOVERRIDE { wxFAIL_MSG("not implemented"); return false; } - virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) + virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) wxOVERRIDE { wxFAIL_MSG("not implemented"); return false; } - virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) + virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) wxOVERRIDE { wxFAIL_MSG("not implemented"); return false; } - virtual long XYToPosition(long x, long y) const + virtual long XYToPosition(long x, long y) const wxOVERRIDE { long pos = PositionFromLine((int)y); pos += x; return pos; } - virtual bool PositionToXY(long pos, long *x, long *y) const + virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE { int l = LineFromPosition((int)pos); if ( l == -1 ) @@ -5104,11 +5104,11 @@ public: return true; } - virtual void ShowPosition(long pos) { GotoPos((int)pos); } + virtual void ShowPosition(long pos) wxOVERRIDE { GotoPos((int)pos); } using wxWindow::HitTest; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE { const long l = PositionFromPoint(pt); if ( l == -1 ) @@ -5123,7 +5123,7 @@ public: // just unhide it virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const + wxTextCoord *row) const wxOVERRIDE { return wxTextAreaBase::HitTest(pt, col, row); } @@ -5131,13 +5131,13 @@ public: static wxVersionInfo GetLibraryVersionInfo(); protected: - virtual void DoSetValue(const wxString& value, int flags); - virtual wxString DoGetValue() const { return GetText(); } - virtual wxWindow *GetEditableWindow() { return this; } + virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; + virtual wxString DoGetValue() const wxOVERRIDE { return GetText(); } + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } #ifndef SWIG - virtual bool DoLoadFile(const wxString& file, int fileType); - virtual bool DoSaveFile(const wxString& file, int fileType); + virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE; + virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE; // Event handlers void OnPaint(wxPaintEvent& evt); @@ -5161,7 +5161,7 @@ protected: void OnListBox(wxCommandEvent& evt); void OnIdle(wxIdleEvent& evt); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // Turn notifications from Scintilla into events void NotifyChange(); diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index a79c6891b3..509007c51b 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -59,7 +59,7 @@ public: #endif #if defined(__WXMAC__) && wxUSE_STDPATHS - virtual wxStandardPaths& GetStandardPaths(); + virtual wxStandardPaths& GetStandardPaths() wxOVERRIDE; #endif virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE; @@ -76,7 +76,7 @@ public: #if wxUSE_SOCKETS #ifdef wxHAS_GUI_SOCKET_MANAGER - virtual wxSocketManager *GetSocketManager(); + virtual wxSocketManager *GetSocketManager() wxOVERRIDE; #endif #ifdef wxHAS_GUI_FDIOMANAGER diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index d8a7d921e0..550d2cd471 100644 --- a/include/wx/vscroll.h +++ b/include/wx/vscroll.h @@ -727,7 +727,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() { Update(); } + virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } #endif // __WXMAC__ private: @@ -794,7 +794,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() { Update(); } + virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } #endif // __WXMAC__ private: @@ -859,7 +859,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() { Update(); } + virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } #endif // __WXMAC__ private: diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index ef77acd907..595a6e94dd 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -104,9 +104,9 @@ public: virtual void DrawCollapseButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc); + virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE; virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, @@ -136,7 +136,7 @@ public: const wxRect& rect, int value, int max, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; diff --git a/src/osx/cocoa/datetimectrl.mm b/src/osx/cocoa/datetimectrl.mm index da9a3834ce..19ca20989b 100644 --- a/src/osx/cocoa/datetimectrl.mm +++ b/src/osx/cocoa/datetimectrl.mm @@ -128,7 +128,7 @@ public: } } - virtual void Enable(bool enable = true) + virtual void Enable(bool enable = true) wxOVERRIDE { wxNSDatePicker* const nsdatePicker = View();