From 8b4ae731d371f862276a204e4e36820d97e31472 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 30 Mar 2014 00:02:23 +0000 Subject: [PATCH] use wxOVERRIDE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/affinematrix2d.h | 22 +-- include/wx/anidecod.h | 20 +- include/wx/any.h | 18 +- include/wx/anybutton.h | 4 +- include/wx/app.h | 20 +- include/wx/apptrait.h | 34 ++-- include/wx/archive.h | 2 +- include/wx/aui/auibook.h | 48 ++--- include/wx/aui/framemanager.h | 2 +- include/wx/aui/tabart.h | 72 +++---- include/wx/aui/tabartgtk.h | 18 +- include/wx/bannerwindow.h | 2 +- include/wx/bookctrl.h | 12 +- include/wx/calctrl.h | 2 +- include/wx/checkbox.h | 6 +- include/wx/choice.h | 6 +- include/wx/choicebk.h | 30 +-- include/wx/clipbrd.h | 2 +- include/wx/clrpicker.h | 8 +- include/wx/collpane.h | 2 +- include/wx/colour.h | 4 +- include/wx/combo.h | 76 ++++---- include/wx/combobox.h | 2 +- include/wx/commandlinkbutton.h | 2 +- include/wx/containr.h | 2 +- include/wx/control.h | 12 +- include/wx/convauto.h | 8 +- include/wx/cshelp.h | 12 +- include/wx/ctrlsub.h | 2 +- include/wx/dataobj.h | 64 +++---- include/wx/dataview.h | 76 ++++---- include/wx/dateevt.h | 2 +- include/wx/datetime.h | 4 +- include/wx/dc.h | 16 +- include/wx/dcmirror.h | 90 ++++----- include/wx/dcprint.h | 2 +- include/wx/dcsvg.h | 86 ++++----- include/wx/debugrpt.h | 6 +- include/wx/dialog.h | 6 +- include/wx/dnd.h | 4 +- include/wx/docview.h | 12 +- include/wx/event.h | 126 ++++++------ include/wx/evtloop.h | 6 +- include/wx/fdrepdlg.h | 2 +- include/wx/fileconf.h | 44 ++--- include/wx/filectrl.h | 2 +- include/wx/filepicker.h | 30 +-- include/wx/filesys.h | 8 +- include/wx/fontpicker.h | 8 +- include/wx/frame.h | 12 +- include/wx/fs_arc.h | 8 +- include/wx/fs_filter.h | 8 +- include/wx/fs_inet.h | 4 +- include/wx/fs_mem.h | 8 +- include/wx/fswatcher.h | 4 +- include/wx/gauge.h | 4 +- include/wx/gbsizer.h | 6 +- include/wx/gdiobj.h | 4 +- include/wx/generic/accel.h | 4 +- include/wx/generic/buttonbar.h | 22 +-- include/wx/generic/caret.h | 14 +- include/wx/generic/dcpsg.h | 96 +++++----- include/wx/generic/grid.h | 58 +++--- include/wx/generic/gridctrl.h | 48 ++--- include/wx/generic/grideditors.h | 120 ++++++------ include/wx/generic/headerctrlg.h | 14 +- include/wx/generic/icon.h | 2 +- include/wx/generic/infobar.h | 14 +- include/wx/generic/laywin.h | 4 +- include/wx/generic/listctrl.h | 56 +++--- include/wx/generic/logg.h | 8 +- include/wx/generic/printps.h | 10 +- include/wx/generic/progdlgg.h | 4 +- include/wx/generic/propdlg.h | 2 +- include/wx/generic/sashwin.h | 2 +- include/wx/generic/splash.h | 2 +- include/wx/generic/splitter.h | 6 +- include/wx/generic/srchctlg.h | 118 ++++++------ include/wx/generic/statusbr.h | 14 +- include/wx/generic/textdlgg.h | 4 +- include/wx/generic/treectlg.h | 148 +++++++------- include/wx/generic/wizard.h | 16 +- include/wx/gifdecod.h | 20 +- include/wx/graphics.h | 4 +- include/wx/gtk/animate.h | 34 ++-- include/wx/gtk/anybutton.h | 10 +- include/wx/gtk/app.h | 12 +- include/wx/gtk/bitmap.h | 44 ++--- include/wx/gtk/bmpcbox.h | 40 ++-- include/wx/gtk/brush.h | 18 +- include/wx/gtk/button.h | 10 +- include/wx/gtk/calctrl.h | 12 +- include/wx/gtk/checkbox.h | 16 +- include/wx/gtk/checklst.h | 4 +- include/wx/gtk/choice.h | 34 ++-- include/wx/gtk/clipbrd.h | 18 +- include/wx/gtk/clrpicker.h | 2 +- include/wx/gtk/collpane.h | 16 +- include/wx/gtk/colordlg.h | 6 +- include/wx/gtk/colour.h | 12 +- include/wx/gtk/combobox.h | 36 ++-- include/wx/gtk/control.h | 4 +- include/wx/gtk/cursor.h | 4 +- include/wx/gtk/dataobj2.h | 26 +-- include/wx/gtk/dataview.h | 118 ++++++------ include/wx/gtk/dc.h | 40 ++-- include/wx/gtk/dcclient.h | 88 ++++----- include/wx/gtk/dcmemory.h | 22 +-- include/wx/gtk/dcscreen.h | 2 +- include/wx/gtk/dialog.h | 8 +- include/wx/gtk/dirdlg.h | 6 +- include/wx/gtk/dnd.h | 10 +- include/wx/gtk/evtloop.h | 14 +- include/wx/gtk/filectrl.h | 28 +-- include/wx/gtk/filedlg.h | 30 +-- include/wx/gtk/filehistory.h | 2 +- include/wx/gtk/font.h | 42 ++-- include/wx/gtk/fontdlg.h | 2 +- include/wx/gtk/fontpicker.h | 6 +- include/wx/gtk/frame.h | 16 +- include/wx/gtk/gauge.h | 4 +- include/wx/gtk/glcanvas.h | 6 +- include/wx/gtk/hyperlink.h | 24 +-- include/wx/gtk/infobar.h | 10 +- include/wx/gtk/listbox.h | 44 ++--- include/wx/gtk/mdi.h | 24 +-- include/wx/gtk/menu.h | 40 ++-- include/wx/gtk/menuitem.h | 8 +- include/wx/gtk/minifram.h | 6 +- include/wx/gtk/msgdlg.h | 20 +- include/wx/gtk/nonownedwnd.h | 8 +- include/wx/gtk/notebook.h | 40 ++-- include/wx/gtk/notifmsg.h | 4 +- include/wx/gtk/pen.h | 34 ++-- include/wx/gtk/popupwin.h | 8 +- include/wx/gtk/print.h | 180 +++++++++--------- include/wx/gtk/radiobox.h | 44 ++--- include/wx/gtk/radiobut.h | 10 +- include/wx/gtk/region.h | 28 +-- include/wx/gtk/scrolbar.h | 12 +- include/wx/gtk/slider.h | 24 +-- include/wx/gtk/spinbutt.h | 16 +- include/wx/gtk/spinctrl.h | 28 +-- include/wx/gtk/statbmp.h | 8 +- include/wx/gtk/statbox.h | 14 +- include/wx/gtk/stattext.h | 16 +- include/wx/gtk/taskbar.h | 6 +- include/wx/gtk/textctrl.h | 92 ++++----- include/wx/gtk/textentry.h | 48 ++--- include/wx/gtk/tglbtn.h | 14 +- include/wx/gtk/toolbar.h | 38 ++-- include/wx/gtk/toplevel.h | 58 +++--- include/wx/gtk/webview_webkit.h | 104 +++++----- include/wx/gtk/window.h | 118 ++++++------ include/wx/hash.h | 2 +- include/wx/headercol.h | 32 ++-- include/wx/headerctrl.h | 12 +- include/wx/html/helpctrl.h | 28 +-- include/wx/html/helpfrm.h | 2 +- include/wx/html/htmlcell.h | 56 +++--- include/wx/html/htmlfilt.h | 8 +- include/wx/html/htmlwin.h | 26 +-- include/wx/html/htmprint.h | 10 +- include/wx/html/winpars.h | 16 +- include/wx/htmllbox.h | 62 +++--- include/wx/hyperlink.h | 6 +- include/wx/iconbndl.h | 4 +- include/wx/imagbmp.h | 24 +-- include/wx/image.h | 4 +- include/wx/imaggif.h | 8 +- include/wx/imagiff.h | 6 +- include/wx/imagjpeg.h | 6 +- include/wx/imagpcx.h | 6 +- include/wx/imagpng.h | 6 +- include/wx/imagpnm.h | 6 +- include/wx/imagtga.h | 6 +- include/wx/imagtiff.h | 8 +- include/wx/imagxpm.h | 6 +- include/wx/listbase.h | 4 +- include/wx/listbook.h | 28 +-- include/wx/listbox.h | 6 +- include/wx/log.h | 12 +- include/wx/mdi.h | 56 +++--- include/wx/mediactrl.h | 6 +- include/wx/menu.h | 10 +- include/wx/msgout.h | 14 +- include/wx/mstream.h | 24 +-- include/wx/nativewin.h | 18 +- include/wx/nonownedwnd.h | 4 +- include/wx/notebook.h | 4 +- include/wx/odcombo.h | 68 +++---- include/wx/panel.h | 2 +- include/wx/persist/bookctrl.h | 6 +- include/wx/persist/splitter.h | 6 +- include/wx/persist/toplevel.h | 6 +- include/wx/persist/treebook.h | 6 +- include/wx/persist/window.h | 2 +- include/wx/pickerbase.h | 2 +- include/wx/popupwin.h | 6 +- include/wx/preferences.h | 2 +- include/wx/private/fdiodispatcher.h | 6 +- .../wx/private/fdioeventloopsourcehandler.h | 6 +- include/wx/private/fileback.h | 10 +- include/wx/private/markupparserattr.h | 32 ++-- include/wx/private/selectdispatcher.h | 10 +- include/wx/prntbase.h | 90 ++++----- include/wx/process.h | 2 +- include/wx/propgrid/manager.h | 40 ++-- include/wx/propgrid/property.h | 4 +- include/wx/propgrid/propgrid.h | 22 +-- include/wx/protocol/file.h | 6 +- include/wx/protocol/ftp.h | 12 +- include/wx/protocol/http.h | 10 +- include/wx/protocol/protocol.h | 4 +- include/wx/rearrangectrl.h | 2 +- include/wx/ribbon/art.h | 134 ++++++------- include/wx/ribbon/bar.h | 16 +- include/wx/ribbon/buttonbar.h | 20 +- include/wx/ribbon/gallery.h | 18 +- include/wx/ribbon/page.h | 20 +- include/wx/ribbon/panel.h | 30 +-- include/wx/ribbon/toolbar.h | 18 +- include/wx/sckipc.h | 24 +-- include/wx/sckstrm.h | 12 +- include/wx/scrolwin.h | 2 +- include/wx/simplebook.h | 26 +-- include/wx/sizer.h | 30 +-- include/wx/slider.h | 2 +- include/wx/socket.h | 4 +- include/wx/spinbutt.h | 2 +- include/wx/spinctrl.h | 2 +- include/wx/srchctrl.h | 2 +- include/wx/sstream.h | 16 +- include/wx/statbmp.h | 8 +- include/wx/statbox.h | 4 +- include/wx/statline.h | 6 +- include/wx/stattext.h | 6 +- include/wx/statusbr.h | 8 +- include/wx/stdstream.h | 26 +-- include/wx/strconv.h | 78 ++++---- include/wx/stream.h | 64 +++---- include/wx/tarstrm.h | 84 ++++---- include/wx/taskbar.h | 2 +- include/wx/tbarbase.h | 6 +- include/wx/textctrl.h | 36 ++-- include/wx/textfile.h | 10 +- include/wx/textwrapper.h | 2 +- include/wx/tglbtn.h | 2 +- include/wx/thread.h | 2 +- include/wx/timer.h | 4 +- include/wx/toolbook.h | 28 +-- include/wx/toplevel.h | 20 +- include/wx/translation.h | 4 +- include/wx/treebase.h | 2 +- include/wx/treebook.h | 30 +-- include/wx/treectrl.h | 4 +- include/wx/treelist.h | 4 +- include/wx/univ/anybutton.h | 2 +- include/wx/univ/bmpbuttn.h | 12 +- include/wx/univ/button.h | 22 +-- include/wx/univ/checkbox.h | 20 +- include/wx/univ/checklst.h | 18 +- include/wx/univ/combobox.h | 84 ++++---- include/wx/univ/control.h | 6 +- include/wx/univ/custombgwin.h | 2 +- include/wx/univ/dialog.h | 8 +- include/wx/univ/frame.h | 24 +-- include/wx/univ/gauge.h | 10 +- include/wx/univ/inphand.h | 8 +- include/wx/univ/listbox.h | 46 ++--- include/wx/univ/menu.h | 34 ++-- include/wx/univ/menuitem.h | 8 +- include/wx/univ/notebook.h | 42 ++-- include/wx/univ/radiobox.h | 34 ++-- include/wx/univ/radiobut.h | 12 +- include/wx/univ/renderer.h | 138 +++++++------- include/wx/univ/scrolbar.h | 50 ++--- include/wx/univ/scrtimer.h | 2 +- include/wx/univ/slider.h | 58 +++--- include/wx/univ/spinbutt.h | 36 ++-- include/wx/univ/statbmp.h | 12 +- include/wx/univ/statbox.h | 4 +- include/wx/univ/statline.h | 2 +- include/wx/univ/stattext.h | 10 +- include/wx/univ/statusbr.h | 22 +-- include/wx/univ/stdrend.h | 80 ++++---- include/wx/univ/textctrl.h | 88 ++++----- include/wx/univ/tglbtn.h | 8 +- include/wx/univ/toolbar.h | 34 ++-- include/wx/univ/toplevel.h | 18 +- include/wx/univ/window.h | 32 ++-- include/wx/unix/app.h | 2 +- include/wx/unix/apptrait.h | 14 +- include/wx/unix/evtloop.h | 14 +- include/wx/unix/glx11.h | 12 +- include/wx/unix/sound.h | 2 +- include/wx/unix/stackwalk.h | 6 +- include/wx/unix/stdpaths.h | 18 +- include/wx/unix/taskbarx11.h | 6 +- include/wx/valgen.h | 8 +- include/wx/valtext.h | 8 +- include/wx/variant.h | 6 +- include/wx/vlbox.h | 6 +- include/wx/vscroll.h | 28 +-- include/wx/weakref.h | 6 +- include/wx/webview.h | 2 +- include/wx/webviewarchivehandler.h | 2 +- include/wx/webviewfshandler.h | 2 +- include/wx/wfstream.h | 88 ++++----- include/wx/window.h | 8 +- include/wx/wizard.h | 18 +- include/wx/wrapsizer.h | 6 +- include/wx/zipstrm.h | 78 ++++---- include/wx/zstream.h | 38 ++-- samples/artprov/arttest.cpp | 4 +- samples/aui/auidemo.cpp | 2 +- samples/calendar/calendar.cpp | 2 +- samples/caret/caret.cpp | 2 +- samples/clipboard/clipboard.cpp | 2 +- samples/collpane/collpane.cpp | 2 +- samples/combo/combo.cpp | 38 ++-- samples/config/conftest.cpp | 4 +- samples/controls/controls.cpp | 2 +- samples/dataview/dataview.cpp | 12 +- samples/dataview/mymodels.h | 30 +-- samples/debugrpt/debugrpt.cpp | 6 +- samples/dialogs/dialogs.cpp | 8 +- samples/dialogs/dialogs.h | 14 +- samples/dialup/nettest.cpp | 4 +- samples/display/display.cpp | 2 +- samples/dnd/dnd.cpp | 44 ++--- samples/docview/doc.h | 28 +-- samples/docview/docview.h | 8 +- samples/docview/view.h | 30 +-- samples/dragimag/dragimag.h | 6 +- samples/drawing/drawing.cpp | 6 +- samples/erase/erase.cpp | 2 +- samples/event/event.cpp | 4 +- samples/except/except.cpp | 14 +- samples/exec/exec.cpp | 8 +- samples/font/font.cpp | 6 +- samples/fswatcher/fswatcher.cpp | 8 +- samples/grid/griddemo.cpp | 20 +- samples/grid/griddemo.h | 42 ++-- samples/help/demo.cpp | 4 +- samples/htlbox/htlbox.cpp | 8 +- samples/html/about/about.cpp | 2 +- samples/html/help/help.cpp | 2 +- samples/html/helpview/helpview.cpp | 4 +- samples/html/printing/printing.cpp | 2 +- samples/html/test/test.cpp | 6 +- samples/html/virtual/virtual.cpp | 6 +- samples/html/widget/widget.cpp | 2 +- samples/html/zip/zip.cpp | 2 +- samples/image/image.cpp | 2 +- samples/internat/internat.cpp | 6 +- samples/ipc/baseclient.cpp | 18 +- samples/ipc/baseserver.cpp | 28 +-- samples/ipc/client.h | 16 +- samples/ipc/server.h | 18 +- samples/joytest/joytest.h | 2 +- samples/keyboard/keyboard.cpp | 2 +- samples/layout/layout.h | 2 +- samples/listctrl/listtest.h | 8 +- samples/mdi/mdi.h | 4 +- samples/mediaplayer/mediaplayer.cpp | 10 +- samples/menu/menu.cpp | 2 +- samples/minimal/minimal.cpp | 2 +- samples/notebook/notebook.h | 2 +- samples/opengl/cube/cube.h | 4 +- samples/opengl/isosurf/isosurf.h | 6 +- samples/opengl/penguin/penguin.h | 2 +- samples/popup/popup.cpp | 10 +- samples/printing/printing.h | 14 +- samples/propgrid/propgrid.cpp | 20 +- samples/propgrid/propgrid.h | 20 +- samples/propgrid/sampleprops.cpp | 12 +- samples/propgrid/sampleprops.h | 28 +-- samples/propgrid/tests.cpp | 6 +- samples/render/renddll.cpp | 4 +- samples/render/render.cpp | 8 +- samples/ribbon/ribbondemo.cpp | 2 +- samples/richtext/richtext.cpp | 32 ++-- samples/sashtest/sashtest.h | 4 +- samples/scroll/scroll.cpp | 14 +- samples/shaped/shaped.cpp | 2 +- samples/sockets/baseclient.cpp | 14 +- samples/sockets/baseserver.cpp | 12 +- samples/sockets/client.cpp | 2 +- samples/sockets/server.cpp | 2 +- samples/sound/sound.cpp | 2 +- samples/splash/splash.cpp | 2 +- samples/splitter/splitter.cpp | 4 +- samples/statbar/statbar.cpp | 2 +- samples/svg/svgtest.cpp | 4 +- samples/taborder/taborder.cpp | 2 +- samples/taskbar/tbtest.h | 4 +- samples/text/text.cpp | 2 +- samples/thread/thread.cpp | 12 +- samples/toolbar/toolbar.cpp | 2 +- samples/treectrl/treetest.h | 4 +- samples/treelist/treelist.cpp | 4 +- samples/typetest/typetest.h | 4 +- samples/uiaction/uiaction.cpp | 2 +- samples/validate/validate.h | 12 +- samples/vscroll/vstest.cpp | 10 +- samples/webview/webview.cpp | 6 +- samples/widgets/bmpcombobox.cpp | 8 +- samples/widgets/button.cpp | 6 +- samples/widgets/checkbox.cpp | 6 +- samples/widgets/choice.cpp | 8 +- samples/widgets/clrpicker.cpp | 6 +- samples/widgets/combobox.cpp | 10 +- samples/widgets/datepick.cpp | 6 +- samples/widgets/dirctrl.cpp | 6 +- samples/widgets/dirpicker.cpp | 6 +- samples/widgets/editlbox.cpp | 6 +- samples/widgets/filectrl.cpp | 6 +- samples/widgets/filepicker.cpp | 6 +- samples/widgets/fontpicker.cpp | 6 +- samples/widgets/gauge.cpp | 6 +- samples/widgets/hyperlnk.cpp | 6 +- samples/widgets/listbox.cpp | 8 +- samples/widgets/notebook.cpp | 12 +- samples/widgets/odcombobox.cpp | 18 +- samples/widgets/radiobox.cpp | 6 +- samples/widgets/searchctrl.cpp | 8 +- samples/widgets/slider.cpp | 6 +- samples/widgets/spinbtn.cpp | 8 +- samples/widgets/statbmp.cpp | 6 +- samples/widgets/static.cpp | 8 +- samples/widgets/textctrl.cpp | 8 +- samples/widgets/timepick.cpp | 6 +- samples/widgets/toggle.cpp | 6 +- samples/widgets/widgets.cpp | 6 +- samples/wizard/wizard.cpp | 8 +- samples/wrapsizer/wrapsizer.cpp | 2 +- src/aui/framemanager.cpp | 4 +- src/common/cairo.cpp | 4 +- src/common/strconv.cpp | 2 +- src/common/strvararg.cpp | 4 +- src/gtk/artgtk.cpp | 4 +- src/gtk/bitmap.cpp | 2 +- src/gtk/cursor.cpp | 2 +- src/gtk/dataobj.cpp | 12 +- src/gtk/dataview.cpp | 16 +- src/gtk/dcclient.cpp | 4 +- src/gtk/evtloop.cpp | 2 +- src/gtk/nonownedwnd.cpp | 12 +- src/gtk/notifmsg.cpp | 4 +- src/gtk/print.cpp | 4 +- src/gtk/private.cpp | 4 +- src/gtk/renderer.cpp | 36 ++-- src/gtk/sockgtk.cpp | 4 +- src/gtk/utilsgtk.cpp | 2 +- src/unix/dialup.cpp | 30 +-- src/unix/displayx11.cpp | 18 +- src/unix/joystick.cpp | 2 +- src/unix/mediactrl.cpp | 38 ++-- src/unix/sound.cpp | 48 ++--- 460 files changed, 4103 insertions(+), 4107 deletions(-) diff --git a/include/wx/affinematrix2d.h b/include/wx/affinematrix2d.h index 28055f8d35..ce383a96ac 100644 --- a/include/wx/affinematrix2d.h +++ b/include/wx/affinematrix2d.h @@ -28,19 +28,19 @@ public: } // Implement base class pure virtual methods. - virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr); - virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const; - virtual void Concat(const wxAffineMatrix2DBase& t); - virtual bool Invert(); - virtual bool IsIdentity() const; - virtual bool IsEqual(const wxAffineMatrix2DBase& t) const; - virtual void Translate(wxDouble dx, wxDouble dy); - virtual void Scale(wxDouble xScale, wxDouble yScale); - virtual void Rotate(wxDouble cRadians); + virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) wxOVERRIDE; + virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const wxOVERRIDE; + virtual void Concat(const wxAffineMatrix2DBase& t) wxOVERRIDE; + virtual bool Invert() wxOVERRIDE; + virtual bool IsIdentity() const wxOVERRIDE; + virtual bool IsEqual(const wxAffineMatrix2DBase& t) const wxOVERRIDE; + virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE; + virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE; + virtual void Rotate(wxDouble cRadians) wxOVERRIDE; protected: - virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const; - virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const; + virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const wxOVERRIDE; + virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const wxOVERRIDE; private: wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty; diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h index 2923887b49..4a112410c8 100644 --- a/include/wx/anidecod.h +++ b/include/wx/anidecod.h @@ -36,26 +36,26 @@ public: ~wxANIDecoder(); - virtual wxSize GetFrameSize(unsigned int frame) const; - virtual wxPoint GetFramePosition(unsigned int frame) const; - virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; - virtual long GetDelay(unsigned int frame) const; - virtual wxColour GetTransparentColour(unsigned int frame) const; + virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE; + virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE; + virtual long GetDelay(unsigned int frame) const wxOVERRIDE; + virtual wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE; // implementation of wxAnimationDecoder's pure virtuals - virtual bool Load( wxInputStream& stream ); + virtual bool Load( wxInputStream& stream ) wxOVERRIDE; - bool ConvertToImage(unsigned int frame, wxImage *image) const; + bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE; - wxAnimationDecoder *Clone() const + wxAnimationDecoder *Clone() const wxOVERRIDE { return new wxANIDecoder; } - wxAnimationType GetType() const + wxAnimationType GetType() const wxOVERRIDE { return wxANIMATION_TYPE_ANI; } private: // wxAnimationDecoder pure virtual: - virtual bool DoCanRead( wxInputStream& stream ) const; + virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; // modifies current stream position (see wxAnimationDecoder::CanRead) // frames stored as wxImage(s): ANI files are meant to be used mostly for animated diff --git a/include/wx/any.h b/include/wx/any.h index c2cd7a79f4..c418392f5b 100644 --- a/include/wx/any.h +++ b/include/wx/any.h @@ -288,13 +288,13 @@ public: wxAnyValueTypeImplBase() : wxAnyValueType() { } virtual ~wxAnyValueTypeImplBase() { } - virtual void DeleteValue(wxAnyValueBuffer& buf) const + virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE { Ops::DeleteValue(buf); } virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const + wxAnyValueBuffer& dst) const wxOVERRIDE { Ops::SetValue(Ops::GetValue(src), dst); } @@ -418,7 +418,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const; + wxAnyValueBuffer& dst) const wxOVERRIDE; }; @@ -433,7 +433,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const; + wxAnyValueBuffer& dst) const wxOVERRIDE; }; @@ -520,7 +520,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const; + wxAnyValueBuffer& dst) const wxOVERRIDE; }; // @@ -537,7 +537,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const; + wxAnyValueBuffer& dst) const wxOVERRIDE; }; // WX_ANY_DEFINE_SUB_TYPE requires this @@ -614,7 +614,7 @@ public: wxAnyValueTypeImplBase() { } virtual ~wxAnyValueTypeImplVariantData() { } - virtual void DeleteValue(wxAnyValueBuffer& buf) const + virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE { wxVariantData* data = static_cast(buf.m_ptr); if ( data ) @@ -622,7 +622,7 @@ public: } virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const + wxAnyValueBuffer& dst) const wxOVERRIDE { wxVariantData* data = static_cast(src.m_ptr); if ( data ) @@ -644,7 +644,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const + wxAnyValueBuffer& dst) const wxOVERRIDE { wxUnusedVar(src); wxUnusedVar(dstType); diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h index 4e230be83d..3e78fdf0aa 100644 --- a/include/wx/anybutton.h +++ b/include/wx/anybutton.h @@ -102,7 +102,7 @@ public: // Buttons on MSW can look bad if they are not native colours, because // then they become owner-drawn and not theme-drawn. Disable it here // in wxAnyButtonBase to make it consistent. - virtual bool ShouldInheritColours() const { return false; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } // wxUniv-compatible and deprecated equivalents to SetBitmapXXX() #if WXWIN_COMPATIBILITY_2_8 @@ -150,7 +150,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const { return wxBitmap(); } diff --git a/include/wx/app.h b/include/wx/app.h index 4af957cc46..9540f6e392 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -264,7 +264,7 @@ public: // Implement the inherited wxEventFilter method but just return -1 from it // to indicate that default processing should take place. - virtual int FilterEvent(wxEvent& event); + virtual int FilterEvent(wxEvent& event) wxOVERRIDE; // return true if we're running event loop, i.e. if the events can // (already) be dispatched @@ -541,7 +541,7 @@ public: // very first initialization function // // Override: very rarely - virtual bool Initialize(int& argc, wxChar **argv); + virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; // a platform-dependent version of OnInit(): the code here is likely to // depend on the toolkit. default version does nothing. @@ -556,15 +556,15 @@ public: // of the program really starts here // // Override: rarely in GUI applications, always in console ones. - virtual int OnRun(); + virtual int OnRun() wxOVERRIDE; // a matching function for OnInit() - virtual int OnExit(); + virtual int OnExit() wxOVERRIDE; // very last clean up function // // Override: very rarely - virtual void CleanUp(); + virtual void CleanUp() wxOVERRIDE; // the worker functions - usually not used directly by the user code @@ -579,10 +579,10 @@ public: // parties // // it should return true if more idle events are needed, false if not - virtual bool ProcessIdle(); + virtual bool ProcessIdle() wxOVERRIDE; // override base class version: GUI apps always use an event loop - virtual bool UsesEventLoop() const { return true; } + virtual bool UsesEventLoop() const wxOVERRIDE { return true; } // top level window functions @@ -645,8 +645,8 @@ public: // ------------------------------------------------------------------------ #if wxUSE_CMDLINE_PARSER - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); - virtual void OnInitCmdLine(wxCmdLineParser& parser); + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; #endif // miscellaneous other stuff @@ -659,7 +659,7 @@ public: protected: // override base class method to use GUI traits - virtual wxAppTraits *CreateTraits(); + virtual wxAppTraits *CreateTraits() wxOVERRIDE; // the main top level window (may be NULL) diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index da1b39b1d3..c6c15cea14 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -199,19 +199,19 @@ public: #endif // !wxUSE_CONSOLE_EVENTLOOP #if wxUSE_LOG - virtual wxLog *CreateLogTarget(); + virtual wxLog *CreateLogTarget() wxOVERRIDE; #endif // wxUSE_LOG - virtual wxMessageOutput *CreateMessageOutput(); + virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE; #if wxUSE_FONTMAP - virtual wxFontMapper *CreateFontMapper(); + virtual wxFontMapper *CreateFontMapper() wxOVERRIDE; #endif // wxUSE_FONTMAP - virtual wxRendererNative *CreateRenderer(); + virtual wxRendererNative *CreateRenderer() wxOVERRIDE; - virtual bool ShowAssertDialog(const wxString& msg); - virtual bool HasStderr(); + virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; + virtual bool HasStderr() wxOVERRIDE; // the GetToolkitVersion for console application is always the same - virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const + virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const wxOVERRIDE { // no toolkits (wxBase is for console applications without GUI support) // NB: zero means "no toolkit", -1 means "not initialized yet" @@ -221,8 +221,8 @@ public: return wxPORT_BASE; } - virtual bool IsUsingUniversalWidgets() const { return false; } - virtual wxString GetDesktopEnvironment() const { return wxEmptyString; } + virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { return false; } + virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; } }; // ---------------------------------------------------------------------------- @@ -235,18 +235,18 @@ class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits { public: #if wxUSE_LOG - virtual wxLog *CreateLogTarget(); + virtual wxLog *CreateLogTarget() wxOVERRIDE; #endif // wxUSE_LOG - virtual wxMessageOutput *CreateMessageOutput(); + virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE; #if wxUSE_FONTMAP - virtual wxFontMapper *CreateFontMapper(); + virtual wxFontMapper *CreateFontMapper() wxOVERRIDE; #endif // wxUSE_FONTMAP - virtual wxRendererNative *CreateRenderer(); + virtual wxRendererNative *CreateRenderer() wxOVERRIDE; - virtual bool ShowAssertDialog(const wxString& msg); - virtual bool HasStderr(); + virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; + virtual bool HasStderr() wxOVERRIDE; - virtual bool IsUsingUniversalWidgets() const + virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { #ifdef __WXUNIVERSAL__ return true; @@ -255,7 +255,7 @@ public: #endif } - virtual wxString GetDesktopEnvironment() const { return wxEmptyString; } + virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; } }; #endif // wxUSE_GUI diff --git a/include/wx/archive.h b/include/wx/archive.h index 9f284668dd..8822249458 100644 --- a/include/wx/archive.h +++ b/include/wx/archive.h @@ -99,7 +99,7 @@ public: wxArchiveEntry *GetNextEntry() { return DoGetNextEntry(); } - virtual char Peek() { return wxInputStream::Peek(); } + virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); } protected: wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv); diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h index 17b3fdae9f..9811c6605b 100644 --- a/include/wx/aui/auibook.h +++ b/include/wx/aui/auibook.h @@ -75,7 +75,7 @@ public: m_dragSource = c.m_dragSource; } #endif - wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); } void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; } wxAuiNotebook* GetDragSource() const { return m_dragSource; } @@ -206,7 +206,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } void OnPaint(wxPaintEvent& evt); void OnEraseBackground(wxEraseEvent& evt); @@ -268,7 +268,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0); - void SetWindowStyleFlag(long style); + void SetWindowStyleFlag(long style) wxOVERRIDE; void SetArtProvider(wxAuiTabArt* art); wxAuiTabArt* GetArtProvider() const; @@ -286,15 +286,15 @@ public: bool select = false, const wxBitmap& bitmap = wxNullBitmap); - bool DeletePage(size_t page); - bool RemovePage(size_t page); + bool DeletePage(size_t page) wxOVERRIDE; + bool RemovePage(size_t page) wxOVERRIDE; - virtual size_t GetPageCount() const; - virtual wxWindow* GetPage(size_t pageIdx) const; + virtual size_t GetPageCount() const wxOVERRIDE; + virtual wxWindow* GetPage(size_t pageIdx) const wxOVERRIDE; int GetPageIndex(wxWindow* pageWnd) const; - bool SetPageText(size_t page, const wxString& text); - wxString GetPageText(size_t pageIdx) const; + bool SetPageText(size_t page, const wxString& text) wxOVERRIDE; + wxString GetPageText(size_t pageIdx) const wxOVERRIDE; bool SetPageToolTip(size_t page, const wxString& text); wxString GetPageToolTip(size_t pageIdx) const; @@ -302,8 +302,8 @@ public: bool SetPageBitmap(size_t page, const wxBitmap& bitmap); wxBitmap GetPageBitmap(size_t pageIdx) const; - int SetSelection(size_t newPage); - int GetSelection() const; + int SetSelection(size_t newPage) wxOVERRIDE; + int GetSelection() const wxOVERRIDE; virtual void Split(size_t page, int direction); @@ -319,7 +319,7 @@ public: void SetMeasuringFont(const wxFont& font); // Sets the tab font - virtual bool SetFont(const wxFont& font); + virtual bool SetFont(const wxFont& font) wxOVERRIDE; // Gets the tab control height int GetTabCtrlHeight() const; @@ -331,36 +331,36 @@ public: bool ShowWindowMenu(); // we do have multiple pages - virtual bool HasMultiplePages() const { return true; } + virtual bool HasMultiplePages() const wxOVERRIDE { return true; } // we don't want focus for ourselves // virtual bool AcceptsFocus() const { return false; } //wxBookCtrlBase functions - virtual void SetPageSize (const wxSize &size); - virtual int HitTest (const wxPoint &pt, long *flags=NULL) const; + virtual void SetPageSize (const wxSize &size) wxOVERRIDE; + virtual int HitTest (const wxPoint &pt, long *flags=NULL) 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 int ChangeSelection(size_t n); + virtual int ChangeSelection(size_t n) wxOVERRIDE; virtual bool AddPage(wxWindow *page, const wxString &text, bool select, - int imageId); - virtual bool DeleteAllPages(); + int imageId) wxOVERRIDE; + virtual bool DeleteAllPages() wxOVERRIDE; virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text, - bool select, int imageId); + bool select, int imageId) wxOVERRIDE; protected: // Common part of all ctors. void Init(); // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // Redo sizing after thawing - virtual void DoThaw(); + virtual void DoThaw() wxOVERRIDE; // these can be overridden @@ -372,7 +372,7 @@ protected: virtual wxSize CalculateNewSplitSize(); // remove the page and return a pointer to it - virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) { return NULL; } + virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) wxOVERRIDE { return NULL; } //A general selection function virtual int DoModifySelection(size_t n, bool events); diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index 4f6b4641b1..3fe01f1b54 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -696,7 +696,7 @@ public: dc = c.dc; } #endif - wxEvent *Clone() const { return new wxAuiManagerEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxAuiManagerEvent(*this); } void SetManager(wxAuiManager* mgr) { manager = mgr; } void SetPane(wxAuiPaneInfo* p) { pane = p; } diff --git a/include/wx/aui/tabart.h b/include/wx/aui/tabart.h index 3de076c9e3..17e5992e8d 100644 --- a/include/wx/aui/tabart.h +++ b/include/wx/aui/tabart.h @@ -120,26 +120,26 @@ public: wxAuiGenericTabArt(); virtual ~wxAuiGenericTabArt(); - wxAuiTabArt* Clone(); - void SetFlags(unsigned int flags); + wxAuiTabArt* Clone() wxOVERRIDE; + void SetFlags(unsigned int flags) wxOVERRIDE; void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount); + size_t tabCount) wxOVERRIDE; - void SetNormalFont(const wxFont& font); - void SetSelectedFont(const wxFont& font); - void SetMeasuringFont(const wxFont& font); - void SetColour(const wxColour& colour); - void SetActiveColour(const wxColour& colour); + void SetNormalFont(const wxFont& font) wxOVERRIDE; + void SetSelectedFont(const wxFont& font) wxOVERRIDE; + void SetMeasuringFont(const wxFont& font) wxOVERRIDE; + void SetColour(const wxColour& colour) wxOVERRIDE; + void SetActiveColour(const wxColour& colour) wxOVERRIDE; void DrawBorder( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawTab(wxDC& dc, wxWindow* wnd, @@ -148,7 +148,7 @@ public: int closeButtonState, wxRect* outTabRect, wxRect* outButtonRect, - int* xExtent); + int* xExtent) wxOVERRIDE; void DrawButton( wxDC& dc, @@ -157,15 +157,15 @@ public: int bitmapId, int buttonState, int orientation, - wxRect* outRect); + wxRect* outRect) wxOVERRIDE; - int GetIndentSize(); + int GetIndentSize() wxOVERRIDE; int GetBorderWidth( - wxWindow* wnd); + wxWindow* wnd) wxOVERRIDE; int GetAdditionalBorderSpace( - wxWindow* wnd); + wxWindow* wnd) wxOVERRIDE; wxSize GetTabSize( wxDC& dc, @@ -174,16 +174,16 @@ public: const wxBitmap& bitmap, bool active, int closeButtonState, - int* xExtent); + int* xExtent) wxOVERRIDE; int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int activeIdx); + int activeIdx) wxOVERRIDE; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize); + const wxSize& requiredBmpSize) wxOVERRIDE; protected: @@ -218,27 +218,27 @@ public: wxAuiSimpleTabArt(); virtual ~wxAuiSimpleTabArt(); - wxAuiTabArt* Clone(); - void SetFlags(unsigned int flags); + wxAuiTabArt* Clone() wxOVERRIDE; + void SetFlags(unsigned int flags) wxOVERRIDE; void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount); + size_t tabCount) wxOVERRIDE; - void SetNormalFont(const wxFont& font); - void SetSelectedFont(const wxFont& font); - void SetMeasuringFont(const wxFont& font); - void SetColour(const wxColour& colour); - void SetActiveColour(const wxColour& colour); + void SetNormalFont(const wxFont& font) wxOVERRIDE; + void SetSelectedFont(const wxFont& font) wxOVERRIDE; + void SetMeasuringFont(const wxFont& font) wxOVERRIDE; + void SetColour(const wxColour& colour) wxOVERRIDE; + void SetActiveColour(const wxColour& colour) wxOVERRIDE; void DrawBorder( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawTab(wxDC& dc, wxWindow* wnd, @@ -247,7 +247,7 @@ public: int closeButtonState, wxRect* outTabRect, wxRect* outButtonRect, - int* xExtent); + int* xExtent) wxOVERRIDE; void DrawButton( wxDC& dc, @@ -256,15 +256,15 @@ public: int bitmapId, int buttonState, int orientation, - wxRect* outRect); + wxRect* outRect) wxOVERRIDE; - int GetIndentSize(); + int GetIndentSize() wxOVERRIDE; int GetBorderWidth( - wxWindow* wnd); + wxWindow* wnd) wxOVERRIDE; int GetAdditionalBorderSpace( - wxWindow* wnd); + wxWindow* wnd) wxOVERRIDE; wxSize GetTabSize( wxDC& dc, @@ -273,16 +273,16 @@ public: const wxBitmap& bitmap, bool active, int closeButtonState, - int* xExtent); + int* xExtent) wxOVERRIDE; int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int activeIdx); + int activeIdx) wxOVERRIDE; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize); + const wxSize& requiredBmpSize) wxOVERRIDE; protected: diff --git a/include/wx/aui/tabartgtk.h b/include/wx/aui/tabartgtk.h index 85fe9e2a50..13f42cb4a8 100644 --- a/include/wx/aui/tabartgtk.h +++ b/include/wx/aui/tabartgtk.h @@ -31,9 +31,9 @@ class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt public: wxAuiGtkTabArt(); - virtual wxAuiTabArt* Clone(); - virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect); - virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect); + virtual wxAuiTabArt* Clone() wxOVERRIDE; + virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE; + virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE; virtual void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& page, @@ -41,16 +41,16 @@ public: int close_button_state, wxRect* out_tab_rect, wxRect* out_button_rect, - int* x_extent); + int* x_extent) wxOVERRIDE; void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, - int button_state, int orientation, wxRect* out_rect); + int button_state, int orientation, wxRect* out_rect) wxOVERRIDE; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size); - int GetBorderWidth(wxWindow* wnd); - int GetAdditionalBorderSpace(wxWindow* wnd); + const wxSize& required_bmp_size) wxOVERRIDE; + int GetBorderWidth(wxWindow* wnd) wxOVERRIDE; + int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE; virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, bool active, - int close_button_state, int* x_extent); + int close_button_state, int* x_extent) wxOVERRIDE; }; #endif // wxUSE_AUI diff --git a/include/wx/bannerwindow.h b/include/wx/bannerwindow.h index 1f1fb24611..c65f801fd8 100644 --- a/include/wx/bannerwindow.h +++ b/include/wx/bannerwindow.h @@ -87,7 +87,7 @@ public: void SetGradient(const wxColour& start, const wxColour& end); protected: - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; private: // Common part of all constructors. diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index 0eb0cadea4..cd9c8d5588 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -226,13 +226,13 @@ public: // we do have multiple pages - virtual bool HasMultiplePages() const { return true; } + virtual bool HasMultiplePages() const wxOVERRIDE { return true; } // we don't want focus for ourselves - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const { return false; } + virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } protected: // flags for DoSetSelection() @@ -242,7 +242,7 @@ protected: }; // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // After the insertion of the page in the method InsertPage, calling this // method sets the selection to the given page or the first one if there is @@ -303,7 +303,7 @@ protected: virtual wxWindow *DoRemovePage(size_t page) = 0; // our best size is the size which fits all our pages - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // helper: get the next page wrapping if we reached the end int GetNextPage(bool forward) const; @@ -384,7 +384,7 @@ public: m_nOldSel = event.m_nOldSel; } - virtual wxEvent *Clone() const { return new wxBookCtrlEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxBookCtrlEvent(*this); } // accessors // the currently selected page (wxNOT_FOUND if none) diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h index 16a84748d2..54775b3ed7 100644 --- a/include/wx/calctrl.h +++ b/include/wx/calctrl.h @@ -167,7 +167,7 @@ public: void SetWeekDay(const wxDateTime::WeekDay wd) { m_wday = wd; } wxDateTime::WeekDay GetWeekDay() const { return m_wday; } - virtual wxEvent *Clone() const { return new wxCalendarEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalendarEvent(*this); } private: wxDateTime::WeekDay m_wday; diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index e0978a0d13..3d355ee605 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -97,10 +97,10 @@ public: return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER); } - virtual bool HasTransparentBackground() { return true; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } // wxCheckBox-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE { wxControl::DoUpdateWindowUI(event); @@ -110,7 +110,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } diff --git a/include/wx/choice.h b/include/wx/choice.h index 3a848f9f3c..25b651ef37 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -52,17 +52,17 @@ public: virtual int GetColumns() const { return 1 ; } // emulate selecting the item event.GetInt() - void Command(wxCommandEvent& event); + void Command(wxCommandEvent& event) wxOVERRIDE; // override wxItemContainer::IsSorted - virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } + virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); } protected: // The generic implementation doesn't determine the height correctly and // doesn't account for the width of the arrow but does take into account // the string widths, so the derived classes should override it and set the // height and add the arrow width to the size returned by this version. - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; private: wxDECLARE_NO_COPY_CLASS(wxChoiceBase); diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 335ede165e..f59d72fea4 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -60,21 +60,21 @@ public: const wxString& name = wxEmptyString); - virtual bool SetPageText(size_t n, const wxString& strText); - virtual wxString GetPageText(size_t n) const; - virtual int GetPageImage(size_t n) const; - virtual bool SetPageImage(size_t n, int imageId); + 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 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 = NO_IMAGE); - virtual int SetSelection(size_t n) + int imageId = NO_IMAGE) wxOVERRIDE; + virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } - virtual void SetImageList(wxImageList *imageList); + virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } + virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual bool DeleteAllPages(); + virtual bool DeleteAllPages() wxOVERRIDE; // returns the choice control wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; } @@ -82,21 +82,21 @@ public: // Override this to return true because the part of parent window // background between our controlling wxChoice and the page area should // show through. - virtual bool HasTransparentBackground() { return true; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } protected: - virtual void DoSetWindowVariant(wxWindowVariant variant); + virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE; - virtual wxWindow *DoRemovePage(size_t page); + virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; - void UpdateSelectedPage(size_t newsel) + void UpdateSelectedPage(size_t newsel) wxOVERRIDE { m_selection = static_cast(newsel); GetChoiceCtrl()->Select(m_selection); } - wxBookCtrlEvent* CreatePageChangingEvent() const; - void MakeChangedEvent(wxBookCtrlEvent &event); + wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; + void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; // event handlers void OnChoiceSelected(wxCommandEvent& event); diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 5399be27d5..4fd6f80414 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -117,7 +117,7 @@ public: bool SupportsFormat(const wxDataFormat& format) const; void AddFormat(const wxDataFormat& format); - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardEvent(*this); } diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 1794ee68c9..7d43dc2551 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -134,16 +134,16 @@ public: // public API public: // internal functions // update the button colour to match the text control contents - void UpdatePickerFromTextCtrl(); + void UpdatePickerFromTextCtrl() wxOVERRIDE; // update the text control to match the button's colour - void UpdateTextCtrlFromPicker(); + void UpdateTextCtrlFromPicker() wxOVERRIDE; // event handler for our picker void OnColourChange(wxColourPickerEvent &); protected: - virtual long GetPickerStyle(long style) const + virtual long GetPickerStyle(long style) const wxOVERRIDE { return (style & wxCLRP_SHOW_LABEL); } private: @@ -173,7 +173,7 @@ public: // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxColourPickerEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxColourPickerEvent(*this); } private: wxColour m_colour; diff --git a/include/wx/collpane.h b/include/wx/collpane.h index 40c8939b01..9fa0472a84 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -70,7 +70,7 @@ public: // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxCollapsiblePaneEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxCollapsiblePaneEvent(*this); } private: bool m_bCollapsed; diff --git a/include/wx/colour.h b/include/wx/colour.h index ba058b0ba7..ce946c8ecb 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -182,14 +182,14 @@ protected: // wxColour doesn't use reference counted data (at least not in all ports) // so provide stubs for the functions which need to be defined if we do use // them - virtual wxGDIRefData *CreateGDIRefData() const + virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE { wxFAIL_MSG( "must be overridden if used" ); return NULL; } - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE { wxFAIL_MSG( "must be overridden if used" ); diff --git a/include/wx/combo.h b/include/wx/combo.h index 6a040b3d22..57fbcd829b 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -204,9 +204,9 @@ public: wxWindow *GetButton() const { return m_btn; } // forward these methods to all subcontrols - virtual bool Enable(bool enable = true); - virtual bool Show(bool show = true); - virtual bool SetFont(const wxFont& font); + virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) wxOVERRIDE; // // wxTextEntry methods @@ -214,49 +214,49 @@ public: // NB: We basically need to override all of them because there is // no guarantee how platform-specific wxTextEntry is implemented. // - virtual void SetValue(const wxString& value) + virtual void SetValue(const wxString& value) wxOVERRIDE { wxTextEntryBase::SetValue(value); } - virtual void ChangeValue(const wxString& value) + virtual void ChangeValue(const wxString& value) wxOVERRIDE { wxTextEntryBase::ChangeValue(value); } - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text) + virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual void AppendText(const wxString& text) wxOVERRIDE { wxTextEntryBase::AppendText(text); } - virtual wxString GetValue() const + virtual wxString GetValue() const wxOVERRIDE { return wxTextEntryBase::GetValue(); } - virtual wxString GetRange(long from, long to) const + virtual wxString GetRange(long from, long to) const wxOVERRIDE { return wxTextEntryBase::GetRange(from, to); } // Replace() and DoSetValue() need to be fully re-implemented since // EventSuppressor utility class does not work with the way // wxComboCtrl is implemented. - virtual void Replace(long from, long to, const wxString& value); + virtual void Replace(long from, long to, const wxString& value) 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; - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; + virtual bool SetHint(const wxString& hint) wxOVERRIDE; + virtual wxString GetHint() const wxOVERRIDE; // This method sets the text without affecting list selection // (ie. wxComboPopup::SetStringValue doesn't get called). @@ -467,12 +467,12 @@ public: void SetCtrlMainWnd( wxWindow* wnd ) { m_mainCtrlWnd = wnd; } // This is public so we can access it from wxComboCtrlTextCtrl - virtual wxWindow *GetMainWindowOfCompositeControl() + virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return m_mainCtrlWnd; } // also set the embedded wxTextCtrl colours - virtual bool SetForegroundColour(const wxColour& colour); - virtual bool SetBackgroundColour(const wxColour& colour); + virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; protected: @@ -546,8 +546,8 @@ protected: // override the base class virtuals involved in geometry calculations // The common version only sets a default width, so the derived classes // should override it and set the height and change the width as needed. - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; // NULL popup can be used to indicate default in a derived class virtual void DoSetPopupControl(wxComboPopup* popup); @@ -598,17 +598,17 @@ protected: virtual bool AnimateShow( const wxRect& rect, int flags ); #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); + virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; #endif // protected wxTextEntry methods - virtual void DoSetValue(const wxString& value, int flags); - virtual wxString DoGetValue() const; - virtual wxWindow *GetEditableWindow() { return this; } + virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; + virtual wxString DoGetValue() const wxOVERRIDE; + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } // margins functions - virtual bool DoSetMargins(const wxPoint& pt); - virtual wxPoint DoGetMargins() const; + virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; + virtual wxPoint DoGetMargins() const wxOVERRIDE; // This is used when m_text is hidden (readonly). wxString m_valueString; diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 93b3699553..e4154342a7 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer, { public: // override these methods to disambiguate between two base classes versions - virtual void Clear() + virtual void Clear() wxOVERRIDE { wxTextEntry::Clear(); wxItemContainer::Clear(); diff --git a/include/wx/commandlinkbutton.h b/include/wx/commandlinkbutton.h index 0aaa0ec65a..bd4b5d2e23 100644 --- a/include/wx/commandlinkbutton.h +++ b/include/wx/commandlinkbutton.h @@ -120,7 +120,7 @@ public: const wxString& name = wxButtonNameStr); virtual void SetMainLabelAndNote(const wxString& mainLabel, - const wxString& note) + const wxString& note) wxOVERRIDE { wxButton::SetLabel(mainLabel + '\n' + note); } diff --git a/include/wx/containr.h b/include/wx/containr.h index 277909e559..784ff2fcd7 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -137,7 +137,7 @@ class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase { protected: // set the focus to the child which had it the last time - virtual bool SetFocusToChild(); + virtual bool SetFocusToChild() wxOVERRIDE; }; #else // !wxHAS_NATIVE_TAB_TRAVERSAL diff --git a/include/wx/control.h b/include/wx/control.h index cd7bc9e268..f3e22f26fd 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -71,7 +71,7 @@ public: int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } // set label with mnemonics - virtual void SetLabel(const wxString& label) + virtual void SetLabel(const wxString& label) wxOVERRIDE { m_labelOrig = label; @@ -82,7 +82,7 @@ public: // return the original string, as it was passed to SetLabel() // (i.e. with wx-style mnemonics) - virtual wxString GetLabel() const { return m_labelOrig; } + virtual wxString GetLabel() const wxOVERRIDE { return m_labelOrig; } // set label text (mnemonics will be escaped) virtual void SetLabelText(const wxString& text) @@ -119,7 +119,7 @@ public: // controls by default inherit the colours of their parents, if a // particular control class doesn't want to do it, it can override // ShouldInheritColours() to return false - virtual bool ShouldInheritColours() const { return true; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return true; } // WARNING: this doesn't work for all controls nor all platforms! @@ -128,10 +128,10 @@ public: // if the button was clicked) virtual void Command(wxCommandEvent &event); - virtual bool SetFont(const wxFont& font); + virtual bool SetFont(const wxFont& font) wxOVERRIDE; // wxControl-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; wxSize GetSizeFromTextSize(int xlen, int ylen = -1) const { return DoGetSizeFromTextSize(xlen, ylen); } @@ -176,7 +176,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE; // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children diff --git a/include/wx/convauto.h b/include/wx/convauto.h index 0912368f64..3da6c6adc4 100644 --- a/include/wx/convauto.h +++ b/include/wx/convauto.h @@ -71,14 +71,14 @@ public: // override the base class virtual function(s) to use our m_conv virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMBNulLen() const { return m_conv->GetMBNulLen(); } + virtual size_t GetMBNulLen() const wxOVERRIDE { return m_conv->GetMBNulLen(); } - virtual wxMBConv *Clone() const { return new wxConvAuto(*this); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvAuto(*this); } // return the BOM type of this buffer static wxBOM DetectBOM(const char *src, size_t srcLen); diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index 1cd8a2b54c..50b803b928 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -204,14 +204,14 @@ class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider { public: // implement wxHelpProvider methods - virtual wxString GetHelp(const wxWindowBase *window); + virtual wxString GetHelp(const wxWindowBase *window) wxOVERRIDE; // override ShowHelp() and not ShowHelpAtPoint() as explained above - virtual bool ShowHelp(wxWindowBase *window); + virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE; - virtual void AddHelp(wxWindowBase *window, const wxString& text); - virtual void AddHelp(wxWindowID id, const wxString& text); - virtual void RemoveHelp(wxWindowBase* window); + virtual void AddHelp(wxWindowBase *window, const wxString& text) wxOVERRIDE; + virtual void AddHelp(wxWindowID id, const wxString& text) wxOVERRIDE; + virtual void RemoveHelp(wxWindowBase* window) wxOVERRIDE; protected: // we use 2 hashes for storing the help strings associated with windows @@ -235,7 +235,7 @@ public: // again (see above): this should be ShowHelpAtPoint() but we need to // override ShowHelp() to avoid breaking existing code - virtual bool ShowHelp(wxWindowBase *window); + virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE; // Other accessors void SetHelpController(wxHelpControllerBase* hc) { m_helpController = hc; } diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 88832e5b75..4ae66a7d62 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -438,7 +438,7 @@ public: // usually the controls like list/combo boxes have their own background // colour - virtual bool ShouldInheritColours() const { return false; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } // Implementation only from now on. diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index d099f4b6b1..30ee857670 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -225,20 +225,20 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const + virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE { return m_format; } - virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const + virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE { return 1; } virtual void GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir) = Get) const + wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE { *formats = m_format; } - 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); } private: @@ -286,12 +286,12 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const; - virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const; - virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const; - virtual size_t GetDataSize(const wxDataFormat& format) const; - virtual bool GetDataHere(const wxDataFormat& format, void *buf) const; - virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf); + virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE; + virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE; + virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const wxOVERRIDE; + virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE; + virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE; + virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) wxOVERRIDE; #if defined(__WXMSW__) virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, const wxDataFormat& format ); @@ -350,20 +350,20 @@ public: virtual wxString GetHTML() const { return m_html; } virtual void SetHTML(const wxString& html) { m_html = html; } - 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); } @@ -400,17 +400,17 @@ public: // some platforms have 2 and not 1 format for text data #if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) - virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const { return 2; } + virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const wxOVERRIDE { return 2; } virtual void GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir) = Get) const; + wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE; - virtual size_t GetDataSize() const { return GetDataSize(GetPreferredFormat()); } - virtual bool GetDataHere(void *buf) const { return GetDataHere(GetPreferredFormat(), buf); } - virtual bool SetData(size_t len, const void *buf) { return SetData(GetPreferredFormat(), len, buf); } + virtual size_t GetDataSize() const wxOVERRIDE { return GetDataSize(GetPreferredFormat()); } + virtual bool GetDataHere(void *buf) const wxOVERRIDE { return GetDataHere(GetPreferredFormat(), buf); } + virtual bool SetData(size_t len, const void *buf) wxOVERRIDE { return SetData(GetPreferredFormat(), len, buf); } - size_t GetDataSize(const wxDataFormat& format) const; - bool GetDataHere(const wxDataFormat& format, void *pBuf) const; - bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf); + size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE; + bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE; + bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) wxOVERRIDE; #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ virtual size_t GetDataSize() const; virtual bool GetDataHere(void *buf) const; @@ -520,19 +520,19 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t size, const void *buf); + virtual size_t GetDataSize() const wxOVERRIDE; + virtual bool GetDataHere(void *buf) const wxOVERRIDE; + virtual bool SetData(size_t size, 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/dataview.h b/include/wx/dataview.h index 8841709527..b5b74b00b0 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -313,13 +313,13 @@ public: // implement some base class pure virtual directly virtual wxDataViewItem - GetParent( const wxDataViewItem & WXUNUSED(item) ) const + GetParent( const wxDataViewItem & WXUNUSED(item) ) const wxOVERRIDE { // items never have valid parent in this model return wxDataViewItem(); } - virtual bool IsContainer( const wxDataViewItem &item ) const + virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE { // only the invisible (and invalid) root item has children return !item.IsOk(); @@ -327,30 +327,30 @@ public: // and implement some others by forwarding them to our own ones virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const + const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE { GetValueByRow(variant, GetRow(item), col); } virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) + const wxDataViewItem &item, unsigned int col ) wxOVERRIDE { return SetValueByRow( variant, GetRow(item), col ); } virtual bool GetAttr(const wxDataViewItem &item, unsigned int col, - wxDataViewItemAttr &attr) const + wxDataViewItemAttr &attr) const wxOVERRIDE { return GetAttrByRow( GetRow(item), col, attr ); } - virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const + virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE { return IsEnabledByRow( GetRow(item), col ); } - virtual bool IsListModel() const { return true; } + virtual bool IsListModel() const wxOVERRIDE { return true; } }; // --------------------------------------------------------- @@ -373,13 +373,13 @@ public: // convert to/from row/wxDataViewItem - virtual unsigned GetRow( const wxDataViewItem &item ) const; + virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE; wxDataViewItem GetItem( unsigned int row ) const; // implement base methods - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const; + virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; - unsigned int GetCount() const { return m_hash.GetCount(); } + unsigned int GetCount() const wxOVERRIDE { return m_hash.GetCount(); } private: wxDataViewItemArray m_hash; @@ -412,22 +412,22 @@ public: // convert to/from row/wxDataViewItem - virtual unsigned GetRow( const wxDataViewItem &item ) const; + virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE; wxDataViewItem GetItem( unsigned int row ) const; // compare based on index virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const; - virtual bool HasDefaultCompare() const; + unsigned int column, bool ascending ) const wxOVERRIDE; + virtual bool HasDefaultCompare() const wxOVERRIDE; // implement base methods - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const; + virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; - unsigned int GetCount() const { return m_size; } + unsigned int GetCount() const wxOVERRIDE { return m_size; } // internal - virtual bool IsVirtualListModel() const { return true; } + virtual bool IsVirtualListModel() const wxOVERRIDE { return true; } private: unsigned int m_size; @@ -485,8 +485,8 @@ public: // implement some of base class pure virtuals (the rest is port-dependent // and done differently in generic and native versions) - virtual void SetBitmap( const wxBitmap& bitmap ) { m_bitmap = bitmap; } - virtual wxBitmap GetBitmap() const { return m_bitmap; } + virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE { m_bitmap = bitmap; } + virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } protected: wxDataViewRenderer *m_renderer; @@ -728,7 +728,7 @@ public: // define control visual attributes // -------------------------------- - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -854,7 +854,7 @@ public: wxDragResult GetDropEffect() const { return m_dropEffect; } #endif // wxUSE_DRAG_AND_DROP - virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxDataViewEvent(*this); } protected: wxDataViewItem m_item; @@ -1000,15 +1000,15 @@ public: // override base virtuals - virtual unsigned int GetColumnCount() const; + virtual unsigned int GetColumnCount() const wxOVERRIDE; - virtual wxString GetColumnType( unsigned int col ) const; + virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE; virtual void GetValueByRow( wxVariant &value, - unsigned int row, unsigned int col ) const; + unsigned int row, unsigned int col ) const wxOVERRIDE; virtual bool SetValueByRow( const wxVariant &value, - unsigned int row, unsigned int col ); + unsigned int row, unsigned int col ) wxOVERRIDE; public: @@ -1057,10 +1057,10 @@ public: bool InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ); // overridden from base class - virtual bool PrependColumn( wxDataViewColumn *col ); - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ); - virtual bool AppendColumn( wxDataViewColumn *col ); - virtual bool ClearColumns(); + virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE; + virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE; + virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE; + virtual bool ClearColumns() wxOVERRIDE; wxDataViewColumn *AppendTextColumn( const wxString &label, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, @@ -1185,7 +1185,7 @@ public: bool IsExpanded() const { return m_isExpanded; } - virtual bool IsContainer() + virtual bool IsContainer() wxOVERRIDE { return true; } private: @@ -1238,21 +1238,21 @@ public: // implement base methods virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const; + const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE; virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ); - virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const; - virtual bool IsContainer( const wxDataViewItem &item ) const; - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const; + const wxDataViewItem &item, unsigned int col ) wxOVERRIDE; + virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE; + virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE; + virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const; + unsigned int column, bool ascending ) const wxOVERRIDE; - virtual bool HasDefaultCompare() const + virtual bool HasDefaultCompare() const wxOVERRIDE { return true; } - virtual unsigned int GetColumnCount() const + virtual unsigned int GetColumnCount() const wxOVERRIDE { return 1; } - virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const + virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const wxOVERRIDE { return wxT("wxDataViewIconText"); } wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const; diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h index 4131ab383e..0bd8a670ad 100644 --- a/include/wx/dateevt.h +++ b/include/wx/dateevt.h @@ -34,7 +34,7 @@ public: void SetDate(const wxDateTime &date) { m_date = date; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxDateEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxDateEvent(*this); } private: wxDateTime m_date; diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 14a1501b15..2c56bb9ae2 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1584,10 +1584,10 @@ private: class WXDLLIMPEXP_BASE wxDateTimeWorkDays : public wxDateTimeHolidayAuthority { protected: - virtual bool DoIsHoliday(const wxDateTime& dt) const; + virtual bool DoIsHoliday(const wxDateTime& dt) const wxOVERRIDE; virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart, const wxDateTime& dtEnd, - wxDateTimeArray& holidays) const; + wxDateTimeArray& holidays) const wxOVERRIDE; }; // ============================================================================ diff --git a/include/wx/dc.h b/include/wx/dc.h index a0dd254b53..2f539b4c01 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -242,15 +242,15 @@ class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory public: wxNativeDCFactory() {} - virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ); - virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ); - virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ); - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ); - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ); - virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ); - virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ); + virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) wxOVERRIDE; + virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) wxOVERRIDE; + virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) wxOVERRIDE; + virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) wxOVERRIDE; + virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) wxOVERRIDE; + virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) wxOVERRIDE; + virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) wxOVERRIDE; #if wxUSE_PRINTING_ARCHITECTURE - virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ); + virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ) wxOVERRIDE; #endif }; diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h index 42deb9771c..4bbd27e777 100644 --- a/include/wx/dcmirror.h +++ b/include/wx/dcmirror.h @@ -33,39 +33,39 @@ public: } // wxDCBase operations - virtual void Clear() { m_dc.Clear(); } - virtual void SetFont(const wxFont& font) { m_dc.SetFont(font); } - virtual void SetPen(const wxPen& pen) { m_dc.SetPen(pen); } - virtual void SetBrush(const wxBrush& brush) { m_dc.SetBrush(brush); } - virtual void SetBackground(const wxBrush& brush) + virtual void Clear() wxOVERRIDE { m_dc.Clear(); } + virtual void SetFont(const wxFont& font) wxOVERRIDE { m_dc.SetFont(font); } + virtual void SetPen(const wxPen& pen) wxOVERRIDE { m_dc.SetPen(pen); } + virtual void SetBrush(const wxBrush& brush) wxOVERRIDE { m_dc.SetBrush(brush); } + virtual void SetBackground(const wxBrush& brush) wxOVERRIDE { m_dc.SetBackground(brush); } - virtual void SetBackgroundMode(int mode) { m_dc.SetBackgroundMode(mode); } + virtual void SetBackgroundMode(int mode) wxOVERRIDE { m_dc.SetBackgroundMode(mode); } #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) + virtual void SetPalette(const wxPalette& palette) wxOVERRIDE { m_dc.SetPalette(palette); } #endif // wxUSE_PALETTE - virtual void DestroyClippingRegion() { m_dc.DestroyClippingRegion(); } - virtual wxCoord GetCharHeight() const { return m_dc.GetCharHeight(); } - virtual wxCoord GetCharWidth() const { return m_dc.GetCharWidth(); } - virtual bool CanDrawBitmap() const { return m_dc.CanDrawBitmap(); } - virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); } - virtual int GetDepth() const { return m_dc.GetDepth(); } - virtual wxSize GetPPI() const { return m_dc.GetPPI(); } - virtual bool IsOk() const { return m_dc.IsOk(); } - virtual void SetMapMode(wxMappingMode mode) { m_dc.SetMapMode(mode); } - virtual void SetUserScale(double x, double y) + virtual void DestroyClippingRegion() wxOVERRIDE { m_dc.DestroyClippingRegion(); } + virtual wxCoord GetCharHeight() const wxOVERRIDE { return m_dc.GetCharHeight(); } + virtual wxCoord GetCharWidth() const wxOVERRIDE { return m_dc.GetCharWidth(); } + virtual bool CanDrawBitmap() const wxOVERRIDE { return m_dc.CanDrawBitmap(); } + virtual bool CanGetTextExtent() const wxOVERRIDE { return m_dc.CanGetTextExtent(); } + virtual int GetDepth() const wxOVERRIDE { return m_dc.GetDepth(); } + virtual wxSize GetPPI() const wxOVERRIDE { return m_dc.GetPPI(); } + virtual bool IsOk() const wxOVERRIDE { return m_dc.IsOk(); } + virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE { m_dc.SetMapMode(mode); } + virtual void SetUserScale(double x, double y) wxOVERRIDE { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); } - virtual void SetLogicalOrigin(wxCoord x, wxCoord y) + virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE { m_dc.SetLogicalOrigin(GetX(x, y), GetY(x, y)); } - virtual void SetDeviceOrigin(wxCoord x, wxCoord y) + virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE { m_dc.SetDeviceOrigin(GetX(x, y), GetY(x, y)); } - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) + virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp), GetY(xLeftRight, yBottomUp)); } - virtual void SetLogicalFunction(wxRasterOperationMode function) + virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE { m_dc.SetLogicalFunction(function); } - virtual void* GetHandle() const + virtual void* GetHandle() const wxOVERRIDE { return m_dc.GetHandle(); } protected: @@ -100,30 +100,30 @@ protected: // wxDCBase functions virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) + wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE { return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style); } - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE { return m_dc.DoGetPixel(GetX(x, y), GetY(x, y), col); } - virtual void DoDrawPoint(wxCoord x, wxCoord y) + virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE { m_dc.DoDrawPoint(GetX(x, y), GetY(x, y)); } - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE { m_dc.DoDrawLine(GetX(x1, y1), GetY(x1, y1), GetX(x2, y2), GetY(x2, y2)); } virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) + wxCoord xc, wxCoord yc) wxOVERRIDE { wxFAIL_MSG( wxT("this is probably wrong") ); @@ -133,14 +133,14 @@ protected: } virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) + wxCoord w, wxCoord h) wxOVERRIDE { m_dc.DoDrawCheckMark(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); } virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) + double sa, double ea) wxOVERRIDE { wxFAIL_MSG( wxT("this is probably wrong") ); @@ -149,49 +149,49 @@ protected: sa, ea); } - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE { m_dc.DoDrawRectangle(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); } virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double radius) + double radius) wxOVERRIDE { m_dc.DoDrawRoundedRectangle(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h), radius); } - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) + virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE { m_dc.DoDrawEllipse(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); } - virtual void DoCrossHair(wxCoord x, wxCoord y) + virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE { m_dc.DoCrossHair(GetX(x, y), GetY(x, y)); } - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE { m_dc.DoDrawIcon(icon, GetX(x, y), GetY(x, y)); } virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) + bool useMask = false) wxOVERRIDE { m_dc.DoDrawBitmap(bmp, GetX(x, y), GetY(x, y), useMask); } - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE { // this is never mirrored m_dc.DoDrawText(text, x, y); } virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle) + wxCoord x, wxCoord y, double angle) wxOVERRIDE { // this is never mirrored m_dc.DoDrawRotatedText(text, x, y, angle); @@ -202,7 +202,7 @@ protected: wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE { return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest), GetX(w, h), GetY(w, h), @@ -211,18 +211,18 @@ protected: GetX(xsrcMask, ysrcMask), GetX(xsrcMask, ysrcMask)); } - virtual void DoGetSize(int *w, int *h) const + virtual void DoGetSize(int *w, int *h) const wxOVERRIDE { m_dc.DoGetSize(GetX(w, h), GetY(w, h)); } - virtual void DoGetSizeMM(int *w, int *h) const + virtual void DoGetSizeMM(int *w, int *h) const wxOVERRIDE { m_dc.DoGetSizeMM(GetX(w, h), GetY(w, h)); } virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) + wxCoord xoffset, wxCoord yoffset) wxOVERRIDE { wxPoint* points_alloc = Mirror(n, points); @@ -234,7 +234,7 @@ protected: virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE { wxPoint* points_alloc = Mirror(n, points); @@ -245,13 +245,13 @@ protected: delete[] points_alloc; } - virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) + virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE { wxFAIL_MSG( wxT("not implemented") ); } virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) + wxCoord w, wxCoord h) wxOVERRIDE { m_dc.DoSetClippingRegion(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); } @@ -260,7 +260,7 @@ protected: wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const + const wxFont *theFont = NULL) const wxOVERRIDE { // never mirrored m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont); diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h index 6d84731116..1d50954595 100644 --- a/include/wx/dcprint.h +++ b/include/wx/dcprint.h @@ -28,7 +28,7 @@ public: wxPrinterDC(const wxPrintData& data); wxRect GetPaperRect() const; - int GetResolution() const; + int GetResolution() const wxOVERRIDE; protected: wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { } diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h index 4f79708908..0fce5ed572 100644 --- a/include/wx/dcsvg.h +++ b/include/wx/dcsvg.h @@ -49,7 +49,7 @@ class WXDLLIMPEXP_CORE wxSVGBitmapFileHandler : public wxSVGBitmapHandler public: virtual bool ProcessBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, - wxOutputStream& stream) const; + wxOutputStream& stream) const wxOVERRIDE; }; // Predefined handler which embeds the bitmap (base64-encoding it) inside the @@ -59,7 +59,7 @@ class WXDLLIMPEXP_CORE wxSVGBitmapEmbedHandler : public wxSVGBitmapHandler public: virtual bool ProcessBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, - wxOutputStream& stream) const; + wxOutputStream& stream) const wxOVERRIDE; }; class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl @@ -70,26 +70,26 @@ public: virtual ~wxSVGFileDCImpl(); - bool IsOk() const { return m_OK; } + bool IsOk() const wxOVERRIDE { return m_OK; } - virtual bool CanDrawBitmap() const { return true; } - virtual bool CanGetTextExtent() const { return true; } + virtual bool CanDrawBitmap() const wxOVERRIDE { return true; } + virtual bool CanGetTextExtent() const wxOVERRIDE { return true; } - virtual int GetDepth() const + virtual int GetDepth() const wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1; } - virtual void Clear() + virtual void Clear() wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); } - virtual void DestroyClippingRegion(); + virtual void DestroyClippingRegion() wxOVERRIDE; - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; + virtual wxCoord GetCharHeight() const wxOVERRIDE; + virtual wxCoord GetCharWidth() const wxOVERRIDE; virtual void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(w), wxCoord WXUNUSED(h)) @@ -97,7 +97,7 @@ public: wxFAIL_MSG(wxT("wxSVGFILEDC::SetClippingRegion not implemented")); } - virtual void SetPalette(const wxPalette& WXUNUSED(palette)) + virtual void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented")); } @@ -108,29 +108,29 @@ public: wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented")); } - virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) + virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented")); } - virtual wxRasterOperationMode GetLogicalFunction() const + virtual wxRasterOperationMode GetLogicalFunction() const wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented")); return wxCOPY; } - virtual void SetBackground( const wxBrush &brush ); - virtual void SetBackgroundMode( int mode ); - virtual void SetBrush(const wxBrush& brush); - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); + virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE; + virtual void SetBackgroundMode( int mode ) wxOVERRIDE; + virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; + virtual void SetFont(const wxFont& font) wxOVERRIDE; + virtual void SetPen(const wxPen& pen) wxOVERRIDE; - virtual void* GetHandle() const { return NULL; } + virtual void* GetHandle() const wxOVERRIDE { return NULL; } void SetBitmapHandler(wxSVGBitmapHandler* handler); private: - virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const + virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; @@ -138,57 +138,57 @@ private: virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *, wxCoord, wxCoord, wxRasterOperationMode = wxCOPY, - bool = 0, int = -1, int = -1); + bool = 0, int = -1, int = -1) wxOVERRIDE; - virtual void DoCrossHair(wxCoord, wxCoord) + virtual void DoCrossHair(wxCoord, wxCoord) wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented")); } - virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord); + virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord) wxOVERRIDE; - virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false); + virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false) wxOVERRIDE; - virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h); + virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE; - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h); + virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); + double sa, double ea) wxOVERRIDE; - virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord); + virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord) wxOVERRIDE; - virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); + virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset = 0, wxCoord yoffset = 0); + wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE; - virtual void DoDrawPoint(wxCoord, wxCoord); + virtual void DoDrawPoint(wxCoord, wxCoord) wxOVERRIDE; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle); + wxPolygonFillMode fillStyle) wxOVERRIDE; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h); + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE; virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle); + double angle) wxOVERRIDE; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double radius = 20) ; + double radius = 20) wxOVERRIDE ; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col), - wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) + wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false; } - virtual void DoGetSize(int * x, int *y) const + virtual void DoGetSize(int * x, int *y) const wxOVERRIDE { if ( x ) *x = m_width; @@ -199,18 +199,18 @@ private: virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *font = NULL) const; + const wxFont *font = NULL) const wxOVERRIDE; - virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) + virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE { wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion not yet implemented")); } - virtual void DoSetClippingRegion(int x, int y, int width, int height); + virtual void DoSetClippingRegion(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoGetSizeMM( int *width, int *height ) const; + virtual void DoGetSizeMM( int *width, int *height ) const wxOVERRIDE; - virtual wxSize GetPPI() const; + virtual wxSize GetPPI() const wxOVERRIDE; void Init (const wxString &filename, int width, int height, double dpi); diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h index 421bede975..17e0b899a4 100644 --- a/include/wx/debugrpt.h +++ b/include/wx/debugrpt.h @@ -146,7 +146,7 @@ public: const wxString& GetCompressedFileName() const { return m_zipfile; } protected: - virtual bool DoProcess(); + virtual bool DoProcess() wxOVERRIDE; private: // user-specified file directory/base name, use defaults if empty @@ -176,7 +176,7 @@ public: const wxString& curl = wxT("curl")); protected: - virtual bool DoProcess(); + virtual bool DoProcess() wxOVERRIDE; // this function may be overridden in a derived class to show the output // from curl: this may be an HTML page or anything else that the server @@ -237,7 +237,7 @@ class WXDLLIMPEXP_QA wxDebugReportPreviewStd : public wxDebugReportPreview public: wxDebugReportPreviewStd() { } - virtual bool Show(wxDebugReport& dbgrpt) const; + virtual bool Show(wxDebugReport& dbgrpt) const wxOVERRIDE; }; #endif // wxUSE_GUI diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 7110151356..2a0e1fdd64 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -309,10 +309,10 @@ public: // Overrides // Indicate that adaptation should be done - virtual bool CanDoLayoutAdaptation(wxDialog* dialog); + virtual bool CanDoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE; // Do layout adaptation - virtual bool DoLayoutAdaptation(wxDialog* dialog); + virtual bool DoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE; // Implementation @@ -381,7 +381,7 @@ public: int GetReturnCode() const { return GetDialog()->GetReturnCode(); } - virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowModalDialogEvent (*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent ) diff --git a/include/wx/dnd.h b/include/wx/dnd.h index 9d9f2e25ca..80fbda1372 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -239,7 +239,7 @@ public: virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0; - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; private: wxDECLARE_NO_COPY_CLASS(wxTextDropTarget); @@ -255,7 +255,7 @@ public: virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) = 0; - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; private: wxDECLARE_NO_COPY_CLASS(wxFileDropTarget); diff --git a/include/wx/docview.h b/include/wx/docview.h index 78c3190601..2ac189c40b 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -284,7 +284,7 @@ public: protected: // hook the document into event handlers chain here - virtual bool TryBefore(wxEvent& event); + virtual bool TryBefore(wxEvent& event) wxOVERRIDE; wxDocument* m_viewDocument; wxString m_viewTypeName; @@ -548,7 +548,7 @@ protected: #endif // wxUSE_PRINTING_ARCHITECTURE // hook the currently active view into event handlers chain here - virtual bool TryBefore(wxEvent& event); + virtual bool TryBefore(wxEvent& event) wxOVERRIDE; // return the command processor for the current document, if any wxCommandProcessor *GetCurrentCommandProcessor() const; @@ -983,11 +983,11 @@ public: wxDocPrintout(wxView *view = NULL, const wxString& title = wxString()); // implement wxPrintout methods - virtual bool OnPrintPage(int page); - virtual bool HasPage(int page); - virtual bool OnBeginDocument(int startPage, int endPage); + virtual bool OnPrintPage(int page) wxOVERRIDE; + virtual bool HasPage(int page) wxOVERRIDE; + virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; virtual void GetPageInfo(int *minPage, int *maxPage, - int *selPageFrom, int *selPageTo); + int *selPageFrom, int *selPageTo) wxOVERRIDE; virtual wxView *GetView() { return m_printoutView; } diff --git a/include/wx/event.h b/include/wx/event.h index 9d09ff1bf2..d3ffc929ac 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -223,9 +223,9 @@ public: : m_handler( handler ), m_method( method ) { } - virtual void operator()(wxEvtHandler *handler, wxEvent& event); + virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE; - virtual bool IsMatching(const wxEventFunctor& functor) const + virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE { if ( wxTypeId(functor) == wxTypeId(*this) ) { @@ -245,10 +245,10 @@ public: return false; } - virtual wxEvtHandler *GetEvtHandler() const + virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE { return m_handler; } - virtual wxEventFunction GetEvtMethod() const + virtual wxEventFunction GetEvtMethod() const wxOVERRIDE { return m_method; } private: @@ -459,7 +459,7 @@ public: CheckHandlerArgument(static_cast(NULL)); } - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) + virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE { // If you get an error here like "must use .* or ->* to call // pointer-to-member function" then you probably tried to call @@ -471,7 +471,7 @@ public: m_handler(static_cast(event)); } - virtual bool IsMatching(const wxEventFunctor &functor) const + virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE { if ( wxTypeId(functor) != wxTypeId(*this) ) return false; @@ -504,7 +504,7 @@ public: : m_handler(handler), m_handlerAddr(&handler) { } - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) + virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE { // If you get an error here like "must use '.*' or '->*' to call // pointer-to-member function" then you probably tried to call @@ -516,7 +516,7 @@ public: m_handler(static_cast(event)); } - virtual bool IsMatching(const wxEventFunctor &functor) const + virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE { if ( wxTypeId(functor) != wxTypeId(*this) ) return false; @@ -1261,7 +1261,7 @@ public: void RequestMore(bool needMore = true) { m_requestMore = needMore; } bool MoreRequested() const { return m_requestMore; } - virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxIdleEvent(*this); } // Specify how wxWidgets will send idle events: to // all windows, or only to those which specify that they @@ -1299,14 +1299,14 @@ public: SetString(GetString().Clone()); } - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxThreadEvent(*this); } // this is important to avoid that calling wxEventLoopBase::YieldFor thread events // gets processed when this is unwanted: - virtual wxEventCategory GetEventCategory() const + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_THREAD; } private: @@ -1363,12 +1363,12 @@ public: { } - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxAsyncMethodCallEvent0(*this); } - virtual void Execute() + virtual void Execute() wxOVERRIDE { (m_object->*m_method)(); } @@ -1405,12 +1405,12 @@ public: { } - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxAsyncMethodCallEvent1(*this); } - virtual void Execute() + virtual void Execute() wxOVERRIDE { (m_object->*m_method)(m_param1); } @@ -1452,12 +1452,12 @@ public: { } - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxAsyncMethodCallEvent2(*this); } - virtual void Execute() + virtual void Execute() wxOVERRIDE { (m_object->*m_method)(m_param1, m_param2); } @@ -1488,12 +1488,12 @@ public: { } - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxAsyncMethodCallEventFunctor(*this); } - virtual void Execute() + virtual void Execute() wxOVERRIDE { m_fn(); } @@ -1566,8 +1566,8 @@ public: // true if the listbox event was a selection. bool IsSelection() const { return (m_extraLong != 0); } - virtual wxEvent *Clone() const { return new wxCommandEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxCommandEvent(*this); } + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } protected: void* m_clientData; // Arbitrary client data @@ -1599,7 +1599,7 @@ public: // for implementation code only: is the operation allowed? bool IsAllowed() const { return m_bAllow; } - virtual wxEvent *Clone() const { return new wxNotifyEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxNotifyEvent(*this); } private: bool m_bAllow; @@ -1634,7 +1634,7 @@ public: void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetPosition(int pos) { m_commandInt = pos; } - virtual wxEvent *Clone() const { return new wxScrollEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent) @@ -1667,7 +1667,7 @@ public: void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetPosition(int pos) { m_commandInt = pos; } - virtual wxEvent *Clone() const { return new wxScrollWinEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollWinEvent(*this); } protected: int m_commandInt; @@ -1805,8 +1805,8 @@ public: // Is the system set to do page scrolling? bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); } - virtual wxEvent *Clone() const { return new wxMouseEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseEvent(*this); } + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } wxMouseEvent& operator=(const wxMouseEvent& event) { @@ -1859,7 +1859,7 @@ public: const wxCursor& GetCursor() const { return m_cursor; } bool HasCursor() const { return m_cursor.IsOk(); } - virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSetCursorEvent(*this); } private: wxCoord m_x, m_y; @@ -1971,8 +1971,8 @@ public: bool IsNextEventAllowed() const { return m_allowNext; } - virtual wxEvent *Clone() const { return new wxKeyEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxKeyEvent(*this); } + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for // example) @@ -2080,7 +2080,7 @@ public: wxRect GetRect() const { return m_rect; } void SetRect(const wxRect& rect) { m_rect = rect; } - virtual wxEvent *Clone() const { return new wxSizeEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSizeEvent(*this); } public: // For internal usage only. Will be converted to protected members. @@ -2120,7 +2120,7 @@ public: wxRect GetRect() const { return m_rect; } void SetRect(const wxRect& rect) { m_rect = rect; } - virtual wxEvent *Clone() const { return new wxMoveEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMoveEvent(*this); } protected: wxPoint m_pos; @@ -2170,7 +2170,7 @@ public: } #endif // debug - virtual wxEvent *Clone() const { return new wxPaintEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaintEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent) @@ -2183,7 +2183,7 @@ public: : wxEvent(winid, wxEVT_NC_PAINT) { } - virtual wxEvent *Clone() const { return new wxNcPaintEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxNcPaintEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent) @@ -2209,7 +2209,7 @@ public: wxDC *GetDC() const { return m_dc; } - virtual wxEvent *Clone() const { return new wxEraseEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxEraseEvent(*this); } protected: wxDC *m_dc; @@ -2241,7 +2241,7 @@ public: wxWindow *GetWindow() const { return m_win; } void SetWindow(wxWindow *win) { m_win = win; } - virtual wxEvent *Clone() const { return new wxFocusEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxFocusEvent(*this); } private: wxWindow *m_win; @@ -2259,7 +2259,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - virtual wxEvent *Clone() const { return new wxChildFocusEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxChildFocusEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent) @@ -2300,7 +2300,7 @@ public: bool GetActive() const { return m_active; } Reason GetActivationReason() const { return m_activationReason;} - virtual wxEvent *Clone() const { return new wxActivateEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxActivateEvent(*this); } private: bool m_active; @@ -2322,7 +2322,7 @@ public: : wxEvent(Id, wxEVT_INIT_DIALOG) { } - virtual wxEvent *Clone() const { return new wxInitDialogEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxInitDialogEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent) @@ -2354,7 +2354,7 @@ public: // only for wxEVT_MENU_OPEN/CLOSE wxMenu* GetMenu() const { return m_menu; } - virtual wxEvent *Clone() const { return new wxMenuEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMenuEvent(*this); } private: int m_menuId; @@ -2408,7 +2408,7 @@ public: bool CanVeto() const { return m_canVeto; } bool GetVeto() const { return m_canVeto && m_veto; } - virtual wxEvent *Clone() const { return new wxCloseEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxCloseEvent(*this); } protected: bool m_loggingOff, @@ -2442,7 +2442,7 @@ public: wxDEPRECATED( bool GetShow() const { return IsShown(); } ) #endif - virtual wxEvent *Clone() const { return new wxShowEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxShowEvent(*this); } protected: bool m_show; @@ -2471,7 +2471,7 @@ public: // return true if the frame was iconized, false if restored bool IsIconized() const { return m_iconized; } - virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxIconizeEvent(*this); } protected: bool m_iconized; @@ -2490,7 +2490,7 @@ public: : wxEvent(winid, wxEVT_MAXIMIZE) { } - virtual wxEvent *Clone() const { return new wxMaximizeEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMaximizeEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent) @@ -2589,7 +2589,7 @@ public: { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) || ((m_buttonState & but) == but)); } - virtual wxEvent *Clone() const { return new wxJoystickEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxJoystickEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent) @@ -2639,7 +2639,7 @@ public: int GetNumberOfFiles() const { return m_noFiles; } wxString *GetFiles() const { return m_files; } - virtual wxEvent *Clone() const { return new wxDropFilesEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxDropFilesEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent) @@ -2726,7 +2726,7 @@ public: // Returns the UI update mode static wxUpdateUIMode GetMode() { return sm_updateMode; } - virtual wxEvent *Clone() const { return new wxUpdateUIEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxUpdateUIEvent(*this); } protected: bool m_checked; @@ -2759,7 +2759,7 @@ public: : wxEvent(0, wxEVT_SYS_COLOUR_CHANGED) { } - virtual wxEvent *Clone() const { return new wxSysColourChangedEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSysColourChangedEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent) @@ -2784,7 +2784,7 @@ public: m_gainedCapture(event.m_gainedCapture) { } - virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureChangedEvent(*this); } wxWindow* GetCapturedWindow() const { return m_gainedCapture; } @@ -2812,7 +2812,7 @@ public: : wxEvent(event) {} - virtual wxEvent *Clone() const { return new wxMouseCaptureLostEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureLostEvent(*this); } DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent) }; @@ -2830,7 +2830,7 @@ public: : wxEvent(0, wxEVT_DISPLAY_CHANGED) { } - virtual wxEvent *Clone() const { return new wxDisplayChangedEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxDisplayChangedEvent(*this); } }; /* @@ -2853,7 +2853,7 @@ public: void SetChangedWindow(wxWindow* win) { m_changedWindow = win; } wxWindow* GetChangedWindow() const { return m_changedWindow; } - virtual wxEvent *Clone() const { return new wxPaletteChangedEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaletteChangedEvent(*this); } protected: wxWindow* m_changedWindow; @@ -2883,7 +2883,7 @@ public: void SetPaletteRealized(bool realized) { m_paletteRealized = realized; } bool GetPaletteRealized() const { return m_paletteRealized; } - virtual wxEvent *Clone() const { return new wxQueryNewPaletteEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryNewPaletteEvent(*this); } protected: bool m_paletteRealized; @@ -2942,7 +2942,7 @@ public: // Set flags void SetFlags(long flags) { m_flags = flags; } - virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxNavigationKeyEvent(*this); } enum wxNavigationKeyEventFlags { @@ -2976,7 +2976,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - virtual wxEvent *Clone() const { return new wxWindowCreateEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowCreateEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent) @@ -2989,7 +2989,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - virtual wxEvent *Clone() const { return new wxWindowDestroyEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowDestroyEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent) @@ -3040,7 +3040,7 @@ public: const wxString& GetTarget() const { return m_target; } void SetTarget(const wxString& target) { m_target = target; } - virtual wxEvent *Clone() const { return new wxHelpEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxHelpEvent(*this); } // optional indication of the event source Origin GetOrigin() const { return m_origin; } @@ -3082,7 +3082,7 @@ public: : wxCommandEvent(event) { } - virtual wxEvent *Clone() const { return new wxClipboardTextEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardTextEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent) @@ -3114,7 +3114,7 @@ public: const wxPoint& GetPosition() const { return m_pos; } void SetPosition(const wxPoint& pos) { m_pos = pos; } - virtual wxEvent *Clone() const { return new wxContextMenuEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxContextMenuEvent(*this); } protected: wxPoint m_pos; @@ -3775,14 +3775,14 @@ public: } // The sink is being destroyed - virtual void OnObjectDestroy( ) + virtual void OnObjectDestroy( ) wxOVERRIDE { if ( m_src ) m_src->OnSinkDestroyed( m_sink ); delete this; } - virtual wxEventConnectionRef *ToEventConnection() { return this; } + virtual wxEventConnectionRef *ToEventConnection() wxOVERRIDE { return this; } void IncRef() { m_refCount++; } void DecRef() @@ -3855,7 +3855,7 @@ public: m_eventsToBlock.push_back(type); } - virtual bool ProcessEvent(wxEvent& event); + virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; protected: wxArrayInt m_eventsToBlock; @@ -3986,9 +3986,9 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent& static const wxEventTableEntry sm_eventTableEntries[]; \ protected: \ static const wxEventTable sm_eventTable; \ - virtual const wxEventTable* GetEventTable() const; \ + const wxEventTable* GetEventTable() const wxOVERRIDE; \ static wxEventHashTable sm_eventHashTable; \ - virtual wxEventHashTable& GetEventHashTable() const + wxEventHashTable& GetEventHashTable() const wxOVERRIDE // N.B.: when building DLL with Borland C++ 5.5 compiler, you must initialize // sm_eventTable before using it in GetEventTable() or the compiler gives diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 0482504ae6..f7232e06af 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -238,12 +238,12 @@ 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; 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 @@ -377,7 +377,7 @@ public: } protected: - virtual void OnExit() + virtual void OnExit() wxOVERRIDE { delete m_windowDisabler; m_windowDisabler = NULL; diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index 709dcb156b..e5223ca9ae 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -156,7 +156,7 @@ public: void SetFindString(const wxString& str) { SetString(str); } void SetReplaceString(const wxString& str) { m_strReplace = str; } - virtual wxEvent *Clone() const { return new wxFindDialogEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxFindDialogEvent(*this); } private: wxString m_strReplace; diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index c16129a5b1..a3dd19b17c 100644 --- a/include/wx/fileconf.h +++ b/include/wx/fileconf.h @@ -151,28 +151,28 @@ public: #endif // __UNIX__/!__UNIX__ // implement inherited pure virtual functions - virtual void SetPath(const wxString& strPath); - virtual const wxString& GetPath() const; + virtual void SetPath(const wxString& strPath) wxOVERRIDE; + virtual const wxString& GetPath() const wxOVERRIDE; - virtual bool GetFirstGroup(wxString& str, long& lIndex) const; - virtual bool GetNextGroup (wxString& str, long& lIndex) const; - virtual bool GetFirstEntry(wxString& str, long& lIndex) const; - virtual bool GetNextEntry (wxString& str, long& lIndex) const; + virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE; + virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE; + virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE; + virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE; - virtual size_t GetNumberOfEntries(bool bRecursive = false) const; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const; + virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE; + virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE; - virtual bool HasGroup(const wxString& strName) const; - virtual bool HasEntry(const wxString& strName) const; + virtual bool HasGroup(const wxString& strName) const wxOVERRIDE; + virtual bool HasEntry(const wxString& strName) const wxOVERRIDE; - virtual bool Flush(bool bCurrentOnly = false); + virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE; - virtual bool RenameEntry(const wxString& oldName, const wxString& newName); - virtual bool RenameGroup(const wxString& oldName, const wxString& newName); + virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE; + virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE; - virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true); - virtual bool DeleteGroup(const wxString& szKey); - virtual bool DeleteAll(); + virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE; + virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE; + virtual bool DeleteAll() wxOVERRIDE; // additional, wxFileConfig-specific, functionality #if wxUSE_STREAMS @@ -191,16 +191,16 @@ public: bool LineListIsEmpty(); protected: - virtual bool DoReadString(const wxString& key, wxString *pStr) const; - virtual bool DoReadLong(const wxString& key, long *pl) const; + virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE; + virtual bool DoReadLong(const wxString& key, long *pl) const wxOVERRIDE; #if wxUSE_BASE64 - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const; + virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE; #endif // wxUSE_BASE64 - virtual bool DoWriteString(const wxString& key, const wxString& szValue); - virtual bool DoWriteLong(const wxString& key, long lValue); + virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE; + virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE; #if wxUSE_BASE64 - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf); + virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE; #endif // wxUSE_BASE64 private: diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h index 82ce095f73..a7c2515976 100644 --- a/include/wx/filectrl.h +++ b/include/wx/filectrl.h @@ -98,7 +98,7 @@ public: } // no need for the copy constructor as the default one will be fine. - virtual wxEvent *Clone() const { return new wxFileCtrlEvent( *this ); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxFileCtrlEvent( *this ); } void SetFiles( const wxArrayString &files ) { m_files = files; } void SetDirectory( const wxString &directory ) { m_directory = directory; } diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index 5264ddb3ea..28f9b4732d 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -50,7 +50,7 @@ public: void SetPath(const wxString &p) { m_path = p; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxFileDirPickerEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxFileDirPickerEvent(*this); } private: wxString m_path; @@ -176,8 +176,8 @@ public: // public API public: // internal functions - void UpdatePickerFromTextCtrl(); - void UpdateTextCtrlFromPicker(); + void UpdatePickerFromTextCtrl() wxOVERRIDE; + void UpdateTextCtrlFromPicker() wxOVERRIDE; // event handler for our picker void OnFileDirChange(wxFileDirPickerEvent &); @@ -267,15 +267,15 @@ public: public: // overrides // return the text control value in canonical form - wxString GetTextCtrlValue() const; + wxString GetTextCtrlValue() const wxOVERRIDE; - bool IsCwdToUpdate() const + bool IsCwdToUpdate() const wxOVERRIDE { return HasFlag(wxFLP_CHANGE_DIR); } - wxEventType GetEventType() const + wxEventType GetEventType() const wxOVERRIDE { return wxEVT_FILEPICKER_CHANGED; } - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) + virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE { sender->Connect( wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ), @@ -288,7 +288,7 @@ protected: wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, const wxString& path, const wxString& message, - const wxString& wildcard) + const wxString& wildcard) wxOVERRIDE { return new wxFilePickerWidget(parent, wxID_ANY, wxGetTranslation(wxFilePickerWidgetLabel), @@ -298,7 +298,7 @@ protected: } // extracts the style for our picker from wxFileDirPickerCtrlBase's style - long GetPickerStyle(long style) const + long GetPickerStyle(long style) const wxOVERRIDE { return style & (wxFLP_OPEN | wxFLP_SAVE | @@ -367,15 +367,15 @@ public: public: // overrides - wxString GetTextCtrlValue() const; + wxString GetTextCtrlValue() const wxOVERRIDE; - bool IsCwdToUpdate() const + bool IsCwdToUpdate() const wxOVERRIDE { return HasFlag(wxDIRP_CHANGE_DIR); } - wxEventType GetEventType() const + wxEventType GetEventType() const wxOVERRIDE { return wxEVT_DIRPICKER_CHANGED; } - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) + virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE { sender->Connect( wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ), @@ -388,7 +388,7 @@ protected: wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, const wxString& path, const wxString& message, - const wxString& WXUNUSED(wildcard)) + const wxString& WXUNUSED(wildcard)) wxOVERRIDE { return new wxDirPickerWidget(parent, wxID_ANY, wxGetTranslation(wxDirPickerWidgetLabel), @@ -398,7 +398,7 @@ protected: } // extracts the style for our picker from wxFileDirPickerCtrlBase's style - long GetPickerStyle(long style) const + long GetPickerStyle(long style) const wxOVERRIDE { return style & (wxDIRP_DIR_MUST_EXIST | wxDIRP_CHANGE_DIR | diff --git a/include/wx/filesys.h b/include/wx/filesys.h index 3bd6e426c7..a661f180b9 100644 --- a/include/wx/filesys.h +++ b/include/wx/filesys.h @@ -277,10 +277,10 @@ special characters : class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler { public: - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); + virtual bool CanOpen(const wxString& location) wxOVERRIDE; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; + virtual wxString FindNext() wxOVERRIDE; // wxLocalFSHandler will prefix all filenames with 'root' before accessing // files on disk. This effectively makes 'root' the top-level directory diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index 7761a30807..4e43c95f2c 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -157,8 +157,8 @@ public: // public API public: // internal functions - void UpdatePickerFromTextCtrl(); - void UpdateTextCtrlFromPicker(); + void UpdatePickerFromTextCtrl() wxOVERRIDE; + void UpdateTextCtrlFromPicker() wxOVERRIDE; // event handler for our picker void OnFontChange(wxFontPickerEvent &); @@ -170,7 +170,7 @@ public: // internal functions protected: // extracts the style for our picker from wxFontPickerCtrl's style - long GetPickerStyle(long style) const + long GetPickerStyle(long style) const wxOVERRIDE { return (style & (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)); } // the maximum pointsize allowed to the user @@ -205,7 +205,7 @@ public: void SetFont(const wxFont &c) { m_font = c; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxFontPickerEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxFontPickerEvent(*this); } private: wxFont m_font; diff --git a/include/wx/frame.h b/include/wx/frame.h index 41927f775a..d7c570cb07 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -71,7 +71,7 @@ public: // get the origin of the client area (which may be different from (0, 0) // if the frame has a toolbar) in client coordinates - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // menu bar functions @@ -164,19 +164,19 @@ public: #endif // wxUSE_MENUS // do the UI update processing for this window - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE); + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE; // Implement internal behaviour (menu updating on some platforms) - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; #if wxUSE_MENUS || wxUSE_TOOLBAR // show help text for the currently selected menu or toolbar item // (typically in the status bar) or hide it and restore the status bar text // originally shown before the menu was opened if show == false - virtual void DoGiveHelp(const wxString& text, bool show); + virtual void DoGiveHelp(const wxString& text, bool show) wxOVERRIDE; #endif - virtual bool IsClientAreaChild(const wxWindow *child) const + virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE { return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); } @@ -190,7 +190,7 @@ protected: void DeleteAllBars(); // test whether this window makes part of the frame - virtual bool IsOneOfBars(const wxWindow *win) const; + virtual bool IsOneOfBars(const wxWindow *win) const wxOVERRIDE; #if wxUSE_MENUS // override to update menu bar position when the frame size changes diff --git a/include/wx/fs_arc.h b/include/wx/fs_arc.h index e65b8fc7b6..7b6979b27e 100644 --- a/include/wx/fs_arc.h +++ b/include/wx/fs_arc.h @@ -26,10 +26,10 @@ class WXDLLIMPEXP_BASE wxArchiveFSHandler : public wxFileSystemHandler { public: wxArchiveFSHandler(); - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); + virtual bool CanOpen(const wxString& location) wxOVERRIDE; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; + virtual wxString FindNext() wxOVERRIDE; void Cleanup(); virtual ~wxArchiveFSHandler(); diff --git a/include/wx/fs_filter.h b/include/wx/fs_filter.h index 8e8afda4e2..4391921252 100644 --- a/include/wx/fs_filter.h +++ b/include/wx/fs_filter.h @@ -25,11 +25,11 @@ public: wxFilterFSHandler() : wxFileSystemHandler() { } virtual ~wxFilterFSHandler() { } - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); + virtual bool CanOpen(const wxString& location) wxOVERRIDE; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); + virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; + virtual wxString FindNext() wxOVERRIDE; private: wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler); diff --git a/include/wx/fs_inet.h b/include/wx/fs_inet.h index bde0c69546..58b74ab64a 100644 --- a/include/wx/fs_inet.h +++ b/include/wx/fs_inet.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_NET wxInternetFSHandler : public wxFileSystemHandler { public: - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); + virtual bool CanOpen(const wxString& location) wxOVERRIDE; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; }; #endif diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 6688537ca5..f62d21c2fd 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -49,10 +49,10 @@ public: // Remove file from memory FS and free occupied memory static void RemoveFile(const wxString& filename); - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); + virtual bool CanOpen(const wxString& location) wxOVERRIDE; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; + virtual wxString FindNext() wxOVERRIDE; protected: // check that the given file is not already present in m_Hash; logs an diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h index 056780d348..223dff7732 100644 --- a/include/wx/fswatcher.h +++ b/include/wx/fswatcher.h @@ -159,7 +159,7 @@ public: return m_changeType; } - virtual wxEvent* Clone() const + virtual wxEvent* Clone() const wxOVERRIDE { wxFileSystemWatcherEvent* evt = new wxFileSystemWatcherEvent(*this); evt->m_errorMsg = m_errorMsg.Clone(); @@ -169,7 +169,7 @@ public: return evt; } - virtual wxEventCategory GetEventCategory() const + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { // TODO this has to be merged with "similar" categories and changed return wxEVT_CATEGORY_UNKNOWN; diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 8c8f1e28fe..0141451726 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -79,10 +79,10 @@ public: virtual int GetBezelFace() const; // overridden base class virtuals - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // the max position int m_rangeMax; diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index dea46c15ab..c606b18f33 100644 --- a/include/wx/gbsizer.h +++ b/include/wx/gbsizer.h @@ -291,8 +291,8 @@ public: // These are what make the sizer do size calculations and layout - virtual void RecalcSizes(); - virtual wxSize CalcMin(); + virtual void RecalcSizes() wxOVERRIDE; + virtual wxSize CalcMin() wxOVERRIDE; // Look at all items and see if any intersect (or would overlap) the given @@ -317,7 +317,7 @@ public: virtual wxSizerItem* Insert( size_t index, wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); virtual wxSizerItem* Insert( size_t index, wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); virtual wxSizerItem* Insert( size_t index, int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); - virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ); + virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ) wxOVERRIDE; virtual wxSizerItem* Prepend( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); virtual wxSizerItem* Prepend( wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); virtual wxSizerItem* Prepend( int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL ); diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h index 903dfe083d..a23bbe3fb3 100644 --- a/include/wx/gdiobj.h +++ b/include/wx/gdiobj.h @@ -73,12 +73,12 @@ protected: // replace base class functions using wxObjectRefData with our own which // use wxGDIRefData to ensure that we always work with data objects of the // correct type (i.e. derived from wxGDIRefData) - virtual wxObjectRefData *CreateRefData() const + virtual wxObjectRefData *CreateRefData() const wxOVERRIDE { return CreateGDIRefData(); } - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE { return CloneGDIRefData(static_cast(data)); } diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 44f8e07e83..7d821de409 100644 --- a/include/wx/generic/accel.h +++ b/include/wx/generic/accel.h @@ -38,8 +38,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: DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h index e933a3ca2c..0729950027 100644 --- a/include/wx/generic/buttonbar.h +++ b/include/wx/generic/buttonbar.h @@ -47,22 +47,22 @@ public: virtual ~wxButtonToolBar(); - virtual bool Realize(); + virtual bool Realize() wxOVERRIDE; - virtual void SetToolShortHelp(int id, const wxString& helpString); - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; + virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; protected: // common part of all ctors void Init(); // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, @@ -71,11 +71,11 @@ protected: wxItemKind kind, wxObject *clientData, const wxString& shortHelp, - const wxString& longHelp); + const wxString& longHelp) wxOVERRIDE; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); + const wxString& label) wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // calculate layout void DoLayout(); diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 67041cf20d..de9117c656 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); - virtual void Notify(); + virtual void Notify() wxOVERRIDE; private: wxCaret *m_caret; @@ -50,17 +50,17 @@ public: // -------------- // called by wxWindow (not using the event tables) - virtual void OnSetFocus(); - virtual void OnKillFocus(); + virtual void OnSetFocus() wxOVERRIDE; + virtual void OnKillFocus() wxOVERRIDE; // called by wxCaretTimer void OnTimer(); protected: - virtual void DoShow(); - virtual void DoHide(); - virtual void DoMove(); - virtual void DoSize(); + virtual void DoShow() wxOVERRIDE; + virtual void DoHide() wxOVERRIDE; + virtual void DoMove() wxOVERRIDE; + virtual void DoSize() wxOVERRIDE; // blink the caret once void Blink(); diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index ea423475d5..ff51068543 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -51,91 +51,91 @@ public: virtual ~wxPostScriptDCImpl(); virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const; + virtual bool IsOk() const wxOVERRIDE; - bool CanDrawBitmap() const { return true; } + bool CanDrawBitmap() const wxOVERRIDE { return true; } - void Clear(); - void SetFont( const wxFont& font ); - void SetPen( const wxPen& pen ); - void SetBrush( const wxBrush& brush ); - void SetLogicalFunction( wxRasterOperationMode function ); - void SetBackground( const wxBrush& brush ); + void Clear() wxOVERRIDE; + void SetFont( const wxFont& font ) wxOVERRIDE; + void SetPen( const wxPen& pen ) wxOVERRIDE; + void SetBrush( const wxBrush& brush ) wxOVERRIDE; + void SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE; + void SetBackground( const wxBrush& brush ) wxOVERRIDE; - void DestroyClippingRegion(); + void DestroyClippingRegion() wxOVERRIDE; - bool StartDoc(const wxString& message); - void EndDoc(); - void StartPage(); - void EndPage(); + bool StartDoc(const wxString& message) wxOVERRIDE; + void EndDoc() wxOVERRIDE; + void StartPage() wxOVERRIDE; + void EndPage() wxOVERRIDE; - wxCoord GetCharHeight() const; - wxCoord GetCharWidth() const; - bool CanGetTextExtent() const { return true; } + wxCoord GetCharHeight() const wxOVERRIDE; + wxCoord GetCharWidth() const wxOVERRIDE; + bool CanGetTextExtent() const wxOVERRIDE { return true; } // Resolution in pixels per logical inch - wxSize GetPPI() const; + wxSize GetPPI() const wxOVERRIDE; - virtual void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin() wxOVERRIDE; - void SetBackgroundMode(int WXUNUSED(mode)) { } - void SetPalette(const wxPalette& WXUNUSED(palette)) { } + void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { } + void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } void SetPrintData(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } - virtual int GetDepth() const { return 24; } + virtual int GetDepth() const wxOVERRIDE { return 24; } void PsPrint( const wxString& psdata ); // Overrridden for wxPrinterDC Impl - virtual int GetResolution() const; - virtual wxRect GetPaperRect() const; + virtual int GetResolution() const wxOVERRIDE; + virtual wxRect GetPaperRect() const wxOVERRIDE; - virtual void* GetHandle() const { return NULL; } + virtual void* GetHandle() const wxOVERRIDE { return NULL; } protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - wxFloodFillStyle style = wxFLOOD_SURFACE); - bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; - void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - void DoCrossHair(wxCoord x, wxCoord y) ; - void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc); - void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea); - void DoDrawPoint(wxCoord x, wxCoord y); - void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0); + wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; + bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const wxOVERRIDE; + void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE ; + void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) wxOVERRIDE; + void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) wxOVERRIDE; + void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; + void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE; void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20); - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20) wxOVERRIDE; + void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; #if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points); + void DoDrawSpline(const wxPointList *points) wxOVERRIDE; #endif bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); - void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false); - void DoDrawText(const wxString& text, wxCoord x, wxCoord y); - void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip)) + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; + void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false) wxOVERRIDE; + void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; + void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) wxOVERRIDE; + void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip)) wxOVERRIDE { wxFAIL_MSG( "not implemented" ); } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - void DoGetSize(int* width, int* height) const; - void DoGetSizeMM(int *width, int *height) const; + const wxFont *theFont = NULL) const wxOVERRIDE; + void DoGetSize(int* width, int* height) const wxOVERRIDE; + void DoGetSizeMM(int *width, int *height) const wxOVERRIDE; FILE* m_pstream; // PostScript output stream unsigned char m_currentRed; diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index c58cec3742..2fae46edd7 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -355,7 +355,7 @@ class WXDLLIMPEXP_ADV wxGridRowHeaderRendererDefault public: virtual void DrawBorder(const wxGrid& grid, wxDC& dc, - wxRect& rect) const; + wxRect& rect) const wxOVERRIDE; }; // Column header cells renderers @@ -365,7 +365,7 @@ class WXDLLIMPEXP_ADV wxGridColumnHeaderRendererDefault public: virtual void DrawBorder(const wxGrid& grid, wxDC& dc, - wxRect& rect) const; + wxRect& rect) const wxOVERRIDE; }; // Header corner renderer @@ -375,7 +375,7 @@ class WXDLLIMPEXP_ADV wxGridCornerHeaderRendererDefault public: virtual void DrawBorder(const wxGrid& grid, wxDC& dc, - wxRect& rect) const; + wxRect& rect) const wxOVERRIDE; }; @@ -826,25 +826,25 @@ public: // these are pure virtual in wxGridTableBase // - virtual int GetNumberRows() { return static_cast(m_data.size()); } - virtual int GetNumberCols() { return m_numCols; } - virtual wxString GetValue( int row, int col ); - virtual void SetValue( int row, int col, const wxString& s ); + virtual int GetNumberRows() wxOVERRIDE { return static_cast(m_data.size()); } + virtual int GetNumberCols() wxOVERRIDE { return m_numCols; } + virtual wxString GetValue( int row, int col ) wxOVERRIDE; + virtual void SetValue( int row, int col, const wxString& s ) wxOVERRIDE; // overridden functions from wxGridTableBase // - void Clear(); - bool InsertRows( size_t pos = 0, size_t numRows = 1 ); - bool AppendRows( size_t numRows = 1 ); - bool DeleteRows( size_t pos = 0, size_t numRows = 1 ); - bool InsertCols( size_t pos = 0, size_t numCols = 1 ); - bool AppendCols( size_t numCols = 1 ); - bool DeleteCols( size_t pos = 0, size_t numCols = 1 ); + void Clear() wxOVERRIDE; + bool InsertRows( size_t pos = 0, size_t numRows = 1 ) wxOVERRIDE; + bool AppendRows( size_t numRows = 1 ) wxOVERRIDE; + bool DeleteRows( size_t pos = 0, size_t numRows = 1 ) wxOVERRIDE; + bool InsertCols( size_t pos = 0, size_t numCols = 1 ) wxOVERRIDE; + bool AppendCols( size_t numCols = 1 ) wxOVERRIDE; + bool DeleteCols( size_t pos = 0, size_t numCols = 1 ) wxOVERRIDE; - void SetRowLabelValue( int row, const wxString& ); - void SetColLabelValue( int col, const wxString& ); - wxString GetRowLabelValue( int row ); - wxString GetColLabelValue( int col ); + void SetRowLabelValue( int row, const wxString& ) wxOVERRIDE; + void SetColLabelValue( int col, const wxString& ) wxOVERRIDE; + wxString GetRowLabelValue( int row ) wxOVERRIDE; + wxString GetColLabelValue( int col ) wxOVERRIDE; private: wxGridStringArray m_data; @@ -1083,7 +1083,7 @@ public: int GetBatchCount() { return m_batchCount; } - virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL); + virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL) wxOVERRIDE; // Use this, rather than wxWindow::Refresh(), to force an // immediate repainting of the grid. Has no effect if you are @@ -1642,7 +1642,7 @@ public: // ------- drag and drop #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget(wxDropTarget *dropTarget); + virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE; #endif // wxUSE_DRAG_AND_DROP @@ -1838,16 +1838,16 @@ public: // override some base class functions - virtual bool Enable(bool enable = true); - virtual wxWindow *GetMainWindowOfCompositeControl() + virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return (wxWindow*)m_gridWin; } - virtual void Fit(); + virtual void Fit() wxOVERRIDE; // implementation only void CancelMouseCapture(); protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; bool m_created; @@ -2166,7 +2166,7 @@ protected: private: // implement wxScrolledWindow method to return m_gridWin size - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size); + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; // redraw the grid lines, should be called after changing their attributes void RedrawGridLines(); @@ -2420,7 +2420,7 @@ public: wxPoint GetPosition() { return wxPoint( m_x, m_y ); } bool Selecting() { return m_selecting; } - virtual wxEvent *Clone() const { return new wxGridEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEvent(*this); } protected: int m_row; @@ -2480,7 +2480,7 @@ public: int GetRowOrCol() { return m_rowOrCol; } wxPoint GetPosition() { return wxPoint( m_x, m_y ); } - virtual wxEvent *Clone() const { return new wxGridSizeEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridSizeEvent(*this); } protected: int m_rowOrCol; @@ -2544,7 +2544,7 @@ public: int GetRightCol() { return m_bottomRight.GetCol(); } bool Selecting() { return m_selecting; } - virtual wxEvent *Clone() const { return new wxGridRangeSelectEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridRangeSelectEvent(*this); } protected: void Init(const wxGridCellCoords& topLeft, @@ -2585,7 +2585,7 @@ public: void SetCol(int col) { m_col = col; } void SetControl(wxControl* ctrl) { m_ctrl = ctrl; } - virtual wxEvent *Clone() const { return new wxGridEditorCreatedEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEditorCreatedEvent(*this); } private: int m_row; diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index efcb233c8d..63c5a169f5 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -29,15 +29,15 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; // return the string extent virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const + virtual wxGridCellRenderer *Clone() const wxOVERRIDE { return new wxGridCellStringRenderer; } protected: @@ -63,14 +63,14 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const + virtual wxGridCellRenderer *Clone() const wxOVERRIDE { return new wxGridCellNumberRenderer; } protected: @@ -98,18 +98,18 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; // parameters string format is "width[,precision[,format]]" // with format being one of f|e|g|E|F|G - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const; + virtual wxGridCellRenderer *Clone() const wxOVERRIDE; protected: wxString GetString(const wxGrid& grid, int row, int col); @@ -133,15 +133,15 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; // return the checkmark size virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const + virtual wxGridCellRenderer *Clone() const wxOVERRIDE { return new wxGridCellBoolRenderer; } private: @@ -166,17 +166,17 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const; + virtual wxGridCellRenderer *Clone() const wxOVERRIDE; // output strptime()-like format string - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; protected: wxString GetString(const wxGrid& grid, int row, int col); @@ -201,18 +201,18 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const; + virtual wxGridCellRenderer *Clone() const wxOVERRIDE; // parameters string format is "item1[,item2[...,itemN]]" where itemN will // be used if the cell value is N-1 - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; protected: wxString GetString(const wxGrid& grid, int row, int col); @@ -231,14 +231,14 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + int row, int col) wxOVERRIDE; - virtual wxGridCellRenderer *Clone() const + virtual wxGridCellRenderer *Clone() const wxOVERRIDE { return new wxGridCellAutoWrapStringRenderer; } private: diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h index c45106d3e8..ebe7b8d7db 100644 --- a/include/wx/generic/grideditors.h +++ b/include/wx/generic/grideditors.h @@ -57,31 +57,31 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); - virtual void SetSize(const wxRect& rect); + wxEvtHandler* evtHandler) wxOVERRIDE; + virtual void SetSize(const wxRect& rect) wxOVERRIDE; virtual void PaintBackground(wxDC& dc, const wxRect& rectCell, - const wxGridCellAttr& attr); + const wxGridCellAttr& attr) wxOVERRIDE; - virtual bool IsAcceptedKey(wxKeyEvent& event); - virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval); - virtual void ApplyEdit(int row, int col, wxGrid* grid); + const wxString& oldval, wxString *newval) wxOVERRIDE; + virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual void Reset(); - virtual void StartingKey(wxKeyEvent& event); - virtual void HandleReturn(wxKeyEvent& event); + virtual void Reset() wxOVERRIDE; + virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; + virtual void HandleReturn(wxKeyEvent& event) wxOVERRIDE; // parameters string format is "max_width" - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; virtual void SetValidator(const wxValidator& validator); - virtual wxGridCellEditor *Clone() const; + virtual wxGridCellEditor *Clone() const wxOVERRIDE; // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const; + virtual wxString GetValue() const wxOVERRIDE; protected: wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; } @@ -110,25 +110,25 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); + wxEvtHandler* evtHandler) wxOVERRIDE; - virtual bool IsAcceptedKey(wxKeyEvent& event); - virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval); - virtual void ApplyEdit(int row, int col, wxGrid* grid); + const wxString& oldval, wxString *newval) wxOVERRIDE; + virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual void Reset(); - virtual void StartingKey(wxKeyEvent& event); + virtual void Reset() wxOVERRIDE; + virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; // parameters string format is "min,max" - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; - virtual wxGridCellEditor *Clone() const + virtual wxGridCellEditor *Clone() const wxOVERRIDE { return new wxGridCellNumberEditor(m_min, m_max); } // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const; + virtual wxString GetValue() const wxOVERRIDE; protected: #if wxUSE_SPINCTRL @@ -193,23 +193,23 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); + wxEvtHandler* evtHandler) wxOVERRIDE; - virtual bool IsAcceptedKey(wxKeyEvent& event); - virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval); - virtual void ApplyEdit(int row, int col, wxGrid* grid); + const wxString& oldval, wxString *newval) wxOVERRIDE; + virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual void Reset(); - virtual void StartingKey(wxKeyEvent& event); + virtual void Reset() wxOVERRIDE; + virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - virtual wxGridCellEditor *Clone() const + virtual wxGridCellEditor *Clone() const wxOVERRIDE { return new wxGridCellFloatEditor(m_width, m_precision); } // parameters string format is "width[,precision[,format]]" // format to choose beween f|e|g|E|G (f is used by default) - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; protected: // string representation of our value @@ -238,27 +238,27 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); + wxEvtHandler* evtHandler) wxOVERRIDE; - virtual void SetSize(const wxRect& rect); - virtual void Show(bool show, wxGridCellAttr *attr = NULL); + virtual void SetSize(const wxRect& rect) wxOVERRIDE; + virtual void Show(bool show, wxGridCellAttr *attr = NULL) wxOVERRIDE; - virtual bool IsAcceptedKey(wxKeyEvent& event); - virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval); - virtual void ApplyEdit(int row, int col, wxGrid* grid); + const wxString& oldval, wxString *newval) wxOVERRIDE; + virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual void Reset(); - virtual void StartingClick(); - virtual void StartingKey(wxKeyEvent& event); + virtual void Reset() wxOVERRIDE; + virtual void StartingClick() wxOVERRIDE; + virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - virtual wxGridCellEditor *Clone() const + virtual wxGridCellEditor *Clone() const wxOVERRIDE { return new wxGridCellBoolEditor; } // added GetValue so we can get the value which is in the control, see // also UseStringValues() - virtual wxString GetValue() const; + virtual wxString GetValue() const wxOVERRIDE; // set the string values returned by GetValue() for the true and false // states, respectively @@ -297,28 +297,28 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); + wxEvtHandler* evtHandler) wxOVERRIDE; - virtual void SetSize(const wxRect& rect); + virtual void SetSize(const wxRect& rect) wxOVERRIDE; virtual void PaintBackground(wxDC& dc, const wxRect& rectCell, - const wxGridCellAttr& attr); + const wxGridCellAttr& attr) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval); - virtual void ApplyEdit(int row, int col, wxGrid* grid); + const wxString& oldval, wxString *newval) wxOVERRIDE; + virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; - virtual void Reset(); + virtual void Reset() wxOVERRIDE; // parameters string format is "item1[,item2[...,itemN]]" - virtual void SetParameters(const wxString& params); + virtual void SetParameters(const wxString& params) wxOVERRIDE; - virtual wxGridCellEditor *Clone() const; + virtual wxGridCellEditor *Clone() const wxOVERRIDE; // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const; + virtual wxString GetValue() const wxOVERRIDE; protected: wxComboBox *Combo() const { return (wxComboBox *)m_control; } @@ -340,12 +340,12 @@ public: wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); virtual ~wxGridCellEnumEditor() {} - virtual wxGridCellEditor* Clone() const; + virtual wxGridCellEditor* Clone() const wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval); - virtual void ApplyEdit(int row, int col, wxGrid* grid); + const wxString& oldval, wxString *newval) wxOVERRIDE; + virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; private: long m_index; @@ -361,9 +361,9 @@ public: wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { } virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); + wxEvtHandler* evtHandler) wxOVERRIDE; - virtual wxGridCellEditor *Clone() const + virtual wxGridCellEditor *Clone() const wxOVERRIDE { return new wxGridCellAutoWrapStringEditor; } wxDECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor); diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h index d2eceb2bfc..93201e1499 100644 --- a/include/wx/generic/headerctrlg.h +++ b/include/wx/generic/headerctrlg.h @@ -48,19 +48,19 @@ public: virtual ~wxHeaderCtrl(); protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; private: // implement base class pure virtuals - virtual void DoSetCount(unsigned int count); - virtual unsigned int DoGetCount() const; - virtual void DoUpdate(unsigned int idx); + virtual void DoSetCount(unsigned int count) wxOVERRIDE; + virtual unsigned int DoGetCount() const wxOVERRIDE; + virtual void DoUpdate(unsigned int idx) wxOVERRIDE; - virtual void DoScrollHorz(int dx); + virtual void DoScrollHorz(int dx) wxOVERRIDE; - virtual void DoSetColumnsOrder(const wxArrayInt& order); - virtual wxArrayInt DoGetColumnsOrder() const; + virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE; + virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE; // common part of all ctors void Init(); diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index 7a336d37ce..64fd7c28fd 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -47,7 +47,7 @@ public: // unhide the base class version virtual bool LoadFile(const wxString& name, - wxBitmapType flags = wxICON_DEFAULT_TYPE) + wxBitmapType flags = wxICON_DEFAULT_TYPE) wxOVERRIDE { return wxBitmap::LoadFile(name, flags); } // create from bitmap (which should have a mask unless it's monochrome): diff --git a/include/wx/generic/infobar.h b/include/wx/generic/infobar.h index 4a6bf2b3c1..e3cd14f2b5 100644 --- a/include/wx/generic/infobar.h +++ b/include/wx/generic/infobar.h @@ -38,13 +38,13 @@ public: // ---------------------------- virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION); + int flags = wxICON_INFORMATION) wxOVERRIDE; - virtual void Dismiss(); + virtual void Dismiss() wxOVERRIDE; - virtual void AddButton(wxWindowID btnid, const wxString& label = wxString()); + virtual void AddButton(wxWindowID btnid, const wxString& label = wxString()) wxOVERRIDE; - virtual void RemoveButton(wxWindowID btnid); + virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE; // methods specific to this version // -------------------------------- @@ -77,15 +77,15 @@ public: // setting the font of this window sets it for the text control inside it // (default font is a larger and bold version of the normal one) - virtual bool SetFont(const wxFont& font); + virtual bool SetFont(const wxFont& font) wxOVERRIDE; // same thing with the colour: this affects the text colour - virtual bool SetForegroundColour(const wxColor& colour); + virtual bool SetForegroundColour(const wxColor& colour) wxOVERRIDE; protected: // info bar shouldn't have any border by default, the colour difference // between it and the main window separates it well enough - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // update the parent to take our new or changed size into account (notably diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index a38fd97fc1..af67ef37b6 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -87,7 +87,7 @@ public: void SetAlignment(wxLayoutAlignment align) { m_alignment = align; } wxLayoutAlignment GetAlignment() const { return m_alignment; } - virtual wxEvent *Clone() const { return new wxQueryLayoutInfoEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryLayoutInfoEvent(*this); } protected: int m_flags; @@ -130,7 +130,7 @@ public: void SetRect(const wxRect& rect) { m_rect = rect; } wxRect GetRect() const { return m_rect; } - virtual wxEvent *Clone() const { return new wxCalculateLayoutEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalculateLayoutEvent(*this); } protected: int m_flags; diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 23c8966d5a..eed280969e 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -63,10 +63,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxListCtrlNameStr); - bool GetColumn( int col, wxListItem& item ) const; - bool SetColumn( int col, const wxListItem& item ); - int GetColumnWidth( int col ) const; - bool SetColumnWidth( int col, int width); + bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE; + bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE; + int GetColumnWidth( int col ) const wxOVERRIDE; + bool SetColumnWidth( int col, int width) wxOVERRIDE; int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think wxRect GetViewRect() const; @@ -87,7 +87,7 @@ public: bool GetItemPosition( long item, wxPoint& pos ) const; bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC int GetItemCount() const; - int GetColumnCount() const; + int GetColumnCount() const wxOVERRIDE; void SetItemSpacing( int spacing, bool isSmall = false ); wxSize GetItemSpacing() const; void SetItemTextColour( long item, const wxColour& col); @@ -102,19 +102,19 @@ public: long GetTopItem() const; void SetSingleStyle( long style, bool add = true ) ; - void SetWindowStyleFlag( long style ); + void SetWindowStyleFlag( long style ) wxOVERRIDE; void RecreateWindow() {} long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const; - wxImageList *GetImageList( int which ) const; - void SetImageList( wxImageList *imageList, int which ); - void AssignImageList( wxImageList *imageList, int which ); + wxImageList *GetImageList( int which ) const wxOVERRIDE; + void SetImageList( wxImageList *imageList, int which ) wxOVERRIDE; + void AssignImageList( wxImageList *imageList, int which ) wxOVERRIDE; bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC void ClearAll(); bool DeleteItem( long item ); bool DeleteAllItems(); - bool DeleteAllColumns(); - bool DeleteColumn( int col ); + bool DeleteAllColumns() wxOVERRIDE; + bool DeleteColumn( int col ) wxOVERRIDE; void SetItemCount(long count); @@ -143,12 +143,12 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); - virtual void EnableBellOnNoMatch(bool on = true); + virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE; // overridden base class virtuals // ------------------------------ - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -156,7 +156,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual void Update(); + virtual void Update() wxOVERRIDE; // implementation only from now on @@ -165,25 +165,25 @@ public: // generic version extension, don't use in portable code bool Update( long item ); - void OnInternalIdle( ); + void OnInternalIdle( ) wxOVERRIDE; // We have to hand down a few functions virtual void Refresh(bool eraseBackground = true, - const wxRect *rect = NULL); + const wxRect *rect = NULL) wxOVERRIDE; - virtual bool SetBackgroundColour( const wxColour &colour ); - virtual bool SetForegroundColour( const wxColour &colour ); + virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; virtual wxColour GetBackgroundColour() const; virtual wxColour GetForegroundColour() const; - virtual bool SetFont( const wxFont &font ); - virtual bool SetCursor( const wxCursor &cursor ); + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); - virtual wxDropTarget *GetDropTarget() const; + virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; + virtual wxDropTarget *GetDropTarget() const wxOVERRIDE; #endif - virtual bool ShouldInheritColours() const { return false; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } // implementation // -------------- @@ -199,12 +199,12 @@ public: protected: // Implement base class pure virtual methods. - long DoInsertColumn(long col, const wxListItem& info); + long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE; - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // return the text for the given column of the given item virtual wxString OnGetItemText(long item, long column) const; @@ -220,9 +220,9 @@ protected: // it calls our OnGetXXX() functions friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow; - virtual wxBorder GetDefaultBorder() const; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE; - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size); + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; private: void CreateOrDestroyHeaderWindowAsNeeded(); diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 303b441e81..f45731d358 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -33,7 +33,7 @@ public: protected: // implement sink function - virtual void DoLogText(const wxString& msg); + virtual void DoLogText(const wxString& msg) wxOVERRIDE; private: // the control we use @@ -57,12 +57,12 @@ public: wxLogGui(); // show all messages that were logged since the last Flush() - virtual void Flush(); + virtual void Flush() wxOVERRIDE; protected: virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info); + const wxLogRecordInfo& info) wxOVERRIDE; // return the title to be used for the log dialog, depending on m_bErrors // and m_bWarnings values @@ -136,7 +136,7 @@ public: virtual void OnFrameDelete(wxFrame *frame); protected: - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg); + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE; private: wxLogFrame *m_pLogFrame; // the log frame diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h index 388307297c..6da2c633e4 100644 --- a/include/wx/generic/printps.h +++ b/include/wx/generic/printps.h @@ -26,9 +26,9 @@ public: wxPostScriptPrinter(wxPrintDialogData *data = NULL); virtual ~wxPostScriptPrinter(); - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true); - virtual wxDC* PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE; + virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; + virtual bool Setup(wxWindow *parent) wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter) @@ -51,8 +51,8 @@ public: virtual ~wxPostScriptPrintPreview(); - virtual bool Print(bool interactive); - virtual void DetermineScaling(); + virtual bool Print(bool interactive) wxOVERRIDE; + virtual void DetermineScaling() wxOVERRIDE; private: void Init(wxPrintout *printout, wxPrintout *printoutForPrinting); diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index d29452f1f0..8e7f6e93ca 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -57,9 +57,9 @@ public: bool WasSkipped() const; // Must provide overload to avoid hiding it (and warnings about it) - virtual void Update() { wxDialog::Update(); } + virtual void Update() wxOVERRIDE { wxDialog::Update(); } - virtual bool Show( bool show = true ); + virtual bool Show( bool show = true ) wxOVERRIDE; // This enum is an implementation detail and should not be used // by user code. diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h index 6cb63efad9..dd67ac6de3 100644 --- a/include/wx/generic/propdlg.h +++ b/include/wx/generic/propdlg.h @@ -106,7 +106,7 @@ public: wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; } // Override function in base - virtual wxWindow* GetContentWindow() const; + virtual wxWindow* GetContentWindow() const wxOVERRIDE; // Set and get the inner sizer void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; } diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index a6bebaab0b..f122e3be0e 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -224,7 +224,7 @@ public: void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; } wxSashDragStatus GetDragStatus() const { return m_dragStatus; } - virtual wxEvent *Clone() const { return new wxSashEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSashEvent(*this); } private: wxSashEdgePosition m_edge; diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index 24ad733d5d..4b96665a17 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -54,7 +54,7 @@ public: int GetTimeout() const { return m_milliseconds; } // Override wxEventFilter method to hide splash screen on any user input. - virtual int FilterEvent(wxEvent& event); + virtual int FilterEvent(wxEvent& event) wxOVERRIDE; protected: // Common part of all ctors. diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index 61128a3959..ad240355fe 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -202,7 +202,7 @@ public: void OnSize(wxSizeEvent& event); // In live mode, resize child windows in idle time - void OnInternalIdle(); + void OnInternalIdle() wxOVERRIDE; // Draws the sash virtual void DrawSash(wxDC& dc); @@ -274,7 +274,7 @@ protected: // return the best size of the splitter equal to best sizes of its // subwindows - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; wxSplitMode m_splitMode; @@ -370,7 +370,7 @@ public: return m_data.pt.y; } - virtual wxEvent *Clone() const { return new wxSplitterEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSplitterEvent(*this); } private: friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow; diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h index c61ddee751..e96c4b0ada 100644 --- a/include/wx/generic/srchctlg.h +++ b/include/wx/generic/srchctlg.h @@ -49,17 +49,17 @@ public: #if wxUSE_MENUS // get/set search button menu // -------------------------- - virtual void SetMenu( wxMenu* menu ); - virtual wxMenu* GetMenu(); + virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; + virtual wxMenu* GetMenu() wxOVERRIDE; #endif // wxUSE_MENUS // get/set search options // ---------------------- - virtual void ShowSearchButton( bool show ); - virtual bool IsSearchButtonVisible() const; + virtual void ShowSearchButton( bool show ) wxOVERRIDE; + virtual bool IsSearchButtonVisible() const wxOVERRIDE; - virtual void ShowCancelButton( bool show ); - virtual bool IsCancelButtonVisible() const; + virtual void ShowCancelButton( bool show ) wxOVERRIDE; + virtual bool IsCancelButtonVisible() const wxOVERRIDE; // TODO: In 2.9 these should probably be virtual, and declared in the base class... void SetDescriptiveText(const wxString& text); @@ -68,48 +68,48 @@ public: // accessors // --------- - virtual wxString GetRange(long from, long to) const; + virtual wxString GetRange(long from, long to) const wxOVERRIDE; - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; + virtual int GetLineLength(long lineNo) const wxOVERRIDE; + virtual wxString GetLineText(long lineNo) const wxOVERRIDE; + virtual int GetNumberOfLines() const wxOVERRIDE; - virtual bool IsModified() const; - virtual bool IsEditable() const; + virtual bool IsModified() const wxOVERRIDE; + virtual bool IsEditable() const wxOVERRIDE; // more readable flag testing methods virtual bool IsSingleLine() const; virtual bool IsMultiLine() const; // 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; - virtual wxString GetStringSelection() const; + virtual wxString GetStringSelection() const wxOVERRIDE; // operations // ---------- // editing - virtual void Clear(); - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); + virtual void Clear() wxOVERRIDE; + virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE; + virtual void Remove(long from, long to) wxOVERRIDE; // load/save the controls contents from/to the file virtual bool LoadFile(const wxString& file); virtual bool SaveFile(const wxString& file = wxEmptyString); // sets/clears the dirty flag - virtual void MarkDirty(); - virtual void DiscardEdits(); + virtual void MarkDirty() wxOVERRIDE; + virtual void DiscardEdits() wxOVERRIDE; // set the max number of characters which may be entered in a single line // text control - virtual void SetMaxLength(unsigned long WXUNUSED(len)); + virtual void SetMaxLength(unsigned long WXUNUSED(len)) wxOVERRIDE; // writing text inserts it at the current position, appending always // inserts it at the end - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text); + virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual void AppendText(const wxString& text) wxOVERRIDE; // insert the character which would have resulted from this key event, // return true if anything has been inserted @@ -118,53 +118,53 @@ public: // text control under some platforms supports the text styles: these // methods allow to apply the given text style to the given selection or to // set/get the style which will be used for all appended text - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - virtual bool GetStyle(long position, wxTextAttr& style); - virtual bool SetDefaultStyle(const wxTextAttr& style); - virtual const wxTextAttr& GetDefaultStyle() const; + 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 const wxTextAttr& GetDefaultStyle() const wxOVERRIDE; // translate between the position (which is just an index in the text ctrl // considering all its contents as a single strings) and (x, y) coordinates // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; + virtual long XYToPosition(long x, long y) const wxOVERRIDE; + virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - virtual void ShowPosition(long pos); + virtual void ShowPosition(long pos) wxOVERRIDE; // find the character at position given in pixels // // NB: pt is in device coords (not adjusted for the client area origin nor // scrolling) - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const; + wxTextCoord *row) const 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 wxTextPos GetLastPosition() const; + virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual void SetInsertionPointEnd() wxOVERRIDE; + virtual long GetInsertionPoint() const wxOVERRIDE; + virtual wxTextPos GetLastPosition() const wxOVERRIDE; - virtual void SetSelection(long from, long to); - virtual void SelectAll(); - virtual void SetEditable(bool editable); + virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void SelectAll() wxOVERRIDE; + virtual void SetEditable(bool editable) wxOVERRIDE; #if 0 @@ -184,13 +184,13 @@ public: #endif // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; - virtual bool ShouldInheritColours() const; + virtual bool ShouldInheritColours() const wxOVERRIDE; // wxWindow overrides - virtual bool SetFont(const wxFont& font); - virtual bool SetBackgroundColour(const wxColour& colour); + virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; // search control generic only void SetSearchBitmap( const wxBitmap& bitmap ); @@ -200,15 +200,15 @@ public: #endif // wxUSE_MENUS protected: - virtual void DoSetValue(const wxString& value, int flags); - virtual wxString DoGetValue() const; + virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; + virtual wxString DoGetValue() 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; // override the base class virtuals involved into geometry calculations - virtual wxSize DoGetBestSize() const; - virtual void DoMoveWindow(int x, int y, int width, int height); + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; virtual void LayoutControls(int x, int y, int width, int height); virtual void RecalcBitmaps(); @@ -236,7 +236,7 @@ private: friend class wxSearchButton; // Implement pure virtual function inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const; + virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; #if wxUSE_MENUS void PopupSearchMenu(); diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index bff20807e3..3b3560961d 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -44,12 +44,12 @@ public: const wxString& name = wxStatusBarNameStr); // implement base class methods - virtual void SetStatusWidths(int n, const int widths_field[]); - virtual bool GetFieldRect(int i, wxRect& rect) const; - virtual void SetMinHeight(int height); + virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE; + virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; + virtual void SetMinHeight(int height) wxOVERRIDE; - virtual int GetBorderX() const { return m_borderX; } - virtual int GetBorderY() const { return m_borderY; } + virtual int GetBorderX() const wxOVERRIDE { return m_borderX; } + virtual int GetBorderY() const wxOVERRIDE { return m_borderY; } // implementation only (not part of wxStatusBar public API): @@ -57,7 +57,7 @@ public: int GetFieldFromPoint(const wxPoint& point) const; protected: - virtual void DoUpdateStatusText(int number); + virtual void DoUpdateStatusText(int number) wxOVERRIDE; // event handlers void OnPaint(wxPaintEvent& event); @@ -103,7 +103,7 @@ protected: wxPen m_mediumShadowPen; wxPen m_hilightPen; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; private: // Update m_lastClientSize and m_widthsAbs from the current size. diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index d35bd1875f..c714b51705 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -72,8 +72,8 @@ public: wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); } #endif // wxUSE_VALIDATORS - virtual bool TransferDataToWindow(); - virtual bool TransferDataFromWindow(); + virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() wxOVERRIDE; // implementation only void OnOK(wxCommandEvent& event); diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index d06d61c9a3..1e50878b7a 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -67,74 +67,74 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual unsigned int GetCount() const; + virtual unsigned int GetCount() const wxOVERRIDE; - virtual unsigned int GetIndent() const { return m_indent; } - virtual void SetIndent(unsigned int indent); + virtual unsigned int GetIndent() const wxOVERRIDE { return m_indent; } + virtual void SetIndent(unsigned int indent) wxOVERRIDE; - virtual void SetImageList(wxImageList *imageList); - virtual void SetStateImageList(wxImageList *imageList); + virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; + virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE; - virtual wxString GetItemText(const wxTreeItemId& item) const; + virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE; virtual int GetItemImage(const wxTreeItemId& item, - wxTreeItemIcon which = wxTreeItemIcon_Normal) const; - virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const; - virtual wxColour GetItemTextColour(const wxTreeItemId& item) const; - virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const; - virtual wxFont GetItemFont(const wxTreeItemId& item) const; + wxTreeItemIcon which = wxTreeItemIcon_Normal) const wxOVERRIDE; + virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxColour GetItemTextColour(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxFont GetItemFont(const wxTreeItemId& item) const wxOVERRIDE; - virtual void SetItemText(const wxTreeItemId& item, const wxString& text); + virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE; virtual void SetItemImage(const wxTreeItemId& item, int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal); - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); + wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE; + virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE; - virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true); - virtual void SetItemBold(const wxTreeItemId& item, bool bold = true); - virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true); - virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col); - virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col); - virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font); + virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) wxOVERRIDE; + virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) wxOVERRIDE; + virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true) wxOVERRIDE; + virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) wxOVERRIDE; + virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) wxOVERRIDE; + virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) wxOVERRIDE; - virtual bool IsVisible(const wxTreeItemId& item) const; - virtual bool ItemHasChildren(const wxTreeItemId& item) const; - virtual bool IsExpanded(const wxTreeItemId& item) const; - virtual bool IsSelected(const wxTreeItemId& item) const; - virtual bool IsBold(const wxTreeItemId& item) const; + virtual bool IsVisible(const wxTreeItemId& item) const wxOVERRIDE; + virtual bool ItemHasChildren(const wxTreeItemId& item) const wxOVERRIDE; + virtual bool IsExpanded(const wxTreeItemId& item) const wxOVERRIDE; + virtual bool IsSelected(const wxTreeItemId& item) const wxOVERRIDE; + virtual bool IsBold(const wxTreeItemId& item) const wxOVERRIDE; virtual size_t GetChildrenCount(const wxTreeItemId& item, - bool recursively = true) const; + bool recursively = true) const wxOVERRIDE; // navigation // ---------- - virtual wxTreeItemId GetRootItem() const { return m_anchor; } - virtual wxTreeItemId GetSelection() const + virtual wxTreeItemId GetRootItem() const wxOVERRIDE { return m_anchor; } + virtual wxTreeItemId GetSelection() const wxOVERRIDE { wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE), wxT("must use GetSelections() with this control") ); return m_current; } - virtual size_t GetSelections(wxArrayTreeItemIds&) const; - virtual wxTreeItemId GetFocusedItem() const { return m_current; } + virtual size_t GetSelections(wxArrayTreeItemIds&) const wxOVERRIDE; + virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE { return m_current; } - virtual void ClearFocusedItem(); - virtual void SetFocusedItem(const wxTreeItemId& item); + virtual void ClearFocusedItem() wxOVERRIDE; + virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE; - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const; + virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE; virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; + wxTreeItemIdValue& cookie) const wxOVERRIDE; virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; - virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const; - virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const; - virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const; + wxTreeItemIdValue& cookie) const wxOVERRIDE; + virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetFirstVisibleItem() const; - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const; - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const; + virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE; + virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE; // operations @@ -142,41 +142,41 @@ public: virtual wxTreeItemId AddRoot(const wxString& text, int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); + wxTreeItemData *data = NULL) wxOVERRIDE; - virtual void Delete(const wxTreeItemId& item); - virtual void DeleteChildren(const wxTreeItemId& item); - virtual void DeleteAllItems(); + virtual void Delete(const wxTreeItemId& item) wxOVERRIDE; + virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE; + virtual void DeleteAllItems() wxOVERRIDE; - virtual void Expand(const wxTreeItemId& item); - virtual void Collapse(const wxTreeItemId& item); - virtual void CollapseAndReset(const wxTreeItemId& item); - virtual void Toggle(const wxTreeItemId& item); + virtual void Expand(const wxTreeItemId& item) wxOVERRIDE; + virtual void Collapse(const wxTreeItemId& item) wxOVERRIDE; + virtual void CollapseAndReset(const wxTreeItemId& item) wxOVERRIDE; + virtual void Toggle(const wxTreeItemId& item) wxOVERRIDE; - virtual void Unselect(); - virtual void UnselectAll(); - virtual void SelectItem(const wxTreeItemId& item, bool select = true); - virtual void SelectChildren(const wxTreeItemId& parent); + virtual void Unselect() wxOVERRIDE; + virtual void UnselectAll() wxOVERRIDE; + virtual void SelectItem(const wxTreeItemId& item, bool select = true) wxOVERRIDE; + virtual void SelectChildren(const wxTreeItemId& parent) wxOVERRIDE; - virtual void EnsureVisible(const wxTreeItemId& item); - virtual void ScrollTo(const wxTreeItemId& item); + virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE; + virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE; virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)); - virtual wxTextCtrl *GetEditControl() const; + wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE; + virtual wxTextCtrl *GetEditControl() const wxOVERRIDE; virtual void EndEditLabel(const wxTreeItemId& item, - bool discardChanges = false); + bool discardChanges = false) wxOVERRIDE; - virtual void EnableBellOnNoMatch(bool on = true); + virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE; - virtual void SortChildren(const wxTreeItemId& item); + virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE; // items geometry // -------------- virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, - bool textOnly = false) const; + bool textOnly = false) const wxOVERRIDE; // this version specific methods @@ -194,12 +194,12 @@ public: // implementation only from now on // overridden base class virtuals - virtual bool SetBackgroundColour(const wxColour& colour); - virtual bool SetForegroundColour(const wxColour& colour); + virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); + virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; - virtual bool SetFont( const wxFont &font ); + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; virtual void SetWindowStyle(const long styles); // callbacks @@ -211,9 +211,9 @@ public: void OnMouse( wxMouseEvent &event ); void OnGetToolTip( wxTreeEvent &event ); void OnSize( wxSizeEvent &event ); - void OnInternalIdle( ); + void OnInternalIdle( ) wxOVERRIDE; - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -281,7 +281,7 @@ protected: void Init(); // overridden wxWindow methods - virtual void DoThaw(); + virtual void DoThaw() wxOVERRIDE; // misc helpers void SendDeleteEvent(wxGenericTreeItem *itemBeingDeleted); @@ -294,21 +294,21 @@ protected: bool unselect_others = true, bool extended_select = false); - virtual int DoGetItemState(const wxTreeItemId& item) const; - virtual void DoSetItemState(const wxTreeItemId& item, int state); + virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE; + virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE; virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, size_t previous, const wxString& text, int image, int selectedImage, - wxTreeItemData *data); + wxTreeItemData *data) wxOVERRIDE; virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, const wxTreeItemId& idPrevious, const wxString& text, int image = -1, int selImage = -1, - wxTreeItemData *data = NULL); - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const; + wxTreeItemData *data = NULL) wxOVERRIDE; + virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE; // called by wxTextTreeCtrl when it marks itself for deletion void ResetTextControl(); @@ -348,7 +348,7 @@ protected: void DoDirtyProcessing(); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; private: // Reset the state of the last find (i.e. keyboard incremental search) diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index 2161870077..d8c9643b08 100644 --- a/include/wx/generic/wizard.h +++ b/include/wx/generic/wizard.h @@ -46,13 +46,13 @@ public: virtual ~wxWizard(); // implement base class pure virtuals - virtual bool RunWizard(wxWizardPage *firstPage); - virtual wxWizardPage *GetCurrentPage() const; - virtual void SetPageSize(const wxSize& size); - virtual wxSize GetPageSize() const; - virtual void FitToPage(const wxWizardPage *firstPage); - virtual wxSizer *GetPageAreaSizer() const; - virtual void SetBorder(int border); + virtual bool RunWizard(wxWizardPage *firstPage) wxOVERRIDE; + virtual wxWizardPage *GetCurrentPage() const wxOVERRIDE; + virtual void SetPageSize(const wxSize& size) wxOVERRIDE; + virtual wxSize GetPageSize() const wxOVERRIDE; + virtual void FitToPage(const wxWizardPage *firstPage) wxOVERRIDE; + virtual wxSizer *GetPageAreaSizer() const wxOVERRIDE; + virtual void SetBorder(int border) wxOVERRIDE; /// set/get bitmap const wxBitmap& GetBitmap() const { return m_bitmap; } @@ -74,7 +74,7 @@ public: virtual void DoCreateControls(); // Do the adaptation - virtual bool DoLayoutAdaptation(); + virtual bool DoLayoutAdaptation() wxOVERRIDE; // Set/get bitmap background colour void SetBitmapBackgroundColour(const wxColour& colour) { m_bitmapBackgroundColour = colour; } diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index f0b84fc4bf..b0de4669e6 100644 --- a/include/wx/gifdecod.h +++ b/include/wx/gifdecod.h @@ -57,12 +57,12 @@ public: unsigned char* GetPalette(unsigned int frame) const; unsigned int GetNcolours(unsigned int frame) const; int GetTransparentColourIndex(unsigned int frame) const; - wxColour GetTransparentColour(unsigned int frame) const; + wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE; - virtual wxSize GetFrameSize(unsigned int frame) const; - virtual wxPoint GetFramePosition(unsigned int frame) const; - virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; - virtual long GetDelay(unsigned int frame) const; + virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE; + virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE; + virtual long GetDelay(unsigned int frame) const wxOVERRIDE; // GIFs can contain both static images and animations bool IsAnimation() const @@ -75,19 +75,19 @@ public: void Destroy(); // implementation of wxAnimationDecoder's pure virtuals - virtual bool Load( wxInputStream& stream ) + virtual bool Load( wxInputStream& stream ) wxOVERRIDE { return LoadGIF(stream) == wxGIF_OK; } - bool ConvertToImage(unsigned int frame, wxImage *image) const; + bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE; - wxAnimationDecoder *Clone() const + wxAnimationDecoder *Clone() const wxOVERRIDE { return new wxGIFDecoder; } - wxAnimationType GetType() const + wxAnimationType GetType() const wxOVERRIDE { return wxANIMATION_TYPE_GIF; } private: // wxAnimationDecoder pure virtual - virtual bool DoCanRead( wxInputStream& stream ) const; + virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; // modifies current stream position (see wxAnimationDecoder::CanRead) int getcode(wxInputStream& stream, int bits, int abfin); diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 2873d7322b..bcdcdb00eb 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -125,8 +125,8 @@ public: wxGraphicsRenderer* GetRenderer() const; wxGraphicsObjectRefData* GetGraphicsData() const; protected: - virtual wxObjectRefData* CreateRefData() const; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + virtual wxObjectRefData* CreateRefData() const wxOVERRIDE; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxGraphicsObject) }; diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index 1cda545a41..3046ddfe58 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -34,23 +34,23 @@ public: wxAnimation& operator= (const wxAnimation&); - virtual bool IsOk() const + virtual bool IsOk() const wxOVERRIDE { return m_pixbuf != NULL; } // unfortunately GdkPixbufAnimation does not expose these info: - virtual unsigned int GetFrameCount() const { return 0; } - virtual wxImage GetFrame(unsigned int frame) const; + virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; } + virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE; // we can retrieve the delay for a frame only after building // a GdkPixbufAnimationIter... - virtual int GetDelay(unsigned int WXUNUSED(frame)) const { return 0; } + virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; } - virtual wxSize GetSize() const; + virtual wxSize GetSize() const wxOVERRIDE; - virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY); - virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; // Implementation public: // used by GTK callbacks @@ -109,24 +109,24 @@ public: // event handler public: // public API - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual void SetAnimation(const wxAnimation &anim); - virtual wxAnimation GetAnimation() const + virtual void SetAnimation(const wxAnimation &anim) wxOVERRIDE; + virtual wxAnimation GetAnimation() const wxOVERRIDE { return wxAnimation(m_anim); } - virtual bool Play(); - virtual void Stop(); + virtual bool Play() wxOVERRIDE; + virtual void Stop() wxOVERRIDE; - virtual bool IsPlaying() const; + virtual bool IsPlaying() const wxOVERRIDE; - bool SetBackgroundColour( const wxColour &colour ); + bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; protected: - virtual void DisplayStaticImage(); - virtual wxSize DoGetBestSize() const; + virtual void DisplayStaticImage() wxOVERRIDE; + virtual wxSize DoGetBestSize() const wxOVERRIDE; void FitToAnimation(); void ClearToBackgroundColour(); diff --git a/include/wx/gtk/anybutton.h b/include/wx/gtk/anybutton.h index 604c72c72a..69777daef6 100644 --- a/include/wx/gtk/anybutton.h +++ b/include/wx/gtk/anybutton.h @@ -23,7 +23,7 @@ public: m_isPressed = false; } - virtual bool Enable( bool enable = true ); + virtual bool Enable( bool enable = true ) wxOVERRIDE; // implementation // -------------- @@ -39,11 +39,11 @@ public: void GTKReleased(); protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); + virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE; + virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; private: typedef wxAnyButtonBase base_type; diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 6f112a3c88..1bdc364e45 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -31,20 +31,20 @@ public: * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by * default. when overriding this method, the code in it is likely to be * platform dependent, otherwise use OnInit(). */ - virtual bool SetNativeTheme(const wxString& theme); - virtual bool OnInitGui(); + virtual bool SetNativeTheme(const wxString& theme) wxOVERRIDE; + virtual bool OnInitGui() wxOVERRIDE; // override base class (pure) virtuals - virtual void WakeUpIdle(); + virtual void WakeUpIdle() wxOVERRIDE; - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); + virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; + virtual void CleanUp() wxOVERRIDE; virtual void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, - const wxChar *msg); + const wxChar *msg) wxOVERRIDE; // GTK-specific methods // ------------------- diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index d035f2c2c1..a7900119dd 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -43,9 +43,9 @@ public: #endif protected: - virtual void FreeData(); - virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); + virtual void FreeData() wxOVERRIDE; + virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE; + virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE; private: #ifdef __WXGTK3__ @@ -83,36 +83,36 @@ public: wxBitmap(GdkPixbuf* pixbuf, int depth = 0); virtual ~wxBitmap(); - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE { return Create(sz.GetWidth(), sz.GetHeight(), depth); } bool Create(int width, int height, const wxDC& WXUNUSED(dc)) { return Create(width,height); } - 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 - wxImage ConvertToImage() const; + wxImage ConvertToImage() const wxOVERRIDE; #endif // wxUSE_IMAGE // 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; - wxMask *GetMask() const; - void SetMask( wxMask *mask ); + wxMask *GetMask() const wxOVERRIDE; + void SetMask( wxMask *mask ) wxOVERRIDE; - wxBitmap GetSubBitmap( const wxRect& rect ) const; + wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE; bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); + const wxPalette *palette = NULL) const wxOVERRIDE; + bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; #if wxUSE_PALETTE - wxPalette *GetPalette() const; - void SetPalette(const wxPalette& palette); + wxPalette *GetPalette() const wxOVERRIDE; + void SetPalette(const wxPalette& palette) wxOVERRIDE; wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE @@ -121,9 +121,9 @@ public: // implementation // -------------- - void SetHeight( int height ); - void SetWidth( int width ); - void SetDepth( int depth ); + void SetHeight( int height ) wxOVERRIDE; + void SetWidth( int width ) wxOVERRIDE; + void SetDepth( int depth ) wxOVERRIDE; #ifdef __WXGTK3__ GdkPixbuf* GetPixbufNoMask() const; @@ -151,8 +151,8 @@ protected: #endif // wxUSE_IMAGE #endif - 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: #ifndef __WXGTK3__ diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h index f5d00a517b..9714b5c190 100644 --- a/include/wx/gtk/bmpcbox.h +++ b/include/wx/gtk/bmpcbox.h @@ -81,13 +81,13 @@ public: virtual ~wxBitmapComboBox(); // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); + virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE; // Returns the image of the item with the given index. - virtual wxBitmap GetItemBitmap(unsigned int n) const; + virtual wxBitmap GetItemBitmap(unsigned int n) const wxOVERRIDE; // Returns size of the image used in list - virtual wxSize GetBitmapSize() const + virtual wxSize GetBitmapSize() const wxOVERRIDE { return m_bitmapSize; } @@ -106,33 +106,33 @@ public: unsigned int pos, wxClientData *clientData); // Override some wxTextEntry interface. - virtual void WriteText(const wxString& value); + virtual void WriteText(const wxString& value) wxOVERRIDE; - virtual wxString GetValue() const; - virtual void Remove(long from, long to); + virtual wxString GetValue() const wxOVERRIDE; + virtual void Remove(long from, long to) 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 void SetSelection(int n) { wxComboBox::SetSelection(n); } - virtual int GetSelection() const { return wxComboBox::GetSelection(); } + virtual void SetSelection(int n) wxOVERRIDE { wxComboBox::SetSelection(n); } + virtual int GetSelection() const wxOVERRIDE { return wxComboBox::GetSelection(); } - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); + virtual bool IsEditable() const wxOVERRIDE; + virtual void SetEditable(bool editable) wxOVERRIDE; - virtual GtkWidget* GetConnectWidget(); + virtual GtkWidget* GetConnectWidget() wxOVERRIDE; protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual void GTKCreateComboBoxWidget(); - virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ); + virtual void GTKCreateComboBoxWidget() wxOVERRIDE; + virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) wxOVERRIDE; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; wxSize m_bitmapSize; int m_bitmapCellIndex; diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 4ea1642be1..98612eb9b3 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -28,14 +28,14 @@ public: bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - wxBrushStyle GetStyle() const; - wxColour GetColour() const; - wxBitmap *GetStipple() const; + wxBrushStyle GetStyle() const wxOVERRIDE; + wxColour GetColour() const wxOVERRIDE; + wxBitmap *GetStipple() const wxOVERRIDE; - void SetColour( const wxColour& col ); - void SetColour( unsigned char r, unsigned char g, unsigned char b ); - void SetStyle( wxBrushStyle style ); - void SetStipple( const wxBitmap& stipple ); + void SetColour( const wxColour& col ) wxOVERRIDE; + void SetColour( unsigned char r, unsigned char g, unsigned char b ) wxOVERRIDE; + void SetStyle( wxBrushStyle style ) wxOVERRIDE; + void SetStipple( const wxBitmap& stipple ) wxOVERRIDE; wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") wxBrush(const wxColour& col, int style); @@ -44,8 +44,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; DECLARE_DYNAMIC_CLASS(wxBrush) }; diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 9e7a57d890..cdc9119644 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -34,8 +34,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual wxWindow *SetDefault(); - virtual void SetLabel( const wxString &label ); + virtual wxWindow *SetDefault() wxOVERRIDE; + virtual void SetLabel( const wxString &label ) wxOVERRIDE; // implementation // -------------- @@ -54,11 +54,11 @@ public: void GTKReleased(); protected: - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); + virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; #endif // wxUSE_MARKUP private: diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h index 3fce698ee5..195b873412 100644 --- a/include/wx/gtk/calctrl.h +++ b/include/wx/gtk/calctrl.h @@ -34,16 +34,16 @@ public: virtual ~wxGtkCalendarCtrl() {} - 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 bool EnableMonthChange(bool enable = true) wxOVERRIDE; - virtual void Mark(size_t day, bool mark); + virtual void Mark(size_t day, bool mark) wxOVERRIDE; // implementation // -------------- diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h index 69985fc457..0aa970d920 100644 --- a/include/wx/gtk/checkbox.h +++ b/include/wx/gtk/checkbox.h @@ -35,11 +35,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr ); - void SetValue( bool state ); - bool GetValue() const; + void SetValue( bool state ) wxOVERRIDE; + bool GetValue() const wxOVERRIDE; - virtual void SetLabel( const wxString& label ); - virtual bool Enable( bool enable = true ); + virtual void SetLabel( const wxString& label ) wxOVERRIDE; + virtual bool Enable( bool enable = true ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -49,11 +49,11 @@ public: void GTKEnableEvents(); protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - void DoSet3StateValue(wxCheckBoxState state); - wxCheckBoxState DoGet3StateValue() const; + void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE; + wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; private: typedef wxCheckBoxBase base_type; diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h index 3cfbd76407..0bd9a2babb 100644 --- a/include/wx/gtk/checklst.h +++ b/include/wx/gtk/checklst.h @@ -34,8 +34,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); - virtual bool IsChecked(unsigned int index) const; - virtual void Check(unsigned int index, bool check = true); + virtual bool IsChecked(unsigned int index) const wxOVERRIDE; + virtual void Check(unsigned int index, bool check = true) wxOVERRIDE; int GetItemHeight() const; diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index d952a0fa2c..cef21a5b12 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -63,16 +63,16 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr ); - int GetSelection() const; - void SetSelection(int n); + int GetSelection() const wxOVERRIDE; + void SetSelection(int n) wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& string); + virtual unsigned int GetCount() const wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& string) wxOVERRIDE; - virtual void SetColumns(int n=1); - virtual int GetColumns() const; + virtual void SetColumns(int n=1) wxOVERRIDE; + virtual int GetColumns() const wxOVERRIDE; virtual void GTKDisableEvents(); virtual void GTKEnableEvents(); @@ -91,18 +91,18 @@ protected: // index to GtkListStore cell which displays the item text int m_stringCellIndex; - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + void **clientData, wxClientDataType type) wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; + virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; // in derived classes, implement this to insert list store entry // with all items default except text diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h index 28d84df815..2c46b368c0 100644 --- a/include/wx/gtk/clipbrd.h +++ b/include/wx/gtk/clipbrd.h @@ -30,31 +30,31 @@ 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; // ask if data in correct format is available - virtual bool IsSupportedAsync( wxEvtHandler *sink ); + virtual bool IsSupportedAsync( wxEvtHandler *sink ) 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; diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h index 4a375fb849..eb7a63b607 100644 --- a/include/wx/gtk/clrpicker.h +++ b/include/wx/gtk/clrpicker.h @@ -47,7 +47,7 @@ public: virtual ~wxColourButton(); protected: - void UpdateColour(); + void UpdateColour() wxOVERRIDE; public: // used by the GTK callback only diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h index 7503b8e1b2..52d2af4bfa 100644 --- a/include/wx/gtk/collpane.h +++ b/include/wx/gtk/collpane.h @@ -43,15 +43,15 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxCollapsiblePaneNameStr); - virtual void Collapse(bool collapse = true); - virtual bool IsCollapsed() const; - virtual void SetLabel(const wxString& str); + virtual void Collapse(bool collapse = true) wxOVERRIDE; + virtual bool IsCollapsed() const wxOVERRIDE; + virtual void SetLabel(const wxString& str) wxOVERRIDE; - virtual wxWindow *GetPane() const { return m_pPane; } - virtual wxString GetLabel() const { return m_strLabel; } + virtual wxWindow *GetPane() const wxOVERRIDE { return m_pPane; } + virtual wxString GetLabel() const wxOVERRIDE { return m_strLabel; } protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; public: // used by GTK callbacks bool m_bIgnoreNextChange; @@ -69,8 +69,8 @@ private: } void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child); - GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; + GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxCollapsiblePane) DECLARE_EVENT_TABLE() diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h index a1fdbb75ec..75d76a0f4d 100644 --- a/include/wx/gtk/colordlg.h +++ b/include/wx/gtk/colordlg.h @@ -25,16 +25,16 @@ public: wxColourData &GetColourData() { return m_data; } - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; protected: // implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} + int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} // copy data between the dialog and m_colourData: void ColourDataToDialog(); diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index d48d707cbe..605c28cad6 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -33,10 +33,10 @@ public: bool operator==(const wxColour& col) const; bool operator!=(const wxColour& col) const { return !(*this == col); } - unsigned char Red() const; - unsigned char Green() const; - unsigned char Blue() const; - unsigned char Alpha() const; + unsigned char Red() const wxOVERRIDE; + unsigned char Green() const wxOVERRIDE; + unsigned char Blue() const wxOVERRIDE; + unsigned char Alpha() const wxOVERRIDE; // Implementation part #ifdef __WXGTK3__ @@ -49,9 +49,9 @@ public: protected: virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) wxOVERRIDE; - virtual bool FromString(const wxString& str); + virtual bool FromString(const wxString& str) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxColour) }; diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index c655991e3c..0c4240bd0c 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -76,25 +76,25 @@ public: // Set/GetSelection() from wxTextEntry and wxChoice - virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) + virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); } + virtual void SetSelection(long from, long to) wxOVERRIDE { wxTextEntry::SetSelection(from, to); } - virtual int GetSelection() const { return wxChoice::GetSelection(); } - virtual void GetSelection(long *from, long *to) const + virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); } + virtual void GetSelection(long *from, long *to) const wxOVERRIDE { return wxTextEntry::GetSelection(from, to); } - virtual wxString GetStringSelection() const + virtual wxString GetStringSelection() const wxOVERRIDE { return wxItemContainer::GetStringSelection(); } - virtual void SetString(unsigned int n, const wxString& string); + virtual void SetString(unsigned int n, const wxString& string) wxOVERRIDE; virtual void Popup(); virtual void Dismiss(); - virtual void Clear() + virtual void Clear() wxOVERRIDE { wxTextEntry::Clear(); wxItemContainer::Clear(); @@ -106,7 +106,7 @@ public: void OnChar( wxKeyEvent &event ); - virtual void SetValue(const wxString& value); + virtual void SetValue(const wxString& value) wxOVERRIDE; // Standard event handling void OnCut(wxCommandEvent& event); @@ -125,37 +125,37 @@ public: void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event); - virtual void GTKDisableEvents(); - virtual void GTKEnableEvents(); - GtkWidget* GetConnectWidget(); + virtual void GTKDisableEvents() wxOVERRIDE; + virtual void GTKEnableEvents() wxOVERRIDE; + GtkWidget* GetConnectWidget() wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: // From wxWindowGTK: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; // Widgets that use the style->base colour for the BG colour should // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } + virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } // Override in derived classes to create combo box widgets with // custom list stores. virtual void GTKCreateComboBoxWidget(); - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual GtkEntry *GetEntry() const + virtual GtkEntry *GetEntry() const wxOVERRIDE { return m_entry; } GtkEntry* m_entry; private: // From wxTextEntry: - virtual wxWindow *GetEditableWindow() { return this; } - virtual GtkEditable *GetEditable() const; - virtual void EnableTextChangedEvents(bool enable); + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual GtkEditable *GetEditable() const wxOVERRIDE; + virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; void Init(); diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 454d1fc90d..009da4cf48 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -37,13 +37,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr); - virtual wxVisualAttributes GetDefaultAttributes() const; + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; #ifdef __WXGTK3__ virtual bool SetFont(const wxFont& font); #endif protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; void PostCreation(const wxSize& size); // sets the label to the given string and also sets it for the given widget diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index e1915efc1d..2c4b97aa13 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -49,8 +49,8 @@ protected: void InitFromImage(const wxImage& image); #endif - 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: DECLARE_DYNAMIC_CLASS(wxCursor) diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h index 62f380a429..5e94b4e49c 100644 --- a/include/wx/gtk/dataobj2.h +++ b/include/wx/gtk/dataobj2.h @@ -25,24 +25,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 { return m_pngSize; } - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize() const wxOVERRIDE { return m_pngSize; } + 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); } @@ -72,19 +72,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/gtk/dataview.h b/include/wx/gtk/dataview.h index 44d2af93b2..90d302c868 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -34,44 +34,44 @@ public: // setters: - virtual void SetTitle( const wxString &title ); - virtual void SetBitmap( const wxBitmap &bitmap ); + virtual void SetTitle( const wxString &title ) wxOVERRIDE; + virtual void SetBitmap( const wxBitmap &bitmap ) wxOVERRIDE; - virtual void SetOwner( wxDataViewCtrl *owner ); + virtual void SetOwner( wxDataViewCtrl *owner ) wxOVERRIDE; - virtual void SetAlignment( wxAlignment align ); + virtual void SetAlignment( wxAlignment align ) wxOVERRIDE; - virtual void SetSortable( bool sortable ); - virtual void SetSortOrder( bool ascending ); + virtual void SetSortable( bool sortable ) wxOVERRIDE; + virtual void SetSortOrder( bool ascending ) wxOVERRIDE; - virtual void SetResizeable( bool resizable ); - virtual void SetHidden( bool hidden ); + virtual void SetResizeable( bool resizable ) wxOVERRIDE; + virtual void SetHidden( bool hidden ) wxOVERRIDE; - virtual void SetMinWidth( int minWidth ); - virtual void SetWidth( int width ); + virtual void SetMinWidth( int minWidth ) wxOVERRIDE; + virtual void SetWidth( int width ) wxOVERRIDE; - virtual void SetReorderable( bool reorderable ); + virtual void SetReorderable( bool reorderable ) wxOVERRIDE; - virtual void SetFlags(int flags) { SetIndividualFlags(flags); } + virtual void SetFlags(int flags) wxOVERRIDE { SetIndividualFlags(flags); } // getters: - virtual wxString GetTitle() const; - virtual wxAlignment GetAlignment() const; + virtual wxString GetTitle() const wxOVERRIDE; + virtual wxAlignment GetAlignment() const wxOVERRIDE; - virtual bool IsSortable() const; - virtual bool IsSortOrderAscending() const; - virtual bool IsSortKey() const; + virtual bool IsSortable() const wxOVERRIDE; + virtual bool IsSortOrderAscending() const wxOVERRIDE; + virtual bool IsSortKey() const wxOVERRIDE; - virtual bool IsResizeable() const; - virtual bool IsHidden() const; + virtual bool IsResizeable() const wxOVERRIDE; + virtual bool IsHidden() const wxOVERRIDE; - virtual int GetWidth() const; - virtual int GetMinWidth() const; + virtual int GetWidth() const wxOVERRIDE; + virtual int GetMinWidth() const wxOVERRIDE; - virtual bool IsReorderable() const; + virtual bool IsReorderable() const wxOVERRIDE; - virtual int GetFlags() const { return GetFromIndividualFlags(); } + virtual int GetFlags() const wxOVERRIDE { return GetFromIndividualFlags(); } // implementation GtkWidget* GetGtkHandle() const { return m_column; } @@ -126,49 +126,49 @@ public: virtual ~wxDataViewCtrl(); - virtual bool AssociateModel( wxDataViewModel *model ); + virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE; - virtual bool PrependColumn( wxDataViewColumn *col ); - virtual bool AppendColumn( wxDataViewColumn *col ); - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ); + virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE; + virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE; + virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE; - virtual unsigned int GetColumnCount() const; - virtual wxDataViewColumn* GetColumn( unsigned int pos ) const; - virtual bool DeleteColumn( wxDataViewColumn *column ); - virtual bool ClearColumns(); - virtual int GetColumnPosition( const wxDataViewColumn *column ) const; + virtual unsigned int GetColumnCount() const wxOVERRIDE; + virtual wxDataViewColumn* GetColumn( unsigned int pos ) const wxOVERRIDE; + virtual bool DeleteColumn( wxDataViewColumn *column ) wxOVERRIDE; + virtual bool ClearColumns() wxOVERRIDE; + virtual int GetColumnPosition( const wxDataViewColumn *column ) const wxOVERRIDE; - virtual wxDataViewColumn *GetSortingColumn() const; + virtual wxDataViewColumn *GetSortingColumn() const wxOVERRIDE; - virtual int GetSelectedItemsCount() const; - virtual int GetSelections( wxDataViewItemArray & sel ) const; - virtual void SetSelections( const wxDataViewItemArray & sel ); - virtual void Select( const wxDataViewItem & item ); - virtual void Unselect( const wxDataViewItem & item ); - virtual bool IsSelected( const wxDataViewItem & item ) const; - virtual void SelectAll(); - virtual void UnselectAll(); + virtual int GetSelectedItemsCount() const wxOVERRIDE; + virtual int GetSelections( wxDataViewItemArray & sel ) const wxOVERRIDE; + virtual void SetSelections( const wxDataViewItemArray & sel ) wxOVERRIDE; + virtual void Select( const wxDataViewItem & item ) wxOVERRIDE; + virtual void Unselect( const wxDataViewItem & item ) wxOVERRIDE; + virtual bool IsSelected( const wxDataViewItem & item ) const wxOVERRIDE; + virtual void SelectAll() wxOVERRIDE; + virtual void UnselectAll() wxOVERRIDE; virtual void EnsureVisible( const wxDataViewItem& item, - const wxDataViewColumn *column = NULL ); + const wxDataViewColumn *column = NULL ) wxOVERRIDE; virtual void HitTest( const wxPoint &point, wxDataViewItem &item, - wxDataViewColumn *&column ) const; + wxDataViewColumn *&column ) const wxOVERRIDE; virtual wxRect GetItemRect( const wxDataViewItem &item, - const wxDataViewColumn *column = NULL ) const; + const wxDataViewColumn *column = NULL ) const wxOVERRIDE; - virtual bool SetRowHeight( int rowHeight ); + virtual bool SetRowHeight( int rowHeight ) wxOVERRIDE; - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; - virtual void Expand( const wxDataViewItem & item ); - virtual void Collapse( const wxDataViewItem & item ); - virtual bool IsExpanded( const wxDataViewItem & item ) const; + virtual void Expand( const wxDataViewItem & item ) wxOVERRIDE; + virtual void Collapse( const wxDataViewItem & item ) wxOVERRIDE; + virtual bool IsExpanded( const wxDataViewItem & item ) const wxOVERRIDE; - virtual bool EnableDragSource( const wxDataFormat &format ); - virtual bool EnableDropTarget( const wxDataFormat &format ); + virtual bool EnableDragSource( const wxDataFormat &format ) wxOVERRIDE; + virtual bool EnableDropTarget( const wxDataFormat &format ) wxOVERRIDE; - virtual wxDataViewColumn *GetCurrentColumn() const; + virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -182,21 +182,21 @@ public: // failed. wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const; - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } protected: - virtual void DoSetExpanderColumn(); - virtual void DoSetIndent(); + virtual void DoSetExpanderColumn() wxOVERRIDE; + virtual void DoSetIndent() wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; private: void Init(); - virtual wxDataViewItem DoGetCurrentItem() const; - virtual void DoSetCurrentItem(const wxDataViewItem& item); + virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; + virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; // Return wxDataViewColumn matching the given GtkTreeViewColumn. // @@ -218,7 +218,7 @@ private: // value to force the height of all rows to the given value. int m_uniformRowHeight; - virtual void AddChildGTK(wxWindowGTK* child); + virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; void GtkEnableSelectionEvents(); void GtkDisableSelectionEvents(); diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index 7eb9dd1267..c016eec845 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -21,16 +21,16 @@ public: wxGTKCairoDCImpl(wxDC* owner, int); wxGTKCairoDCImpl(wxDC* owner, wxWindow* window); - virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask); - virtual void DoDrawIcon(const wxIcon& icon, int x, int y); + virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask) wxOVERRIDE; + virtual void DoDrawIcon(const wxIcon& icon, int x, int y) wxOVERRIDE; #if wxUSE_IMAGE - virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style); + virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style) wxOVERRIDE; #endif - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const; - virtual bool DoGetPixel(int x, int y, wxColour* col) const; - virtual void DoGetSize(int* width, int* height) const; - virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask); - virtual void* GetCairoContext() const; + virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const wxOVERRIDE; + virtual bool DoGetPixel(int x, int y, wxColour* col) const wxOVERRIDE; + virtual void DoGetSize(int* width, int* height) const wxOVERRIDE; + virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask) wxOVERRIDE; + virtual void* GetCairoContext() const wxOVERRIDE; protected: int m_width, m_height; @@ -86,10 +86,10 @@ public: wxMemoryDCImpl(wxMemoryDC* owner); wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap); wxMemoryDCImpl(wxMemoryDC* owner, wxDC* dc); - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const; - virtual void DoSelect(const wxBitmap& bitmap); - virtual const wxBitmap& GetSelectedBitmap() const; - virtual wxBitmap& GetSelectedBitmap(); + virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const wxOVERRIDE; + virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; + virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE; + virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE; private: void Setup(); @@ -127,19 +127,19 @@ public: #endif // wxUSE_PALETTE // Resolution in pixels per logical inch - virtual wxSize GetPPI() const; + virtual wxSize GetPPI() const wxOVERRIDE; - virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } - virtual void EndDoc() { } - virtual void StartPage() { } - virtual void EndPage() { } + virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE { return true; } + virtual void EndDoc() wxOVERRIDE { } + virtual void StartPage() wxOVERRIDE { } + virtual void EndPage() wxOVERRIDE { } virtual GdkWindow* GetGDKWindow() const { return NULL; } - virtual void* GetHandle() const { return GetGDKWindow(); } + virtual void* GetHandle() const wxOVERRIDE { return GetGDKWindow(); } // base class pure virtuals implemented here - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoGetSizeMM(int* width, int* height) const; + virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; DECLARE_ABSTRACT_CLASS(wxGTKDCImpl) }; diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 53469796a1..c6fc425827 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -23,79 +23,79 @@ public: virtual ~wxWindowDCImpl(); - virtual bool CanDrawBitmap() const { return true; } - virtual bool CanGetTextExtent() const { return true; } + virtual bool CanDrawBitmap() const wxOVERRIDE { return true; } + virtual bool CanGetTextExtent() const wxOVERRIDE { return true; } - virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style=wxFLOOD_SURFACE ); - virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; + wxFloodFillStyle style=wxFLOOD_SURFACE ) wxOVERRIDE; + virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const wxOVERRIDE; - virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); - virtual void DoCrossHair( wxCoord x, wxCoord y ); + virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) wxOVERRIDE; + virtual void DoCrossHair( wxCoord x, wxCoord y ) 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 width, wxCoord height, - double sa, double ea ); - virtual void DoDrawPoint( wxCoord x, wxCoord y ); + double sa, double ea ) wxOVERRIDE; + virtual void DoDrawPoint( wxCoord x, wxCoord y ) 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; - virtual void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ); - virtual void DoDrawEllipse( 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 = 20.0 ) wxOVERRIDE; + virtual void DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) 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 &bitmap, wxCoord x, wxCoord y, - bool useMask = false ); + bool useMask = false ) wxOVERRIDE; virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode logical_func = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); + wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ) 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); + double angle) wxOVERRIDE; virtual void DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ); + const wxFont *theFont = NULL) const wxOVERRIDE; + virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; + virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) wxOVERRIDE; + virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ) wxOVERRIDE; - virtual wxCoord GetCharWidth() const; - virtual wxCoord GetCharHeight() const; + virtual wxCoord GetCharWidth() const wxOVERRIDE; + virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual void Clear(); + virtual void Clear() 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 SetLogicalFunction( wxRasterOperationMode function ); - virtual void SetTextForeground( const wxColour &col ); - virtual void SetTextBackground( const wxColour &col ); - virtual void SetBackgroundMode( int mode ); - virtual void SetPalette( const wxPalette& palette ); + 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 SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE; + virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE; + virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE; + virtual void SetBackgroundMode( int mode ) wxOVERRIDE; + virtual void SetPalette( const wxPalette& palette ) wxOVERRIDE; - virtual void DestroyClippingRegion(); + virtual void DestroyClippingRegion() wxOVERRIDE; // Resolution in pixels per logical inch - virtual wxSize GetPPI() const; - virtual int GetDepth() const; + virtual wxSize GetPPI() const wxOVERRIDE; + virtual int GetDepth() const wxOVERRIDE; // overrriden here for RTL - virtual void SetDeviceOrigin( wxCoord x, wxCoord y ); - virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); + virtual void SetDeviceOrigin( wxCoord x, wxCoord y ) wxOVERRIDE; + virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) wxOVERRIDE; // protected: // implementation @@ -119,9 +119,9 @@ public: void SetUpDC( bool ismem = false ); void Destroy(); - virtual void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin() wxOVERRIDE; - virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; } + virtual GdkWindow *GetGDKWindow() const wxOVERRIDE { return m_gdkwindow; } private: void DrawingSetup(GdkGC*& gc, bool& originChanged); @@ -140,7 +140,7 @@ public: wxClientDCImpl( wxDC *owner ); wxClientDCImpl( wxDC *owner, wxWindow *win ); - virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; DECLARE_ABSTRACT_CLASS(wxClientDCImpl) }; diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index 8afb45c52e..758ea4c0e4 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -29,22 +29,22 @@ public: // more like their Win32 couterparts. They now interpret // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0 // and everything else as drawing 1. - virtual void SetPen( const wxPen &pen ); - virtual void SetBrush( const wxBrush &brush ); - virtual void SetBackground( const wxBrush &brush ); - virtual void SetTextForeground( const wxColour &col ); - virtual void SetTextBackground( const wxColour &col ); + virtual void SetPen( const wxPen &pen ) wxOVERRIDE; + virtual void SetBrush( const wxBrush &brush ) wxOVERRIDE; + virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE; + virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE; + virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE; // overridden from wxDCImpl - virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; - virtual void* GetHandle() const; + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; + virtual void* GetHandle() const wxOVERRIDE; // overridden for wxMemoryDC Impl - virtual void DoSelect(const wxBitmap& bitmap); + 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/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h index c91926b910..842e24bcc9 100644 --- a/include/wx/gtk/dcscreen.h +++ b/include/wx/gtk/dcscreen.h @@ -22,7 +22,7 @@ public: wxScreenDCImpl( wxScreenDC *owner ); ~wxScreenDCImpl(); - virtual void DoGetSize(int *width, int *height) const; + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; private: void Init(); diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index fcd7cd3db8..d26dffbe7c 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -34,10 +34,10 @@ public: const wxString &name = wxDialogNameStr ); virtual ~wxDialog(); - virtual bool Show( bool show = true ); - virtual int ShowModal(); - virtual void EndModal( int retCode ); - virtual bool IsModal() const; + virtual bool Show( bool show = true ) wxOVERRIDE; + virtual int ShowModal() wxOVERRIDE; + virtual void EndModal( int retCode ) wxOVERRIDE; + virtual bool IsModal() const wxOVERRIDE; private: // common part of all ctors diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h index 8a05d55796..4f0712815e 100644 --- a/include/wx/gtk/dirdlg.h +++ b/include/wx/gtk/dirdlg.h @@ -37,8 +37,8 @@ public: public: // overrides from wxGenericDirDialog - wxString GetPath() const; - void SetPath(const wxString& path); + wxString GetPath() const wxOVERRIDE; + void SetPath(const wxString& path) wxOVERRIDE; // Implementation only. @@ -51,7 +51,7 @@ protected: // form doesn't have any m_wxwindow virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; private: diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h index 0aea7b41f6..3c771e2f68 100644 --- a/include/wx/gtk/dnd.h +++ b/include/wx/gtk/dnd.h @@ -30,10 +30,10 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase public: 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; // Can only be called during OnXXX methods. wxDataFormat GetMatchingPair(); @@ -92,7 +92,7 @@ public: } // start drag action - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; void PrepareIcon( int action, GdkDragContext *context ); diff --git a/include/wx/gtk/evtloop.h b/include/wx/gtk/evtloop.h index cb078f664f..0e3c1b15ea 100644 --- a/include/wx/gtk/evtloop.h +++ b/include/wx/gtk/evtloop.h @@ -21,18 +21,18 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase public: wxGUIEventLoop(); - virtual void ScheduleExit(int rc = 0); - virtual bool Pending() const; - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout); - virtual void WakeUp(); + virtual void ScheduleExit(int rc = 0) wxOVERRIDE; + virtual bool Pending() const wxOVERRIDE; + virtual bool Dispatch() wxOVERRIDE; + virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; + virtual void WakeUp() wxOVERRIDE; void StoreGdkEventForLaterProcessing(GdkEvent* ev) { m_arrGdkEvents.Add(ev); } protected: - virtual int DoRun(); - virtual void DoYieldFor(long eventsToProcess); + virtual int DoRun() wxOVERRIDE; + virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; private: // the exit code of this event loop diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h index 3de17e3af8..4cfbf69aff 100644 --- a/include/wx/gtk/filectrl.h +++ b/include/wx/gtk/filectrl.h @@ -99,22 +99,22 @@ public: const wxSize& size = wxDefaultSize, const wxString& name = wxFileCtrlNameStr ); - virtual void SetWildcard( const wxString& wildCard ); - virtual void SetFilterIndex( int filterIndex ); - virtual bool SetDirectory( const wxString& dir ); - virtual bool SetFilename( const wxString& name ); - virtual bool SetPath( const wxString& path ); + virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE; + virtual void SetFilterIndex( int filterIndex ) wxOVERRIDE; + virtual bool SetDirectory( const wxString& dir ) wxOVERRIDE; + virtual bool SetFilename( const wxString& name ) wxOVERRIDE; + virtual bool SetPath( const wxString& path ) wxOVERRIDE; - virtual wxString GetFilename() const; - virtual wxString GetDirectory() const; - virtual wxString GetWildcard() const { return this->m_wildCard; } - virtual wxString GetPath() const; - virtual void GetPaths( wxArrayString& paths ) const; - virtual void GetFilenames( wxArrayString& files ) const; - virtual int GetFilterIndex() const { return m_fc.GetFilterIndex(); } + virtual wxString GetFilename() const wxOVERRIDE; + virtual wxString GetDirectory() const wxOVERRIDE; + virtual wxString GetWildcard() const wxOVERRIDE { return this->m_wildCard; } + virtual wxString GetPath() const wxOVERRIDE; + virtual void GetPaths( wxArrayString& paths ) const wxOVERRIDE; + virtual void GetFilenames( wxArrayString& files ) const wxOVERRIDE; + virtual int GetFilterIndex() const wxOVERRIDE { return m_fc.GetFilterIndex(); } - virtual bool HasMultipleFileSelection() const { return HasFlag( wxFC_MULTIPLE ); } - virtual void ShowHidden(bool show); + virtual bool HasMultipleFileSelection() const wxOVERRIDE { return HasFlag( wxFC_MULTIPLE ); } + virtual void ShowHidden(bool show) wxOVERRIDE; virtual bool HasFilterChoice() const { return m_fc.HasFilterChoice(); } diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index 377734db79..edde44fa97 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -40,22 +40,22 @@ public: const wxString& name = wxFileDialogNameStr); virtual ~wxFileDialog(); - virtual wxString GetPath() const; - virtual void GetPaths(wxArrayString& paths) const; - virtual wxString GetFilename() const; - virtual void GetFilenames(wxArrayString& files) const; - virtual int GetFilterIndex() const; + virtual wxString GetPath() const wxOVERRIDE; + virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE; + virtual wxString GetFilename() const wxOVERRIDE; + virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE; + virtual int GetFilterIndex() const wxOVERRIDE; - virtual void SetMessage(const wxString& message); - virtual void SetPath(const wxString& path); - virtual void SetDirectory(const wxString& dir); - virtual void SetFilename(const wxString& name); - virtual void SetWildcard(const wxString& wildCard); - virtual void SetFilterIndex(int filterIndex); + virtual void SetMessage(const wxString& message) wxOVERRIDE; + virtual void SetPath(const wxString& path) wxOVERRIDE; + virtual void SetDirectory(const wxString& dir) wxOVERRIDE; + virtual void SetFilename(const wxString& name) wxOVERRIDE; + virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE; + virtual void SetFilterIndex(int filterIndex) wxOVERRIDE; - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; - virtual bool SupportsExtraControl() const { return true; } + virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } // Implementation only. void GTKSelectionChanged(const wxString& filename); @@ -66,13 +66,13 @@ protected: // form doesn't have any m_wxwindow virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; private: void OnFakeOk( wxCommandEvent &event ); void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child); + virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; wxGtkFileChooser m_fc; diff --git a/include/wx/gtk/filehistory.h b/include/wx/gtk/filehistory.h index 70a93d6f5e..3c837fcb6c 100644 --- a/include/wx/gtk/filehistory.h +++ b/include/wx/gtk/filehistory.h @@ -16,7 +16,7 @@ public: wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1) : wxFileHistoryBase(maxFiles, idBase) {} - virtual void AddFileToHistory(const wxString& file); + virtual void AddFileToHistory(const wxString& file) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxFileHistory) }; diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 80a4e305a0..216f88d107 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -64,24 +64,24 @@ public: virtual ~wxFont(); // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual wxString GetFaceName() const; - virtual bool GetUnderlined() const; - virtual bool GetStrikethrough() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - virtual bool IsFixedWidth() const; + virtual int GetPointSize() const wxOVERRIDE; + virtual wxFontStyle GetStyle() const wxOVERRIDE; + virtual wxFontWeight GetWeight() const wxOVERRIDE; + virtual wxString GetFaceName() const wxOVERRIDE; + virtual bool GetUnderlined() const wxOVERRIDE; + virtual bool GetStrikethrough() const wxOVERRIDE; + virtual wxFontEncoding GetEncoding() const wxOVERRIDE; + virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE; + virtual bool IsFixedWidth() const wxOVERRIDE; - virtual void SetPointSize( int pointSize ); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName( const wxString& faceName ); - virtual void SetUnderlined( bool underlined ); - virtual void SetStrikethrough(bool strikethrough); - virtual void SetEncoding(wxFontEncoding encoding); + virtual void SetPointSize( int pointSize ) wxOVERRIDE; + virtual void SetFamily(wxFontFamily family) wxOVERRIDE; + virtual void SetStyle(wxFontStyle style) wxOVERRIDE; + virtual void SetWeight(wxFontWeight weight) wxOVERRIDE; + virtual bool SetFaceName( const wxString& faceName ) wxOVERRIDE; + virtual void SetUnderlined( bool underlined ) wxOVERRIDE; + virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE; + virtual void SetEncoding(wxFontEncoding encoding) wxOVERRIDE; wxDECLARE_COMMON_FONT_METHODS(); @@ -110,12 +110,12 @@ public: // no data :-) protected: - virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ) wxOVERRIDE; - 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 wxFontFamily DoGetFamily() const; + virtual wxFontFamily DoGetFamily() const wxOVERRIDE; private: void Init(); diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index d484c20ad8..179af47042 100644 --- a/include/wx/gtk/fontdlg.h +++ b/include/wx/gtk/fontdlg.h @@ -27,7 +27,7 @@ public: protected: // create the GTK dialog - virtual bool DoCreate(wxWindow *parent); + virtual bool DoCreate(wxWindow *parent) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxFontDialog) }; diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h index c991137cab..25928d19c0 100644 --- a/include/wx/gtk/fontpicker.h +++ b/include/wx/gtk/fontpicker.h @@ -45,16 +45,16 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxFontPickerWidgetNameStr); - virtual wxColour GetSelectedColour() const + virtual wxColour GetSelectedColour() const wxOVERRIDE { return m_selectedColour; } - void SetSelectedColour(const wxColour &colour) + void SetSelectedColour(const wxColour &colour) wxOVERRIDE { m_selectedColour = colour; } virtual ~wxFontButton(); protected: - void UpdateFont(); + void UpdateFont() wxOVERRIDE; public: // used by the GTK callback only diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 1f172c43c1..abef72a19a 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -42,15 +42,15 @@ public: virtual ~wxFrame(); #if wxUSE_STATUSBAR - void SetStatusBar(wxStatusBar *statbar); + void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - void SetToolBar(wxToolBar *toolbar); + void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; #endif // wxUSE_TOOLBAR - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + wxPoint GetClientAreaOrigin() const wxOVERRIDE { return wxPoint(0, 0); } #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 // in Hildon environment all frames are always shown maximized @@ -60,15 +60,15 @@ public: // implementation from now on // -------------------------- - virtual bool SendIdleEvents(wxIdleEvent& event); + virtual bool SendIdleEvents(wxIdleEvent& event) wxOVERRIDE; protected: // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoGetClientSize( int *width, int *height ) const; + virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; #if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar(); - virtual void AttachMenuBar(wxMenuBar *menubar); + virtual void DetachMenuBar() wxOVERRIDE; + virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; #endif // wxUSE_MENUS_NATIVE private: diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index 8df47461e5..92827dc73b 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -60,7 +60,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual wxVisualAttributes GetDefaultAttributes() const; + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; // implementation // ------------- @@ -73,7 +73,7 @@ protected: // set the gauge value to the value of m_gaugePos void DoSetGauge(); - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; private: void Init() { m_rangeMax = m_gaugePos = 0; } diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index 01591149b5..e891a0a4c5 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -38,12 +38,12 @@ public: const int *attribList = NULL, const wxPalette& palette = wxNullPalette); - virtual bool SetBackgroundStyle(wxBackgroundStyle style); + virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; // implement wxGLCanvasX11 methods // -------------------------------- - virtual Window GetXWindow() const; + virtual Window GetXWindow() const wxOVERRIDE; // deprecated methods @@ -90,7 +90,7 @@ public: #endif // WXWIN_COMPATIBILITY_2_8 // implementation from now on - void OnInternalIdle(); + void OnInternalIdle() wxOVERRIDE; bool m_exposed; #ifdef __WXGTK3__ diff --git a/include/wx/gtk/hyperlink.h b/include/wx/gtk/hyperlink.h index 0b6ce6bf9a..25464d6e47 100644 --- a/include/wx/gtk/hyperlink.h +++ b/include/wx/gtk/hyperlink.h @@ -46,25 +46,25 @@ public: // get/set - virtual wxColour GetHoverColour() const; - virtual void SetHoverColour(const wxColour &colour); + virtual wxColour GetHoverColour() const wxOVERRIDE; + virtual void SetHoverColour(const wxColour &colour) wxOVERRIDE; - virtual wxColour GetNormalColour() const; - virtual void SetNormalColour(const wxColour &colour); + virtual wxColour GetNormalColour() const wxOVERRIDE; + virtual void SetNormalColour(const wxColour &colour) wxOVERRIDE; - virtual wxColour GetVisitedColour() const; - virtual void SetVisitedColour(const wxColour &colour); + virtual wxColour GetVisitedColour() const wxOVERRIDE; + virtual void SetVisitedColour(const wxColour &colour) wxOVERRIDE; - virtual wxString GetURL() const; - virtual void SetURL(const wxString &url); + virtual wxString GetURL() const wxOVERRIDE; + virtual void SetURL(const wxString &url) wxOVERRIDE; - virtual void SetLabel(const wxString &label); + virtual void SetLabel(const wxString &label) wxOVERRIDE; protected: - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl) }; diff --git a/include/wx/gtk/infobar.h b/include/wx/gtk/infobar.h index 45563eb275..b8f24043a7 100644 --- a/include/wx/gtk/infobar.h +++ b/include/wx/gtk/infobar.h @@ -38,14 +38,14 @@ public: // ---------------------------- virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION); + int flags = wxICON_INFORMATION) wxOVERRIDE; - virtual void Dismiss(); + virtual void Dismiss() wxOVERRIDE; virtual void AddButton(wxWindowID btnid, - const wxString& label = wxString()); + const wxString& label = wxString()) wxOVERRIDE; - virtual void RemoveButton(wxWindowID btnid); + virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE; // implementation only // ------------------- @@ -53,7 +53,7 @@ public: void GTKResponse(int btnid); protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; private: void Init() { m_impl = NULL; } diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h index c40bda6a27..22960abe6f 100644 --- a/include/wx/gtk/listbox.h +++ b/include/wx/gtk/listbox.h @@ -63,25 +63,25 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; + virtual unsigned int GetCount() const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - virtual bool IsSelected(int n) const; - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; + virtual bool IsSelected(int n) const wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; + virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; - virtual void EnsureVisible(int n); + virtual void EnsureVisible(int n) wxOVERRIDE; - virtual void Update(); + virtual void Update() wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // implementation from now on - virtual GtkWidget *GetConnectWidget(); + virtual GtkWidget *GetConnectWidget() wxOVERRIDE; struct _GtkTreeView *m_treeview; struct _GtkListStore *m_liststore; @@ -99,23 +99,23 @@ public: void GTKOnActivated(int item); protected: - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual void DoSetSelection(int n, bool select); + virtual void DoSetSelection(int n, bool select) wxOVERRIDE; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type); - virtual int DoInsertOneItem(const wxString& item, unsigned int pos); + void **clientData, wxClientDataType type) wxOVERRIDE; + virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE; - virtual void DoSetFirstItem(int n); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - virtual int DoListHitTest(const wxPoint& point) const; + virtual void DoSetFirstItem(int n) wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; + virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; // get the iterator for the given index, returns false if invalid bool GTKGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const; diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 02a61eb899..380fab2da5 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -49,13 +49,13 @@ public: // we don't store the active child in m_currentChild unlike the base class // version so override this method to find it dynamically - virtual wxMDIChildFrame *GetActiveChild() const; + virtual wxMDIChildFrame *GetActiveChild() const wxOVERRIDE; // implement base class pure virtuals // ---------------------------------- - virtual void ActivateNext(); - virtual void ActivatePrevious(); + virtual void ActivateNext() wxOVERRIDE; + virtual void ActivatePrevious() wxOVERRIDE; static bool IsTDI() { return true; } @@ -63,10 +63,10 @@ public: bool m_justInserted; - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; protected: - virtual void DoGetClientSize(int* width, int* height) const; + virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE; private: friend class wxMDIChildFrame; @@ -106,18 +106,18 @@ public: virtual ~wxMDIChildFrame(); - virtual void SetMenuBar( wxMenuBar *menu_bar ); - virtual wxMenuBar *GetMenuBar() const; + virtual void SetMenuBar( wxMenuBar *menu_bar ) wxOVERRIDE; + virtual wxMenuBar *GetMenuBar() const wxOVERRIDE; - virtual void Activate(); + virtual void Activate() wxOVERRIDE; - virtual void SetTitle(const wxString& title); + virtual void SetTitle(const wxString& title) wxOVERRIDE; // implementation void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event ); - virtual void GTKHandleRealized(); + virtual void GTKHandleRealized() wxOVERRIDE; wxMenuBar *m_menuBar; bool m_justInserted; @@ -142,10 +142,10 @@ public: ~wxMDIClientWindow(); virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); + long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; private: - virtual void AddChildGTK(wxWindowGTK* child); + virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) }; diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index fec12ba977..97df608564 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -23,25 +23,25 @@ public: ~wxMenuBar(); // implement base class (pure) virtuals - 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 int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; + const wxString& itemString) const wxOVERRIDE; + virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const 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 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; - void SetLayoutDirection(wxLayoutDirection dir); - wxLayoutDirection GetLayoutDirection() const; + void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; + wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; - virtual void Attach(wxFrame *frame); - virtual void Detach(); + virtual void Attach(wxFrame *frame) wxOVERRIDE; + virtual void Detach() wxOVERRIDE; private: // common part of Append and Insert @@ -51,7 +51,7 @@ private: // wxMenuBar is not a top level window but it still doesn't need a parent // window - virtual bool GTKNeedsParent() const { return false; } + virtual bool GTKNeedsParent() const wxOVERRIDE { return false; } GtkWidget* m_menubar; @@ -73,7 +73,7 @@ public: virtual ~wxMenu(); - void Attach(wxMenuBarBase *menubar); + void Attach(wxMenuBarBase *menubar) wxOVERRIDE; void SetLayoutDirection(const wxLayoutDirection dir); wxLayoutDirection GetLayoutDirection() const; @@ -82,7 +82,7 @@ public: wxString GetTitle() const; // Sets the title, with mnemonics translated to gtk format - virtual void SetTitle(const wxString& title); + virtual void SetTitle(const wxString& title) wxOVERRIDE; // implementation GTK only GtkWidget *m_menu; // GtkMenu @@ -91,9 +91,9 @@ public: bool m_popupShown; protected: - 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 code for all constructors: diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index c17ad03a97..61cd61627e 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -27,10 +27,10 @@ public: virtual ~wxMenuItem(); // implement base class virtuals - virtual void SetItemLabel( const wxString& str ); - virtual void Enable( bool enable = true ); - virtual void Check( bool check = true ); - virtual bool IsChecked() const; + virtual void SetItemLabel( const wxString& str ) wxOVERRIDE; + virtual void Enable( bool enable = true ) wxOVERRIDE; + virtual void Check( bool check = true ) wxOVERRIDE; + virtual bool IsChecked() const wxOVERRIDE; virtual void SetBitmap(const wxBitmap& bitmap); virtual const wxBitmap& GetBitmap() const { return m_bitmap; } diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h index 748f266a9a..66f3d07596 100644 --- a/include/wx/gtk/minifram.h +++ b/include/wx/gtk/minifram.h @@ -42,13 +42,13 @@ public: long style = wxCAPTION | wxRESIZE_BORDER, const wxString& name = wxFrameNameStr); - virtual void SetTitle( const wxString &title ); + virtual void SetTitle( const wxString &title ) wxOVERRIDE; protected: virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH ); - virtual void DoGetClientSize(int* width, int* height) const; + int incW, int incH ) wxOVERRIDE; + virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE; // implementation public: diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h index 670d7f9782..4aa1c93767 100644 --- a/include/wx/gtk/msgdlg.h +++ b/include/wx/gtk/msgdlg.h @@ -19,27 +19,27 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - virtual int ShowModal(); - virtual bool Show(bool WXUNUSED(show) = true) { return false; } + virtual int ShowModal() wxOVERRIDE; + virtual bool Show(bool WXUNUSED(show) = true) wxOVERRIDE { return false; } protected: // implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} + int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} // override to convert wx mnemonics to GTK+ ones and handle stock ids - virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label); + virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label) wxOVERRIDE; private: // override to use stock GTK+ defaults instead of just string ones - virtual wxString GetDefaultYesLabel() const; - virtual wxString GetDefaultNoLabel() const; - virtual wxString GetDefaultOKLabel() const; - virtual wxString GetDefaultCancelLabel() const; - virtual wxString GetDefaultHelpLabel() const; + virtual wxString GetDefaultYesLabel() const wxOVERRIDE; + virtual wxString GetDefaultNoLabel() const wxOVERRIDE; + virtual wxString GetDefaultOKLabel() const wxOVERRIDE; + virtual wxString GetDefaultCancelLabel() const wxOVERRIDE; + virtual wxString GetDefaultHelpLabel() const wxOVERRIDE; // create the real GTK+ dialog: this is done from ShowModal() to allow // changing the message between constructing the dialog and showing it diff --git a/include/wx/gtk/nonownedwnd.h b/include/wx/gtk/nonownedwnd.h index 70e853c1ce..bc4687b5c5 100644 --- a/include/wx/gtk/nonownedwnd.h +++ b/include/wx/gtk/nonownedwnd.h @@ -23,13 +23,13 @@ public: virtual ~wxNonOwnedWindow(); // Overridden to actually set the shape when the window becomes realized. - virtual void GTKHandleRealized(); + virtual void GTKHandleRealized() wxOVERRIDE; protected: - 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 diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 6edbb84fb1..63384d6d3f 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -51,35 +51,35 @@ public: // set the currently selected page, return the index of the previously // selected one (or wxNOT_FOUND on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } + int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } // get the currently selected page - int GetSelection() const; + int GetSelection() const wxOVERRIDE; // changes selected page without sending events - int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } + int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; + bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; + wxString GetPageText(size_t nPage) const wxOVERRIDE; // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); + int GetPageImage(size_t nPage) const wxOVERRIDE; + bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; // control the appearance of the notebook pages // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); + void SetPadding(const wxSize& padding) wxOVERRIDE; // sets the size of the tabs (assumes all tabs are the same size) - void SetTabSize(const wxSize& sz); + void SetTabSize(const wxSize& sz) wxOVERRIDE; // geometry - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; // operations // ---------- // remove all pages - bool DeleteAllPages(); + bool DeleteAllPages() wxOVERRIDE; // adds a new page to the notebook (it will be deleted by the notebook, // don't delete it yourself). If bSelect, this page becomes active. @@ -88,7 +88,7 @@ public: wxNotebookPage *win, const wxString& strText, bool bSelect = false, - int imageId = NO_IMAGE ); + int imageId = NO_IMAGE ) wxOVERRIDE; // handler for tab navigation // -------------------------- @@ -102,8 +102,8 @@ public: // -------------- #if wxUSE_CONSTRAINTS - void SetConstraintSizes(bool recurse); - bool DoPhase(int phase); + void SetConstraintSizes(bool recurse) wxOVERRIDE; + bool DoPhase(int phase) wxOVERRIDE; #endif // Called by GTK event handler when the current page is definitely changed. @@ -122,20 +122,20 @@ public: protected: // set all page's attributes - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; // remove one page from the notebook but do not destroy it - virtual wxNotebookPage *DoRemovePage(size_t nPage); + virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE; - int DoSetSelection(size_t nPage, int flags = 0); + int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; private: // the padding set by SetPadding() int m_padding; void Init(); - virtual void AddChildGTK(wxWindowGTK* child); + virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxNotebook) DECLARE_EVENT_TABLE() diff --git a/include/wx/gtk/notifmsg.h b/include/wx/gtk/notifmsg.h index 9135b3aee8..6547a5f90b 100644 --- a/include/wx/gtk/notifmsg.h +++ b/include/wx/gtk/notifmsg.h @@ -32,8 +32,8 @@ public: virtual ~wxNotificationMessage(); - virtual bool Show(int timeout = Timeout_Auto); - virtual bool Close(); + virtual bool Show(int timeout = Timeout_Auto) wxOVERRIDE; + virtual bool Close() wxOVERRIDE; // Set the name of the icon to use, overriding the default icon determined // by the flags. Call with empty string to reset custom icon. diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 33db6c89af..38f6544d80 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -27,24 +27,24 @@ public: bool operator==(const wxPen& pen) const; bool operator!=(const wxPen& pen) const { return !(*this == pen); } - void SetColour( const wxColour &colour ); - void SetColour( unsigned char red, unsigned char green, unsigned char blue ); - void SetCap( wxPenCap capStyle ); - void SetJoin( wxPenJoin joinStyle ); - void SetStyle( wxPenStyle style ); - void SetWidth( int width ); - void SetDashes( int number_of_dashes, const wxDash *dash ); - void SetStipple(const wxBitmap& stipple); + void SetColour( const wxColour &colour ) wxOVERRIDE; + void SetColour( unsigned char red, unsigned char green, unsigned char blue ) wxOVERRIDE; + void SetCap( wxPenCap capStyle ) wxOVERRIDE; + void SetJoin( wxPenJoin joinStyle ) wxOVERRIDE; + void SetStyle( wxPenStyle style ) wxOVERRIDE; + void SetWidth( int width ) wxOVERRIDE; + void SetDashes( int number_of_dashes, const wxDash *dash ) wxOVERRIDE; + void SetStipple(const wxBitmap& stipple) wxOVERRIDE; - wxColour GetColour() const; - wxPenCap GetCap() const; - wxPenJoin GetJoin() const; - wxPenStyle GetStyle() const; - int GetWidth() const; - int GetDashes(wxDash **ptr) const; + wxColour GetColour() const wxOVERRIDE; + wxPenCap GetCap() const wxOVERRIDE; + wxPenJoin GetJoin() const wxOVERRIDE; + wxPenStyle GetStyle() const wxOVERRIDE; + int GetWidth() const wxOVERRIDE; + int GetDashes(wxDash **ptr) const wxOVERRIDE; int GetDashCount() const; wxDash* GetDash() const; - wxBitmap *GetStipple() const; + wxBitmap *GetStipple() const wxOVERRIDE; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") @@ -54,8 +54,8 @@ public: void SetStyle(int style) { SetStyle((wxPenStyle)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; DECLARE_DYNAMIC_CLASS(wxPen) }; diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h index 1c848795b9..26c8096300 100644 --- a/include/wx/gtk/popupwin.h +++ b/include/wx/gtk/popupwin.h @@ -24,9 +24,9 @@ public: { (void)Create(parent, flags); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - virtual bool Show(bool show = true); + virtual bool Show(bool show = true) wxOVERRIDE; - virtual void SetFocus(); + virtual void SetFocus() wxOVERRIDE; // implementation // -------------- @@ -37,9 +37,9 @@ public: protected: virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height); + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; #ifdef __WXUNIVERSAL__ DECLARE_EVENT_TABLE() diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h index e4eae1cef3..ac17d52e83 100644 --- a/include/wx/gtk/print.h +++ b/include/wx/gtk/print.h @@ -33,34 +33,34 @@ typedef struct _cairo cairo_t; class wxGtkPrintFactory: public wxPrintFactory { public: - virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ); + virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ) wxOVERRIDE; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ); + wxPrintDialogData *data = NULL ) wxOVERRIDE; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout, - wxPrintData *data ); + wxPrintData *data ) wxOVERRIDE; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ); + wxPrintDialogData *data = NULL ) wxOVERRIDE; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ); + wxPrintData *data ) wxOVERRIDE; virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ); + wxPageSetupDialogData * data = NULL ) wxOVERRIDE; - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ); + virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxOVERRIDE; - virtual bool HasPrintSetupDialog(); - virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ); - virtual bool HasOwnPrintToFile(); - virtual bool HasPrinterLine(); - virtual wxString CreatePrinterLine(); - virtual bool HasStatusLine(); - virtual wxString CreateStatusLine(); + virtual bool HasPrintSetupDialog() wxOVERRIDE; + virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) wxOVERRIDE; + virtual bool HasOwnPrintToFile() wxOVERRIDE; + virtual bool HasPrinterLine() wxOVERRIDE; + virtual wxString CreatePrinterLine() wxOVERRIDE; + virtual bool HasStatusLine() wxOVERRIDE; + virtual wxString CreateStatusLine() wxOVERRIDE; - virtual wxPrintNativeDataBase *CreatePrintNativeData(); + virtual wxPrintNativeDataBase *CreatePrintNativeData() wxOVERRIDE; }; //---------------------------------------------------------------------------- @@ -75,19 +75,19 @@ public: wxGtkPrintDialog( wxWindow *parent, wxPrintData* data); virtual ~wxGtkPrintDialog(); - wxPrintData& GetPrintData() + wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); } - wxPrintDialogData& GetPrintDialogData() + wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; } - wxDC *GetPrintDC() { return m_dc; } + wxDC *GetPrintDC() wxOVERRIDE { return m_dc; } void SetPrintDC(wxDC * printDC) { m_dc = printDC; } - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; - virtual bool Validate() { return true; } - virtual bool TransferDataToWindow() { return true; } - virtual bool TransferDataFromWindow() { return true; } + virtual bool Validate() wxOVERRIDE { return true; } + virtual bool TransferDataToWindow() wxOVERRIDE { return true; } + virtual bool TransferDataFromWindow() wxOVERRIDE { return true; } void SetShowDialog(bool show) { m_showDialog = show; } bool GetShowDialog() { return m_showDialog; } @@ -97,9 +97,9 @@ protected: // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} + int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} private: wxPrintDialogData m_printDialogData; @@ -121,22 +121,22 @@ public: wxPageSetupDialogData* data = NULL ); virtual ~wxGtkPageSetupDialog(); - virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageDialogData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE { return m_pageDialogData; } - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; - virtual bool Validate() { return true; } - virtual bool TransferDataToWindow() { return true; } - virtual bool TransferDataFromWindow() { return true; } + virtual bool Validate() wxOVERRIDE { return true; } + virtual bool TransferDataToWindow() wxOVERRIDE { return true; } + virtual bool TransferDataFromWindow() wxOVERRIDE { return true; } protected: // Implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} + int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} private: wxPageSetupDialogData m_pageDialogData; @@ -157,9 +157,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; GtkPrintContext *GetPrintContext() { return m_gpc; } void SetPrintContext(GtkPrintContext *context) {m_gpc = context;} @@ -184,11 +184,11 @@ public: wxGtkPrintNativeData(); virtual ~wxGtkPrintNativeData(); - 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 Ok() const { return IsOk(); } - virtual bool IsOk() const { return true; } + virtual bool Ok() const wxOVERRIDE { return IsOk(); } + virtual bool IsOk() const wxOVERRIDE { return true; } GtkPrintSettings* GetPrintConfig() { return m_config; } void SetPrintConfig( GtkPrintSettings * config ); @@ -224,75 +224,75 @@ public: virtual ~wxGtkPrinterDCImpl(); bool Ok() const { return IsOk(); } - bool IsOk() const; + bool IsOk() const wxOVERRIDE; - virtual void* GetCairoContext() const; - virtual void* GetHandle() const; + virtual void* GetCairoContext() const wxOVERRIDE; + virtual void* GetHandle() const wxOVERRIDE; - bool CanDrawBitmap() const { return true; } - void Clear(); - void SetFont( const wxFont& font ); - void SetPen( const wxPen& pen ); - void SetBrush( const wxBrush& brush ); - void SetLogicalFunction( wxRasterOperationMode function ); - void SetBackground( const wxBrush& brush ); - void DestroyClippingRegion(); - bool StartDoc(const wxString& message); - void EndDoc(); - void StartPage(); - void EndPage(); - wxCoord GetCharHeight() const; - wxCoord GetCharWidth() const; - bool CanGetTextExtent() const { return true; } - wxSize GetPPI() const; - virtual int GetDepth() const { return 24; } - void SetBackgroundMode(int mode); - void SetPalette(const wxPalette& WXUNUSED(palette)) { } + bool CanDrawBitmap() const wxOVERRIDE { return true; } + void Clear() wxOVERRIDE; + void SetFont( const wxFont& font ) wxOVERRIDE; + void SetPen( const wxPen& pen ) wxOVERRIDE; + void SetBrush( const wxBrush& brush ) wxOVERRIDE; + void SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE; + void SetBackground( const wxBrush& brush ) wxOVERRIDE; + void DestroyClippingRegion() wxOVERRIDE; + bool StartDoc(const wxString& message) wxOVERRIDE; + void EndDoc() wxOVERRIDE; + void StartPage() wxOVERRIDE; + void EndPage() wxOVERRIDE; + wxCoord GetCharHeight() const wxOVERRIDE; + wxCoord GetCharWidth() const wxOVERRIDE; + bool CanGetTextExtent() const wxOVERRIDE { return true; } + wxSize GetPPI() const wxOVERRIDE; + virtual int GetDepth() const wxOVERRIDE { return 24; } + void SetBackgroundMode(int mode) wxOVERRIDE; + void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } void SetResolution(int ppi); // overridden for wxPrinterDC Impl - virtual int GetResolution() const; - virtual wxRect GetPaperRect() const; + virtual int GetResolution() const wxOVERRIDE; + virtual wxRect GetPaperRect() const wxOVERRIDE; protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - wxFloodFillStyle style=wxFLOOD_SURFACE ); - void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter); - void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST); - bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; - void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - void DoCrossHair(wxCoord x, wxCoord y); - void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc); - void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea); - void DoDrawPoint(wxCoord x, wxCoord y); - void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0); - void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE); - void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE); - void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0); - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + wxFloodFillStyle style=wxFLOOD_SURFACE ) wxOVERRIDE; + void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter) wxOVERRIDE; + void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST) wxOVERRIDE; + bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const wxOVERRIDE; + void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; + void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) wxOVERRIDE; + void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) wxOVERRIDE; + void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; + void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE; + void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE) wxOVERRIDE; + void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE) wxOVERRIDE; + void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0) wxOVERRIDE; + void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; #if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points); + void DoDrawSpline(const wxPointList *points) wxOVERRIDE; #endif bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); - void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ); - void DoDrawText(const wxString& text, wxCoord x, wxCoord y ); - void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) ) + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) wxOVERRIDE; + void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ) wxOVERRIDE; + void DoDrawText(const wxString& text, wxCoord x, wxCoord y ) wxOVERRIDE; + void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) wxOVERRIDE; + void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) ) wxOVERRIDE { wxFAIL_MSG( "not implemented" ); } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL ) const; - void DoGetSize(int* width, int* height) const; - void DoGetSizeMM(int *width, int *height) const; + const wxFont *theFont = NULL ) const wxOVERRIDE; + void DoGetSize(int* width, int* height) const wxOVERRIDE; + void DoGetSizeMM(int *width, int *height) const wxOVERRIDE; wxPrintData& GetPrintData() { return m_printData; } void SetPrintData(const wxPrintData& data); @@ -335,8 +335,8 @@ public: virtual ~wxGtkPrintPreview(); - virtual bool Print(bool interactive); - virtual void DetermineScaling(); + virtual bool Print(bool interactive) wxOVERRIDE; + virtual void DetermineScaling() wxOVERRIDE; private: void Init(wxPrintout *printout, diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index a7f6bd9125..7c32c97693 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -83,38 +83,38 @@ public: // implement wxItemContainerImmutable methods - virtual unsigned int GetCount() const; + virtual unsigned int GetCount() const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); + 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; // implement wxRadioBoxBase methods - virtual bool Show(unsigned int n, bool show = true); - virtual bool Enable(unsigned int n, bool enable = true); + virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; + virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; - virtual bool IsItemEnabled(unsigned int n) const; - virtual bool IsItemShown(unsigned int n) const; + virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; + virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; // override some base class methods to operate on radiobox itself too - virtual bool Show( bool show = true ); - virtual bool Enable( bool enable = true ); + virtual bool Show( bool show = true ) wxOVERRIDE; + virtual bool Enable( bool enable = true ) wxOVERRIDE; - virtual void SetLabel( const wxString& label ); + virtual void SetLabel( const wxString& label ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual int GetItemFromPoint( const wxPoint& pt ) const; + virtual int GetItemFromPoint( const wxPoint& pt ) const wxOVERRIDE; #if wxUSE_HELP // override virtual wxWindow::GetHelpTextAtPoint to use common platform independent // wxRadioBoxBase::DoGetHelpTextAtPoint from the platform independent // base class-interface wxRadioBoxBase. - virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const + virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const wxOVERRIDE { return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); } @@ -126,25 +126,25 @@ public: void GtkDisableEvents(); void GtkEnableEvents(); #if wxUSE_TOOLTIPS - virtual void GTKApplyToolTip(const char* tip); + virtual void GTKApplyToolTip(const char* tip) wxOVERRIDE; #endif // wxUSE_TOOLTIPS wxRadioBoxButtonsInfoList m_buttonsInfo; protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } #if wxUSE_TOOLTIPS - virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip); + virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) wxOVERRIDE; #endif - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual bool GTKNeedsToFilterSameWindowFocus() const { return true; } + virtual bool GTKNeedsToFilterSameWindowFocus() const wxOVERRIDE { return true; } - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); + virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxRadioBox) diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h index 165370aa12..34234d78d5 100644 --- a/include/wx/gtk/radiobut.h +++ b/include/wx/gtk/radiobut.h @@ -38,19 +38,19 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxRadioButtonNameStr ); - virtual void SetLabel(const wxString& label); + virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual void SetValue(bool val); virtual bool GetValue() const; - virtual bool Enable( bool enable = true ); + virtual bool Enable( bool enable = true ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; private: typedef wxControl base_type; diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index a2231a1950..513c4e390f 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -56,8 +56,8 @@ public: virtual ~wxRegion(); // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; + virtual void Clear() wxOVERRIDE; + virtual bool IsEmpty() const wxOVERRIDE; #ifdef __WXGTK3__ cairo_region_t* GetRegion() const; @@ -67,21 +67,21 @@ public: #endif 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; // wxRegionBase pure virtuals - 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 DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); + virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; + virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; + virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE; + virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE; + virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE; + virtual bool DoXor(const wxRegion& region) wxOVERRIDE; // common part of ctors for a rectangle region void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index e49bb7a2ce..73bb500453 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -33,13 +33,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); virtual ~wxScrollBar(); - int GetThumbPosition() const; - int GetThumbSize() const; - int GetPageSize() const; - int GetRange() const; - virtual void SetThumbPosition( int viewStart ); + int GetThumbPosition() const wxOVERRIDE; + int GetThumbSize() const wxOVERRIDE; + int GetPageSize() const wxOVERRIDE; + int GetRange() const wxOVERRIDE; + virtual void SetThumbPosition( int viewStart ) wxOVERRIDE; virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool refresh = true ); + bool refresh = true ) wxOVERRIDE; void SetThumbSize(int thumbSize); void SetPageSize( int pageLength ); diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h index f8833c4685..6f15468e94 100644 --- a/include/wx/gtk/slider.h +++ b/include/wx/gtk/slider.h @@ -41,20 +41,20 @@ public: const wxString& name = wxSliderNameStr); // implement the base class pure virtuals - 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 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; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -73,7 +73,7 @@ protected: GtkWidget *m_minLabel,*m_maxLabel; bool m_blockScrollEvent; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; // set the slider value unconditionally void GTKSetValue(int value); diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h index 4bd71f4746..25f1728ef5 100644 --- a/include/wx/gtk/spinbutt.h +++ b/include/wx/gtk/spinbutt.h @@ -35,16 +35,16 @@ public: long style = wxSP_VERTICAL, const wxString& name = wxSPIN_BUTTON_NAME); - virtual int GetValue() const; - virtual void SetValue( int value ); - virtual void SetRange( int minVal, int maxVal ); - virtual int GetMin() const; - virtual int GetMax() const; + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue( int value ) wxOVERRIDE; + virtual void SetRange( int minVal, int maxVal ) wxOVERRIDE; + virtual int GetMin() const wxOVERRIDE; + virtual int GetMax() const wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual bool Enable( bool enable = true ); + virtual bool Enable( bool enable = true ) wxOVERRIDE; // implementation int m_pos; @@ -53,8 +53,8 @@ protected: void GtkDisableEvents() const; void GtkEnableEvents() const; - virtual wxSize DoGetBestSize() const; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; private: typedef wxSpinButtonBase base_type; diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index ef7b6edb7d..db3f1b8b60 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -39,17 +39,17 @@ public: // T GetMin() const // T GetMax() const // T GetIncrement() const - virtual bool GetSnapToTicks() const; + virtual bool GetSnapToTicks() const wxOVERRIDE; // operations - virtual void SetValue(const wxString& value); + virtual void SetValue(const wxString& value) wxOVERRIDE; // void SetValue(T val) // void SetRange(T minVal, T maxVal) // void SetIncrement(T inc) - void SetSnapToTicks( bool snap_to_ticks ); + void SetSnapToTicks( bool snap_to_ticks ) wxOVERRIDE; // Select text in the textctrl - void SetSelection(long from, long to); + void SetSelection(long from, long to) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -71,13 +71,13 @@ protected: void GtkDisableEvents() const; void GtkEnableEvents() const; - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; // Widgets that use the style->base colour for the BG colour should // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } + virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } friend class wxSpinCtrlEventDisabler; @@ -126,13 +126,13 @@ public: int GetIncrement() const { return int(DoGetIncrement()); } // operations - void SetValue(const wxString& value) { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc + void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc void SetValue( int value ) { DoSetValue(value); } void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); } void SetIncrement(int inc) { DoSetIncrement(inc); } - virtual int GetBase() const { return m_base; } - virtual bool SetBase(int base); + virtual int GetBase() const wxOVERRIDE { return m_base; } + virtual bool SetBase(int base) wxOVERRIDE; private: // Common part of all ctors. @@ -190,14 +190,14 @@ public: unsigned GetDigits() const; // operations - void SetValue(const wxString& value) { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc + void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc void SetValue(double value) { DoSetValue(value); } void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } void SetIncrement(double inc) { DoSetIncrement(inc); } void SetDigits(unsigned digits); - virtual int GetBase() const { return 10; } - virtual bool SetBase(int WXUNUSED(base)) { return false; } + virtual int GetBase() const wxOVERRIDE { return 10; } + virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble) }; diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h index b7bba950d0..094dd02627 100644 --- a/include/wx/gtk/statbmp.h +++ b/include/wx/gtk/statbmp.h @@ -34,12 +34,12 @@ public: long style = 0, const wxString& name = wxStaticBitmapNameStr); - virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); } - virtual void SetBitmap( const wxBitmap& bitmap ); - virtual wxBitmap GetBitmap() const { return m_bitmap; } + virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetBitmap( icon ); } + virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE; + virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } // for compatibility with wxMSW - wxIcon GetIcon() const + wxIcon GetIcon() const wxOVERRIDE { // don't use wxDynamicCast, icons and bitmaps are really the same thing // in wxGTK diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h index 80dbb7f594..3158fb1590 100644 --- a/include/wx/gtk/statbox.h +++ b/include/wx/gtk/statbox.h @@ -32,24 +32,24 @@ public: long style = 0, const wxString &name = wxStaticBoxNameStr ); - virtual void SetLabel( const wxString &label ); + virtual void SetLabel( const wxString &label ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // implementation - virtual bool GTKIsTransparentForMouse() const { return true; } + virtual bool GTKIsTransparentForMouse() const wxOVERRIDE { return true; } - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; - virtual void AddChild( wxWindowBase *child ); + virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; protected: - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); + virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; - void DoApplyWidgetStyle(GtkRcStyle *style); + void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxStaticBox) }; diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h index f6d88cb83a..bc5e50f310 100644 --- a/include/wx/gtk/stattext.h +++ b/include/wx/gtk/stattext.h @@ -33,9 +33,9 @@ public: long style = 0, const wxString &name = wxStaticTextNameStr ); - void SetLabel( const wxString &label ); + void SetLabel( const wxString &label ) wxOVERRIDE; - bool SetFont( const wxFont &font ); + bool SetFont( const wxFont &font ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -44,15 +44,15 @@ public: // -------------- protected: - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); + virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxString DoGetLabel() const; - virtual void DoSetLabel(const wxString& str); + virtual wxString DoGetLabel() const wxOVERRIDE; + virtual void DoSetLabel(const wxString& str) wxOVERRIDE; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); + virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; #endif // wxUSE_MARKUP private: diff --git a/include/wx/gtk/taskbar.h b/include/wx/gtk/taskbar.h index 03bd8daff0..1b358edda6 100644 --- a/include/wx/gtk/taskbar.h +++ b/include/wx/gtk/taskbar.h @@ -15,9 +15,9 @@ class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase public: wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); ~wxTaskBarIcon(); - virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxString()); - virtual bool RemoveIcon(); - virtual bool PopupMenu(wxMenu* menu); + virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxString()) wxOVERRIDE; + virtual bool RemoveIcon() wxOVERRIDE; + virtual bool PopupMenu(wxMenu* menu) wxOVERRIDE; bool IsOk() const { return true; } bool IsIconInstalled() const; diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 9fefd91975..d1eaaec20a 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -43,59 +43,59 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual void WriteText(const wxString& text); - virtual wxString GetValue() const; + virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual wxString GetValue() const wxOVERRIDE; virtual bool IsEmpty() const; - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; + virtual int GetLineLength(long lineNo) const wxOVERRIDE; + virtual wxString GetLineText(long lineNo) const wxOVERRIDE; + virtual int GetNumberOfLines() const wxOVERRIDE; - virtual bool IsModified() const; - virtual bool IsEditable() const; + virtual bool IsModified() const wxOVERRIDE; + virtual bool IsEditable() const wxOVERRIDE; - virtual void GetSelection(long* from, long* to) const; + virtual void GetSelection(long* from, long* to) const wxOVERRIDE; - virtual void Remove(long from, long to); + virtual void Remove(long from, long to) wxOVERRIDE; - virtual void MarkDirty(); - virtual void DiscardEdits(); + 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 SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; + virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; // translate between the position (which is just an index in the text ctrl // considering all its contents as a single strings) and (x, y) coordinates // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; + virtual long XYToPosition(long x, long y) const wxOVERRIDE; + virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - virtual void ShowPosition(long pos); + virtual void ShowPosition(long pos) wxOVERRIDE; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const + wxTextCoord *row) const wxOVERRIDE { return wxTextCtrlBase::HitTest(pt, col, row); } // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); + virtual void Copy() wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; // Insertion point - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; + virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual long GetInsertionPoint() const wxOVERRIDE; + virtual wxTextPos GetLastPosition() const wxOVERRIDE; - 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; // Overridden wxWindow methods - virtual void SetWindowStyleFlag( long style ); - virtual bool Enable( bool enable = true ); + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual bool Enable( bool enable = true ) wxOVERRIDE; // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); @@ -113,11 +113,11 @@ public: void OnUpdateUndo(wxUpdateUIEvent& event); void OnUpdateRedo(wxUpdateUIEvent& event); - bool SetFont(const wxFont& font); - bool SetForegroundColour(const wxColour& colour); - bool SetBackgroundColour(const wxColour& colour); + bool SetFont(const wxFont& font) wxOVERRIDE; + bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; + bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - GtkWidget* GetConnectWidget(); + GtkWidget* GetConnectWidget() wxOVERRIDE; void SetUpdateFont(bool WXUNUSED(update)) { } @@ -137,7 +137,7 @@ public: bool MarkDirtyOnChange(); // always let GTK have mouse release events for multiline controls - virtual bool GTKProcessEvent(wxEvent& event) const; + virtual bool GTKProcessEvent(wxEvent& event) const wxOVERRIDE; static wxVisualAttributes @@ -145,26 +145,26 @@ public: protected: // overridden wxWindow virtual methods - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual void DoFreeze(); - virtual void DoThaw(); + virtual void DoFreeze() wxOVERRIDE; + virtual void DoThaw() wxOVERRIDE; // Widgets that use the style->base colour for the BG colour should // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } + virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } - virtual void DoSetValue(const wxString &value, int flags = 0); + virtual void DoSetValue(const wxString &value, int flags = 0) wxOVERRIDE; // Override this to use either GtkEntry or GtkTextView IME depending on the // kind of control we are. - virtual int GTKIMFilterKeypress(GdkEventKey* event) const; + virtual int GTKIMFilterKeypress(GdkEventKey* event) const wxOVERRIDE; - virtual wxPoint DoPositionToCoords(long pos) const; + virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE; // wrappers hiding the differences between functions doing the same thing // for GtkTextView and GtkEntry (all of them use current window style to @@ -179,9 +179,9 @@ private: void Init(); // overridden wxTextEntry virtual methods - virtual GtkEditable *GetEditable() const; - virtual GtkEntry *GetEntry() const; - virtual void EnableTextChangedEvents(bool enable); + virtual GtkEditable *GetEditable() const wxOVERRIDE; + virtual GtkEntry *GetEntry() const wxOVERRIDE; + virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; // change the font for everything in this control void ChangeFontGlobally(); diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h index 3d9da824ec..89177673c3 100644 --- a/include/wx/gtk/textentry.h +++ b/include/wx/gtk/textentry.h @@ -24,33 +24,33 @@ public: wxTextEntry() { } // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text); - virtual void Remove(long from, long to); + virtual void WriteText(const wxString& text) wxOVERRIDE; + 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; - virtual void SetMaxLength(unsigned long len); + virtual void SetMaxLength(unsigned long len) wxOVERRIDE; #ifdef __WXGTK3__ - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; + virtual bool SetHint(const wxString& hint) wxOVERRIDE; + virtual wxString GetHint() const wxOVERRIDE; #endif // implementation only from now on @@ -66,14 +66,14 @@ protected: void GTKConnectInsertTextSignal(GtkEntry* entry); - virtual void DoSetValue(const wxString& value, int flags); - virtual wxString DoGetValue() const; + virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; + virtual wxString DoGetValue() const wxOVERRIDE; // margins functions - virtual bool DoSetMargins(const wxPoint& pt); - virtual wxPoint DoGetMargins() const; + virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; + virtual wxPoint DoGetMargins() const wxOVERRIDE; - virtual bool DoAutoCompleteStrings(const wxArrayString& choices); + virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE; // Override the base class method to use GtkEntry IM context. virtual int GTKIMFilterKeypress(GdkEventKey* event) const; diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index d6975311f4..9100cf3f3d 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -45,11 +45,11 @@ public: const wxString& name = wxCheckBoxNameStr); // Get/set the value - void SetValue(bool state); - bool GetValue() const; + void SetValue(bool state) wxOVERRIDE; + bool GetValue() const wxOVERRIDE; // Set the label - void SetLabel(const wxString& label); + void SetLabel(const wxString& label) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -58,11 +58,11 @@ protected: void GTKDisableEvents(); void GTKEnableEvents(); - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); + virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; #endif // wxUSE_MARKUP private: @@ -108,7 +108,7 @@ public: wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), SetBitmapLabel(bitmap); ) // prevent virtual function hiding - virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } + virtual void SetLabel(const wxString& label) wxOVERRIDE { wxToggleButton::SetLabel(label); } private: typedef wxToggleButtonBase base_type; diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h index d504b6c2e8..c7e4d245ce 100644 --- a/include/wx/gtk/toolbar.h +++ b/include/wx/gtk/toolbar.h @@ -9,8 +9,6 @@ #ifndef _WX_GTK_TOOLBAR_H_ #define _WX_GTK_TOOLBAR_H_ -#if wxUSE_TOOLBAR - typedef struct _GtkTooltips GtkTooltips; // ---------------------------------------------------------------------------- @@ -43,16 +41,16 @@ public: virtual ~wxToolBar(); - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual void SetToolShortHelp(int id, const wxString& helpString); + virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; - virtual void SetWindowStyleFlag( long style ); + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); - virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); + virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; + virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE; - virtual bool Realize(); + virtual bool Realize() wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -64,33 +62,33 @@ public: wxItemKind kind = wxITEM_NORMAL, wxObject *clientData = NULL, const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString); + const wxString& longHelpString = wxEmptyString) wxOVERRIDE; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); + const wxString& label) wxOVERRIDE; // implementation from now on // -------------------------- protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_DEFAULT; } - virtual wxSize DoGetBestSize() const; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; private: void Init(); void GtkSetStyle(); GSList* GetRadioGroup(size_t pos); - virtual void AddChildGTK(wxWindowGTK* child); + virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; GtkToolbar* m_toolbar; GtkTooltips* m_tooltips; @@ -98,7 +96,5 @@ private: DECLARE_DYNAMIC_CLASS(wxToolBar) }; -#endif // wxUSE_TOOLBAR - #endif // _WX_GTK_TOOLBAR_H_ diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index 9f9374b06b..36fc1ee61d 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -43,38 +43,38 @@ public: virtual ~wxTopLevelWindowGTK(); // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void SetIcons(const wxIconBundle& icons); - virtual void Restore(); + virtual void Maximize(bool maximize = true) wxOVERRIDE; + virtual bool IsMaximized() const wxOVERRIDE; + virtual void Iconize(bool iconize = true) wxOVERRIDE; + virtual bool IsIconized() const wxOVERRIDE; + virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; + virtual void Restore() wxOVERRIDE; - virtual bool EnableCloseButton(bool enable = true); + virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE; - virtual void ShowWithoutActivating(); - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; } + virtual void ShowWithoutActivating() wxOVERRIDE; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + virtual bool IsFullScreen() const wxOVERRIDE { return m_fsIsShowing; } - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; - virtual void SetWindowStyleFlag( long style ); + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual bool Show(bool show = true); + virtual bool Show(bool show = true) wxOVERRIDE; - virtual void Raise(); + virtual void Raise() wxOVERRIDE; - virtual bool IsActive(); + virtual bool IsActive() wxOVERRIDE; - virtual void SetTitle( const wxString &title ); - virtual wxString GetTitle() const { return m_title; } + virtual void SetTitle( const wxString &title ) wxOVERRIDE; + virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - virtual void SetLabel(const wxString& label) { SetTitle( label ); } - virtual wxString GetLabel() const { return GetTitle(); } + virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } + virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } - virtual bool SetTransparent(wxByte alpha); - virtual bool CanSetTransparent(); + virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; + virtual bool CanSetTransparent() wxOVERRIDE; // Experimental, to allow help windows to be // viewable from within modal dialogs @@ -84,15 +84,15 @@ public: virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); + const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; // implementation from now on // -------------------------- // GTK callbacks - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; - virtual void GTKHandleRealized(); + virtual void GTKHandleRealized() wxOVERRIDE; void GTKConfigureEvent(int x, int y); @@ -132,17 +132,17 @@ protected: // of the TLW can be changed by dragging virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH); + int incW, int incH) wxOVERRIDE; // move the window to the specified location and resize it - virtual void DoMoveWindow(int x, int y, int width, int height); + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; // take into account WM decorations here virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height); - virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; // string shown in the title bar wxString m_title; diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h index e1a01bf811..48518369e6 100644 --- a/include/wx/gtk/webview_webkit.h +++ b/include/wx/gtk/webview_webkit.h @@ -42,11 +42,11 @@ public: const wxString& url = wxWebViewDefaultURLStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr); + const wxString& name = wxWebViewNameStr) wxOVERRIDE; virtual ~wxWebViewWebKit(); - virtual bool Enable( bool enable = true ); + virtual bool Enable( bool enable = true ) wxOVERRIDE; // implementation // -------------- @@ -54,68 +54,68 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual void Stop(); - virtual void LoadURL(const wxString& url); - virtual void GoBack(); - virtual void GoForward(); - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT); - virtual bool CanGoBack() const; - virtual bool CanGoForward() const; - virtual void ClearHistory(); - virtual void EnableContextMenu(bool enable = true); - virtual void EnableHistory(bool enable = true); - virtual wxVector > GetBackwardHistory(); - virtual wxVector > GetForwardHistory(); - virtual void LoadHistoryItem(wxSharedPtr item); - virtual wxString GetCurrentURL() const; - virtual wxString GetCurrentTitle() const; - virtual wxString GetPageSource() const; - virtual wxString GetPageText() const; - virtual void Print(); - virtual bool IsBusy() const; + virtual void Stop() wxOVERRIDE; + virtual void LoadURL(const wxString& url) wxOVERRIDE; + virtual void GoBack() wxOVERRIDE; + virtual void GoForward() wxOVERRIDE; + virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; + virtual bool CanGoBack() const wxOVERRIDE; + virtual bool CanGoForward() const wxOVERRIDE; + virtual void ClearHistory() wxOVERRIDE; + virtual void EnableContextMenu(bool enable = true) wxOVERRIDE; + virtual void EnableHistory(bool enable = true) wxOVERRIDE; + virtual wxVector > GetBackwardHistory() wxOVERRIDE; + virtual wxVector > GetForwardHistory() wxOVERRIDE; + virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; + virtual wxString GetCurrentURL() const wxOVERRIDE; + virtual wxString GetCurrentTitle() const wxOVERRIDE; + virtual wxString GetPageSource() const wxOVERRIDE; + virtual wxString GetPageText() const wxOVERRIDE; + virtual void Print() wxOVERRIDE; + virtual bool IsBusy() const wxOVERRIDE; - void SetZoomType(wxWebViewZoomType); - wxWebViewZoomType GetZoomType() const; - bool CanSetZoomType(wxWebViewZoomType) const; - virtual wxWebViewZoom GetZoom() const; - virtual void SetZoom(wxWebViewZoom); + void SetZoomType(wxWebViewZoomType) wxOVERRIDE; + wxWebViewZoomType GetZoomType() const wxOVERRIDE; + bool CanSetZoomType(wxWebViewZoomType) const wxOVERRIDE; + virtual wxWebViewZoom GetZoom() const wxOVERRIDE; + virtual void SetZoom(wxWebViewZoom) wxOVERRIDE; //Clipboard functions - virtual bool CanCut() const; - virtual bool CanCopy() const; - virtual bool CanPaste() const; - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); + virtual bool CanCut() const wxOVERRIDE; + virtual bool CanCopy() const wxOVERRIDE; + virtual bool CanPaste() const wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Copy() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; //Undo / redo functionality - virtual bool CanUndo() const; - virtual bool CanRedo() const; - virtual void Undo(); - virtual void Redo(); + virtual bool CanUndo() const wxOVERRIDE; + virtual bool CanRedo() const wxOVERRIDE; + virtual void Undo() wxOVERRIDE; + virtual void Redo() wxOVERRIDE; //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT); + virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE; //Editing functions - virtual void SetEditable(bool enable = true); - virtual bool IsEditable() const; + virtual void SetEditable(bool enable = true) wxOVERRIDE; + virtual bool IsEditable() const wxOVERRIDE; //Selection - virtual void DeleteSelection(); - virtual bool HasSelection() const; - virtual void SelectAll(); - virtual wxString GetSelectedText() const; - virtual wxString GetSelectedSource() const; - virtual void ClearSelection(); + virtual void DeleteSelection() wxOVERRIDE; + virtual bool HasSelection() const wxOVERRIDE; + virtual void SelectAll() wxOVERRIDE; + virtual wxString GetSelectedText() const wxOVERRIDE; + virtual wxString GetSelectedSource() const wxOVERRIDE; + virtual void ClearSelection() wxOVERRIDE; - virtual void RunScript(const wxString& javascript); + virtual void RunScript(const wxString& javascript) wxOVERRIDE; //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler); + virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; virtual wxVector > GetHandlers() { return m_handlerList; } - virtual void* GetNativeBackend() const { return m_web_view; } + virtual void* GetNativeBackend() const wxOVERRIDE { return m_web_view; } /** TODO: check if this can be made private * The native control has a getter to check for busy state, but except in @@ -135,9 +135,9 @@ public: bool m_creating; protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl); + virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; private: @@ -169,14 +169,14 @@ private: class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory { public: - virtual wxWebView* Create() { return new wxWebViewWebKit; } + virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewWebKit; } virtual wxWebView* Create(wxWindow* parent, wxWindowID id, const wxString& url = wxWebViewDefaultURLStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) + const wxString& name = wxWebViewNameStr) wxOVERRIDE { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); } }; diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 01f75a5e53..66171148b8 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -60,81 +60,81 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- - virtual void Raise(); - virtual void Lower(); + virtual void Raise() wxOVERRIDE; + virtual void Lower() wxOVERRIDE; - virtual bool Show( bool show = true ); + virtual bool Show( bool show = true ) wxOVERRIDE; - virtual bool IsRetained() const; + virtual bool IsRetained() const wxOVERRIDE; - virtual void SetFocus(); + virtual void SetFocus() wxOVERRIDE; // hint from wx to native GTK+ tab traversal code - virtual void SetCanFocus(bool canFocus); + virtual void SetCanFocus(bool canFocus) wxOVERRIDE; - virtual bool Reparent( wxWindowBase *newParent ); + virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; - virtual void WarpPointer(int x, int y); + virtual void WarpPointer(int x, int y) wxOVERRIDE; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - virtual void Update(); - virtual void ClearBackground(); + const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + virtual void Update() wxOVERRIDE; + virtual void ClearBackground() wxOVERRIDE; - virtual bool SetBackgroundColour( const wxColour &colour ); - virtual bool SetForegroundColour( const wxColour &colour ); - virtual bool SetCursor( const wxCursor &cursor ); - virtual bool SetFont( const wxFont &font ); + virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE ; + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE; - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; + virtual int GetCharHeight() const wxOVERRIDE; + virtual int GetCharWidth() const wxOVERRIDE; virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ); - virtual void SetScrollPos( int orient, int pos, bool refresh = true ); - virtual int GetScrollPos( int orient ) const; - virtual int GetScrollThumb( int orient ) const; - virtual int GetScrollRange( int orient ) const; + int range, bool refresh = true ) wxOVERRIDE; + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE; + virtual int GetScrollPos( int orient ) const wxOVERRIDE; + virtual int GetScrollThumb( int orient ) const wxOVERRIDE; + virtual int GetScrollRange( int orient ) const wxOVERRIDE; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ); - virtual bool ScrollLines(int lines); - virtual bool ScrollPages(int pages); + const wxRect* rect = NULL ) wxOVERRIDE; + virtual bool ScrollLines(int lines) wxOVERRIDE; + virtual bool ScrollPages(int pages) wxOVERRIDE; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); + virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; #endif // wxUSE_DRAG_AND_DROP - virtual void AddChild( wxWindowBase *child ); - virtual void RemoveChild( wxWindowBase *child ); + virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; + virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; - virtual void SetLayoutDirection(wxLayoutDirection dir); - virtual wxLayoutDirection GetLayoutDirection() const; + virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; + virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; virtual wxCoord AdjustForLayoutDirection(wxCoord x, wxCoord width, - wxCoord widthTotal) const; + wxCoord widthTotal) const wxOVERRIDE; - virtual bool DoIsExposed( int x, int y ) const; - virtual bool DoIsExposed( int x, int y, int w, int h ) const; + virtual bool DoIsExposed( int x, int y ) const wxOVERRIDE; + virtual bool DoIsExposed( int x, int y, int w, int h ) const wxOVERRIDE; // currently wxGTK2-only void SetDoubleBuffered(bool on); - virtual bool IsDoubleBuffered() const; + virtual bool IsDoubleBuffered() const wxOVERRIDE; // SetLabel(), which does nothing in wxWindow - virtual void SetLabel(const wxString& label) { m_gtkLabel = label; } - virtual wxString GetLabel() const { return m_gtkLabel; } + virtual void SetLabel(const wxString& label) wxOVERRIDE { m_gtkLabel = label; } + virtual wxString GetLabel() const wxOVERRIDE { return m_gtkLabel; } // implementation // -------------- - virtual WXWidget GetHandle() const { return m_widget; } + virtual WXWidget GetHandle() const wxOVERRIDE { return m_widget; } // many important things are done here, this function must be called // regularly - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} @@ -356,36 +356,36 @@ protected: int *x, int *y, int *descent = NULL, int *externalLeading = NULL, - const wxFont *font = NULL) const; - virtual void DoClientToScreen( int *x, int *y ) const; - virtual void DoScreenToClient( int *x, int *y ) const; - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetClientSize( int *width, int *height ) const; + const wxFont *font = NULL) const wxOVERRIDE; + virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE; + virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE; + virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; + virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - virtual wxSize DoGetBorderSize() const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoEnable(bool enable); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual wxSize DoGetBorderSize() const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoEnable(bool enable) wxOVERRIDE; #if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; #endif // wxUSE_MENUS_NATIVE - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); + virtual void DoCaptureMouse() wxOVERRIDE; + virtual void DoReleaseMouse() wxOVERRIDE; - virtual void DoFreeze(); - virtual void DoThaw(); + virtual void DoFreeze() wxOVERRIDE; + virtual void DoThaw() wxOVERRIDE; void GTKFreezeWidget(GtkWidget *w); void GTKThawWidget(GtkWidget *w); void GTKDisconnect(void* instance); #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); + virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; #endif // wxUSE_TOOLTIPS // Create a GtkScrolledWindow containing the given widget (usually @@ -396,8 +396,8 @@ protected: // style. void GTKCreateScrolledWindowWith(GtkWidget* view); - virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move); - virtual bool DoNavigateIn(int flags); + virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move) wxOVERRIDE; + virtual bool DoNavigateIn(int flags) wxOVERRIDE; // Copies m_children tab order to GTK focus chain: diff --git a/include/wx/hash.h b/include/wx/hash.h index 452040ba31..1da1d21fc7 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -241,7 +241,7 @@ protected: // m_curr to it and m_currBucket to its bucket void GetNextNode( size_t bucketStart ); private: - virtual void DoDeleteContents( wxHashTableBase_Node* node ); + virtual void DoDeleteContents( wxHashTableBase_Node* node ) wxOVERRIDE; // current node Node* m_curr; diff --git a/include/wx/headercol.h b/include/wx/headercol.h index 1002c0f562..1b2fa3d401 100644 --- a/include/wx/headercol.h +++ b/include/wx/headercol.h @@ -234,34 +234,34 @@ public: } // implement base class pure virtuals - virtual void SetTitle(const wxString& title) { m_title = title; } - virtual wxString GetTitle() const { return m_title; } + virtual void SetTitle(const wxString& title) wxOVERRIDE { m_title = title; } + virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } - wxBitmap GetBitmap() const { return m_bitmap; } + virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE { m_bitmap = bitmap; } + wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } - virtual void SetWidth(int width) { m_width = width; } - virtual int GetWidth() const { return m_width; } + virtual void SetWidth(int width) wxOVERRIDE { m_width = width; } + virtual int GetWidth() const wxOVERRIDE { return m_width; } - virtual void SetMinWidth(int minWidth) { m_minWidth = minWidth; } - virtual int GetMinWidth() const { return m_minWidth; } + virtual void SetMinWidth(int minWidth) wxOVERRIDE { m_minWidth = minWidth; } + virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; } - virtual void SetAlignment(wxAlignment align) { m_align = align; } - virtual wxAlignment GetAlignment() const { return m_align; } + virtual void SetAlignment(wxAlignment align) wxOVERRIDE { m_align = align; } + virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_align; } - virtual void SetFlags(int flags) { m_flags = flags; } - virtual int GetFlags() const { return m_flags; } + virtual void SetFlags(int flags) wxOVERRIDE { m_flags = flags; } + virtual int GetFlags() const wxOVERRIDE { return m_flags; } - virtual bool IsSortKey() const { return m_sort; } - virtual void UnsetAsSortKey() { m_sort = false; } + virtual bool IsSortKey() const wxOVERRIDE { return m_sort; } + virtual void UnsetAsSortKey() wxOVERRIDE { m_sort = false; } - virtual void SetSortOrder(bool ascending) + virtual void SetSortOrder(bool ascending) wxOVERRIDE { m_sort = true; m_sortAscending = ascending; } - virtual bool IsSortOrderAscending() const { return m_sortAscending; } + virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_sortAscending; } private: // common part of all ctors diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h index 78d7117b9f..4203954597 100644 --- a/include/wx/headerctrl.h +++ b/include/wx/headerctrl.h @@ -160,12 +160,12 @@ public: // ------------------------------- // the user doesn't need to TAB to this control - virtual bool AcceptsFocusFromKeyboard() const { return false; } + virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } // this method is only overridden in order to synchronize the control with // the main window when it is scrolled, the derived class must implement // DoScrollHorz() - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); + virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) wxOVERRIDE; protected: // this method must be implemented by the derived classes to return the @@ -211,7 +211,7 @@ protected: protected: // this window doesn't look nice with the border so don't use it by default - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } private: // methods implementing our public API and defined in platform-specific @@ -331,8 +331,8 @@ public: protected: // implement/override base class methods - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const; - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle); + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE; + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE; // and define another one to be overridden in the derived classes: it // should return the best width for the given column contents or -1 if not @@ -405,7 +405,7 @@ public: unsigned int GetNewOrder() const { return m_order; } void SetNewOrder(unsigned int order) { m_order = order; } - virtual wxEvent *Clone() const { return new wxHeaderCtrlEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxHeaderCtrlEvent(*this); } protected: // the column affected by the event diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index 0053823a88..dfa7cf5a6d 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -58,10 +58,10 @@ public: bool Display(const wxString& x); bool Display(int id); - bool DisplayContents(); + bool DisplayContents() wxOVERRIDE; bool DisplayIndex(); bool KeywordSearch(const wxString& keyword, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE; wxHtmlHelpWindow* GetHelpWindow() { return m_helpWindow; } void SetHelpWindow(wxHtmlHelpWindow* helpWindow); @@ -81,30 +81,30 @@ public: //// Backward compatibility with wxHelpController API - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize(file); } - virtual bool Initialize(const wxString& file); - virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {} - virtual bool LoadFile(const wxString& file = wxT("")); - virtual bool DisplaySection(int sectionNo); - virtual bool DisplaySection(const wxString& section) { return Display(section); } - virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); } - virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos); + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize(file); } + virtual bool Initialize(const wxString& file) wxOVERRIDE; + virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) wxOVERRIDE {} + virtual bool LoadFile(const wxString& file = wxT("")) wxOVERRIDE; + virtual bool DisplaySection(int sectionNo) wxOVERRIDE; + virtual bool DisplaySection(const wxString& section) wxOVERRIDE { return Display(section); } + virtual bool DisplayBlock(long blockNo) wxOVERRIDE { return DisplaySection(blockNo); } + virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE; virtual void SetFrameParameters(const wxString& titleFormat, const wxSize& size, const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = false); + bool newFrameEachTime = false) wxOVERRIDE; /// Obtains the latest settings used by the help frame and the help /// frame. virtual wxFrame *GetFrameParameters(wxSize *size = NULL, wxPoint *pos = NULL, - bool *newFrameEachTime = NULL); + bool *newFrameEachTime = NULL) wxOVERRIDE; // Get direct access to help data: wxHtmlHelpData *GetHelpData() { return &m_helpData; } - virtual bool Quit() ; - virtual void OnQuit() {} + virtual bool Quit() wxOVERRIDE ; + virtual void OnQuit() wxOVERRIDE {} void OnCloseFrame(wxCloseEvent& evt); diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index 89225eb27b..302531dc6c 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -118,7 +118,7 @@ public: // we don't want to prevent the app from closing just because a help window // remains opened - virtual bool ShouldPreventAppExit() const { return m_shouldPreventAppExit; } + virtual bool ShouldPreventAppExit() const wxOVERRIDE { return m_shouldPreventAppExit; } protected: void Init(wxHtmlHelpData* data = NULL); diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index 87455f6681..4f8b8c284c 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -114,8 +114,8 @@ public: class WXDLLIMPEXP_HTML wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle { public: - virtual wxColour GetSelectedTextColour(const wxColour& clr); - virtual wxColour GetSelectedTextBgColour(const wxColour& clr); + virtual wxColour GetSelectedTextColour(const wxColour& clr) wxOVERRIDE; + virtual wxColour GetSelectedTextBgColour(const wxColour& clr) wxOVERRIDE; }; @@ -378,10 +378,10 @@ class WXDLLIMPEXP_HTML wxHtmlWordCell : public wxHtmlCell public: wxHtmlWordCell(const wxString& word, const wxDC& dc); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); - virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const; - virtual wxString ConvertToText(wxHtmlSelection *sel) const; - bool IsLinebreakAllowed() const { return m_allowLinebreak; } + wxHtmlRenderingInfo& info) wxOVERRIDE; + virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const wxOVERRIDE; + virtual wxString ConvertToText(wxHtmlSelection *sel) const wxOVERRIDE; + bool IsLinebreakAllowed() const wxOVERRIDE { return m_allowLinebreak; } void SetPreviousWord(wxHtmlWordCell *cell); @@ -420,8 +420,8 @@ public: {} protected: - virtual wxString GetAllAsText() const; - virtual wxString GetPartAsText(int begin, int end) const; + virtual wxString GetAllAsText() const wxOVERRIDE; + virtual wxString GetPartAsText(int begin, int end) const wxOVERRIDE; wxString m_wordOrig; size_t m_linepos; @@ -436,15 +436,15 @@ public: wxHtmlContainerCell(wxHtmlContainerCell *parent); virtual ~wxHtmlContainerCell(); - virtual void Layout(int w); + virtual void Layout(int w) wxOVERRIDE; virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; virtual bool AdjustPagebreak(int *pagebreak, const wxArrayInt& known_pagebreaks, - int pageHeight) const; + int pageHeight) const wxOVERRIDE; // insert cell at the end of m_Cells list void InsertCell(wxHtmlCell *cell); @@ -478,26 +478,26 @@ public: // adapt to it: wxColour GetBackgroundColour(); void SetBorder(const wxColour& clr1, const wxColour& clr2, int border = 1) {m_Border = border; m_BorderColour1 = clr1, m_BorderColour2 = clr2;} - virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const; - virtual const wxHtmlCell* Find(int condition, const void* param) const; + virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxOVERRIDE; + virtual const wxHtmlCell* Find(int condition, const void* param) const wxOVERRIDE; virtual bool ProcessMouseClick(wxHtmlWindowInterface *window, const wxPoint& pos, - const wxMouseEvent& event); + const wxMouseEvent& event) wxOVERRIDE; - virtual wxHtmlCell* GetFirstChild() const { return m_Cells; } + virtual wxHtmlCell* GetFirstChild() const wxOVERRIDE { return m_Cells; } // returns last child cell: wxHtmlCell* GetLastChild() const { return m_LastCell; } // see comment in wxHtmlCell about this method - virtual bool IsTerminalCell() const { return false; } + virtual bool IsTerminalCell() const wxOVERRIDE { return false; } virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y, - unsigned flags = wxHTML_FIND_EXACT) const; + unsigned flags = wxHTML_FIND_EXACT) const wxOVERRIDE; - virtual wxHtmlCell *GetFirstTerminal() const; - virtual wxHtmlCell *GetLastTerminal() const; + virtual wxHtmlCell *GetFirstTerminal() const wxOVERRIDE; + virtual wxHtmlCell *GetLastTerminal() const wxOVERRIDE; // Removes indentation on top or bottom of the container (i.e. above or @@ -506,7 +506,7 @@ public: // Returns the maximum possible length of the container. // Call Layout at least once before using GetMaxTotalWidth() - virtual int GetMaxTotalWidth() const { return m_MaxTotalWidth; } + virtual int GetMaxTotalWidth() const wxOVERRIDE { return m_MaxTotalWidth; } protected: void UpdateRenderingStatePre(wxHtmlRenderingInfo& info, @@ -557,9 +557,9 @@ class WXDLLIMPEXP_HTML wxHtmlColourCell : public wxHtmlCell public: wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;} virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; protected: wxColour m_Colour; @@ -582,9 +582,9 @@ class WXDLLIMPEXP_HTML wxHtmlFontCell : public wxHtmlCell public: wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); } virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; protected: wxFont m_Font; @@ -615,10 +615,10 @@ public: wxHtmlWidgetCell(wxWindow *wnd, int w = 0); virtual ~wxHtmlWidgetCell() { m_Wnd->Destroy(); } virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); + wxHtmlRenderingInfo& info) wxOVERRIDE; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); - virtual void Layout(int w); + wxHtmlRenderingInfo& info) wxOVERRIDE; + virtual void Layout(int w) wxOVERRIDE; protected: wxWindow* m_Wnd; diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h index fe25d4ffb9..2fdc5b9094 100644 --- a/include/wx/html/htmlfilt.h +++ b/include/wx/html/htmlfilt.h @@ -55,8 +55,8 @@ class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText) public: - virtual bool CanRead(const wxFSFile& file) const; - virtual wxString ReadFile(const wxFSFile& file) const; + virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE; + virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE; }; //-------------------------------------------------------------------------------- @@ -69,8 +69,8 @@ class wxHtmlFilterHTML : public wxHtmlFilter DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML) public: - virtual bool CanRead(const wxFSFile& file) const; - virtual wxString ReadFile(const wxFSFile& file) const; + virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE; + virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE; }; diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index e36685c031..51b3c4eba0 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -383,7 +383,7 @@ public: wxString ToText(); #endif // wxUSE_CLIPBOARD - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; /// Returns standard HTML cursor as used by wxHtmlWindow static wxCursor GetDefaultHTMLCursor(HTMLCursor type); @@ -448,19 +448,19 @@ protected: public: // wxHtmlWindowInterface methods: - virtual void SetHTMLWindowTitle(const wxString& title); - virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link); + virtual void SetHTMLWindowTitle(const wxString& title) wxOVERRIDE; + virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) wxOVERRIDE; virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, const wxString& url, - wxString *redirect) const; + wxString *redirect) const wxOVERRIDE; virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, - const wxPoint& pos) const; - virtual wxWindow* GetHTMLWindow(); - virtual wxColour GetHTMLBackgroundColour() const; - virtual void SetHTMLBackgroundColour(const wxColour& clr); - virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg); - virtual void SetHTMLStatusText(const wxString& text); - virtual wxCursor GetHTMLCursor(HTMLCursor type) const; + const wxPoint& pos) const wxOVERRIDE; + virtual wxWindow* GetHTMLWindow() wxOVERRIDE; + virtual wxColour GetHTMLBackgroundColour() const wxOVERRIDE; + virtual void SetHTMLBackgroundColour(const wxColour& clr) wxOVERRIDE; + virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) wxOVERRIDE; + virtual void SetHTMLStatusText(const wxString& text) wxOVERRIDE; + virtual wxCursor GetHTMLCursor(HTMLCursor type) const wxOVERRIDE; // implementation of SetPage() bool DoSetPage(const wxString& source); @@ -593,7 +593,7 @@ public: bool GetLinkClicked() const { return m_bLinkWasClicked; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxHtmlCellEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxHtmlCellEvent(*this); } private: wxHtmlCell *m_cell; @@ -624,7 +624,7 @@ public: const wxHtmlLinkInfo &GetLinkInfo() const { return m_linkInfo; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxHtmlLinkEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxHtmlLinkEvent(*this); } private: wxHtmlLinkInfo m_linkInfo; diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index 3699adae4b..ccb8aa4963 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -160,11 +160,11 @@ public: // between text and header and/or footer // wxPrintout stuff: - bool OnPrintPage(int page); - bool HasPage(int page); - void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo); - bool OnBeginDocument(int startPage, int endPage); - void OnPreparePrinting(); + bool OnPrintPage(int page) wxOVERRIDE; + bool HasPage(int page) wxOVERRIDE; + void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE; + bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; + void OnPreparePrinting() wxOVERRIDE; // Adds input filter static void AddFilter(wxHtmlFilter *filter); diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 619d8d3c37..ac7a3f70b1 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -42,11 +42,11 @@ public: virtual ~wxHtmlWinParser(); - virtual void InitParser(const wxString& source); - virtual void DoneParser(); - virtual wxObject* GetProduct(); + virtual void InitParser(const wxString& source) wxOVERRIDE; + virtual void DoneParser() wxOVERRIDE; + virtual wxObject* GetProduct() wxOVERRIDE; - virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const; + virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const wxOVERRIDE; // Set's the DC used for parsing. If SetDC() is not called, // parsing won't proceed @@ -163,7 +163,7 @@ public: WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; } protected: - virtual void AddText(const wxString& txt); + virtual void AddText(const wxString& txt) wxOVERRIDE; private: void FlushWordBuf(wxChar *temp, int& len); @@ -263,7 +263,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler public: wxHtmlWinTagHandler() : wxHtmlTagHandler() {} - virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} + virtual void SetParser(wxHtmlParser *parser) wxOVERRIDE {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted @@ -293,8 +293,8 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule public: wxHtmlTagsModule() : wxModule() {} - virtual bool OnInit(); - virtual void OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual void OnExit() wxOVERRIDE; // This is called by wxHtmlWinParser. // The method must simply call parser->AddTagHandler(new diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h index 27c3a36c30..c7e27ee809 100644 --- a/include/wx/htmllbox.h +++ b/include/wx/htmllbox.h @@ -68,10 +68,10 @@ public: virtual ~wxHtmlListBox(); // override some base class virtuals - virtual void RefreshRow(size_t line); - virtual void RefreshRows(size_t from, size_t to); - virtual void RefreshAll(); - virtual void SetItemCount(size_t count); + virtual void RefreshRow(size_t line) wxOVERRIDE; + virtual void RefreshRows(size_t from, size_t to) wxOVERRIDE; + virtual void RefreshAll() wxOVERRIDE; + virtual void SetItemCount(size_t count) wxOVERRIDE; #if wxUSE_FILESYSTEM // retrieve the file system used by the wxHtmlWinParser: if you use @@ -80,7 +80,7 @@ public: const wxFileSystem& GetFileSystem() const { return m_filesystem; } #endif // wxUSE_FILESYSTEM - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; protected: // this method must be implemented in the derived class and should return @@ -107,11 +107,11 @@ protected: // we implement both of these functions in terms of OnGetItem(), they are // not supposed to be overridden by our descendants - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const; - virtual wxCoord OnMeasureItem(size_t n) const; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; + virtual wxCoord OnMeasureItem(size_t n) const wxOVERRIDE; // override this one to draw custom background for selected items correctly - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const; + virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; // this method may be overridden to handle clicking on a link in the // listbox (by default, clicks on links are simply ignored) @@ -131,19 +131,19 @@ protected: private: // wxHtmlWindowInterface methods: - virtual void SetHTMLWindowTitle(const wxString& title); - virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link); + virtual void SetHTMLWindowTitle(const wxString& title) wxOVERRIDE; + virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) wxOVERRIDE; virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, const wxString& url, - wxString *redirect) const; + wxString *redirect) const wxOVERRIDE; virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, - const wxPoint& pos) const; - virtual wxWindow* GetHTMLWindow(); - virtual wxColour GetHTMLBackgroundColour() const; - virtual void SetHTMLBackgroundColour(const wxColour& clr); - virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg); - virtual void SetHTMLStatusText(const wxString& text); - virtual wxCursor GetHTMLCursor(HTMLCursor type) const; + const wxPoint& pos) const wxOVERRIDE; + virtual wxWindow* GetHTMLWindow() wxOVERRIDE; + virtual wxColour GetHTMLBackgroundColour() const wxOVERRIDE; + virtual void SetHTMLBackgroundColour(const wxColour& clr) wxOVERRIDE; + virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) wxOVERRIDE; + virtual void SetHTMLStatusText(const wxString& text) wxOVERRIDE; + virtual wxCursor GetHTMLCursor(HTMLCursor type) const wxOVERRIDE; // returns index of item that contains given HTML cell size_t GetItemForCell(const wxHtmlCell *cell) const; @@ -248,25 +248,25 @@ public: // these must be overloaded otherwise the compiler will complain // about wxItemContainerImmutable::[G|S]etSelection being pure virtuals... - void SetSelection(int n) + void SetSelection(int n) wxOVERRIDE { wxVListBox::SetSelection(n); } - int GetSelection() const + int GetSelection() const wxOVERRIDE { return wxVListBox::GetSelection(); } // accessing strings // ----------------- - virtual unsigned int GetCount() const + virtual unsigned int GetCount() const wxOVERRIDE { return m_items.GetCount(); } - virtual wxString GetString(unsigned int n) const; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; // override default unoptimized wxItemContainer::GetStrings() function wxArrayString GetStrings() const { return m_items; } - virtual void SetString(unsigned int n, const wxString& s); + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; // resolve ambiguity between wxItemContainer and wxVListBox versions void Clear(); @@ -274,32 +274,32 @@ public: protected: 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 DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE { m_HTMLclientData[n] = clientData; } - virtual void *DoGetItemClientData(unsigned int n) const + virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE { return m_HTMLclientData[n]; } // wxItemContainer methods - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; // calls wxHtmlListBox::SetItemCount() and RefreshAll() void UpdateCount(); // override these functions just to change their visibility: users of // wxSimpleHtmlListBox shouldn't be allowed to call them directly! - virtual void SetItemCount(size_t count) + virtual void SetItemCount(size_t count) wxOVERRIDE { wxHtmlListBox::SetItemCount(count); } virtual void SetRowCount(size_t count) { wxHtmlListBox::SetRowCount(count); } - virtual wxString OnGetItem(size_t n) const + virtual wxString OnGetItem(size_t n) const wxOVERRIDE { return m_items[n]; } - virtual void InitEvent(wxCommandEvent& event, int n) + virtual void InitEvent(wxCommandEvent& event, int n) wxOVERRIDE { // we're not a virtual control and we can include the string // of the item which was clicked: diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h index db183d5a2e..60a7def61e 100644 --- a/include/wx/hyperlink.h +++ b/include/wx/hyperlink.h @@ -67,10 +67,10 @@ public: // NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour, // wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important ! - virtual bool HasTransparentBackground() { return true; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // checks for validity some of the ctor/Create() function parameters void CheckParams(const wxString& label, const wxString& url, long style); @@ -110,7 +110,7 @@ public: void SetURL(const wxString &url) { m_url=url; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxHyperlinkEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxHyperlinkEvent(*this); } private: diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index 50ad64261d..22f0cae14c 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -119,8 +119,8 @@ public: #endif // WXWIN_COMPATIBILITY_2_8 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: // delete all icons diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 6d1bcc6f84..ed90bdd8b1 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -51,11 +51,11 @@ public: } #if wxUSE_STREAMS - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; protected: - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose, bool IsBmp, bool IsMask); bool DoLoadDib(wxImage *image, int width, int height, int bpp, int ncolors, @@ -85,13 +85,13 @@ public: } #if wxUSE_STREAMS - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ); protected: - virtual int DoGetImageCount( wxInputStream& stream ); - virtual bool DoCanRead( wxInputStream& stream ); + virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif // wxUSE_STREAMS private: @@ -120,7 +120,7 @@ public: protected: #if wxUSE_STREAMS - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif // wxUSE_STREAMS private: @@ -143,12 +143,12 @@ public: #if wxUSE_STREAMS - virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;} - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); + virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ) wxOVERRIDE{return false ;} + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; protected: - virtual int DoGetImageCount( wxInputStream& stream ); - virtual bool DoCanRead( wxInputStream& stream ); + virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif // wxUSE_STREAMS private: diff --git a/include/wx/image.h b/include/wx/image.h index 3e7f39eb0d..29931d9cbb 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -588,8 +588,8 @@ protected: // note that index must be multiplied by 3 when using it with RGB array long XYToIndex(int x, int y) const; - 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: friend class WXDLLIMPEXP_FWD_CORE wxImageHandler; diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h index 1d76a632c8..0d149e7b27 100644 --- a/include/wx/imaggif.h +++ b/include/wx/imaggif.h @@ -38,17 +38,17 @@ public: #if wxUSE_STREAMS virtual bool LoadFile(wxImage *image, wxInputStream& stream, - bool verbose = true, int index = -1); + bool verbose = true, int index = -1) wxOVERRIDE; virtual bool SaveFile(wxImage *image, wxOutputStream& stream, - bool verbose=true); + bool verbose=true) wxOVERRIDE; // Save animated gif bool SaveAnimation(const wxImageArray& images, wxOutputStream *stream, bool verbose = true, int delayMilliSecs = 1000); protected: - virtual int DoGetImageCount(wxInputStream& stream); - virtual bool DoCanRead(wxInputStream& stream); + virtual int DoGetImageCount(wxInputStream& stream) wxOVERRIDE; + virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; bool DoSaveFile(const wxImage&, wxOutputStream *, bool verbose, bool first, int delayMilliSecs, bool loop, diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h index f7307ba5e1..7a6c5e76ce 100644 --- a/include/wx/imagiff.h +++ b/include/wx/imagiff.h @@ -29,10 +29,10 @@ public: } #if wxUSE_STREAMS - virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1); - virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true); + virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1) wxOVERRIDE; + virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true) wxOVERRIDE; protected: - virtual bool DoCanRead(wxInputStream& stream); + virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; #endif DECLARE_DYNAMIC_CLASS(wxIFFHandler) diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h index 53f6e06170..4f124af32c 100644 --- a/include/wx/imagjpeg.h +++ b/include/wx/imagjpeg.h @@ -36,10 +36,10 @@ public: static wxVersionInfo GetLibraryVersionInfo(); #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; protected: - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif private: diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h index cc9d54fa8a..3337e21e50 100644 --- a/include/wx/imagpcx.h +++ b/include/wx/imagpcx.h @@ -29,10 +29,10 @@ public: } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; protected: - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif // wxUSE_STREAMS private: diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h index 55adcd5f97..20c6f294c3 100644 --- a/include/wx/imagpng.h +++ b/include/wx/imagpng.h @@ -50,10 +50,10 @@ public: static wxVersionInfo GetLibraryVersionInfo(); #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; protected: - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif private: diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h index aab7c76faa..8d49897829 100644 --- a/include/wx/imagpnm.h +++ b/include/wx/imagpnm.h @@ -31,10 +31,10 @@ public: } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; protected: - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif private: diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h index d11083785f..8059ffd4f1 100644 --- a/include/wx/imagtga.h +++ b/include/wx/imagtga.h @@ -31,11 +31,11 @@ public: #if wxUSE_STREAMS virtual bool LoadFile(wxImage* image, wxInputStream& stream, - bool verbose = true, int index = -1); + bool verbose = true, int index = -1) wxOVERRIDE; virtual bool SaveFile(wxImage* image, wxOutputStream& stream, - bool verbose = true); + bool verbose = true) wxOVERRIDE; protected: - virtual bool DoCanRead(wxInputStream& stream); + virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; #endif // wxUSE_STREAMS DECLARE_DYNAMIC_CLASS(wxTGAHandler) diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 9182e67173..886453c508 100644 --- a/include/wx/imagtiff.h +++ b/include/wx/imagtiff.h @@ -41,12 +41,12 @@ public: static wxVersionInfo GetLibraryVersionInfo(); #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; protected: - virtual int DoGetImageCount( wxInputStream& stream ); - virtual bool DoCanRead( wxInputStream& stream ); + virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif private: diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h index 16477b2d57..bf5cd5606c 100644 --- a/include/wx/imagxpm.h +++ b/include/wx/imagxpm.h @@ -29,10 +29,10 @@ public: } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; protected: - virtual bool DoCanRead( wxInputStream& stream ); + virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; #endif private: diff --git a/include/wx/listbase.h b/include/wx/listbase.h index 5e6fb7cae3..b8b7e2b344 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -467,7 +467,7 @@ protected: virtual long DoInsertColumn(long col, const wxListItem& info) = 0; // Overridden methods of the base class. - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; private: // user defined color to draw row lines, may be invalid @@ -522,7 +522,7 @@ public: bool IsEditCancelled() const { return m_editCancelled; } void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } - virtual wxEvent *Clone() const { return new wxListEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxListEvent(*this); } //protected: -- not for backwards compatibility int m_code; diff --git a/include/wx/listbook.h b/include/wx/listbook.h index 1c7cdbd923..98e0ba546b 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -61,31 +61,31 @@ public: // overridden base class methods - virtual bool SetPageText(size_t n, const wxString& strText); - virtual wxString GetPageText(size_t n) const; - virtual int GetPageImage(size_t n) const; - virtual bool SetPageImage(size_t n, int imageId); + 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 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 = NO_IMAGE); - virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; - virtual void SetImageList(wxImageList *imageList); + int imageId = NO_IMAGE) wxOVERRIDE; + virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual bool DeleteAllPages(); + virtual bool DeleteAllPages() wxOVERRIDE; wxListView* GetListView() const { return (wxListView*)m_bookctrl; } protected: - virtual wxWindow *DoRemovePage(size_t page); + virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; - void UpdateSelectedPage(size_t newsel); + void UpdateSelectedPage(size_t newsel) wxOVERRIDE; - wxBookCtrlEvent* CreatePageChangingEvent() const; - void MakeChangedEvent(wxBookCtrlEvent &event); + wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; + void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; // Get the correct wxListCtrl flags to use depending on our own flags. long GetListCtrlFlags() const; diff --git a/include/wx/listbox.h b/include/wx/listbox.h index afb0220036..f6e4dc6afc 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -48,7 +48,7 @@ public: // multiple selection logic virtual bool IsSelected(int n) const = 0; - virtual void SetSelection(int n); + virtual void SetSelection(int n) wxOVERRIDE; void SetSelection(int n, bool select) { DoSetSelection(n, select); } void Deselect(int n) { DoSetSelection(n, false); } void DeselectAll(int itemToLeaveSelected = -1); @@ -84,11 +84,11 @@ public: } // override wxItemContainer::IsSorted - virtual bool IsSorted() const { return HasFlag( wxLB_SORT ); } + virtual bool IsSorted() const wxOVERRIDE { return HasFlag( wxLB_SORT ); } // emulate selecting or deselecting the item event.GetInt() (depending on // event.GetExtraLong()) - void Command(wxCommandEvent& event); + void Command(wxCommandEvent& event) wxOVERRIDE; // return the index of the item at this position or wxNOT_FOUND int HitTest(const wxPoint& point) const { return DoListHitTest(point); } diff --git a/include/wx/log.h b/include/wx/log.h index cc4217fc41..4d7adef5c4 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -705,10 +705,10 @@ public: // show the buffer contents to the user in the best possible way (this uses // wxMessageOutputMessageBox) and clear it - virtual void Flush(); + virtual void Flush() wxOVERRIDE; protected: - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg); + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE; private: wxString m_str; @@ -726,7 +726,7 @@ public: protected: // implement sink function - virtual void DoLogText(const wxString& msg); + virtual void DoLogText(const wxString& msg) wxOVERRIDE; FILE *m_fp; @@ -744,7 +744,7 @@ public: protected: // implement sink function - virtual void DoLogText(const wxString& msg); + virtual void DoLogText(const wxString& msg) wxOVERRIDE; // using ptr here to avoid including from this file wxSTD ostream *m_ostr; @@ -811,7 +811,7 @@ public: wxLog *GetOldLog() const { return m_logOld; } // override base class version to flush the old logger as well - virtual void Flush(); + virtual void Flush() wxOVERRIDE; // call to avoid destroying the old log target void DetachOldLog() { m_logOld = NULL; } @@ -820,7 +820,7 @@ protected: // pass the record to the old logger if needed virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info); + const wxLogRecordInfo& info) wxOVERRIDE; private: // the current log target diff --git a/include/wx/mdi.h b/include/wx/mdi.h index f6f9839306..69db24a917 100644 --- a/include/wx/mdi.h +++ b/include/wx/mdi.h @@ -123,7 +123,7 @@ public: protected: // Override to pass menu/toolbar events to the active child first. - virtual bool TryBefore(wxEvent& event); + virtual bool TryBefore(wxEvent& event) wxOVERRIDE; // This is wxMDIClientWindow for all the native implementations but not for @@ -177,17 +177,17 @@ public: // in most ports MDI children frames are not really top-level, the only // exception are the Mac ports in which MDI children are just normal top // level windows too - virtual bool IsTopLevel() const { return false; } + virtual bool IsTopLevel() const wxOVERRIDE { return false; } // In all ports keyboard navigation must stop at MDI child frame level and // can't cross its boundary. Indicate this by overriding this function to // return true. - virtual bool IsTopNavigationDomain() const { return true; } + virtual bool IsTopNavigationDomain() const wxOVERRIDE { return true; } // Raising any frame is supposed to show it but wxFrame Raise() // implementation doesn't work for MDI child frames in most forms so // forward this to Activate() which serves the same purpose by default. - virtual void Raise() { Activate(); } + virtual void Raise() wxOVERRIDE { Activate(); } protected: wxMDIParentFrame *m_mdiParent; @@ -210,16 +210,16 @@ public: long WXUNUSED(style) = 1, wxWindowID WXUNUSED(id) = 1, const wxString& WXUNUSED(name) - = wxEmptyString) + = wxEmptyString) wxOVERRIDE { return NULL; } - virtual wxStatusBar *GetStatusBar() const + virtual wxStatusBar *GetStatusBar() const wxOVERRIDE { return NULL; } virtual void SetStatusText(const wxString &WXUNUSED(text), - int WXUNUSED(number)=0) + int WXUNUSED(number)=0) wxOVERRIDE { } virtual void SetStatusWidths(int WXUNUSED(n), - const int WXUNUSED(widths)[]) + const int WXUNUSED(widths)[]) wxOVERRIDE { } #endif // wxUSE_STATUSBAR @@ -229,29 +229,29 @@ public: // TODO: again, it should be possible to have tool bars virtual wxToolBar *CreateToolBar(long WXUNUSED(style), wxWindowID WXUNUSED(id), - const wxString& WXUNUSED(name)) + const wxString& WXUNUSED(name)) wxOVERRIDE { return NULL; } - virtual wxToolBar *GetToolBar() const { return NULL; } + virtual wxToolBar *GetToolBar() const wxOVERRIDE { return NULL; } #endif // wxUSE_TOOLBAR // no icon - virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { } + virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) wxOVERRIDE { } // title is used as the tab label - virtual wxString GetTitle() const { return m_title; } + virtual wxString GetTitle() const wxOVERRIDE { return m_title; } virtual void SetTitle(const wxString& title) = 0; // no maximize etc - virtual void Maximize(bool WXUNUSED(maximize) = true) { } - virtual bool IsMaximized() const { return true; } - virtual bool IsAlwaysMaximized() const { return true; } - virtual void Iconize(bool WXUNUSED(iconize) = true) { } - virtual bool IsIconized() const { return false; } - virtual void Restore() { } + virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE { } + virtual bool IsMaximized() const wxOVERRIDE { return true; } + virtual bool IsAlwaysMaximized() const wxOVERRIDE { return true; } + virtual void Iconize(bool WXUNUSED(iconize) = true) wxOVERRIDE { } + virtual bool IsIconized() const wxOVERRIDE { return false; } + virtual void Restore() wxOVERRIDE { } virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style)) { return false; } - virtual bool IsFullScreen() const { return false; } + long WXUNUSED(style)) wxOVERRIDE { return false; } + virtual bool IsFullScreen() const wxOVERRIDE { return false; } // we need to override these functions to ensure that a child window is @@ -259,9 +259,9 @@ public: // behave as just a wxWindow by short-circuiting wxTLW changes to the base // class behaviour - virtual void AddChild(wxWindowBase *child) { wxWindow::AddChild(child); } + virtual void AddChild(wxWindowBase *child) wxOVERRIDE { wxWindow::AddChild(child); } - virtual bool Destroy() { return wxWindow::Destroy(); } + virtual bool Destroy() wxOVERRIDE { return wxWindow::Destroy(); } // extra platform-specific hacks #ifdef __WXMSW__ @@ -282,27 +282,27 @@ public: #endif // __WXMSW__ protected: - virtual void DoGetSize(int *width, int *height) const + virtual void DoGetSize(int *width, int *height) const wxOVERRIDE { wxWindow::DoGetSize(width, height); } - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE { wxWindow::DoSetSize(x, y, width, height, sizeFlags); } - virtual void DoGetClientSize(int *width, int *height) const + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE { wxWindow::DoGetClientSize(width, height); } - virtual void DoSetClientSize(int width, int height) + virtual void DoSetClientSize(int width, int height) wxOVERRIDE { wxWindow::DoSetClientSize(width, height); } - virtual void DoMoveWindow(int x, int y, int width, int height) + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE { wxWindow::DoMoveWindow(x, y, width, height); } @@ -310,7 +310,7 @@ protected: // no size hints virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), - int WXUNUSED(incW), int WXUNUSED(incH)) { } + int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE { } wxString m_title; }; diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index 4d0fd7b0f1..1d32cd2664 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -106,7 +106,7 @@ public: // Allocates a copy of this object. // Required for wxEvtHandler::AddPendingEvent // ------------------------------------------------------------------------ - virtual wxEvent *Clone() const + virtual wxEvent *Clone() const wxOVERRIDE { return new wxMediaEvent(*this); } @@ -215,8 +215,8 @@ protected: static const wxClassInfo* NextBackend(wxClassInfo::const_iterator* it); void OnMediaFinished(wxMediaEvent& evt); - virtual void DoMoveWindow(int x, int y, int w, int h); - wxSize DoGetBestSize() const; + virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE; + wxSize DoGetBestSize() const wxOVERRIDE; //FIXME: This is nasty... find a better way to work around //inheritance issues diff --git a/include/wx/menu.h b/include/wx/menu.h index e4dedcf2dd..f02280cb9b 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -528,17 +528,17 @@ public: virtual void Detach(); // need to override these ones to avoid virtual function hiding - virtual bool Enable(bool enable = true) { return wxWindow::Enable(enable); } - virtual void SetLabel(const wxString& s) { wxWindow::SetLabel(s); } - virtual wxString GetLabel() const { return wxWindow::GetLabel(); } + virtual bool Enable(bool enable = true) wxOVERRIDE { return wxWindow::Enable(enable); } + virtual void SetLabel(const wxString& s) wxOVERRIDE { wxWindow::SetLabel(s); } + virtual wxString GetLabel() const wxOVERRIDE { return wxWindow::GetLabel(); } // don't want menu bars to accept the focus by tabbing to them - virtual bool AcceptsFocusFromKeyboard() const { return false; } + virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } // update all menu item states in all menus virtual void UpdateMenus(); - virtual bool CanBeOutsideClientArea() const { return true; } + virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; } #if wxUSE_EXTENDED_RTTI // XTI helpers: diff --git a/include/wx/msgout.h b/include/wx/msgout.h index 63b39b92c2..2bfe423ab8 100644 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -86,10 +86,10 @@ public: protected: #if !wxUSE_UTF8_LOCALE_ONLY - virtual void DoPrintfWchar(const wxChar *format, ...); + virtual void DoPrintfWchar(const wxChar *format, ...) wxOVERRIDE; #endif #if wxUSE_UNICODE_UTF8 - virtual void DoPrintfUtf8(const char *format, ...); + virtual void DoPrintfUtf8(const char *format, ...) wxOVERRIDE; #endif private: @@ -109,7 +109,7 @@ class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput public: wxMessageOutputStderr(FILE *fp = stderr) : m_fp(fp) { } - virtual void Output(const wxString& str); + virtual void Output(const wxString& str) wxOVERRIDE; protected: // return the string with "\n" appended if it doesn't already terminate @@ -136,7 +136,7 @@ public: wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR) : m_flags(flags) { } - virtual void Output(const wxString& str); + virtual void Output(const wxString& str) wxOVERRIDE; private: wxMessageOutputFlags m_flags; @@ -153,7 +153,7 @@ class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput public: wxMessageOutputMessageBox() { } - virtual void Output(const wxString& str); + virtual void Output(const wxString& str) wxOVERRIDE; }; #endif // wxUSE_GUI && wxUSE_MSGDLG @@ -167,7 +167,7 @@ class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr public: wxMessageOutputDebug() { } - virtual void Output(const wxString& str); + virtual void Output(const wxString& str) wxOVERRIDE; }; // ---------------------------------------------------------------------------- @@ -179,7 +179,7 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput public: wxMessageOutputLog() { } - virtual void Output(const wxString& str); + virtual void Output(const wxString& str) wxOVERRIDE; }; #endif // _WX_MSGOUT_H_ diff --git a/include/wx/mstream.h b/include/wx/mstream.h index 5290f9b7cd..773321d6fa 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -36,20 +36,20 @@ public: } virtual ~wxMemoryInputStream(); - virtual wxFileOffset GetLength() const { return m_length; } - virtual bool IsSeekable() const { return true; } + virtual wxFileOffset GetLength() const wxOVERRIDE { return m_length; } + virtual bool IsSeekable() const wxOVERRIDE { return true; } - virtual char Peek(); - virtual bool CanRead() const; + virtual char Peek() wxOVERRIDE; + virtual bool CanRead() const wxOVERRIDE; wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } protected: wxStreamBuffer *m_i_streambuf; - size_t OnSysRead(void *buffer, size_t nbytes); - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - wxFileOffset OnSysTell() const; + size_t OnSysRead(void *buffer, size_t nbytes) wxOVERRIDE; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE; private: // common part of ctors taking wxInputStream @@ -68,8 +68,8 @@ public: // if data is !NULL it must be allocated with malloc() wxMemoryOutputStream(void *data = NULL, size_t length = 0); virtual ~wxMemoryOutputStream(); - virtual wxFileOffset GetLength() const { return m_o_streambuf->GetLastAccess(); } - virtual bool IsSeekable() const { return true; } + virtual wxFileOffset GetLength() const wxOVERRIDE { return m_o_streambuf->GetLastAccess(); } + virtual bool IsSeekable() const wxOVERRIDE { return true; } size_t CopyTo(void *buffer, size_t len) const; @@ -79,9 +79,9 @@ protected: wxStreamBuffer *m_o_streambuf; protected: - size_t OnSysWrite(const void *buffer, size_t nbytes); - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - wxFileOffset OnSysTell() const; + size_t OnSysWrite(const void *buffer, size_t nbytes) wxOVERRIDE; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream) wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream); diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h index e0328e9583..fbbc0d1efa 100644 --- a/include/wx/nativewin.h +++ b/include/wx/nativewin.h @@ -92,55 +92,55 @@ public: // provide (trivial) implementation of the base class pure virtuals - virtual void SetTitle(const wxString& WXUNUSED(title)) + virtual void SetTitle(const wxString& WXUNUSED(title)) wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); } - virtual wxString GetTitle() const + virtual wxString GetTitle() const wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); return wxString(); } - virtual void Maximize(bool WXUNUSED(maximize) = true) + virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); } - virtual bool IsMaximized() const + virtual bool IsMaximized() const wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); return false; } - virtual void Iconize(bool WXUNUSED(iconize) = true) + virtual void Iconize(bool WXUNUSED(iconize) = true) wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); } - virtual bool IsIconized() const + virtual bool IsIconized() const wxOVERRIDE { // this is called by wxGTK implementation so don't assert return false; } - virtual void Restore() + virtual void Restore() wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); } virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style) = wxFULLSCREEN_ALL) + long WXUNUSED(style) = wxFULLSCREEN_ALL) wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); return false; } - virtual bool IsFullScreen() const + virtual bool IsFullScreen() const wxOVERRIDE { wxFAIL_MSG( "not implemented for native windows" ); diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h index 7d8709933d..11aa5acf7d 100644 --- a/include/wx/nonownedwnd.h +++ b/include/wx/nonownedwnd.h @@ -62,13 +62,13 @@ public: // ------------------------------ virtual void AdjustForParentClientOrigin(int& WXUNUSED(x), int& WXUNUSED(y), - int WXUNUSED(sizeFlags) = 0) const + int WXUNUSED(sizeFlags) = 0) const wxOVERRIDE { // Non owned windows positions don't need to be adjusted for parent // client area origin so simply do nothing here. } - virtual void InheritAttributes() + virtual void InheritAttributes() wxOVERRIDE { // Non owned windows don't inherit attributes from their parent window // (if the parent frame is red, it doesn't mean that all dialogs shown diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 1535229aa0..7b82fbb2c5 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -125,7 +125,7 @@ public: // implement some base class functions - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; // On platforms that support it, get the theme page background colour, else invalid colour virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; } @@ -142,7 +142,7 @@ public: // wxBookCtrlBase overrides this method to return false but we do need // focus because we have tabs - virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } + virtual bool AcceptsFocus() const wxOVERRIDE { return wxControl::AcceptsFocus(); } #if wxUSE_EXTENDED_RTTI // XTI accessors diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h index af0f1160d8..cc47127859 100644 --- a/include/wx/odcombo.h +++ b/include/wx/odcombo.h @@ -77,22 +77,22 @@ public: virtual ~wxVListBoxComboPopup(); // required virtuals - virtual void Init(); - virtual bool Create(wxWindow* parent); - virtual void SetFocus(); - virtual wxWindow *GetControl() { return this; } - virtual void SetStringValue( const wxString& value ); - virtual wxString GetStringValue() const; + virtual void Init() wxOVERRIDE; + virtual bool Create(wxWindow* parent) wxOVERRIDE; + virtual void SetFocus() wxOVERRIDE; + virtual wxWindow *GetControl() wxOVERRIDE { return this; } + virtual void SetStringValue( const wxString& value ) wxOVERRIDE; + virtual wxString GetStringValue() const wxOVERRIDE; // more customization - virtual void OnPopup(); - virtual wxSize GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ); - virtual void PaintComboControl( wxDC& dc, const wxRect& rect ); - virtual void OnComboKeyEvent( wxKeyEvent& event ); - virtual void OnComboCharEvent( wxKeyEvent& event ); - virtual void OnComboDoubleClick(); - virtual bool LazyCreate(); - virtual bool FindItem(const wxString& item, wxString* trueItem); + virtual void OnPopup() wxOVERRIDE; + virtual wxSize GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ) wxOVERRIDE; + virtual void PaintComboControl( wxDC& dc, const wxRect& rect ) wxOVERRIDE; + virtual void OnComboKeyEvent( wxKeyEvent& event ) wxOVERRIDE; + virtual void OnComboCharEvent( wxKeyEvent& event ) wxOVERRIDE; + virtual void OnComboDoubleClick() wxOVERRIDE; + virtual bool LazyCreate() wxOVERRIDE; + virtual bool FindItem(const wxString& item, wxString* trueItem) wxOVERRIDE; // Item management void SetSelection( int item ); @@ -148,7 +148,7 @@ protected: virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags) const; // This is same as in wxVListBox - virtual wxCoord OnMeasureItem( size_t item ) const; + virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE; // Return item width, or -1 for calculating from text extent (default) virtual wxCoord OnMeasureItemWidth( size_t item ) const; @@ -158,8 +158,8 @@ protected: virtual void OnDrawBg(wxDC& dc, const wxRect& rect, int item, int flags) const; // Additional wxVListBox implementation (no need to override in derived classes) - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const; - void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; + void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; // filter mouse move events happening outside the list box // move selection with cursor @@ -308,23 +308,23 @@ public: } // wxControlWithItems methods - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; + virtual unsigned int GetCount() const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; virtual void Select(int n); - virtual int GetSelection() const; + virtual int GetSelection() const wxOVERRIDE; // Override these just to maintain consistency with virtual methods // between classes. - virtual void Clear(); - virtual void GetSelection(long *from, long *to) const; + virtual void Clear() wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - virtual void SetSelection(int n) { Select(n); } + virtual void SetSelection(int n) wxOVERRIDE { Select(n); } // Prevent a method from being hidden - virtual void SetSelection(long from, long to) + virtual void SetSelection(long from, long to) wxOVERRIDE { wxComboCtrl::SetSelection(from,to); } @@ -335,11 +335,11 @@ public: // Return the index of the widest item (recalculating it if necessary) virtual int GetWidestItem() { EnsurePopupControl(); return GetVListBoxComboPopup()->GetWidestItem(); } - virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } + virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); } protected: - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; // Callback for drawing. Font, background and text colour have been // prepared according to selection, focus and such. @@ -356,14 +356,14 @@ protected: // override base implementation so we can return the size for the // largest item - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // Callback for background drawing. Flags are same as with // OnDrawItem. virtual void OnDrawBackground( wxDC& dc, const wxRect& rect, int item, int flags ) const; // NULL popup can be used to indicate default interface - virtual void DoSetPopupControl(wxComboPopup* popup); + virtual void DoSetPopupControl(wxComboPopup* popup) wxOVERRIDE; // clears all allocated client datas void ClearClientDatas(); @@ -375,9 +375,9 @@ protected: virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; + void **clientData, wxClientDataType type) wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; + virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; // temporary storage for the initial choices //const wxString* m_baseChoices; diff --git a/include/wx/panel.h b/include/wx/panel.h index 11fc2c6416..e11db6728b 100644 --- a/include/wx/panel.h +++ b/include/wx/panel.h @@ -54,7 +54,7 @@ public: // implementation from now on // -------------------------- - virtual void InitDialog(); + virtual void InitDialog() wxOVERRIDE; private: wxDECLARE_NO_COPY_CLASS(wxPanelBase); diff --git a/include/wx/persist/bookctrl.h b/include/wx/persist/bookctrl.h index 38eee262e9..6b48ebe0b4 100644 --- a/include/wx/persist/bookctrl.h +++ b/include/wx/persist/bookctrl.h @@ -34,12 +34,12 @@ public: { } - virtual void Save() const + virtual void Save() const wxOVERRIDE { SaveValue(wxPERSIST_BOOK_SELECTION, Get()->GetSelection()); } - virtual bool Restore() + virtual bool Restore() wxOVERRIDE { long sel; if ( RestoreValue(wxPERSIST_BOOK_SELECTION, &sel) ) @@ -55,7 +55,7 @@ public: return false; } - virtual wxString GetKind() const { return wxPERSIST_BOOK_KIND; } + virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_BOOK_KIND; } }; inline wxPersistentObject *wxCreatePersistentObject(wxBookCtrlBase *book) diff --git a/include/wx/persist/splitter.h b/include/wx/persist/splitter.h index d8369c3783..46979d673f 100644 --- a/include/wx/persist/splitter.h +++ b/include/wx/persist/splitter.h @@ -35,7 +35,7 @@ public: { } - virtual void Save() const + virtual void Save() const wxOVERRIDE { wxSplitterWindow* const splitter = Get(); @@ -43,7 +43,7 @@ public: SaveValue(wxPERSIST_SPLITTER_POSITION, pos); } - virtual bool Restore() + virtual bool Restore() wxOVERRIDE { int pos; if ( !RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) ) @@ -57,7 +57,7 @@ public: return true; } - virtual wxString GetKind() const { return wxPERSIST_SPLITTER_KIND; } + virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_SPLITTER_KIND; } }; inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter) diff --git a/include/wx/persist/toplevel.h b/include/wx/persist/toplevel.h index 7d79f23460..c221ed3392 100644 --- a/include/wx/persist/toplevel.h +++ b/include/wx/persist/toplevel.h @@ -46,7 +46,7 @@ public: { } - virtual void Save() const + virtual void Save() const wxOVERRIDE { const wxTopLevelWindow * const tlw = Get(); @@ -69,7 +69,7 @@ public: SaveValue(wxPERSIST_TLW_ICONIZED, tlw->IsIconized()); } - virtual bool Restore() + virtual bool Restore() wxOVERRIDE { wxTopLevelWindow * const tlw = Get(); @@ -117,7 +117,7 @@ public: return hasSize; } - virtual wxString GetKind() const { return wxPERSIST_TLW_KIND; } + virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TLW_KIND; } }; inline wxPersistentObject *wxCreatePersistentObject(wxTopLevelWindow *tlw) diff --git a/include/wx/persist/treebook.h b/include/wx/persist/treebook.h index 1c0ba94631..9a38296879 100644 --- a/include/wx/persist/treebook.h +++ b/include/wx/persist/treebook.h @@ -38,7 +38,7 @@ public: { } - virtual void Save() const + virtual void Save() const wxOVERRIDE { const wxTreebook * const book = GetTreeBook(); @@ -60,7 +60,7 @@ public: wxPersistentBookCtrl::Save(); } - virtual bool Restore() + virtual bool Restore() wxOVERRIDE { wxTreebook * const book = GetTreeBook(); @@ -83,7 +83,7 @@ public: return wxPersistentBookCtrl::Restore(); } - virtual wxString GetKind() const { return wxPERSIST_TREEBOOK_KIND; } + virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TREEBOOK_KIND; } wxTreebook *GetTreeBook() const { return static_cast(Get()); } }; diff --git a/include/wx/persist/window.h b/include/wx/persist/window.h index 279e11d26d..d0bec23520 100644 --- a/include/wx/persist/window.h +++ b/include/wx/persist/window.h @@ -33,7 +33,7 @@ public: wxPersistentWindowBase::HandleDestroy, this); } - virtual wxString GetName() const + virtual wxString GetName() const wxOVERRIDE { const wxString name = GetWindow()->GetName(); wxASSERT_MSG( !name.empty(), "persistent windows should be named!" ); diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index 3c761da876..5266b1d9b8 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -117,7 +117,7 @@ public: // public API protected: // overridden base class methods #if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip *tip); + virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE; #endif // wxUSE_TOOLTIPS diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 6b61517f39..3f38bdd716 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -44,7 +44,7 @@ public: virtual void Position(const wxPoint& ptOrigin, const wxSize& size); - virtual bool IsTopLevel() const { return true; } + virtual bool IsTopLevel() const wxOVERRIDE { return true; } wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase); }; @@ -107,10 +107,10 @@ public: virtual bool ProcessLeftDown(wxMouseEvent& event); // Overridden to grab the input on some plaforms - virtual bool Show( bool show = true ); + virtual bool Show( bool show = true ) wxOVERRIDE; // Override to implement delayed destruction of this window. - virtual bool Destroy(); + virtual bool Destroy() wxOVERRIDE; protected: // common part of all ctors diff --git a/include/wx/preferences.h b/include/wx/preferences.h index 7eee648289..5055011b35 100644 --- a/include/wx/preferences.h +++ b/include/wx/preferences.h @@ -79,7 +79,7 @@ public: wxStockPreferencesPage(Kind kind) : m_kind(kind) {} Kind GetKind() const { return m_kind; } - virtual wxString GetName() const; + virtual wxString GetName() const wxOVERRIDE; #ifdef __WXOSX_COCOA__ virtual wxBitmap GetLargeIcon() const; #endif diff --git a/include/wx/private/fdiodispatcher.h b/include/wx/private/fdiodispatcher.h index 0b85505cc0..704bd46377 100644 --- a/include/wx/private/fdiodispatcher.h +++ b/include/wx/private/fdiodispatcher.h @@ -100,13 +100,13 @@ public: // register handler for the given descriptor with the dispatcher, return // true on success or false on error - virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags); + virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE; // modify descriptor flags or handler, return true on success - virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags); + virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE; // unregister descriptor previously registered with RegisterFD() - virtual bool UnregisterFD(int fd); + virtual bool UnregisterFD(int fd) wxOVERRIDE; virtual ~wxMappedFDIODispatcher() { } diff --git a/include/wx/private/fdioeventloopsourcehandler.h b/include/wx/private/fdioeventloopsourcehandler.h index f457a09e5c..5ac17de240 100644 --- a/include/wx/private/fdioeventloopsourcehandler.h +++ b/include/wx/private/fdioeventloopsourcehandler.h @@ -25,9 +25,9 @@ public: } // Just forward to the real handler. - virtual void OnReadWaiting() { m_handler->OnReadWaiting(); } - virtual void OnWriteWaiting() { m_handler->OnWriteWaiting(); } - virtual void OnExceptionWaiting() { m_handler->OnExceptionWaiting(); } + virtual void OnReadWaiting() wxOVERRIDE { m_handler->OnReadWaiting(); } + virtual void OnWriteWaiting() wxOVERRIDE { m_handler->OnWriteWaiting(); } + virtual void OnExceptionWaiting() wxOVERRIDE { m_handler->OnExceptionWaiting(); } protected: wxEventLoopSourceHandler* const m_handler; diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h index aaf5ab4afb..a4ca08aee7 100644 --- a/include/wx/private/fileback.h +++ b/include/wx/private/fileback.h @@ -58,17 +58,17 @@ public: // If the length of the backer's parent stream is unknown then GetLength() // returns wxInvalidOffset until the parent has been read to the end. - wxFileOffset GetLength() const; + wxFileOffset GetLength() const wxOVERRIDE; // Returns the length, reading the parent stream to the end if necessary. wxFileOffset FindLength() const; - bool IsSeekable() const { return true; } + bool IsSeekable() const wxOVERRIDE { return true; } protected: - size_t OnSysRead(void *buffer, size_t size); - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - wxFileOffset OnSysTell() const; + size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE; private: wxBackingFile m_backer; diff --git a/include/wx/private/markupparserattr.h b/include/wx/private/markupparserattr.h index d433879daf..998a0414a9 100644 --- a/include/wx/private/markupparserattr.h +++ b/include/wx/private/markupparserattr.h @@ -68,33 +68,33 @@ public: // Implement all pure virtual methods inherited from the base class in // terms of our own ones. - virtual void OnBoldStart() { DoChangeFont(&wxFont::Bold); } - virtual void OnBoldEnd() { DoEndAttr(); } + virtual void OnBoldStart() wxOVERRIDE { DoChangeFont(&wxFont::Bold); } + virtual void OnBoldEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnItalicStart() { DoChangeFont(&wxFont::Italic); } - virtual void OnItalicEnd() { DoEndAttr(); } + virtual void OnItalicStart() wxOVERRIDE { DoChangeFont(&wxFont::Italic); } + virtual void OnItalicEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnUnderlinedStart() { DoChangeFont(&wxFont::Underlined); } - virtual void OnUnderlinedEnd() { DoEndAttr(); } + virtual void OnUnderlinedStart() wxOVERRIDE { DoChangeFont(&wxFont::Underlined); } + virtual void OnUnderlinedEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnStrikethroughStart() { DoChangeFont(&wxFont::Strikethrough); } - virtual void OnStrikethroughEnd() { DoEndAttr(); } + virtual void OnStrikethroughStart() wxOVERRIDE { DoChangeFont(&wxFont::Strikethrough); } + virtual void OnStrikethroughEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnBigStart() { DoChangeFont(&wxFont::Larger); } - virtual void OnBigEnd() { DoEndAttr(); } + virtual void OnBigStart() wxOVERRIDE { DoChangeFont(&wxFont::Larger); } + virtual void OnBigEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnSmallStart() { DoChangeFont(&wxFont::Smaller); } - virtual void OnSmallEnd() { DoEndAttr(); } + virtual void OnSmallStart() wxOVERRIDE { DoChangeFont(&wxFont::Smaller); } + virtual void OnSmallEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnTeletypeStart() + virtual void OnTeletypeStart() wxOVERRIDE { wxFont font(GetFont()); font.SetFamily(wxFONTFAMILY_TELETYPE); DoSetFont(font); } - virtual void OnTeletypeEnd() { DoEndAttr(); } + virtual void OnTeletypeEnd() wxOVERRIDE { DoEndAttr(); } - virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr) + virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr) wxOVERRIDE { wxFont font(GetFont()); if ( !spanAttr.m_fontFace.empty() ) @@ -147,7 +147,7 @@ public: m_attrs.push(attr); } - virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr)) + virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr)) wxOVERRIDE { DoEndAttr(); } diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h index 644377739f..17e12b6247 100644 --- a/include/wx/private/selectdispatcher.h +++ b/include/wx/private/selectdispatcher.h @@ -91,11 +91,11 @@ public: wxSelectDispatcher() { m_maxFD = -1; } // implement pure virtual methods of the base class - virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL); - virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL); - virtual bool UnregisterFD(int fd); - virtual bool HasPending() const; - virtual int Dispatch(int timeout = TIMEOUT_INFINITE); + virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) wxOVERRIDE; + virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) wxOVERRIDE; + virtual bool UnregisterFD(int fd) wxOVERRIDE; + virtual bool HasPending() const wxOVERRIDE; + virtual int Dispatch(int timeout = TIMEOUT_INFINITE) wxOVERRIDE; private: // common part of RegisterFD() and ModifyFD() diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index a6f22fa098..7a43e7d343 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -122,34 +122,34 @@ private: class WXDLLIMPEXP_CORE wxNativePrintFactory: public wxPrintFactory { public: - virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ); + virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ) wxOVERRIDE; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ); + wxPrintDialogData *data = NULL ) wxOVERRIDE; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout, - wxPrintData *data ); + wxPrintData *data ) wxOVERRIDE; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ); + wxPrintDialogData *data = NULL ) wxOVERRIDE; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ); + wxPrintData *data ) wxOVERRIDE; virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ); + wxPageSetupDialogData * data = NULL ) wxOVERRIDE; - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ); + virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxOVERRIDE; - virtual bool HasPrintSetupDialog(); - virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ); - virtual bool HasOwnPrintToFile(); - virtual bool HasPrinterLine(); - virtual wxString CreatePrinterLine(); - virtual bool HasStatusLine(); - virtual wxString CreateStatusLine(); + virtual bool HasPrintSetupDialog() wxOVERRIDE; + virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) wxOVERRIDE; + virtual bool HasOwnPrintToFile() wxOVERRIDE; + virtual bool HasPrinterLine() wxOVERRIDE; + virtual wxString CreatePrinterLine() wxOVERRIDE; + virtual bool HasStatusLine() wxOVERRIDE; + virtual wxString CreateStatusLine() wxOVERRIDE; - virtual wxPrintNativeDataBase *CreatePrintNativeData(); + virtual wxPrintNativeDataBase *CreatePrintNativeData() wxOVERRIDE; }; //---------------------------------------------------------------------------- @@ -229,14 +229,14 @@ public: wxPrinter(wxPrintDialogData *data = NULL); virtual ~wxPrinter(); - virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout); - virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message); + virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout) wxOVERRIDE; + virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message) wxOVERRIDE; - 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; - virtual wxPrintDialogData& GetPrintDialogData() const; + virtual wxPrintDialogData& GetPrintDialogData() const wxOVERRIDE; protected: wxPrinterBase *m_pimpl; @@ -688,35 +688,35 @@ public: wxPrintData *data); virtual ~wxPrintPreview(); - virtual bool SetCurrentPage(int pageNum); - virtual int GetCurrentPage() const; - virtual void SetPrintout(wxPrintout *printout); - virtual wxPrintout *GetPrintout() const; - virtual wxPrintout *GetPrintoutForPrinting() const; - virtual void SetFrame(wxFrame *frame); - virtual void SetCanvas(wxPreviewCanvas *canvas); + virtual bool SetCurrentPage(int pageNum) wxOVERRIDE; + virtual int GetCurrentPage() const wxOVERRIDE; + virtual void SetPrintout(wxPrintout *printout) wxOVERRIDE; + virtual wxPrintout *GetPrintout() const wxOVERRIDE; + virtual wxPrintout *GetPrintoutForPrinting() const wxOVERRIDE; + virtual void SetFrame(wxFrame *frame) wxOVERRIDE; + virtual void SetCanvas(wxPreviewCanvas *canvas) wxOVERRIDE; - virtual wxFrame *GetFrame() const; - virtual wxPreviewCanvas *GetCanvas() const; - virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc); - virtual bool UpdatePageRendering(); - virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc); - virtual void AdjustScrollbars(wxPreviewCanvas *canvas); - virtual bool RenderPage(int pageNum); - virtual void SetZoom(int percent); - virtual int GetZoom() const; + virtual wxFrame *GetFrame() const wxOVERRIDE; + virtual wxPreviewCanvas *GetCanvas() const wxOVERRIDE; + virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc) wxOVERRIDE; + virtual bool UpdatePageRendering() wxOVERRIDE; + virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc) wxOVERRIDE; + virtual void AdjustScrollbars(wxPreviewCanvas *canvas) wxOVERRIDE; + virtual bool RenderPage(int pageNum) wxOVERRIDE; + virtual void SetZoom(int percent) wxOVERRIDE; + virtual int GetZoom() const wxOVERRIDE; - virtual bool Print(bool interactive); - virtual void DetermineScaling(); + virtual bool Print(bool interactive) wxOVERRIDE; + virtual void DetermineScaling() wxOVERRIDE; - virtual wxPrintDialogData& GetPrintDialogData(); + virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE; - virtual int GetMaxPage() const; - virtual int GetMinPage() const; + virtual int GetMaxPage() const wxOVERRIDE; + virtual int GetMinPage() const wxOVERRIDE; - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - virtual void SetOk(bool ok); + virtual bool Ok() const wxOVERRIDE { return IsOk(); } + virtual bool IsOk() const wxOVERRIDE; + virtual void SetOk(bool ok) wxOVERRIDE; private: wxPrintPreviewBase *m_pimpl; diff --git a/include/wx/process.h b/include/wx/process.h index 4c0018e6a6..73df968a55 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -167,7 +167,7 @@ public: int GetExitCode() { return m_exitcode; } // implement the base class pure virtual - virtual wxEvent *Clone() const { return new wxProcessEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxProcessEvent(*this); } public: int m_pid, diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index ce4aca0f90..6c8032c5a8 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -75,7 +75,7 @@ public: /** Deletes all properties on page. */ - virtual void Clear(); + virtual void Clear() wxOVERRIDE; /** Reduces column sizes to minimum possible that contents are still @@ -147,7 +147,7 @@ public: */ virtual void OnShow(); - virtual void RefreshProperty( wxPGProperty* p ); + virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE; /** Sets splitter position on page. @remarks @@ -163,7 +163,7 @@ protected: */ virtual void DoSetSplitterPosition( int pos, int splitterColumn = 0, - int flags = wxPG_SPLITTER_REFRESH ); + int flags = wxPG_SPLITTER_REFRESH ) wxOVERRIDE; /** Page label (may be referred as name in some parts of documentation). Can be set in constructor, or passed in @@ -268,7 +268,7 @@ public: /** Deletes all all properties and all pages. */ - virtual void Clear(); + virtual void Clear() wxOVERRIDE; /** Deletes all properties on given page. */ @@ -385,7 +385,7 @@ public: which can be useful for forward-iterating through arbitrary property containers. */ - virtual wxPGVIterator GetVIterator( int flags ) const; + virtual wxPGVIterator GetVIterator( int flags ) const wxOVERRIDE; /** Returns currently selected page. */ @@ -424,7 +424,7 @@ public: protected: /** Returns wxPropertyGridPageState of given page, current page's for -1. */ - virtual wxPropertyGridPageState* GetPageState( int page ) const; + virtual wxPropertyGridPageState* GetPageState( int page ) const wxOVERRIDE; public: /** Returns number of managed pages. */ @@ -496,7 +496,7 @@ public: virtual bool IsPropertySelected( wxPGPropArg id ) const; virtual void Refresh( bool eraseBackground = true, - const wxRect* rect = (const wxRect*) NULL ); + const wxRect* rect = (const wxRect*) NULL ) wxOVERRIDE; /** Removes a page. @return @@ -622,23 +622,23 @@ protected: virtual wxPropertyGrid* CreatePropertyGrid() const; public: - virtual void RefreshProperty( wxPGProperty* p ); + virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE; // // Overridden functions - no documentation required. // void SetId( wxWindowID winid ); - virtual void SetExtraStyle ( long exStyle ); - virtual bool SetFont ( const wxFont& font ); - virtual void SetWindowStyleFlag ( long style ); - virtual bool Reparent( wxWindowBase *newParent ); + virtual void SetExtraStyle ( long exStyle ) wxOVERRIDE; + virtual bool SetFont ( const wxFont& font ) wxOVERRIDE; + virtual void SetWindowStyleFlag ( long style ) wxOVERRIDE; + virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoFreeze(); - virtual void DoThaw(); + virtual void DoFreeze() wxOVERRIDE; + virtual void DoThaw() wxOVERRIDE; // // Event handlers @@ -704,10 +704,10 @@ protected: bool m_showHeader; - virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const; + virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const wxOVERRIDE; /** Select and displays a given page. */ - virtual bool DoSelectPage( int index ); + virtual bool DoSelectPage( int index ) wxOVERRIDE; // Sets some members to defaults. void Init1(); @@ -719,7 +719,7 @@ protected: virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; #endif*/ - virtual bool ProcessEvent( wxEvent& event ); + virtual bool ProcessEvent( wxEvent& event ) wxOVERRIDE; /** Recalculates new positions for components, according to the given size. @@ -739,8 +739,8 @@ protected: void SetDescribedProperty( wxPGProperty* p ); // Reimplement these to handle "descboxheight" state item - virtual bool SetEditableStateItem( const wxString& name, wxVariant value ); - virtual wxVariant GetEditableStateItem( const wxString& name ) const; + virtual bool SetEditableStateItem( const wxString& name, wxVariant value ) wxOVERRIDE; + virtual wxVariant GetEditableStateItem( const wxString& name ) const wxOVERRIDE; private: DECLARE_EVENT_TABLE() diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index 36356ddd63..2ad91a32ef 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -313,10 +313,10 @@ public: } private: - virtual wxObjectRefData *CreateRefData() const + virtual wxObjectRefData *CreateRefData() const wxOVERRIDE { return new wxPGCellData(); } - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; }; // ----------------------------------------------------------------------- diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index 8a651306eb..08473b57f0 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -834,7 +834,7 @@ public: /** Deletes all properties. */ - virtual void Clear(); + virtual void Clear() wxOVERRIDE; /** Clears action triggers for given action. @param action @@ -1090,7 +1090,7 @@ public: /** Redraws given property. */ - virtual void RefreshProperty( wxPGProperty* p ); + virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE; /** Registers a new editor class. @return @@ -1700,7 +1700,7 @@ public: */ bool UnfocusEditor(); - virtual void SetWindowStyleFlag( long style ); + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 ); @@ -1763,20 +1763,20 @@ public: bool DoSelectProperty( wxPGProperty* p, unsigned int flags = 0 ); // Overridden functions. - virtual bool Destroy(); + virtual bool Destroy() wxOVERRIDE; // Returns property at given y coordinate (relative to grid's top left). wxPGProperty* GetItemAtY( int y ) const { return DoGetItemAtY(y); } virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - virtual bool SetFont( const wxFont& font ); - virtual void SetExtraStyle( long exStyle ); - virtual bool Reparent( wxWindowBase *newParent ); + const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + virtual bool SetFont( const wxFont& font ) wxOVERRIDE; + virtual void SetExtraStyle( long exStyle ) wxOVERRIDE; + virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; protected: - virtual void DoThaw(); + virtual void DoThaw() wxOVERRIDE; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; #ifndef wxPG_ICON_WIDTH wxBitmap *m_expandbmp, *m_collbmp; @@ -2392,7 +2392,7 @@ public: ~wxPropertyGridEvent(); /** Copyer. */ - virtual wxEvent* Clone() const; + virtual wxEvent* Clone() const wxOVERRIDE; /** Returns the column index associated with this event. diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h index fd44ce593a..57a9d94fa5 100644 --- a/include/wx/protocol/file.h +++ b/include/wx/protocol/file.h @@ -23,10 +23,10 @@ public: wxFileProto(); virtual ~wxFileProto(); - bool Abort() { return true; } - wxString GetContentType() const { return wxEmptyString; } + bool Abort() wxOVERRIDE { return true; } + wxString GetContentType() const wxOVERRIDE { return wxEmptyString; } - wxInputStream *GetInputStream(const wxString& path); + wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto) diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h index a87a638066..e3501a3f0d 100644 --- a/include/wx/protocol/ftp.h +++ b/include/wx/protocol/ftp.h @@ -34,12 +34,12 @@ public: virtual ~wxFTP(); // Connecting and disconnecting - virtual bool Connect(const wxSockAddress& addr, bool wait = true); - virtual bool Connect(const wxString& host) { return Connect(host, 0); } + virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE; + virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); } virtual bool Connect(const wxString& host, unsigned short port); // disconnect - virtual bool Close(); + virtual bool Close() wxOVERRIDE; // Parameters set up @@ -52,7 +52,7 @@ public: // Generic FTP interface // FTP doesn't know the MIME type of the last downloaded/uploaded file - virtual wxString GetContentType() const { return wxEmptyString; } + virtual wxString GetContentType() const wxOVERRIDE { return wxEmptyString; } // the last FTP server reply const wxString& GetLastResult() const { return m_lastResult; } @@ -87,9 +87,9 @@ public: bool FileExists(const wxString& fileName); // Download methods - bool Abort(); + bool Abort() wxOVERRIDE; - virtual wxInputStream *GetInputStream(const wxString& path); + virtual wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; virtual wxOutputStream *GetOutputStream(const wxString& path); // Directory listing diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h index cfa2e6f944..6bf36d396c 100644 --- a/include/wx/protocol/http.h +++ b/include/wx/protocol/http.h @@ -25,13 +25,13 @@ public: virtual ~wxHTTP(); virtual bool Connect(const wxString& host, unsigned short port); - virtual bool Connect(const wxString& host) { return Connect(host, 0); } - virtual bool Connect(const wxSockAddress& addr, bool wait); - bool Abort(); + virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); } + virtual bool Connect(const wxSockAddress& addr, bool wait) wxOVERRIDE; + bool Abort() wxOVERRIDE; - wxInputStream *GetInputStream(const wxString& path); + wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; - wxString GetContentType() const; + wxString GetContentType() const wxOVERRIDE; wxString GetHeader(const wxString& header) const; int GetResponse() const { return m_http_response; } diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h index e6a32ef55c..23ffc1dd92 100644 --- a/include/wx/protocol/protocol.h +++ b/include/wx/protocol/protocol.h @@ -61,7 +61,7 @@ public: #if wxUSE_SOCKETS bool Reconnect(); virtual bool Connect( const wxString& WXUNUSED(host) ) { return false; } - virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true) + virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true) wxOVERRIDE { return wxSocketClient::Connect(addr); } // read a '\r\n' terminated line from the given socket and put it in @@ -87,7 +87,7 @@ public: // override wxSocketBase::SetTimeout function to avoid that the internal // m_uiDefaultTimeout goes out-of-sync: - virtual void SetTimeout(long seconds) + virtual void SetTimeout(long seconds) wxOVERRIDE { SetDefaultTimeout(seconds); } diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h index e334ca247e..c83d4acafc 100644 --- a/include/wx/rearrangectrl.h +++ b/include/wx/rearrangectrl.h @@ -97,7 +97,7 @@ public: // Override this to keep our m_order array in sync with the real item state. - virtual void Check(unsigned int item, bool check = true); + virtual void Check(unsigned int item, bool check = true) wxOVERRIDE; private: // swap two items at the given positions in the listbox diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h index b951412999..d076ec4e97 100644 --- a/include/wx/ribbon/art.h +++ b/include/wx/ribbon/art.h @@ -409,80 +409,80 @@ public: wxRibbonMSWArtProvider(bool set_colour_scheme = true); virtual ~wxRibbonMSWArtProvider(); - wxRibbonArtProvider* Clone() const; - void SetFlags(long flags); - long GetFlags() const; + wxRibbonArtProvider* Clone() const wxOVERRIDE; + void SetFlags(long flags) wxOVERRIDE; + long GetFlags() const wxOVERRIDE; - int GetMetric(int id) const; - void SetMetric(int id, int new_val); - void SetFont(int id, const wxFont& font); - wxFont GetFont(int id) const; - wxColour GetColour(int id) const; - void SetColour(int id, const wxColor& colour); + int GetMetric(int id) const wxOVERRIDE; + void SetMetric(int id, int new_val) wxOVERRIDE; + void SetFont(int id, const wxFont& font) wxOVERRIDE; + wxFont GetFont(int id) const wxOVERRIDE; + wxColour GetColour(int id) const wxOVERRIDE; + void SetColour(int id, const wxColor& colour) wxOVERRIDE; void GetColourScheme(wxColour* primary, wxColour* secondary, - wxColour* tertiary) const; + wxColour* tertiary) const wxOVERRIDE; void SetColourScheme(const wxColour& primary, const wxColour& secondary, - const wxColour& tertiary); + const wxColour& tertiary) wxOVERRIDE; int GetTabCtrlHeight( wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfoArray& pages); + const wxRibbonPageTabInfoArray& pages) wxOVERRIDE; void DrawTabCtrlBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawTab(wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfo& tab); + const wxRibbonPageTabInfo& tab) wxOVERRIDE; void DrawTabSeparator( wxDC& dc, wxWindow* wnd, const wxRect& rect, - double visibility); + double visibility) wxOVERRIDE; void DrawPageBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawScrollButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, - long style); + long style) wxOVERRIDE; void DrawPanelBackground( wxDC& dc, wxRibbonPanel* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawGalleryBackground( wxDC& dc, wxRibbonGallery* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawGalleryItemBackground( wxDC& dc, wxRibbonGallery* wnd, const wxRect& rect, - wxRibbonGalleryItem* item); + wxRibbonGalleryItem* item) wxOVERRIDE; void DrawMinimisedPanel( wxDC& dc, wxRibbonPanel* wnd, const wxRect& rect, - wxBitmap& bitmap); + wxBitmap& bitmap) wxOVERRIDE; void DrawButtonBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawButtonBarButton( wxDC& dc, @@ -492,17 +492,17 @@ public: long state, const wxString& label, const wxBitmap& bitmap_large, - const wxBitmap& bitmap_small); + const wxBitmap& bitmap_small) wxOVERRIDE; void DrawToolBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawToolGroupBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawTool( wxDC& dc, @@ -510,17 +510,17 @@ public: const wxRect& rect, const wxBitmap& bitmap, wxRibbonButtonKind kind, - long state); + long state) wxOVERRIDE; void DrawToggleButton( wxDC& dc, wxRibbonBar* wnd, const wxRect& rect, - wxRibbonDisplayMode mode); + wxRibbonDisplayMode mode) wxOVERRIDE; void DrawHelpButton(wxDC& dc, wxRibbonBar* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void GetBarTabWidth( wxDC& dc, @@ -530,34 +530,34 @@ public: int* ideal, int* small_begin_need_separator, int* small_must_have_separator, - int* minimum); + int* minimum) wxOVERRIDE; wxSize GetScrollButtonMinimumSize( wxDC& dc, wxWindow* wnd, - long style); + long style) wxOVERRIDE; wxSize GetPanelSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize client_size, - wxPoint* client_offset); + wxPoint* client_offset) wxOVERRIDE; wxSize GetPanelClientSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize size, - wxPoint* client_offset); + wxPoint* client_offset) wxOVERRIDE; wxRect GetPanelExtButtonArea( wxDC& dc, const wxRibbonPanel* wnd, - wxRect rect); + wxRect rect) wxOVERRIDE; wxSize GetGallerySize( wxDC& dc, const wxRibbonGallery* wnd, - wxSize client_size); + wxSize client_size) wxOVERRIDE; wxSize GetGalleryClientSize( wxDC& dc, @@ -566,13 +566,13 @@ public: wxPoint* client_offset, wxRect* scroll_up_button, wxRect* scroll_down_button, - wxRect* extension_button); + wxRect* extension_button) wxOVERRIDE; wxRect GetPageBackgroundRedrawArea( wxDC& dc, const wxRibbonPage* wnd, wxSize page_old_size, - wxSize page_new_size); + wxSize page_new_size) wxOVERRIDE; bool GetButtonBarButtonSize( wxDC& dc, @@ -584,13 +584,13 @@ public: wxSize bitmap_size_small, wxSize* button_size, wxRect* normal_region, - wxRect* dropdown_region); + wxRect* dropdown_region) wxOVERRIDE; wxSize GetMinimisedPanelMinimumSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize* desired_bitmap_size, - wxDirection* expanded_panel_direction); + wxDirection* expanded_panel_direction) wxOVERRIDE; wxSize GetToolSize( wxDC& dc, @@ -599,11 +599,11 @@ public: wxRibbonButtonKind kind, bool is_first, bool is_last, - wxRect* dropdown_region); + wxRect* dropdown_region) wxOVERRIDE; - wxRect GetBarToggleButtonArea(const wxRect& rect); + wxRect GetBarToggleButtonArea(const wxRect& rect) wxOVERRIDE; - wxRect GetRibbonHelpButtonArea(const wxRect& rect); + wxRect GetRibbonHelpButtonArea(const wxRect& rect) wxOVERRIDE; protected: void ReallyDrawTabSeparator(wxWindow* wnd, const wxRect& rect, double visibility); @@ -768,52 +768,52 @@ public: wxRibbonAUIArtProvider(); virtual ~wxRibbonAUIArtProvider(); - wxRibbonArtProvider* Clone() const; + wxRibbonArtProvider* Clone() const wxOVERRIDE; - wxColour GetColour(int id) const; - void SetColour(int id, const wxColor& colour); + wxColour GetColour(int id) const wxOVERRIDE; + void SetColour(int id, const wxColor& colour) wxOVERRIDE; void SetColourScheme(const wxColour& primary, const wxColour& secondary, - const wxColour& tertiary); - void SetFont(int id, const wxFont& font); + const wxColour& tertiary) wxOVERRIDE; + void SetFont(int id, const wxFont& font) wxOVERRIDE; wxSize GetScrollButtonMinimumSize( wxDC& dc, wxWindow* wnd, - long style); + long style) wxOVERRIDE; void DrawScrollButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, - long style); + long style) wxOVERRIDE; wxSize GetPanelSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize client_size, - wxPoint* client_offset); + wxPoint* client_offset) wxOVERRIDE; wxSize GetPanelClientSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize size, - wxPoint* client_offset); + wxPoint* client_offset) wxOVERRIDE; wxRect GetPanelExtButtonArea( wxDC& dc, const wxRibbonPanel* wnd, - wxRect rect); + wxRect rect) wxOVERRIDE; void DrawTabCtrlBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; int GetTabCtrlHeight( wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfoArray& pages); + const wxRibbonPageTabInfoArray& pages) wxOVERRIDE; void GetBarTabWidth( wxDC& dc, @@ -823,49 +823,49 @@ public: int* ideal, int* small_begin_need_separator, int* small_must_have_separator, - int* minimum); + int* minimum) wxOVERRIDE; void DrawTab(wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfo& tab); + const wxRibbonPageTabInfo& tab) wxOVERRIDE; void DrawTabSeparator( wxDC& dc, wxWindow* wnd, const wxRect& rect, - double visibility); + double visibility) wxOVERRIDE; void DrawPageBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawPanelBackground( wxDC& dc, wxRibbonPanel* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawMinimisedPanel( wxDC& dc, wxRibbonPanel* wnd, const wxRect& rect, - wxBitmap& bitmap); + wxBitmap& bitmap) wxOVERRIDE; void DrawGalleryBackground( wxDC& dc, wxRibbonGallery* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawGalleryItemBackground( wxDC& dc, wxRibbonGallery* wnd, const wxRect& rect, - wxRibbonGalleryItem* item); + wxRibbonGalleryItem* item) wxOVERRIDE; void DrawButtonBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawButtonBarButton( wxDC& dc, @@ -875,17 +875,17 @@ public: long state, const wxString& label, const wxBitmap& bitmap_large, - const wxBitmap& bitmap_small); + const wxBitmap& bitmap_small) wxOVERRIDE; void DrawToolBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawToolGroupBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawTool( wxDC& dc, @@ -893,13 +893,13 @@ public: const wxRect& rect, const wxBitmap& bitmap, wxRibbonButtonKind kind, - long state); + long state) wxOVERRIDE; protected: void DrawPartialPanelBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect); void DrawGalleryButton(wxDC& dc, wxRect rect, - wxRibbonGalleryButtonState state, wxBitmap* bitmaps); + wxRibbonGalleryButtonState state, wxBitmap* bitmaps) wxOVERRIDE; wxColour m_tab_ctrl_background_colour; wxColour m_tab_ctrl_background_gradient_colour; diff --git a/include/wx/ribbon/bar.h b/include/wx/ribbon/bar.h index 2b454543fd..c4904e9c64 100644 --- a/include/wx/ribbon/bar.h +++ b/include/wx/ribbon/bar.h @@ -65,7 +65,7 @@ public: m_page = c.m_page; } #endif - wxEvent *Clone() const { return new wxRibbonBarEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxRibbonBarEvent(*this); } wxRibbonPage* GetPage() {return m_page;} void SetPage(wxRibbonPage* page) {m_page = page;} @@ -119,7 +119,7 @@ public: void SetTabCtrlMargins(int left, int right); - void SetArtProvider(wxRibbonArtProvider* art); + void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE; bool SetActivePage(size_t page); bool SetActivePage(wxRibbonPage* page); @@ -144,11 +144,11 @@ public: void HidePanels() { ShowPanels(false); } bool ArePanelsShown() const { return m_arePanelsShown; } - virtual bool HasMultiplePages() const { return true; } + virtual bool HasMultiplePages() const wxOVERRIDE { return true; } - void SetWindowStyleFlag(long style); - long GetWindowStyleFlag() const; - virtual bool Realize(); + void SetWindowStyleFlag(long style) wxOVERRIDE; + long GetWindowStyleFlag() const wxOVERRIDE; + virtual bool Realize() wxOVERRIDE; // Implementation only. bool IsToggleButtonHovered() const { return m_toggle_button_hovered; } @@ -159,8 +159,8 @@ public: protected: friend class wxRibbonPage; - virtual wxSize DoGetBestSize() const; - wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const wxOVERRIDE; + wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL); void HitTestRibbonButton(const wxRect& rect, const wxPoint& position, bool &hover_flag); diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h index ab637a104e..93bdd09c29 100644 --- a/include/wx/ribbon/buttonbar.h +++ b/include/wx/ribbon/buttonbar.h @@ -133,7 +133,7 @@ public: virtual int GetItemId(wxRibbonButtonBarButtonBase *button) const; - virtual bool Realize(); + virtual bool Realize() wxOVERRIDE; virtual void ClearButtons(); virtual bool DeleteButton(int button_id); virtual void EnableButton(int button_id, bool enable = true); @@ -142,18 +142,18 @@ public: virtual wxRibbonButtonBarButtonBase *GetActiveItem() const; virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const; - virtual void SetArtProvider(wxRibbonArtProvider* art); - virtual bool IsSizingContinuous() const; + virtual void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE; + virtual bool IsSizingContinuous() const wxOVERRIDE; - virtual wxSize GetMinSize() const; + virtual wxSize GetMinSize() const wxOVERRIDE; void SetShowToolTipsForDisabled(bool show); bool GetShowToolTipsForDisabled() const; protected: friend class wxRibbonButtonBarEvent; - virtual wxSize DoGetBestSize() const; - wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const wxOVERRIDE; + wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); void OnPaint(wxPaintEvent& evt); @@ -165,9 +165,9 @@ protected: void OnMouseUp(wxMouseEvent& evt); virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; void CommonInit(long style); void MakeLayouts(); @@ -176,7 +176,7 @@ protected: static wxBitmap MakeDisabledBitmap(const wxBitmap& original); void FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button, wxRibbonButtonBarButtonState size, wxDC& dc); - virtual void UpdateWindowUI(long flags); + virtual void UpdateWindowUI(long flags) wxOVERRIDE; wxArrayRibbonButtonBarLayout m_layouts; wxArrayRibbonButtonBarButtonBase m_buttons; @@ -215,7 +215,7 @@ public: m_button = e.m_button; } #endif - wxEvent *Clone() const { return new wxRibbonButtonBarEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxRibbonButtonBarEvent(*this); } wxRibbonButtonBar* GetBar() {return m_bar;} wxRibbonButtonBarButtonBase *GetButton() { return m_button; } diff --git a/include/wx/ribbon/gallery.h b/include/wx/ribbon/gallery.h index 665c69420d..07b76cf0bb 100644 --- a/include/wx/ribbon/gallery.h +++ b/include/wx/ribbon/gallery.h @@ -63,16 +63,16 @@ public: wxRibbonGalleryButtonState GetExtensionButtonState() const; bool IsHovered() const; - virtual bool IsSizingContinuous() const; - virtual bool Realize(); - virtual bool Layout(); + virtual bool IsSizingContinuous() const wxOVERRIDE; + virtual bool Realize() wxOVERRIDE; + virtual bool Layout() wxOVERRIDE; - virtual bool ScrollLines(int lines); + virtual bool ScrollLines(int lines) wxOVERRIDE; bool ScrollPixels(int pixels); void EnsureVisible(const wxRibbonGalleryItem* item); protected: - wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } void CommonInit(long style); void CalculateMinSize(); bool TestButtonHover(const wxRect& rect, wxPoint pos, @@ -89,11 +89,11 @@ protected: void OnSize(wxSizeEvent& evt); int GetScrollLineSize() const; - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; wxArrayRibbonGalleryItem m_items; wxRibbonGalleryItem* m_selected_item; @@ -140,7 +140,7 @@ public: m_item = e.m_item; } #endif - wxEvent *Clone() const { return new wxRibbonGalleryEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxRibbonGalleryEvent(*this); } wxRibbonGallery* GetGallery() {return m_gallery;} wxRibbonGalleryItem* GetGalleryItem() {return m_item;} diff --git a/include/wx/ribbon/page.h b/include/wx/ribbon/page.h index 33a961412f..140012fc86 100644 --- a/include/wx/ribbon/page.h +++ b/include/wx/ribbon/page.h @@ -41,33 +41,33 @@ public: const wxBitmap& icon = wxNullBitmap, long style = 0); - void SetArtProvider(wxRibbonArtProvider* art); + void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE; wxBitmap& GetIcon() {return m_icon;} - virtual wxSize GetMinSize() const; + virtual wxSize GetMinSize() const wxOVERRIDE; void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height); void AdjustRectToIncludeScrollButtons(wxRect* rect) const; bool DismissExpandedPanel(); - virtual bool Realize(); - virtual bool Show(bool show = true); - virtual bool Layout(); - virtual bool ScrollLines(int lines); + virtual bool Realize() wxOVERRIDE; + virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Layout() wxOVERRIDE; + virtual bool ScrollLines(int lines) wxOVERRIDE; bool ScrollPixels(int pixels); bool ScrollSections(int sections); wxOrientation GetMajorAxis() const; - virtual void RemoveChild(wxWindowBase *child); + virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; void HideIfExpanded(); protected: - virtual wxSize DoGetBestSize() const; - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; bool DoActualLayout(); void OnEraseBackground(wxEraseEvent& evt); void OnPaint(wxPaintEvent& evt); diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h index fded272c4a..f549a9758f 100644 --- a/include/wx/ribbon/panel.h +++ b/include/wx/ribbon/panel.h @@ -62,16 +62,16 @@ public: bool ShowExpanded(); bool HideExpanded(); - void SetArtProvider(wxRibbonArtProvider* art); + void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE; - virtual bool Realize(); - virtual bool Layout(); - virtual wxSize GetMinSize() const; + virtual bool Realize() wxOVERRIDE; + virtual bool Layout() wxOVERRIDE; + virtual wxSize GetMinSize() const wxOVERRIDE; - virtual bool IsSizingContinuous() const; + virtual bool IsSizingContinuous() const wxOVERRIDE; - virtual void AddChild(wxWindowBase *child); - virtual void RemoveChild(wxWindowBase *child); + virtual void AddChild(wxWindowBase *child) wxOVERRIDE; + virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; virtual bool HasExtButton() const; @@ -79,25 +79,25 @@ public: wxRibbonPanel* GetExpandedPanel(); // Finds the best width and height given the parent's width and height - virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const; + virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const wxOVERRIDE; long GetFlags() { return m_flags; } void HideIfExpanded(); protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual wxSize GetPanelSizerBestSize() const; wxSize GetPanelSizerMinSize() const; - wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } wxSize GetMinNotMinimisedSize() const; virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; - void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; void OnSize(wxSizeEvent& evt); void OnEraseBackground(wxEraseEvent& evt); void OnPaint(wxPaintEvent& evt); @@ -112,7 +112,7 @@ protected: void TestPositionForHover(const wxPoint& pos); bool ShouldSendEventToDummy(wxEvent& evt); - virtual bool TryAfter(wxEvent& evt); + virtual bool TryAfter(wxEvent& evt) wxOVERRIDE; void CommonInit(const wxString& label, const wxBitmap& icon, long style); static wxRect GetExpandedPosition(wxRect panel, @@ -156,7 +156,7 @@ public: m_panel = e.m_panel; } #endif - wxEvent *Clone() const { return new wxRibbonPanelEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxRibbonPanelEvent(*this); } wxRibbonPanel* GetPanel() {return m_panel;} void SetPanel(wxRibbonPanel* panel) {m_panel = panel;} diff --git a/include/wx/ribbon/toolbar.h b/include/wx/ribbon/toolbar.h index 467de94463..06d12857b3 100644 --- a/include/wx/ribbon/toolbar.h +++ b/include/wx/ribbon/toolbar.h @@ -141,7 +141,7 @@ public: virtual int GetToolPos(int tool_id)const; virtual bool GetToolState(int tool_id)const; - virtual bool Realize(); + virtual bool Realize() wxOVERRIDE; virtual void SetRows(int nMin, int nMax = -1); virtual void SetToolClientData(int tool_id, wxObject* clientData); @@ -149,18 +149,18 @@ public: virtual void SetToolHelpString(int tool_id, const wxString& helpString); virtual void SetToolNormalBitmap(int tool_id, const wxBitmap &bitmap); - virtual bool IsSizingContinuous() const; + virtual bool IsSizingContinuous() const wxOVERRIDE; virtual void EnableTool(int tool_id, bool enable = true); virtual void ToggleTool(int tool_id, bool checked); // Finds the best width and height given the parent's width and height - virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const; + virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const wxOVERRIDE; protected: friend class wxRibbonToolBarEvent; - virtual wxSize DoGetBestSize() const; - wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const wxOVERRIDE; + wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); void OnMouseDown(wxMouseEvent& evt); @@ -172,14 +172,14 @@ protected: void OnSize(wxSizeEvent& evt); virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const; + wxSize relative_to) const wxOVERRIDE; void CommonInit(long style); void AppendGroup(); wxRibbonToolBarToolGroup* InsertGroup(size_t pos); - virtual void UpdateWindowUI(long flags); + virtual void UpdateWindowUI(long flags) wxOVERRIDE; static wxBitmap MakeDisabledBitmap(const wxBitmap& original); @@ -213,7 +213,7 @@ public: m_bar = e.m_bar; } #endif - wxEvent *Clone() const { return new wxRibbonToolBarEvent(*this); } + wxEvent *Clone() const wxOVERRIDE { return new wxRibbonToolBarEvent(*this); } wxRibbonToolBar* GetBar() {return m_bar;} void SetBar(wxRibbonToolBar* bar) {m_bar = bar;} diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 3801da8cf9..7dfe011d92 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -68,10 +68,10 @@ public: // implement base class pure virtual methods virtual const void *Request(const wxString& item, size_t *size = NULL, - wxIPCFormat format = wxIPC_TEXT); - virtual bool StartAdvise(const wxString& item); - virtual bool StopAdvise(const wxString& item); - virtual bool Disconnect(void); + wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE; + virtual bool StartAdvise(const wxString& item) wxOVERRIDE; + virtual bool StopAdvise(const wxString& item) wxOVERRIDE; + virtual bool Disconnect(void) wxOVERRIDE; // Will be used in the future to enable the compression but does nothing // for now. @@ -79,11 +79,11 @@ public: protected: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format); + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; virtual bool DoPoke(const wxString& item, const void *data, size_t size, - wxIPCFormat format); + wxIPCFormat format) wxOVERRIDE; virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format); + wxIPCFormat format) wxOVERRIDE; // notice that all the members below are only initialized once the @@ -119,9 +119,9 @@ public: virtual ~wxTCPServer(); // Returns false on error (e.g. port number is already in use) - virtual bool Create(const wxString& serverName); + virtual bool Create(const wxString& serverName) wxOVERRIDE; - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; protected: wxSocketServer *m_server; @@ -140,15 +140,15 @@ class WXDLLIMPEXP_NET wxTCPClient : public wxClientBase public: wxTCPClient(); - virtual bool ValidHost(const wxString& host); + virtual bool ValidHost(const wxString& host) wxOVERRIDE; // Call this to make a connection. Returns NULL if cannot. virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, - const wxString& topic); + const wxString& topic) wxOVERRIDE; // Callbacks to CLIENT - override at will - virtual wxConnectionBase *OnMakeConnection(); + virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxTCPClient) diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h index 31f32706e9..f90a2feeec 100644 --- a/include/wx/sckstrm.h +++ b/include/wx/sckstrm.h @@ -25,12 +25,12 @@ public: protected: wxSocketBase *m_o_socket; - size_t OnSysWrite(const void *buffer, size_t bufsize); + size_t OnSysWrite(const void *buffer, size_t bufsize) wxOVERRIDE; // socket streams are both un-seekable and size-less streams: - wxFileOffset OnSysTell() const + wxFileOffset OnSysTell() const wxOVERRIDE { return wxInvalidOffset; } - wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) + wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) wxOVERRIDE { return wxInvalidOffset; } wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream); @@ -45,13 +45,13 @@ public: protected: wxSocketBase *m_i_socket; - size_t OnSysRead(void *buffer, size_t bufsize); + size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; // socket streams are both un-seekable and size-less streams: - wxFileOffset OnSysTell() const + wxFileOffset OnSysTell() const wxOVERRIDE { return wxInvalidOffset; } - wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) + wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) wxOVERRIDE { return wxInvalidOffset; } wxDECLARE_NO_COPY_CLASS(wxSocketInputStream); diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 370969929e..995edf81da 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -214,7 +214,7 @@ public: void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; } wxRect GetTargetRect() const { return m_rectToScroll; } - virtual void DoPrepareDC(wxDC& dc); + virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; // are we generating the autoscroll events? bool IsAutoScrolling() const { return m_timerAutoScroll != NULL; } diff --git a/include/wx/simplebook.h b/include/wx/simplebook.h index d54ebc45b6..f8ee1b8729 100644 --- a/include/wx/simplebook.h +++ b/include/wx/simplebook.h @@ -85,7 +85,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE) + int imageId = NO_IMAGE) wxOVERRIDE { if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) return false; @@ -98,19 +98,19 @@ public: return true; } - virtual int SetSelection(size_t n) + virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) + virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } // Neither labels nor images are supported but we still store the labels // just in case the user code attaches some importance to them. - virtual bool SetPageText(size_t n, const wxString& strText) + virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE { wxCHECK_MSG( n < GetPageCount(), false, wxS("Invalid page") ); @@ -119,41 +119,41 @@ public: return true; } - virtual wxString GetPageText(size_t n) const + virtual wxString GetPageText(size_t n) const wxOVERRIDE { wxCHECK_MSG( n < GetPageCount(), wxString(), wxS("Invalid page") ); return m_pageTexts[n]; } - virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) + virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) wxOVERRIDE { return false; } - virtual int GetPageImage(size_t WXUNUSED(n)) const + virtual int GetPageImage(size_t WXUNUSED(n)) const wxOVERRIDE { return NO_IMAGE; } protected: - virtual void UpdateSelectedPage(size_t newsel) + virtual void UpdateSelectedPage(size_t newsel) wxOVERRIDE { m_selection = newsel; } - virtual wxBookCtrlEvent* CreatePageChangingEvent() const + virtual wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE { return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING, GetId()); } - virtual void MakeChangedEvent(wxBookCtrlEvent& event) + virtual void MakeChangedEvent(wxBookCtrlEvent& event) wxOVERRIDE { event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED); } - virtual wxWindow *DoRemovePage(size_t page) + virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE { wxWindow* const win = wxBookCtrlBase::DoRemovePage(page); if ( win ) @@ -166,14 +166,14 @@ protected: return win; } - virtual void DoSize() + virtual void DoSize() wxOVERRIDE { wxWindow* const page = GetCurrentPage(); if ( page ) page->SetSize(GetPageRect()); } - virtual void DoShowPage(wxWindow* page, bool show) + virtual void DoShowPage(wxWindow* page, bool show) wxOVERRIDE { if ( show ) page->ShowWithEffect(m_showEffect, m_showTimeout); diff --git a/include/wx/sizer.h b/include/wx/sizer.h index 3b0e2233b0..8e7272ab2a 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -748,8 +748,8 @@ public: wxGridSizer( int rows, int cols, int vgap, int hgap ); wxGridSizer( int rows, int cols, const wxSize& gap ); - virtual void RecalcSizes(); - virtual wxSize CalcMin(); + virtual void RecalcSizes() wxOVERRIDE; + virtual wxSize CalcMin() wxOVERRIDE; void SetCols( int cols ) { @@ -787,7 +787,7 @@ protected: int m_vgap; int m_hgap; - virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item); + virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) wxOVERRIDE; void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ); @@ -879,8 +879,8 @@ public: const wxArrayInt& GetColWidths() const { return m_colWidths; } // implementation - virtual void RecalcSizes(); - virtual wxSize CalcMin(); + virtual void RecalcSizes() wxOVERRIDE; + virtual wxSize CalcMin() wxOVERRIDE; protected: void AdjustForFlexDirection(); @@ -928,7 +928,7 @@ public: wxT("invalid value for wxBoxSizer orientation") ); } - virtual wxSizerItem *AddSpacer(int size); + virtual wxSizerItem *AddSpacer(int size) wxOVERRIDE; int GetOrientation() const { return m_orient; } @@ -937,8 +937,8 @@ public: void SetOrientation(int orient) { m_orient = orient; } // implementation of our resizing logic - virtual wxSize CalcMin(); - virtual void RecalcSizes(); + virtual wxSize CalcMin() wxOVERRIDE; + virtual void RecalcSizes() wxOVERRIDE; protected: // helpers for our code: this returns the component of the given wxSize in @@ -1016,19 +1016,19 @@ public: wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString); virtual ~wxStaticBoxSizer(); - void RecalcSizes(); - wxSize CalcMin(); + void RecalcSizes() wxOVERRIDE; + wxSize CalcMin() wxOVERRIDE; wxStaticBox *GetStaticBox() const { return m_staticBox; } // override to hide/show the static box as well - virtual void ShowItems (bool show); - virtual bool AreAnyItemsShown() const; + virtual void ShowItems (bool show) wxOVERRIDE; + virtual bool AreAnyItemsShown() const wxOVERRIDE; - virtual bool Detach( wxWindow *window ); - virtual bool Detach( wxSizer *sizer ) { return wxBoxSizer::Detach(sizer); } - virtual bool Detach( int index ) { return wxBoxSizer::Detach(index); } + virtual bool Detach( wxWindow *window ) wxOVERRIDE; + virtual bool Detach( wxSizer *sizer ) wxOVERRIDE { return wxBoxSizer::Detach(sizer); } + virtual bool Detach( int index ) wxOVERRIDE { return wxBoxSizer::Detach(index); } protected: wxStaticBox *m_staticBox; diff --git a/include/wx/slider.h b/include/wx/slider.h index 361b8d77cb..9a5788bb0b 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -108,7 +108,7 @@ protected: virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ } // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // adjust value according to wxSL_INVERSE style virtual int ValueInvertOrNot(int value) const diff --git a/include/wx/socket.h b/include/wx/socket.h index 35ff266216..e2f8c0f1c5 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -410,8 +410,8 @@ public: { return (wxSocketBase *) GetEventObject(); } void *GetClientData() const { return m_clientData; } - virtual wxEvent *Clone() const { return new wxSocketEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_SOCKET; } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSocketEvent(*this); } + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_SOCKET; } public: wxSocketNotify m_event; diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index cb11e29833..48da93213a 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -113,7 +113,7 @@ public: int GetPosition() const { return m_commandInt; } void SetPosition(int pos) { m_commandInt = pos; } - virtual wxEvent *Clone() const { return new wxSpinEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSpinEvent(*this); } private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent) diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index 7a7b3a4bd9..7c44a9bd1f 100644 --- a/include/wx/spinctrl.h +++ b/include/wx/spinctrl.h @@ -82,7 +82,7 @@ public: double GetValue() const { return m_value; } void SetValue(double value) { m_value = value; } - virtual wxEvent *Clone() const { return new wxSpinDoubleEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxSpinDoubleEvent(*this); } protected: double m_value; diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index 3ca462258c..b28d3912d1 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -70,7 +70,7 @@ public: private: // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() { return this; } + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } }; diff --git a/include/wx/sstream.h b/include/wx/sstream.h index b0b2290fbc..19f37c58d3 100644 --- a/include/wx/sstream.h +++ b/include/wx/sstream.h @@ -26,13 +26,13 @@ public: // it wxStringInputStream(const wxString& s); - virtual wxFileOffset GetLength() const; - virtual bool IsSeekable() const { return true; } + virtual wxFileOffset GetLength() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return true; } protected: - virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; - virtual size_t OnSysRead(void *buffer, size_t size); + virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; private: // the string that was passed in the ctor @@ -76,11 +76,11 @@ public: // get the string containing current output const wxString& GetString() const { return *m_str; } - virtual bool IsSeekable() const { return true; } + virtual bool IsSeekable() const wxOVERRIDE { return true; } protected: - virtual wxFileOffset OnSysTell() const; - virtual size_t OnSysWrite(const void *buffer, size_t size); + virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; private: // internal string, not used if caller provided his own string diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index e86f45b59c..27752633a8 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -40,14 +40,14 @@ public: } // overridden base class virtuals - virtual bool AcceptsFocus() const { return false; } - virtual bool HasTransparentBackground() { return true; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase); }; diff --git a/include/wx/statbox.h b/include/wx/statbox.h index d01f257969..155bb89b98 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -30,7 +30,7 @@ public: wxStaticBoxBase(); // overridden base class virtuals - virtual bool HasTransparentBackground() { return true; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } // implementation only: this is used by wxStaticBoxSizer to account for the // need for extra space taken by the static box @@ -47,7 +47,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase); }; diff --git a/include/wx/statline.h b/include/wx/statline.h index 4f9e0f1561..a6f522c5d5 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -46,11 +46,11 @@ public: static int GetDefaultSize() { return 2; } // overridden base class virtuals - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // set the right size for the right dimension wxSize AdjustSize(const wxSize& size) const @@ -70,7 +70,7 @@ protected: return sizeReal; } - virtual wxSize DoGetBestSize() const + virtual wxSize DoGetBestSize() const wxOVERRIDE { return AdjustSize(wxDefaultSize); } diff --git a/include/wx/stattext.h b/include/wx/stattext.h index fa29077526..f5406d94b8 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -39,8 +39,8 @@ public: void Wrap(int width); // overridden base virtuals - virtual bool AcceptsFocus() const { return false; } - virtual bool HasTransparentBackground() { return true; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } bool IsEllipsized() const { @@ -52,7 +52,7 @@ public: protected: // functions required for wxST_ELLIPSIZE_* support // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // Calls Ellipsize() on the real label if necessary. Unlike GetLabelText(), // keeps the mnemonics instead of removing them. diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index 17e033ffc3..68b571a808 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -181,10 +181,10 @@ public: // wxWindow overrides: // don't want status bars to accept the focus at all - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } // the client size of a toplevel window doesn't include the status bar - virtual bool CanBeOutsideClientArea() const { return true; } + virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; } protected: // called after the status bar pane text changed and should update its @@ -195,14 +195,14 @@ protected: // wxWindow overrides: #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) + virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE { wxASSERT_MSG(!HasFlag(wxSTB_SHOW_TIPS), "Do not set tooltip(s) manually when using wxSTB_SHOW_TIPS!"); wxWindow::DoSetToolTip(tip); } #endif // wxUSE_TOOLTIPS - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // internal helpers & data: diff --git a/include/wx/stdstream.h b/include/wx/stdstream.h index 73ac0ac260..3cf565b624 100644 --- a/include/wx/stdstream.h +++ b/include/wx/stdstream.h @@ -30,21 +30,21 @@ public: virtual ~wxStdInputStreamBuffer() { } protected: - virtual std::streambuf *setbuf(char *s, std::streamsize n); + virtual std::streambuf *setbuf(char *s, std::streamsize n) wxOVERRIDE; virtual std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way, std::ios_base::openmode which = std::ios_base::in | - std::ios_base::out); + std::ios_base::out) wxOVERRIDE; virtual std::streampos seekpos(std::streampos sp, std::ios_base::openmode which = std::ios_base::in | - std::ios_base::out); - virtual std::streamsize showmanyc(); - virtual std::streamsize xsgetn(char *s, std::streamsize n); - virtual int underflow(); - virtual int uflow(); - virtual int pbackfail(int c = EOF); + std::ios_base::out) wxOVERRIDE; + virtual std::streamsize showmanyc() wxOVERRIDE; + virtual std::streamsize xsgetn(char *s, std::streamsize n) wxOVERRIDE; + virtual int underflow() wxOVERRIDE; + virtual int uflow() wxOVERRIDE; + virtual int pbackfail(int c = EOF) wxOVERRIDE; // Special work around for VC8/9 (this bug was fixed in VC10 and later): // these versions have non-standard _Xsgetn_s() that it being called from @@ -87,18 +87,18 @@ public: virtual ~wxStdOutputStreamBuffer() { } protected: - virtual std::streambuf *setbuf(char *s, std::streamsize n); + virtual std::streambuf *setbuf(char *s, std::streamsize n) wxOVERRIDE; virtual std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way, std::ios_base::openmode which = std::ios_base::in | - std::ios_base::out); + std::ios_base::out) wxOVERRIDE; virtual std::streampos seekpos(std::streampos sp, std::ios_base::openmode which = std::ios_base::in | - std::ios_base::out); - virtual std::streamsize xsputn(const char *s, std::streamsize n); - virtual int overflow(int c); + std::ios_base::out) wxOVERRIDE; + virtual std::streamsize xsputn(const char *s, std::streamsize n) wxOVERRIDE; + virtual int overflow(int c) wxOVERRIDE; wxOutputStream& m_stream; }; diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 3dc3752186..48e2130bf3 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -183,13 +183,13 @@ public: class WXDLLIMPEXP_BASE wxMBConvLibc : public wxMBConv { public: - virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const; - virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; + virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const wxOVERRIDE; + virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const wxOVERRIDE; - virtual wxMBConv *Clone() const { return new wxMBConvLibc; } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvLibc; } #if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const { return wxLocaleIsUtf8; } + virtual bool IsUTF8() const wxOVERRIDE { return wxLocaleIsUtf8; } #endif }; @@ -213,27 +213,27 @@ public: } virtual ~wxConvBrokenFileNames() { delete m_conv; } - virtual size_t MB2WC(wchar_t *out, const char *in, size_t outLen) const + virtual size_t MB2WC(wchar_t *out, const char *in, size_t outLen) const wxOVERRIDE { return m_conv->MB2WC(out, in, outLen); } - virtual size_t WC2MB(char *out, const wchar_t *in, size_t outLen) const + virtual size_t WC2MB(char *out, const wchar_t *in, size_t outLen) const wxOVERRIDE { return m_conv->WC2MB(out, in, outLen); } - virtual size_t GetMBNulLen() const + virtual size_t GetMBNulLen() const wxOVERRIDE { // cast needed to call a private function return m_conv->GetMBNulLen(); } #if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const { return m_conv->IsUTF8(); } + virtual bool IsUTF8() const wxOVERRIDE { return m_conv->IsUTF8(); } #endif - virtual wxMBConv *Clone() const { return new wxConvBrokenFileNames(*this); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvBrokenFileNames(*this); } private: // the conversion object we forward to @@ -257,11 +257,11 @@ public: // (assuming it's ok to copy the shift state -- not really sure about it) virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const { return new wxMBConvUTF7; } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF7; } private: // UTF-7 decoder/encoder may be in direct mode or in shifted mode after a @@ -344,16 +344,16 @@ public: // compiler-generated default ctor and other methods are ok virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const { return new wxMBConvStrictUTF8(); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvStrictUTF8(); } #if wxUSE_UNICODE_UTF8 // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't // take the shortcut in that case - virtual bool IsUTF8() const { return true; } + virtual bool IsUTF8() const wxOVERRIDE { return true; } #endif }; @@ -370,16 +370,16 @@ public: wxMBConvUTF8(int options = MAP_INVALID_UTF8_NOT) : m_options(options) { } virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual wxMBConv *Clone() const { return new wxMBConvUTF8(m_options); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF8(m_options); } #if wxUSE_UNICODE_UTF8 // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't // take the shortcut in that case - virtual bool IsUTF8() const { return m_options == MAP_INVALID_UTF8_NOT; } + virtual bool IsUTF8() const wxOVERRIDE { return m_options == MAP_INVALID_UTF8_NOT; } #endif private: @@ -395,7 +395,7 @@ class WXDLLIMPEXP_BASE wxMBConvUTF16Base : public wxMBConv public: enum { BYTES_PER_CHAR = 2 }; - virtual size_t GetMBNulLen() const { return BYTES_PER_CHAR; } + virtual size_t GetMBNulLen() const wxOVERRIDE { return BYTES_PER_CHAR; } protected: // return the length of the buffer using srcLen if it's not wxNO_LEN and @@ -413,10 +413,10 @@ class WXDLLIMPEXP_BASE wxMBConvUTF16LE : public wxMBConvUTF16Base { public: virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; - virtual wxMBConv *Clone() const { return new wxMBConvUTF16LE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16LE; } }; // ---------------------------------------------------------------------------- @@ -427,10 +427,10 @@ class WXDLLIMPEXP_BASE wxMBConvUTF16BE : public wxMBConvUTF16Base { public: virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; - virtual wxMBConv *Clone() const { return new wxMBConvUTF16BE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16BE; } }; // ---------------------------------------------------------------------------- @@ -442,7 +442,7 @@ class WXDLLIMPEXP_BASE wxMBConvUTF32Base : public wxMBConv public: enum { BYTES_PER_CHAR = 4 }; - virtual size_t GetMBNulLen() const { return BYTES_PER_CHAR; } + virtual size_t GetMBNulLen() const wxOVERRIDE { return BYTES_PER_CHAR; } protected: // this is similar to wxMBConvUTF16Base method with the same name except @@ -459,10 +459,10 @@ class WXDLLIMPEXP_BASE wxMBConvUTF32LE : public wxMBConvUTF32Base { public: virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; - virtual wxMBConv *Clone() const { return new wxMBConvUTF32LE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32LE; } }; // ---------------------------------------------------------------------------- @@ -473,10 +473,10 @@ class WXDLLIMPEXP_BASE wxMBConvUTF32BE : public wxMBConvUTF32Base { public: virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; - virtual wxMBConv *Clone() const { return new wxMBConvUTF32BE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32BE; } }; // ---------------------------------------------------------------------------- @@ -499,16 +499,16 @@ public: wxCSConv& operator=(const wxCSConv& conv); virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const; + const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const; - virtual size_t GetMBNulLen() const; + const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + virtual size_t GetMBNulLen() const wxOVERRIDE; #if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const; + virtual bool IsUTF8() const wxOVERRIDE; #endif - virtual wxMBConv *Clone() const { return new wxCSConv(*this); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxCSConv(*this); } void Clear(); diff --git a/include/wx/stream.h b/include/wx/stream.h index b8432607bd..017eb50004 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -280,14 +280,14 @@ class WXDLLIMPEXP_BASE wxCountingOutputStream : public wxOutputStream public: wxCountingOutputStream(); - virtual wxFileOffset GetLength() const; + virtual wxFileOffset GetLength() const wxOVERRIDE; bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return true; } + virtual bool IsOk() const wxOVERRIDE { return true; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; size_t m_currentPos, m_lastPos; @@ -308,9 +308,9 @@ public: wxFilterInputStream(wxInputStream *stream); virtual ~wxFilterInputStream(); - virtual char Peek() { return m_parent_i_stream->Peek(); } + virtual char Peek() wxOVERRIDE { return m_parent_i_stream->Peek(); } - virtual wxFileOffset GetLength() const { return m_parent_i_stream->GetLength(); } + virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_i_stream->GetLength(); } wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; } @@ -330,11 +330,11 @@ public: wxFilterOutputStream(wxOutputStream *stream); virtual ~wxFilterOutputStream(); - virtual wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); } + virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_o_stream->GetLength(); } wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; } - bool Close(); + bool Close() wxOVERRIDE; protected: wxOutputStream *m_parent_o_stream; @@ -561,22 +561,22 @@ public: virtual ~wxBufferedInputStream(); - virtual char Peek(); - virtual wxInputStream& Read(void *buffer, size_t size); + virtual char Peek() wxOVERRIDE; + virtual wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE; // Position functions - virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart); - virtual wxFileOffset TellI() const; - virtual bool IsSeekable() const { return m_parent_i_stream->IsSeekable(); } + virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxOVERRIDE; + virtual wxFileOffset TellI() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return m_parent_i_stream->IsSeekable(); } // the buffer given to the stream will be deleted by it void SetInputStreamBuffer(wxStreamBuffer *buffer); wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } protected: - virtual size_t OnSysRead(void *buffer, size_t bufsize); - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; wxStreamBuffer *m_i_streambuf; @@ -604,26 +604,26 @@ public: virtual ~wxBufferedOutputStream(); - virtual wxOutputStream& Write(const void *buffer, size_t size); + virtual wxOutputStream& Write(const void *buffer, size_t size) wxOVERRIDE; // Position functions - virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart); - virtual wxFileOffset TellO() const; - virtual bool IsSeekable() const { return m_parent_o_stream->IsSeekable(); } + virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxOVERRIDE; + virtual wxFileOffset TellO() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return m_parent_o_stream->IsSeekable(); } - void Sync(); - bool Close(); + void Sync() wxOVERRIDE; + bool Close() wxOVERRIDE; - virtual wxFileOffset GetLength() const; + virtual wxFileOffset GetLength() const wxOVERRIDE; // the buffer given to the stream will be deleted by it void SetOutputStreamBuffer(wxStreamBuffer *buffer); wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t bufsize); - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysWrite(const void *buffer, size_t bufsize) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; wxStreamBuffer *m_o_streambuf; @@ -647,13 +647,13 @@ public: wxWrapperInputStream(wxInputStream* stream); // Override the base class methods to forward to the wrapped stream. - virtual wxFileOffset GetLength() const; - virtual bool IsSeekable() const; + virtual wxFileOffset GetLength() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE; protected: - virtual size_t OnSysRead(void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; // Ensure that our own last error is the same as that of the real stream. // diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h index 906d4383ec..8459b1bbec 100644 --- a/include/wx/tarstrm.h +++ b/include/wx/tarstrm.h @@ -68,15 +68,15 @@ public: wxTarEntry& operator=(const wxTarEntry& entry); // Get accessors - wxString GetName(wxPathFormat format = wxPATH_NATIVE) const; - wxString GetInternalName() const { return m_Name; } - wxPathFormat GetInternalFormat() const { return wxPATH_UNIX; } + wxString GetName(wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE; + wxString GetInternalName() const wxOVERRIDE { return m_Name; } + wxPathFormat GetInternalFormat() const wxOVERRIDE { return wxPATH_UNIX; } int GetMode() const; int GetUserId() const { return m_UserId; } int GetGroupId() const { return m_GroupId; } - wxFileOffset GetSize() const { return m_Size; } - wxFileOffset GetOffset() const { return m_Offset; } - wxDateTime GetDateTime() const { return m_ModifyTime; } + wxFileOffset GetSize() const wxOVERRIDE { return m_Size; } + wxFileOffset GetOffset() const wxOVERRIDE { return m_Offset; } + wxDateTime GetDateTime() const wxOVERRIDE { return m_ModifyTime; } wxDateTime GetAccessTime() const { return m_AccessTime; } wxDateTime GetCreateTime() const { return m_CreateTime; } int GetTypeFlag() const { return m_TypeFlag; } @@ -87,16 +87,16 @@ public: int GetDevMinor() const { return m_DevMinor; } // is accessors - bool IsDir() const; - bool IsReadOnly() const { return !(m_Mode & 0222); } + bool IsDir() const wxOVERRIDE; + bool IsReadOnly() const wxOVERRIDE { return !(m_Mode & 0222); } // set accessors - void SetName(const wxString& name, wxPathFormat format = wxPATH_NATIVE); + void SetName(const wxString& name, wxPathFormat format = wxPATH_NATIVE) wxOVERRIDE; void SetUserId(int id) { m_UserId = id; } void SetGroupId(int id) { m_GroupId = id; } void SetMode(int mode); - void SetSize(wxFileOffset size) { m_Size = size; } - void SetDateTime(const wxDateTime& dt) { m_ModifyTime = dt; } + void SetSize(wxFileOffset size) wxOVERRIDE { m_Size = size; } + void SetDateTime(const wxDateTime& dt) wxOVERRIDE { m_ModifyTime = dt; } void SetAccessTime(const wxDateTime& dt) { m_AccessTime = dt; } void SetCreateTime(const wxDateTime& dt) { m_CreateTime = dt; } void SetTypeFlag(int type) { m_TypeFlag = type; } @@ -107,8 +107,8 @@ public: void SetDevMinor(int dev) { m_DevMinor = dev; } // set is accessors - void SetIsDir(bool isDir = true); - void SetIsReadOnly(bool isReadOnly = true); + void SetIsDir(bool isDir = true) wxOVERRIDE; + void SetIsReadOnly(bool isReadOnly = true) wxOVERRIDE; static wxString GetInternalName(const wxString& name, wxPathFormat format = wxPATH_NATIVE, @@ -119,9 +119,9 @@ public: void SetNotifier(wxTarNotifier& WXUNUSED(notifier)) { } private: - void SetOffset(wxFileOffset offset) { m_Offset = offset; } + void SetOffset(wxFileOffset offset) wxOVERRIDE { m_Offset = offset; } - virtual wxArchiveEntry* DoClone() const { return Clone(); } + virtual wxArchiveEntry* DoClone() const wxOVERRIDE { return Clone(); } wxString m_Name; int m_Mode; @@ -161,23 +161,23 @@ public: virtual ~wxTarInputStream(); bool OpenEntry(wxTarEntry& entry); - bool CloseEntry(); + bool CloseEntry() wxOVERRIDE; wxTarEntry *GetNextEntry(); - wxFileOffset GetLength() const { return m_size; } - bool IsSeekable() const { return m_parent_i_stream->IsSeekable(); } + wxFileOffset GetLength() const wxOVERRIDE { return m_size; } + bool IsSeekable() const wxOVERRIDE { return m_parent_i_stream->IsSeekable(); } protected: - size_t OnSysRead(void *buffer, size_t size); - wxFileOffset OnSysTell() const { return m_pos; } - wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode); + size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; private: void Init(); - wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); } - bool OpenEntry(wxArchiveEntry& entry); + wxArchiveEntry *DoGetNextEntry() wxOVERRIDE { return GetNextEntry(); } + bool OpenEntry(wxArchiveEntry& entry) wxOVERRIDE; bool IsOpened() const { return m_pos != wxInvalidOffset; } wxStreamError ReadHeaders(); @@ -221,34 +221,34 @@ public: bool PutNextEntry(const wxString& name, const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset); + wxFileOffset size = wxInvalidOffset) wxOVERRIDE; bool PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()); + const wxDateTime& dt = wxDateTime::Now()) wxOVERRIDE; bool CopyEntry(wxTarEntry *entry, wxTarInputStream& inputStream); bool CopyArchiveMetaData(wxTarInputStream& WXUNUSED(s)) { return true; } - void Sync(); - bool CloseEntry(); - bool Close(); + void Sync() wxOVERRIDE; + bool CloseEntry() wxOVERRIDE; + bool Close() wxOVERRIDE; - bool IsSeekable() const { return m_parent_o_stream->IsSeekable(); } + bool IsSeekable() const wxOVERRIDE { return m_parent_o_stream->IsSeekable(); } void SetBlockingFactor(int factor) { m_BlockingFactor = factor; } int GetBlockingFactor() const { return m_BlockingFactor; } protected: - size_t OnSysWrite(const void *buffer, size_t size); - wxFileOffset OnSysTell() const { return m_pos; } - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); + size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; private: void Init(wxTarFormat format); - bool PutNextEntry(wxArchiveEntry *entry); - bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream); - bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) { return true; } + bool PutNextEntry(wxArchiveEntry *entry) wxOVERRIDE; + bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) wxOVERRIDE; + bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) wxOVERRIDE { return true; } bool IsOpened() const { return m_pos != wxInvalidOffset; } bool WriteHeaders(wxTarEntry& entry); @@ -325,22 +325,22 @@ public: { return new wxTarOutputStream(stream, wxTAR_PAX, GetConv()); } wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const + wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE { return wxTarEntry::GetInternalName(name, format); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const; + = wxSTREAM_PROTOCOL) const wxOVERRIDE; protected: - wxArchiveEntry *DoNewEntry() const + wxArchiveEntry *DoNewEntry() const wxOVERRIDE { return NewEntry(); } - wxArchiveInputStream *DoNewStream(wxInputStream& stream) const + wxArchiveInputStream *DoNewStream(wxInputStream& stream) const wxOVERRIDE { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const + wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const wxOVERRIDE { return NewStream(stream); } - wxArchiveInputStream *DoNewStream(wxInputStream *stream) const + wxArchiveInputStream *DoNewStream(wxInputStream *stream) const wxOVERRIDE { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const + wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const wxOVERRIDE { return NewStream(stream); } private: diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index 4a81088b01..067b3ab418 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -100,7 +100,7 @@ public: SetEventObject(tbIcon); } - virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxTaskBarIconEvent(*this); } private: wxDECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent); diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index c9ff7f430c..a104a49be1 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -597,10 +597,10 @@ public: // ------------------------------- // Do the toolbar button updates (check for EVT_UPDATE_UI handlers) - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ; + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE ; // don't want toolbars to accept the focus - virtual bool AcceptsFocus() const { return false; } + virtual bool AcceptsFocus() const wxOVERRIDE { return false; } #if wxUSE_MENUS // Set dropdown menu @@ -609,7 +609,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // to implement in derived classes // ------------------------------- diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 65cd42030f..78d27bbd4c 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -644,17 +644,17 @@ public: wxTextCtrlIface() { } // wxTextAreaBase overrides - virtual wxString GetValue() const + virtual wxString GetValue() const wxOVERRIDE { return wxTextEntryBase::GetValue(); } - virtual void SetValue(const wxString& value) + virtual void SetValue(const wxString& value) wxOVERRIDE { wxTextEntryBase::SetValue(value); } protected: - virtual bool IsValidPosition(long pos) const + virtual bool IsValidPosition(long pos) const wxOVERRIDE { return pos >= 0 && pos <= GetLastPosition(); } @@ -702,45 +702,45 @@ public: // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; - virtual bool ShouldInheritColours() const { return false; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } // work around the problem with having HitTest() both in wxControl and // wxTextAreaBase base classes - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE { return wxTextAreaBase::HitTest(pt, pos); } virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const + wxTextCoord *row) const wxOVERRIDE { return wxTextAreaBase::HitTest(pt, col, row); } // we provide stubs for these functions as not all platforms have styles // support, but we really should leave them pure virtual here - 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; // wxTextAreaBase overrides - virtual wxString GetValue() const + virtual wxString GetValue() const wxOVERRIDE { return wxTextEntry::GetValue(); } - virtual void SetValue(const wxString& value) + virtual void SetValue(const wxString& value) wxOVERRIDE { wxTextEntry::SetValue(value); } // wxTextEntry overrides - virtual bool SetHint(const wxString& hint); + virtual bool SetHint(const wxString& hint) wxOVERRIDE; // wxWindow overrides - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -754,17 +754,17 @@ public: protected: // override streambuf method #if wxHAS_TEXT_WINDOW_STREAM - int overflow(int i); + int overflow(int i) wxOVERRIDE; #endif // wxHAS_TEXT_WINDOW_STREAM // Another wxTextAreaBase override. - virtual bool IsValidPosition(long pos) const + virtual bool IsValidPosition(long pos) const wxOVERRIDE { return pos >= 0 && pos <= GetLastPosition(); } // implement the wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() { return this; } + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase); DECLARE_ABSTRACT_CLASS(wxTextCtrlBase) @@ -830,7 +830,7 @@ public: // get the end of the URL long GetURLEnd() const { return m_end; } - virtual wxEvent *Clone() const { return new wxTextUrlEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxTextUrlEvent(*this); } protected: // the corresponding mouse event diff --git a/include/wx/textfile.h b/include/wx/textfile.h index e6aa3ba663..50be56b827 100644 --- a/include/wx/textfile.h +++ b/include/wx/textfile.h @@ -34,12 +34,12 @@ public: protected: // implement the base class pure virtuals - virtual bool OnExists() const; + virtual bool OnExists() const wxOVERRIDE; virtual bool OnOpen(const wxString &strBufferName, - wxTextBufferOpenMode OpenMode); - virtual bool OnClose(); - virtual bool OnRead(const wxMBConv& conv); - virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv); + wxTextBufferOpenMode OpenMode) wxOVERRIDE; + virtual bool OnClose() wxOVERRIDE; + virtual bool OnRead(const wxMBConv& conv) wxOVERRIDE; + virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) wxOVERRIDE; private: diff --git a/include/wx/textwrapper.h b/include/wx/textwrapper.h index a708cebd75..02e37bd23e 100644 --- a/include/wx/textwrapper.h +++ b/include/wx/textwrapper.h @@ -101,7 +101,7 @@ protected: wxControl::EscapeMnemonics(line)); } - virtual void OnOutputLine(const wxString& line) + virtual void OnOutputLine(const wxString& line) wxOVERRIDE { if ( !line.empty() ) { diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index dcc183ea1c..8fe11b77b3 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -36,7 +36,7 @@ public: virtual void SetValue(bool state) = 0; virtual bool GetValue() const = 0; - void UpdateWindowUI(long flags) + void UpdateWindowUI(long flags) wxOVERRIDE { wxControl::UpdateWindowUI(flags); diff --git a/include/wx/thread.h b/include/wx/thread.h index 0ed50cbaf4..121d9b12ba 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -659,7 +659,7 @@ public: protected: // entry point for the thread -- calls Entry() in owner. - virtual void *Entry(); + virtual void *Entry() wxOVERRIDE; private: // the owner of the thread diff --git a/include/wx/timer.h b/include/wx/timer.h index 8ee5684e00..78e4b8e75a 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -174,8 +174,8 @@ public: wxTimer& GetTimer() const { return *m_timer; } // implement the base class pure virtual - virtual wxEvent *Clone() const { return new wxTimerEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_TIMER; } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxTimerEvent(*this); } + virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_TIMER; } private: wxTimer* m_timer; diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index 45730cd9c4..e8e437362e 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -70,21 +70,21 @@ public: // implement base class virtuals - virtual bool SetPageText(size_t n, const wxString& strText); - virtual wxString GetPageText(size_t n) const; - virtual int GetPageImage(size_t n) const; - virtual bool SetPageImage(size_t n, int imageId); + 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 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 = NO_IMAGE); - virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } - virtual void SetImageList(wxImageList *imageList); + int imageId = NO_IMAGE) wxOVERRIDE; + virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } + virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual bool DeleteAllPages(); - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + virtual bool DeleteAllPages() wxOVERRIDE; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; // methods which are not part of base wxBookctrl API @@ -97,17 +97,17 @@ public: void Realize(); protected: - virtual wxWindow *DoRemovePage(size_t page); + virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; // event handlers void OnToolSelected(wxCommandEvent& event); void OnSize(wxSizeEvent& event); void OnIdle(wxIdleEvent& event); - void UpdateSelectedPage(size_t newsel); + void UpdateSelectedPage(size_t newsel) wxOVERRIDE; - wxBookCtrlEvent* CreatePageChangingEvent() const; - void MakeChangedEvent(wxBookCtrlEvent &event); + wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; + void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; // whether the toolbar needs to be realized bool m_needsRealizing; diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 417f681a4e..ca3bf6afdc 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -259,9 +259,9 @@ public: // ------------------------------- // override some base class virtuals - virtual bool Destroy(); - virtual bool IsTopLevel() const { return true; } - virtual bool IsTopNavigationDomain() const { return true; } + virtual bool Destroy() wxOVERRIDE; + virtual bool IsTopLevel() const wxOVERRIDE { return true; } + virtual bool IsTopNavigationDomain() const wxOVERRIDE { return true; } virtual bool IsVisible() const { return IsShown(); } // event handlers @@ -276,11 +276,11 @@ public: void OnActivate(wxActivateEvent &WXUNUSED(event)) { } // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ; + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE ; // a different API for SetSizeHints - virtual void SetMinSize(const wxSize& minSize); - virtual void SetMaxSize(const wxSize& maxSize); + virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE; + virtual void SetMaxSize(const wxSize& maxSize) wxOVERRIDE; virtual void OSXSetModified(bool modified) { m_modified = modified; } virtual bool OSXIsModified() const { return m_modified; } @@ -297,15 +297,15 @@ public: protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area - virtual void DoClientToScreen(int *x, int *y) const; - virtual void DoScreenToClient(int *x, int *y) const; + virtual void DoClientToScreen(int *x, int *y) const wxOVERRIDE; + virtual void DoScreenToClient(int *x, int *y) const wxOVERRIDE; // add support for wxCENTRE_ON_SCREEN - virtual void DoCentre(int dir); + virtual void DoCentre(int dir) wxOVERRIDE; // no need to do client to screen translation to get our position in screen // coordinates: this is already the case - virtual void DoGetScreenPosition(int *x, int *y) const + virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE { DoGetPosition(x, y); } diff --git a/include/wx/translation.h b/include/wx/translation.h index 187caf366b..5c5761d440 100644 --- a/include/wx/translation.h +++ b/include/wx/translation.h @@ -208,9 +208,9 @@ public: static void AddCatalogLookupPathPrefix(const wxString& prefix); virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang); + const wxString& lang) wxOVERRIDE; - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const; + virtual wxArrayString GetAvailableTranslations(const wxString& domain) const wxOVERRIDE; }; diff --git a/include/wx/treebase.h b/include/wx/treebase.h index 40f4d86623..efab3e0fd9 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -232,7 +232,7 @@ public: const wxTreeItemId &item = wxTreeItemId()); wxTreeEvent(const wxTreeEvent& event); - virtual wxEvent *Clone() const { return new wxTreeEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxTreeEvent(*this); } // accessors // get the item on which the operation was performed or the newly diff --git a/include/wx/treebook.h b/include/wx/treebook.h index bd59338952..b0e0204cf7 100644 --- a/include/wx/treebook.h +++ b/include/wx/treebook.h @@ -74,7 +74,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE); + int imageId = NO_IMAGE) wxOVERRIDE; // Inserts a new sub-page to the end of children of the page at given pos. virtual bool InsertSubPage(size_t pos, @@ -87,7 +87,7 @@ public: virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE); + int imageId = NO_IMAGE) wxOVERRIDE; // Adds a new child-page to the last top-level page inserted. // Useful when constructing 1 level tree structure. @@ -99,7 +99,7 @@ public: // Deletes the page and ALL its children. Could trigger page selection // change in a case when selected page is removed. In that case its parent // is selected (or the next page if no parent). - virtual bool DeletePage(size_t pos); + virtual bool DeletePage(size_t pos) wxOVERRIDE; // Tree operations @@ -126,23 +126,23 @@ public: // Standard operations inherited from wxBookCtrlBase // ------------------------------------------------- - virtual bool SetPageText(size_t n, const wxString& strText); - virtual wxString GetPageText(size_t n) const; - virtual int GetPageImage(size_t n) const; - virtual bool SetPageImage(size_t n, int imageId); - virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; - virtual void SetImageList(wxImageList *imageList); + 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 wxOVERRIDE; + virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; + virtual int SetSelection(size_t n) wxOVERRIDE { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; virtual void AssignImageList(wxImageList *imageList); - virtual bool DeleteAllPages(); + virtual bool DeleteAllPages() wxOVERRIDE; protected: // Implementation of a page removal. See DeletPage for comments. - wxTreebookPage *DoRemovePage(size_t pos); + wxTreebookPage *DoRemovePage(size_t pos) wxOVERRIDE; // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages) - virtual bool AllowNullPage() const { return true; } + virtual bool AllowNullPage() const wxOVERRIDE { return true; } // event handlers void OnTreeSelectionChange(wxTreeEvent& event); @@ -181,7 +181,7 @@ private: int imageId = NO_IMAGE); // Sets selection in the tree control and updates the page being shown. - int DoSetSelection(size_t pos, int flags = 0); + int DoSetSelection(size_t pos, int flags = 0) wxOVERRIDE; // Returns currently shown page. In a case when selected the node // has empty (NULL) page finds first (sub)child with not-empty page. diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index 89493c3bbb..13df8ae557 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -391,14 +391,14 @@ public: // implementation // -------------- - virtual bool ShouldInheritColours() const { return false; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } // hint whether to calculate best size quickly or accurately void SetQuickBestSize(bool q) { m_quickBestSize = q; } bool GetQuickBestSize() const { return m_quickBestSize; } protected: - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // common part of Get/SetItemState() virtual int DoGetItemState(const wxTreeItemId& item) const = 0; diff --git a/include/wx/treelist.h b/include/wx/treelist.h index d06e35e869..65208cb0a1 100644 --- a/include/wx/treelist.h +++ b/include/wx/treelist.h @@ -395,7 +395,7 @@ private: void Init(); // Pure virtual method inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const; + virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; // Implementation of AppendColumn(). int DoInsertColumn(const wxString& title, @@ -470,7 +470,7 @@ public: // COLUMN_SORTED event. unsigned GetColumn() const { return m_column; } - virtual wxEvent* Clone() const { return new wxTreeListEvent(*this); } + virtual wxEvent* Clone() const wxOVERRIDE { return new wxTreeListEvent(*this); } private: // Common part of all ctors. diff --git a/include/wx/univ/anybutton.h b/include/wx/univ/anybutton.h index d519e6a468..2f4fbf8650 100644 --- a/include/wx/univ/anybutton.h +++ b/include/wx/univ/anybutton.h @@ -23,7 +23,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_STATIC; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_STATIC; } private: wxDECLARE_NO_COPY_CLASS(wxAnyButton); diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 832f199b1a..480b6da8d3 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -37,26 +37,26 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void SetMargins(int x, int y) + virtual void SetMargins(int x, int y) wxOVERRIDE { SetBitmapMargins(x, y); wxBitmapButtonBase::SetMargins(x, y); } - virtual bool Enable(bool enable = true); + virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool SetCurrent(bool doit = true); + virtual bool SetCurrent(bool doit = true) wxOVERRIDE; - virtual void Press(); - virtual void Release(); + virtual void Press() wxOVERRIDE; + virtual void Release() wxOVERRIDE; protected: void OnSetFocus(wxFocusEvent& event); void OnKillFocus(wxFocusEvent& event); // called when one of the bitmap is changed by user - virtual void OnSetBitmap(); + virtual void OnSetBitmap() wxOVERRIDE; // set bitmap to the given one if it's ok or to the normal bitmap and // return true if the bitmap really changed diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 56e66c5db5..629a79ed41 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -86,10 +86,10 @@ public: virtual ~wxButton(); - virtual wxWindow *SetDefault(); + virtual wxWindow *SetDefault() wxOVERRIDE; - virtual bool IsPressed() const { return m_isPressed; } - virtual bool IsDefault() const { return m_isDefault; } + virtual bool IsPressed() const wxOVERRIDE { return m_isPressed; } + virtual bool IsDefault() const wxOVERRIDE { return m_isDefault; } // wxButton actions virtual void Toggle(); @@ -99,25 +99,25 @@ public: virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; - virtual bool CanBeHighlighted() const { return true; } + virtual bool CanBeHighlighted() const wxOVERRIDE { return true; } static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } protected: - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual bool DoDrawBackground(wxDC& dc); - virtual void DoDraw(wxControlRenderer *renderer); + virtual bool DoDrawBackground(wxDC& dc) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); + virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE; + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE; // common part of all ctors void Init(); diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index b10fa93712..4019749df0 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -75,8 +75,8 @@ public: const wxString& name = wxCheckBoxNameStr); // implement the checkbox interface - virtual void SetValue(bool value); - virtual bool GetValue() const; + virtual void SetValue(bool value) wxOVERRIDE; + virtual bool GetValue() const wxOVERRIDE; // set/get the bitmaps to use for the checkbox indicator void SetBitmap(const wxBitmap& bmp, State state, Status status); @@ -89,25 +89,25 @@ public: virtual void ChangeValue(bool value); // overridden base class virtuals - virtual bool IsPressed() const { return m_isPressed; } + virtual bool IsPressed() const wxOVERRIDE { return m_isPressed; } virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; - virtual bool CanBeHighlighted() const { return true; } + virtual bool CanBeHighlighted() const wxOVERRIDE { return true; } virtual wxInputHandler *CreateStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return CreateStdInputHandler(handlerDef); } protected: - virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)); - virtual wxCheckBoxState DoGet3StateValue() const; + virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) wxOVERRIDE; + virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer); - virtual wxSize DoGetBestClientSize() const; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // get the size of the bitmap using either the current one or the default // one (query renderer then) diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h index 68030084d9..a6132c21dc 100644 --- a/include/wx/univ/checklst.h +++ b/include/wx/univ/checklst.h @@ -69,16 +69,16 @@ public: const wxString& name = wxListBoxNameStr); // implement check list box methods - 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; // and input handling virtual bool PerformAction(const wxControlAction& action, long numArg = -1l, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } @@ -86,16 +86,16 @@ public: protected: // override all methods which add/delete items to update m_checks array as // well - virtual void OnItemInserted(unsigned int pos); - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual void OnItemInserted(unsigned int pos) wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() wxOVERRIDE; // draw the check items instead of the usual ones virtual void DoDrawRange(wxControlRenderer *renderer, - int itemFirst, int itemLast); + int itemFirst, int itemLast) wxOVERRIDE; // take them also into account for size calculation - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // common part of all ctors void Init(); diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 44b0406b2d..d4940f87c2 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -94,35 +94,35 @@ public: // implement the combobox interface // wxTextCtrl methods - virtual wxString GetValue() const { return DoGetValue(); } - virtual void SetValue(const wxString& value); - virtual void WriteText(const wxString& value); - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); - virtual void SetSelection(long from, long to); - virtual void GetSelection(long *from, long *to) const; - virtual void SetEditable(bool editable); - virtual bool IsEditable() const; + virtual wxString GetValue() const wxOVERRIDE { return DoGetValue(); } + virtual void SetValue(const wxString& value) wxOVERRIDE; + virtual void WriteText(const wxString& value) wxOVERRIDE; + virtual void Copy() wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Paste() wxOVERRIDE; + virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual void SetInsertionPointEnd() wxOVERRIDE; + virtual long GetInsertionPoint() const wxOVERRIDE; + virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE; + virtual void Remove(long from, long to) wxOVERRIDE; + virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetEditable(bool editable) wxOVERRIDE; + virtual bool IsEditable() const wxOVERRIDE; - virtual void Undo(); - virtual void Redo(); - virtual void SelectAll(); + virtual void Undo() wxOVERRIDE; + virtual void Redo() wxOVERRIDE; + virtual void SelectAll() wxOVERRIDE; - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; - virtual bool CanUndo() const; - virtual bool CanRedo() const; + virtual bool CanCopy() const wxOVERRIDE; + virtual bool CanCut() const wxOVERRIDE; + virtual bool CanPaste() const wxOVERRIDE; + virtual bool CanUndo() const wxOVERRIDE; + virtual bool CanRedo() const wxOVERRIDE; // override these methods to disambiguate between two base classes versions - virtual void Clear() + virtual void Clear() wxOVERRIDE { wxComboCtrl::Clear(); wxItemContainer::Clear(); @@ -133,15 +133,15 @@ public: bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } // wxControlWithItems methods - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual void SetSelection(int n); - virtual int GetSelection() const; - virtual wxString GetStringSelection() const; + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual unsigned int GetCount() const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; + virtual void SetSelection(int n) wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; + virtual wxString GetStringSelection() const wxOVERRIDE; // we have our own input handler and our own actions // (but wxComboCtrl already handled Popup/Dismiss) @@ -152,25 +152,25 @@ public: */ static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } // we delegate our client data handling to wxListBox which we use for the // items, so override this and other methods dealing with the client data - virtual wxClientDataType GetClientDataType() const; - virtual void SetClientDataType(wxClientDataType clientDataItemsType); + virtual wxClientDataType GetClientDataType() const wxOVERRIDE; + virtual void SetClientDataType(wxClientDataType clientDataItemsType) wxOVERRIDE; protected: - virtual wxString DoGetValue() const; + virtual wxString DoGetValue() 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; // common part of all ctors @@ -181,7 +181,7 @@ protected: private: // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() { return this; } + virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } // the popup listbox wxListBox *m_lbox; diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h index 442946d048..e2eceb4b3f 100644 --- a/include/wx/univ/control.h +++ b/include/wx/univ/control.h @@ -63,10 +63,10 @@ public: // this function will filter out '&' characters and will put the // accelerator char (the one immediately after '&') into m_chAccel - virtual void SetLabel(const wxString& label); + virtual void SetLabel(const wxString& label) wxOVERRIDE; // return the current label - virtual wxString GetLabel() const { return m_label; } + virtual wxString GetLabel() const wxOVERRIDE { return m_label; } // wxUniversal-specific methods @@ -79,7 +79,7 @@ public: return m_indexAccel == -1 ? wxT('\0') : (wxChar)m_label[m_indexAccel]; } - virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; } + virtual wxWindow *GetInputWindow() const wxOVERRIDE { return (wxWindow*)this; } protected: // common part of all ctors diff --git a/include/wx/univ/custombgwin.h b/include/wx/univ/custombgwin.h index 61d236f7b6..64ebf0c071 100644 --- a/include/wx/univ/custombgwin.h +++ b/include/wx/univ/custombgwin.h @@ -24,7 +24,7 @@ public: wxCustomBackgroundWindow() { } protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE { // We have support for background bitmap even at the base class level. BaseWindowClass::SetBackground(bmp, wxALIGN_NOT, wxTILE); diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index d4f860b6fe..e1c84e80c1 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -42,18 +42,18 @@ public: virtual ~wxDialog(); // is the dialog in modal state right now? - virtual bool IsModal() const; + virtual bool IsModal() const wxOVERRIDE; // For now, same as Show(true) but returns return code - virtual int ShowModal(); + virtual int ShowModal() wxOVERRIDE; // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); + virtual void EndModal(int retCode) wxOVERRIDE; // returns true if we're in a modal loop bool IsModalShowing() const; - virtual bool Show(bool show = true); + virtual bool Show(bool show = true) wxOVERRIDE; // implementation only from now on // ------------------------------- diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 526640f4dc..2e91dd9558 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -38,47 +38,47 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual wxPoint GetClientAreaOrigin() const; - virtual bool Enable(bool enable = true); + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual bool Enable(bool enable = true) wxOVERRIDE; #if wxUSE_STATUSBAR virtual wxStatusBar* CreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); + const wxString& name = wxStatusLineNameStr) wxOVERRIDE; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = wxID_ANY, - const wxString& name = wxToolBarNameStr); + const wxString& name = wxToolBarNameStr) wxOVERRIDE; #endif // wxUSE_TOOLBAR - virtual wxSize GetMinSize() const; + virtual wxSize GetMinSize() const wxOVERRIDE; protected: void OnSize(wxSizeEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int height); + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; #if wxUSE_MENUS // override to update menu bar position when the frame size changes - virtual void PositionMenuBar(); - virtual void DetachMenuBar(); - virtual void AttachMenuBar(wxMenuBar *menubar); + virtual void PositionMenuBar() wxOVERRIDE; + virtual void DetachMenuBar() wxOVERRIDE; + virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; #endif // wxUSE_MENUS #if wxUSE_STATUSBAR // override to update statusbar position when the frame size changes - virtual void PositionStatusBar(); + virtual void PositionStatusBar() wxOVERRIDE; #endif // wxUSE_MENUS protected: #if wxUSE_TOOLBAR - virtual void PositionToolBar(); + virtual void PositionToolBar() wxOVERRIDE; #endif // wxUSE_TOOLBAR DECLARE_EVENT_TABLE() diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h index 4b88175f39..e2d12b1dcd 100644 --- a/include/wx/univ/gauge.h +++ b/include/wx/univ/gauge.h @@ -44,8 +44,8 @@ public: const wxString& name = wxGaugeNameStr); // implement base class virtuals - virtual void SetRange(int range); - virtual void SetValue(int pos); + virtual void SetRange(int range) wxOVERRIDE; + virtual void SetValue(int pos) wxOVERRIDE; // wxUniv-specific methods @@ -60,13 +60,13 @@ protected: void Init(); // return the def border for a progress bar - virtual wxBorder GetDefaultBorder() const; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE; // return the default size - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // draw the control - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxGauge) }; diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h index 00604afaa2..1affc52476 100644 --- a/include/wx/univ/inphand.h +++ b/include/wx/univ/inphand.h @@ -86,24 +86,24 @@ public: virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, - bool pressed) + bool pressed) wxOVERRIDE { return m_handler ? m_handler->HandleKey(consumer, event, pressed) : false; } virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event) + const wxMouseEvent& event) wxOVERRIDE { return m_handler ? m_handler->HandleMouse(consumer, event) : false; } - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) wxOVERRIDE { return m_handler ? m_handler->HandleMouseMove(consumer, event) : false; } - virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) + virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) wxOVERRIDE { return m_handler ? m_handler->HandleFocus(consumer, event) : false; } diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 2a94ffae9d..f4bc78cad4 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -95,38 +95,38 @@ public: const wxString& name = wxListBoxNameStr); // implement the listbox interface defined by wxListBoxBase - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; + virtual unsigned int GetCount() const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - virtual bool IsSelected(int n) const + virtual bool IsSelected(int n) const wxOVERRIDE { return m_selections.Index(n) != wxNOT_FOUND; } - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; + virtual int GetSelection() const wxOVERRIDE; + virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; protected: - virtual void DoSetSelection(int n, bool select); + virtual void DoSetSelection(int n, bool select) wxOVERRIDE; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, - wxClientDataType type); + wxClientDataType type) wxOVERRIDE; // universal wxComboBox implementation internally uses wxListBox friend class WXDLLIMPEXP_FWD_CORE wxComboBox; - virtual void DoSetFirstItem(int n); + virtual void DoSetFirstItem(int n) 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; public: // override some more base class methods - virtual bool SetFont(const wxFont& font); + virtual bool SetFont(const wxFont& font) wxOVERRIDE; // the wxUniversal-specific methods // -------------------------------- @@ -154,7 +154,7 @@ public: void SelectAndNotify(int item); // ensure that the given item is visible by scrolling it into view - virtual void EnsureVisible(int n); + virtual void EnsureVisible(int n) wxOVERRIDE; // find the first item [strictly] after the current one which starts with // the given string and make it the current one, return true if the current @@ -179,26 +179,26 @@ public: // override the wxControl virtual methods virtual bool PerformAction(const wxControlAction& action, long numArg = 0l, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } // idle processing - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; protected: // geometry - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer); - virtual wxBorder GetDefaultBorder() const; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE; // special hook for wxCheckListBox which allows it to update its internal // data when a new item is inserted into the listbox diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index 4525825ec5..a4734017f9 100644 --- a/include/wx/univ/menu.h +++ b/include/wx/univ/menu.h @@ -55,8 +55,8 @@ public: void Dismiss(); // override the base class methods to connect/disconnect event handlers - virtual void Attach(wxMenuBarBase *menubar); - virtual void Detach(); + virtual void Attach(wxMenuBarBase *menubar) wxOVERRIDE; + virtual void Detach() wxOVERRIDE; // implementation only from here @@ -74,9 +74,9 @@ public: protected: // implement base class virtuals - 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; // common part of DoAppend and DoInsert void OnItemAdded(wxMenuItem *item); @@ -146,19 +146,19 @@ public: virtual ~wxMenuBar(); // implement base class virtuals - 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 enable); - virtual bool IsEnabledTop(size_t pos) const; + virtual void EnableTop(size_t pos, bool enable) wxOVERRIDE; + virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; - virtual void SetMenuLabel(size_t pos, const wxString& label); - virtual wxString GetMenuLabel(size_t pos) const; + virtual void SetMenuLabel(size_t pos, const wxString& label) wxOVERRIDE; + virtual wxString GetMenuLabel(size_t pos) const wxOVERRIDE; - virtual void Attach(wxFrame *frame); - virtual void Detach(); + virtual void Attach(wxFrame *frame) wxOVERRIDE; + virtual void Detach() wxOVERRIDE; // get the next item for the givan accel letter (used by wxFrame), return // -1 if none @@ -202,10 +202,10 @@ protected: void OnDismiss(); // draw the menubar - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // menubar geometry - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // has the menubar been created already? bool IsCreated() const { return m_frameLast != NULL; } diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h index e6a11ea44a..889c1bf4a0 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -28,11 +28,11 @@ public: virtual ~wxMenuItem(); // override base class virtuals to update the item appearance on screen - virtual void SetItemLabel(const wxString& text); - virtual void SetCheckable(bool checkable); + virtual void SetItemLabel(const wxString& text) wxOVERRIDE; + virtual void SetCheckable(bool checkable) wxOVERRIDE; - virtual void Enable(bool enable = true); - virtual void Check(bool check = true); + virtual void Enable(bool enable = true) wxOVERRIDE; + virtual void Check(bool check = true) wxOVERRIDE; // we add some extra functions which are also available under MSW from // wxOwnerDrawn class - they will be moved to wxMenuItemBase later diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index 2c7a161c1f..ca32431ed8 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -62,30 +62,30 @@ public: // implement wxNotebookBase pure virtuals // -------------------------------------- - virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } + virtual int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } // changes selected page without sending events - int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } + int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } - virtual bool SetPageText(size_t nPage, const wxString& strText); - virtual wxString GetPageText(size_t nPage) const; + virtual bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; + virtual wxString GetPageText(size_t nPage) const wxOVERRIDE; - virtual int GetPageImage(size_t nPage) const; - virtual bool SetPageImage(size_t nPage, int nImage); + virtual int GetPageImage(size_t nPage) const wxOVERRIDE; + virtual bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; - virtual void SetPageSize(const wxSize& size); - virtual void SetPadding(const wxSize& padding); - virtual void SetTabSize(const wxSize& sz); + virtual void SetPageSize(const wxSize& size) wxOVERRIDE; + virtual void SetPadding(const wxSize& padding) wxOVERRIDE; + virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - virtual bool DeleteAllPages(); + virtual bool DeleteAllPages() wxOVERRIDE; virtual bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = NO_IMAGE); + int imageId = NO_IMAGE) wxOVERRIDE; // style tests // ----------- @@ -103,17 +103,17 @@ public: // hit testing // ----------- - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; // input handling // -------------- virtual bool PerformAction(const wxControlAction& action, long numArg = 0l, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } @@ -122,19 +122,19 @@ public: void RefreshCurrent(); protected: - virtual wxNotebookPage *DoRemovePage(size_t nPage); + virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE; // drawing - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n); // resizing - virtual void DoMoveWindow(int x, int y, int width, int height); + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - int DoSetSelection(size_t nPage, int flags = 0); + int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; // common part of all ctors void Init(); @@ -193,7 +193,7 @@ protected: wxRect GetPagePart() const; // get the page rect in our client coords - wxRect GetPageRect() const; + wxRect GetPageRect() const wxOVERRIDE; // get our client size from the page size wxSize GetSizeForPage(const wxSize& size) const; diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index a0e3fd9832..0fa4c67635 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -80,30 +80,30 @@ public: virtual ~wxRadioBox(); // implement wxRadioBox interface - virtual void SetSelection(int n); - virtual int GetSelection() const; + virtual void SetSelection(int n) wxOVERRIDE; + virtual int GetSelection() const wxOVERRIDE; - virtual unsigned int GetCount() const + virtual unsigned int GetCount() const wxOVERRIDE { return (unsigned int)m_buttons.GetCount(); } - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& label); + virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& label) wxOVERRIDE; - virtual bool Enable(unsigned int n, bool enable = true); - virtual bool Show(unsigned int n, bool show = true); + virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; + virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; - virtual bool IsItemEnabled(unsigned int n) const; - virtual bool IsItemShown(unsigned int n) const; + virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; + virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; // we also override the wxControl methods to avoid virtual function hiding - virtual bool Enable(bool enable = true); - virtual bool Show(bool show = true); - virtual wxString GetLabel() const; - virtual void SetLabel(const wxString& label); + virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Show(bool show = true) wxOVERRIDE; + virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) wxOVERRIDE; // we inherit a version always returning false from wxStaticBox, override // it to behave normally - virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } + virtual bool AcceptsFocus() const wxOVERRIDE { return wxControl::AcceptsFocus(); } #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); @@ -119,12 +119,12 @@ public: bool OnKeyDown(wxKeyEvent& event); protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // override the base class methods dealing with window positioning/sizing // as we must move/size the buttons as well - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual wxSize DoGetBestClientSize() const; + virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // generate a radiobutton click event for the current item void SendRadioEvent(); diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h index d7423d0c07..6f17b9e94f 100644 --- a/include/wx/univ/radiobut.h +++ b/include/wx/univ/radiobut.h @@ -47,16 +47,16 @@ public: const wxString& name = wxRadioButtonNameStr); // override some base class methods - virtual void ChangeValue(bool value); + virtual void ChangeValue(bool value) wxOVERRIDE; protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // implement our own drawing - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // we use the radio button bitmaps for size calculation - virtual wxSize GetBitmapSize() const; + virtual wxSize GetBitmapSize() const wxOVERRIDE; // the radio button can only be cleared using this method, not // ChangeValue() above - and it is protected as it can only be called by @@ -65,10 +65,10 @@ protected: // called when the radio button becomes checked: we clear all the buttons // in the same group with us here - virtual void OnCheck(); + virtual void OnCheck() wxOVERRIDE; // send event about radio button selection - virtual void SendEvent(); + virtual void SendEvent() wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxRadioButton) diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 46f31682cf..bc9438ec77 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -501,14 +501,14 @@ public: const wxColour& col, const wxRect& rect, int flags, - wxWindow *window = NULL ) + wxWindow *window = NULL ) wxOVERRIDE { m_renderer->DrawBackground(dc, col, rect, flags, window ); } virtual void DrawButtonSurface(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags) + int flags) wxOVERRIDE { m_renderer->DrawButtonSurface(dc, col, rect, flags); } - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE { m_renderer->DrawFocusRect(win, dc, rect, flags); } virtual void DrawLabel(wxDC& dc, const wxString& label, @@ -516,7 +516,7 @@ public: int flags = 0, int align = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1, - wxRect *rectBounds = NULL) + wxRect *rectBounds = NULL) wxOVERRIDE { m_renderer->DrawLabel(dc, label, rect, flags, align, indexAccel, rectBounds); } virtual void DrawButtonLabel(wxDC& dc, @@ -526,72 +526,72 @@ public: int flags = 0, int align = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1, - wxRect *rectBounds = NULL) + wxRect *rectBounds = NULL) wxOVERRIDE { m_renderer->DrawButtonLabel(dc, label, image, rect, flags, align, indexAccel, rectBounds); } virtual void DrawBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) + wxRect *rectIn = NULL) wxOVERRIDE { m_renderer->DrawBorder(dc, border, rect, flags, rectIn); } virtual void DrawTextBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) + wxRect *rectIn = NULL) wxOVERRIDE { m_renderer->DrawTextBorder(dc, border, rect, flags, rectIn); } virtual void DrawButtonBorder(wxDC& dc, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) + wxRect *rectIn = NULL) wxOVERRIDE { m_renderer->DrawButtonBorder(dc, rect, flags, rectIn); } virtual void DrawFrame(wxDC& dc, const wxString& label, const wxRect& rect, int flags = 0, int align = wxALIGN_LEFT, - int indexAccel = -1) + int indexAccel = -1) wxOVERRIDE { m_renderer->DrawFrame(dc, label, rect, flags, align, indexAccel); } virtual void DrawHorizontalLine(wxDC& dc, - wxCoord y, wxCoord x1, wxCoord x2) + wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE { m_renderer->DrawHorizontalLine(dc, y, x1, x2); } virtual void DrawVerticalLine(wxDC& dc, - wxCoord x, wxCoord y1, wxCoord y2) + wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE { m_renderer->DrawVerticalLine(dc, x, y1, y2); } virtual void DrawArrow(wxDC& dc, wxDirection dir, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawArrow(dc, dir, rect, flags); } virtual void DrawScrollbarArrow(wxDC& dc, wxDirection dir, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawScrollbarArrow(dc, dir, rect, flags); } virtual void DrawScrollbarThumb(wxDC& dc, wxOrientation orient, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawScrollbarThumb(dc, orient, rect, flags); } virtual void DrawScrollbarShaft(wxDC& dc, wxOrientation orient, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawScrollbarShaft(dc, orient, rect, flags); } virtual void DrawScrollCorner(wxDC& dc, - const wxRect& rect) + const wxRect& rect) wxOVERRIDE { m_renderer->DrawScrollCorner(dc, rect); } virtual void DrawItem(wxDC& dc, const wxString& label, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawItem(dc, label, rect, flags); } virtual void DrawCheckItem(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawCheckItem(dc, label, bitmap, rect, flags); } virtual void DrawCheckButton(wxDC& dc, const wxString& label, @@ -599,7 +599,7 @@ public: const wxRect& rect, int flags = 0, wxAlignment align = wxALIGN_LEFT, - int indexAccel = -1) + int indexAccel = -1) wxOVERRIDE { m_renderer->DrawCheckButton(dc, label, bitmap, rect, flags, align, indexAccel); } virtual void DrawRadioButton(wxDC& dc, @@ -608,7 +608,7 @@ public: const wxRect& rect, int flags = 0, wxAlignment align = wxALIGN_LEFT, - int indexAccel = -1) + int indexAccel = -1) wxOVERRIDE { m_renderer->DrawRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); } #if wxUSE_TOOLBAR @@ -618,7 +618,7 @@ public: const wxRect& rect, int flags = 0, long style = 0, - int tbarStyle = 0) + int tbarStyle = 0) wxOVERRIDE { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags, style, tbarStyle); } #endif // wxUSE_TOOLBAR @@ -628,9 +628,9 @@ public: const wxRect& rect, int selStart = -1, int selEnd = -1, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawTextLine(dc, text, rect, selStart, selEnd, flags); } - virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) + virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE { m_renderer->DrawLineWrapMark(dc, rect); } #endif // wxUSE_TEXTCTRL @@ -641,7 +641,7 @@ public: const wxString& label, const wxBitmap& bitmap = wxNullBitmap, int flags = 0, - int accel = -1) + int accel = -1) wxOVERRIDE { m_renderer->DrawTab(dc, rect, dir, label, bitmap, flags, accel); } #endif // wxUSE_NOTEBOOK @@ -653,13 +653,13 @@ public: wxOrientation orient, int flags = 0, long style = 0, - wxRect *rectShaft = NULL) + wxRect *rectShaft = NULL) wxOVERRIDE { m_renderer->DrawSliderShaft(dc, rect, lenThumb, orient, flags, style, rectShaft); } virtual void DrawSliderThumb(wxDC& dc, const wxRect& rect, wxOrientation orient, int flags = 0, - long style = 0) + long style = 0) wxOVERRIDE { m_renderer->DrawSliderThumb(dc, rect, orient, flags, style); } virtual void DrawSliderTicks(wxDC& dc, const wxRect& rect, @@ -669,7 +669,7 @@ public: int end, int WXUNUSED(step) = 1, int flags = 0, - long style = 0) + long style = 0) wxOVERRIDE { m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient, start, end, start, flags, style); } #endif // wxUSE_SLIDER @@ -679,7 +679,7 @@ public: const wxRect& rect, const wxString& label, int flags = 0, - int indexAccel = -1) + int indexAccel = -1) wxOVERRIDE { m_renderer->DrawMenuBarItem(dc, rect, label, flags, indexAccel); } virtual void DrawMenuItem(wxDC& dc, wxCoord y, @@ -688,12 +688,12 @@ public: const wxString& accel, const wxBitmap& bitmap = wxNullBitmap, int flags = 0, - int indexAccel = -1) + int indexAccel = -1) wxOVERRIDE { m_renderer->DrawMenuItem(dc, y, gi, label, accel, bitmap, flags, indexAccel); } virtual void DrawMenuSeparator(wxDC& dc, wxCoord y, - const wxMenuGeometryInfo& geomInfo) + const wxMenuGeometryInfo& geomInfo) wxOVERRIDE { m_renderer->DrawMenuSeparator(dc, y, geomInfo); } #endif // wxUSE_MENUS @@ -701,7 +701,7 @@ public: virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0, int style = 0) + int flags = 0, int style = 0) wxOVERRIDE { m_renderer->DrawStatusField(dc, rect, label, flags, style); } #endif // wxUSE_STATUSBAR @@ -711,133 +711,133 @@ public: const wxIcon& icon, int flags, int specialButton = 0, - int specialButtonFlag = 0) + int specialButtonFlag = 0) wxOVERRIDE { m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags, specialButton, specialButtonFlag); } virtual void DrawFrameBorder(wxDC& dc, const wxRect& rect, - int flags) + int flags) wxOVERRIDE { m_renderer->DrawFrameBorder(dc, rect, flags); } virtual void DrawFrameBackground(wxDC& dc, const wxRect& rect, - int flags) + int flags) wxOVERRIDE { m_renderer->DrawFrameBackground(dc, rect, flags); } virtual void DrawFrameTitle(wxDC& dc, const wxRect& rect, const wxString& title, - int flags) + int flags) wxOVERRIDE { m_renderer->DrawFrameTitle(dc, rect, title, flags); } virtual void DrawFrameIcon(wxDC& dc, const wxRect& rect, const wxIcon& icon, - int flags) + int flags) wxOVERRIDE { m_renderer->DrawFrameIcon(dc, rect, icon, flags); } virtual void DrawFrameButton(wxDC& dc, wxCoord x, wxCoord y, int button, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawFrameButton(dc, x, y, button, flags); } #if wxUSE_COMBOBOX virtual void GetComboBitmaps(wxBitmap *bmpNormal, wxBitmap *bmpFocus, wxBitmap *bmpPressed, - wxBitmap *bmpDisabled) + wxBitmap *bmpDisabled) wxOVERRIDE { m_renderer->GetComboBitmaps(bmpNormal, bmpFocus, bmpPressed, bmpDisabled); } #endif // wxUSE_COMBOBOX - virtual void AdjustSize(wxSize *size, const wxWindow *window) + virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE { m_renderer->AdjustSize(size, window); } - virtual wxRect GetBorderDimensions(wxBorder border) const + virtual wxRect GetBorderDimensions(wxBorder border) const wxOVERRIDE { return m_renderer->GetBorderDimensions(border); } - virtual bool AreScrollbarsInsideBorder() const + virtual bool AreScrollbarsInsideBorder() const wxOVERRIDE { return m_renderer->AreScrollbarsInsideBorder(); } #if wxUSE_SCROLLBAR - virtual wxSize GetScrollbarArrowSize() const + virtual wxSize GetScrollbarArrowSize() const wxOVERRIDE { return m_renderer->GetScrollbarArrowSize(); } #endif // wxUSE_SCROLLBAR - virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) + virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE { return m_renderer->GetListboxItemHeight(fontHeight); } - virtual wxSize GetCheckBitmapSize() const + virtual wxSize GetCheckBitmapSize() const wxOVERRIDE { return m_renderer->GetCheckBitmapSize(); } - virtual wxSize GetRadioBitmapSize() const + virtual wxSize GetRadioBitmapSize() const wxOVERRIDE { return m_renderer->GetRadioBitmapSize(); } - virtual wxCoord GetCheckItemMargin() const + virtual wxCoord GetCheckItemMargin() const wxOVERRIDE { return m_renderer->GetCheckItemMargin(); } #if wxUSE_TOOLBAR - virtual wxSize GetToolBarButtonSize(wxCoord *separator) const + virtual wxSize GetToolBarButtonSize(wxCoord *separator) const wxOVERRIDE { return m_renderer->GetToolBarButtonSize(separator); } - virtual wxSize GetToolBarMargin() const + virtual wxSize GetToolBarMargin() const wxOVERRIDE { return m_renderer->GetToolBarMargin(); } #endif // wxUSE_TOOLBAR #if wxUSE_TEXTCTRL virtual wxRect GetTextTotalArea(const wxTextCtrl *text, - const wxRect& rect) const + const wxRect& rect) const wxOVERRIDE { return m_renderer->GetTextTotalArea(text, rect); } virtual wxRect GetTextClientArea(const wxTextCtrl *text, const wxRect& rect, - wxCoord *extraSpaceBeyond) const + wxCoord *extraSpaceBeyond) const wxOVERRIDE { return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); } #endif // wxUSE_TEXTCTRL #if wxUSE_NOTEBOOK - virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); } - virtual wxSize GetTabPadding() const { return m_renderer->GetTabPadding(); } + virtual wxSize GetTabIndent() const wxOVERRIDE { return m_renderer->GetTabIndent(); } + virtual wxSize GetTabPadding() const wxOVERRIDE { return m_renderer->GetTabPadding(); } #endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER - virtual wxCoord GetSliderDim() const + virtual wxCoord GetSliderDim() const wxOVERRIDE { return m_renderer->GetSliderDim(); } - virtual wxCoord GetSliderTickLen() const + virtual wxCoord GetSliderTickLen() const wxOVERRIDE { return m_renderer->GetSliderTickLen(); } virtual wxRect GetSliderShaftRect(const wxRect& rect, int lenThumb, wxOrientation orient, - long style = 0) const + long style = 0) const wxOVERRIDE { return m_renderer->GetSliderShaftRect(rect, lenThumb, orient, style); } virtual wxSize GetSliderThumbSize(const wxRect& rect, int lenThumb, - wxOrientation orient) const + wxOrientation orient) const wxOVERRIDE { return m_renderer->GetSliderThumbSize(rect, lenThumb, orient); } #endif // wxUSE_SLIDER - virtual wxSize GetProgressBarStep() const + virtual wxSize GetProgressBarStep() const wxOVERRIDE { return m_renderer->GetProgressBarStep(); } #if wxUSE_MENUS - virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const + virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const wxOVERRIDE { return m_renderer->GetMenuBarItemSize(sizeText); } virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win, - const wxMenu& menu) const + const wxMenu& menu) const wxOVERRIDE { return m_renderer->GetMenuGeometry(win, menu); } #endif // wxUSE_MENUS #if wxUSE_STATUSBAR - virtual wxSize GetStatusBarBorders() const + virtual wxSize GetStatusBarBorders() const wxOVERRIDE { return m_renderer->GetStatusBarBorders(); } - virtual wxCoord GetStatusBarBorderBetweenFields() const + virtual wxCoord GetStatusBarBorderBetweenFields() const wxOVERRIDE { return m_renderer->GetStatusBarBorderBetweenFields(); } - virtual wxSize GetStatusBarFieldMargins() const + virtual wxSize GetStatusBarFieldMargins() const wxOVERRIDE { return m_renderer->GetStatusBarFieldMargins(); } #endif // wxUSE_STATUSBAR - virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const + virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const wxOVERRIDE { return m_renderer->GetFrameClientArea(rect, flags); } - virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const + virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const wxOVERRIDE { return m_renderer->GetFrameTotalSize(clientSize, flags); } - virtual wxSize GetFrameMinSize(int flags) const + virtual wxSize GetFrameMinSize(int flags) const wxOVERRIDE { return m_renderer->GetFrameMinSize(flags); } - virtual wxSize GetFrameIconSize() const + virtual wxSize GetFrameIconSize() const wxOVERRIDE { return m_renderer->GetFrameIconSize(); } virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, - int flags) const + int flags) const wxOVERRIDE { return m_renderer->HitTestFrame(rect, pt, flags); } virtual int DrawHeaderButton(wxWindow *win, @@ -845,12 +845,12 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortIcon = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) + wxHeaderButtonParams* params = NULL) wxOVERRIDE { return m_renderer->DrawHeaderButton(win, dc, rect, flags, sortIcon, params); } virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_renderer->DrawTreeItemButton(win, dc, rect, flags); } protected: diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h index c82692f9fe..025ffaf938 100644 --- a/include/wx/univ/scrolbar.h +++ b/include/wx/univ/scrolbar.h @@ -75,47 +75,47 @@ public: virtual ~wxScrollBar(); // implement base class pure virtuals - 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 thumbPos); + virtual void SetThumbPosition(int thumbPos) wxOVERRIDE; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true); + bool refresh = true) wxOVERRIDE; // wxScrollBar actions void ScrollToStart(); void ScrollToEnd(); - bool ScrollLines(int nLines); - bool ScrollPages(int nPages); + bool ScrollLines(int nLines) wxOVERRIDE; + bool ScrollPages(int nPages) wxOVERRIDE; virtual bool PerformAction(const wxControlAction& action, long numArg = 0, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } // scrollbars around a normal window should not receive the focus - virtual bool AcceptsFocus() const; + virtual bool AcceptsFocus() const wxOVERRIDE; // wxScrollBar sub elements state (combination of wxCONTROL_XXX) void SetState(Element which, int flags); int GetState(Element which) const; // implement wxControlWithArrows methods - virtual wxRenderer *GetRenderer() const { return m_renderer; } - virtual wxWindow *GetWindow() { return this; } - virtual bool IsVertical() const { return wxScrollBarBase::IsVertical(); } - virtual int GetArrowState(wxScrollArrows::Arrow arrow) const; - virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set); - virtual bool OnArrow(wxScrollArrows::Arrow arrow); - virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const; + virtual wxRenderer *GetRenderer() const wxOVERRIDE { return m_renderer; } + virtual wxWindow *GetWindow() wxOVERRIDE { return this; } + virtual bool IsVertical() const wxOVERRIDE { return wxScrollBarBase::IsVertical(); } + virtual int GetArrowState(wxScrollArrows::Arrow arrow) const wxOVERRIDE; + virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set) wxOVERRIDE; + virtual bool OnArrow(wxScrollArrows::Arrow arrow) wxOVERRIDE; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const wxOVERRIDE; // for wxControlRenderer::DrawScrollbar() only const wxScrollArrows& GetArrows() const { return m_arrows; } @@ -124,12 +124,12 @@ public: wxHitTest HitTestBar(const wxPoint& pt) const; // idle processing - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; protected: - virtual wxSize DoGetBestClientSize() const; - virtual void DoDraw(wxControlRenderer *renderer); - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // forces update of thumb's visual appearence (does nothing if m_dirty=false) void UpdateThumb(); @@ -212,10 +212,10 @@ public: virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, - bool pressed); + bool pressed) wxOVERRIDE; virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event); - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); + const wxMouseEvent& event) wxOVERRIDE; + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) wxOVERRIDE; virtual ~wxStdScrollBarInputHandler(); diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h index 3d3f059dc5..f7c079f45e 100644 --- a/include/wx/univ/scrtimer.h +++ b/include/wx/univ/scrtimer.h @@ -34,7 +34,7 @@ public: void StartAutoScroll(); // the base class method - virtual void Notify(); + virtual void Notify() wxOVERRIDE; protected: // to implement in derived classes: perform the scroll action and return diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h index fadab4d12f..fb61ab8922 100644 --- a/include/wx/univ/slider.h +++ b/include/wx/univ/slider.h @@ -61,22 +61,22 @@ public: const wxString& name = wxSliderNameStr); // implement base class pure virtuals - 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 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 int GetTickFreq() const { return m_tickFreq; } + virtual int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } // wxUniv-specific methods // ----------------------- @@ -99,32 +99,32 @@ public: ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); } // implement wxControlWithThumb interface - virtual wxWindow *GetWindow() { return this; } - virtual bool IsVertical() const { return IsVert(); } + virtual wxWindow *GetWindow() wxOVERRIDE { return this; } + virtual bool IsVertical() const wxOVERRIDE { return IsVert(); } - virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const; - virtual wxCoord ThumbPosToPixel() const; - virtual int PixelToThumbPos(wxCoord x) const; + virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const wxOVERRIDE; + virtual wxCoord ThumbPosToPixel() const wxOVERRIDE; + virtual int PixelToThumbPos(wxCoord x) const wxOVERRIDE; virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart, int flag, - bool set = true); + bool set = true) wxOVERRIDE; - virtual void OnThumbDragStart(int pos); - virtual void OnThumbDrag(int pos); - virtual void OnThumbDragEnd(int pos); - virtual void OnPageScrollStart(); - virtual bool OnPageScroll(int pageInc); + virtual void OnThumbDragStart(int pos) wxOVERRIDE; + virtual void OnThumbDrag(int pos) wxOVERRIDE; + virtual void OnThumbDragEnd(int pos) wxOVERRIDE; + virtual void OnPageScrollStart() wxOVERRIDE; + virtual bool OnPageScroll(int pageInc) wxOVERRIDE; // for wxStdSliderInputHandler wxScrollThumb& GetThumb() { return m_thumb; } virtual bool PerformAction(const wxControlAction& action, long numArg = 0, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } @@ -136,12 +136,12 @@ protected: }; // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq); + virtual void DoSetTickFreq(int freq) wxOVERRIDE; // overridden base class virtuals - virtual wxSize DoGetBestClientSize() const; - virtual void DoDraw(wxControlRenderer *renderer); - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // event handlers void OnSize(wxSizeEvent& event); diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 1ae4ccba7c..4f2862d55f 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -41,36 +41,36 @@ public: const wxString& name = wxSPIN_BUTTON_NAME); // implement wxSpinButtonBase methods - virtual int GetValue() const; - virtual void SetValue(int val); - virtual void SetRange(int minVal, int maxVal); + virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int val) wxOVERRIDE; + virtual void SetRange(int minVal, int maxVal) wxOVERRIDE; // implement wxControlWithArrows methods - virtual wxRenderer *GetRenderer() const { return m_renderer; } - virtual wxWindow *GetWindow() { return this; } - virtual bool IsVertical() const { return wxSpinButtonBase::IsVertical(); } - virtual int GetArrowState(wxScrollArrows::Arrow arrow) const; - virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set); - virtual bool OnArrow(wxScrollArrows::Arrow arrow); - virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const; + virtual wxRenderer *GetRenderer() const wxOVERRIDE { return m_renderer; } + virtual wxWindow *GetWindow() wxOVERRIDE { return this; } + virtual bool IsVertical() const wxOVERRIDE { return wxSpinButtonBase::IsVertical(); } + virtual int GetArrowState(wxScrollArrows::Arrow arrow) const wxOVERRIDE; + virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set) wxOVERRIDE; + virtual bool OnArrow(wxScrollArrows::Arrow arrow) wxOVERRIDE; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const wxOVERRIDE; // for wxStdSpinButtonInputHandler const wxScrollArrows& GetArrows() { return m_arrows; } virtual bool PerformAction(const wxControlAction& action, long numArg = 0, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } protected: - virtual wxSize DoGetBestClientSize() const; - virtual void DoDraw(wxControlRenderer *renderer); - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // the common part of all ctors void Init(); @@ -110,11 +110,11 @@ public: virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, - bool pressed); + bool pressed) wxOVERRIDE; virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event); + const wxMouseEvent& event) wxOVERRIDE; virtual bool HandleMouseMove(wxInputConsumer *consumer, - const wxMouseEvent& event); + const wxMouseEvent& event) wxOVERRIDE; }; #endif // _WX_UNIV_SPINBUTT_H_ diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h index c649653915..d799643ac4 100644 --- a/include/wx/univ/statbmp.h +++ b/include/wx/univ/statbmp.h @@ -52,16 +52,16 @@ public: long style = 0, const wxString& name = wxStaticBitmapNameStr); - virtual void SetBitmap(const wxBitmap& bitmap); - virtual void SetIcon(const wxIcon& icon); - virtual wxBitmap GetBitmap() const { return m_bitmap; } + virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; + virtual void SetIcon(const wxIcon& icon) wxOVERRIDE; + virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; } - wxIcon GetIcon() const; + wxIcon GetIcon() const wxOVERRIDE; - virtual bool HasTransparentBackground() { return true; } + virtual bool HasTransparentBackground() wxOVERRIDE { return true; } protected: - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; private: // the bitmap which we show diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h index 081c9d6e66..e2d1b69e27 100644 --- a/include/wx/univ/statbox.h +++ b/include/wx/univ/statbox.h @@ -48,11 +48,11 @@ public: // returning true from here ensures that we act as a container window for // our children - virtual bool IsStaticBox() const { return true; } + virtual bool IsStaticBox() const wxOVERRIDE { return true; } protected: // draw the control - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // get the size of the border wxRect GetBorderGeometry() const; diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h index 6801d6c124..acf3edfe21 100644 --- a/include/wx/univ/statline.h +++ b/include/wx/univ/statline.h @@ -45,7 +45,7 @@ public: const wxString &name = wxStaticLineNameStr ); protected: - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxStaticLine) diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index f2e27bb3b5..4e13ca2393 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -50,16 +50,16 @@ public: // implementation only from now on - virtual void SetLabel(const wxString& label); + virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual bool IsFocused() const { return false; } + virtual bool IsFocused() const wxOVERRIDE { return false; } protected: // draw the control - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual void DoSetLabel(const wxString& str); - virtual wxString DoGetLabel() const; + virtual void DoSetLabel(const wxString& str) wxOVERRIDE; + virtual wxString DoGetLabel() const wxOVERRIDE; DECLARE_DYNAMIC_CLASS(wxStaticText) }; diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 89dd8bf255..a0557368b6 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -39,35 +39,35 @@ public: const wxString& name = wxPanelNameStr); // implement base class methods - virtual void SetFieldsCount(int number = 1, const int *widths = NULL); - virtual void SetStatusWidths(int n, const int widths[]); + virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE; + virtual void SetStatusWidths(int n, const int widths[]) wxOVERRIDE; - virtual bool GetFieldRect(int i, wxRect& rect) const; - virtual void SetMinHeight(int height); + virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; + virtual void SetMinHeight(int height) wxOVERRIDE; - virtual int GetBorderX() const; - virtual int GetBorderY() const; + virtual int GetBorderX() const wxOVERRIDE; + virtual int GetBorderY() const wxOVERRIDE; // wxInputConsumer pure virtual - virtual wxWindow *GetInputWindow() const + virtual wxWindow *GetInputWindow() const wxOVERRIDE { return const_cast(this); } protected: - virtual void DoUpdateStatusText(int i); + virtual void DoUpdateStatusText(int i) wxOVERRIDE; // recalculate the field widths void OnSize(wxSizeEvent& event); // draw the statusbar - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // tell them about our preferred height - virtual wxSize DoGetBestSize() const; + virtual wxSize DoGetBestSize() const wxOVERRIDE; // override DoSetSize() to prevent the status bar height from changing virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; // get the (fixed) status bar height wxCoord GetHeight() const; diff --git a/include/wx/univ/stdrend.h b/include/wx/univ/stdrend.h index 66ca413218..e781981a8b 100644 --- a/include/wx/univ/stdrend.h +++ b/include/wx/univ/stdrend.h @@ -30,14 +30,14 @@ public: const wxColour& col, const wxRect& rect, int flags = 0, - wxWindow *window = NULL); + wxWindow *window = NULL) wxOVERRIDE; virtual void DrawButtonSurface(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags); + int flags) wxOVERRIDE; - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; virtual void DrawLabel(wxDC& dc, const wxString& label, @@ -45,7 +45,7 @@ public: int flags = 0, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1, - wxRect *rectBounds = NULL); + wxRect *rectBounds = NULL) wxOVERRIDE; virtual void DrawButtonLabel(wxDC& dc, const wxString& label, const wxBitmap& image, @@ -53,41 +53,41 @@ public: int flags = 0, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1, - wxRect *rectBounds = NULL); + wxRect *rectBounds = NULL) wxOVERRIDE; virtual void DrawBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL); + wxRect *rectIn = NULL) wxOVERRIDE; virtual void DrawTextBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL); + wxRect *rectIn = NULL) wxOVERRIDE; virtual void DrawHorizontalLine(wxDC& dc, - wxCoord y, wxCoord x1, wxCoord x2); + wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE; virtual void DrawVerticalLine(wxDC& dc, - wxCoord x, wxCoord y1, wxCoord y2); + wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE; virtual void DrawFrame(wxDC& dc, const wxString& label, const wxRect& rect, int flags = 0, int alignment = wxALIGN_LEFT, - int indexAccel = -1); + int indexAccel = -1) wxOVERRIDE; virtual void DrawItem(wxDC& dc, const wxString& label, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawCheckItem(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawCheckButton(wxDC& dc, const wxString& label, @@ -95,21 +95,21 @@ public: const wxRect& rect, int flags = 0, wxAlignment align = wxALIGN_LEFT, - int indexAccel = -1); + int indexAccel = -1) wxOVERRIDE; virtual void DrawRadioButton(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rect, int flags = 0, wxAlignment align = wxALIGN_LEFT, - int indexAccel = -1); + int indexAccel = -1) wxOVERRIDE; virtual void DrawScrollbarArrow(wxDC& dc, wxDirection dir, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawScrollCorner(wxDC& dc, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; #if wxUSE_TEXTCTRL virtual void DrawTextLine(wxDC& dc, @@ -117,39 +117,39 @@ public: const wxRect& rect, int selStart = -1, int selEnd = -1, - int flags = 0); + int flags = 0) wxOVERRIDE; - virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect); + virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE; virtual wxRect GetTextTotalArea(const wxTextCtrl *text, - const wxRect& rect) const; + const wxRect& rect) const wxOVERRIDE; virtual wxRect GetTextClientArea(const wxTextCtrl *text, const wxRect& rect, - wxCoord *extraSpaceBeyond) const; + wxCoord *extraSpaceBeyond) const wxOVERRIDE; #endif // wxUSE_TEXTCTRL - virtual wxRect GetBorderDimensions(wxBorder border) const; + virtual wxRect GetBorderDimensions(wxBorder border) const wxOVERRIDE; - virtual bool AreScrollbarsInsideBorder() const; + virtual bool AreScrollbarsInsideBorder() const wxOVERRIDE; - virtual void AdjustSize(wxSize *size, const wxWindow *window); + virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE; - virtual wxCoord GetListboxItemHeight(wxCoord fontHeight); + virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE; #if wxUSE_STATUSBAR virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0, int style = 0); + int flags = 0, int style = 0) wxOVERRIDE; - virtual wxSize GetStatusBarBorders() const; + virtual wxSize GetStatusBarBorders() const wxOVERRIDE; - virtual wxCoord GetStatusBarBorderBetweenFields() const; + virtual wxCoord GetStatusBarBorderBetweenFields() const wxOVERRIDE; - virtual wxSize GetStatusBarFieldMargins() const; + virtual wxSize GetStatusBarFieldMargins() const wxOVERRIDE; #endif // wxUSE_STATUSBAR - virtual wxCoord GetCheckItemMargin() const { return 0; } + virtual wxCoord GetCheckItemMargin() const wxOVERRIDE { return 0; } virtual void DrawFrameTitleBar(wxDC& dc, @@ -158,37 +158,37 @@ public: const wxIcon& icon, int flags, int specialButton = 0, - int specialButtonFlag = 0); + int specialButtonFlag = 0) wxOVERRIDE; virtual void DrawFrameBorder(wxDC& dc, const wxRect& rect, - int flags); + int flags) wxOVERRIDE; virtual void DrawFrameBackground(wxDC& dc, const wxRect& rect, - int flags); + int flags) wxOVERRIDE; virtual void DrawFrameTitle(wxDC& dc, const wxRect& rect, const wxString& title, - int flags); + int flags) wxOVERRIDE; virtual void DrawFrameIcon(wxDC& dc, const wxRect& rect, const wxIcon& icon, - int flags); + int flags) wxOVERRIDE; virtual void DrawFrameButton(wxDC& dc, wxCoord x, wxCoord y, int button, - int flags = 0); + int flags = 0) wxOVERRIDE; - virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const; + virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const wxOVERRIDE; - virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const; + virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const wxOVERRIDE; - virtual wxSize GetFrameMinSize(int flags) const; + virtual wxSize GetFrameMinSize(int flags) const wxOVERRIDE; - virtual wxSize GetFrameIconSize() const; + virtual wxSize GetFrameIconSize() const wxOVERRIDE; virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, - int flags = 0) const; + int flags = 0) const wxOVERRIDE; protected: // various constants enum ArrowDirection diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 1c2565a852..87aafa2b5e 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -103,39 +103,39 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual int GetLineLength(wxTextCoord lineNo) const; - virtual wxString GetLineText(wxTextCoord lineNo) const; - virtual int GetNumberOfLines() const; + virtual int GetLineLength(wxTextCoord lineNo) const wxOVERRIDE; + virtual wxString GetLineText(wxTextCoord lineNo) const wxOVERRIDE; + virtual int GetNumberOfLines() const wxOVERRIDE; - virtual bool IsModified() const; - virtual bool IsEditable() const; + virtual bool IsModified() const wxOVERRIDE; + virtual bool IsEditable() const wxOVERRIDE; // If the return values from and to are the same, there is no selection. - virtual void GetSelection(wxTextPos* from, wxTextPos* to) const; + virtual void GetSelection(wxTextPos* from, wxTextPos* to) const wxOVERRIDE; // operations // ---------- // editing - virtual void Clear(); - virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value); - virtual void Remove(wxTextPos from, wxTextPos to); + virtual void Clear() wxOVERRIDE; + virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value) wxOVERRIDE; + virtual void Remove(wxTextPos from, wxTextPos to) wxOVERRIDE; // sets/clears the dirty flag - virtual void MarkDirty(); - virtual void DiscardEdits(); + virtual void MarkDirty() wxOVERRIDE; + virtual void DiscardEdits() wxOVERRIDE; // writing text inserts it at the current position, appending always // inserts it at the end - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text); + virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual void AppendText(const wxString& text) wxOVERRIDE; // translate between the position (which is just an index in the text ctrl // considering all its contents as a single strings) and (x, y) coordinates // which represent (logical, i.e. unwrapped) column and line. - virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const; + virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const wxOVERRIDE; virtual bool PositionToXY(wxTextPos pos, - wxTextCoord *x, wxTextCoord *y) const; + wxTextCoord *x, wxTextCoord *y) const wxOVERRIDE; // wxUniv-specific: find a screen position (in client coordinates) of the // given text position or of the caret @@ -143,28 +143,28 @@ public: bool PositionToDeviceXY(wxTextPos pos, wxCoord *x, wxCoord *y) const; wxPoint GetCaretPosition() const; - virtual void ShowPosition(wxTextPos pos); + virtual void ShowPosition(wxTextPos pos) wxOVERRIDE; // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); + virtual void Copy() wxOVERRIDE; + virtual void Cut() wxOVERRIDE; + virtual void Paste() 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(wxTextPos pos); - virtual void SetInsertionPointEnd(); - virtual wxTextPos GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; + virtual void SetInsertionPoint(wxTextPos pos) wxOVERRIDE; + virtual void SetInsertionPointEnd() wxOVERRIDE; + virtual wxTextPos GetInsertionPoint() const wxOVERRIDE; + virtual wxTextPos GetLastPosition() const wxOVERRIDE; - virtual void SetSelection(wxTextPos from, wxTextPos to); - virtual void SetEditable(bool editable); + virtual void SetSelection(wxTextPos from, wxTextPos to) wxOVERRIDE; + virtual void SetEditable(bool editable) wxOVERRIDE; // wxUniv-specific methods // ----------------------- @@ -185,10 +185,10 @@ public: void RemoveSelection(); wxString GetSelectionText() const; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const; + wxTextCoord *row) const wxOVERRIDE; // find the character at this position in the given line, return value as // for HitTest() @@ -206,7 +206,7 @@ public: void ScrollText(wxTextCoord col); // adjust the DC for horz text control scrolling too - virtual void DoPrepareDC(wxDC& dc); + virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; // implementation only from now on // ------------------------------- @@ -218,17 +218,17 @@ public: // perform an action virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } // override these methods to handle the caret - virtual bool SetFont(const wxFont &font); - virtual bool Enable(bool enable = true); + virtual bool SetFont(const wxFont &font) wxOVERRIDE; + virtual bool Enable(bool enable = true) wxOVERRIDE; // more readable flag testing methods bool IsPassword() const { return HasFlag(wxTE_PASSWORD); } @@ -239,25 +239,25 @@ public: // override wxScrollHelper method to prevent (auto)scrolling beyond the end // of line - virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const; + virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const wxOVERRIDE; // idle processing - virtual void OnInternalIdle(); + virtual void OnInternalIdle() wxOVERRIDE; protected: // ensure we have correct default border - virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_SUNKEN; } // override base class methods - virtual void DoDrawBorder(wxDC& dc, const wxRect& rect); - virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoDrawBorder(wxDC& dc, const wxRect& rect) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // calc the size from the text extent - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // implements Set/ChangeValue() - virtual void DoSetValue(const wxString& value, int flags = 0); - virtual wxString DoGetValue() const; + virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE; + virtual wxString DoGetValue() const wxOVERRIDE; // common part of all ctors void Init(); diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h index 7485c19c5b..d2386b0783 100644 --- a/include/wx/univ/tglbtn.h +++ b/include/wx/univ/tglbtn.h @@ -43,18 +43,18 @@ public: virtual ~wxToggleButton(); - virtual bool IsPressed() const { return m_isPressed || m_value; } + virtual bool IsPressed() const wxOVERRIDE { return m_isPressed || m_value; } // wxToggleButton actions - virtual void Toggle(); - virtual void Click(); + virtual void Toggle() wxOVERRIDE; + virtual void Click() wxOVERRIDE; // Get/set the value void SetValue(bool state); bool GetValue() const { return m_value; } protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } // the current value bool m_value; diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 2ff1831800..5023981ae7 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -56,23 +56,23 @@ public: virtual ~wxToolBar(); - virtual bool Realize(); + virtual bool Realize() wxOVERRIDE; - virtual void SetWindowStyleFlag( long style ); + virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual void SetToolShortHelp(int id, const wxString& helpString); + virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; - virtual void SetMargins(int x, int y); + virtual void SetMargins(int x, int y) wxOVERRIDE; void SetMargins(const wxSize& size) { SetMargins((int) size.x, (int) size.y); } virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } @@ -82,12 +82,12 @@ protected: void Init(); // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, @@ -96,15 +96,15 @@ protected: wxItemKind kind, wxObject *clientData, const wxString& shortHelp, - const wxString& longHelp); + const wxString& longHelp) wxOVERRIDE; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); + const wxString& label) wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoDraw(wxControlRenderer *renderer); + int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; // get the bounding rect for the given tool wxRect GetToolRect(wxToolBarToolBase *tool) const; diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 84fc34c49a..2438c787e9 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -127,9 +127,9 @@ public: // implement base class pure virtuals - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual wxPoint GetClientAreaOrigin() const; - virtual void SetIcons(const wxIconBundle& icons); + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; // implementation from now on // -------------------------- @@ -139,10 +139,10 @@ public: virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString); + const wxString& strArg = wxEmptyString) wxOVERRIDE; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE { return GetStdInputHandler(handlerDef); } @@ -150,13 +150,13 @@ public: // move/resize the frame interactively, i.e. let the user do it virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE); - virtual wxSize GetMinSize() const; + virtual wxSize GetMinSize() const wxOVERRIDE; - virtual wxWindow *GetInputWindow() const { return const_cast(this); } + virtual wxWindow *GetInputWindow() const wxOVERRIDE { return const_cast(this); } protected: - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int height); + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; // handle titlebar button click event virtual void ClickTitleBarButton(long button); diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h index d34077af92..5fcb9776bd 100644 --- a/include/wx/univ/window.h +++ b/include/wx/univ/window.h @@ -93,16 +93,16 @@ public: int pos, int page, int range, - bool refresh = true ); - virtual void SetScrollPos(int orient, int pos, bool refresh = true); - virtual int GetScrollPos(int orient) const; - virtual int GetScrollThumb(int orient) const; - virtual int GetScrollRange(int orient) const; + bool refresh = true ) wxOVERRIDE; + virtual void SetScrollPos(int orient, int pos, bool refresh = true) wxOVERRIDE; + virtual int GetScrollPos(int orient) const wxOVERRIDE; + virtual int GetScrollThumb(int orient) const wxOVERRIDE; + virtual int GetScrollRange(int orient) const wxOVERRIDE; virtual void ScrollWindow(int dx, int dy, - const wxRect* rect = NULL); + const wxRect* rect = NULL) wxOVERRIDE; // take into account the borders here - virtual wxPoint GetClientAreaOrigin() const; + virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; // popup menu support // ------------------ @@ -179,15 +179,15 @@ public: // the rect coordinates are, for us, in client coords, but if no rect is // specified, the entire window is refreshed virtual void Refresh(bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL); + const wxRect *rect = (const wxRect *) NULL) wxOVERRIDE; // we refresh the window when it is dis/enabled - virtual bool Enable(bool enable = true); + virtual bool Enable(bool enable = true) wxOVERRIDE; // should we use the standard control colours or not? - virtual bool ShouldInheritColours() const { return false; } + virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } - virtual bool IsClientAreaChild(const wxWindow *child) const + virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE { #if wxUSE_SCROLLBAR if ( child == (wxWindow*)m_scrollbarHorz || @@ -202,13 +202,13 @@ protected: void Init(); #if wxUSE_MENUS - virtual bool DoPopupMenu(wxMenu *menu, int x, int y); + virtual bool DoPopupMenu(wxMenu *menu, int x, int y) wxOVERRIDE; #endif // wxUSE_MENUS // we deal with the scrollbars in these functions - virtual void DoSetClientSize(int width, int height); - virtual void DoGetClientSize(int *width, int *height) const; - virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const; + virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const wxOVERRIDE; // event handlers void OnSize(wxSizeEvent& event); @@ -235,7 +235,7 @@ protected: virtual void DoDraw(wxControlRenderer *renderer); // override the base class method to return the size of the window borders - virtual wxSize DoGetBorderSize() const; + virtual wxSize DoGetBorderSize() const wxOVERRIDE; // adjust the size of the window to take into account its borders wxSize AdjustSize(const wxSize& size) const; diff --git a/include/wx/unix/app.h b/include/wx/unix/app.h index f14df9ec3f..8b173548a8 100644 --- a/include/wx/unix/app.h +++ b/include/wx/unix/app.h @@ -22,7 +22,7 @@ public: virtual ~wxAppConsole(); // override base class initialization - virtual bool Initialize(int& argc, wxChar** argv); + virtual bool Initialize(int& argc, wxChar** argv) wxOVERRIDE; // Unix-specific: Unix signal handling diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 3fbe4d82da..8b3d2479ab 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -19,10 +19,10 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: #if wxUSE_CONSOLE_EVENTLOOP - virtual wxEventLoopBase *CreateEventLoop(); + virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; #endif // wxUSE_CONSOLE_EVENTLOOP #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; #endif }; @@ -48,10 +48,10 @@ public: class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: - virtual wxEventLoopBase *CreateEventLoop(); - virtual int WaitForChild(wxExecuteData& execData); + virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; + virtual int WaitForChild(wxExecuteData& execData) wxOVERRIDE; #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; #endif #if wxUSE_THREADS && defined(__WXGTK20__) virtual void MutexGuiEnter(); @@ -61,7 +61,7 @@ public: #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS virtual wxStandardPaths& GetStandardPaths(); #endif - virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; + virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE; #ifdef __WXGTK20__ virtual wxString GetDesktopEnvironment() const; @@ -85,7 +85,7 @@ public: #endif // wxUSE_SOCKETS - virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager(); + virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() wxOVERRIDE; }; #endif // wxUSE_GUI diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index 46891ef447..5c2d074620 100644 --- a/include/wx/unix/evtloop.h +++ b/include/wx/unix/evtloop.h @@ -33,15 +33,15 @@ public: virtual ~wxConsoleEventLoop(); // implement base class pure virtuals - virtual bool Pending() const; - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout); - virtual void WakeUp(); - virtual bool IsOk() const { return m_dispatcher != NULL; } + virtual bool Pending() const wxOVERRIDE; + virtual bool Dispatch() wxOVERRIDE; + virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; + virtual void WakeUp() wxOVERRIDE; + virtual bool IsOk() const wxOVERRIDE { return m_dispatcher != NULL; } protected: - virtual void OnNextIteration(); - virtual void DoYieldFor(long eventsToProcess); + virtual void OnNextIteration() wxOVERRIDE; + virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; private: // pipe used for wake up messages: when a child thread wants to wake up diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h index 34ed4dd46d..7d7e1106fd 100644 --- a/include/wx/unix/glx11.h +++ b/include/wx/unix/glx11.h @@ -22,7 +22,7 @@ public: wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL); virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const; + virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; private: // attach context to the drawable or unset it (if NULL) @@ -56,7 +56,7 @@ public: // implement wxGLCanvasBase methods // -------------------------------- - virtual bool SwapBuffers(); + virtual bool SwapBuffers() wxOVERRIDE; // X11-specific methods @@ -77,7 +77,7 @@ public: // return true only if the window is realized: OpenGL context can't be // created until we are - virtual bool IsShownOnScreen() const; + virtual bool IsShownOnScreen() const wxOVERRIDE; // implementation only from now on @@ -137,19 +137,19 @@ public: wxGLApp() : wxGLAppBase() { } // implement wxGLAppBase method - virtual bool InitGLVisual(const int *attribList) + virtual bool InitGLVisual(const int *attribList) wxOVERRIDE { return wxGLCanvasX11::InitDefaultVisualInfo(attribList); } // and implement this wxGTK::wxApp method too - virtual void *GetXVisualInfo() + virtual void *GetXVisualInfo() wxOVERRIDE { return wxGLCanvasX11::GetDefaultXVisualInfo(); } // and override this wxApp method to clean up - virtual int OnExit() + virtual int OnExit() wxOVERRIDE { wxGLCanvasX11::FreeDefaultVisualInfo(); diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h index 76efeae3dc..b5aa3ca6a5 100644 --- a/include/wx/unix/sound.h +++ b/include/wx/unix/sound.h @@ -79,7 +79,7 @@ public: static void UnloadBackend(); protected: - bool DoPlay(unsigned flags) const; + bool DoPlay(unsigned flags) const wxOVERRIDE; static void EnsureBackend(); void Free(); diff --git a/include/wx/unix/stackwalk.h b/include/wx/unix/stackwalk.h index e99741934a..f7e3a7de41 100644 --- a/include/wx/unix/stackwalk.h +++ b/include/wx/unix/stackwalk.h @@ -32,7 +32,7 @@ public: } protected: - virtual void OnGetName(); + virtual void OnGetName() wxOVERRIDE; // optimized for the 2 step initialization done by wxStackWalker void Set(const wxString &name, const wxString &filename, const char* syminfo, @@ -72,9 +72,9 @@ public: FreeStack(); } - virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH); + virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE; #if wxUSE_ON_FATAL_EXCEPTION - virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) { Walk(2, maxDepth); } + virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE { Walk(2, maxDepth); } #endif // wxUSE_ON_FATAL_EXCEPTION static const wxString& GetExePath() { return ms_exepath; } diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h index 2f111992a3..3e97725abd 100644 --- a/include/wx/unix/stdpaths.h +++ b/include/wx/unix/stdpaths.h @@ -37,17 +37,17 @@ public: // implement base class pure virtuals - virtual wxString GetExecutablePath() const; - virtual wxString GetConfigDir() const; - virtual wxString GetUserConfigDir() const; - virtual wxString GetDataDir() const; - virtual wxString GetLocalDataDir() const; - virtual wxString GetUserDataDir() const; - virtual wxString GetPluginsDir() const; + virtual wxString GetExecutablePath() const wxOVERRIDE; + virtual wxString GetConfigDir() const wxOVERRIDE; + virtual wxString GetUserConfigDir() const wxOVERRIDE; + virtual wxString GetDataDir() const wxOVERRIDE; + virtual wxString GetLocalDataDir() const wxOVERRIDE; + virtual wxString GetUserDataDir() const wxOVERRIDE; + virtual wxString GetPluginsDir() const wxOVERRIDE; virtual wxString GetLocalizedResourcesDir(const wxString& lang, - ResourceCat category) const; + ResourceCat category) const wxOVERRIDE; #ifndef __VMS - virtual wxString GetDocumentsDir() const; + virtual wxString GetDocumentsDir() const wxOVERRIDE; #endif protected: diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h index 02a9200941..09d96c2518 100644 --- a/include/wx/unix/taskbarx11.h +++ b/include/wx/unix/taskbarx11.h @@ -24,9 +24,9 @@ public: bool IsIconInstalled() const; // Operations: - bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); - bool RemoveIcon(); - bool PopupMenu(wxMenu *menu); + bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE; + bool RemoveIcon() wxOVERRIDE; + bool PopupMenu(wxMenu *menu) wxOVERRIDE; protected: wxTaskBarIconArea *m_iconWnd; diff --git a/include/wx/valgen.h b/include/wx/valgen.h index c24142e791..7ee3a71a45 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -57,18 +57,18 @@ public: // if you're passing a reference to a validator. // Another possibility is to always pass a pointer to a new validator // (so the calling code can use a copy constructor of the relevant class). - virtual wxObject *Clone() const { return new wxGenericValidator(*this); } + virtual wxObject *Clone() const wxOVERRIDE { return new wxGenericValidator(*this); } bool Copy(const wxGenericValidator& val); // Called when the value in the window must be validated: this is not used // by this class - virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; } + virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; } // Called to transfer data to the window - virtual bool TransferToWindow(); + virtual bool TransferToWindow() wxOVERRIDE; // Called to transfer data to the window - virtual bool TransferFromWindow(); + virtual bool TransferFromWindow() wxOVERRIDE; protected: void Initialize(); diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 93f5dd614e..2c63801fd8 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -46,18 +46,18 @@ public: // if you're passing a reference to a validator. // Another possibility is to always pass a pointer to a new validator // (so the calling code can use a copy constructor of the relevant class). - virtual wxObject *Clone() const { return new wxTextValidator(*this); } + virtual wxObject *Clone() const wxOVERRIDE { return new wxTextValidator(*this); } bool Copy(const wxTextValidator& val); // Called when the value in the window must be validated. // This function can pop up an error message. - virtual bool Validate(wxWindow *parent); + virtual bool Validate(wxWindow *parent) wxOVERRIDE; // Called to transfer data to the window - virtual bool TransferToWindow(); + virtual bool TransferToWindow() wxOVERRIDE; // Called to transfer data from the window - virtual bool TransferFromWindow(); + virtual bool TransferFromWindow() wxOVERRIDE; // Filter keystrokes void OnChar(wxKeyEvent& event); diff --git a/include/wx/variant.h b/include/wx/variant.h index 39adc729b9..bdcf4c01ed 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -383,8 +383,8 @@ public: // Attributes protected: - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxObjectRefData *CreateRefData() const wxOVERRIDE; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; wxString m_name; @@ -430,7 +430,7 @@ public: { } - virtual wxAnyValueType* GetAssociatedType() + virtual wxAnyValueType* GetAssociatedType() wxOVERRIDE { return wxAnyValueTypeImpl::GetInstance(); } diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h index 1981110509..16b178055d 100644 --- a/include/wx/vlbox.h +++ b/include/wx/vlbox.h @@ -193,7 +193,7 @@ public: void RefreshSelected(); - virtual wxVisualAttributes GetDefaultAttributes() const + virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -202,7 +202,7 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_THEME; } + virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_THEME; } // the derived class must implement this function to actually draw the item // with the given index on the provided DC @@ -232,7 +232,7 @@ protected: // allows us to add borders to the items easily // // this function is not supposed to be overridden by the derived classes - virtual wxCoord OnGetRowHeight(size_t line) const; + virtual wxCoord OnGetRowHeight(size_t line) const wxOVERRIDE; // event handlers diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index 2312d78f0b..ecf4455b73 100644 --- a/include/wx/vscroll.h +++ b/include/wx/vscroll.h @@ -124,7 +124,7 @@ public: // change the DC origin according to the scroll position. To properly // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER() // derived class - virtual void DoPrepareDC(wxDC& dc); + virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; // the methods to be called from the window event handlers void HandleOnScroll(wxScrollWinEvent& event); @@ -326,23 +326,23 @@ public: size_t GetVisibleRowsEnd() const { return GetVisibleEnd(); } bool IsRowVisible(size_t row) const { return IsVisible(row); } - virtual int GetOrientationTargetSize() const + virtual int GetOrientationTargetSize() const wxOVERRIDE { return GetTargetWindow()->GetClientSize().y; } - virtual int GetNonOrientationTargetSize() const + virtual int GetNonOrientationTargetSize() const wxOVERRIDE { return GetTargetWindow()->GetClientSize().x; } - virtual wxOrientation GetOrientation() const { return wxVERTICAL; } + virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxVERTICAL; } protected: // this function must be overridden in the derived class and it should // return the size of the given row in pixels virtual wxCoord OnGetRowHeight(size_t n) const = 0; - wxCoord OnGetUnitSize(size_t n) const { return OnGetRowHeight(n); } + wxCoord OnGetUnitSize(size_t n) const wxOVERRIDE { return OnGetRowHeight(n); } virtual void OnGetRowsHeightHint(size_t WXUNUSED(rowMin), size_t WXUNUSED(rowMax)) const { } // forward calls to OnGetRowsHeightHint() - virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const + virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const wxOVERRIDE { OnGetRowsHeightHint(unitMin, unitMax); } // again, if not overridden, it will fall back on default method @@ -350,7 +350,7 @@ protected: { return DoEstimateTotalSize(); } // forward calls to EstimateTotalHeight() - virtual wxCoord EstimateTotalSize() const { return EstimateTotalHeight(); } + virtual wxCoord EstimateTotalSize() const wxOVERRIDE { return EstimateTotalHeight(); } wxCoord GetRowsHeight(size_t rowMin, size_t rowMax) const { return GetUnitsSize(rowMin, rowMax); } @@ -406,31 +406,31 @@ public: { return IsVisible(column); } - virtual int GetOrientationTargetSize() const + virtual int GetOrientationTargetSize() const wxOVERRIDE { return GetTargetWindow()->GetClientSize().x; } - virtual int GetNonOrientationTargetSize() const + virtual int GetNonOrientationTargetSize() const wxOVERRIDE { return GetTargetWindow()->GetClientSize().y; } - virtual wxOrientation GetOrientation() const { return wxHORIZONTAL; } + virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxHORIZONTAL; } protected: // this function must be overridden in the derived class and it should // return the size of the given column in pixels virtual wxCoord OnGetColumnWidth(size_t n) const = 0; - wxCoord OnGetUnitSize(size_t n) const { return OnGetColumnWidth(n); } + wxCoord OnGetUnitSize(size_t n) const wxOVERRIDE { return OnGetColumnWidth(n); } virtual void OnGetColumnsWidthHint(size_t WXUNUSED(columnMin), size_t WXUNUSED(columnMax)) const { } // forward calls to OnGetColumnsWidthHint() - virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const + virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const wxOVERRIDE { OnGetColumnsWidthHint(unitMin, unitMax); } // again, if not overridden, it will fall back on default method virtual wxCoord EstimateTotalWidth() const { return DoEstimateTotalSize(); } // forward calls to EstimateTotalWidth() - virtual wxCoord EstimateTotalSize() const { return EstimateTotalWidth(); } + virtual wxCoord EstimateTotalSize() const wxOVERRIDE { return EstimateTotalWidth(); } wxCoord GetColumnsWidth(size_t columnMin, size_t columnMax) const { return GetUnitsSize(columnMin, columnMax); } @@ -513,7 +513,7 @@ public: // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER() // derived class. We use this version to call both base classes' // DoPrepareDC() - virtual void DoPrepareDC(wxDC& dc); + virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; // replacement implementation of wxWindow::Layout virtual method. To // properly forward calls to wxWindow::Layout use diff --git a/include/wx/weakref.h b/include/wx/weakref.h index b692f037e8..0aa02900fb 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -60,7 +60,7 @@ public: } } - virtual void OnObjectDestroy() + virtual void OnObjectDestroy() wxOVERRIDE { // Tracked object itself removes us from list of trackers wxASSERT(m_pobj != NULL); @@ -123,7 +123,7 @@ struct wxWeakRefImpl : public wxTrackerNode } } - virtual void OnObjectDestroy() + virtual void OnObjectDestroy() wxOVERRIDE { // Tracked object itself removes us from list of trackers wxASSERT(m_pobj != NULL); @@ -300,7 +300,7 @@ public: } } - virtual void OnObjectDestroy() + virtual void OnObjectDestroy() wxOVERRIDE { wxASSERT_MSG(m_pobj, "tracked object should have removed us itself"); diff --git a/include/wx/webview.h b/include/wx/webview.h index 3ea2e74a32..4f18bada70 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -246,7 +246,7 @@ public: const wxString& GetURL() const { return m_url; } const wxString& GetTarget() const { return m_target; } - virtual wxEvent* Clone() const { return new wxWebViewEvent(*this); } + virtual wxEvent* Clone() const wxOVERRIDE { return new wxWebViewEvent(*this); } private: wxString m_url; wxString m_target; diff --git a/include/wx/webviewarchivehandler.h b/include/wx/webviewarchivehandler.h index 8b2eb19908..6157b6b107 100644 --- a/include/wx/webviewarchivehandler.h +++ b/include/wx/webviewarchivehandler.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler public: wxWebViewArchiveHandler(const wxString& scheme); virtual ~wxWebViewArchiveHandler(); - virtual wxFSFile* GetFile(const wxString &uri); + virtual wxFSFile* GetFile(const wxString &uri) wxOVERRIDE; private: wxFileSystem* m_fileSystem; }; diff --git a/include/wx/webviewfshandler.h b/include/wx/webviewfshandler.h index ebdbbcb906..275410ab3f 100644 --- a/include/wx/webviewfshandler.h +++ b/include/wx/webviewfshandler.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewFSHandler : public wxWebViewHandler public: wxWebViewFSHandler(const wxString& scheme); virtual ~wxWebViewFSHandler(); - virtual wxFSFile* GetFile(const wxString &uri); + virtual wxFSFile* GetFile(const wxString &uri) wxOVERRIDE; private: wxFileSystem* m_fileSystem; }; diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 488d964d62..990e4ab114 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -35,20 +35,20 @@ public: wxFileInputStream(int fd); virtual ~wxFileInputStream(); - virtual wxFileOffset GetLength() const; + virtual wxFileOffset GetLength() const wxOVERRIDE; bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } wxFile* GetFile() const { return m_file; } protected: wxFileInputStream(); - virtual size_t OnSysRead(void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; protected: wxFile *m_file; @@ -65,22 +65,22 @@ public: wxFileOutputStream(int fd); virtual ~wxFileOutputStream(); - void Sync(); - bool Close() { return m_file_destroy ? m_file->Close() : true; } - virtual wxFileOffset GetLength() const; + void Sync() wxOVERRIDE; + bool Close() wxOVERRIDE { return m_file_destroy ? m_file->Close() : true; } + virtual wxFileOffset GetLength() const wxOVERRIDE; bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } wxFile* GetFile() const { return m_file; } protected: wxFileOutputStream(); - virtual size_t OnSysWrite(const void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; protected: wxFile *m_file; @@ -95,18 +95,18 @@ public: wxTempFileOutputStream(const wxString& fileName); virtual ~wxTempFileOutputStream(); - bool Close() { return Commit(); } + bool Close() wxOVERRIDE { return Commit(); } WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); } WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); } - virtual wxFileOffset GetLength() const { return m_file->Length(); } - virtual bool IsSeekable() const { return true; } + virtual wxFileOffset GetLength() const wxOVERRIDE { return m_file->Length(); } + virtual bool IsSeekable() const wxOVERRIDE { return true; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) + virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE { return m_file->Seek(pos, mode); } - virtual wxFileOffset OnSysTell() const { return m_file->Tell(); } + virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_file->Tell(); } private: wxTempFile *m_file; @@ -119,29 +119,29 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream, { public: wxFileStream(const wxString& fileName); - virtual bool IsOk() const; + virtual bool IsOk() const wxOVERRIDE; // override (some) virtual functions inherited from both classes to resolve // ambiguities (this wouldn't be necessary if wxStreamBase were a virtual // base class but it isn't) - virtual bool IsSeekable() const + virtual bool IsSeekable() const wxOVERRIDE { return wxFileInputStream::IsSeekable(); } - virtual wxFileOffset GetLength() const + virtual wxFileOffset GetLength() const wxOVERRIDE { return wxFileInputStream::GetLength(); } protected: - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE { return wxFileInputStream::OnSysSeek(pos, mode); } - virtual wxFileOffset OnSysTell() const + virtual wxFileOffset OnSysTell() const wxOVERRIDE { return wxFileInputStream::OnSysTell(); } @@ -166,20 +166,20 @@ public: wxFFileInputStream(FILE *file); virtual ~wxFFileInputStream(); - virtual wxFileOffset GetLength() const; + virtual wxFileOffset GetLength() const wxOVERRIDE; bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } wxFFile* GetFile() const { return m_file; } protected: wxFFileInputStream(); - virtual size_t OnSysRead(void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; protected: wxFFile *m_file; @@ -196,22 +196,22 @@ public: wxFFileOutputStream(FILE *file); virtual ~wxFFileOutputStream(); - void Sync(); - bool Close() { return m_file_destroy ? m_file->Close() : true; } - virtual wxFileOffset GetLength() const; + void Sync() wxOVERRIDE; + bool Close() wxOVERRIDE { return m_file_destroy ? m_file->Close() : true; } + virtual wxFileOffset GetLength() const wxOVERRIDE; bool Ok() const { return IsOk(); } - virtual bool IsOk() const; - virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const wxOVERRIDE; + virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } wxFFile* GetFile() const { return m_file; } protected: wxFFileOutputStream(); - virtual size_t OnSysWrite(const void *buffer, size_t size); - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); - virtual wxFileOffset OnSysTell() const; + virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE; protected: wxFFile *m_file; @@ -229,25 +229,25 @@ public: // override some virtual functions to resolve ambiguities, just as in // wxFileStream - virtual bool IsOk() const; + virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const + virtual bool IsSeekable() const wxOVERRIDE { return wxFFileInputStream::IsSeekable(); } - virtual wxFileOffset GetLength() const + virtual wxFileOffset GetLength() const wxOVERRIDE { return wxFFileInputStream::GetLength(); } protected: - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE { return wxFFileInputStream::OnSysSeek(pos, mode); } - virtual wxFileOffset OnSysTell() const + virtual wxFileOffset OnSysTell() const wxOVERRIDE { return wxFFileInputStream::OnSysTell(); } diff --git a/include/wx/window.h b/include/wx/window.h index 928fb3780d..936c2466cb 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -875,8 +875,8 @@ public: bool HandleWindowEvent(wxEvent& event) const; // disable wxEvtHandler double-linked list mechanism: - virtual void SetNextHandler(wxEvtHandler *handler); - virtual void SetPreviousHandler(wxEvtHandler *handler); + virtual void SetNextHandler(wxEvtHandler *handler) wxOVERRIDE; + virtual void SetPreviousHandler(wxEvtHandler *handler) wxOVERRIDE; // Watcom doesn't allow reducing access with using access declaration, see @@ -1524,8 +1524,8 @@ protected: const wxString& name); // event handling specific to wxWindow - virtual bool TryBefore(wxEvent& event); - virtual bool TryAfter(wxEvent& event); + virtual bool TryBefore(wxEvent& event) wxOVERRIDE; + virtual bool TryAfter(wxEvent& event) wxOVERRIDE; enum WindowOrder { diff --git a/include/wx/wizard.h b/include/wx/wizard.h index 82dc438ac4..71745015d5 100644 --- a/include/wx/wizard.h +++ b/include/wx/wizard.h @@ -80,19 +80,19 @@ public: #if wxUSE_VALIDATORS // Override the base functions to allow a validator to be assigned to this page. - virtual bool TransferDataToWindow() + virtual bool TransferDataToWindow() wxOVERRIDE { return GetValidator() ? GetValidator()->TransferToWindow() : wxPanel::TransferDataToWindow(); } - virtual bool TransferDataFromWindow() + virtual bool TransferDataFromWindow() wxOVERRIDE { return GetValidator() ? GetValidator()->TransferFromWindow() : wxPanel::TransferDataFromWindow(); } - virtual bool Validate() + virtual bool Validate() wxOVERRIDE { return GetValidator() ? GetValidator()->Validate(this) : wxPanel::Validate(); @@ -165,8 +165,8 @@ public: } // base class pure virtuals - virtual wxWizardPage *GetPrev() const; - virtual wxWizardPage *GetNext() const; + virtual wxWizardPage *GetPrev() const wxOVERRIDE; + virtual wxWizardPage *GetNext() const wxOVERRIDE; private: // common part of ctors: @@ -246,9 +246,9 @@ public: /// Override these functions to stop InitDialog from calling TransferDataToWindow /// for _all_ pages when the wizard starts. Instead 'ShowPage' will call /// TransferDataToWindow for the first page only. - bool TransferDataToWindow() { return true; } - bool TransferDataFromWindow() { return true; } - bool Validate() { return true; } + bool TransferDataToWindow() wxOVERRIDE { return true; } + bool TransferDataFromWindow() wxOVERRIDE { return true; } + bool Validate() wxOVERRIDE { return true; } private: wxDECLARE_NO_COPY_CLASS(wxWizardBase); @@ -279,7 +279,7 @@ public: wxWizardPage* GetPage() const { return m_page; } - virtual wxEvent *Clone() const { return new wxWizardEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxWizardEvent(*this); } private: bool m_direction; diff --git a/include/wx/wrapsizer.h b/include/wx/wrapsizer.h index a4d6145002..2154de3b57 100644 --- a/include/wx/wrapsizer.h +++ b/include/wx/wrapsizer.h @@ -35,12 +35,12 @@ public: virtual ~wxWrapSizer(); // override base class virtual methods - virtual wxSize CalcMin(); - virtual void RecalcSizes(); + virtual wxSize CalcMin() wxOVERRIDE; + virtual void RecalcSizes() wxOVERRIDE; virtual bool InformFirstDirection(int direction, int size, - int availableOtherDir); + int availableOtherDir) wxOVERRIDE; protected: // This method is called to decide if an item represents empty space or diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h index 4313cb88b6..3506a7a6f6 100644 --- a/include/wx/zipstrm.h +++ b/include/wx/zipstrm.h @@ -142,10 +142,10 @@ public: wxZipEntry& operator=(const wxZipEntry& entry); // Get accessors - wxDateTime GetDateTime() const { return m_DateTime; } - wxFileOffset GetSize() const { return m_Size; } - wxFileOffset GetOffset() const { return m_Offset; } - wxString GetInternalName() const { return m_Name; } + wxDateTime GetDateTime() const wxOVERRIDE { return m_DateTime; } + wxFileOffset GetSize() const wxOVERRIDE { return m_Size; } + wxFileOffset GetOffset() const wxOVERRIDE { return m_Offset; } + wxString GetInternalName() const wxOVERRIDE { return m_Name; } int GetMethod() const { return m_Method; } int GetFlags() const { return m_Flags; } wxUint32 GetCrc() const { return m_Crc; } @@ -153,23 +153,23 @@ public: int GetSystemMadeBy() const { return m_SystemMadeBy; } wxString GetComment() const { return m_Comment; } wxUint32 GetExternalAttributes() const { return m_ExternalAttributes; } - wxPathFormat GetInternalFormat() const { return wxPATH_UNIX; } + wxPathFormat GetInternalFormat() const wxOVERRIDE { return wxPATH_UNIX; } int GetMode() const; const char *GetLocalExtra() const; size_t GetLocalExtraLen() const; const char *GetExtra() const; size_t GetExtraLen() const; - wxString GetName(wxPathFormat format = wxPATH_NATIVE) const; + wxString GetName(wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE; // is accessors - inline bool IsDir() const; + inline bool IsDir() const wxOVERRIDE; inline bool IsText() const; - inline bool IsReadOnly() const; + inline bool IsReadOnly() const wxOVERRIDE; inline bool IsMadeByUnix() const; // set accessors - void SetDateTime(const wxDateTime& dt) { m_DateTime = dt; } - void SetSize(wxFileOffset size) { m_Size = size; } + void SetDateTime(const wxDateTime& dt) wxOVERRIDE { m_DateTime = dt; } + void SetSize(wxFileOffset size) wxOVERRIDE { m_Size = size; } void SetMethod(int method) { m_Method = (wxUint16)method; } void SetComment(const wxString& comment) { m_Comment = comment; } void SetExternalAttributes(wxUint32 attr ) { m_ExternalAttributes = attr; } @@ -179,21 +179,21 @@ public: void SetLocalExtra(const char *extra, size_t len); inline void SetName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE); + wxPathFormat format = wxPATH_NATIVE) wxOVERRIDE; static wxString GetInternalName(const wxString& name, wxPathFormat format = wxPATH_NATIVE, bool *pIsDir = NULL); // set is accessors - void SetIsDir(bool isDir = true); - inline void SetIsReadOnly(bool isReadOnly = true); + void SetIsDir(bool isDir = true) wxOVERRIDE; + inline void SetIsReadOnly(bool isReadOnly = true) wxOVERRIDE; inline void SetIsText(bool isText = true); wxZipEntry *Clone() const { return ZipClone(); } void SetNotifier(wxZipNotifier& notifier); - void UnsetNotifier(); + void UnsetNotifier() wxOVERRIDE; protected: // Internal attributes @@ -207,7 +207,7 @@ protected: int GetInternalAttributes() const { return m_InternalAttributes; } void SetVersionNeeded(int version) { m_VersionNeeded = (wxUint16)version; } - void SetOffset(wxFileOffset offset) { m_Offset = offset; } + void SetOffset(wxFileOffset offset) wxOVERRIDE { m_Offset = offset; } void SetFlags(int flags) { m_Flags = (wxUint16)flags; } void SetVersionMadeBy(int version) { m_VersionMadeBy = (wxUint8)version; } void SetCrc(wxUint32 crc) { m_Crc = crc; } @@ -221,7 +221,7 @@ protected: void Notify(); private: - wxArchiveEntry* DoClone() const { return ZipClone(); } + wxArchiveEntry* DoClone() const wxOVERRIDE { return ZipClone(); } size_t ReadLocal(wxInputStream& stream, wxMBConv& conv); size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const; @@ -285,17 +285,17 @@ public: bool WXZIPFIX PutNextEntry(const wxString& name, const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset); + wxFileOffset size = wxInvalidOffset) wxOVERRIDE; bool WXZIPFIX PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()); + const wxDateTime& dt = wxDateTime::Now()) wxOVERRIDE; bool WXZIPFIX CopyEntry(wxZipEntry *entry, wxZipInputStream& inputStream); bool WXZIPFIX CopyArchiveMetaData(wxZipInputStream& inputStream); - void WXZIPFIX Sync(); - bool WXZIPFIX CloseEntry(); - bool WXZIPFIX Close(); + void WXZIPFIX Sync() wxOVERRIDE; + bool WXZIPFIX CloseEntry() wxOVERRIDE; + bool WXZIPFIX Close() wxOVERRIDE; void SetComment(const wxString& comment) { m_Comment = comment; } @@ -303,8 +303,8 @@ public: void WXZIPFIX SetLevel(int level); protected: - virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size); - virtual wxFileOffset OnSysTell() const { return m_entrySize; } + virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_entrySize; } // this protected interface isn't yet finalised struct Buffer { const char *m_data; size_t m_size; }; @@ -319,9 +319,9 @@ protected: private: void Init(int level); - bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry); - bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream); - bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream); + bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry) wxOVERRIDE; + bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) wxOVERRIDE; + bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream) wxOVERRIDE; bool IsOpened() const { return m_comp || m_pending; } @@ -365,18 +365,18 @@ public: virtual WXZIPFIX ~wxZipInputStream(); bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); } - bool WXZIPFIX CloseEntry(); + bool WXZIPFIX CloseEntry() wxOVERRIDE; wxZipEntry *GetNextEntry(); wxString WXZIPFIX GetComment(); int WXZIPFIX GetTotalEntries(); - virtual wxFileOffset GetLength() const { return m_entry.GetSize(); } + virtual wxFileOffset GetLength() const wxOVERRIDE { return m_entry.GetSize(); } protected: - size_t WXZIPFIX OnSysRead(void *buffer, size_t size); - wxFileOffset OnSysTell() const { return m_decomp ? m_decomp->TellI() : 0; } + size_t WXZIPFIX OnSysRead(void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE { return m_decomp ? m_decomp->TellI() : 0; } // this protected interface isn't yet finalised virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream); @@ -386,9 +386,9 @@ private: void Init(); void Init(const wxString& file); - wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); } + wxArchiveEntry *DoGetNextEntry() wxOVERRIDE { return GetNextEntry(); } - bool WXZIPFIX OpenEntry(wxArchiveEntry& entry); + bool WXZIPFIX OpenEntry(wxArchiveEntry& entry) wxOVERRIDE; wxStreamError ReadLocal(bool readEndRec = false); wxStreamError ReadCentral(); @@ -471,22 +471,22 @@ public: { return new wxZipOutputStream(stream, -1, GetConv()); } wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const + wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE { return wxZipEntry::GetInternalName(name, format); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const; + = wxSTREAM_PROTOCOL) const wxOVERRIDE; protected: - wxArchiveEntry *DoNewEntry() const + wxArchiveEntry *DoNewEntry() const wxOVERRIDE { return NewEntry(); } - wxArchiveInputStream *DoNewStream(wxInputStream& stream) const + wxArchiveInputStream *DoNewStream(wxInputStream& stream) const wxOVERRIDE { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const + wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const wxOVERRIDE { return NewStream(stream); } - wxArchiveInputStream *DoNewStream(wxInputStream *stream) const + wxArchiveInputStream *DoNewStream(wxInputStream *stream) const wxOVERRIDE { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const + wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const wxOVERRIDE { return NewStream(stream); } private: diff --git a/include/wx/zstream.h b/include/wx/zstream.h index 193bb79d4e..3c64f36cec 100644 --- a/include/wx/zstream.h +++ b/include/wx/zstream.h @@ -39,8 +39,8 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { wxZlibInputStream(wxInputStream *stream, int flags = wxZLIB_AUTO); virtual ~wxZlibInputStream(); - char Peek() { return wxInputStream::Peek(); } - wxFileOffset GetLength() const { return wxInputStream::GetLength(); } + char Peek() wxOVERRIDE { return wxInputStream::Peek(); } + wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); } static bool CanHandleGZip(); @@ -48,8 +48,8 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { bool SetDictionary(const wxMemoryBuffer &buf); protected: - size_t OnSysRead(void *buffer, size_t size); - wxFileOffset OnSysTell() const { return m_pos; } + size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } private: void Init(int flags); @@ -69,9 +69,9 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { wxZlibOutputStream(wxOutputStream *stream, int level = -1, int flags = wxZLIB_ZLIB); virtual ~wxZlibOutputStream() { Close(); } - void Sync() { DoFlush(false); } - bool Close(); - wxFileOffset GetLength() const { return m_pos; } + void Sync() wxOVERRIDE { DoFlush(false); } + bool Close() wxOVERRIDE; + wxFileOffset GetLength() const wxOVERRIDE { return m_pos; } static bool CanHandleGZip(); @@ -79,8 +79,8 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { bool SetDictionary(const wxMemoryBuffer &buf); protected: - size_t OnSysWrite(const void *buffer, size_t size); - wxFileOffset OnSysTell() const { return m_pos; } + size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } virtual void DoFlush(bool final); @@ -101,17 +101,17 @@ class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory public: wxZlibClassFactory(); - wxFilterInputStream *NewStream(wxInputStream& stream) const + wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const + wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE { return new wxZlibOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const + wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const + wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE { return new wxZlibOutputStream(stream, -1); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const; + = wxSTREAM_PROTOCOL) const wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxZlibClassFactory) @@ -122,17 +122,17 @@ class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory public: wxGzipClassFactory(); - wxFilterInputStream *NewStream(wxInputStream& stream) const + wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const + wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE { return new wxZlibOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const + wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const + wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE { return new wxZlibOutputStream(stream, -1); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const; + = wxSTREAM_PROTOCOL) const wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxGzipClassFactory) diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index 61affa05bc..48852c73d1 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -33,7 +33,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; class MyFrame : public wxFrame @@ -113,7 +113,7 @@ class MyArtProvider : public wxArtProvider { protected: virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size); + const wxSize& size) wxOVERRIDE; }; #include "info.xpm" diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 9b9eff4cee..cb40a6a36e 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -42,7 +42,7 @@ class MyApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; DECLARE_APP(MyApp) diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 9a5466b90b..e00bfac0bf 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -77,7 +77,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; class MyPanel : public wxPanel diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 57f5714db3..d3a0e54179 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -48,7 +48,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // MyCanvas is a canvas on which you can type diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp index 9276f79ae7..180de47a9a 100644 --- a/samples/clipboard/clipboard.cpp +++ b/samples/clipboard/clipboard.cpp @@ -31,7 +31,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp index d83d9cd84e..f6e1decee1 100644 --- a/samples/collpane/collpane.cpp +++ b/samples/collpane/collpane.cpp @@ -75,7 +75,7 @@ class MyApp: public wxApp public: MyApp() { } - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; wxDECLARE_NO_COPY_CLASS(MyApp); }; diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp index ecf48986a6..d8b950e591 100644 --- a/samples/combo/combo.cpp +++ b/samples/combo/combo.cpp @@ -62,7 +62,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame @@ -179,7 +179,7 @@ public: virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, - int flags ) const + int flags ) const wxOVERRIDE { if ( item == wxNOT_FOUND ) return; @@ -233,7 +233,7 @@ public: } virtual void OnDrawBackground( wxDC& dc, const wxRect& rect, - int item, int flags ) const + int item, int flags ) const wxOVERRIDE { // If item is selected or even, or we are painting the @@ -252,7 +252,7 @@ public: dc.DrawRectangle(rect); } - virtual wxCoord OnMeasureItem( size_t item ) const + virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE { // Simply demonstrate the ability to have variable-height items if ( item & 1 ) @@ -261,7 +261,7 @@ public: return 24; } - virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const + virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const wxOVERRIDE { return -1; // default - will be measured from text width } @@ -279,13 +279,13 @@ class ListViewComboPopup : public wxListView, public wxComboPopup { public: - virtual void Init() + virtual void Init() wxOVERRIDE { m_value = -1; m_itemHere = -1; // hot item in list } - virtual bool Create( wxWindow* parent ) + virtual bool Create( wxWindow* parent ) wxOVERRIDE { return wxListView::Create(parent,1, wxPoint(0,0),wxDefaultSize, @@ -293,16 +293,16 @@ public: wxLC_SORT_ASCENDING|wxSIMPLE_BORDER); } - virtual wxWindow *GetControl() { return this; } + virtual wxWindow *GetControl() wxOVERRIDE { return this; } - virtual void SetStringValue( const wxString& s ) + virtual void SetStringValue( const wxString& s ) wxOVERRIDE { int n = wxListView::FindItem(-1,s); if ( n >= 0 && n < GetItemCount() ) wxListView::Select(n); } - virtual wxString GetStringValue() const + virtual wxString GetStringValue() const wxOVERRIDE { if ( m_value >= 0 ) return wxListView::GetItemText(m_value); @@ -373,7 +373,7 @@ class TreeCtrlComboPopup : public wxTreeCtrl, public wxComboPopup { public: - virtual void Init() + virtual void Init() wxOVERRIDE { } virtual ~TreeCtrlComboPopup() @@ -385,7 +385,7 @@ public: SendDestroyEvent(); } - virtual bool Create( wxWindow* parent ) + virtual bool Create( wxWindow* parent ) wxOVERRIDE { return wxTreeCtrl::Create(parent,1, wxPoint(0,0),wxDefaultSize, @@ -401,12 +401,12 @@ public: virtual wxSize GetAdjustedSize( int minWidth, int WXUNUSED(prefHeight), - int maxHeight ) + int maxHeight ) wxOVERRIDE { return wxSize(wxMax(300,minWidth),wxMin(250,maxHeight)); } - virtual wxWindow *GetControl() { return this; } + virtual wxWindow *GetControl() wxOVERRIDE { return this; } // Needed by SetStringValue wxTreeItemId FindItemByText( wxTreeItemId parent, const wxString& text ) @@ -430,7 +430,7 @@ public: return wxTreeItemId(); } - virtual void SetStringValue( const wxString& s ) + virtual void SetStringValue( const wxString& s ) wxOVERRIDE { wxTreeItemId root = GetRootItem(); if ( !root.IsOk() ) @@ -444,7 +444,7 @@ public: } } - virtual wxString GetStringValue() const + virtual wxString GetStringValue() const wxOVERRIDE { if ( m_value.IsOk() ) return wxTreeCtrl::GetItemText(m_value); @@ -507,7 +507,7 @@ END_EVENT_TABLE() class wxComboCtrlWithCustomPopupAnim : public wxComboCtrl { protected: - virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) + virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) wxOVERRIDE { wxWindow* win = GetPopupWindow(); win->SetSize(rect); @@ -572,7 +572,7 @@ public: SetButtonBitmaps(bmp,true); } - virtual void OnButtonClick() + virtual void OnButtonClick() wxOVERRIDE { // Show standard wxFileDialog on button click @@ -590,7 +590,7 @@ public: } // Implement empty DoSetPopupControl to prevent assertion failure. - virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) + virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) wxOVERRIDE { } diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp index f1b4f7881b..18c0d1e88b 100644 --- a/samples/config/conftest.cpp +++ b/samples/config/conftest.cpp @@ -40,8 +40,8 @@ class MyApp: public wxApp { public: // implement base class virtuals - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; }; class MyFrame: public wxFrame diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 24482f301f..6cba3a281a 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -68,7 +68,7 @@ class MyApp: public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; class MyPanel: public wxPanel diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 29f1110b82..670e1dc8d2 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -53,7 +53,7 @@ class MyApp: public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // ---------------------------------------------------------------------------- @@ -176,7 +176,7 @@ public: wxALIGN_CENTER) { } - virtual bool Render( wxRect rect, wxDC *dc, int state ) + virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE { dc->SetBrush( *wxLIGHT_GREY_BRUSH ); dc->SetPen( *wxTRANSPARENT_PEN ); @@ -196,7 +196,7 @@ public: wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col), - const wxMouseEvent *mouseEvent) + const wxMouseEvent *mouseEvent) wxOVERRIDE { wxString position; if ( mouseEvent ) @@ -207,18 +207,18 @@ public: return false; } - virtual wxSize GetSize() const + virtual wxSize GetSize() const wxOVERRIDE { return wxSize(60,20); } - virtual bool SetValue( const wxVariant &value ) + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE { m_value = value.GetString(); return true; } - virtual bool GetValue( wxVariant &WXUNUSED(value) ) const { return true; } + virtual bool GetValue( wxVariant &WXUNUSED(value) ) const wxOVERRIDE { return true; } private: wxString m_value; diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h index d925779655..8706bbc260 100644 --- a/samples/dataview/mymodels.h +++ b/samples/dataview/mymodels.h @@ -140,16 +140,16 @@ public: // override sorting to always sort branches ascendingly int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const; + unsigned int column, bool ascending ) const wxOVERRIDE; // implementation of base class virtuals to define model - virtual unsigned int GetColumnCount() const + virtual unsigned int GetColumnCount() const wxOVERRIDE { return 6; } - virtual wxString GetColumnType( unsigned int col ) const + virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE { if (col == 2) return wxT("long"); @@ -158,17 +158,17 @@ public: } virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const; + const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE; virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ); + const wxDataViewItem &item, unsigned int col ) wxOVERRIDE; virtual bool IsEnabled( const wxDataViewItem &item, - unsigned int col ) const; + unsigned int col ) const wxOVERRIDE; - virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const; - virtual bool IsContainer( const wxDataViewItem &item ) const; + virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE; + virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE; virtual unsigned int GetChildren( const wxDataViewItem &parent, - wxDataViewItemArray &array ) const; + wxDataViewItemArray &array ) const wxOVERRIDE; private: MyMusicTreeModelNode* m_root; @@ -211,12 +211,12 @@ public: // implementation of base class virtuals to define model - virtual unsigned int GetColumnCount() const + virtual unsigned int GetColumnCount() const wxOVERRIDE { return Col_Max; } - virtual wxString GetColumnType( unsigned int col ) const + virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE { if (col == Col_IconText) return wxT("wxDataViewIconText"); @@ -225,11 +225,11 @@ public: } virtual void GetValueByRow( wxVariant &variant, - unsigned int row, unsigned int col ) const; + unsigned int row, unsigned int col ) const wxOVERRIDE; virtual bool GetAttrByRow( unsigned int row, unsigned int col, - wxDataViewItemAttr &attr ) const; + wxDataViewItemAttr &attr ) const wxOVERRIDE; virtual bool SetValueByRow( const wxVariant &variant, - unsigned int row, unsigned int col ); + unsigned int row, unsigned int col ) wxOVERRIDE; private: wxArrayString m_textColValues; @@ -244,5 +244,5 @@ private: class MyListStoreDerivedModel : public wxDataViewListStore { public: - virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const; + virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const wxOVERRIDE; }; diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp index c5ac83a8ba..9c0f909a38 100644 --- a/samples/debugrpt/debugrpt.cpp +++ b/samples/debugrpt/debugrpt.cpp @@ -61,7 +61,7 @@ protected: // this is called with the contents of the server response: you will // probably want to parse the XML document in OnServerReply() instead of // just dumping it as I do - virtual bool OnServerReply(const wxArrayString& reply) + virtual bool OnServerReply(const wxArrayString& reply) wxOVERRIDE { if ( reply.IsEmpty() ) { @@ -187,10 +187,10 @@ public: MyApp(); // create our main window here - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // called when a crash occurs in this application - virtual void OnFatalException(); + virtual void OnFatalException() wxOVERRIDE; // this is where we really generate the debug report void GenerateReport(wxDebugReport::Context ctx); diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index e73ad27d3c..07fa203141 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -2141,14 +2141,14 @@ void MyFrame::OnModalHook(wxCommandEvent& event) class TestModalHook : public wxModalDialogHook { protected: - virtual int Enter(wxDialog* dialog) + virtual int Enter(wxDialog* dialog) wxOVERRIDE { wxLogStatus("Showing %s modal dialog", dialog->GetClassInfo()->GetClassName()); return wxID_NONE; } - virtual void Exit(wxDialog* dialog) + virtual void Exit(wxDialog* dialog) wxOVERRIDE { wxLogStatus("Leaving %s modal dialog", dialog->GetClassInfo()->GetClassName()); @@ -2359,7 +2359,7 @@ public: } // add some custom controls - virtual void DoAddCustomControls() + virtual void DoAddCustomControls() wxOVERRIDE { AddControl(new wxStaticLine(this), wxSizerFlags().Expand()); AddText(wxT("Some custom text")); @@ -3332,7 +3332,7 @@ class MyLogGui : public wxLogGui private: virtual void DoShowSingleLogMessage(const wxString& message, const wxString& title, - int style) + int style) wxOVERRIDE { wxMessageDialog dlg(NULL, message, title, wxOK | wxCANCEL | wxCANCEL_DEFAULT | style); diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 9ec21f0e01..7576f46dd4 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -105,7 +105,7 @@ of MSW, MAC and OS2 class MyAppTraits : public wxGUIAppTraits { public: - virtual wxLog *CreateLogTarget(); + virtual wxLog *CreateLogTarget() wxOVERRIDE; }; #endif // wxUSE_LOG @@ -116,16 +116,16 @@ class MyApp: public wxApp public: MyApp() { m_startupProgressStyle = -1; } - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; #if wxUSE_CMDLINE_PARSER - virtual void OnInitCmdLine(wxCmdLineParser& parser); - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; #endif // wxUSE_CMDLINE_PARSER protected: #if wxUSE_LOG - virtual wxAppTraits *CreateTraits() { return new MyAppTraits; } + virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyAppTraits; } #endif // wxUSE_LOG private: @@ -276,8 +276,8 @@ public: protected: // overrides method in base class - virtual void AddAdditionalTextOptions(wxSizer *sizer); - virtual void AddAdditionalFlags(wxSizer *sizer); + virtual void AddAdditionalTextOptions(wxSizer *sizer) wxOVERRIDE; + virtual void AddAdditionalFlags(wxSizer *sizer) wxOVERRIDE; void OnApply(wxCommandEvent& event); diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp index 6fb7773594..a33fe7a57b 100644 --- a/samples/dialup/nettest.cpp +++ b/samples/dialup/nettest.cpp @@ -53,10 +53,10 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // called before the application termination - virtual int OnExit(); + virtual int OnExit() wxOVERRIDE; // event handlers void OnConnected(wxDialUpEvent& event); diff --git a/samples/display/display.cpp b/samples/display/display.cpp index ee20a1bd62..401a117b3e 100644 --- a/samples/display/display.cpp +++ b/samples/display/display.cpp @@ -53,7 +53,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index aaf018626c..a1d2e9d1d1 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -47,7 +47,7 @@ class DnDText : public wxTextDropTarget public: DnDText(wxListBox *pOwner) { m_pOwner = pOwner; } - virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text); + virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) wxOVERRIDE; private: wxListBox *m_pOwner; @@ -59,7 +59,7 @@ public: DnDFile(wxListBox *pOwner = NULL) { m_pOwner = pOwner; } virtual bool OnDropFiles(wxCoord x, wxCoord y, - const wxArrayString& filenames); + const wxArrayString& filenames) wxOVERRIDE; private: wxListBox *m_pOwner; @@ -83,14 +83,14 @@ public: // URLs can't be moved, only copied virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxDragResult WXUNUSED(def)) + wxDragResult WXUNUSED(def)) wxOVERRIDE { return wxDragLink; // At least IE 5.x needs wxDragLink, the // other browsers on MSW seem okay with it too. } // translate this to calls to OnDropURL() just for convenience - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE { if ( !GetData() ) return wxDragNone; @@ -110,7 +110,7 @@ public: class DnDApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; IMPLEMENT_APP(DnDApp) @@ -378,8 +378,8 @@ public: wxLogMessage(wxT("DnDTriangularShape is being deleted")); } - virtual Kind GetKind() const { return Triangle; } - virtual void Draw(wxDC& dc) + virtual Kind GetKind() const wxOVERRIDE { return Triangle; } + virtual void Draw(wxDC& dc) wxOVERRIDE { DnDShape::Draw(dc); @@ -415,8 +415,8 @@ public: wxLogMessage(wxT("DnDRectangularShape is being deleted")); } - virtual Kind GetKind() const { return Rectangle; } - virtual void Draw(wxDC& dc) + virtual Kind GetKind() const wxOVERRIDE { return Rectangle; } + virtual void Draw(wxDC& dc) wxOVERRIDE { DnDShape::Draw(dc); @@ -451,8 +451,8 @@ public: wxLogMessage(wxT("DnDEllipticShape is being deleted")); } - virtual Kind GetKind() const { return Ellipse; } - virtual void Draw(wxDC& dc) + virtual Kind GetKind() const wxOVERRIDE { return Ellipse; } + virtual void Draw(wxDC& dc) wxOVERRIDE { DnDShape::Draw(dc); @@ -529,12 +529,12 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const + virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const wxOVERRIDE { return m_formatShape; } - virtual size_t GetFormatCount(Direction dir) const + virtual size_t GetFormatCount(Direction dir) const wxOVERRIDE { // our custom format is supported by both GetData() and SetData() size_t nFormats = 1; @@ -551,7 +551,7 @@ public: return nFormats; } - virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const + virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const wxOVERRIDE { formats[0] = m_formatShape; if ( dir == Get ) @@ -568,7 +568,7 @@ public: } } - virtual size_t GetDataSize(const wxDataFormat& format) const + virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE { if ( format == m_formatShape ) { @@ -595,7 +595,7 @@ public: } } - virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const + virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE { if ( format == m_formatShape ) { @@ -625,7 +625,7 @@ public: } virtual bool SetData(const wxDataFormat& format, - size_t WXUNUSED(len), const void *buf) + size_t WXUNUSED(len), const void *buf) wxOVERRIDE { wxCHECK_MSG( format == m_formatShape, false, wxT( "unsupported format") ); @@ -674,8 +674,8 @@ public: DnDShape *GetShape() const; - virtual bool TransferDataToWindow(); - virtual bool TransferDataFromWindow(); + virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() wxOVERRIDE; void OnColour(wxCommandEvent& event); @@ -752,20 +752,20 @@ public: } // override base class (pure) virtuals - virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) + virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE { #if wxUSE_STATUSBAR m_frame->SetStatusText(wxT("Mouse entered the frame")); #endif // wxUSE_STATUSBAR return OnDragOver(x, y, def); } - virtual void OnLeave() + virtual void OnLeave() wxOVERRIDE { #if wxUSE_STATUSBAR m_frame->SetStatusText(wxT("Mouse left the frame")); #endif // wxUSE_STATUSBAR } - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE { if ( !GetData() ) { diff --git a/samples/docview/doc.h b/samples/docview/doc.h index 8f970cdd52..c084166e74 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -80,8 +80,8 @@ class DrawingDocument : public wxDocument public: DrawingDocument() : wxDocument() { } - DocumentOstream& SaveObject(DocumentOstream& stream); - DocumentIstream& LoadObject(DocumentIstream& stream); + DocumentOstream& SaveObject(DocumentOstream& stream) wxOVERRIDE; + DocumentIstream& LoadObject(DocumentIstream& stream) wxOVERRIDE; // add a new segment to the document void AddDoodleSegment(const DoodleSegment& segment); @@ -138,8 +138,8 @@ public: { } - virtual bool Do() { return DoAdd(); } - virtual bool Undo() { return DoRemove(); } + virtual bool Do() wxOVERRIDE { return DoAdd(); } + virtual bool Undo() wxOVERRIDE { return DoRemove(); } }; // The command for removing the last segment @@ -151,8 +151,8 @@ public: { } - virtual bool Do() { return DoRemove(); } - virtual bool Undo() { return DoAdd(); } + virtual bool Do() wxOVERRIDE { return DoRemove(); } + virtual bool Undo() wxOVERRIDE { return DoAdd(); } }; @@ -165,16 +165,16 @@ class wxTextDocument : public wxDocument public: wxTextDocument() : wxDocument() { } - virtual bool OnCreate(const wxString& path, long flags); + virtual bool OnCreate(const wxString& path, long flags) wxOVERRIDE; virtual wxTextCtrl* GetTextCtrl() const = 0; - virtual bool IsModified() const; - virtual void Modify(bool mod); + virtual bool IsModified() const wxOVERRIDE; + virtual void Modify(bool mod) wxOVERRIDE; protected: - virtual bool DoSaveDocument(const wxString& filename); - virtual bool DoOpenDocument(const wxString& filename); + virtual bool DoSaveDocument(const wxString& filename) wxOVERRIDE; + virtual bool DoOpenDocument(const wxString& filename) wxOVERRIDE; void OnTextChange(wxCommandEvent& event); @@ -190,7 +190,7 @@ class TextEditDocument : public wxTextDocument { public: TextEditDocument() : wxTextDocument() { } - virtual wxTextCtrl* GetTextCtrl() const; + virtual wxTextCtrl* GetTextCtrl() const wxOVERRIDE; wxDECLARE_NO_COPY_CLASS(TextEditDocument); DECLARE_DYNAMIC_CLASS(TextEditDocument) @@ -208,12 +208,12 @@ class ImageDocument : public wxDocument public: ImageDocument() : wxDocument() { } - virtual bool OnOpenDocument(const wxString& file); + virtual bool OnOpenDocument(const wxString& file) wxOVERRIDE; wxImage GetImage() const { return m_image; } protected: - virtual bool DoOpenDocument(const wxString& file); + virtual bool DoOpenDocument(const wxString& file) wxOVERRIDE; private: wxImage m_image; diff --git a/samples/docview/docview.h b/samples/docview/docview.h index c694031b2b..7be00d3ec5 100644 --- a/samples/docview/docview.h +++ b/samples/docview/docview.h @@ -33,11 +33,11 @@ public: MyApp(); // override some wxApp virtual methods - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; - virtual void OnInitCmdLine(wxCmdLineParser& parser); - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; // our specific methods Mode GetMode() const { return m_mode; } diff --git a/samples/docview/view.h b/samples/docview/view.h index 9102144b7c..920f9e049c 100644 --- a/samples/docview/view.h +++ b/samples/docview/view.h @@ -27,7 +27,7 @@ public: MyCanvas(wxView *view, wxWindow *parent = NULL); virtual ~MyCanvas(); - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; // in a normal multiple document application a canvas is associated with // one view from the beginning until the end, but to support the single @@ -68,10 +68,10 @@ class DrawingView : public wxView public: DrawingView() : wxView(), m_canvas(NULL) {} - virtual bool OnCreate(wxDocument *doc, long flags); - virtual void OnDraw(wxDC *dc); - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); - virtual bool OnClose(bool deleteWindow = true); + virtual bool OnCreate(wxDocument *doc, long flags) wxOVERRIDE; + virtual void OnDraw(wxDC *dc) wxOVERRIDE; + virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) wxOVERRIDE; + virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE; DrawingDocument* GetDocument(); @@ -94,9 +94,9 @@ class TextEditView : public wxView public: TextEditView() : wxView(), m_text(NULL) {} - virtual bool OnCreate(wxDocument *doc, long flags); - virtual void OnDraw(wxDC *dc); - virtual bool OnClose(bool deleteWindow = true); + virtual bool OnCreate(wxDocument *doc, long flags) wxOVERRIDE; + virtual void OnDraw(wxDC *dc) wxOVERRIDE; + virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE; wxTextCtrl *GetText() const { return m_text; } @@ -120,7 +120,7 @@ class ImageCanvas : public wxScrolledWindow public: ImageCanvas(wxView*); - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; private: wxView *m_view; }; @@ -134,10 +134,10 @@ class ImageView : public wxView public: ImageView() : wxView() {} - virtual bool OnCreate(wxDocument*, long flags); - virtual void OnDraw(wxDC*); - virtual bool OnClose(bool deleteWindow = true); - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); + virtual bool OnCreate(wxDocument*, long flags) wxOVERRIDE; + virtual void OnDraw(wxDC*) wxOVERRIDE; + virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE; + virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) wxOVERRIDE; ImageDocument* GetDocument(); @@ -156,8 +156,8 @@ class ImageDetailsView : public wxView public: ImageDetailsView(ImageDetailsDocument *doc); - virtual void OnDraw(wxDC *dc); - virtual bool OnClose(bool deleteWindow); + virtual void OnDraw(wxDC *dc) wxOVERRIDE; + virtual bool OnClose(bool deleteWindow) wxOVERRIDE; private: wxFrame *m_frame; diff --git a/samples/dragimag/dragimag.h b/samples/dragimag/dragimag.h index 391495d5a7..9bb9997419 100644 --- a/samples/dragimag/dragimag.h +++ b/samples/dragimag/dragimag.h @@ -44,8 +44,8 @@ class MyApp: public wxApp { public: MyApp(); - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; //// Operations @@ -180,7 +180,7 @@ public: // On some platforms, notably Mac OS X with Core Graphics, we can't blit from // a window, so we need to draw the background explicitly. virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC, const wxRect& sourceRect, - const wxRect& destRect) const; + const wxRect& destRect) const wxOVERRIDE; protected: MyCanvas* m_canvas; diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 75ebb807d3..6a9ebfae0b 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -76,9 +76,9 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() { DeleteBitmaps(); return 0; } + virtual int OnExit() wxOVERRIDE { DeleteBitmaps(); return 0; } protected: void DeleteBitmaps(); @@ -111,7 +111,7 @@ public: #if wxUSE_COLOURDLG wxColour SelectColour(); #endif // wxUSE_COLOURDLG - void PrepareDC(wxDC& dc); + void PrepareDC(wxDC& dc) wxOVERRIDE; int m_backgroundMode; int m_textureBackground; diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp index 8b175cfb3b..61804a0972 100644 --- a/samples/erase/erase.cpp +++ b/samples/erase/erase.cpp @@ -49,7 +49,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; diff --git a/samples/event/event.cpp b/samples/event/event.cpp index 861c2d2048..e48a86c244 100644 --- a/samples/event/event.cpp +++ b/samples/event/event.cpp @@ -66,7 +66,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // these are regular event handlers used to highlight the events handling // order @@ -75,7 +75,7 @@ public: // we override wxConsoleApp::FilterEvent used to highlight the events // handling order - virtual int FilterEvent(wxEvent& event); + virtual int FilterEvent(wxEvent& event) wxOVERRIDE; private: DECLARE_EVENT_TABLE() diff --git a/samples/except/except.cpp b/samples/except/except.cpp index 4f9ea48dbf..8c2654f600 100644 --- a/samples/except/except.cpp +++ b/samples/except/except.cpp @@ -78,19 +78,19 @@ public: // ---------------------------- // program startup - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // 2nd-level exception handling: we get all the exceptions occurring in any // event handler here - virtual bool OnExceptionInMainLoop(); + virtual bool OnExceptionInMainLoop() wxOVERRIDE; // 3rd, and final, level exception handling: whenever an unhandled // exception is caught, this function is called - virtual void OnUnhandledException(); + virtual void OnUnhandledException() wxOVERRIDE; // and now for something different: this function is called in case of a // crash (e.g. dereferencing null pointer, division by 0, ...) - virtual void OnFatalException(); + virtual void OnFatalException() wxOVERRIDE; // you can override this function to do something different (e.g. log the // assert to file) whenever an assertion fails @@ -98,7 +98,7 @@ public: int line, const wxChar *func, const wxChar *cond, - const wxChar *msg); + const wxChar *msg) wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame @@ -128,7 +128,7 @@ protected: // 1st-level exception handling: we overload ProcessEvent() to be able to // catch exceptions which occur in MyFrame methods here - virtual bool ProcessEvent(wxEvent& event); + virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; // provoke assert in main or worker thread // @@ -485,7 +485,7 @@ void MyFrame::OnShowAssertInThread(wxCommandEvent& WXUNUSED(event)) } protected: - virtual void *Entry() + virtual void *Entry() wxOVERRIDE { wxFAIL_MSG("Test assert in another thread."); diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index 91df193390..f79b2b12f4 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -83,7 +83,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define an array of process pointers used by MyFrame @@ -263,7 +263,7 @@ public: // instead of overriding this virtual function we might as well process the // event from it in the frame class - this might be more convenient in some // cases - virtual void OnTerminate(int pid, int status); + virtual void OnTerminate(int pid, int status) wxOVERRIDE; protected: MyFrame *m_parent; @@ -280,7 +280,7 @@ public: Redirect(); } - virtual void OnTerminate(int pid, int status); + virtual void OnTerminate(int pid, int status) wxOVERRIDE; virtual bool HasInput(); }; @@ -295,7 +295,7 @@ public: { } - virtual bool HasInput(); + virtual bool HasInput() wxOVERRIDE; private: wxString m_input; diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 7136e9557f..7c6afa7ee8 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -56,7 +56,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // MyCanvas is a canvas on which we show the font sample @@ -428,7 +428,7 @@ public: protected: virtual bool OnFontEncoding(const wxString& facename, - const wxString& encoding) + const wxString& encoding) wxOVERRIDE { wxString text; text.Printf(wxT("Encoding %u: %s (available in facename '%s')\n"), @@ -464,7 +464,7 @@ public: { return m_facenames; } protected: - virtual bool OnFacename(const wxString& facename) + virtual bool OnFacename(const wxString& facename) wxOVERRIDE { m_facenames.Add(facename); return true; diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp index 727ce088e1..4bd50e768c 100644 --- a/samples/fswatcher/fswatcher.cpp +++ b/samples/fswatcher/fswatcher.cpp @@ -73,7 +73,7 @@ class MyApp : public wxApp { public: // 'Main program' equivalent: the program execution "starts" here - virtual bool OnInit() + virtual bool OnInit() wxOVERRIDE { if ( !wxApp::OnInit() ) return false; @@ -89,7 +89,7 @@ public: } // create the file system watcher here, because it needs an active loop - virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) + virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) wxOVERRIDE { if ( m_frame->CreateWatcherIfNecessary() ) { @@ -98,7 +98,7 @@ public: } } - virtual void OnInitCmdLine(wxCmdLineParser& parser) + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE { wxApp::OnInitCmdLine(parser); parser.AddParam("directory to watch", @@ -106,7 +106,7 @@ public: wxCMD_LINE_PARAM_OPTIONAL); } - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE { if ( !wxApp::OnCmdLineParsed(parser) ) return false; diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index 506b36812e..ee3f2fb9f0 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -59,7 +59,7 @@ public: const wxRect& rect, int horizAlign, int vertAlign, - int WXUNUSED(textOrientation)) const + int WXUNUSED(textOrientation)) const wxOVERRIDE { dc.SetTextForeground(m_colFg); dc.SetFont(wxITALIC_FONT->Bold()); @@ -68,7 +68,7 @@ public: virtual void DrawBorder(const wxGrid& WXUNUSED(grid), wxDC& dc, - wxRect& rect) const + wxRect& rect) const wxOVERRIDE { dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxBrush(m_colBg)); @@ -99,7 +99,7 @@ public: void UseCustomColHeaders(bool use = true) { m_useCustom = use; } protected: - virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) + virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) wxOVERRIDE { // if enabled, use custom renderers if ( m_useCustom ) @@ -1789,10 +1789,10 @@ public: TabularGridTable() { m_sortOrder = NULL; } - virtual int GetNumberRows() { return ROW_MAX; } - virtual int GetNumberCols() { return COL_MAX; } + virtual int GetNumberRows() wxOVERRIDE { return ROW_MAX; } + virtual int GetNumberCols() wxOVERRIDE { return COL_MAX; } - virtual wxString GetValue(int row, int col) + virtual wxString GetValue(int row, int col) wxOVERRIDE { if ( m_sortOrder ) row = m_sortOrder[row]; @@ -1817,12 +1817,12 @@ public: return wxString(); } - virtual void SetValue(int, int, const wxString&) + virtual void SetValue(int, int, const wxString&) wxOVERRIDE { wxFAIL_MSG( "shouldn't be called" ); } - virtual wxString GetColLabelValue(int col) + virtual wxString GetColLabelValue(int col) wxOVERRIDE { // notice that column parameter here always refers to the internal // column index, independently of its position on the screen @@ -1832,7 +1832,7 @@ public: return labels[col]; } - virtual void SetColLabelValue(int, const wxString&) + virtual void SetColLabelValue(int, const wxString&) wxOVERRIDE { wxFAIL_MSG( "shouldn't be called" ); } @@ -1909,7 +1909,7 @@ public: } protected: - virtual wxSize DoGetBestSize() const + virtual wxSize DoGetBestSize() const wxOVERRIDE { wxSize size = wxTextCtrl::DoGetBestSize(); size.x = 3*GetCharWidth(); diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h index 8ec319a597..e86f5e5ea6 100644 --- a/samples/grid/griddemo.h +++ b/samples/grid/griddemo.h @@ -16,7 +16,7 @@ class wxGrid; class GridApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; @@ -228,7 +228,7 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected); + bool isSelected) wxOVERRIDE; }; // ---------------------------------------------------------------------------- @@ -241,15 +241,15 @@ class BigGridTable : public wxGridTableBase public: BigGridTable(long sizeGrid) { m_sizeGrid = sizeGrid; } - int GetNumberRows() { return m_sizeGrid; } - int GetNumberCols() { return m_sizeGrid; } - wxString GetValue( int row, int col ) + int GetNumberRows() wxOVERRIDE { return m_sizeGrid; } + int GetNumberCols() wxOVERRIDE { return m_sizeGrid; } + wxString GetValue( int row, int col ) wxOVERRIDE { return wxString::Format(wxT("(%d, %d)"), row, col); } - void SetValue( int , int , const wxString& ) { /* ignore */ } - bool IsEmptyCell( int , int ) { return false; } + void SetValue( int , int , const wxString& ) wxOVERRIDE { /* ignore */ } + bool IsEmptyCell( int , int ) wxOVERRIDE { return false; } private: long m_sizeGrid; @@ -276,7 +276,7 @@ public: virtual ~MyGridCellAttrProvider(); virtual wxGridCellAttr *GetAttr(int row, int col, - wxGridCellAttr::wxAttrKind kind) const; + wxGridCellAttr::wxAttrKind kind) const wxOVERRIDE; private: wxGridCellAttr *m_attrForOddRows; @@ -291,23 +291,23 @@ class BugsGridTable : public wxGridTableBase public: BugsGridTable() { } - virtual int GetNumberRows(); - virtual int GetNumberCols(); - virtual bool IsEmptyCell( int row, int col ); - virtual wxString GetValue( int row, int col ); - virtual void SetValue( int row, int col, const wxString& value ); + virtual int GetNumberRows() wxOVERRIDE; + virtual int GetNumberCols() wxOVERRIDE; + virtual bool IsEmptyCell( int row, int col ) wxOVERRIDE; + virtual wxString GetValue( int row, int col ) wxOVERRIDE; + virtual void SetValue( int row, int col, const wxString& value ) wxOVERRIDE; - virtual wxString GetColLabelValue( int col ); + virtual wxString GetColLabelValue( int col ) wxOVERRIDE; - virtual wxString GetTypeName( int row, int col ); - virtual bool CanGetValueAs( int row, int col, const wxString& typeName ); - virtual bool CanSetValueAs( int row, int col, const wxString& typeName ); + virtual wxString GetTypeName( int row, int col ) wxOVERRIDE; + virtual bool CanGetValueAs( int row, int col, const wxString& typeName ) wxOVERRIDE; + virtual bool CanSetValueAs( int row, int col, const wxString& typeName ) wxOVERRIDE; - virtual long GetValueAsLong( int row, int col ); - virtual bool GetValueAsBool( int row, int col ); + virtual long GetValueAsLong( int row, int col ) wxOVERRIDE; + virtual bool GetValueAsBool( int row, int col ) wxOVERRIDE; - virtual void SetValueAsLong( int row, int col, long value ); - virtual void SetValueAsBool( int row, int col, bool value ); + virtual void SetValueAsLong( int row, int col, long value ) wxOVERRIDE; + virtual void SetValueAsBool( int row, int col, bool value ) wxOVERRIDE; }; class BugsGridFrame : public wxFrame diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index 7f6835395c..cac377d31f 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -96,10 +96,10 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // do some clean up here - virtual int OnExit(); + virtual int OnExit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp index f6101d2648..36c5d66457 100644 --- a/samples/htlbox/htlbox.cpp +++ b/samples/htlbox/htlbox.cpp @@ -71,11 +71,11 @@ public: protected: // override this method to return data to be shown in the listbox (this is // mandatory) - virtual wxString OnGetItem(size_t n) const; + virtual wxString OnGetItem(size_t n) const wxOVERRIDE; // change the appearance by overriding these functions (this is optional) - virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const; - virtual wxColour GetSelectedTextColour(const wxColour& colFg) const; + virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const wxOVERRIDE; + virtual wxColour GetSelectedTextColour(const wxColour& colFg) const wxOVERRIDE; // flag telling us whether we should use fg colour even for the selected // item @@ -152,7 +152,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit() { (new MyFrame())->Show(); return true; } + virtual bool OnInit() wxOVERRIDE { (new MyFrame())->Show(); return true; } }; // ---------------------------------------------------------------------------- diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp index 2021fcfadf..d1721d7ef6 100644 --- a/samples/html/about/about.cpp +++ b/samples/html/about/about.cpp @@ -46,7 +46,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp index 24f8d1d924..18595e5275 100644 --- a/samples/html/help/help.cpp +++ b/samples/html/help/help.cpp @@ -47,7 +47,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp index 074b943d84..281d7ad13f 100644 --- a/samples/html/helpview/helpview.cpp +++ b/samples/html/helpview/helpview.cpp @@ -46,8 +46,8 @@ public: // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; private: wxHtmlHelpController *help; diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index 46cdadf4f2..77a238c92e 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -44,7 +44,7 @@ public: // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index 64498d7c2e..adb094851a 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -41,7 +41,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new html window type: this is a wrapper for handling wxHtmlWindow events @@ -56,7 +56,7 @@ public: virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType WXUNUSED(type), const wxString& WXUNUSED(url), - wxString *WXUNUSED(redirect)) const; + wxString *WXUNUSED(redirect)) const wxOVERRIDE; // toggle drawing of custom background void DrawCustomBg(bool draw) @@ -110,7 +110,7 @@ private: class BoldProcessor : public wxHtmlProcessor { public: - virtual wxString Process(const wxString& s) const + virtual wxString Process(const wxString& s) const wxOVERRIDE { wxString r(s); r.Replace(wxT(""), wxEmptyString); diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp index d89eb9835a..80ba55a810 100644 --- a/samples/html/virtual/virtual.cpp +++ b/samples/html/virtual/virtual.cpp @@ -42,8 +42,8 @@ class MyVFS : public wxFileSystemHandler public: MyVFS() : wxFileSystemHandler() {} - wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); - bool CanOpen(const wxString& location); + wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + bool CanOpen(const wxString& location) wxOVERRIDE; }; bool MyVFS::CanOpen(const wxString& location) @@ -94,7 +94,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp index 04ff16c5f6..649cfd3b99 100644 --- a/samples/html/widget/widget.cpp +++ b/samples/html/widget/widget.cpp @@ -87,7 +87,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp index 61ec1e556c..d7582ddd6b 100644 --- a/samples/html/zip/zip.cpp +++ b/samples/html/zip/zip.cpp @@ -43,7 +43,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 3c614c3229..568613b290 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -64,7 +64,7 @@ class MyApp: public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // ---------------------------------------------------------------------------- diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index 2567325036..a59490ab81 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -50,9 +50,9 @@ class MyApp: public wxApp public: MyApp() { m_lang = wxLANGUAGE_UNKNOWN; } - virtual void OnInitCmdLine(wxCmdLineParser& parser); - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); - virtual bool OnInit(); + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnInit() wxOVERRIDE; protected: wxLanguage m_lang; // language specified by user diff --git a/samples/ipc/baseclient.cpp b/samples/ipc/baseclient.cpp index 99ba992876..0eaa375762 100644 --- a/samples/ipc/baseclient.cpp +++ b/samples/ipc/baseclient.cpp @@ -49,8 +49,8 @@ class MyApp : public wxApp public: MyApp() { Connect(wxEVT_IDLE, wxIdleEventHandler(MyApp::OnIdle)); } - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; private: void OnIdle(wxIdleEvent& event); @@ -61,11 +61,11 @@ private: class MyConnection : public MyConnectionBase { public: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format); - virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT); - virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format); - virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format); - virtual bool OnDisconnect(); + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE; + virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnDisconnect() wxOVERRIDE; }; class MyClient : public wxClient, @@ -77,10 +77,10 @@ public: bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic); void Disconnect(); - wxConnectionBase *OnMakeConnection(); + wxConnectionBase *OnMakeConnection() wxOVERRIDE; bool IsConnected() { return m_connection != NULL; }; - virtual void Notify(); + virtual void Notify() wxOVERRIDE; void StartNextTestIfNecessary(); diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp index db6ebddfd5..06a58356ac 100644 --- a/samples/ipc/baseserver.cpp +++ b/samples/ipc/baseserver.cpp @@ -45,28 +45,28 @@ class MyConnection : public MyConnectionBase, public wxTimer { public: - virtual bool Disconnect() { return wxConnection::Disconnect(); } + virtual bool Disconnect() wxOVERRIDE { return wxConnection::Disconnect(); } virtual bool OnExecute(const wxString& topic, const void *data, size_t size, - wxIPCFormat format); + wxIPCFormat format) wxOVERRIDE; virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, - wxIPCFormat format); + wxIPCFormat format) wxOVERRIDE; virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, - wxIPCFormat format); - virtual bool OnStartAdvise(const wxString& topic, const wxString& item); - virtual bool OnStopAdvise(const wxString& topic, const wxString& item); + wxIPCFormat format) wxOVERRIDE; + virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE; + virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE; virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format); - virtual bool OnDisconnect(); - virtual void Notify(); + wxIPCFormat format) wxOVERRIDE; + virtual bool OnDisconnect() wxOVERRIDE; + virtual void Notify() wxOVERRIDE; private: wxString m_sAdvise; @@ -86,9 +86,9 @@ public: const wxString& item, const void *data, size_t size, - wxIPCFormat format); - virtual bool OnStartAdvise(const wxString& topic, const wxString& item); - virtual bool OnStopAdvise(const wxString& topic, const wxString& item); + wxIPCFormat format) wxOVERRIDE; + virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE; + virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE; private: // return true if this is the supported topic+item combination, log an @@ -115,7 +115,7 @@ public: void Disconnect(); bool IsConnected() { return m_connection != NULL; }; - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; private: wxConnection *m_connection; @@ -125,7 +125,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; protected: MyServer m_server; diff --git a/samples/ipc/client.h b/samples/ipc/client.h index b27570c2d4..b71979ab8a 100644 --- a/samples/ipc/client.h +++ b/samples/ipc/client.h @@ -29,8 +29,8 @@ class MyFrame; class MyApp: public wxApp { public: - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; MyFrame *GetFrame() { return m_frame; }; protected: @@ -81,11 +81,11 @@ protected: class MyConnection : public MyConnectionBase { public: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format); - virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT); - virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format); - virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format); - virtual bool OnDisconnect(); + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE; + virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnDisconnect() wxOVERRIDE; }; class MyClient: public wxClient @@ -95,7 +95,7 @@ public: ~MyClient(); bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic); void Disconnect(); - wxConnectionBase *OnMakeConnection(); + wxConnectionBase *OnMakeConnection() wxOVERRIDE; bool IsConnected() { return m_connection != NULL; }; MyConnection *GetConnection() { return m_connection; }; diff --git a/samples/ipc/server.h b/samples/ipc/server.h index 4cf38233bf..08abe6abcc 100644 --- a/samples/ipc/server.h +++ b/samples/ipc/server.h @@ -25,7 +25,7 @@ class MyFrame; class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; MyFrame *GetFrame() { return m_frame; } protected: @@ -65,13 +65,13 @@ protected: class MyConnection : public MyConnectionBase { public: - virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format); - virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format); - virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format); - virtual bool OnStartAdvise(const wxString& topic, const wxString& item); - virtual bool OnStopAdvise(const wxString& topic, const wxString& item); - virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format); - virtual bool OnDisconnect(); + virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE; + virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE; + virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool OnDisconnect() wxOVERRIDE; // topic for which we advise the client or empty if none wxString m_advise; @@ -95,7 +95,7 @@ public: void Advise(); bool CanAdvise() { return m_connection && !m_connection->m_advise.empty(); } - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; protected: MyConnection *m_connection; diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h index 8e2d6a9c0f..0045a0b119 100644 --- a/samples/joytest/joytest.h +++ b/samples/joytest/joytest.h @@ -12,7 +12,7 @@ class MyApp: public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; // Joystick max values int m_minX; diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp index 7a11cd84ff..13efee9293 100644 --- a/samples/keyboard/keyboard.cpp +++ b/samples/keyboard/keyboard.cpp @@ -114,7 +114,7 @@ class MyApp : public wxApp { public: // 'Main program' equivalent: the program execution "starts" here - virtual bool OnInit() + virtual bool OnInit() wxOVERRIDE { // create the main application window new MyFrame("Keyboard wxWidgets App"); diff --git a/samples/layout/layout.h b/samples/layout/layout.h index 7e80805ef6..25968998a6 100644 --- a/samples/layout/layout.h +++ b/samples/layout/layout.h @@ -13,7 +13,7 @@ class MyApp: public wxApp { public: MyApp(){}; - bool OnInit(); + bool OnInit() wxOVERRIDE; }; // the main frame class diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h index a5cdcc1679..d6c8cb3950 100644 --- a/samples/listctrl/listtest.h +++ b/samples/listctrl/listtest.h @@ -22,7 +22,7 @@ class MyApp: public wxApp public: MyApp() { } - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; private: wxDECLARE_NO_COPY_CLASS(MyApp); @@ -82,9 +82,9 @@ private: void LogEvent(const wxListEvent& event, const wxChar *eventName); void LogColEvent(const wxListEvent& event, const wxChar *eventName); - virtual wxString OnGetItemText(long item, long column) const; - virtual int OnGetItemColumnImage(long item, long column) const; - virtual wxListItemAttr *OnGetItemAttr(long item) const; + virtual wxString OnGetItemText(long item, long column) const wxOVERRIDE; + virtual int OnGetItemColumnImage(long item, long column) const wxOVERRIDE; + virtual wxListItemAttr *OnGetItemAttr(long item) const wxOVERRIDE; long m_updated; diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h index abfdb6a3d2..86c2869701 100644 --- a/samples/mdi/mdi.h +++ b/samples/mdi/mdi.h @@ -14,14 +14,14 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; class MyCanvas : public wxScrolledWindow { public: MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size); - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; bool IsDirty() const { return m_dirty; } diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp index 640bb152c7..7a5bdce8fc 100644 --- a/samples/mediaplayer/mediaplayer.cpp +++ b/samples/mediaplayer/mediaplayer.cpp @@ -147,14 +147,14 @@ public: #endif #if wxUSE_CMDLINE_PARSER - virtual void OnInitCmdLine(wxCmdLineParser& parser); - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; // Files specified on the command line, if any. wxVector m_params; #endif // wxUSE_CMDLINE_PARSER - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; protected: class wxMediaPlayerFrame* m_frame; @@ -287,7 +287,7 @@ public: wxMediaPlayerTimer(wxMediaPlayerFrame* frame) {m_frame = frame;} // Called each time the timer's timeout expires - void Notify(); + void Notify() wxOVERRIDE; wxMediaPlayerFrame* m_frame; // The wxMediaPlayerFrame }; @@ -353,7 +353,7 @@ public: wxPlayListDropTarget(wxMediaPlayerListCtrl& list) : m_list(list) {} ~wxPlayListDropTarget(){} virtual bool OnDropFiles(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - const wxArrayString& files) + const wxArrayString& files) wxOVERRIDE { for (size_t i = 0; i < files.GetCount(); ++i) { diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 192dea405b..8c9534bece 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -68,7 +68,7 @@ class MyApp: public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; // Define a new frame diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index a78e462908..6dce25cdd4 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -54,7 +54,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h index 649c7f161f..29c1fce2da 100644 --- a/samples/notebook/notebook.h +++ b/samples/notebook/notebook.h @@ -26,7 +26,7 @@ class MyApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; DECLARE_APP(MyApp) diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h index ac70d65584..de64171f4a 100644 --- a/samples/opengl/cube/cube.h +++ b/samples/opengl/cube/cube.h @@ -38,8 +38,8 @@ public: TestGLContext& GetContext(wxGLCanvas *canvas, bool useStereo); // virtual wxApp methods - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; private: // the GL context we use for all our mono rendering windows diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h index aeb6c8e712..02018bb0e0 100644 --- a/samples/opengl/isosurf/isosurf.h +++ b/samples/opengl/isosurf/isosurf.h @@ -33,10 +33,10 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; - virtual void OnInitCmdLine(wxCmdLineParser& parser); - virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; }; diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h index 6c8240e9f1..c4d38b791e 100644 --- a/samples/opengl/penguin/penguin.h +++ b/samples/opengl/penguin/penguin.h @@ -45,7 +45,7 @@ struct GLData class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp index fdf102314a..0500b9cc8f 100644 --- a/samples/popup/popup.cpp +++ b/samples/popup/popup.cpp @@ -69,10 +69,10 @@ public: virtual ~SimpleTransientPopup(); // wxPopupTransientWindow virtual methods are all overridden to log them - virtual void Popup(wxWindow *focus = NULL); - virtual void OnDismiss(); - virtual bool ProcessLeftDown(wxMouseEvent& event); - virtual bool Show( bool show = true ); + virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE; + virtual void OnDismiss() wxOVERRIDE; + virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE; + virtual bool Show( bool show = true ) wxOVERRIDE; private: wxScrolledWindow *m_panel; @@ -294,7 +294,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; MyFrame *m_frame; }; diff --git a/samples/printing/printing.h b/samples/printing/printing.h index 00e6f64dcf..ef2a01c257 100644 --- a/samples/printing/printing.h +++ b/samples/printing/printing.h @@ -14,8 +14,8 @@ class MyApp: public wxApp public: MyApp() {} - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; void Draw(wxDC& dc); @@ -76,7 +76,7 @@ public: MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style = wxRETAINED); //void OnPaint(wxPaintEvent& evt); - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; private: DECLARE_EVENT_TABLE() @@ -89,10 +89,10 @@ public: MyPrintout(MyFrame* frame, const wxString &title = wxT("My printout")) : wxPrintout(title) { m_frame=frame; } - virtual bool OnPrintPage(int page); - virtual bool HasPage(int page); - virtual bool OnBeginDocument(int startPage, int endPage); - virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo); + virtual bool OnPrintPage(int page) wxOVERRIDE; + virtual bool HasPage(int page) wxOVERRIDE; + virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; + virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE; void DrawPageOne(); void DrawPageTwo(); diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index 69d9c23d68..150b564a54 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -88,11 +88,11 @@ public: virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& sz ) const; + const wxSize& sz ) const wxOVERRIDE; virtual bool OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property, wxWindow* ctrl, - wxEvent& event ) const; + wxEvent& event ) const wxOVERRIDE; }; IMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor) @@ -172,12 +172,12 @@ public: { } - virtual wxObject* Clone() const + virtual wxObject* Clone() const wxOVERRIDE { return new wxInvalidWordValidator(m_invalidWord); } - virtual bool Validate(wxWindow* WXUNUSED(parent)) + virtual bool Validate(wxWindow* WXUNUSED(parent)) wxOVERRIDE { wxTextCtrl* tc = wxDynamicCast(GetWindow(), wxTextCtrl); wxCHECK_MSG(tc, true, wxT("validator window must be wxTextCtrl")); @@ -318,7 +318,7 @@ public: } virtual bool DoShowDialog( wxPropertyGrid* WXUNUSED(propGrid), - wxPGProperty* WXUNUSED(property) ) + wxPGProperty* WXUNUSED(property) ) wxOVERRIDE { wxString s = ::wxGetSingleChoice(wxT("Message"), wxT("Caption"), @@ -354,13 +354,13 @@ public: } // Set editor to have button - virtual const wxPGEditor* DoGetEditorClass() const + virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE { return wxPGEditor_TextCtrlAndButton; } // Set what happens on button click - virtual wxPGEditorDialogAdapter* GetEditorDialog() const + virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE { return new wxSingleChoiceDialogAdapter(m_choices); } @@ -1745,13 +1745,13 @@ public: // Return false here to indicate unhandled events should be // propagated to manager's parent, as normal. - virtual bool IsHandlingAllEvents() const { return false; } + virtual bool IsHandlingAllEvents() const wxOVERRIDE { return false; } protected: virtual wxPGProperty* DoInsert( wxPGProperty* parent, int index, - wxPGProperty* property ) + wxPGProperty* property ) wxOVERRIDE { return wxPropertyGridPage::DoInsert(parent,index,property); } @@ -3248,7 +3248,7 @@ struct PropertyGridPopup : wxPopupWindow Fit(); } - void Fit() + void Fit() wxOVERRIDE { ::SetMinSize(m_grid); m_sizer->Fit(m_panel); diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h index 0d39094b2e..f00d397a77 100644 --- a/samples/propgrid/propgrid.h +++ b/samples/propgrid/propgrid.h @@ -23,13 +23,13 @@ public: const wxString& value = wxEmptyString ); virtual ~wxAdvImageFileProperty (); - virtual void OnSetValue(); // Override to allow image loading. + virtual void OnSetValue() wxOVERRIDE; // Override to allow image loading. - virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const; - virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ); - virtual wxSize OnMeasureImage( int item ) const; + virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const wxOVERRIDE; + virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) wxOVERRIDE; + virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE; virtual void OnCustomPaint( wxDC& dc, - const wxRect& rect, wxPGPaintData& paintdata ); + const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE; void LoadThumbnails( size_t n ); @@ -77,8 +77,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const; - virtual void RefreshChildren(); + wxVariant& childValue ) const wxOVERRIDE; + virtual void RefreshChildren() wxOVERRIDE; protected: }; @@ -110,8 +110,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const; - virtual void RefreshChildren(); + wxVariant& childValue ) const wxOVERRIDE; + virtual void RefreshChildren() wxOVERRIDE; protected: }; @@ -269,7 +269,7 @@ class cxApplication : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; private: FormMain *Form1; diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp index cc7e8eae06..7d583b6d12 100644 --- a/samples/propgrid/sampleprops.cpp +++ b/samples/propgrid/sampleprops.cpp @@ -357,12 +357,12 @@ protected: int m_precision; // Mandatory overridden methods - virtual wxString ArrayGet( size_t index ); - virtual size_t ArrayGetCount(); - virtual bool ArrayInsert( const wxString& str, int index ); - virtual bool ArraySet( size_t index, const wxString& str ); - virtual void ArrayRemoveAt( int index ); - virtual void ArraySwap( size_t first, size_t second ); + virtual wxString ArrayGet( size_t index ) wxOVERRIDE; + virtual size_t ArrayGetCount() wxOVERRIDE; + virtual bool ArrayInsert( const wxString& str, int index ) wxOVERRIDE; + virtual bool ArraySet( size_t index, const wxString& str ) wxOVERRIDE; + virtual void ArrayRemoveAt( int index ) wxOVERRIDE; + virtual void ArraySwap( size_t first, size_t second ) wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog) diff --git a/samples/propgrid/sampleprops.h b/samples/propgrid/sampleprops.h index a92d95700b..87b46cb234 100644 --- a/samples/propgrid/sampleprops.h +++ b/samples/propgrid/sampleprops.h @@ -26,19 +26,19 @@ public: const wxFontData& value = wxFontData() ); virtual ~wxFontDataProperty (); - void OnSetValue(); + void OnSetValue() wxOVERRIDE; // In order to have different value type in a derived property // class, we will override GetValue to return custom variant, // instead of changing the base m_value. This allows the methods // in base class to function properly. - virtual wxVariant DoGetValue() const; + virtual wxVariant DoGetValue() const wxOVERRIDE; virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const; - virtual void RefreshChildren(); - virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ); + wxVariant& childValue ) const wxOVERRIDE; + virtual void RefreshChildren() wxOVERRIDE; + virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) wxOVERRIDE; protected: // Value must be stored as variant - otherwise it will be @@ -59,8 +59,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const; - virtual void RefreshChildren(); + wxVariant& childValue ) const wxOVERRIDE; + virtual void RefreshChildren() wxOVERRIDE; protected: @@ -84,8 +84,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const; - virtual void RefreshChildren(); + wxVariant& childValue ) const wxOVERRIDE; + virtual void RefreshChildren() wxOVERRIDE; protected: @@ -115,13 +115,13 @@ public: virtual ~wxArrayDoubleProperty (); - virtual void OnSetValue(); - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const; + virtual void OnSetValue() wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const; - virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ); - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ); + int argFlags = 0 ) const wxOVERRIDE; + virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) wxOVERRIDE; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; // Generates cache for displayed text virtual void GenerateValueAsString ( wxString& target, int prec, bool removeZeroes ) const; diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index b83ca06806..17376bf417 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -63,7 +63,7 @@ public: { } - virtual wxColour GetColour( int index ) const + virtual wxColour GetColour( int index ) const wxOVERRIDE { switch (index) { @@ -89,7 +89,7 @@ public: virtual wxString ColourToString( const wxColour& col, int index, - int argFlags = 0 ) const + int argFlags = 0 ) const wxOVERRIDE { if ( index == (int)(m_choices.GetCount()-1) ) return wxT(""); @@ -97,7 +97,7 @@ public: return wxColourProperty::ColourToString(col, index, argFlags); } - virtual int GetCustomColourIndex() const + virtual int GetCustomColourIndex() const wxOVERRIDE { return m_choices.GetCount()-2; } diff --git a/samples/render/renddll.cpp b/samples/render/renddll.cpp index 5c0056fd6c..4379eae735 100644 --- a/samples/render/renddll.cpp +++ b/samples/render/renddll.cpp @@ -31,7 +31,7 @@ public: const wxRect& rect, int WXUNUSED(flags) = 0, wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* WXUNUSED(params) = NULL) + wxHeaderButtonParams* WXUNUSED(params) = NULL) wxOVERRIDE { dc.SetBrush(*wxCYAN_BRUSH); dc.SetTextForeground(*wxRED); @@ -41,7 +41,7 @@ public: return dc.GetTextExtent("MyDllRenderer").x; } - virtual wxRendererVersion GetVersion() const + virtual wxRendererVersion GetVersion() const wxOVERRIDE { return wxRendererVersion(wxRendererVersion::Current_Version, wxRendererVersion::Current_Age); diff --git a/samples/render/render.cpp b/samples/render/render.cpp index 1986e54b21..cc98898e60 100644 --- a/samples/render/render.cpp +++ b/samples/render/render.cpp @@ -66,7 +66,7 @@ public: int WXUNUSED(flags) = 0, wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) + wxHeaderButtonParams* params = NULL) wxOVERRIDE { wxDCBrushChanger setBrush(dc, *wxBLUE_BRUSH); wxDCTextColourChanger setFgCol(dc, *wxWHITE); @@ -86,7 +86,7 @@ public: // cases, but we show this here just for completeness) class MyTraits : public wxGUIAppTraits { - virtual wxRendererNative *CreateRenderer() + virtual wxRendererNative *CreateRenderer() wxOVERRIDE { // it will be deleted on program shutdown by wxWidgets itself return new MyRenderer; @@ -97,10 +97,10 @@ class MyTraits : public wxGUIAppTraits class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // if we want MyTraits to be used we must override CreateTraits() - virtual wxAppTraits *CreateTraits() { return new MyTraits; } + virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyTraits; } }; // Define a new frame type: this is going to be our main frame diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp index 44f8c2cb92..aad62aeba1 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -36,7 +36,7 @@ class MyApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; DECLARE_APP(MyApp) diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp index d4a07d266b..2eab427521 100644 --- a/samples/richtext/richtext.cpp +++ b/samples/richtext/richtext.cpp @@ -94,15 +94,15 @@ public: { } - virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const { return true; } - virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) + virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE { return true; } + virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) wxOVERRIDE { wxString label = GetLabel(); wxMessageBox(wxString::Format(wxT("Editing %s"), label.c_str())); return true; } - virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const + virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE { return GetLabel(); } @@ -117,7 +117,7 @@ public: { } - virtual bool UpdateField(wxRichTextBuffer* buffer, wxRichTextField* obj) + virtual bool UpdateField(wxRichTextBuffer* buffer, wxRichTextField* obj) wxOVERRIDE { if (buffer) { @@ -169,19 +169,19 @@ public: Prepares the content just before insertion (or after buffer reset). Called by the same function in wxRichTextBuffer. Currently is only called if undo mode is on. */ - virtual void PrepareContent(wxRichTextParagraphLayoutBox& container); + virtual void PrepareContent(wxRichTextParagraphLayoutBox& container) wxOVERRIDE; /** Can we delete this range? Sends an event to the control. */ - virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const; + virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const wxOVERRIDE; /** Can we insert content at this position? Sends an event to the control. */ - virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const; + virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const wxOVERRIDE; /** Finds a table, either selected or near the cursor @@ -207,8 +207,8 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; void CreateStyles(); @@ -314,7 +314,7 @@ public: protected: // Forward command events to the current rich text control, if any - bool ProcessEvent(wxEvent& event); + bool ProcessEvent(wxEvent& event) wxOVERRIDE; // Write text void WriteInitialText(); @@ -2211,37 +2211,37 @@ public: /** Returns @true if this object has virtual attributes that we can provide. */ - virtual bool HasVirtualAttributes(wxRichTextObject* obj) const; + virtual bool HasVirtualAttributes(wxRichTextObject* obj) const wxOVERRIDE; /** Provides virtual attributes that we can provide. */ - virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const; + virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const wxOVERRIDE; /** Gets the count for mixed virtual attributes for individual positions within the object. For example, individual characters within a text object may require special highlighting. */ - virtual int GetVirtualSubobjectAttributesCount(wxRichTextObject* WXUNUSED(obj)) const { return 0; } + virtual int GetVirtualSubobjectAttributesCount(wxRichTextObject* WXUNUSED(obj)) const wxOVERRIDE { return 0; } /** Gets the mixed virtual attributes for individual positions within the object. For example, individual characters within a text object may require special highlighting. Returns the number of virtual attributes found. */ - virtual int GetVirtualSubobjectAttributes(wxRichTextObject* WXUNUSED(obj), wxArrayInt& WXUNUSED(positions), wxRichTextAttrArray& WXUNUSED(attributes)) const { return 0; } + virtual int GetVirtualSubobjectAttributes(wxRichTextObject* WXUNUSED(obj), wxArrayInt& WXUNUSED(positions), wxRichTextAttrArray& WXUNUSED(attributes)) const wxOVERRIDE { return 0; } /** Do we have virtual text for this object? Virtual text allows an application to replace characters in an object for editing and display purposes, for example for highlighting special characters. */ - virtual bool HasVirtualText(const wxRichTextPlainText* WXUNUSED(obj)) const { return false; } + virtual bool HasVirtualText(const wxRichTextPlainText* WXUNUSED(obj)) const wxOVERRIDE { return false; } /** Gets the virtual text for this object. */ - virtual bool GetVirtualText(const wxRichTextPlainText* WXUNUSED(obj), wxString& WXUNUSED(text)) const { return false; } + virtual bool GetVirtualText(const wxRichTextPlainText* WXUNUSED(obj), wxString& WXUNUSED(text)) const wxOVERRIDE { return false; } wxColour m_lockBackgroundColour; }; diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h index fdb1085881..c62cd11cae 100644 --- a/samples/sashtest/sashtest.h +++ b/samples/sashtest/sashtest.h @@ -14,14 +14,14 @@ class MyApp: public wxApp { public: - bool OnInit(void); + bool OnInit(void) wxOVERRIDE; }; class MyCanvas: public wxScrolledWindow { public: MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size); - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; void OnEvent(wxMouseEvent& event); DECLARE_EVENT_TABLE() diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp index 0ad49f77bf..784a8a7bf4 100644 --- a/samples/scroll/scroll.cpp +++ b/samples/scroll/scroll.cpp @@ -294,7 +294,7 @@ public: // override the base class function so that when this window is scrolled, // the labels are scrolled in sync - virtual void ScrollWindow(int dx, int dy, const wxRect *rect) + virtual void ScrollWindow(int dx, int dy, const wxRect *rect) wxOVERRIDE { wxPanel::ScrollWindow( dx, dy, rect ); m_colLabels->ScrollWindow( dx, 0, rect ); @@ -402,7 +402,7 @@ public: protected: // scrolled windows which use scroll target different from the window // itself must override this virtual method - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE { // decrease the total size by the size of the non-scrollable parts // above/to the left of the canvas @@ -473,7 +473,7 @@ public: DoSyncIfNecessary(); } - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) + virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) wxOVERRIDE { wxScrolled::ScrollWindow(dx, dy, rect); @@ -523,7 +523,7 @@ public: SetScrollbars(0, m_hLine, 0, m_nLines + 1, 0, 0, true /* no refresh */); } - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; }; // this class does "smart" redrawing - only redraws the lines which must be @@ -542,7 +542,7 @@ public: SetVirtualSize( wxDefaultCoord, ( m_nLines + 1 ) * m_hLine ); } - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; }; // ---------------------------------------------------------------------------- @@ -567,7 +567,7 @@ public: private: // event handlers - void OnDraw(wxDC& dc); + void OnDraw(wxDC& dc) wxOVERRIDE; void OnMouseLeftDown(wxMouseEvent& event); void OnMouseLeftUp(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); @@ -639,7 +639,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp index cc357408ed..760070c93c 100644 --- a/samples/shaped/shaped.cpp +++ b/samples/shaped/shaped.cpp @@ -77,7 +77,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp index 35b249c2b4..f8098ea9c5 100644 --- a/samples/sockets/baseclient.cpp +++ b/samples/sockets/baseclient.cpp @@ -52,7 +52,7 @@ public: void setFailed() { m_isFailed = true; } bool isFailed() const { return m_isFailed; } - virtual wxEvent* Clone() const + virtual wxEvent* Clone() const wxOVERRIDE { return new WorkerEvent(*this); } @@ -94,11 +94,11 @@ private: wxString m_host; long m_stressWorkers; - virtual bool OnInit(); - virtual int OnRun(); - virtual int OnExit(); - void OnInitCmdLine(wxCmdLineParser& pParser); - bool OnCmdLineParsed(wxCmdLineParser& pParser); + virtual bool OnInit() wxOVERRIDE; + virtual int OnRun() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; + void OnInitCmdLine(wxCmdLineParser& pParser) wxOVERRIDE; + bool OnCmdLineParsed(wxCmdLineParser& pParser) wxOVERRIDE; void OnWorkerEvent(WorkerEvent& pEvent); void OnTimerEvent(wxTimerEvent& pEvent); @@ -127,7 +127,7 @@ class ThreadWorker : public wxThread { public: ThreadWorker(const wxString& p_host, char* p_buf, int p_size); - virtual ExitCode Entry(); + virtual ExitCode Entry() wxOVERRIDE; private: wxString m_host; wxSocketClient* m_clientSocket; diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp index 67e5ebc495..7506a84e9d 100644 --- a/samples/sockets/baseserver.cpp +++ b/samples/sockets/baseserver.cpp @@ -78,7 +78,7 @@ public: m_workerFailed = false; } - virtual wxEvent* Clone() const + virtual wxEvent* Clone() const wxOVERRIDE { return new WorkerEvent(*this); } @@ -112,11 +112,11 @@ private: EVENTS }; - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual int OnExit() wxOVERRIDE; - void OnInitCmdLine(wxCmdLineParser& pParser); - bool OnCmdLineParsed(wxCmdLineParser& pParser); + void OnInitCmdLine(wxCmdLineParser& pParser) wxOVERRIDE; + bool OnCmdLineParsed(wxCmdLineParser& pParser) wxOVERRIDE; void OnSocketEvent(wxSocketEvent& pEvent); void OnWorkerEvent(WorkerEvent& pEvent); @@ -168,7 +168,7 @@ class ThreadWorker : public wxThread, private WorkerBase { public: ThreadWorker(wxSocketBase* pSocket); - virtual ExitCode Entry(); + virtual ExitCode Entry() wxOVERRIDE; private: wxSocketBase* m_socket; diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index 23ccaafab3..17f452e958 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -50,7 +50,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp index 1f6835a0ae..bd5c501358 100644 --- a/samples/sockets/server.cpp +++ b/samples/sockets/server.cpp @@ -56,7 +56,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index 4d48d4d0d4..85bd2f77df 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -48,7 +48,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp index 2df96524b3..f24d430902 100644 --- a/samples/splash/splash.cpp +++ b/samples/splash/splash.cpp @@ -61,7 +61,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp index 4177990a17..91488d56ad 100644 --- a/samples/splitter/splitter.cpp +++ b/samples/splitter/splitter.cpp @@ -72,7 +72,7 @@ class MyApp: public wxApp public: MyApp() { } - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; wxDECLARE_NO_COPY_CLASS(MyApp); }; @@ -143,7 +143,7 @@ public: MyCanvas(wxWindow* parent, bool mirror); virtual ~MyCanvas(){}; - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; private: bool m_mirror; diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index ec12792ad7..2f39e1d008 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -81,7 +81,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // A custom status bar which contains controls, icons &c diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp index 7caa9473f7..c5e577fc5a 100644 --- a/samples/svg/svgtest.cpp +++ b/samples/svg/svgtest.cpp @@ -51,7 +51,7 @@ class MyCanvas; class MyApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; class MyFrame : public wxMDIParentFrame @@ -104,7 +104,7 @@ class MyCanvas : public wxScrolledWindow { public: MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size); - virtual void OnDraw(wxDC& dc); + virtual void OnDraw(wxDC& dc) wxOVERRIDE; private: int m_index; diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp index da546fe8e3..55fd15682a 100644 --- a/samples/taborder/taborder.cpp +++ b/samples/taborder/taborder.cpp @@ -78,7 +78,7 @@ enum class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // and the main sample window diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index 1d93a8df25..2125c94b1a 100644 --- a/samples/taskbar/tbtest.h +++ b/samples/taskbar/tbtest.h @@ -26,7 +26,7 @@ public: void OnMenuCheckmark(wxCommandEvent&); void OnMenuUICheckmark(wxUpdateUIEvent&); void OnMenuSub(wxCommandEvent&); - virtual wxMenu *CreatePopupMenu(); + virtual wxMenu *CreatePopupMenu() wxOVERRIDE; DECLARE_EVENT_TABLE() }; @@ -36,7 +36,7 @@ public: class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; class MyDialog: public wxDialog diff --git a/samples/text/text.cpp b/samples/text/text.cpp index f7733e57e5..05ad2d7e35 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -55,7 +55,7 @@ class MyApp: public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; // a text ctrl which allows to call different wxTextCtrl functions diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp index 0f0f7db0fd..da955816bf 100644 --- a/samples/thread/thread.cpp +++ b/samples/thread/thread.cpp @@ -68,7 +68,7 @@ public: MyApp(); virtual ~MyApp(){}; - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; // critical section protects access to all of the fields below wxCriticalSection m_critsect; @@ -102,7 +102,7 @@ public: protected: virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info); + const wxLogRecordInfo& info) wxOVERRIDE; private: // event handlers @@ -213,7 +213,7 @@ public: virtual ~MyThread(); // thread execution starts here - virtual void *Entry(); + virtual void *Entry() wxOVERRIDE; public: unsigned m_count; @@ -229,11 +229,11 @@ public: MyWorkerThread(MyFrame *frame); // thread execution starts here - virtual void *Entry(); + virtual void *Entry() wxOVERRIDE; // called when the thread exits - whether it terminates normally or is // stopped with Delete() (but not when it is Kill()ed!) - virtual void OnExit(); + virtual void OnExit() wxOVERRIDE; public: MyFrame *m_frame; @@ -256,7 +256,7 @@ public: m_dlg = dlg; } - virtual ExitCode Entry(); + virtual ExitCode Entry() wxOVERRIDE; private: MyImageDialog *m_dlg; diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 81698c35f0..14639ce1f3 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -86,7 +86,7 @@ enum Positions class MyApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; // Define a new frame diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h index 61fac9dacf..99ffac0ad7 100644 --- a/samples/treectrl/treetest.h +++ b/samples/treectrl/treetest.h @@ -24,7 +24,7 @@ class MyApp : public wxApp public: MyApp() { m_showImages = true; m_showStates = true; m_showButtons = false; } - bool OnInit(); + bool OnInit() wxOVERRIDE; void SetShowImages(bool show) { m_showImages = show; } bool ShowImages() const { return m_showImages; } @@ -128,7 +128,7 @@ public: } protected: - virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2); + virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2) wxOVERRIDE; // is this the test item which we use in several event handlers? bool IsTestItem(const wxTreeItemId& item) diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp index 32f94862a7..e42d1b782d 100644 --- a/samples/treelist/treelist.cpp +++ b/samples/treelist/treelist.cpp @@ -95,7 +95,7 @@ public: Compare(wxTreeListCtrl* treelist, unsigned column, wxTreeListItem item1, - wxTreeListItem item2) + wxTreeListItem item2) wxOVERRIDE { wxString text1 = treelist->GetItemText(item1, column), text2 = treelist->GetItemText(item2, column); @@ -162,7 +162,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // ---------------------------------------------------------------------------- diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h index 67a828f5dc..b9a87bc776 100644 --- a/samples/typetest/typetest.h +++ b/samples/typetest/typetest.h @@ -17,8 +17,8 @@ class MyApp: public wxApp public: MyApp() { m_textCtrl = NULL; m_mimeDatabase = NULL; } - bool OnInit(); - int OnExit() { delete m_mimeDatabase; return wxApp::OnExit(); } + bool OnInit() wxOVERRIDE; + int OnExit() wxOVERRIDE { delete m_mimeDatabase; return wxApp::OnExit(); } void DoVariantDemo(wxCommandEvent& event); void DoByteOrderDemo(wxCommandEvent& event); diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp index 56e477c153..5b2da97a31 100644 --- a/samples/uiaction/uiaction.cpp +++ b/samples/uiaction/uiaction.cpp @@ -63,7 +63,7 @@ enum class MyApp : public wxApp { public: - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; #if wxUSE_UIACTIONSIMULATOR diff --git a/samples/validate/validate.h b/samples/validate/validate.h index b651318307..c15f1d3abb 100644 --- a/samples/validate/validate.h +++ b/samples/validate/validate.h @@ -20,7 +20,7 @@ class MyApp : public wxApp { public: - bool OnInit(); + bool OnInit() wxOVERRIDE; }; // Define a new frame type @@ -48,7 +48,7 @@ public: const wxSize& size = wxDefaultSize, const long style = wxDEFAULT_DIALOG_STYLE); - bool TransferDataToWindow(); + bool TransferDataToWindow() wxOVERRIDE; wxTextCtrl *m_text; wxComboBox *m_combobox; @@ -88,14 +88,14 @@ public: MyComboBoxValidator(const MyComboBoxValidator& tocopy) { m_var=tocopy.m_var; } MyComboBoxValidator(wxString* var) { m_var=var; } - virtual bool Validate(wxWindow* parent); - virtual wxObject* Clone() const { return new MyComboBoxValidator(*this); } + virtual bool Validate(wxWindow* parent) wxOVERRIDE; + virtual wxObject* Clone() const wxOVERRIDE { return new MyComboBoxValidator(*this); } // Called to transfer data to the window - virtual bool TransferToWindow(); + virtual bool TransferToWindow() wxOVERRIDE; // Called to transfer data from the window - virtual bool TransferFromWindow(); + virtual bool TransferFromWindow() wxOVERRIDE; protected: wxString* m_var; diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp index 0edf14cbe6..25a89dae0b 100644 --- a/samples/vscroll/vstest.cpp +++ b/samples/vscroll/vstest.cpp @@ -58,7 +58,7 @@ class VarScrollApp : public wxApp { public: // create our main window - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame @@ -170,7 +170,7 @@ public: event.Skip(); } - virtual wxCoord OnGetRowHeight(size_t n) const + virtual wxCoord OnGetRowHeight(size_t n) const wxOVERRIDE { wxASSERT( n < GetRowCount() ); @@ -267,7 +267,7 @@ public: event.Skip(); } - virtual wxCoord OnGetColumnWidth(size_t n) const + virtual wxCoord OnGetColumnWidth(size_t n) const wxOVERRIDE { wxASSERT( n < GetColumnCount() ); @@ -388,14 +388,14 @@ public: event.Skip(); } - virtual wxCoord OnGetRowHeight(size_t n) const + virtual wxCoord OnGetRowHeight(size_t n) const wxOVERRIDE { wxASSERT( n < GetRowCount() ); return m_heights[n]; } - virtual wxCoord OnGetColumnWidth(size_t n) const + virtual wxCoord OnGetColumnWidth(size_t n) const wxOVERRIDE { wxASSERT( n < GetColumnCount() ); diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index 8911f6b513..2a3ff50786 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -67,10 +67,10 @@ public: { } - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; #if wxUSE_CMDLINE_PARSER - virtual void OnInitCmdLine(wxCmdLineParser& parser) + virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE { wxApp::OnInitCmdLine(parser); @@ -79,7 +79,7 @@ public: wxCMD_LINE_PARAM_OPTIONAL); } - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE { if ( !wxApp::OnCmdLineParsed(parser) ) return false; diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index f1d0dbfa26..98b75436ed 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -103,12 +103,12 @@ class BitmapComboBoxWidgetsPage : public ItemContainerWidgetsPage public: BitmapComboBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxControl *GetWidget() const { return m_combobox; } - virtual wxItemContainer* GetContainer() const { return m_combobox; } - virtual void RecreateWidget() { CreateCombo(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; } + virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; } + virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index ac100e2b5a..09194abb26 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -91,11 +91,11 @@ public: ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~ButtonWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_button; } - virtual void RecreateWidget() { CreateButton(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_button; } + virtual void RecreateWidget() wxOVERRIDE { CreateButton(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp index 6dad1ec2f0..215b38dee3 100644 --- a/samples/widgets/checkbox.cpp +++ b/samples/widgets/checkbox.cpp @@ -75,11 +75,11 @@ public: CheckBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~CheckBoxWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_checkbox; } - virtual void RecreateWidget() { CreateCheckbox(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_checkbox; } + virtual void RecreateWidget() wxOVERRIDE { CreateCheckbox(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/choice.cpp b/samples/widgets/choice.cpp index 033a617fce..5f12b34452 100644 --- a/samples/widgets/choice.cpp +++ b/samples/widgets/choice.cpp @@ -77,12 +77,12 @@ class ChoiceWidgetsPage : public ItemContainerWidgetsPage public: ChoiceWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxControl *GetWidget() const { return m_choice; } - virtual wxItemContainer* GetContainer() const { return m_choice; } - virtual void RecreateWidget() { CreateChoice(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_choice; } + virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_choice; } + virtual void RecreateWidget() wxOVERRIDE { CreateChoice(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp index 39a91f109b..6ab26705be 100644 --- a/samples/widgets/clrpicker.cpp +++ b/samples/widgets/clrpicker.cpp @@ -65,11 +65,11 @@ public: ColourPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~ColourPickerWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_clrPicker; } - virtual void RecreateWidget() { RecreatePicker(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_clrPicker; } + virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp index 51c0969e1f..0096095238 100644 --- a/samples/widgets/combobox.cpp +++ b/samples/widgets/combobox.cpp @@ -94,13 +94,13 @@ class ComboboxWidgetsPage : public ItemContainerWidgetsPage public: ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxControl *GetWidget() const { return m_combobox; } - virtual wxTextEntryBase *GetTextEntry() const { return m_combobox; } - virtual wxItemContainer* GetContainer() const { return m_combobox; } - virtual void RecreateWidget() { CreateCombo(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; } + virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_combobox; } + virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; } + virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp index ab51827524..16844fb0bd 100644 --- a/samples/widgets/datepick.cpp +++ b/samples/widgets/datepick.cpp @@ -70,11 +70,11 @@ public: DatePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~DatePickerWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_datePicker; } - virtual void RecreateWidget() { CreateDatePicker(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_datePicker; } + virtual void RecreateWidget() wxOVERRIDE { CreateDatePicker(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/dirctrl.cpp b/samples/widgets/dirctrl.cpp index b40c47e2e7..037d739203 100644 --- a/samples/widgets/dirctrl.cpp +++ b/samples/widgets/dirctrl.cpp @@ -98,11 +98,11 @@ public: DirCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~DirCtrlWidgetsPage() {} - virtual wxControl *GetWidget() const { return m_dirCtrl; } - virtual void RecreateWidget() { CreateDirCtrl(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_dirCtrl; } + virtual void RecreateWidget() wxOVERRIDE { CreateDirCtrl(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp index 598c87560e..efda3b7338 100644 --- a/samples/widgets/dirpicker.cpp +++ b/samples/widgets/dirpicker.cpp @@ -67,11 +67,11 @@ public: DirPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~DirPickerWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_dirPicker; } - virtual void RecreateWidget() { RecreatePicker(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_dirPicker; } + virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: diff --git a/samples/widgets/editlbox.cpp b/samples/widgets/editlbox.cpp index fb0416f27d..51e6dd88d8 100644 --- a/samples/widgets/editlbox.cpp +++ b/samples/widgets/editlbox.cpp @@ -69,11 +69,11 @@ class EditableListboxWidgetsPage : public WidgetsPage public: EditableListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxControl *GetWidget() const { return m_lbox->GetListCtrl(); } - virtual void RecreateWidget() { CreateLbox(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_lbox->GetListCtrl(); } + virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/filectrl.cpp b/samples/widgets/filectrl.cpp index b77b328ff9..f775c02402 100644 --- a/samples/widgets/filectrl.cpp +++ b/samples/widgets/filectrl.cpp @@ -70,11 +70,11 @@ public: FileCtrlWidgetsPage( WidgetsBookCtrl *book, wxImageList *imaglist ); virtual ~FileCtrlWidgetsPage() {} - virtual wxControl *GetWidget() const { return m_fileCtrl; } - virtual void RecreateWidget() { CreateFileCtrl(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_fileCtrl; } + virtual void RecreateWidget() wxOVERRIDE { CreateFileCtrl(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp index 9d843c505a..78e50f1bd7 100644 --- a/samples/widgets/filepicker.cpp +++ b/samples/widgets/filepicker.cpp @@ -74,11 +74,11 @@ public: FilePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~FilePickerWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_filePicker; } - virtual void RecreateWidget() { RecreatePicker(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_filePicker; } + virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp index c4f710e241..3750e92553 100644 --- a/samples/widgets/fontpicker.cpp +++ b/samples/widgets/fontpicker.cpp @@ -65,11 +65,11 @@ public: FontPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~FontPickerWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_fontPicker; } - virtual void RecreateWidget() { RecreatePicker(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_fontPicker; } + virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp index 30501c3078..770f8c2997 100644 --- a/samples/widgets/gauge.cpp +++ b/samples/widgets/gauge.cpp @@ -75,11 +75,11 @@ public: GaugeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~GaugeWidgetsPage(); - virtual wxControl *GetWidget() const { return m_gauge; } - virtual void RecreateWidget() { CreateGauge(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_gauge; } + virtual void RecreateWidget() wxOVERRIDE { CreateGauge(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/hyperlnk.cpp b/samples/widgets/hyperlnk.cpp index 3e18b01adf..e445ea42d4 100644 --- a/samples/widgets/hyperlnk.cpp +++ b/samples/widgets/hyperlnk.cpp @@ -79,11 +79,11 @@ public: HyperlinkWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~HyperlinkWidgetsPage() {} - virtual wxControl *GetWidget() const { return m_hyperlink; } - virtual void RecreateWidget() { CreateHyperlink(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_hyperlink; } + virtual void RecreateWidget() wxOVERRIDE { CreateHyperlink(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp index 615b8f4ccd..89c95e54ae 100644 --- a/samples/widgets/listbox.cpp +++ b/samples/widgets/listbox.cpp @@ -81,12 +81,12 @@ class ListboxWidgetsPage : public ItemContainerWidgetsPage public: ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxControl *GetWidget() const { return m_lbox; } - virtual wxItemContainer* GetContainer() const { return m_lbox; } - virtual void RecreateWidget() { CreateLbox(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_lbox; } + virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_lbox; } + virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 0a5d282103..8b8313b638 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -88,11 +88,11 @@ public: BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]); virtual ~BookWidgetsPage(); - virtual wxControl *GetWidget() const { return m_book; } - virtual void RecreateWidget() { RecreateBook(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_book; } + virtual void RecreateWidget() wxOVERRIDE { RecreateBook(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers @@ -560,7 +560,7 @@ protected: void OnPageChanged(wxNotebookEvent& event); // (re)create book - virtual wxBookCtrlBase *CreateBook(long flags) + virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE { return new wxNotebook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, @@ -641,7 +641,7 @@ protected: void OnPageChanged(wxListbookEvent& event); // (re)create book - virtual wxBookCtrlBase *CreateBook(long flags) + virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE { return new wxListbook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, @@ -714,7 +714,7 @@ protected: void OnPageChanged(wxChoicebookEvent& event); // (re)create book - virtual wxBookCtrlBase *CreateBook(long flags) + virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE { return new wxChoicebook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp index 0fd552fbe1..2a5828b116 100644 --- a/samples/widgets/odcombobox.cpp +++ b/samples/widgets/odcombobox.cpp @@ -90,14 +90,14 @@ class ODComboboxWidgetsPage : public ItemContainerWidgetsPage public: ODComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxControl *GetWidget() const { return m_combobox; } - virtual wxTextEntryBase *GetTextEntry() const + virtual wxControl *GetWidget() const wxOVERRIDE { return m_combobox; } + virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_combobox ? m_combobox->GetTextCtrl() : NULL; } - virtual wxItemContainer* GetContainer() const { return m_combobox; } - virtual void RecreateWidget() { CreateCombo(); } + virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; } + virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers @@ -242,7 +242,7 @@ public: virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, - int WXUNUSED(flags)) const + int WXUNUSED(flags)) const wxOVERRIDE { if ( item == wxNOT_FOUND ) return; @@ -268,7 +268,7 @@ public: } virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, - int item, int flags ) const + int item, int flags ) const wxOVERRIDE { // If item is selected or even, or we are painting the @@ -287,12 +287,12 @@ public: dc.DrawRectangle(rect); } - virtual wxCoord OnMeasureItem(size_t WXUNUSED(item)) const + virtual wxCoord OnMeasureItem(size_t WXUNUSED(item)) const wxOVERRIDE { return 48; } - virtual wxCoord OnMeasureItemWidth(size_t WXUNUSED(item)) const + virtual wxCoord OnMeasureItemWidth(size_t WXUNUSED(item)) const wxOVERRIDE { return -1; // default - will be measured from text width } diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp index c60d77f7fa..c50daf4c81 100644 --- a/samples/widgets/radiobox.cpp +++ b/samples/widgets/radiobox.cpp @@ -85,11 +85,11 @@ public: RadioWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~RadioWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_radio; } - virtual void RecreateWidget() { CreateRadio(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_radio; } + virtual void RecreateWidget() wxOVERRIDE { CreateRadio(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp index 3273920479..9ca69d5392 100644 --- a/samples/widgets/searchctrl.cpp +++ b/samples/widgets/searchctrl.cpp @@ -70,12 +70,12 @@ public: SearchCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~SearchCtrlWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_srchCtrl; } - virtual wxTextEntryBase *GetTextEntry() const { return m_srchCtrl; } - virtual void RecreateWidget(); + virtual wxControl *GetWidget() const wxOVERRIDE { return m_srchCtrl; } + virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_srchCtrl; } + virtual void RecreateWidget() wxOVERRIDE; // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index c16c6fd353..e382e977de 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -96,11 +96,11 @@ public: SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~SliderWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_slider; } - virtual void RecreateWidget() { CreateSlider(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_slider; } + virtual void RecreateWidget() wxOVERRIDE { CreateSlider(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp index 6ac58d60bb..18bfcc34cb 100644 --- a/samples/widgets/spinbtn.cpp +++ b/samples/widgets/spinbtn.cpp @@ -86,8 +86,8 @@ public: SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~SpinBtnWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_spinbtn; } - virtual Widgets GetWidgets() const + virtual wxControl *GetWidget() const wxOVERRIDE { return m_spinbtn; } + virtual Widgets GetWidgets() const wxOVERRIDE { Widgets widgets(WidgetsPage::GetWidgets()); widgets.push_back(m_spinctrl); @@ -95,10 +95,10 @@ public: return widgets; } - virtual void RecreateWidget() { CreateSpin(); } + virtual void RecreateWidget() wxOVERRIDE { CreateSpin(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp index d4b155ce95..f3474b1472 100644 --- a/samples/widgets/statbmp.cpp +++ b/samples/widgets/statbmp.cpp @@ -51,9 +51,9 @@ public: StatBmpWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) : WidgetsPage(book, imaglist, statbmp_xpm) {} - virtual void CreateContent(); - virtual wxControl *GetWidget() const { return m_statbmp; } - virtual void RecreateWidget(); + virtual void CreateContent() wxOVERRIDE; + virtual wxControl *GetWidget() const wxOVERRIDE { return m_statbmp; } + virtual void RecreateWidget() wxOVERRIDE; private: void OnFileChange(wxFileDirPickerEvent &WXUNUSED(ev)) { RecreateWidget(); } diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp index 9acf45b871..0c1c8318ca 100644 --- a/samples/widgets/static.cpp +++ b/samples/widgets/static.cpp @@ -93,8 +93,8 @@ public: StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~StaticWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_statText; } - virtual Widgets GetWidgets() const + virtual wxControl *GetWidget() const wxOVERRIDE { return m_statText; } + virtual Widgets GetWidgets() const wxOVERRIDE { Widgets widgets; widgets.push_back(m_sizerStatBox->GetStaticBox()); @@ -108,10 +108,10 @@ public: return widgets; } - virtual void RecreateWidget() { CreateStatic(); } + virtual void RecreateWidget() wxOVERRIDE { CreateStatic(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp index 2d561458fa..d19ab8df71 100644 --- a/samples/widgets/textctrl.cpp +++ b/samples/widgets/textctrl.cpp @@ -138,12 +138,12 @@ public: TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~TextWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_text; } - virtual wxTextEntryBase *GetTextEntry() const { return m_text; } - virtual void RecreateWidget() { CreateText(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_text; } + virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_text; } + virtual void RecreateWidget() wxOVERRIDE { CreateText(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // create an info text contorl diff --git a/samples/widgets/timepick.cpp b/samples/widgets/timepick.cpp index 8086b59574..0982c821db 100644 --- a/samples/widgets/timepick.cpp +++ b/samples/widgets/timepick.cpp @@ -66,11 +66,11 @@ public: TimePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~TimePickerWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_timePicker; } - virtual void RecreateWidget() { CreateTimePicker(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_timePicker; } + virtual void RecreateWidget() wxOVERRIDE { CreateTimePicker(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp index 1179bf88ee..07ba3b6863 100644 --- a/samples/widgets/toggle.cpp +++ b/samples/widgets/toggle.cpp @@ -89,11 +89,11 @@ public: ToggleWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~ToggleWidgetsPage(){}; - virtual wxControl *GetWidget() const { return m_toggle; } - virtual void RecreateWidget() { CreateToggle(); } + virtual wxControl *GetWidget() const wxOVERRIDE { return m_toggle; } + virtual void RecreateWidget() wxOVERRIDE { CreateToggle(); } // lazy creation of the content - virtual void CreateContent(); + virtual void CreateContent() wxOVERRIDE; protected: // event handlers diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 23f5cafda4..33375a57e0 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -136,7 +136,7 @@ public: // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; // Define a new frame type: this is going to be our main frame @@ -240,7 +240,7 @@ public: private: // implement sink functions - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE { if ( level == wxLOG_Trace ) { @@ -1053,7 +1053,7 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event)) class CustomTextCompleter : public wxTextCompleterSimple { public: - virtual void GetCompletions(const wxString& prefix, wxArrayString& res) + virtual void GetCompletions(const wxString& prefix, wxArrayString& res) wxOVERRIDE { // This is used for illustrative purposes only and shows how many // completions we return every time when we're called. diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp index 10cd458de1..e43705e600 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -72,7 +72,7 @@ class MyApp : public wxApp { public: // override base class virtuals - virtual bool OnInit(); + virtual bool OnInit() wxOVERRIDE; }; class MyFrame : public wxFrame @@ -148,7 +148,7 @@ public: SetSizerAndFit(mainSizer); } - virtual bool TransferDataFromWindow() + virtual bool TransferDataFromWindow() wxOVERRIDE { if ( !m_checkbox->GetValue() ) { @@ -315,8 +315,8 @@ public: } // implement wxWizardPage functions - virtual wxWizardPage *GetPrev() const { return m_prev; } - virtual wxWizardPage *GetNext() const + virtual wxWizardPage *GetPrev() const wxOVERRIDE { return m_prev; } + virtual wxWizardPage *GetNext() const wxOVERRIDE { return m_checkbox->GetValue() ? m_next->GetNext() : m_next; } diff --git a/samples/wrapsizer/wrapsizer.cpp b/samples/wrapsizer/wrapsizer.cpp index 1079528b44..d4512ae45f 100644 --- a/samples/wrapsizer/wrapsizer.cpp +++ b/samples/wrapsizer/wrapsizer.cpp @@ -73,7 +73,7 @@ class WrapSizerApp : public wxApp public: WrapSizerApp() {} - virtual bool OnInit() + virtual bool OnInit() wxOVERRIDE { new WrapSizerFrame; return true; diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 55451ccad8..8f923653c1 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -273,7 +273,7 @@ public: gtk_widget_modify_bg( m_widget, GTK_STATE_NORMAL, &col ); } - bool SetTransparent(wxByte WXUNUSED(alpha)) + bool SetTransparent(wxByte WXUNUSED(alpha)) wxOVERRIDE { return true; } @@ -281,7 +281,7 @@ public: protected: virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH) + int incW, int incH) wxOVERRIDE { // the real wxFrame method doesn't work for us because we're not really // a top level window so skip it diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp index a10ca6499f..a8e75c506c 100644 --- a/src/common/cairo.cpp +++ b/src/common/cairo.cpp @@ -414,8 +414,8 @@ class wxCairoModule : public wxModule { public: wxCairoModule() { } - virtual bool OnInit(); - virtual void OnExit(); + virtual bool OnInit() wxOVERRIDE; + virtual void OnExit() wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxCairoModule) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index e3eed96c22..9af585a988 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -2138,7 +2138,7 @@ public: virtual size_t GetMBNulLen() const wxOVERRIDE; #if wxUSE_UNICODE_UTF8 - virtual bool IsUTF8() const; + virtual bool IsUTF8() const wxOVERRIDE; #endif virtual wxMBConv *Clone() const wxOVERRIDE diff --git a/src/common/strvararg.cpp b/src/common/strvararg.cpp index 112018a507..1ec3d06690 100644 --- a/src/common/strvararg.cpp +++ b/src/common/strvararg.cpp @@ -441,7 +441,7 @@ class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase { virtual void HandleString(CharType WXUNUSED(conv), SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) + CharType& outConv, SizeModifier& outSize) wxOVERRIDE { outConv = 's'; outSize = Size_Default; @@ -449,7 +449,7 @@ class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase virtual void HandleChar(CharType WXUNUSED(conv), SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) + CharType& outConv, SizeModifier& outSize) wxOVERRIDE { // chars are represented using wchar_t in both builds, so this is // the same as above diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index addcca0f1f..f44ca3ff68 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -41,9 +41,9 @@ class wxGTK2ArtProvider : public wxArtProvider { protected: virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size); + const wxSize& size) wxOVERRIDE; virtual wxIconBundle CreateIconBundle(const wxArtID& id, - const wxArtClient& client); + const wxArtClient& client) wxOVERRIDE; }; /*static*/ void wxArtProvider::InitNativeProvider() diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index f81e7104a8..bf8a971907 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -331,7 +331,7 @@ public: wxBitmapRefData(int width, int height, int depth); virtual ~wxBitmapRefData(); - virtual bool IsOk() const; + virtual bool IsOk() const wxOVERRIDE; #ifdef __WXGTK3__ GdkPixbuf* m_pixbufMask; diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 7b5436e5f2..c7faabc933 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -32,7 +32,7 @@ public: wxCursorRefData(); virtual ~wxCursorRefData(); - virtual bool IsOk() const { return m_cursor != NULL; } + virtual bool IsOk() const wxOVERRIDE { return m_cursor != NULL; } GdkCursor *m_cursor; diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 9a3960797d..d7862576df 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -432,7 +432,7 @@ public: void SetURL(const wxString& url) { m_url = url; } - virtual size_t GetDataSize() const + virtual size_t GetDataSize() const wxOVERRIDE { // It is not totally clear whether we should include "\r\n" at the end // of the string if there is only one URL or not, but not doing it @@ -440,7 +440,7 @@ public: return strlen(m_url.utf8_str()) + 1; } - virtual bool GetDataHere(void *buf) const + virtual bool GetDataHere(void *buf) const wxOVERRIDE { char* const dst = static_cast(buf); @@ -449,7 +449,7 @@ public: return true; } - virtual bool SetData(size_t len, const void *buf) + virtual bool SetData(size_t len, const void *buf) wxOVERRIDE { const char* const src = static_cast(buf); @@ -469,15 +469,15 @@ public: } // 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/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 30a66dc67c..9373a2f0af 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -1563,14 +1563,14 @@ public: wxGtkDataViewModelNotifier( wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal ); ~wxGtkDataViewModelNotifier(); - virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); - virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); - virtual bool ItemChanged( const wxDataViewItem &item ); - virtual bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ); - virtual bool Cleared(); - virtual void Resort(); - virtual bool BeforeReset(); - virtual bool AfterReset(); + virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE; + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE; + virtual bool ItemChanged( const wxDataViewItem &item ) wxOVERRIDE; + virtual bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ) wxOVERRIDE; + virtual bool Cleared() wxOVERRIDE; + virtual void Resort() wxOVERRIDE; + virtual bool BeforeReset() wxOVERRIDE; + virtual bool AfterReset() wxOVERRIDE; void UpdateLastCount(); diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 2c4a716964..4e11a4fb5b 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -2108,8 +2108,8 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *win ) class wxDCModule : public wxModule { public: - bool OnInit(); - void OnExit(); + bool OnInit() wxOVERRIDE; + void OnExit() wxOVERRIDE; private: DECLARE_DYNAMIC_CLASS(wxDCModule) diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index 6be2d7ac40..375fad539e 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -149,7 +149,7 @@ class wxGUIEventLoopSourcesManager : public wxEventLoopSourcesManagerBase { public: virtual wxEventLoopSource* - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) + AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) wxOVERRIDE { wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" ); diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp index 2bd4cb9938..b23a76a0a1 100644 --- a/src/gtk/nonownedwnd.cpp +++ b/src/gtk/nonownedwnd.cpp @@ -89,10 +89,10 @@ public: { } - virtual bool CanBeDeleted() const { return true; } + virtual bool CanBeDeleted() const wxOVERRIDE { return true; } private: - virtual bool DoSetShape(GdkWindow* window) + virtual bool DoSetShape(GdkWindow* window) wxOVERRIDE { gdk_window_shape_combine_region(window, NULL, 0, 0); @@ -110,10 +110,10 @@ public: { } - virtual bool CanBeDeleted() const { return true; } + virtual bool CanBeDeleted() const wxOVERRIDE { return true; } private: - virtual bool DoSetShape(GdkWindow* window) + virtual bool DoSetShape(GdkWindow* window) wxOVERRIDE { gdk_window_shape_combine_region(window, m_region.GetRegion(), 0, 0); @@ -157,7 +157,7 @@ public: // Currently we always return false from here, if drawing the border // becomes optional, we could return true if we don't need to draw it. - virtual bool CanBeDeleted() const { return false; } + virtual bool CanBeDeleted() const wxOVERRIDE { return false; } private: wxBitmap CreateShapeBitmap(const wxGraphicsPath& path) @@ -185,7 +185,7 @@ private: return bmp; } - virtual bool DoSetShape(GdkWindow *window) + virtual bool DoSetShape(GdkWindow *window) wxOVERRIDE { if (!m_mask) return false; diff --git a/src/gtk/notifmsg.cpp b/src/gtk/notifmsg.cpp index 20bc1884ba..63670ee2a5 100644 --- a/src/gtk/notifmsg.cpp +++ b/src/gtk/notifmsg.cpp @@ -48,13 +48,13 @@ class wxLibnotifyModule : public wxModule { public: - virtual bool OnInit() + virtual bool OnInit() wxOVERRIDE { // We're initialized on demand. return true; } - virtual void OnExit() + virtual void OnExit() wxOVERRIDE { if ( notify_is_initted() ) notify_uninit(); diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index f2ea462dca..19c0be9017 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -68,8 +68,8 @@ public: wxGtkPrintModule() { } - bool OnInit(); - void OnExit() {} + bool OnInit() wxOVERRIDE; + void OnExit() wxOVERRIDE {} private: DECLARE_DYNAMIC_CLASS(wxGtkPrintModule) diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp index 4cf519ee87..594f6f7186 100644 --- a/src/gtk/private.cpp +++ b/src/gtk/private.cpp @@ -262,12 +262,12 @@ GtkWidget *GetTreeWidget() class WidgetsCleanupModule : public wxModule { public: - virtual bool OnInit() + virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() + virtual void OnExit() wxOVERRIDE { if ( gs_container ) { diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 98969dd3e5..93d660ff80 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -54,80 +54,80 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL); + wxHeaderButtonParams* params = NULL) wxOVERRIDE; - virtual int GetHeaderButtonHeight(wxWindow *win); + virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE; - virtual int GetHeaderButtonMargin(wxWindow *win); + virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE; // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawDropArrow(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) wxOVERRIDE; virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0); + int flags=0) wxOVERRIDE; virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0); + int flags=0) wxOVERRIDE; virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0); + int flags=0) wxOVERRIDE; virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0); + int flags=0) wxOVERRIDE; - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0); + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; - virtual wxSize GetCheckBoxSize(wxWindow *win); + virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE; - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; }; // ============================================================================ diff --git a/src/gtk/sockgtk.cpp b/src/gtk/sockgtk.cpp index 85d56c3a71..834c85d383 100644 --- a/src/gtk/sockgtk.cpp +++ b/src/gtk/sockgtk.cpp @@ -44,7 +44,7 @@ static gboolean wxSocket_Input(GIOChannel*, GIOCondition condition, gpointer dat class GTKFDIOManager : public wxFDIOManager { public: - virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) + virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE { GIOChannel* channel = g_io_channel_unix_new(fd); unsigned id = g_io_add_watch( @@ -57,7 +57,7 @@ public: } virtual void - RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d)) + RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d)) wxOVERRIDE { g_source_remove(fd); } diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 34a16108a3..45b8624edb 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -259,7 +259,7 @@ public: StackDump(GtkAssertDialog *dlg) { m_dlg=dlg; } protected: - virtual void OnStackFrame(const wxStackFrame& frame) + virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE { wxString fncname = frame.GetName(); diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index c5f8edd1c4..b17b2f98d9 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -78,7 +78,7 @@ public: to call this function and check its result before calling any other wxDialUpManager methods. */ - virtual bool IsOk() const + virtual bool IsOk() const wxOVERRIDE { return true; } /** The simplest way to initiate a dial up: this function dials the given @@ -92,39 +92,39 @@ public: virtual bool Dial(const wxString& nameOfISP, const wxString& WXUNUSED(username), const wxString& WXUNUSED(password), - bool async); + bool async) wxOVERRIDE; // Hang up the currently active dial up connection. - virtual bool HangUp(); + virtual bool HangUp() wxOVERRIDE; // returns true if the computer is connected to the network: under Windows, // this just means that a RAS connection exists, under Unix we check that // the "well-known host" (as specified by SetWellKnownHost) is reachable - virtual bool IsOnline() const + virtual bool IsOnline() const wxOVERRIDE { CheckStatus(); return m_IsOnline == Net_Connected; } // do we have a constant net connection? - virtual bool IsAlwaysOnline() const; + virtual bool IsAlwaysOnline() const wxOVERRIDE; // returns true if (async) dialing is in progress - virtual bool IsDialing() const + virtual bool IsDialing() const wxOVERRIDE { return m_DialProcess != NULL; } // cancel dialing the number initiated with Dial(async = true) // NB: this won't result in DISCONNECTED event being sent - virtual bool CancelDialing(); + virtual bool CancelDialing() wxOVERRIDE; - size_t GetISPNames(class wxArrayString &) const + size_t GetISPNames(class wxArrayString &) const wxOVERRIDE { return 0; } // sometimes the built-in logic for determining the online status may fail, // so, in general, the user should be allowed to override it. This function // allows to forcefully set the online status - whatever our internal // algorithm may think about it. - virtual void SetOnlineStatus(bool isOnline = true) + virtual void SetOnlineStatus(bool isOnline = true) wxOVERRIDE { m_IsOnline = isOnline ? Net_Connected : Net_No; } // set misc wxDialUpManager options @@ -137,21 +137,21 @@ public: // instantenous. // // Returns false if couldn't set up automatic check for online status. - virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds); + virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds) wxOVERRIDE; // disable automatic check for connection status change - notice that the // wxEVT_DIALUP_XXX events won't be sent any more neither. - virtual void DisableAutoCheckOnlineStatus(); + virtual void DisableAutoCheckOnlineStatus() wxOVERRIDE; // under Unix, the value of well-known host is used to check whether we're // connected to the internet. It's unused under Windows, but this function // is always safe to call. The default value is www.yahoo.com. virtual void SetWellKnownHost(const wxString& hostname, - int portno = 80); + int portno = 80) wxOVERRIDE; /** Sets the commands to start up the network and to hang up again. Used by the Unix implementations only. */ - virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd) + virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd) wxOVERRIDE { m_ConnectCommand = command; m_HangUpCommand = hupcmd; } //private: -- Sun CC 4.2 objects to using NetConnection enum as the return @@ -246,7 +246,7 @@ public: m_dupman = dupman; } - virtual void Notify() + virtual void Notify() wxOVERRIDE { wxLogTrace(wxT("dialup"), wxT("Checking dial up network status.")); @@ -265,7 +265,7 @@ public: m_DupMan = dupman; } void Disconnect() { m_DupMan = NULL; } - virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) + virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) wxOVERRIDE { if(m_DupMan) { diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 51f1335d19..84f0d8b6dd 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -143,8 +143,8 @@ public: { } - virtual wxRect GetGeometry() const { return m_rect; } - virtual wxRect GetClientArea() const + virtual wxRect GetGeometry() const wxOVERRIDE { return m_rect; } + virtual wxRect GetClientArea() const wxOVERRIDE { // we intentionally don't cache the result here because the client // display area may change (e.g. the user resized or hid a panel) and @@ -152,11 +152,11 @@ public: return IsPrimary() ? wxGetClientDisplayRect() : m_rect; } - virtual wxString GetName() const { return wxString(); } + virtual wxString GetName() const wxOVERRIDE { return wxString(); } - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; - virtual wxVideoMode GetCurrentMode() const; - virtual bool ChangeMode(const wxVideoMode& mode); + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; + virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; + virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; private: wxRect m_rect; @@ -170,9 +170,9 @@ class wxDisplayFactoryX11 : public wxDisplayFactory public: wxDisplayFactoryX11() { } - virtual wxDisplayImpl *CreateDisplay(unsigned n); - virtual unsigned GetCount(); - virtual int GetFromPoint(const wxPoint& pt); + virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; + virtual unsigned GetCount() wxOVERRIDE; + virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; protected: wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11); diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp index cf9cc33b3e..77847dd985 100644 --- a/src/unix/joystick.cpp +++ b/src/unix/joystick.cpp @@ -63,7 +63,7 @@ class wxJoystickThread : public wxThread { public: wxJoystickThread(int device, int joystick); - void* Entry(); + void* Entry() wxOVERRIDE; private: void SendEvent(wxEventType type, long ts, int change = 0); diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index f01b1f15fd..9e9616373a 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -154,36 +154,36 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name); + const wxString& name) wxOVERRIDE; - virtual bool Play(); - virtual bool Pause(); - virtual bool Stop(); + virtual bool Play() wxOVERRIDE; + virtual bool Pause() wxOVERRIDE; + virtual bool Stop() wxOVERRIDE; - virtual bool Load(const wxString& fileName); - virtual bool Load(const wxURI& location); + virtual bool Load(const wxString& fileName) wxOVERRIDE; + virtual bool Load(const wxURI& location) wxOVERRIDE; virtual bool Load(const wxURI& location, - const wxURI& proxy) + const wxURI& proxy) wxOVERRIDE { return wxMediaBackendCommonBase::Load(location, proxy); } - virtual wxMediaState GetState(); + virtual wxMediaState GetState() wxOVERRIDE; - virtual bool SetPosition(wxLongLong where); - virtual wxLongLong GetPosition(); - virtual wxLongLong GetDuration(); + virtual bool SetPosition(wxLongLong where) wxOVERRIDE; + virtual wxLongLong GetPosition() wxOVERRIDE; + virtual wxLongLong GetDuration() wxOVERRIDE; - virtual void Move(int x, int y, int w, int h); - wxSize GetVideoSize() const; + virtual void Move(int x, int y, int w, int h) wxOVERRIDE; + wxSize GetVideoSize() const wxOVERRIDE; - virtual double GetPlaybackRate(); - virtual bool SetPlaybackRate(double dRate); + virtual double GetPlaybackRate() wxOVERRIDE; + virtual bool SetPlaybackRate(double dRate) wxOVERRIDE; - virtual wxLongLong GetDownloadProgress(); - virtual wxLongLong GetDownloadTotal(); + virtual wxLongLong GetDownloadProgress() wxOVERRIDE; + virtual wxLongLong GetDownloadTotal() wxOVERRIDE; - virtual bool SetVolume(double dVolume); - virtual double GetVolume(); + virtual bool SetVolume(double dVolume) wxOVERRIDE; + virtual double GetVolume() wxOVERRIDE; //------------implementation from now on----------------------------------- bool CheckForErrors(); diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp index c6ff1bd420..6f671d3125 100644 --- a/src/unix/sound.cpp +++ b/src/unix/sound.cpp @@ -78,15 +78,15 @@ wxSoundData::~wxSoundData() class wxSoundBackendNull : public wxSoundBackend { public: - wxString GetName() const { return _("No sound"); } - int GetPriority() const { return 0; } - bool IsAvailable() const { return true; } - bool HasNativeAsyncPlayback() const { return true; } + wxString GetName() const wxOVERRIDE { return _("No sound"); } + int GetPriority() const wxOVERRIDE { return 0; } + bool IsAvailable() const wxOVERRIDE { return true; } + bool HasNativeAsyncPlayback() const wxOVERRIDE { return true; } bool Play(wxSoundData *WXUNUSED(data), unsigned WXUNUSED(flags), - volatile wxSoundPlaybackStatus *WXUNUSED(status)) + volatile wxSoundPlaybackStatus *WXUNUSED(status)) wxOVERRIDE { return true; } - void Stop() {} - bool IsPlaying() const { return false; } + void Stop() wxOVERRIDE {} + bool IsPlaying() const wxOVERRIDE { return false; } }; @@ -103,14 +103,14 @@ public: class wxSoundBackendOSS : public wxSoundBackend { public: - wxString GetName() const { return wxT("Open Sound System"); } - int GetPriority() const { return 10; } - bool IsAvailable() const; - bool HasNativeAsyncPlayback() const { return false; } + wxString GetName() const wxOVERRIDE { return wxT("Open Sound System"); } + int GetPriority() const wxOVERRIDE { return 10; } + bool IsAvailable() const wxOVERRIDE; + bool HasNativeAsyncPlayback() const wxOVERRIDE { return false; } bool Play(wxSoundData *data, unsigned flags, - volatile wxSoundPlaybackStatus *status); - void Stop() {} - bool IsPlaying() const { return false; } + volatile wxSoundPlaybackStatus *status) wxOVERRIDE; + void Stop() wxOVERRIDE {} + bool IsPlaying() const wxOVERRIDE { return false; } private: int OpenDSP(const wxSoundData *data); @@ -278,7 +278,7 @@ public: wxSoundAsyncPlaybackThread(wxSoundSyncOnlyAdaptor *adaptor, wxSoundData *data, unsigned flags) : wxThread(), m_adapt(adaptor), m_data(data), m_flags(flags) {} - virtual ExitCode Entry(); + virtual ExitCode Entry() wxOVERRIDE; protected: wxSoundSyncOnlyAdaptor *m_adapt; @@ -299,26 +299,26 @@ public: { delete m_backend; } - wxString GetName() const + wxString GetName() const wxOVERRIDE { return m_backend->GetName(); } - int GetPriority() const + int GetPriority() const wxOVERRIDE { return m_backend->GetPriority(); } - bool IsAvailable() const + bool IsAvailable() const wxOVERRIDE { return m_backend->IsAvailable(); } - bool HasNativeAsyncPlayback() const + bool HasNativeAsyncPlayback() const wxOVERRIDE { return true; } bool Play(wxSoundData *data, unsigned flags, - volatile wxSoundPlaybackStatus *status); - void Stop(); - bool IsPlaying() const; + volatile wxSoundPlaybackStatus *status) wxOVERRIDE; + void Stop() wxOVERRIDE; + bool IsPlaying() const wxOVERRIDE; private: friend class wxSoundAsyncPlaybackThread; @@ -712,8 +712,8 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData) class wxSoundCleanupModule: public wxModule { public: - bool OnInit() { return true; } - void OnExit() { wxSound::UnloadBackend(); } + bool OnInit() wxOVERRIDE { return true; } + void OnExit() wxOVERRIDE { wxSound::UnloadBackend(); } DECLARE_DYNAMIC_CLASS(wxSoundCleanupModule) };