diff --git a/include/wx/generic/private/textmeasure.h b/include/wx/generic/private/textmeasure.h index 6cd900e945..c6145b91e2 100644 --- a/include/wx/generic/private/textmeasure.h +++ b/include/wx/generic/private/textmeasure.h @@ -27,11 +27,11 @@ protected: wxCoord *width, wxCoord *height, wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); + wxCoord *externalLeading = NULL) wxOVERRIDE; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths, - double scaleX); + double scaleX) wxOVERRIDE; wxDECLARE_NO_COPY_CLASS(wxTextMeasure); }; diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index 04d0c867d1..cf7896dc55 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -128,13 +128,13 @@ public: virtual ~wxBitmap() {} - wxImage ConvertToImage() const; + wxImage ConvertToImage() const wxOVERRIDE; // get the given part of bitmap - wxBitmap GetSubBitmap( const wxRect& rect ) const; + wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE; - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; + virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE { return Create(sz.GetWidth(), sz.GetHeight(), depth); } virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); @@ -146,7 +146,7 @@ public: bool Create(int width, int height, const wxDC& dc); // Create a bitmap with a scale factor, width and height are multiplied with that factor - bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale); + bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale) wxOVERRIDE; // virtual bool Create( WXHICON icon) ; virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); @@ -159,28 +159,28 @@ public: { return (wxBitmapRefData *)m_refData; } // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); + virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE; - int GetWidth() const; - int GetHeight() const; - int GetDepth() const; + int GetWidth() const wxOVERRIDE; + int GetHeight() const wxOVERRIDE; + int GetDepth() const wxOVERRIDE; #if WXWIN_COMPATIBILITY_3_0 wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") - void SetWidth(int width); + void SetWidth(int width) wxOVERRIDE; wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") - void SetHeight(int height); + void SetHeight(int height) wxOVERRIDE; wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") - void SetDepth(int depth); + void SetDepth(int depth) wxOVERRIDE; #endif #if wxUSE_PALETTE - wxPalette* GetPalette() const; - void SetPalette(const wxPalette& palette); + wxPalette* GetPalette() const wxOVERRIDE; + void SetPalette(const wxPalette& palette) wxOVERRIDE; #endif // wxUSE_PALETTE - wxMask *GetMask() const; - void SetMask(wxMask *mask) ; + wxMask *GetMask() const wxOVERRIDE; + void SetMask(wxMask *mask) wxOVERRIDE; static void InitStandardHandlers(); @@ -233,14 +233,14 @@ public: void EndRawAccess(); #endif - double GetScaleFactor() const; + double GetScaleFactor() const wxOVERRIDE; void SetSelectedInto(wxDC *dc); wxDC *GetSelectedInto() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; }; #endif // _WX_BITMAP_H_ diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h index 33253d5613..fb2a62ae28 100644 --- a/include/wx/osx/bmpbuttn.h +++ b/include/wx/osx/bmpbuttn.h @@ -39,7 +39,7 @@ public: protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxBitmapButton); }; diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h index 072cfa4d16..acb7702591 100644 --- a/include/wx/osx/brush.h +++ b/include/wx/osx/brush.h @@ -26,17 +26,17 @@ public: wxBrush(const wxBitmap& stipple); virtual ~wxBrush(); - virtual void SetColour(const wxColour& col) ; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; - virtual void SetStyle(wxBrushStyle style) ; - virtual void SetStipple(const wxBitmap& stipple) ; + virtual void SetColour(const wxColour& col) wxOVERRIDE; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; + virtual void SetStyle(wxBrushStyle style) wxOVERRIDE; + virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - wxColour GetColour() const; - wxBrushStyle GetStyle() const ; - wxBitmap *GetStipple() const ; + wxColour GetColour() const wxOVERRIDE; + wxBrushStyle GetStyle() const wxOVERRIDE; + wxBitmap *GetStipple() const wxOVERRIDE; wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") @@ -46,8 +46,8 @@ public: void SetStyle(int style) { SetStyle((wxBrushStyle)style); } protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxBrush); diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h index 5726b211b9..cf20fbcb56 100644 --- a/include/wx/osx/button.h +++ b/include/wx/osx/button.h @@ -40,13 +40,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void SetLabel(const wxString& label); - virtual wxWindow *SetDefault(); - virtual void Command(wxCommandEvent& event); + virtual void SetLabel(const wxString& label) wxOVERRIDE; + virtual wxWindow *SetDefault() wxOVERRIDE; + 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; #if wxOSX_USE_COCOA void OSXUpdateAfterLabelChange(const wxString& label); diff --git a/include/wx/osx/carbon/private/print.h b/include/wx/osx/carbon/private/print.h index eeda2bef28..fa1ce4126c 100644 --- a/include/wx/osx/carbon/private/print.h +++ b/include/wx/osx/carbon/private/print.h @@ -23,13 +23,13 @@ public: wxOSXPrintData(); virtual ~wxOSXPrintData(); - virtual bool TransferTo( wxPrintData &data ); - virtual bool TransferFrom( const wxPrintData &data ); + virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; + virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; - virtual bool IsOk() const ; + virtual bool IsOk() const wxOVERRIDE; - virtual void TransferFrom( const wxPageSetupDialogData * ); - virtual void TransferTo( wxPageSetupDialogData * ); + virtual void TransferFrom( const wxPageSetupDialogData * ) wxOVERRIDE; + virtual void TransferTo( wxPageSetupDialogData * ) wxOVERRIDE; virtual void TransferFrom( const wxPrintDialogData * ); virtual void TransferTo( wxPrintDialogData * ); @@ -69,8 +69,8 @@ public: WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; } protected: - virtual void UpdateFromPMState(); - virtual void UpdateToPMState(); + virtual void UpdateFromPMState() wxOVERRIDE; + virtual void UpdateToPMState() wxOVERRIDE; WX_NSPrintInfo m_macPrintInfo; private: diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index 1aa40e46e2..a5a1b87e2b 100644 --- a/include/wx/osx/carbon/region.h +++ b/include/wx/osx/carbon/region.h @@ -37,24 +37,24 @@ public: virtual ~wxRegion(); // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; + virtual void Clear() wxOVERRIDE; + virtual bool IsEmpty() const wxOVERRIDE; // Internal WXHRGN GetWXHRGN() const ; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; + virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE; - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoCombine(const wxRegion& region, wxRegionOp op); - virtual bool DoUnionWithRect(const wxRect& rect); + virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; + virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE; + virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxRegion); diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h index 1c6c340595..9734b60413 100644 --- a/include/wx/osx/checkbox.h +++ b/include/wx/osx/checkbox.h @@ -30,17 +30,17 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool); - virtual bool GetValue() const; + virtual void SetValue(bool) wxOVERRIDE; + virtual bool GetValue() const wxOVERRIDE; - 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: - void DoSet3StateValue(wxCheckBoxState val); - virtual wxCheckBoxState DoGet3StateValue() const; + void DoSet3StateValue(wxCheckBoxState val) wxOVERRIDE; + virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxCheckBox); }; @@ -70,10 +70,10 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool); - virtual bool GetValue() const; + virtual void SetValue(bool) wxOVERRIDE; + virtual bool GetValue() const wxOVERRIDE; virtual void SetLabel(const wxBitmap *bitmap); - virtual void SetLabel( const wxString & WXUNUSED(name) ) {} + virtual void SetLabel( const wxString & WXUNUSED(name) ) wxOVERRIDE {} wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox); }; diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h index 4ef0b6b3aa..ca3984a6d5 100644 --- a/include/wx/osx/choice.h +++ b/include/wx/osx/choice.h @@ -66,28 +66,28 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - virtual unsigned int GetCount() const ; - virtual int GetSelection() const ; - virtual void SetSelection(int n); + virtual unsigned int GetCount() const wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; + virtual void SetSelection(int n) wxOVERRIDE; - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const ; - virtual void SetString(unsigned int pos, const wxString& s); + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int pos, const wxString& s) wxOVERRIDE; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; protected: - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; - virtual wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const wxOVERRIDE; 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; wxArrayString m_strings; wxChoiceDataArray m_datas ; diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h index 2c45068e24..77a78f7129 100644 --- a/include/wx/osx/clipbrd.h +++ b/include/wx/osx/clipbrd.h @@ -26,33 +26,33 @@ public: virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() - virtual bool Open(); + virtual bool Open() wxOVERRIDE; // close the clipboard after SetData() and GetData() - virtual void Close(); + virtual void Close() wxOVERRIDE; // query whether the clipboard is opened - virtual bool IsOpened() const; + virtual bool IsOpened() const wxOVERRIDE; // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); + virtual bool SetData( wxDataObject *data ) wxOVERRIDE; // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); + virtual bool AddData( wxDataObject *data ) wxOVERRIDE; // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); + virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); + virtual bool GetData( wxDataObject& data ) wxOVERRIDE; // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); + virtual void Clear() wxOVERRIDE; // flushes the clipboard: this means that the data which is currently on // clipboard will stay available even after the application exits (possibly // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush(); + virtual bool Flush() wxOVERRIDE; private: wxDataObject *m_data; diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h index 12fd66a33a..b46a86d0d1 100644 --- a/include/wx/osx/cocoa/evtloop.h +++ b/include/wx/osx/cocoa/evtloop.h @@ -20,18 +20,18 @@ public: void EndModalSession(); - virtual void WakeUp(); + virtual void WakeUp() wxOVERRIDE; void OSXUseLowLevelWakeup(bool useIt) { m_osxLowLevelWakeUp = useIt ; } protected: - virtual int DoDispatchTimeout(unsigned long timeout); + virtual int DoDispatchTimeout(unsigned long timeout) wxOVERRIDE; - virtual void OSXDoRun(); - virtual void OSXDoStop(); + virtual void OSXDoRun() wxOVERRIDE; + virtual void OSXDoStop() wxOVERRIDE; - virtual CFRunLoopRef CFGetCurrentRunLoop() const; + virtual CFRunLoopRef CFGetCurrentRunLoop() const wxOVERRIDE; void* m_modalSession; diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index cc990135cc..706c20c8fc 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -56,8 +56,8 @@ public : void Init(); - virtual bool IsVisible() const ; - virtual void SetVisibility(bool); + virtual bool IsVisible() const wxOVERRIDE; + virtual void SetVisibility(bool) wxOVERRIDE; // we provide a static function which can be reused from // wxNonOwnedWindowCocoaImpl too @@ -68,70 +68,70 @@ public : virtual bool ShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout); + unsigned timeout) wxOVERRIDE; - virtual void Raise(); + virtual void Raise() wxOVERRIDE; - virtual void Lower(); + virtual void Lower() wxOVERRIDE; - virtual void ScrollRect( const wxRect *rect, int dx, int dy ); + virtual void ScrollRect( const wxRect *rect, int dx, int dy ) wxOVERRIDE; - virtual WXWidget GetWXWidget() const { return m_osxView; } + virtual WXWidget GetWXWidget() const wxOVERRIDE { return m_osxView; } - virtual void SetBackgroundColour(const wxColour&); - virtual bool SetBackgroundStyle(wxBackgroundStyle style); + virtual void SetBackgroundColour(const wxColour&) wxOVERRIDE; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - virtual void GetContentArea( int &left , int &top , int &width , int &height ) const; - virtual void Move(int x, int y, int width, int height); - virtual void GetPosition( int &x, int &y ) const; - virtual void GetSize( int &width, int &height ) const; - virtual void SetControlSize( wxWindowVariant variant ); + virtual void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE; + virtual void Move(int x, int y, int width, int height) wxOVERRIDE; + virtual void GetPosition( int &x, int &y ) const wxOVERRIDE; + virtual void GetSize( int &width, int &height ) const wxOVERRIDE; + virtual void SetControlSize( wxWindowVariant variant ) wxOVERRIDE; - virtual void SetNeedsDisplay( const wxRect* where = NULL ); - virtual bool GetNeedsDisplay() const; + virtual void SetNeedsDisplay( const wxRect* where = NULL ) wxOVERRIDE; + virtual bool GetNeedsDisplay() const wxOVERRIDE; - virtual void SetDrawingEnabled(bool enabled); + virtual void SetDrawingEnabled(bool enabled) wxOVERRIDE; - virtual bool CanFocus() const; + virtual bool CanFocus() const wxOVERRIDE; // return true if successful - virtual bool SetFocus(); - virtual bool HasFocus() const; + virtual bool SetFocus() wxOVERRIDE; + virtual bool HasFocus() const wxOVERRIDE; - void RemoveFromParent(); - void Embed( wxWidgetImpl *parent ); + void RemoveFromParent() wxOVERRIDE; + void Embed( wxWidgetImpl *parent ) wxOVERRIDE; - void SetDefaultButton( bool isDefault ); - void PerformClick(); - virtual void SetLabel(const wxString& title, wxFontEncoding encoding); + void SetDefaultButton( bool isDefault ) wxOVERRIDE; + void PerformClick() wxOVERRIDE; + virtual void SetLabel(const wxString& title, wxFontEncoding encoding) wxOVERRIDE; - void SetCursor( const wxCursor & cursor ); - void CaptureMouse(); - void ReleaseMouse(); + void SetCursor( const wxCursor & cursor ) wxOVERRIDE; + void CaptureMouse() wxOVERRIDE; + void ReleaseMouse() wxOVERRIDE; #if wxUSE_DRAG_AND_DROP - void SetDropTarget(wxDropTarget* target); + void SetDropTarget(wxDropTarget* target) wxOVERRIDE; #endif - wxInt32 GetValue() const; - void SetValue( wxInt32 v ); - wxBitmap GetBitmap() const; - void SetBitmap( const wxBitmap& bitmap ); - void SetBitmapPosition( wxDirection dir ); - void SetupTabs( const wxNotebook ¬ebook ); - void GetBestRect( wxRect *r ) const; - bool IsEnabled() const; - void Enable( bool enable ); - bool ButtonClickDidStateChange() { return true ;} - void SetMinimum( wxInt32 v ); - void SetMaximum( wxInt32 v ); - wxInt32 GetMinimum() const; - wxInt32 GetMaximum() const; - void PulseGauge(); - void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ); + wxInt32 GetValue() const wxOVERRIDE; + void SetValue( wxInt32 v ) wxOVERRIDE; + wxBitmap GetBitmap() const wxOVERRIDE; + void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE; + void SetBitmapPosition( wxDirection dir ) wxOVERRIDE; + void SetupTabs( const wxNotebook ¬ebook ) wxOVERRIDE; + void GetBestRect( wxRect *r ) const wxOVERRIDE; + bool IsEnabled() const wxOVERRIDE; + void Enable( bool enable ) wxOVERRIDE; + bool ButtonClickDidStateChange() wxOVERRIDE { return true; } + void SetMinimum( wxInt32 v ) wxOVERRIDE; + void SetMaximum( wxInt32 v ) wxOVERRIDE; + wxInt32 GetMinimum() const wxOVERRIDE; + wxInt32 GetMaximum() const wxOVERRIDE; + void PulseGauge() wxOVERRIDE; + void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE; - void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); - void SetToolTip( wxToolTip* tooltip ); + void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack = true ) wxOVERRIDE; + void SetToolTip( wxToolTip* tooltip ) wxOVERRIDE; - void InstallEventHandler( WXWidget control = NULL ); - bool EnableTouchEvents(int eventsMask); + void InstallEventHandler( WXWidget control = NULL ) wxOVERRIDE; + bool EnableTouchEvents(int eventsMask) wxOVERRIDE; virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const; bool DoHandleKeyNavigation(const wxKeyEvent &event); @@ -162,7 +162,7 @@ public : virtual bool IsFlipped() const { return m_isFlipped; } #endif - virtual double GetContentScaleFactor() const; + virtual double GetContentScaleFactor() const wxOVERRIDE; // cocoa thunk connected calls @@ -242,7 +242,7 @@ public : 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 wxOVERRIDE; + 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 ) wxOVERRIDE; @@ -304,13 +304,13 @@ class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl { public: wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v); - virtual void SetBitmap(const wxBitmap& bitmap); + virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; #if wxUSE_MARKUP - virtual void SetLabelMarkup(const wxString& markup); + virtual void SetLabelMarkup(const wxString& markup) wxOVERRIDE; #endif // wxUSE_MARKUP - void SetPressedBitmap( const wxBitmap& bitmap ); - void GetLayoutInset(int &left , int &top , int &right, int &bottom) const; + void SetPressedBitmap( const wxBitmap& bitmap ) wxOVERRIDE; + void GetLayoutInset(int &left, int &top, int &right, int &bottom) const wxOVERRIDE; void SetAcceleratorFromLabel(const wxString& label); NSButton *GetNSButton() const; diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h index c46f2f5d0f..9d3518caf3 100644 --- a/include/wx/osx/colordlg.h +++ b/include/wx/osx/colordlg.h @@ -27,7 +27,7 @@ public: bool Create(wxWindow *parent, wxColourData *data = NULL); - int ShowModal(); + int ShowModal() wxOVERRIDE; wxColourData& GetColourData() { return m_colourData; } protected: diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index 95de0449d4..35eb85a66c 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -82,53 +82,53 @@ class WXDLLIMPEXP_CORE wxComboBox : const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - virtual int GetSelection() const; - virtual void GetSelection(long *from, long *to) const; - virtual void SetSelection(int n); - virtual void SetSelection(long from, long to); - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const; - virtual wxString GetStringSelection() const; - virtual void SetString(unsigned int n, const wxString& s); + virtual int GetSelection() const wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetSelection(int n) wxOVERRIDE; + virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual wxString GetStringSelection() const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; - virtual unsigned int GetCount() const; + virtual unsigned int GetCount() const wxOVERRIDE; - virtual void SetValue(const wxString& value); + virtual void SetValue(const wxString& value) wxOVERRIDE; // these methods are provided by wxTextEntry for the native impl. #if wxOSX_USE_COCOA - virtual void Popup(); - virtual void Dismiss(); + virtual void Popup() wxOVERRIDE; + virtual void Dismiss() wxOVERRIDE; #endif // wxOSX_USE_COCOA // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; #if wxOSX_USE_COCOA wxComboWidgetImpl* GetComboPeer() const; #endif protected: // List functions - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; // wxTextEntry functions - virtual wxWindow *GetEditableWindow() { return this; } + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } // override the base class virtuals involved in geometry calculations - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; 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; - virtual void EnableTextChangedEvents(bool enable); + virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; // the subcontrols wxComboBoxText* m_text; diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h index 6e667fdd24..e259e928e7 100644 --- a/include/wx/osx/control.h +++ b/include/wx/osx/control.h @@ -36,7 +36,7 @@ public: const wxString& name = wxControlNameStr); // Simulates an event - virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } + virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); } // implementation from now on // -------------------------- diff --git a/include/wx/osx/core/evtloop.h b/include/wx/osx/core/evtloop.h index c2be89e33b..f571d45756 100644 --- a/include/wx/osx/core/evtloop.h +++ b/include/wx/osx/core/evtloop.h @@ -25,22 +25,22 @@ public: // sets the "should exit" flag and wakes up the loop so that it terminates // soon - virtual void ScheduleExit(int rc = 0); + virtual void ScheduleExit(int rc = 0) wxOVERRIDE; // return true if any events are available - virtual bool Pending() const; + virtual bool Pending() const wxOVERRIDE; // dispatch a single event, return false if we should exit from the loop - virtual bool Dispatch(); + virtual bool Dispatch() wxOVERRIDE; // same as Dispatch() but doesn't wait for longer than the specified (in // ms) timeout, return true if an event was processed, false if we should // exit the loop or -1 if timeout expired - virtual int DispatchTimeout(unsigned long timeout); + virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; // implement this to wake up the loop: usually done by posting a dummy event // to it (can be called from non main thread) - virtual void WakeUp(); + virtual void WakeUp() wxOVERRIDE; bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; } @@ -53,13 +53,13 @@ public: protected: // enters a loop calling OnNextIteration(), Pending() and Dispatch() and // terminating when Exit() is called - virtual int DoRun(); + virtual int DoRun() wxOVERRIDE; // may be overridden to perform some action at the start of each new event // loop iteration virtual void OnNextIteration() {} - virtual void DoYieldFor(long eventsToProcess); + virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); diff --git a/include/wx/osx/core/hid.h b/include/wx/osx/core/hid.h index 20c1a7ba41..7446b0df31 100644 --- a/include/wx/osx/core/hid.h +++ b/include/wx/osx/core/hid.h @@ -104,7 +104,7 @@ public: static int GetCount(); bool Create(int nDev = 1); void AddCookie(CFTypeRef Data, int i); - virtual void BuildCookies(CFArrayRef Array); + virtual void BuildCookies(CFArrayRef Array) wxOVERRIDE; void DoBuildCookies(CFArrayRef Array); }; diff --git a/include/wx/osx/core/private/strconv_cf.h b/include/wx/osx/core/private/strconv_cf.h index d22c73f72f..a05ce7d8dc 100644 --- a/include/wx/osx/core/private/strconv_cf.h +++ b/include/wx/osx/core/private/strconv_cf.h @@ -323,7 +323,7 @@ public: virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const; virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const; - virtual wxMBConv *Clone() const { return new wxMBConv_cf(*this); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_cf(*this); } bool IsOk() const { diff --git a/include/wx/osx/core/private/timer.h b/include/wx/osx/core/private/timer.h index 2f191797d9..c23f9553ba 100644 --- a/include/wx/osx/core/private/timer.h +++ b/include/wx/osx/core/private/timer.h @@ -20,10 +20,10 @@ public: wxOSXTimerImpl(wxTimer *timer); virtual ~wxOSXTimerImpl(); - virtual bool Start(int milliseconds = -1, bool one_shot = false); - virtual void Stop(); + virtual bool Start(int milliseconds = -1, bool one_shot = false) wxOVERRIDE; + virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const; + virtual bool IsRunning() const wxOVERRIDE; private: wxOSXTimerInfo *m_info; diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h index 7af9a4176c..37e221f6ce 100644 --- a/include/wx/osx/cursor.h +++ b/include/wx/osx/cursor.h @@ -36,8 +36,8 @@ public: WXHCURSOR GetHCURSOR() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: void InitFromStock(wxStockCursor); diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h index dec7fe50bf..f495c153f1 100644 --- a/include/wx/osx/dataobj2.h +++ b/include/wx/osx/dataobj2.h @@ -26,24 +26,24 @@ public: virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); + virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; // implement base class pure virtuals // ---------------------------------- - virtual size_t GetDataSize() const ; - virtual bool GetDataHere(void *buf) const ; - virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize() const wxOVERRIDE; + virtual bool GetDataHere(void *buf) const wxOVERRIDE; + virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const + virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const + virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE { return SetData(len, buf); } @@ -68,19 +68,19 @@ public: void AddFile( const wxString &filename ); - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize() const wxOVERRIDE; + virtual bool GetDataHere(void *buf) const wxOVERRIDE; + virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const + virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const + virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE { return SetData(len, buf); } diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h index 2eb826b5c4..836581e2a8 100644 --- a/include/wx/osx/dataview.h +++ b/include/wx/osx/dataview.h @@ -42,29 +42,29 @@ public: virtual ~wxDataViewColumn(); // implement wxHeaderColumnBase pure virtual methods - virtual wxAlignment GetAlignment() const { return m_alignment; } - virtual int GetFlags() const { return m_flags; } + virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_alignment; } + virtual int GetFlags() const wxOVERRIDE { return m_flags; } virtual int GetMaxWidth() const { return m_maxWidth; } - virtual int GetMinWidth() const { return m_minWidth; } - virtual wxString GetTitle() const { return m_title; } - virtual int GetWidth() const; - virtual bool IsSortOrderAscending() const { return m_ascending; } - virtual bool IsSortKey() const; - virtual bool IsHidden() const; + virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; } + virtual wxString GetTitle() const wxOVERRIDE { return m_title; } + virtual int GetWidth() const wxOVERRIDE; + virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_ascending; } + virtual bool IsSortKey() const wxOVERRIDE; + virtual bool IsHidden() const wxOVERRIDE; - virtual void SetAlignment (wxAlignment align); - virtual void SetBitmap (wxBitmap const& bitmap); - virtual void SetFlags (int flags) { m_flags = flags; /*SetIndividualFlags(flags); */ } - virtual void SetHidden (bool hidden); + virtual void SetAlignment (wxAlignment align) wxOVERRIDE; + virtual void SetBitmap (wxBitmap const& bitmap) wxOVERRIDE; + virtual void SetFlags (int flags) wxOVERRIDE { m_flags = flags; /*SetIndividualFlags(flags); */ } + virtual void SetHidden (bool hidden) wxOVERRIDE; virtual void SetMaxWidth (int maxWidth); - virtual void SetMinWidth (int minWidth); - virtual void SetReorderable(bool reorderable); - virtual void SetResizeable (bool resizable); - virtual void UnsetAsSortKey(); - virtual void SetSortable (bool sortable); - virtual void SetSortOrder (bool ascending); - virtual void SetTitle (wxString const& title); - virtual void SetWidth (int width); + virtual void SetMinWidth (int minWidth) wxOVERRIDE; + virtual void SetReorderable(bool reorderable) wxOVERRIDE; + virtual void SetResizeable (bool resizable) wxOVERRIDE; + virtual void UnsetAsSortKey() wxOVERRIDE; + virtual void SetSortable (bool sortable) wxOVERRIDE; + virtual void SetSortOrder (bool ascending) wxOVERRIDE; + virtual void SetTitle (wxString const& title) wxOVERRIDE; + virtual void SetWidth (int width) wxOVERRIDE; // implementation only wxDataViewColumnNativeData* GetNativeData() const diff --git a/include/wx/osx/datectrl.h b/include/wx/osx/datectrl.h index 555ba68e99..6d37c201a1 100644 --- a/include/wx/osx/datectrl.h +++ b/include/wx/osx/datectrl.h @@ -42,10 +42,10 @@ public: const wxString& name = wxDatePickerCtrlNameStr); // Implement the base class pure virtuals. - virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2); - virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const; + virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE; + virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE; - virtual void OSXGenerateEvent(const wxDateTime& dt); + virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); diff --git a/include/wx/osx/datetimectrl.h b/include/wx/osx/datetimectrl.h index 9993970125..9117c70510 100644 --- a/include/wx/osx/datetimectrl.h +++ b/include/wx/osx/datetimectrl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase { public: // Implement the base class pure virtuals. - virtual void SetValue(const wxDateTime& dt); - virtual wxDateTime GetValue() const; + virtual void SetValue(const wxDateTime& dt) wxOVERRIDE; + virtual wxDateTime GetValue() const wxOVERRIDE; // Implementation only. virtual void OSXGenerateEvent(const wxDateTime& dt) = 0; diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h index 4c88220d9e..ae85550165 100644 --- a/include/wx/osx/dcclient.h +++ b/include/wx/osx/dcclient.h @@ -28,8 +28,8 @@ public: wxWindowDCImpl( wxDC *owner, wxWindow *window ); virtual ~wxWindowDCImpl(); - virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; protected: bool m_release; diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h index 05fccf5075..787e2a6e92 100644 --- a/include/wx/osx/dcmemory.h +++ b/include/wx/osx/dcmemory.h @@ -22,14 +22,14 @@ public: virtual ~wxMemoryDCImpl(); - virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } - virtual void DoSelect(const wxBitmap& bitmap); + virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; - virtual const wxBitmap& GetSelectedBitmap() const + virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selected; } - virtual wxBitmap& GetSelectedBitmap() + virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selected; } private: diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h index 7bebfbc37c..4fa6de4f9d 100644 --- a/include/wx/osx/dcprint.h +++ b/include/wx/osx/dcprint.h @@ -25,18 +25,18 @@ public: wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata ); virtual ~wxPrinterDCImpl(); - virtual bool StartDoc( const wxString& WXUNUSED(message) ) ; - virtual void EndDoc(void) ; - virtual void StartPage(void) ; - virtual void EndPage(void) ; + virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE; + virtual void EndDoc(void) wxOVERRIDE; + virtual void StartPage(void) wxOVERRIDE; + virtual void EndPage(void) wxOVERRIDE; - wxRect GetPaperRect() const; + wxRect GetPaperRect() const wxOVERRIDE; wxPrintData& GetPrintData() { return m_printData; } - virtual wxSize GetPPI() const; + virtual wxSize GetPPI() const wxOVERRIDE; protected: - virtual void DoGetSize( int *width, int *height ) const; + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; wxPrintData m_printData ; wxNativePrinterDC* m_nativePrinterDC ; diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h index c6fdd335a2..77d7832f70 100644 --- a/include/wx/osx/dcscreen.h +++ b/include/wx/osx/dcscreen.h @@ -20,7 +20,7 @@ public: wxScreenDCImpl( wxDC *owner ); virtual ~wxScreenDCImpl(); - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; private: void* m_overlayWindow; diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h index e8d871cd54..2e0c7a847f 100644 --- a/include/wx/osx/dialog.h +++ b/include/wx/osx/dialog.h @@ -46,18 +46,18 @@ public: virtual ~wxDialog(); // virtual bool Destroy(); - virtual bool Show(bool show = true); + virtual bool Show(bool show = true) wxOVERRIDE; // return true if we're showing the dialog modally - virtual bool IsModal() const; + virtual bool IsModal() const wxOVERRIDE; // show the dialog modally and return the value passed to EndModal() - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; - virtual void ShowWindowModal(); + virtual void ShowWindowModal() wxOVERRIDE; // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); + virtual void EndModal(int retCode) wxOVERRIDE; static bool OSXHasModalDialogsOpen(); void OSXBeginModalDialog(); @@ -71,7 +71,7 @@ public: // implementation // -------------- - wxDialogModality GetModality() const; + wxDialogModality GetModality() const wxOVERRIDE; #if wxOSX_USE_COCOA virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {} @@ -85,7 +85,7 @@ protected: void EndWindowModal(); // mac also takes command-period as cancel - virtual bool IsEscapeKey(const wxKeyEvent& event); + virtual bool IsEscapeKey(const wxKeyEvent& event) wxOVERRIDE; wxDialogModality m_modality; diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h index c23cf71bf5..a77cd0f880 100644 --- a/include/wx/osx/dirdlg.h +++ b/include/wx/osx/dirdlg.h @@ -45,11 +45,11 @@ public: ~wxDirDialog(); #endif - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; #if wxOSX_USE_COCOA - virtual void ShowWindowModal(); - virtual void ModalFinishedCallback(void* panel, int returnCode); + virtual void ShowWindowModal() wxOVERRIDE; + virtual void ModalFinishedCallback(void* panel, int returnCode) wxOVERRIDE; #endif private: diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h index 7cd8ed2242..b81679d7dd 100644 --- a/include/wx/osx/dnd.h +++ b/include/wx/osx/dnd.h @@ -50,10 +50,10 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase wxDropTarget(wxDataObject *dataObject = NULL ); - virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); - virtual bool OnDrop(wxCoord x, wxCoord y); - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); - virtual bool GetData(); + virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; + virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE; + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; + virtual bool GetData() wxOVERRIDE; // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. virtual wxDataFormat GetMatchingPair(); @@ -90,7 +90,7 @@ public: // do it (call this in response to a mouse button press, for example) // params: if bAllowMove is false, data can be only copied - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; wxWindow* GetWindow() { return m_window ; } void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h index 1c6b5b5687..1b8231eebf 100644 --- a/include/wx/osx/dvrenderers.h +++ b/include/wx/osx/dvrenderers.h @@ -29,9 +29,9 @@ public: // implementation only // ------------------- - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; - virtual wxDC* GetDC(); // creates a device context and keeps it + virtual wxDC* GetDC() wxOVERRIDE; // creates a device context and keeps it void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer private: @@ -82,11 +82,11 @@ public: void EnableMarkup(bool enable = true); #endif // wxUSE_MARKUP && Cocoa - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col); + unsigned col) wxOVERRIDE; private: #if wxUSE_MARKUP && wxOSX_USE_COCOA @@ -110,7 +110,7 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); @@ -128,14 +128,14 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; wxString GetChoice(size_t index) const { return m_choices[index]; } const wxArrayString& GetChoices() const { return m_choices; } virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col); + unsigned col) wxOVERRIDE; private: wxArrayString m_choices; @@ -174,11 +174,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col); + unsigned col) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); @@ -200,11 +200,11 @@ public: void ShowAsRadio(); - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col); + unsigned col) wxOVERRIDE; private: void DoInitButtonCell(int buttonType); @@ -226,11 +226,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col); + unsigned col) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); @@ -249,11 +249,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender(); + virtual bool MacRender() wxOVERRIDE; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col); + unsigned col) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer); diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h index e9e7545f18..570be745ce 100644 --- a/include/wx/osx/evtloop.h +++ b/include/wx/osx/evtloop.h @@ -26,11 +26,11 @@ public: #ifdef __WXOSX_COCOA__ // skip wxGUIEventLoop to avoid missing Enter/Exit notifications - virtual int Run() { return wxCFEventLoop::Run(); } + virtual int Run() wxOVERRIDE { return wxCFEventLoop::Run(); } #endif protected: - virtual void OSXDoRun(); - virtual void OSXDoStop(); + virtual void OSXDoRun() wxOVERRIDE; + virtual void OSXDoStop() wxOVERRIDE; // (in case) the modal window for this event loop wxNonOwnedWindow* m_modalWindow; diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h index e106a48629..381f8cc5f4 100644 --- a/include/wx/osx/filedlg.h +++ b/include/wx/osx/filedlg.h @@ -60,17 +60,17 @@ public: ~wxFileDialog(); #endif - virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; } - virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; } + virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE { paths = m_paths; } + virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE { files = m_fileNames ; } - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; #if wxOSX_USE_COCOA - virtual void ShowWindowModal(); - virtual void ModalFinishedCallback(void* panel, int resultCode); + virtual void ShowWindowModal() wxOVERRIDE; + virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE; #endif - virtual bool SupportsExtraControl() const; + virtual bool SupportsExtraControl() const wxOVERRIDE; // implementation only diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h index 817501e39b..1ac7112e32 100644 --- a/include/wx/osx/fontdlg.h +++ b/include/wx/osx/fontdlg.h @@ -41,7 +41,7 @@ public: bool Create(wxWindow *parent); bool Create(wxWindow *parent, const wxFontData& data); - int ShowModal(); + int ShowModal() wxOVERRIDE; wxFontData& GetFontData() { return m_fontData; } protected: diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h index cfd9ff5ce4..c4d22dbfa1 100644 --- a/include/wx/osx/gauge.h +++ b/include/wx/osx/gauge.h @@ -39,11 +39,11 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase const wxString& name = wxGaugeNameStr); // set gauge range/value - virtual void SetRange(int range); - virtual void SetValue(int pos); - virtual int GetValue() const ; + virtual void SetRange(int range) wxOVERRIDE; + virtual void SetValue(int pos) wxOVERRIDE; + virtual int GetValue() const wxOVERRIDE; - void Pulse(); + void Pulse() wxOVERRIDE; protected: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge); diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h index e1948c2f70..7f12f246fd 100644 --- a/include/wx/osx/glcanvas.h +++ b/include/wx/osx/glcanvas.h @@ -43,7 +43,7 @@ public: const wxGLContextAttrs *ctxAttrs = NULL); virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const; + virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; // Mac-specific WXGLContext GetWXGLContext() const { return m_glContext; } diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h index 2bca063802..ad6d5cc5fe 100644 --- a/include/wx/osx/mdi.h +++ b/include/wx/osx/mdi.h @@ -119,14 +119,14 @@ public: virtual ~wxMDIChildFrame(); // un-override the base class override - virtual bool IsTopLevel() const { return true; } + virtual bool IsTopLevel() const wxOVERRIDE { return true; } // implement MDI operations - virtual void Activate(); + virtual void Activate() wxOVERRIDE; // Mac OS activate event - virtual void MacActivate(long timestamp, bool activating); + virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE; protected: // common part of all ctors @@ -142,10 +142,10 @@ public: virtual ~wxMDIClientWindow(); virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); + long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; protected: - virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); }; diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index a9bd1a164e..e03bfb58a3 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -34,9 +34,9 @@ public: virtual ~wxMenu(); - virtual void Break(); + virtual void Break() wxOVERRIDE; - virtual void SetTitle(const wxString& title); + virtual void SetTitle(const wxString& title) wxOVERRIDE; bool ProcessCommand(wxCommandEvent& event); @@ -73,9 +73,9 @@ protected: // that are expected in the app menu void DoRearrange() ; - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); + virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE; private: // common part of all ctors @@ -125,16 +125,16 @@ public: virtual ~wxMenuBar(); // menubar construction - virtual bool Append( wxMenu *menu, const wxString &title ); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); + virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE; + virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE; + virtual wxMenu *Remove(size_t pos) wxOVERRIDE; - virtual void EnableTop( size_t pos, bool flag ); - virtual bool IsEnabledTop(size_t pos) const; - virtual void SetMenuLabel( size_t pos, const wxString& label ); - virtual wxString GetMenuLabel( size_t pos ) const; - virtual bool Enable( bool enable = true ); + virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE; + virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; + virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE; + virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE; + virtual bool Enable( bool enable = true ) wxOVERRIDE; // for virtual function hiding virtual void Enable( int itemid, bool enable ) { @@ -142,6 +142,7 @@ public: } // implementation from now on + // returns TRUE if we're attached to a frame bool IsAttached() const { return m_menuBarFrame != NULL; } // get the frame we live in @@ -149,7 +150,7 @@ public: // if the menubar is modified, the display is not updated automatically, // call this function to update it (m_menuBarFrame should be !NULL) - void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); + void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; #if wxABI_VERSION >= 30001 wxMenu *OSXGetAppleMenu() const { return m_appleMenu; } @@ -167,9 +168,9 @@ public: static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; } - 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 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; protected: // common part of all ctors diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h index 371b790b40..bb2cb8d75b 100644 --- a/include/wx/osx/menuitem.h +++ b/include/wx/osx/menuitem.h @@ -37,7 +37,7 @@ public: virtual ~wxMenuItem(); // override base class virtuals - virtual void SetItemLabel(const wxString& strName); + virtual void SetItemLabel(const wxString& strName) wxOVERRIDE; virtual void Enable(bool bDoEnable = true); virtual void Check(bool bDoCheck = true); diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h index 1851a08cad..c76b6c810d 100644 --- a/include/wx/osx/metafile.h +++ b/include/wx/osx/metafile.h @@ -56,8 +56,8 @@ public: WXHMETAFILE GetHMETAFILE() const ; void SetHMETAFILE(WXHMETAFILE mf) ; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxMetafile); }; @@ -81,7 +81,7 @@ public: void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } protected: - virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; wxMetafile* m_metaFile; @@ -149,17 +149,17 @@ public: { return m_metafile; } // implement base class pure virtuals - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize() const wxOVERRIDE; + virtual bool GetDataHere(void *buf) const wxOVERRIDE; + virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const + void *buf) const wxOVERRIDE { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) + size_t len, const void *buf) wxOVERRIDE { return SetData(len, buf); } protected: wxMetafile m_metafile; diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h index 4d6e9d6a87..81034fa5b1 100644 --- a/include/wx/osx/msgdlg.h +++ b/include/wx/osx/msgdlg.h @@ -25,11 +25,11 @@ public: ~wxMessageDialog(); #endif - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; #if wxOSX_USE_COCOA - virtual void ShowWindowModal(); - virtual void ModalFinishedCallback(void* panel, int resultCode); + virtual void ShowWindowModal() wxOVERRIDE; + virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE; #endif protected: diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index 41c9ca0492..af2c7bf3ed 100644 --- a/include/wx/osx/nonownedwnd.h +++ b/include/wx/osx/nonownedwnd.h @@ -63,16 +63,16 @@ public: virtual void SubclassWin(WXWindow nativeWindow); virtual void UnsubclassWin(); - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // implement base class pure virtuals - virtual bool SetTransparent(wxByte alpha); - virtual bool CanSetTransparent(); + virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; + virtual bool CanSetTransparent() wxOVERRIDE; - virtual bool SetBackgroundStyle(wxBackgroundStyle style); + virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - virtual void Update(); + virtual void Update() wxOVERRIDE; WXWindow GetWXWindow() const ; static wxNonOwnedWindow* GetFromWXWindow( WXWindow win ); @@ -90,21 +90,21 @@ public: static void MacDelayedDeactivation(long timestamp); virtual void MacActivate( long timestamp , bool inIsActivating ) ; - virtual void SetWindowStyleFlag(long flags); + virtual void SetWindowStyleFlag(long flags) wxOVERRIDE; - virtual void Raise(); - virtual void Lower(); - virtual bool Show( bool show = true ); + virtual void Raise() wxOVERRIDE; + virtual void Lower() wxOVERRIDE; + virtual bool Show( bool show = true ) wxOVERRIDE; - virtual void SetExtraStyle(long exStyle) ; + virtual void SetExtraStyle(long exStyle) wxOVERRIDE; - virtual bool SetBackgroundColour( const wxColour &colour ); + virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; } #if wxOSX_USE_COCOA_OR_IPHONE // override the base class method to return an NSWindow instead of NSView - virtual void *OSXGetViewOrWindow() const; + virtual void *OSXGetViewOrWindow() const wxOVERRIDE; #endif // Cocoa // osx specific event handling common for all osx-ports @@ -120,25 +120,25 @@ public: void WindowWasPainted(); - virtual bool Destroy(); + virtual bool Destroy() wxOVERRIDE; protected: // common part of all ctors void Init(); - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; virtual bool OSXShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout); + unsigned timeout) wxOVERRIDE; - virtual bool DoClearShape(); - virtual bool DoSetRegionShape(const wxRegion& region); + virtual bool DoClearShape() wxOVERRIDE; + virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; #if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path); + virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE; #endif // wxUSE_GRAPHICS_CONTEXT virtual void WillBeDestroyed(); diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h index 7c695ec1c9..982d88180a 100644 --- a/include/wx/osx/palette.h +++ b/include/wx/osx/palette.h @@ -27,11 +27,11 @@ public: int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; - virtual int GetColoursCount() const; + virtual int GetColoursCount() const wxOVERRIDE; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxPalette); diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h index f028df68e9..9136793dea 100644 --- a/include/wx/osx/pen.h +++ b/include/wx/osx/pen.h @@ -32,25 +32,25 @@ public: bool operator!=(const wxPen& pen) const { return !(*this == pen); } // Override in order to recreate the pen - void SetColour(const wxColour& col) ; - void SetColour(unsigned char r, unsigned char g, unsigned char b) ; + void SetColour(const wxColour& col) wxOVERRIDE; + void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; - void SetWidth(int width) ; - void SetStyle(wxPenStyle style) ; - void SetStipple(const wxBitmap& stipple) ; - void SetDashes(int nb_dashes, const wxDash *dash) ; - void SetJoin(wxPenJoin join) ; - void SetCap(wxPenCap cap) ; + void SetWidth(int width) wxOVERRIDE; + void SetStyle(wxPenStyle style) wxOVERRIDE; + void SetStipple(const wxBitmap& stipple) wxOVERRIDE; + void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE; + void SetJoin(wxPenJoin join) wxOVERRIDE; + void SetCap(wxPenCap cap) wxOVERRIDE; - wxColour GetColour() const ; - int GetWidth() const; - wxPenStyle GetStyle() const; - wxPenJoin GetJoin() const; - wxPenCap GetCap() const; - int GetDashes(wxDash **ptr) const; + wxColour GetColour() const wxOVERRIDE; + int GetWidth() const wxOVERRIDE; + wxPenStyle GetStyle() const wxOVERRIDE; + wxPenJoin GetJoin() const wxOVERRIDE; + wxPenCap GetCap() const wxOVERRIDE; + int GetDashes(wxDash **ptr) const wxOVERRIDE; int GetDashCount() const; - wxBitmap *GetStipple() const ; + wxBitmap *GetStipple() const wxOVERRIDE; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") @@ -65,8 +65,8 @@ public: bool RealizeResource(); protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: void Unshare(); diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h index 8d9be37dee..4bed655b40 100644 --- a/include/wx/osx/popupwin.h +++ b/include/wx/osx/popupwin.h @@ -26,7 +26,7 @@ public: bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - virtual bool Show(bool show = true); + virtual bool Show(bool show = true) wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow); }; diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h index 83fbd58dde..ffaf775200 100644 --- a/include/wx/osx/printdlg.h +++ b/include/wx/osx/printdlg.h @@ -33,11 +33,11 @@ public: virtual ~wxMacPrintDialog(); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; - virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } - virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } - virtual wxDC *GetPrintDC(); + virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; } + virtual wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); } + virtual wxDC *GetPrintDC() wxOVERRIDE; private: wxPrintDialogData m_printDialogData; @@ -60,10 +60,10 @@ public: wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual ~wxMacPageSetupDialog(); - virtual wxPageSetupDialogData& GetPageSetupDialogData(); + virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE; bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; private: wxPageSetupDialogData m_pageSetupData; @@ -86,7 +86,7 @@ class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog public: wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data); bool TransferToWindow(); - bool TransferDataFromWindow(); + bool TransferDataFromWindow() wxOVERRIDE; virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h index caf4aca61b..403e6fa1ab 100644 --- a/include/wx/osx/printmac.h +++ b/include/wx/osx/printmac.h @@ -27,9 +27,9 @@ public: virtual bool Print(wxWindow *parent, wxPrintout *printout, - bool prompt = true); - virtual wxDC* PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); + bool prompt = true) wxOVERRIDE; + virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; + virtual bool Setup(wxWindow *parent) wxOVERRIDE; }; @@ -51,8 +51,8 @@ public: wxPrintData *data); virtual ~wxMacPrintPreview(); - virtual bool Print(bool interactive); - virtual void DetermineScaling(); + virtual bool Print(bool interactive) wxOVERRIDE; + virtual void DetermineScaling() wxOVERRIDE; }; #endif diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h index 714d1984e9..73291b8d02 100644 --- a/include/wx/osx/radiobut.h +++ b/include/wx/osx/radiobut.h @@ -40,14 +40,14 @@ public: // implementation - void Command(wxCommandEvent& event); + void Command(wxCommandEvent& event) wxOVERRIDE; wxRadioButton *AddInCycle(wxRadioButton *cycle); void RemoveFromCycle(); wxRadioButton *NextInCycle() {return m_cycle;} // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; protected: wxRadioButton *m_cycle; diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h index 43edc4855a..e9b9c27e02 100644 --- a/include/wx/osx/sound.h +++ b/include/wx/osx/sound.h @@ -64,7 +64,7 @@ public: static void SoundStopped(const wxSoundData* data); protected: - bool DoPlay(unsigned flags) const; + bool DoPlay(unsigned flags) const wxOVERRIDE; void Init(); private: diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h index e8b48f3f89..8b7c5b843c 100644 --- a/include/wx/osx/spinbutt.h +++ b/include/wx/osx/spinbutt.h @@ -51,22 +51,22 @@ public: // accessors - virtual void SetRange(int minVal, int maxVal); - virtual int GetValue() const ; - virtual void SetValue(int val); + virtual void SetRange(int minVal, int maxVal) wxOVERRIDE; + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int val) wxOVERRIDE; // implementation - virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; protected: void SendThumbTrackEvent() ; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxSpinButton); diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h index 981d2c3fdb..364c478fd2 100644 --- a/include/wx/osx/statbox.h +++ b/include/wx/osx/statbox.h @@ -34,15 +34,15 @@ public: long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {} + virtual void Command(wxCommandEvent& WXUNUSED(event)) wxOVERRIDE {} virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } // protect native font of box - virtual bool SetFont( const wxFont &font ); + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; }; #endif diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h index 28c89a05d8..45249da560 100644 --- a/include/wx/osx/stattext.h +++ b/include/wx/osx/stattext.h @@ -34,20 +34,20 @@ public: const wxString& name = wxStaticTextNameStr); // accessors - void SetLabel( const wxString &str ) ; - bool SetFont( const wxFont &font ); + void SetLabel( const wxString &str ) wxOVERRIDE; + bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } protected : - virtual wxString DoGetLabel() const; - virtual void DoSetLabel(const wxString& str); + virtual wxString DoGetLabel() const wxOVERRIDE; + virtual void DoSetLabel(const wxString& str) wxOVERRIDE; - virtual wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const wxOVERRIDE; #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 wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h index 29939d8383..fe6350224a 100644 --- a/include/wx/osx/textentry.h +++ b/include/wx/osx/textentry.h @@ -34,58 +34,58 @@ public: wxTextEntry(); virtual ~wxTextEntry(); - virtual bool IsEditable() const; + virtual bool IsEditable() const wxOVERRIDE; // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const; + virtual void GetSelection(long* from, long* to) const wxOVERRIDE; // operations // ---------- // editing - virtual void Clear(); - virtual void Remove(long from, long to); + virtual void Clear() wxOVERRIDE; + virtual void Remove(long from, long to) wxOVERRIDE; // set the max number of characters which may be entered // in a single line text control - virtual void SetMaxLength(unsigned long len); + virtual void SetMaxLength(unsigned long len) wxOVERRIDE; - virtual void ForceUpper(); + virtual void ForceUpper() wxOVERRIDE; // writing text inserts it at the current position; // appending always inserts it at the end - virtual void WriteText(const wxString& text); + virtual void WriteText(const wxString& text) wxOVERRIDE; // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); + virtual void Copy() wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; + virtual bool CanCopy() const wxOVERRIDE; + virtual bool CanCut() const wxOVERRIDE; + virtual bool CanPaste() const wxOVERRIDE; // Undo/redo - virtual void Undo(); - virtual void Redo(); + virtual void Undo() wxOVERRIDE; + virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const; - virtual bool CanRedo() const; + virtual bool CanUndo() const wxOVERRIDE; + virtual bool CanRedo() const wxOVERRIDE; // Insertion point - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; + virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual void SetInsertionPointEnd() wxOVERRIDE; + virtual long GetInsertionPoint() const wxOVERRIDE; virtual wxTextPos GetLastPosition() const; - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); + virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void SetEditable(bool editable) wxOVERRIDE; virtual bool SendMaxLenEvent(); // set the grayed out hint text - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; + virtual bool SetHint(const wxString& hint) wxOVERRIDE; + virtual wxString GetHint() const wxOVERRIDE; // Implementation // -------------- @@ -95,10 +95,10 @@ public: protected: - virtual wxString DoGetValue() const; + virtual wxString DoGetValue() const wxOVERRIDE; - virtual bool DoAutoCompleteStrings(const wxArrayString& choices); - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); + virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE; + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE; // The object providing auto-completions or NULL if none. wxTextCompleter *m_completer; diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h index 1283d33f6c..8f7697b334 100644 --- a/include/wx/osx/tglbtn.h +++ b/include/wx/osx/tglbtn.h @@ -37,15 +37,15 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool value); - virtual bool GetValue() const ; + virtual void SetValue(bool value) wxOVERRIDE; + virtual bool GetValue() const wxOVERRIDE; - virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; - virtual void Command(wxCommandEvent& event); + virtual void Command(wxCommandEvent& event) wxOVERRIDE; protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton); diff --git a/include/wx/osx/timectrl.h b/include/wx/osx/timectrl.h index 6673fcce38..4cce4e9b43 100644 --- a/include/wx/osx/timectrl.h +++ b/include/wx/osx/timectrl.h @@ -41,7 +41,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTimePickerCtrlNameStr); - virtual void OSXGenerateEvent(const wxDateTime& dt); + virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); diff --git a/include/wx/qt/accel.h b/include/wx/qt/accel.h index 3e53300030..a988ffe206 100644 --- a/include/wx/qt/accel.h +++ b/include/wx/qt/accel.h @@ -52,8 +52,8 @@ public: protected: // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxObjectRefData *CreateRefData() const wxOVERRIDE; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); diff --git a/include/wx/qt/anybutton.h b/include/wx/qt/anybutton.h index eb3951aca7..85a8bb9cbe 100644 --- a/include/wx/qt/anybutton.h +++ b/include/wx/qt/anybutton.h @@ -23,9 +23,9 @@ public: // implementation // -------------- - virtual void SetLabel( const wxString &label ); + virtual void SetLabel( const wxString &label ) wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; // implementation only void QtUpdateState(); diff --git a/include/wx/qt/app.h b/include/wx/qt/app.h index 2c7d51ff97..b9f21141aa 100644 --- a/include/wx/qt/app.h +++ b/include/wx/qt/app.h @@ -18,7 +18,7 @@ public: wxApp(); ~wxApp(); - virtual bool Initialize(int& argc, wxChar **argv); + virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; private: wxScopedPtr m_qtApplication; diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h index 0da96633da..afd121f980 100644 --- a/include/wx/qt/bitmap.h +++ b/include/wx/qt/bitmap.h @@ -36,34 +36,34 @@ public: static void InitStandardHandlers(); - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); + virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; + virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc)); - virtual int GetHeight() const; - virtual int GetWidth() const; - virtual int GetDepth() const; + virtual int GetHeight() const wxOVERRIDE; + virtual int GetWidth() const wxOVERRIDE; + virtual int GetDepth() const wxOVERRIDE; #if wxUSE_IMAGE - virtual wxImage ConvertToImage() const; + virtual wxImage ConvertToImage() const wxOVERRIDE; #endif // wxUSE_IMAGE - virtual wxMask *GetMask() const; - virtual void SetMask(wxMask *mask); + virtual wxMask *GetMask() const wxOVERRIDE; + virtual void SetMask(wxMask *mask) wxOVERRIDE; - virtual wxBitmap GetSubBitmap(const wxRect& rect) const; + virtual wxBitmap GetSubBitmap(const wxRect& rect) const wxOVERRIDE; virtual bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const; - virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); + const wxPalette *palette = NULL) const wxOVERRIDE; + virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; #if wxUSE_PALETTE - virtual wxPalette *GetPalette() const; - virtual void SetPalette(const wxPalette& palette); + virtual wxPalette *GetPalette() const wxOVERRIDE; + virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; #endif // wxUSE_PALETTE // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); + virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE; // implementation: #if WXWIN_COMPATIBILITY_3_0 @@ -82,8 +82,8 @@ public: QPixmap *GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxBitmap); }; @@ -114,10 +114,10 @@ public: protected: // this function is called from Create() to free the existing mask data - void FreeData(); + void FreeData() wxOVERRIDE; // by the public wrappers - bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); - bool InitFromMonoBitmap(const wxBitmap& bitmap); + bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE; + bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE; wxBitmap GetBitmap() const; diff --git a/include/wx/qt/brush.h b/include/wx/qt/brush.h index 60c116574f..b060ce7952 100644 --- a/include/wx/qt/brush.h +++ b/include/wx/qt/brush.h @@ -21,17 +21,17 @@ public: wxBrush(const wxBitmap& stipple); - virtual void SetColour(const wxColour& col); - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); - virtual void SetStyle(wxBrushStyle style); - virtual void SetStipple(const wxBitmap& stipple); + virtual void SetColour(const wxColour& col) wxOVERRIDE; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; + virtual void SetStyle(wxBrushStyle style) wxOVERRIDE; + virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - virtual wxColour GetColour() const; - virtual wxBrushStyle GetStyle() const; - virtual wxBitmap *GetStipple() const; + virtual wxColour GetColour() const wxOVERRIDE; + virtual wxBrushStyle GetStyle() const wxOVERRIDE; + virtual wxBitmap *GetStipple() const wxOVERRIDE; wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") void SetStyle(int style) { SetStyle((wxBrushStyle)style); } @@ -39,8 +39,8 @@ public: QBrush GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxBrush); diff --git a/include/wx/qt/button.h b/include/wx/qt/button.h index d1b11c1f51..3560267734 100644 --- a/include/wx/qt/button.h +++ b/include/wx/qt/button.h @@ -29,7 +29,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual wxWindow *SetDefault(); + virtual wxWindow *SetDefault() wxOVERRIDE; // implementation only virtual int GetEventType() const wxOVERRIDE { return wxEVT_BUTTON; } diff --git a/include/wx/qt/calctrl.h b/include/wx/qt/calctrl.h index c8c7595750..abdf32c31e 100644 --- a/include/wx/qt/calctrl.h +++ b/include/wx/qt/calctrl.h @@ -39,41 +39,41 @@ public: long style = wxCAL_SHOW_HOLIDAYS, const wxString& name = wxCalendarNameStr); - virtual bool SetDate(const wxDateTime& date); - virtual wxDateTime GetDate() const; + virtual bool SetDate(const wxDateTime& date) wxOVERRIDE; + virtual wxDateTime GetDate() const wxOVERRIDE; virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime); - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const; + const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; - virtual bool EnableMonthChange(bool enable = true); - virtual void Mark(size_t day, bool mark); + virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; + virtual void Mark(size_t day, bool mark) wxOVERRIDE; // holidays colours - virtual void SetHoliday(size_t day); - virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg); - virtual const wxColour& GetHolidayColourFg() const { return m_colHolidayFg; } - virtual const wxColour& GetHolidayColourBg() const { return m_colHolidayBg; } + virtual void SetHoliday(size_t day) wxOVERRIDE; + virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE; + virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; } + virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; } // header colours - virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg); - virtual const wxColour& GetHeaderColourFg() const { return m_colHeaderFg; } - virtual const wxColour& GetHeaderColourBg() const { return m_colHeaderBg; } + virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE; + virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; } + virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; } // day attributes - virtual wxCalendarDateAttr *GetAttr(size_t day) const; - virtual void SetAttr(size_t day, wxCalendarDateAttr *attr); - virtual void ResetAttr(size_t day) { SetAttr(day, NULL); } + virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE; + virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE; + virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); } - virtual void SetWindowStyleFlag(long style); + virtual void SetWindowStyleFlag(long style) wxOVERRIDE; using wxCalendarCtrlBase::GenerateAllChangeEvents; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: - virtual void RefreshHolidays(); + virtual void RefreshHolidays() wxOVERRIDE; private: void Init(); diff --git a/include/wx/qt/checkbox.h b/include/wx/qt/checkbox.h index 82a28ec14f..ad59788c36 100644 --- a/include/wx/qt/checkbox.h +++ b/include/wx/qt/checkbox.h @@ -29,17 +29,17 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr ); - virtual void SetValue(bool value); - virtual bool GetValue() const; + virtual void SetValue(bool value) wxOVERRIDE; + virtual bool GetValue() const wxOVERRIDE; virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual wxString GetLabel() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: - virtual void DoSet3StateValue(wxCheckBoxState state); - virtual wxCheckBoxState DoGet3StateValue() const; + virtual void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE; + virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; private: QCheckBox *m_qtCheckBox; diff --git a/include/wx/qt/checklst.h b/include/wx/qt/checklst.h index 93d9c09a27..243225acf1 100644 --- a/include/wx/qt/checklst.h +++ b/include/wx/qt/checklst.h @@ -46,11 +46,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); - virtual bool IsChecked(unsigned int item) const; - virtual void Check(unsigned int item, bool check = true); + virtual bool IsChecked(unsigned int item) const wxOVERRIDE; + virtual void Check(unsigned int item, bool check = true) wxOVERRIDE; private: - virtual void Init(); //common construction + virtual void Init() wxOVERRIDE; //common construction wxDECLARE_DYNAMIC_CLASS(wxCheckListBox); }; diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h index 5808879ea8..5e8b1b7888 100644 --- a/include/wx/qt/choice.h +++ b/include/wx/qt/choice.h @@ -47,29 +47,29 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); + 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 void SetSelection(int n); - virtual int GetSelection() const; + virtual void SetSelection(int n) wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, - wxClientDataType type); - virtual int DoInsertOneItem(const wxString& item, unsigned int pos); + wxClientDataType type) wxOVERRIDE; + virtual int DoInsertOneItem(const wxString& item, unsigned int pos) 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; - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int pos); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE; void QtInitSort(QComboBox *combo); diff --git a/include/wx/qt/clipbrd.h b/include/wx/qt/clipbrd.h index 1a0cb22bb2..d81d704676 100644 --- a/include/wx/qt/clipbrd.h +++ b/include/wx/qt/clipbrd.h @@ -18,16 +18,16 @@ public: wxClipboard(); ~wxClipboard(); - virtual bool Open(); - virtual void Close(); - virtual bool IsOpened() const; + virtual bool Open() wxOVERRIDE; + virtual void Close() wxOVERRIDE; + virtual bool IsOpened() const wxOVERRIDE; - virtual bool AddData( wxDataObject *data ); - virtual bool SetData( wxDataObject *data ); - virtual bool GetData( wxDataObject& data ); - virtual void Clear(); - virtual bool IsSupported( const wxDataFormat& format ); - virtual bool IsSupportedAsync(wxEvtHandler *sink); + virtual bool AddData( wxDataObject *data ) wxOVERRIDE; + virtual bool SetData( wxDataObject *data ) wxOVERRIDE; + virtual bool GetData( wxDataObject& data ) wxOVERRIDE; + virtual void Clear() wxOVERRIDE; + virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; + virtual bool IsSupportedAsync(wxEvtHandler *sink) wxOVERRIDE; private: friend class QtClipBoardSignalHandler; diff --git a/include/wx/qt/clrpicker.h b/include/wx/qt/clrpicker.h index 0ba5f0ea49..c3a9ea3096 100644 --- a/include/wx/qt/clrpicker.h +++ b/include/wx/qt/clrpicker.h @@ -42,7 +42,7 @@ public: const wxString& name = wxColourPickerWidgetNameStr); protected: - virtual void UpdateColour(); + virtual void UpdateColour() wxOVERRIDE; private: }; diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h index 52018c500d..f6d041f5fe 100644 --- a/include/wx/qt/colour.h +++ b/include/wx/qt/colour.h @@ -18,12 +18,12 @@ public: DEFINE_STD_WXCOLOUR_CONSTRUCTORS wxColour(const QColor& color); - virtual bool IsOk() const { return m_valid; } + virtual bool IsOk() const wxOVERRIDE { return m_valid; } - ChannelType Red() const { return m_red; } - ChannelType Green() const { return m_green; } - ChannelType Blue() const { return m_blue; } - ChannelType Alpha() const { return m_alpha; } + ChannelType Red() const wxOVERRIDE { return m_red; } + ChannelType Green() const wxOVERRIDE { return m_green; } + ChannelType Blue() const wxOVERRIDE { return m_blue; } + ChannelType Alpha() const wxOVERRIDE { return m_alpha; } bool operator==(const wxColour& color) const; bool operator!=(const wxColour& color) const; @@ -34,7 +34,7 @@ public: protected: void Init(); - virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a); + virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE; private: ChannelType m_red, m_green, m_blue, m_alpha; diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h index be112cd036..189a2b0932 100644 --- a/include/wx/qt/control.h +++ b/include/wx/qt/control.h @@ -24,7 +24,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; protected: bool QtCreateControl( wxWindow *parent, wxWindowID id, const wxPoint &pos, diff --git a/include/wx/qt/cursor.h b/include/wx/qt/cursor.h index 218564e32d..92f0a7bc8c 100644 --- a/include/wx/qt/cursor.h +++ b/include/wx/qt/cursor.h @@ -27,7 +27,7 @@ public: int hotSpotX = 0, int hotSpotY = 0); #endif - virtual wxPoint GetHotSpot() const; + virtual wxPoint GetHotSpot() const wxOVERRIDE; QCursor &GetHandle() const; protected: @@ -38,8 +38,8 @@ protected: private: void Init(); - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxCursor); }; diff --git a/include/wx/qt/dc.h b/include/wx/qt/dc.h index 76abb7a43b..94f3261780 100644 --- a/include/wx/qt/dc.h +++ b/include/wx/qt/dc.h @@ -19,73 +19,73 @@ public: wxQtDCImpl( wxDC *owner ); ~wxQtDCImpl(); - virtual bool CanDrawBitmap() const; - virtual bool CanGetTextExtent() const; + virtual bool CanDrawBitmap() const wxOVERRIDE; + virtual bool CanGetTextExtent() const wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetSizeMM(int* width, int* height) const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; - virtual int GetDepth() const; - virtual wxSize GetPPI() const; + virtual int GetDepth() const wxOVERRIDE; + virtual wxSize GetPPI() const wxOVERRIDE; - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); - virtual void SetBrush(const wxBrush& brush); - virtual void SetBackground(const wxBrush& brush); - virtual void SetBackgroundMode(int mode); + virtual void SetFont(const wxFont& font) wxOVERRIDE; + virtual void SetPen(const wxPen& pen) wxOVERRIDE; + virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; + virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; + virtual void SetBackgroundMode(int mode) wxOVERRIDE; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette); + virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; #endif // wxUSE_PALETTE - virtual void SetLogicalFunction(wxRasterOperationMode function); + virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; + virtual wxCoord GetCharHeight() const wxOVERRIDE; + virtual wxCoord GetCharWidth() const wxOVERRIDE; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; + const wxFont *theFont = NULL) const wxOVERRIDE; - virtual void Clear(); + virtual void Clear() wxOVERRIDE; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); + wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoSetDeviceClippingRegion(const wxRegion& region); - virtual void DestroyClippingRegion(); + virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; + virtual void DestroyClippingRegion() wxOVERRIDE; virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE); - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; + wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; - virtual void DoDrawPoint(wxCoord x, wxCoord y); - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); + virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc); + wxCoord xc, wxCoord yc) wxOVERRIDE; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); + double sa, double ea) wxOVERRIDE; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius); + double radius) wxOVERRIDE; virtual void DoDrawEllipse(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); + wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoCrossHair(wxCoord x, wxCoord y); + virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false); + bool useMask = false) wxOVERRIDE; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle); + wxCoord x, wxCoord y, double angle) wxOVERRIDE; virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, @@ -94,21 +94,21 @@ public: wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord); + wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset ); + wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; // Use Qt transformations, as they automatically scale pen widths, text... - virtual void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin() wxOVERRIDE; void QtPreparePainter(); - virtual void* GetHandle() const { return (void*) m_qtPainter; } + virtual void* GetHandle() const wxOVERRIDE { return (void*) m_qtPainter; } protected: virtual QPixmap *GetQPixmap() { return m_qtPixmap; } diff --git a/include/wx/qt/dcmemory.h b/include/wx/qt/dcmemory.h index 5f1e333cf6..9dddf6e8b4 100644 --- a/include/wx/qt/dcmemory.h +++ b/include/wx/qt/dcmemory.h @@ -18,11 +18,11 @@ public: wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); ~wxMemoryDCImpl(); - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; - virtual void DoSelect(const wxBitmap& bitmap); + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; + virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; - virtual const wxBitmap& GetSelectedBitmap() const; - virtual wxBitmap& GetSelectedBitmap(); + virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE; + virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE; private: wxBitmap m_selected; diff --git a/include/wx/qt/dcprint.h b/include/wx/qt/dcprint.h index 2c9dfce4f8..51b7bee533 100644 --- a/include/wx/qt/dcprint.h +++ b/include/wx/qt/dcprint.h @@ -15,72 +15,72 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl public: wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & ); - virtual bool CanDrawBitmap() const; - virtual bool CanGetTextExtent() const; + virtual bool CanDrawBitmap() const wxOVERRIDE; + virtual bool CanGetTextExtent() const wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetSizeMM(int* width, int* height) const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; - virtual int GetDepth() const; - virtual wxSize GetPPI() const; + virtual int GetDepth() const wxOVERRIDE; + virtual wxSize GetPPI() const wxOVERRIDE; - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); - virtual void SetBrush(const wxBrush& brush); - virtual void SetBackground(const wxBrush& brush); - virtual void SetBackgroundMode(int mode); + virtual void SetFont(const wxFont& font) wxOVERRIDE; + virtual void SetPen(const wxPen& pen) wxOVERRIDE; + virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; + virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; + virtual void SetBackgroundMode(int mode) wxOVERRIDE; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette); + virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; #endif // wxUSE_PALETTE - virtual void SetLogicalFunction(wxRasterOperationMode function); + virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; + virtual wxCoord GetCharHeight() const wxOVERRIDE; + virtual wxCoord GetCharWidth() const wxOVERRIDE; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; + const wxFont *theFont = NULL) const wxOVERRIDE; - virtual void Clear(); + virtual void Clear() wxOVERRIDE; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); + wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoSetDeviceClippingRegion(const wxRegion& region); + virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE); + wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; - virtual void DoDrawPoint(wxCoord x, wxCoord y); - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); + virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc); + wxCoord xc, wxCoord yc) wxOVERRIDE; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); + double sa, double ea) wxOVERRIDE; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius); + double radius) wxOVERRIDE; virtual void DoDrawEllipse(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); + wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoCrossHair(wxCoord x, wxCoord y); + virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false); + bool useMask = false) wxOVERRIDE; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle); + wxCoord x, wxCoord y, double angle) wxOVERRIDE; virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, @@ -89,14 +89,14 @@ public: wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord); + wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset ); + wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; private: wxDECLARE_CLASS(wxPrinterDCImpl); diff --git a/include/wx/qt/dnd.h b/include/wx/qt/dnd.h index b497daf58e..a2e595ec57 100644 --- a/include/wx/qt/dnd.h +++ b/include/wx/qt/dnd.h @@ -46,7 +46,7 @@ public: const wxCursor &move = wxNullCursor, const wxCursor &none = wxNullCursor); - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; private: wxWindow* m_parentWindow; diff --git a/include/wx/qt/font.h b/include/wx/qt/font.h index 391623dcb9..78535e6886 100644 --- a/include/wx/qt/font.h +++ b/include/wx/qt/font.h @@ -53,33 +53,33 @@ public: virtual int GetPointSize() const wxOVERRIDE; virtual float GetFractionalPointSize() const wxOVERRIDE; virtual wxSize GetPixelSize() const wxOVERRIDE; - virtual wxFontStyle GetStyle() const; + virtual wxFontStyle GetStyle() const wxOVERRIDE; virtual int GetNumericWeight() const wxOVERRIDE; - virtual bool GetUnderlined() const; - virtual wxString GetFaceName() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; + virtual bool GetUnderlined() const wxOVERRIDE; + virtual wxString GetFaceName() const wxOVERRIDE; + virtual wxFontEncoding GetEncoding() const wxOVERRIDE; + virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE; virtual bool GetStrikethrough() const wxOVERRIDE; // change the font characteristics virtual void SetFractionalPointSize(float pointSize) wxOVERRIDE; virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE; - virtual void SetFamily( wxFontFamily family ); - virtual void SetStyle( wxFontStyle style ); + virtual void SetFamily( wxFontFamily family ) wxOVERRIDE; + virtual void SetStyle( wxFontStyle style ) wxOVERRIDE; virtual void SetNumericWeight(int weight) wxOVERRIDE; - virtual bool SetFaceName(const wxString& facename); - virtual void SetUnderlined( bool underlined ); + virtual bool SetFaceName(const wxString& facename) wxOVERRIDE; + virtual void SetUnderlined( bool underlined ) wxOVERRIDE; virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE; - virtual void SetEncoding(wxFontEncoding encoding); + virtual void SetEncoding(wxFontEncoding encoding) wxOVERRIDE; wxDECLARE_COMMON_FONT_METHODS(); virtual QFont GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - virtual wxFontFamily DoGetFamily() const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxFontFamily DoGetFamily() const wxOVERRIDE; virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxFont); diff --git a/include/wx/qt/fontdlg.h b/include/wx/qt/fontdlg.h index a170578ffa..91113b229d 100644 --- a/include/wx/qt/fontdlg.h +++ b/include/wx/qt/fontdlg.h @@ -18,7 +18,7 @@ public: wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); } protected: - bool DoCreate(wxWindow *parent); + bool DoCreate(wxWindow *parent) wxOVERRIDE; private: diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h index 4e164f3d26..4905911d79 100644 --- a/include/wx/qt/frame.h +++ b/include/wx/qt/frame.h @@ -42,20 +42,20 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual void SetMenuBar(wxMenuBar *menubar); - virtual void SetStatusBar(wxStatusBar *statusBar ); - virtual void SetToolBar(wxToolBar *toolbar); + virtual void SetMenuBar(wxMenuBar *menubar) wxOVERRIDE; + virtual void SetStatusBar(wxStatusBar *statusBar ) wxOVERRIDE; + virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; - virtual void SetWindowStyleFlag( long style ); + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual void AddChild( wxWindowBase *child ); - virtual void RemoveChild( wxWindowBase *child ); + virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; + virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; QMainWindow *GetQMainWindow() const; - virtual QScrollArea *QtGetScrollBarsContainer() const; + virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE; protected: - virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; private: // Common part of all ctors. diff --git a/include/wx/qt/gauge.h b/include/wx/qt/gauge.h index fc59debbe8..a3e6d39db1 100644 --- a/include/wx/qt/gauge.h +++ b/include/wx/qt/gauge.h @@ -33,14 +33,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxGaugeNameStr); - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; // set/get the control range - virtual void SetRange(int range); - virtual int GetRange() const; + virtual void SetRange(int range) wxOVERRIDE; + virtual int GetRange() const wxOVERRIDE; - virtual void SetValue(int pos); - virtual int GetValue() const; + virtual void SetValue(int pos) wxOVERRIDE; + virtual int GetValue() const wxOVERRIDE; private: QProgressBar *m_qtProgressBar; diff --git a/include/wx/qt/glcanvas.h b/include/wx/qt/glcanvas.h index 0e872e343f..08fc13b887 100644 --- a/include/wx/qt/glcanvas.h +++ b/include/wx/qt/glcanvas.h @@ -75,7 +75,7 @@ public: const int *attribList = NULL, const wxPalette& palette = wxNullPalette); - virtual bool SwapBuffers(); + virtual bool SwapBuffers() wxOVERRIDE; static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format); diff --git a/include/wx/qt/listbox.h b/include/wx/qt/listbox.h index f3acc6eb5f..9ebaf91a66 100644 --- a/include/wx/qt/listbox.h +++ b/include/wx/qt/listbox.h @@ -52,13 +52,13 @@ public: virtual bool IsSelected(int n) const wxOVERRIDE; virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); + 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 GetSelection() const; + virtual int GetSelection() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected); @@ -70,16 +70,16 @@ protected: virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, - wxClientDataType type); - virtual int DoInsertOneItem(const wxString& item, unsigned int pos); + wxClientDataType type) wxOVERRIDE; + virtual int DoInsertOneItem(const wxString& item, unsigned int pos) 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; - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int pos); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE; - virtual QScrollArea *QtGetScrollBarsContainer() const; + virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE; #if wxUSE_CHECKLISTBOX bool m_hasCheckBoxes; diff --git a/include/wx/qt/listctrl.h b/include/wx/qt/listctrl.h index 5d3a135fa7..139bbc698d 100644 --- a/include/wx/qt/listctrl.h +++ b/include/wx/qt/listctrl.h @@ -42,20 +42,20 @@ public: //////////////////////////////////////////////////////////////////////////// // Set the control colours - bool SetForegroundColour(const wxColour& col); - bool SetBackgroundColour(const wxColour& col); + bool SetForegroundColour(const wxColour& col) wxOVERRIDE; + bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; // Gets information about this column - bool GetColumn(int col, wxListItem& info) const; + bool GetColumn(int col, wxListItem& info) const wxOVERRIDE; // Sets information about this column - bool SetColumn(int col, const wxListItem& info); + bool SetColumn(int col, const wxListItem& info) wxOVERRIDE; // Gets the column width - int GetColumnWidth(int col) const; + int GetColumnWidth(int col) const wxOVERRIDE; // Sets the column width - bool SetColumnWidth(int col, int width); + bool SetColumnWidth(int col, int width) wxOVERRIDE; // Gets the column order from its index or index from its order @@ -129,7 +129,7 @@ public: int GetItemCount() const; // Gets the number of columns in the list control - int GetColumnCount() const; + int GetColumnCount() const wxOVERRIDE; // get the horizontal and vertical components of the item spacing wxSize GetItemSpacing() const; @@ -163,7 +163,7 @@ public: void SetSingleStyle(long style, bool add = true); // Set the whole window style - void SetWindowStyleFlag(long style); + void SetWindowStyleFlag(long style) wxOVERRIDE; // Searches for an item, starting from 'item'. // item can be -1 to find the first item that matches the @@ -172,11 +172,11 @@ public: long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const; // Gets one of the three image lists - wxImageList *GetImageList(int which) const; + wxImageList *GetImageList(int which) const wxOVERRIDE; // Sets the image list - void SetImageList(wxImageList *imageList, int which); - void AssignImageList(wxImageList *imageList, int which); + void SetImageList(wxImageList *imageList, int which) wxOVERRIDE; + void AssignImageList(wxImageList *imageList, int which) wxOVERRIDE; // refresh items selectively (only useful for virtual list controls) void RefreshItem(long item); @@ -195,10 +195,10 @@ public: bool DeleteAllItems(); // Deletes a column - bool DeleteColumn(int col); + bool DeleteColumn(int col) wxOVERRIDE; // Deletes all columns - bool DeleteAllColumns(); + bool DeleteAllColumns() wxOVERRIDE; // Clears items, and columns if there are any. void ClearAll(); @@ -286,7 +286,7 @@ public: return OnGetItemAttr(item); } - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: void Init(); diff --git a/include/wx/qt/mdi.h b/include/wx/qt/mdi.h index a1970ba322..37448988a0 100644 --- a/include/wx/qt/mdi.h +++ b/include/wx/qt/mdi.h @@ -33,8 +33,8 @@ public: static bool IsTDI() { return false; } - virtual void ActivateNext(); - virtual void ActivatePrevious(); + virtual void ActivateNext() wxOVERRIDE; + virtual void ActivatePrevious() wxOVERRIDE; protected: @@ -64,7 +64,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual void Activate(); + virtual void Activate() wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame); }; @@ -76,7 +76,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase public: wxMDIClientWindow(); - virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); + virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); }; diff --git a/include/wx/qt/msgdlg.h b/include/wx/qt/msgdlg.h index 08b3c6437d..513d50a0d5 100644 --- a/include/wx/qt/msgdlg.h +++ b/include/wx/qt/msgdlg.h @@ -22,7 +22,7 @@ public: virtual ~wxMessageDialog(); // Reimplemented to translate return codes from Qt to wx - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog); diff --git a/include/wx/qt/notebook.h b/include/wx/qt/notebook.h index 6fbb072b7c..7b580b0245 100644 --- a/include/wx/qt/notebook.h +++ b/include/wx/qt/notebook.h @@ -28,29 +28,29 @@ public: long style = 0, const wxString& name = wxNotebookNameStr); - virtual void SetPadding(const wxSize& padding); - virtual void SetTabSize(const wxSize& sz); + virtual void SetPadding(const wxSize& padding) wxOVERRIDE; + virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; - virtual bool SetPageText(size_t n, const wxString& strText); - virtual wxString GetPageText(size_t n) const; + virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE; + virtual wxString GetPageText(size_t n) const wxOVERRIDE; - virtual int GetPageImage(size_t n) const; - virtual bool SetPageImage(size_t n, int imageId); + virtual int GetPageImage(size_t n) const wxOVERRIDE; + virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, - bool bSelect = false, int imageId = -1); + bool bSelect = false, int imageId = -1) wxOVERRIDE; - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - int SetSelection(size_t nPage); - int ChangeSelection(size_t nPage); + int SetSelection(size_t nPage) wxOVERRIDE; + int ChangeSelection(size_t nPage) wxOVERRIDE; virtual bool DeleteAllPages() wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: - virtual wxWindow *DoRemovePage(size_t page); + virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; private: QTabWidget *m_qtTabWidget; diff --git a/include/wx/qt/palette.h b/include/wx/qt/palette.h index 331130f79c..23d221bc97 100644 --- a/include/wx/qt/palette.h +++ b/include/wx/qt/palette.h @@ -20,8 +20,8 @@ public: int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxPalette); diff --git a/include/wx/qt/pen.h b/include/wx/qt/pen.h index c9d78b56ad..a095b0bd77 100644 --- a/include/wx/qt/pen.h +++ b/include/wx/qt/pen.h @@ -23,23 +23,23 @@ public: bool operator==(const wxPen& pen) const; bool operator!=(const wxPen& pen) const; - virtual void SetColour(const wxColour& col); - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); + virtual void SetColour(const wxColour& col) wxOVERRIDE; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; - virtual void SetWidth(int width); - virtual void SetStyle(wxPenStyle style); - virtual void SetStipple(const wxBitmap& stipple); - virtual void SetDashes(int nb_dashes, const wxDash *dash); - virtual void SetJoin(wxPenJoin join); - virtual void SetCap(wxPenCap cap); + virtual void SetWidth(int width) wxOVERRIDE; + virtual void SetStyle(wxPenStyle style) wxOVERRIDE; + virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; + virtual void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE; + virtual void SetJoin(wxPenJoin join) wxOVERRIDE; + virtual void SetCap(wxPenCap cap) wxOVERRIDE; - virtual wxColour GetColour() const; - virtual wxBitmap *GetStipple() const; - virtual wxPenStyle GetStyle() const; - virtual wxPenJoin GetJoin() const; - virtual wxPenCap GetCap() const; - virtual int GetWidth() const; - virtual int GetDashes(wxDash **ptr) const; + virtual wxColour GetColour() const wxOVERRIDE; + virtual wxBitmap *GetStipple() const wxOVERRIDE; + virtual wxPenStyle GetStyle() const wxOVERRIDE; + virtual wxPenJoin GetJoin() const wxOVERRIDE; + virtual wxPenCap GetCap() const wxOVERRIDE; + virtual int GetWidth() const wxOVERRIDE; + virtual int GetDashes(wxDash **ptr) const wxOVERRIDE; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") void SetStyle(int style) { SetStyle((wxPenStyle)style); } @@ -47,8 +47,8 @@ public: QPen GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxPen); diff --git a/include/wx/qt/printdlg.h b/include/wx/qt/printdlg.h index 1fd43ed1e9..93b62f5e78 100644 --- a/include/wx/qt/printdlg.h +++ b/include/wx/qt/printdlg.h @@ -16,10 +16,10 @@ class WXDLLIMPEXP_CORE wxQtPrintNativeData: public wxPrintNativeDataBase public: wxQtPrintNativeData(); - virtual bool TransferTo( wxPrintData &data ); - virtual bool TransferFrom( const wxPrintData &data ); + virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; + virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; - virtual bool IsOk() const; + virtual bool IsOk() const wxOVERRIDE; }; @@ -29,9 +29,9 @@ public: wxQtPrintDialog(wxWindow *parent, wxPrintDialogData *data); wxQtPrintDialog(wxWindow *parent, wxPrintData *data); - virtual wxPrintDialogData& GetPrintDialogData(); - virtual wxPrintData& GetPrintData(); - virtual wxDC *GetPrintDC(); + virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE; + virtual wxPrintData& GetPrintData() wxOVERRIDE; + virtual wxDC *GetPrintDC() wxOVERRIDE; protected: @@ -48,7 +48,7 @@ public: bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual wxPageSetupDialogData& GetPageSetupDialogData(); + virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE; private: }; diff --git a/include/wx/qt/printqt.h b/include/wx/qt/printqt.h index 65c44bc194..2e0e765237 100644 --- a/include/wx/qt/printqt.h +++ b/include/wx/qt/printqt.h @@ -15,9 +15,9 @@ class WXDLLIMPEXP_CORE wxQtPrinter : public wxPrinterBase public: wxQtPrinter( wxPrintDialogData *data = NULL ); - virtual bool Setup(wxWindow *parent); - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true); - virtual wxDC* PrintDialog(wxWindow *parent); + virtual bool Setup(wxWindow *parent) wxOVERRIDE; + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE; + virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; private: }; @@ -33,8 +33,8 @@ public: wxPrintout *printoutForPrinting, wxPrintData *data); - virtual bool Print(bool interactive); - virtual void DetermineScaling(); + virtual bool Print(bool interactive) wxOVERRIDE; + virtual void DetermineScaling() wxOVERRIDE; protected: }; diff --git a/include/wx/qt/private/timer.h b/include/wx/qt/private/timer.h index d1d5790428..ab046291c0 100644 --- a/include/wx/qt/private/timer.h +++ b/include/wx/qt/private/timer.h @@ -23,12 +23,12 @@ class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject public: wxQtTimerImpl( wxTimer* timer ); - virtual bool Start( int millisecs = -1, bool oneShot = false ); - virtual void Stop(); - virtual bool IsRunning() const; + virtual bool Start( int millisecs = -1, bool oneShot = false ) wxOVERRIDE; + virtual void Stop() wxOVERRIDE; + virtual bool IsRunning() const wxOVERRIDE; protected: - virtual void timerEvent( QTimerEvent * event ); + virtual void timerEvent( QTimerEvent * event ) wxOVERRIDE; private: int m_timerId; diff --git a/include/wx/qt/private/winevent.h b/include/wx/qt/private/winevent.h index a8465b542a..5137f6d00e 100644 --- a/include/wx/qt/private/winevent.h +++ b/include/wx/qt/private/winevent.h @@ -67,7 +67,7 @@ public: { } - virtual Handler *GetHandler() const + virtual Handler *GetHandler() const wxOVERRIDE { // Only process the signal / event if the wxWindow is not destroyed if ( !wxWindow::QtRetrieveWindowPointer( this ) ) @@ -84,7 +84,7 @@ protected: * wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */ //wxActivateEvent - virtual void changeEvent ( QEvent * event ) + virtual void changeEvent ( QEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -96,7 +96,7 @@ protected: } //wxCloseEvent - virtual void closeEvent ( QCloseEvent * event ) + virtual void closeEvent ( QCloseEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -108,7 +108,7 @@ protected: } //wxContextMenuEvent - virtual void contextMenuEvent ( QContextMenuEvent * event ) + virtual void contextMenuEvent ( QContextMenuEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -123,7 +123,7 @@ protected: //virtual void dropEvent ( QDropEvent * event ) { } //wxMouseEvent - virtual void enterEvent ( QEvent * event ) + virtual void enterEvent ( QEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -135,7 +135,7 @@ protected: } //wxFocusEvent. - virtual void focusInEvent ( QFocusEvent * event ) + virtual void focusInEvent ( QFocusEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -147,7 +147,7 @@ protected: } //wxFocusEvent. - virtual void focusOutEvent ( QFocusEvent * event ) + virtual void focusOutEvent ( QFocusEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -159,7 +159,7 @@ protected: } //wxShowEvent - virtual void hideEvent ( QHideEvent * event ) + virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -171,7 +171,7 @@ protected: } //wxKeyEvent - virtual void keyPressEvent ( QKeyEvent * event ) + virtual void keyPressEvent ( QKeyEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -183,7 +183,7 @@ protected: } //wxKeyEvent - virtual void keyReleaseEvent ( QKeyEvent * event ) + virtual void keyReleaseEvent ( QKeyEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -195,7 +195,7 @@ protected: } //wxMouseEvent - virtual void leaveEvent ( QEvent * event ) + virtual void leaveEvent ( QEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -207,7 +207,7 @@ protected: } //wxMouseEvent - virtual void mouseDoubleClickEvent ( QMouseEvent * event ) + virtual void mouseDoubleClickEvent ( QMouseEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -219,7 +219,7 @@ protected: } //wxMouseEvent - virtual void mouseMoveEvent ( QMouseEvent * event ) + virtual void mouseMoveEvent ( QMouseEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -231,7 +231,7 @@ protected: } //wxMouseEvent - virtual void mousePressEvent ( QMouseEvent * event ) + virtual void mousePressEvent ( QMouseEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -243,7 +243,7 @@ protected: } //wxMouseEvent - virtual void mouseReleaseEvent ( QMouseEvent * event ) + virtual void mouseReleaseEvent ( QMouseEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -255,7 +255,7 @@ protected: } //wxMoveEvent - virtual void moveEvent ( QMoveEvent * event ) + virtual void moveEvent ( QMoveEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -267,7 +267,7 @@ protected: } //wxEraseEvent then wxPaintEvent - virtual void paintEvent ( QPaintEvent * event ) + virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -279,7 +279,7 @@ protected: } //wxSizeEvent - virtual void resizeEvent ( QResizeEvent * event ) + virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -291,7 +291,7 @@ protected: } //wxShowEvent - virtual void showEvent ( QShowEvent * event ) + virtual void showEvent ( QShowEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; @@ -303,7 +303,7 @@ protected: } //wxMouseEvent - virtual void wheelEvent ( QWheelEvent * event ) + virtual void wheelEvent ( QWheelEvent * event ) wxOVERRIDE { if ( !this->GetHandler() ) return; diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h index a3149e25e6..43ca8284ba 100644 --- a/include/wx/qt/radiobox.h +++ b/include/wx/qt/radiobox.h @@ -72,14 +72,14 @@ public: virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); + 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 void SetSelection(int n); - virtual int GetSelection() const; + virtual void SetSelection(int n) wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; private: // The 'visual' group box: diff --git a/include/wx/qt/radiobut.h b/include/wx/qt/radiobut.h index 56864e9094..104d262e2d 100644 --- a/include/wx/qt/radiobut.h +++ b/include/wx/qt/radiobut.h @@ -35,7 +35,7 @@ public: virtual void SetValue(bool value); virtual bool GetValue() const; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; private: QRadioButton *m_qtRadioButton; diff --git a/include/wx/qt/region.h b/include/wx/qt/region.h index a1cb66c111..a308cb0f25 100644 --- a/include/wx/qt/region.h +++ b/include/wx/qt/region.h @@ -24,29 +24,29 @@ public: wxRegion(const wxBitmap& bmp); wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); - virtual bool IsEmpty() const; - virtual void Clear(); + virtual bool IsEmpty() const wxOVERRIDE; + virtual void Clear() wxOVERRIDE; virtual const QRegion &GetHandle() const; virtual void QtSetRegion(QRegion region); // Hangs on to this region protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; + virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE; - virtual bool DoOffset(wxCoord x, wxCoord y); + virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); + virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; + virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE; - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); + virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE; + virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE; + virtual bool DoXor(const wxRegion& region) wxOVERRIDE; virtual bool DoCombine(const wxRegion& rgn, wxRegionOp op); diff --git a/include/wx/qt/scrolbar.h b/include/wx/qt/scrolbar.h index e1ea3ebe4b..87d7b7f90c 100644 --- a/include/wx/qt/scrolbar.h +++ b/include/wx/qt/scrolbar.h @@ -32,18 +32,18 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - virtual int GetThumbPosition() const; - virtual int GetThumbSize() const; - virtual int GetPageSize() const; - virtual int GetRange() const; + virtual int GetThumbPosition() const wxOVERRIDE; + virtual int GetThumbSize() const wxOVERRIDE; + virtual int GetPageSize() const wxOVERRIDE; + virtual int GetRange() const wxOVERRIDE; - 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); + bool refresh = true) wxOVERRIDE; QScrollBar *GetQScrollBar() const { return m_qtScrollBar; } - QWidget *GetHandle() const; + QWidget *GetHandle() const wxOVERRIDE; private: QScrollBar *m_qtScrollBar; diff --git a/include/wx/qt/slider.h b/include/wx/qt/slider.h index 0a183f84b1..823df0a0bc 100644 --- a/include/wx/qt/slider.h +++ b/include/wx/qt/slider.h @@ -32,25 +32,25 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxSliderNameStr); - virtual int GetValue() const; - virtual void SetValue(int value); + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int value) wxOVERRIDE; - virtual void SetRange(int minValue, int maxValue); - virtual int GetMin() const; - virtual int GetMax() const; + virtual void SetRange(int minValue, int maxValue) wxOVERRIDE; + virtual int GetMin() const wxOVERRIDE; + virtual int GetMax() const wxOVERRIDE; - virtual void DoSetTickFreq(int freq); - virtual int GetTickFreq() const; + virtual void DoSetTickFreq(int freq) wxOVERRIDE; + virtual int GetTickFreq() const wxOVERRIDE; - virtual void SetLineSize(int lineSize); - virtual void SetPageSize(int pageSize); - virtual int GetLineSize() const; - virtual int GetPageSize() const; + virtual void SetLineSize(int lineSize) wxOVERRIDE; + virtual void SetPageSize(int pageSize) wxOVERRIDE; + virtual int GetLineSize() const wxOVERRIDE; + virtual int GetPageSize() const wxOVERRIDE; - virtual void SetThumbLength(int lenPixels); - virtual int GetThumbLength() const; + virtual void SetThumbLength(int lenPixels) wxOVERRIDE; + virtual int GetThumbLength() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; private: QSlider *m_qtSlider; diff --git a/include/wx/qt/spinbutt.h b/include/wx/qt/spinbutt.h index 10771bc0bf..fe69e878a9 100644 --- a/include/wx/qt/spinbutt.h +++ b/include/wx/qt/spinbutt.h @@ -29,11 +29,11 @@ public: long style = wxSP_VERTICAL, const wxString& name = wxSPIN_BUTTON_NAME); - virtual int GetValue() const; - virtual void SetValue(int val); + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int val) wxOVERRIDE; virtual void SetRange(int min, int max) wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; private: QSpinBox *m_qtSpinBox; diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h index 714dc5982b..9355ff9fc6 100644 --- a/include/wx/qt/spinctrl.h +++ b/include/wx/qt/spinctrl.h @@ -29,12 +29,12 @@ public: T min, T max, T initial, T inc, const wxString& name ); - virtual void SetValue(const wxString&) {} + virtual void SetValue(const wxString&) wxOVERRIDE {} - virtual void SetSnapToTicks(bool snap_to_ticks); - virtual bool GetSnapToTicks() const; + virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE; + virtual bool GetSnapToTicks() const wxOVERRIDE; - virtual void SetSelection(long from, long to); + virtual void SetSelection(long from, long to) wxOVERRIDE; virtual void SetValue(T val); void SetRange(T minVal, T maxVal); @@ -45,7 +45,7 @@ public: T GetMax() const; T GetIncrement() const; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: Widget *m_qtSpinBox; @@ -75,8 +75,8 @@ public: const wxString& name = wxT("wxSpinCtrl")); virtual int GetBase() const wxOVERRIDE { return m_base; } virtual bool SetBase(int base) wxOVERRIDE; - virtual void SetValue(const wxString & val); - virtual void SetValue(int val) { wxSpinCtrlQt::SetValue(val); } + virtual void SetValue(const wxString & val) wxOVERRIDE; + virtual void SetValue(int val) wxOVERRIDE { wxSpinCtrlQt::SetValue(val); } private: // Common part of all ctors. @@ -117,8 +117,8 @@ public: virtual int GetBase() const wxOVERRIDE { return 10; } virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } - virtual void SetValue(const wxString & val); - virtual void SetValue(double val) { wxSpinCtrlQt::SetValue(val); } + virtual void SetValue(const wxString & val) wxOVERRIDE; + virtual void SetValue(double val) wxOVERRIDE { wxSpinCtrlQt::SetValue(val); } private: wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble ); diff --git a/include/wx/qt/statbmp.h b/include/wx/qt/statbmp.h index a61fb5e8fc..cf57a3aef4 100644 --- a/include/wx/qt/statbmp.h +++ b/include/wx/qt/statbmp.h @@ -30,12 +30,12 @@ public: long style = 0, const wxString& name = wxStaticBitmapNameStr); - virtual void SetIcon(const wxIcon& icon); - virtual void SetBitmap(const wxBitmap& bitmap); - virtual wxBitmap GetBitmap() const; - virtual wxIcon GetIcon() const; + virtual void SetIcon(const wxIcon& icon) wxOVERRIDE; + virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; + virtual wxBitmap GetBitmap() const wxOVERRIDE; + virtual wxIcon GetIcon() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: private: diff --git a/include/wx/qt/statbox.h b/include/wx/qt/statbox.h index 8589adf4b1..ab3dfdee01 100644 --- a/include/wx/qt/statbox.h +++ b/include/wx/qt/statbox.h @@ -29,9 +29,9 @@ public: long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual wxString GetLabel() const wxOVERRIDE; diff --git a/include/wx/qt/statline.h b/include/wx/qt/statline.h index aca385e5ec..728815a1f9 100644 --- a/include/wx/qt/statline.h +++ b/include/wx/qt/statline.h @@ -29,7 +29,7 @@ public: long style = wxLI_HORIZONTAL, const wxString &name = wxStaticLineNameStr ); - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; private: QFrame *m_qtFrame; diff --git a/include/wx/qt/stattext.h b/include/wx/qt/stattext.h index 513bae3479..f427f16490 100644 --- a/include/wx/qt/stattext.h +++ b/include/wx/qt/stattext.h @@ -33,7 +33,7 @@ public: virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual wxString GetLabel() const wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; private: QLabel *m_qtLabel; diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h index df9ae9891d..eeb094746c 100644 --- a/include/wx/qt/statusbar.h +++ b/include/wx/qt/statusbar.h @@ -27,18 +27,18 @@ public: long style = wxSTB_DEFAULT_STYLE, const wxString& name = wxStatusBarNameStr); - virtual bool GetFieldRect(int i, wxRect& rect) const; - virtual void SetMinHeight(int height); - virtual int GetBorderX() const; - virtual int GetBorderY() const; + virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; + virtual void SetMinHeight(int height) wxOVERRIDE; + virtual int GetBorderX() const wxOVERRIDE; + virtual int GetBorderY() const wxOVERRIDE; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); + const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; QStatusBar *GetQStatusBar() const { return m_qtStatusBar; } - QWidget *GetHandle() const; + QWidget *GetHandle() const wxOVERRIDE; protected: - virtual void DoUpdateStatusText(int number); + virtual void DoUpdateStatusText(int number) wxOVERRIDE; private: void Init(); diff --git a/include/wx/qt/taskbar.h b/include/wx/qt/taskbar.h index 6ac90e6f71..7d19073f55 100644 --- a/include/wx/qt/taskbar.h +++ b/include/wx/qt/taskbar.h @@ -22,9 +22,9 @@ public: // Operations virtual bool SetIcon(const wxIcon& icon, - const wxString& tooltip = wxEmptyString); - virtual bool RemoveIcon(); - virtual bool PopupMenu(wxMenu *menu); + const wxString& tooltip = wxEmptyString) wxOVERRIDE; + virtual bool RemoveIcon() wxOVERRIDE; + virtual bool PopupMenu(wxMenu *menu) wxOVERRIDE; private: QSystemTrayIcon *m_qtSystemTrayIcon; diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h index 3cd57c936c..b28fe0e5fe 100644 --- a/include/wx/qt/textctrl.h +++ b/include/wx/qt/textctrl.h @@ -35,41 +35,41 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxTextCtrlNameStr); - 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 void MarkDirty(); - virtual void DiscardEdits(); + virtual bool IsModified() const wxOVERRIDE; + virtual void MarkDirty() wxOVERRIDE; + virtual void DiscardEdits() wxOVERRIDE; - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - virtual bool GetStyle(long position, wxTextAttr& style); - virtual bool SetDefaultStyle(const wxTextAttr& style); + virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; + virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; + virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; - 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; - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual void SetSelection( long from, long to ); - virtual void GetSelection(long *from, long *to) const; + virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual long GetInsertionPoint() const wxOVERRIDE; + virtual void SetSelection( long from, long to ) wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - virtual wxString DoGetValue() const; - virtual void DoSetValue(const wxString &text, int flags = 0); - virtual void WriteText(const wxString& text); + virtual wxString DoGetValue() const wxOVERRIDE; + virtual void DoSetValue(const wxString &text, int flags = 0) wxOVERRIDE; + virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; - 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; - virtual QScrollArea *QtGetScrollBarsContainer() const; + virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE; private: wxQtEdit *m_qtEdit; diff --git a/include/wx/qt/textentry.h b/include/wx/qt/textentry.h index 685edda867..d9287a2819 100644 --- a/include/wx/qt/textentry.h +++ b/include/wx/qt/textentry.h @@ -13,34 +13,34 @@ class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase public: wxTextEntry(); - virtual void WriteText(const wxString& text); + virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void Remove(long from, long to); + virtual void Remove(long from, long to) wxOVERRIDE; - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); + virtual void Copy() wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; - virtual void Undo(); - virtual void Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; + virtual void Undo() wxOVERRIDE; + virtual void Redo() wxOVERRIDE; + virtual bool CanUndo() const wxOVERRIDE; + virtual bool CanRedo() const wxOVERRIDE; - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; + virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual long GetInsertionPoint() const wxOVERRIDE; + virtual long GetLastPosition() const wxOVERRIDE; - virtual void SetSelection(long from, long to); - virtual void GetSelection(long *from, long *to) const; + virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); + virtual bool IsEditable() const wxOVERRIDE; + virtual void SetEditable(bool editable) wxOVERRIDE; protected: - virtual wxString DoGetValue() const; - virtual void DoSetValue(const wxString& value, int flags=0); + virtual wxString DoGetValue() const wxOVERRIDE; + virtual void DoSetValue(const wxString& value, int flags=0) wxOVERRIDE; - virtual wxWindow *GetEditableWindow(); + virtual wxWindow *GetEditableWindow() wxOVERRIDE; }; #endif // _WX_QT_TEXTENTRY_H_ diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h index f2b361e579..2bb47042ae 100644 --- a/include/wx/qt/tglbtn.h +++ b/include/wx/qt/tglbtn.h @@ -32,8 +32,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool state); - virtual bool GetValue() const; + virtual void SetValue(bool state) wxOVERRIDE; + virtual bool GetValue() const wxOVERRIDE; // implementation only virtual int GetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; } diff --git a/include/wx/qt/toplevel.h b/include/wx/qt/toplevel.h index 8eb283cc70..8e5f7f6208 100644 --- a/include/wx/qt/toplevel.h +++ b/include/wx/qt/toplevel.h @@ -30,21 +30,21 @@ public: const wxString& name = wxFrameNameStr); virtual bool Show(bool show = true) wxOVERRIDE; - virtual void Maximize(bool maximize = true); - virtual void Restore(); - virtual void Iconize(bool iconize = true); - virtual bool IsMaximized() const; - virtual bool IsIconized() const; + virtual void Maximize(bool maximize = true) wxOVERRIDE; + virtual void Restore() wxOVERRIDE; + virtual void Iconize(bool iconize = true) wxOVERRIDE; + virtual bool IsMaximized() const wxOVERRIDE; + virtual bool IsIconized() const wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const; - virtual void SetTitle(const wxString& title); - virtual wxString GetTitle() const; - virtual void SetIcons(const wxIconBundle& icons); + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + virtual bool IsFullScreen() const wxOVERRIDE; + virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual wxString GetTitle() const wxOVERRIDE; + virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; // Styles - virtual void SetWindowStyleFlag( long style ); - virtual long GetWindowStyleFlag() const; + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual long GetWindowStyleFlag() const wxOVERRIDE; }; #endif // _WX_QT_TOPLEVEL_H_ diff --git a/include/wx/qt/treectrl.h b/include/wx/qt/treectrl.h index 5fdc125ce0..9eb385b71d 100644 --- a/include/wx/qt/treectrl.h +++ b/include/wx/qt/treectrl.h @@ -112,7 +112,7 @@ public: virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const; - virtual QWidget *GetHandle() const; + virtual QWidget *GetHandle() const wxOVERRIDE; protected: virtual int DoGetItemState(const wxTreeItemId& item) const; diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp index a9a221bb90..d2ea457e14 100644 --- a/src/osx/carbon/thread.cpp +++ b/src/osx/carbon/thread.cpp @@ -1193,8 +1193,8 @@ bool wxThread::IsPaused() const class wxThreadModule : public wxModule { public: - virtual bool OnInit(); - virtual void OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual void OnExit() wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxThreadModule); diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index 898d08b155..7ea3fa4626 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -55,7 +55,7 @@ public: virtual ~wxBitmapRefData(); - bool IsOk() const; + bool IsOk() const wxOVERRIDE; void Free(); diff --git a/src/qt/evtloop.cpp b/src/qt/evtloop.cpp index 0f88c0f4ad..3523099ae3 100644 --- a/src/qt/evtloop.cpp +++ b/src/qt/evtloop.cpp @@ -27,7 +27,7 @@ class wxQtIdleTimer : public QTimer, public wxRefCounter public: wxQtIdleTimer(); ~wxQtIdleTimer(); - virtual bool eventFilter( QObject * watched, QEvent * event ); + virtual bool eventFilter( QObject * watched, QEvent * event ) wxOVERRIDE; private: void idle(); @@ -239,7 +239,7 @@ class wxQtEventLoopSourcesManager : public wxEventLoopSourcesManagerBase { public: wxEventLoopSource* - AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags) + AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags) wxOVERRIDE { return new wxQtEventLoopSource(fd, handler, flags); } diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp index 2430d84384..60be7159f9 100644 --- a/src/qt/glcanvas.cpp +++ b/src/qt/glcanvas.cpp @@ -25,13 +25,13 @@ public: } protected: - virtual void showEvent ( QShowEvent * event ); - virtual void hideEvent ( QHideEvent * event ); - virtual void resizeEvent ( QResizeEvent * event ); - virtual void paintEvent ( QPaintEvent * event ); + virtual void showEvent ( QShowEvent * event ) wxOVERRIDE; + virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE; + virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE; + virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE; - virtual void resizeGL(int w, int h); - virtual void paintGL(); + virtual void resizeGL(int w, int h) wxOVERRIDE; + virtual void paintGL() wxOVERRIDE; }; void wxQtGLWidget::showEvent ( QShowEvent * event ) diff --git a/src/qt/sockqt.cpp b/src/qt/sockqt.cpp index 239b4bfed6..cbd5faad18 100644 --- a/src/qt/sockqt.cpp +++ b/src/qt/sockqt.cpp @@ -54,7 +54,7 @@ public: class QtFDIOManager : public wxFDIOManager { public: - virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) + virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE { QSocketNotifier::Type type; switch (d) @@ -73,7 +73,7 @@ public: } virtual void - RemoveInput(wxFDIOHandler* handler, int fd, Direction d) + RemoveInput(wxFDIOHandler* handler, int fd, Direction d) wxOVERRIDE { QSocketNotifier::Type type = d == INPUT ? QSocketNotifier::Read : QSocketNotifier::Write; diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp index 47bc23e968..2fb0cff3dc 100644 --- a/src/qt/toolbar.cpp +++ b/src/qt/toolbar.cpp @@ -46,8 +46,8 @@ public: m_qtToolButton = NULL; } - virtual void SetLabel( const wxString &label ); - virtual void SetDropdownMenu(wxMenu* menu); + virtual void SetLabel( const wxString &label ) wxOVERRIDE; + virtual void SetDropdownMenu(wxMenu* menu) wxOVERRIDE; void SetIcon(); void ClearToolTip(); @@ -67,9 +67,9 @@ public: } private: - void mouseReleaseEvent( QMouseEvent *event ); - void mousePressEvent( QMouseEvent *event ); - void enterEvent( QEvent *event ); + void mouseReleaseEvent( QMouseEvent *event ) wxOVERRIDE; + void mousePressEvent( QMouseEvent *event ) wxOVERRIDE; + void enterEvent( QEvent *event ) wxOVERRIDE; }; void wxQtToolButton::mouseReleaseEvent( QMouseEvent *event ) diff --git a/src/unix/net.cpp b/src/unix/net.cpp index 25161a950f..0c3b22ee18 100644 --- a/src/unix/net.cpp +++ b/src/unix/net.cpp @@ -185,10 +185,10 @@ public: virtual bool Start( int millisecs = -1 ) { m_started = true; return wxTimer::Start(millisecs, false); } - virtual void Notify() + virtual void Notify() wxOVERRIDE { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); } - virtual void Stop() + virtual void Stop() wxOVERRIDE { if ( m_started ) wxTimer::Stop(); } public: bool m_started;