From 88d526660f2e7d3038fd0ff6eb0ae9b4c6e96656 Mon Sep 17 00:00:00 2001 From: PB Date: Wed, 12 Oct 2022 17:07:48 +0200 Subject: [PATCH] Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept Don't use deprecated macros in wxWidgets itself. --- demos/bombs/bombs.h | 2 +- demos/forty/canvas.h | 2 +- demos/forty/forty.h | 2 +- demos/forty/game.h | 18 +- demos/fractal/fractal.cpp | 2 +- demos/life/game.cpp | 4 +- demos/life/life.h | 2 +- demos/poem/wxpoem.h | 4 +- include/wx/activityindicator.h | 6 +- include/wx/addremovectrl.h | 2 +- include/wx/affinematrix2d.h | 22 +- include/wx/anidecod.h | 20 +- include/wx/any.h | 26 +- include/wx/anybutton.h | 4 +- include/wx/app.h | 22 +- include/wx/appprogress.h | 10 +- include/wx/apptrait.h | 40 +-- include/wx/archive.h | 2 +- include/wx/aui/auibar.h | 52 +-- include/wx/aui/auibook.h | 52 +-- include/wx/aui/barartmsw.h | 28 +- include/wx/aui/dockart.h | 28 +- include/wx/aui/floatpane.h | 2 +- include/wx/aui/framemanager.h | 2 +- include/wx/aui/tabart.h | 74 ++-- include/wx/aui/tabartgtk.h | 18 +- include/wx/aui/tabartmsw.h | 22 +- include/wx/aui/tabmdi.h | 20 +- include/wx/bannerwindow.h | 2 +- include/wx/bookctrl.h | 12 +- include/wx/calctrl.h | 2 +- include/wx/catch_cppunit.h | 4 +- include/wx/checkbox.h | 6 +- include/wx/choice.h | 6 +- include/wx/choicebk.h | 28 +- include/wx/clipbrd.h | 2 +- include/wx/clrpicker.h | 8 +- include/wx/collpane.h | 8 +- include/wx/colordlg.h | 2 +- include/wx/colour.h | 4 +- include/wx/combo.h | 76 ++-- include/wx/combobox.h | 6 +- include/wx/commandlinkbutton.h | 2 +- include/wx/compositewin.h | 16 +- include/wx/containr.h | 18 +- include/wx/control.h | 12 +- include/wx/convauto.h | 10 +- include/wx/cshelp.h | 12 +- include/wx/ctrlsub.h | 2 +- include/wx/dataobj.h | 84 ++--- include/wx/dataview.h | 72 ++-- include/wx/dateevt.h | 2 +- include/wx/datetime.h | 4 +- include/wx/dc.h | 16 +- include/wx/dcgraph.h | 134 +++---- include/wx/dcmirror.h | 90 ++--- include/wx/dcprint.h | 2 +- include/wx/dcsvg.h | 98 +++--- include/wx/debugrpt.h | 8 +- include/wx/dfb/private/overlay.h | 12 +- include/wx/dialog.h | 6 +- include/wx/dialup.h | 2 +- include/wx/dnd.h | 4 +- include/wx/docview.h | 16 +- include/wx/dvrenderers.h | 76 ++-- include/wx/dynarray.h | 2 +- include/wx/event.h | 148 ++++---- include/wx/evtloop.h | 6 +- include/wx/fdrepdlg.h | 2 +- include/wx/fileconf.h | 44 +-- include/wx/filectrl.h | 2 +- include/wx/filedlgcustomize.h | 10 +- include/wx/filepicker.h | 30 +- include/wx/filesys.h | 8 +- include/wx/fontmap.h | 4 +- include/wx/fontpicker.h | 8 +- include/wx/frame.h | 10 +- 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/activityindicator.h | 8 +- include/wx/generic/animate.h | 22 +- include/wx/generic/bmpcbox.h | 26 +- include/wx/generic/buttonbar.h | 22 +- include/wx/generic/calctrlg.h | 60 ++-- include/wx/generic/caret.h | 14 +- include/wx/generic/choicdgg.h | 4 +- include/wx/generic/clrpickerg.h | 4 +- include/wx/generic/collheaderctrl.h | 6 +- include/wx/generic/collpaneg.h | 14 +- include/wx/generic/colrdlgg.h | 2 +- include/wx/generic/combo.h | 12 +- include/wx/generic/custombgwin.h | 2 +- include/wx/generic/dataview.h | 180 +++++----- include/wx/generic/datectrl.h | 14 +- include/wx/generic/dcpsg.h | 100 +++--- include/wx/generic/dirctrlg.h | 2 +- include/wx/generic/dirdlgg.h | 8 +- include/wx/generic/dvrenderer.h | 16 +- include/wx/generic/dvrenderers.h | 70 ++-- include/wx/generic/filectrlg.h | 28 +- include/wx/generic/filedlgg.h | 32 +- include/wx/generic/filepickerg.h | 20 +- include/wx/generic/fontdlgg.h | 4 +- include/wx/generic/fontpickerg.h | 6 +- include/wx/generic/grid.h | 82 ++--- include/wx/generic/gridctrl.h | 68 ++-- include/wx/generic/grideditors.h | 140 ++++---- include/wx/generic/headerctrlg.h | 14 +- include/wx/generic/helpext.h | 26 +- include/wx/generic/hyperlink.h | 22 +- include/wx/generic/icon.h | 2 +- include/wx/generic/infobar.h | 20 +- include/wx/generic/laywin.h | 4 +- include/wx/generic/listctrl.h | 80 ++--- include/wx/generic/logg.h | 8 +- include/wx/generic/msgdlgg.h | 2 +- include/wx/generic/paletteg.h | 6 +- include/wx/generic/printps.h | 10 +- include/wx/generic/private/animate.h | 16 +- include/wx/generic/private/grid.h | 264 +++++++------- include/wx/generic/private/listctrl.h | 16 +- include/wx/generic/private/markuptext.h | 4 +- include/wx/generic/private/notifmsg.h | 16 +- include/wx/generic/private/richtooltip.h | 14 +- include/wx/generic/private/textmeasure.h | 4 +- include/wx/generic/prntdlgg.h | 30 +- include/wx/generic/progdlgg.h | 4 +- include/wx/generic/propdlg.h | 2 +- include/wx/generic/richmsgdlgg.h | 6 +- include/wx/generic/sashwin.h | 2 +- include/wx/generic/scrolwin.h | 8 +- include/wx/generic/spinctlg.h | 58 +-- include/wx/generic/splash.h | 2 +- include/wx/generic/splitter.h | 8 +- include/wx/generic/srchctlg.h | 126 +++---- include/wx/generic/statbmpg.h | 6 +- include/wx/generic/stattextg.h | 14 +- include/wx/generic/statusbr.h | 14 +- include/wx/generic/textdlgg.h | 4 +- include/wx/generic/timectrl.h | 10 +- include/wx/generic/treectlg.h | 152 ++++---- include/wx/generic/wizard.h | 16 +- include/wx/gifdecod.h | 20 +- include/wx/glcanvas.h | 2 +- include/wx/graphics.h | 4 +- include/wx/gtk/activityindicator.h | 8 +- include/wx/gtk/animate.h | 20 +- include/wx/gtk/anybutton.h | 10 +- include/wx/gtk/app.h | 12 +- include/wx/gtk/bitmap.h | 50 +-- 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 | 36 +- include/wx/gtk/clipbrd.h | 20 +- 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 | 38 +- include/wx/gtk/control.h | 6 +- include/wx/gtk/cursor.h | 6 +- include/wx/gtk/dataobj2.h | 26 +- include/wx/gtk/dataview.h | 126 +++---- include/wx/gtk/dc.h | 56 +-- include/wx/gtk/dcclient.h | 90 ++--- include/wx/gtk/dcmemory.h | 22 +- include/wx/gtk/dcscreen.h | 2 +- include/wx/gtk/dialog.h | 8 +- include/wx/gtk/dirdlg.h | 4 +- include/wx/gtk/dnd.h | 10 +- include/wx/gtk/dvrenderer.h | 20 +- include/wx/gtk/dvrenderers.h | 64 ++-- include/wx/gtk/evtloop.h | 14 +- include/wx/gtk/filectrl.h | 28 +- include/wx/gtk/filedlg.h | 32 +- include/wx/gtk/filehistory.h | 2 +- include/wx/gtk/filepicker.h | 18 +- 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 | 12 +- include/wx/gtk/glcanvas.h | 6 +- include/wx/gtk/hyperlink.h | 28 +- include/wx/gtk/infobar.h | 16 +- include/wx/gtk/listbox.h | 48 +-- include/wx/gtk/mdi.h | 26 +- include/wx/gtk/menu.h | 40 +-- include/wx/gtk/menuitem.h | 12 +- include/wx/gtk/mimetype.h | 4 +- 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/pen.h | 34 +- include/wx/gtk/popupwin.h | 8 +- include/wx/gtk/print.h | 182 +++++----- include/wx/gtk/private/addremovectrl.h | 2 +- include/wx/gtk/private/animate.h | 16 +- include/wx/gtk/private/log.h | 4 +- include/wx/gtk/private/textmeasure.h | 8 +- include/wx/gtk/private/timer.h | 6 +- include/wx/gtk/private/tlwgeom.h | 8 +- include/wx/gtk/radiobox.h | 46 +-- include/wx/gtk/radiobut.h | 14 +- include/wx/gtk/region.h | 28 +- include/wx/gtk/scrolbar.h | 12 +- include/wx/gtk/scrolwin.h | 10 +- include/wx/gtk/slider.h | 34 +- include/wx/gtk/spinbutt.h | 16 +- include/wx/gtk/spinctrl.h | 44 +-- include/wx/gtk/srchctrl.h | 22 +- include/wx/gtk/statbmp.h | 2 +- include/wx/gtk/statbox.h | 14 +- include/wx/gtk/stattext.h | 16 +- include/wx/gtk/taskbar.h | 6 +- include/wx/gtk/textctrl.h | 98 +++--- include/wx/gtk/textentry.h | 54 +-- include/wx/gtk/tglbtn.h | 14 +- include/wx/gtk/toolbar.h | 34 +- include/wx/gtk/toplevel.h | 62 ++-- include/wx/gtk/webview_webkit.h | 122 +++---- include/wx/gtk/window.h | 128 +++---- include/wx/gtk1/private/addremovectrl.h | 2 +- include/wx/gtk1/stattext.h | 4 +- include/wx/hash.h | 4 +- include/wx/hashmap.h | 80 ++--- include/wx/headercol.h | 34 +- include/wx/headerctrl.h | 12 +- include/wx/html/helpctrl.h | 28 +- include/wx/html/helpfrm.h | 2 +- include/wx/html/htmlcell.h | 64 ++-- include/wx/html/htmlfilt.h | 8 +- include/wx/html/htmlwin.h | 26 +- include/wx/html/htmprint.h | 10 +- include/wx/html/m_templ.h | 6 +- include/wx/html/winpars.h | 16 +- include/wx/htmllbox.h | 64 ++-- 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/list.h | 4 +- include/wx/listbase.h | 4 +- include/wx/listbook.h | 28 +- include/wx/listbox.h | 6 +- include/wx/log.h | 12 +- include/wx/lzmastream.h | 28 +- include/wx/mdi.h | 66 ++-- include/wx/mediactrl.h | 6 +- include/wx/memtext.h | 10 +- include/wx/menu.h | 10 +- include/wx/msgdlg.h | 4 +- include/wx/msgout.h | 10 +- include/wx/mstream.h | 24 +- include/wx/msw/anybutton.h | 26 +- include/wx/msw/app.h | 10 +- include/wx/msw/appprogress.h | 10 +- include/wx/msw/apptbase.h | 2 +- include/wx/msw/apptrait.h | 82 ++--- include/wx/msw/bitmap.h | 10 +- include/wx/msw/bmpcbox.h | 26 +- include/wx/msw/brush.h | 20 +- include/wx/msw/button.h | 14 +- include/wx/msw/calctrl.h | 28 +- include/wx/msw/caret.h | 12 +- include/wx/msw/checkbox.h | 30 +- include/wx/msw/checklst.h | 14 +- include/wx/msw/choice.h | 56 +-- include/wx/msw/clipbrd.h | 18 +- include/wx/msw/colordlg.h | 16 +- include/wx/msw/colour.h | 12 +- include/wx/msw/combo.h | 14 +- include/wx/msw/combobox.h | 48 +-- include/wx/msw/commandlinkbutton.h | 10 +- include/wx/msw/control.h | 14 +- include/wx/msw/cursor.h | 4 +- include/wx/msw/custombgwin.h | 4 +- include/wx/msw/datectrl.h | 16 +- include/wx/msw/datetimectrl.h | 14 +- include/wx/msw/dc.h | 136 ++++---- include/wx/msw/dcclient.h | 4 +- include/wx/msw/dcmemory.h | 12 +- include/wx/msw/dcprint.h | 22 +- include/wx/msw/dcscreen.h | 2 +- include/wx/msw/dde.h | 24 +- include/wx/msw/dialog.h | 12 +- include/wx/msw/dirdlg.h | 4 +- include/wx/msw/enhmeta.h | 30 +- include/wx/msw/evtloop.h | 8 +- include/wx/msw/evtloopconsole.h | 10 +- include/wx/msw/fdrepdlg.h | 12 +- include/wx/msw/filedlg.h | 18 +- include/wx/msw/font.h | 56 +-- include/wx/msw/fontdlg.h | 6 +- include/wx/msw/frame.h | 30 +- include/wx/msw/fswatcher.h | 2 +- include/wx/msw/gauge.h | 16 +- include/wx/msw/gdiimage.h | 10 +- include/wx/msw/glcanvas.h | 6 +- include/wx/msw/headerctrl.h | 18 +- include/wx/msw/helpbest.h | 30 +- include/wx/msw/helpchm.h | 22 +- include/wx/msw/helpwin.h | 20 +- include/wx/msw/hyperlink.h | 10 +- include/wx/msw/icon.h | 6 +- include/wx/msw/iniconf.h | 44 +-- include/wx/msw/listbox.h | 56 +-- include/wx/msw/listctrl.h | 80 ++--- include/wx/msw/mdi.h | 68 ++-- include/wx/msw/menu.h | 32 +- include/wx/msw/menuitem.h | 22 +- include/wx/msw/metafile.h | 18 +- include/wx/msw/mfc.h | 12 +- include/wx/msw/msgdlg.h | 6 +- include/wx/msw/nonownedwnd.h | 12 +- include/wx/msw/notebook.h | 56 +-- include/wx/msw/ole/activex.h | 4 +- include/wx/msw/ole/comimpl.h | 6 +- include/wx/msw/ole/dataobj2.h | 38 +- include/wx/msw/ole/dropsrc.h | 4 +- include/wx/msw/ole/droptgt.h | 4 +- include/wx/msw/ole/oleutils.h | 30 +- include/wx/msw/ownerdrawnbutton.h | 4 +- include/wx/msw/ownerdrw.h | 2 +- include/wx/msw/palette.h | 6 +- include/wx/msw/pen.h | 46 +-- include/wx/msw/popupwin.h | 8 +- include/wx/msw/printdlg.h | 20 +- include/wx/msw/printwin.h | 12 +- include/wx/msw/private/comstream.h | 34 +- include/wx/msw/private/fswatcher.h | 2 +- include/wx/msw/private/pipestream.h | 8 +- include/wx/msw/private/sockmsw.h | 8 +- include/wx/msw/private/textmeasure.h | 8 +- include/wx/msw/private/timer.h | 6 +- include/wx/msw/private/tlwgeom.h | 8 +- include/wx/msw/private/webrequest_winhttp.h | 36 +- include/wx/msw/private/webview_ie.h | 64 ++-- include/wx/msw/progdlg.h | 36 +- include/wx/msw/radiobox.h | 62 ++-- include/wx/msw/radiobut.h | 24 +- include/wx/msw/regconf.h | 50 +-- include/wx/msw/region.h | 20 +- include/wx/msw/richmsgdlg.h | 2 +- include/wx/msw/scrolbar.h | 24 +- include/wx/msw/slider.h | 72 ++-- include/wx/msw/sound.h | 2 +- include/wx/msw/spinbutt.h | 22 +- include/wx/msw/spinctrl.h | 54 +-- include/wx/msw/stackwalk.h | 12 +- include/wx/msw/statbmp.h | 14 +- include/wx/msw/statbox.h | 16 +- include/wx/msw/statline.h | 4 +- include/wx/msw/stattext.h | 14 +- include/wx/msw/statusbar.h | 32 +- include/wx/msw/stdpaths.h | 22 +- include/wx/msw/taskbar.h | 6 +- include/wx/msw/taskbarbutton.h | 32 +- include/wx/msw/textctrl.h | 116 +++--- include/wx/msw/textentry.h | 52 +-- include/wx/msw/tglbtn.h | 18 +- include/wx/msw/timectrl.h | 8 +- include/wx/msw/toolbar.h | 50 +-- include/wx/msw/toplevel.h | 68 ++-- include/wx/msw/treectrl.h | 162 ++++----- include/wx/msw/webview_edge.h | 94 ++--- include/wx/msw/webview_ie.h | 104 +++--- include/wx/msw/window.h | 132 +++---- include/wx/nativewin.h | 22 +- include/wx/nonownedwnd.h | 4 +- include/wx/notebook.h | 2 +- include/wx/odcombo.h | 68 ++-- include/wx/osx/activityindicator.h | 6 +- include/wx/osx/anybutton.h | 14 +- include/wx/osx/app.h | 16 +- include/wx/osx/appprogress.h | 10 +- include/wx/osx/bitmap.h | 52 +-- include/wx/osx/bmpbuttn.h | 2 +- include/wx/osx/brush.h | 18 +- include/wx/osx/button.h | 8 +- include/wx/osx/carbon/private/print.h | 14 +- include/wx/osx/carbon/region.h | 22 +- include/wx/osx/checkbox.h | 18 +- include/wx/osx/checklst.h | 14 +- include/wx/osx/choice.h | 26 +- include/wx/osx/clipbrd.h | 18 +- include/wx/osx/cocoa/dataview.h | 90 ++--- include/wx/osx/cocoa/evtloop.h | 10 +- include/wx/osx/cocoa/private.h | 202 +++++------ include/wx/osx/cocoa/private/textimpl.h | 126 +++---- include/wx/osx/cocoa/stdpaths.h | 22 +- include/wx/osx/colordlg.h | 2 +- include/wx/osx/combobox.h | 44 +-- include/wx/osx/control.h | 2 +- include/wx/osx/core/colour.h | 16 +- include/wx/osx/core/evtloop.h | 14 +- include/wx/osx/core/hid.h | 2 +- include/wx/osx/core/private/strconv_cf.h | 6 +- include/wx/osx/core/private/timer.h | 6 +- include/wx/osx/cursor.h | 4 +- include/wx/osx/dataobj2.h | 26 +- include/wx/osx/dataview.h | 114 +++--- include/wx/osx/datectrl.h | 6 +- include/wx/osx/datetimectrl.h | 4 +- include/wx/osx/dcclient.h | 6 +- include/wx/osx/dcmemory.h | 10 +- include/wx/osx/dcprint.h | 14 +- include/wx/osx/dcscreen.h | 2 +- include/wx/osx/dialog.h | 14 +- include/wx/osx/dirdlg.h | 8 +- include/wx/osx/dnd.h | 10 +- include/wx/osx/dvrenderer.h | 26 +- include/wx/osx/dvrenderers.h | 44 +-- include/wx/osx/evtloop.h | 6 +- include/wx/osx/filedlg.h | 14 +- include/wx/osx/font.h | 44 +-- include/wx/osx/fontdlg.h | 2 +- include/wx/osx/frame.h | 30 +- include/wx/osx/fswatcher_fsevents.h | 6 +- include/wx/osx/gauge.h | 8 +- include/wx/osx/glcanvas.h | 4 +- include/wx/osx/iphone/private.h | 4 +- include/wx/osx/listbox.h | 40 +-- include/wx/osx/mdi.h | 26 +- include/wx/osx/menu.h | 40 +-- include/wx/osx/menuitem.h | 10 +- include/wx/osx/metafile.h | 18 +- include/wx/osx/msgdlg.h | 8 +- include/wx/osx/nonownedwnd.h | 42 +-- include/wx/osx/notebook.h | 40 +-- include/wx/osx/palette.h | 6 +- include/wx/osx/pen.h | 34 +- include/wx/osx/popupwin.h | 2 +- include/wx/osx/printdlg.h | 14 +- include/wx/osx/printmac.h | 10 +- include/wx/osx/private/addremovectrl.h | 2 +- include/wx/osx/private/datatransfer.h | 12 +- .../wx/osx/private/webrequest_urlsession.h | 40 +-- include/wx/osx/radiobox.h | 34 +- include/wx/osx/radiobut.h | 8 +- include/wx/osx/scrolbar.h | 20 +- include/wx/osx/slider.h | 54 +-- include/wx/osx/sound.h | 2 +- include/wx/osx/spinbutt.h | 16 +- include/wx/osx/srchctrl.h | 20 +- include/wx/osx/statbmp.h | 6 +- include/wx/osx/statbox.h | 8 +- include/wx/osx/stattext.h | 14 +- include/wx/osx/statusbr.h | 6 +- include/wx/osx/textctrl.h | 54 +-- include/wx/osx/textentry.h | 56 +-- include/wx/osx/tglbtn.h | 10 +- include/wx/osx/timectrl.h | 2 +- include/wx/osx/toolbar.h | 48 +-- include/wx/osx/toplevel.h | 50 +-- include/wx/osx/webview_webkit.h | 88 ++--- include/wx/osx/window.h | 128 +++---- include/wx/panel.h | 2 +- include/wx/persist/bookctrl.h | 6 +- include/wx/persist/combobox.h | 6 +- include/wx/persist/dataview.h | 6 +- include/wx/persist/splitter.h | 6 +- include/wx/persist/toplevel.h | 10 +- include/wx/persist/treebook.h | 6 +- include/wx/persist/window.h | 2 +- include/wx/pickerbase.h | 2 +- include/wx/popupwin.h | 18 +- include/wx/power.h | 2 +- include/wx/preferences.h | 4 +- include/wx/private/addremovectrl.h | 2 +- include/wx/private/display.h | 12 +- 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/secretstore.h | 4 +- include/wx/private/selectdispatcher.h | 10 +- include/wx/private/tlwgeom.h | 8 +- include/wx/private/webrequest_curl.h | 34 +- include/wx/prntbase.h | 90 ++--- include/wx/process.h | 2 +- include/wx/propgrid/advprops.h | 68 ++-- include/wx/propgrid/editors.h | 74 ++-- include/wx/propgrid/manager.h | 36 +- include/wx/propgrid/property.h | 16 +- include/wx/propgrid/propgrid.h | 28 +- include/wx/propgrid/propgriddefs.h | 6 +- include/wx/propgrid/props.h | 154 ++++---- 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/qt/accel.h | 4 +- include/wx/qt/anybutton.h | 8 +- include/wx/qt/app.h | 2 +- include/wx/qt/bitmap.h | 44 +-- include/wx/qt/brush.h | 18 +- include/wx/qt/button.h | 4 +- include/wx/qt/calctrl.h | 38 +- include/wx/qt/checkbox.h | 14 +- include/wx/qt/checklst.h | 6 +- include/wx/qt/choice.h | 26 +- include/wx/qt/clipbrd.h | 18 +- include/wx/qt/clrpicker.h | 2 +- include/wx/qt/colour.h | 12 +- include/wx/qt/combobox.h | 34 +- include/wx/qt/control.h | 2 +- include/wx/qt/cursor.h | 6 +- include/wx/qt/dataobj2.h | 4 +- include/wx/qt/dc.h | 78 ++--- include/wx/qt/dcmemory.h | 8 +- include/wx/qt/dcprint.h | 72 ++-- include/wx/qt/dcscreen.h | 4 +- include/wx/qt/dialog.h | 8 +- include/wx/qt/dirdlg.h | 4 +- include/wx/qt/dnd.h | 8 +- include/wx/qt/evtloop.h | 14 +- include/wx/qt/filedlg.h | 24 +- include/wx/qt/font.h | 46 +-- include/wx/qt/fontdlg.h | 2 +- include/wx/qt/frame.h | 20 +- include/wx/qt/gauge.h | 10 +- include/wx/qt/glcanvas.h | 4 +- include/wx/qt/listbox.h | 32 +- include/wx/qt/listctrl.h | 44 +-- include/wx/qt/mdi.h | 8 +- include/wx/qt/menu.h | 26 +- include/wx/qt/menuitem.h | 14 +- include/wx/qt/msgdlg.h | 2 +- include/wx/qt/nonownedwnd.h | 6 +- include/wx/qt/notebook.h | 26 +- include/wx/qt/palette.h | 4 +- include/wx/qt/pen.h | 34 +- include/wx/qt/printdlg.h | 14 +- include/wx/qt/printqt.h | 10 +- include/wx/qt/private/timer.h | 8 +- include/wx/qt/private/treeitemdelegate.h | 6 +- include/wx/qt/private/treeitemfactory.h | 2 +- include/wx/qt/private/winevent.h | 40 +-- include/wx/qt/radiobox.h | 24 +- include/wx/qt/radiobut.h | 6 +- include/wx/qt/region.h | 28 +- include/wx/qt/scrolbar.h | 14 +- include/wx/qt/slider.h | 28 +- include/wx/qt/spinbutt.h | 8 +- include/wx/qt/spinctrl.h | 28 +- include/wx/qt/statbmp.h | 6 +- include/wx/qt/statbox.h | 8 +- include/wx/qt/statline.h | 2 +- include/wx/qt/stattext.h | 8 +- include/wx/qt/statusbar.h | 14 +- include/wx/qt/taskbar.h | 6 +- include/wx/qt/textctrl.h | 48 +-- include/wx/qt/textentry.h | 38 +- include/wx/qt/tglbtn.h | 6 +- include/wx/qt/toolbar.h | 28 +- include/wx/qt/toplevel.h | 26 +- include/wx/qt/treectrl.h | 136 ++++---- include/wx/qt/window.h | 94 ++--- include/wx/rearrangectrl.h | 8 +- include/wx/region.h | 10 +- include/wx/renderer.h | 56 +-- include/wx/ribbon/art.h | 136 ++++---- 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/richtext/richtextbackgroundpage.h | 4 +- include/wx/richtext/richtextborderspage.h | 4 +- include/wx/richtext/richtextbuffer.h | 288 +++++++-------- include/wx/richtext/richtextbulletspage.h | 4 +- include/wx/richtext/richtextctrl.h | 114 +++--- include/wx/richtext/richtextfontpage.h | 4 +- include/wx/richtext/richtextformatdlg.h | 8 +- include/wx/richtext/richtexthtml.h | 10 +- include/wx/richtext/richtextindentspage.h | 4 +- include/wx/richtext/richtextliststylepage.h | 4 +- include/wx/richtext/richtextmarginspage.h | 4 +- include/wx/richtext/richtextprint.h | 10 +- include/wx/richtext/richtextsizepage.h | 4 +- include/wx/richtext/richtextstyledlg.h | 4 +- include/wx/richtext/richtextstylepage.h | 4 +- include/wx/richtext/richtextstyles.h | 22 +- include/wx/richtext/richtextsymboldlg.h | 8 +- include/wx/richtext/richtexttabspage.h | 4 +- include/wx/richtext/richtextxml.h | 8 +- include/wx/sckaddr.h | 24 +- include/wx/sckipc.h | 24 +- include/wx/sckstrm.h | 12 +- include/wx/scrolbar.h | 2 +- include/wx/scrolwin.h | 18 +- include/wx/sharedptr.h | 2 +- include/wx/simplebook.h | 28 +- include/wx/sizer.h | 34 +- include/wx/slider.h | 2 +- include/wx/socket.h | 4 +- include/wx/spinbutt.h | 2 +- include/wx/spinctrl.h | 2 +- include/wx/srchctrl.h | 4 +- include/wx/sstream.h | 16 +- include/wx/statbmp.h | 8 +- include/wx/statbox.h | 6 +- include/wx/statline.h | 6 +- include/wx/stattext.h | 6 +- include/wx/statusbr.h | 8 +- include/wx/stc/stc.h | 90 ++--- include/wx/stdstream.h | 26 +- include/wx/strconv.h | 100 +++--- include/wx/stream.h | 64 ++-- include/wx/tarstrm.h | 84 ++--- include/wx/taskbar.h | 2 +- include/wx/tbarbase.h | 6 +- include/wx/testing.h | 12 +- include/wx/textcompleter.h | 6 +- include/wx/textctrl.h | 38 +- include/wx/textfile.h | 10 +- include/wx/textwrapper.h | 2 +- include/wx/tglbtn.h | 4 +- include/wx/thread.h | 2 +- include/wx/timer.h | 4 +- include/wx/tipwin.h | 2 +- include/wx/toolbook.h | 26 +- include/wx/toplevel.h | 22 +- include/wx/translation.h | 8 +- include/wx/treebase.h | 2 +- include/wx/treebook.h | 36 +- include/wx/treectrl.h | 4 +- include/wx/treelist.h | 4 +- include/wx/typeinfo.h | 2 +- include/wx/univ/anybutton.h | 22 +- include/wx/univ/bmpbuttn.h | 12 +- include/wx/univ/button.h | 16 +- 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 | 48 +-- include/wx/univ/menu.h | 34 +- include/wx/univ/menuitem.h | 12 +- include/wx/univ/notebook.h | 42 +-- include/wx/univ/radiobox.h | 34 +- include/wx/univ/radiobut.h | 16 +- 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 | 6 +- 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 | 90 ++--- include/wx/univ/tglbtn.h | 8 +- include/wx/univ/toolbar.h | 32 +- include/wx/univ/toplevel.h | 18 +- include/wx/univ/window.h | 32 +- include/wx/unix/app.h | 2 +- include/wx/unix/apptrait.h | 26 +- include/wx/unix/evtloop.h | 14 +- include/wx/unix/glegl.h | 12 +- include/wx/unix/glx11.h | 12 +- include/wx/unix/private/epolldispatcher.h | 10 +- include/wx/unix/private/executeiohandler.h | 10 +- include/wx/unix/private/fdiounix.h | 4 +- include/wx/unix/private/fswatcher_inotify.h | 6 +- include/wx/unix/private/pipestream.h | 4 +- include/wx/unix/private/sockunix.h | 26 +- include/wx/unix/private/timer.h | 6 +- include/wx/unix/private/wakeuppipe.h | 8 +- include/wx/unix/sound.h | 2 +- include/wx/unix/stackwalk.h | 6 +- include/wx/unix/stdpaths.h | 20 +- include/wx/unix/taskbarx11.h | 6 +- include/wx/valgen.h | 8 +- include/wx/valnum.h | 24 +- include/wx/valtext.h | 8 +- include/wx/variant.h | 16 +- include/wx/vlbox.h | 6 +- include/wx/vscroll.h | 38 +- include/wx/weakref.h | 4 +- include/wx/webrequest.h | 2 +- include/wx/webview.h | 2 +- include/wx/webviewarchivehandler.h | 2 +- include/wx/webviewfshandler.h | 2 +- include/wx/wfstream.h | 100 +++--- include/wx/window.h | 44 +-- include/wx/wizard.h | 18 +- include/wx/wrapsizer.h | 6 +- include/wx/x11/dcclient.h | 2 +- include/wx/x11/font.h | 4 +- include/wx/x11/palette.h | 2 +- include/wx/x11/window.h | 4 +- include/wx/xrc/xh_activityindicator.h | 4 +- include/wx/xrc/xh_animatctrl.h | 4 +- include/wx/xrc/xh_aui.h | 4 +- include/wx/xrc/xh_auitoolb.h | 4 +- include/wx/xrc/xh_bannerwindow.h | 4 +- include/wx/xrc/xh_bmp.h | 8 +- include/wx/xrc/xh_bmpbt.h | 4 +- include/wx/xrc/xh_bmpcbox.h | 4 +- include/wx/xrc/xh_bttn.h | 4 +- include/wx/xrc/xh_cald.h | 4 +- include/wx/xrc/xh_chckb.h | 4 +- include/wx/xrc/xh_chckl.h | 4 +- include/wx/xrc/xh_choic.h | 4 +- include/wx/xrc/xh_choicbk.h | 4 +- include/wx/xrc/xh_clrpicker.h | 4 +- include/wx/xrc/xh_cmdlinkbn.h | 4 +- include/wx/xrc/xh_collpane.h | 4 +- include/wx/xrc/xh_combo.h | 4 +- include/wx/xrc/xh_comboctrl.h | 4 +- include/wx/xrc/xh_dataview.h | 4 +- include/wx/xrc/xh_datectrl.h | 4 +- include/wx/xrc/xh_dirpicker.h | 4 +- include/wx/xrc/xh_dlg.h | 4 +- include/wx/xrc/xh_editlbox.h | 4 +- include/wx/xrc/xh_filectrl.h | 4 +- include/wx/xrc/xh_filepicker.h | 4 +- include/wx/xrc/xh_fontpicker.h | 4 +- include/wx/xrc/xh_frame.h | 4 +- include/wx/xrc/xh_gauge.h | 4 +- include/wx/xrc/xh_gdctl.h | 4 +- include/wx/xrc/xh_grid.h | 4 +- include/wx/xrc/xh_html.h | 4 +- include/wx/xrc/xh_htmllbox.h | 4 +- include/wx/xrc/xh_hyperlink.h | 4 +- include/wx/xrc/xh_infobar.h | 4 +- include/wx/xrc/xh_listb.h | 4 +- include/wx/xrc/xh_listbk.h | 4 +- include/wx/xrc/xh_listc.h | 4 +- include/wx/xrc/xh_mdi.h | 4 +- include/wx/xrc/xh_menu.h | 8 +- include/wx/xrc/xh_notbk.h | 4 +- include/wx/xrc/xh_odcombo.h | 4 +- include/wx/xrc/xh_panel.h | 4 +- include/wx/xrc/xh_propdlg.h | 4 +- include/wx/xrc/xh_radbt.h | 4 +- include/wx/xrc/xh_radbx.h | 4 +- include/wx/xrc/xh_ribbon.h | 4 +- include/wx/xrc/xh_richtext.h | 4 +- include/wx/xrc/xh_scrol.h | 4 +- include/wx/xrc/xh_scwin.h | 4 +- include/wx/xrc/xh_simplebook.h | 4 +- include/wx/xrc/xh_sizer.h | 8 +- include/wx/xrc/xh_slidr.h | 4 +- include/wx/xrc/xh_spin.h | 12 +- include/wx/xrc/xh_split.h | 4 +- include/wx/xrc/xh_srchctrl.h | 4 +- include/wx/xrc/xh_statbar.h | 4 +- include/wx/xrc/xh_stbmp.h | 4 +- include/wx/xrc/xh_stbox.h | 4 +- include/wx/xrc/xh_stlin.h | 4 +- include/wx/xrc/xh_sttxt.h | 4 +- include/wx/xrc/xh_styledtextctrl.h | 4 +- include/wx/xrc/xh_text.h | 4 +- include/wx/xrc/xh_tglbtn.h | 4 +- include/wx/xrc/xh_timectrl.h | 4 +- include/wx/xrc/xh_toolb.h | 4 +- include/wx/xrc/xh_toolbk.h | 4 +- include/wx/xrc/xh_tree.h | 4 +- include/wx/xrc/xh_treebk.h | 6 +- include/wx/xrc/xh_unkwn.h | 4 +- include/wx/xrc/xh_wizrd.h | 4 +- include/wx/xrc/xmlres.h | 88 ++--- include/wx/zipstrm.h | 78 ++--- include/wx/zstream.h | 38 +- interface/wx/bmpbndl.h | 12 +- interface/wx/propgrid/property.h | 2 +- interface/wx/systhemectrl.h | 2 +- interface/wx/webview.h | 2 +- samples/access/accesstest.cpp | 42 +-- samples/animate/anitest.h | 2 +- samples/archive/archive.cpp | 6 +- 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/dataview/dataview.cpp | 30 +- samples/dataview/mymodels.h | 30 +- samples/debugrpt/debugrpt.cpp | 8 +- samples/dialogs/dialogs.cpp | 28 +- samples/dialogs/dialogs.h | 14 +- samples/dialup/nettest.cpp | 4 +- samples/display/display.cpp | 2 +- samples/dll/wx_exe.cpp | 4 +- samples/dnd/dnd.cpp | 44 +-- samples/docview/doc.h | 28 +- samples/docview/docview.h | 10 +- samples/docview/view.h | 30 +- samples/dragimag/dragimag.h | 6 +- samples/drawing/drawing.cpp | 8 +- samples/erase/erase.cpp | 2 +- samples/event/chessboard.cpp | 2 +- samples/event/chessboard.h | 2 +- samples/event/event.cpp | 4 +- samples/except/except.cpp | 18 +- samples/exec/exec.cpp | 8 +- samples/font/font.cpp | 8 +- samples/fswatcher/fswatcher.cpp | 8 +- samples/grid/griddemo.cpp | 32 +- 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 | 14 +- samples/mdi/mdi.h | 4 +- samples/mediaplayer/mediaplayer.cpp | 12 +- samples/memcheck/memcheck.cpp | 2 +- samples/menu/menu.cpp | 2 +- samples/mfc/mfctest.cpp | 2 +- samples/mfc/mfctest.h | 2 +- samples/minimal/minimal.cpp | 2 +- samples/nativdlg/nativdlg.h | 2 +- samples/notebook/notebook.h | 2 +- samples/oleauto/oleauto.cpp | 2 +- samples/opengl/cube/cube.h | 4 +- samples/opengl/isosurf/isosurf.h | 6 +- samples/opengl/penguin/penguin.h | 2 +- samples/opengl/pyramid/pyramid.h | 2 +- samples/ownerdrw/ownerdrw.cpp | 2 +- samples/popup/popup.cpp | 10 +- samples/power/power.cpp | 2 +- samples/preferences/preferences.cpp | 18 +- samples/printing/printing.h | 14 +- samples/propgrid/propgrid.cpp | 20 +- samples/propgrid/propgrid.h | 20 +- samples/propgrid/sampleprops.cpp | 12 +- samples/propgrid/sampleprops.h | 32 +- samples/propgrid/tests.cpp | 6 +- samples/regtest/regtest.cpp | 2 +- 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 | 4 +- 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/stc/edit.h | 8 +- samples/stc/stctest.cpp | 6 +- samples/svg/svgtest.cpp | 4 +- samples/taborder/taborder.cpp | 2 +- samples/taskbar/tbtest.h | 4 +- samples/taskbarbutton/taskbarbutton.cpp | 2 +- samples/text/text.cpp | 2 +- samples/thread/thread.cpp | 12 +- samples/toolbar/toolbar.cpp | 8 +- samples/treectrl/treetest.cpp | 6 +- samples/treectrl/treetest.h | 4 +- samples/treelist/treelist.cpp | 4 +- samples/typetest/typetest.h | 4 +- samples/uiaction/uiaction.cpp | 2 +- samples/validate/validate.h | 18 +- samples/vscroll/vstest.cpp | 10 +- samples/webrequest/webrequest.cpp | 2 +- samples/webview/webview.cpp | 8 +- samples/widgets/activityindicator.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/headerctrl.cpp | 6 +- samples/widgets/hyperlnk.cpp | 6 +- samples/widgets/listbox.cpp | 8 +- samples/widgets/native.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 +- samples/xrc/xrcdemo.h | 2 +- src/aui/auibar.cpp | 2 +- src/aui/auibook.cpp | 10 +- src/aui/framemanager.cpp | 6 +- src/aui/tabart.cpp | 2 +- src/common/animatecmn.cpp | 4 +- src/common/any.cpp | 10 +- src/common/appbase.cpp | 2 +- src/common/artprov.cpp | 12 +- src/common/artstd.cpp | 4 +- src/common/arttango.cpp | 2 +- src/common/bmpbase.cpp | 4 +- src/common/bmpbndl.cpp | 16 +- src/common/bmpbtncmn.cpp | 6 +- src/common/cairo.cpp | 4 +- src/common/clipcmn.cpp | 4 +- src/common/cmdline.cpp | 18 +- src/common/combocmn.cpp | 8 +- src/common/cshelp.cpp | 6 +- src/common/datetime.cpp | 4 +- src/common/dcbase.cpp | 4 +- src/common/dcbufcmn.cpp | 4 +- src/common/debugrpt.cpp | 2 +- src/common/dircmn.cpp | 12 +- src/common/dlgcmn.cpp | 4 +- src/common/dpycmn.cpp | 4 +- src/common/dynload.cpp | 4 +- src/common/event.cpp | 4 +- src/common/fdiodispatcher.cpp | 4 +- src/common/filesys.cpp | 4 +- src/common/fldlgcmn.cpp | 42 +-- src/common/fmapbase.cpp | 4 +- src/common/fontenumcmn.cpp | 8 +- src/common/fs_inet.cpp | 4 +- src/common/fswatchercmn.cpp | 8 +- src/common/http.cpp | 4 +- src/common/iconbndl.cpp | 2 +- src/common/image.cpp | 4 +- src/common/init.cpp | 2 +- src/common/intl.cpp | 4 +- src/common/log.cpp | 2 +- src/common/markupparser.cpp | 34 +- src/common/mimecmn.cpp | 4 +- src/common/overlaycmn.cpp | 14 +- src/common/paper.cpp | 4 +- src/common/prntbase.cpp | 4 +- src/common/sckipc.cpp | 4 +- src/common/socket.cpp | 4 +- src/common/stattextcmn.cpp | 4 +- src/common/strconv.cpp | 26 +- src/common/strvararg.cpp | 12 +- src/common/translation.cpp | 4 +- src/common/url.cpp | 4 +- src/common/variant.cpp | 172 ++++----- src/common/webrequest.cpp | 4 +- src/common/webrequest_curl.cpp | 18 +- src/common/webview.cpp | 4 +- src/common/wincmn.cpp | 14 +- src/common/xlocale.cpp | 4 +- src/common/zipstrm.cpp | 26 +- src/dfb/utils.cpp | 6 +- src/generic/activityindicator.cpp | 2 +- src/generic/bmpsvg.cpp | 6 +- src/generic/datavgen.cpp | 40 +-- src/generic/datectlg.cpp | 12 +- src/generic/dbgrptg.cpp | 4 +- src/generic/dirctrlg.cpp | 4 +- src/generic/graphicc.cpp | 180 +++++----- src/generic/htmllbox.cpp | 4 +- src/generic/listctrl.cpp | 2 +- src/generic/logg.cpp | 2 +- src/generic/markuptext.cpp | 14 +- src/generic/msgdlgg.cpp | 2 +- src/generic/preferencesg.cpp | 12 +- src/generic/renderg.cpp | 60 ++-- src/generic/richtooltipg.cpp | 2 +- src/generic/scrlwing.cpp | 4 +- src/generic/spinctlg.cpp | 2 +- src/generic/srchctlg.cpp | 16 +- src/generic/tipdlg.cpp | 4 +- src/generic/treectlg.cpp | 4 +- src/generic/treelist.cpp | 18 +- src/generic/vscroll.cpp | 2 +- src/generic/wizard.cpp | 6 +- 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/display.cpp | 48 +-- src/gtk/evtloop.cpp | 2 +- src/gtk/font.cpp | 4 +- src/gtk/image_gtk.cpp | 6 +- src/gtk/nonownedwnd.cpp | 12 +- src/gtk/notifmsg.cpp | 20 +- src/gtk/overlay.cpp | 12 +- src/gtk/print.cpp | 4 +- src/gtk/private.cpp | 4 +- src/gtk/renderer.cpp | 36 +- src/gtk/settings.cpp | 4 +- src/gtk/sockgtk.cpp | 4 +- src/gtk/textentry.cpp | 8 +- src/gtk/toolbar.cpp | 4 +- src/gtk/utilsgtk.cpp | 2 +- src/html/chm.cpp | 24 +- src/html/helpdata.cpp | 8 +- src/html/helpwnd.cpp | 2 +- src/html/htmlfilt.cpp | 8 +- src/html/htmlpars.cpp | 8 +- src/html/htmlwin.cpp | 6 +- src/html/htmprint.cpp | 4 +- src/html/m_hline.cpp | 4 +- src/html/m_image.cpp | 22 +- src/html/m_layout.cpp | 4 +- src/html/m_links.cpp | 4 +- src/html/m_list.cpp | 6 +- src/html/m_tables.cpp | 4 +- src/msw/anybutton.cpp | 28 +- src/msw/app.cpp | 4 +- src/msw/artmsw.cpp | 2 +- src/msw/bitmap.cpp | 2 +- src/msw/bmpbndl.cpp | 8 +- src/msw/checklst.cpp | 6 +- src/msw/cursor.cpp | 6 +- src/msw/dc.cpp | 8 +- src/msw/dde.cpp | 4 +- src/msw/dialup.cpp | 32 +- src/msw/display.cpp | 38 +- src/msw/enhmeta.cpp | 8 +- src/msw/filedlg.cpp | 64 ++-- src/msw/font.cpp | 4 +- src/msw/fswatcher.cpp | 6 +- src/msw/gdiimage.cpp | 18 +- src/msw/gdiplus.cpp | 4 +- src/msw/graphics.cpp | 190 +++++----- src/msw/graphicsd2d.cpp | 330 +++++++++--------- src/msw/headerctrl.cpp | 20 +- src/msw/joystick.cpp | 2 +- src/msw/listbox.cpp | 2 +- src/msw/listctrl.cpp | 4 +- src/msw/mediactrl_am.cpp | 40 +-- src/msw/mediactrl_qt.cpp | 40 +-- src/msw/mediactrl_wmp10.cpp | 40 +-- src/msw/notifmsg.cpp | 16 +- src/msw/ole/access.cpp | 58 +-- src/msw/ole/activex.cpp | 126 +++---- src/msw/ole/dataobj.cpp | 32 +- src/msw/ole/dropsrc.cpp | 4 +- src/msw/ole/droptgt.cpp | 8 +- src/msw/palette.cpp | 2 +- src/msw/progdlg.cpp | 4 +- src/msw/renderer.cpp | 68 ++-- src/msw/richtooltip.cpp | 14 +- src/msw/rt/notifmsgrt.cpp | 20 +- src/msw/rt/utilsrt.cpp | 4 +- src/msw/secretstore.cpp | 6 +- src/msw/settings.cpp | 4 +- src/msw/sockmsw.cpp | 10 +- src/msw/sound.cpp | 12 +- src/msw/taskbar.cpp | 2 +- src/msw/textctrl.cpp | 24 +- src/msw/textentry.cpp | 8 +- src/msw/thread.cpp | 4 +- src/msw/timer.cpp | 4 +- src/msw/toolbar.cpp | 2 +- src/msw/tooltip.cpp | 4 +- src/msw/toplevel.cpp | 4 +- src/msw/treectrl.cpp | 4 +- src/msw/uiaction.cpp | 8 +- src/msw/uilocale.cpp | 46 +-- src/msw/utilsexc.cpp | 4 +- src/msw/webview_edge.cpp | 24 +- src/msw/window.cpp | 4 +- src/osx/artmac.cpp | 4 +- src/osx/carbon/cursor.cpp | 2 +- src/osx/carbon/dcprint.cpp | 14 +- src/osx/carbon/font.cpp | 4 +- src/osx/carbon/gdiobj.cpp | 6 +- src/osx/carbon/graphics.cpp | 188 +++++----- src/osx/carbon/metafile.cpp | 2 +- src/osx/carbon/renderer.cpp | 40 +-- src/osx/core/bitmap.cpp | 8 +- src/osx/core/colour.cpp | 14 +- src/osx/core/display.cpp | 32 +- src/osx/core/hid.cpp | 4 +- src/osx/core/hidjoystick.cpp | 4 +- src/osx/core/secretstore.cpp | 6 +- src/osx/core/sockosx.cpp | 12 +- src/osx/core/sound.cpp | 4 +- src/osx/core/utilsexc_cf.cpp | 2 +- src/osx/dataview_osx.cpp | 18 +- src/osx/palette.cpp | 2 +- src/osx/uiaction_osx.cpp | 12 +- src/osx/window_osx.cpp | 2 +- src/propgrid/advprops.cpp | 12 +- src/propgrid/editors.cpp | 8 +- src/propgrid/manager.cpp | 6 +- src/propgrid/propgrid.cpp | 6 +- src/propgrid/propgridiface.cpp | 2 +- src/propgrid/props.cpp | 2 +- src/qt/anybutton.cpp | 2 +- src/qt/choice.cpp | 2 +- src/qt/combobox.cpp | 4 +- src/qt/display.cpp | 20 +- src/qt/dnd.cpp | 2 +- src/qt/evtloop.cpp | 4 +- src/qt/frame.cpp | 2 +- src/qt/glcanvas.cpp | 12 +- src/qt/graphics.cpp | 164 ++++----- src/qt/listctrl.cpp | 36 +- src/qt/sockqt.cpp | 4 +- src/qt/spinbutt.cpp | 2 +- src/qt/textctrl.cpp | 76 ++-- src/qt/toolbar.cpp | 10 +- src/qt/treectrl.cpp | 14 +- src/qt/uiaction.cpp | 8 +- src/qt/window.cpp | 2 +- src/ribbon/page.cpp | 2 +- src/richtext/richtextbuffer.cpp | 4 +- src/richtext/richtextctrl.cpp | 14 +- src/richtext/richtextformatdlg.cpp | 4 +- src/stc/PlatWX.cpp | 158 ++++----- src/stc/PlatWX.h | 58 +-- src/stc/ScintillaWX.cpp | 12 +- src/stc/ScintillaWX.h | 64 ++-- src/unix/appunix.cpp | 2 +- src/unix/dialup.cpp | 30 +- src/unix/displayx11.cpp | 24 +- src/unix/evtloopunix.cpp | 2 +- src/unix/fswatcher_inotify.cpp | 8 +- src/unix/fswatcher_kqueue.cpp | 14 +- src/unix/joystick.cpp | 2 +- src/unix/mediactrl.cpp | 38 +- src/unix/mediactrl_gstplayer.cpp | 38 +- src/unix/net.cpp | 4 +- src/unix/secretstore.cpp | 18 +- src/unix/sound.cpp | 48 +-- src/unix/sound_sdl.cpp | 16 +- src/unix/threadpsx.cpp | 4 +- src/unix/timerunx.cpp | 4 +- src/unix/uiactionx11.cpp | 20 +- src/unix/uilocale.cpp | 16 +- src/xrc/xh_unkwn.cpp | 10 +- src/xrc/xmlres.cpp | 6 +- tests/allheaders.cpp | 2 +- tests/any/anytest.cpp | 8 +- tests/archive/archivetest.cpp | 4 +- tests/archive/archivetest.h | 22 +- tests/archive/tartest.cpp | 4 +- tests/archive/ziptest.cpp | 18 +- tests/cmdline/cmdlinetest.cpp | 2 +- tests/controls/bitmapcomboboxtest.cpp | 14 +- tests/controls/bitmaptogglebuttontest.cpp | 4 +- tests/controls/checkboxtest.cpp | 4 +- tests/controls/checklistboxtest.cpp | 8 +- tests/controls/choicebooktest.cpp | 10 +- tests/controls/choicetest.cpp | 8 +- tests/controls/comboboxtest.cpp | 16 +- tests/controls/dataviewctrltest.cpp | 12 +- tests/controls/datepickerctrltest.cpp | 4 +- tests/controls/dialogtest.cpp | 2 +- tests/controls/frametest.cpp | 4 +- tests/controls/gaugetest.cpp | 4 +- tests/controls/gridtest.cpp | 18 +- tests/controls/headerctrltest.cpp | 4 +- tests/controls/htmllboxtest.cpp | 8 +- tests/controls/hyperlinkctrltest.cpp | 4 +- tests/controls/itemcontainertest.cpp | 2 +- tests/controls/listbooktest.cpp | 10 +- tests/controls/listboxtest.cpp | 8 +- tests/controls/listctrltest.cpp | 6 +- tests/controls/listviewtest.cpp | 6 +- tests/controls/markuptest.cpp | 34 +- tests/controls/notebooktest.cpp | 10 +- tests/controls/ownerdrawncomboboxtest.cpp | 14 +- tests/controls/pickertest.cpp | 24 +- tests/controls/rearrangelisttest.cpp | 8 +- tests/controls/richtextctrltest.cpp | 4 +- tests/controls/simplebooktest.cpp | 10 +- tests/controls/slidertest.cpp | 4 +- tests/controls/textctrltest.cpp | 12 +- tests/controls/togglebuttontest.cpp | 4 +- tests/controls/toolbooktest.cpp | 12 +- tests/controls/treebooktest.cpp | 10 +- tests/controls/treectrltest.cpp | 4 +- tests/controls/treelistctrltest.cpp | 4 +- tests/controls/virtlistctrltest.cpp | 6 +- tests/drawing/drawing.h | 28 +- tests/drawing/pluginsample.cpp | 14 +- tests/events/evthandler.cpp | 2 +- tests/events/evtlooptest.cpp | 4 +- tests/events/keyboard.cpp | 4 +- tests/events/propagation.cpp | 12 +- tests/events/timertest.cpp | 2 +- tests/exec/exec.cpp | 6 +- tests/file/dir.cpp | 4 +- tests/filesys/filesystest.cpp | 4 +- tests/fswatcher/fswatchertest.cpp | 42 +-- tests/graphics/affinematrix.cpp | 22 +- tests/graphics/bitmap.cpp | 4 +- tests/graphics/bmpbundle.cpp | 4 +- tests/graphics/boundingbox.cpp | 2 +- tests/graphics/colour.cpp | 8 +- tests/graphics/graphmatrix.cpp | 4 +- tests/html/htmlparser.cpp | 2 +- tests/html/htmlwindow.cpp | 4 +- tests/interactive/output.cpp | 4 +- tests/intl/intltest.cpp | 4 +- tests/log/logtest.cpp | 6 +- tests/menu/menu.cpp | 4 +- tests/misc/module.cpp | 4 +- tests/net/socket.cpp | 2 +- tests/net/webrequest.cpp | 2 +- tests/persistence/testpersistence.h | 4 +- tests/streams/ffilestream.cpp | 6 +- tests/streams/fileback.cpp | 2 +- tests/streams/filestream.cpp | 6 +- tests/streams/iostreams.cpp | 2 +- tests/streams/largefile.cpp | 14 +- tests/streams/lzmastream.cpp | 4 +- tests/streams/memstream.cpp | 4 +- tests/streams/socketstream.cpp | 12 +- tests/streams/sstream.cpp | 4 +- tests/streams/zlibstream.cpp | 8 +- tests/test.cpp | 22 +- tests/testimage.h | 8 +- tests/textfile/textfiletest.cpp | 2 +- tests/thread/atomic.cpp | 2 +- tests/thread/misc.cpp | 10 +- tests/thread/queue.cpp | 2 +- tests/thread/tls.cpp | 2 +- tests/weakref/evtconnection.cpp | 2 +- tests/window/setsize.cpp | 2 +- tests/xml/xrctest.cpp | 4 +- utils/wxrc/wxrc.cpp | 4 +- 1282 files changed, 11878 insertions(+), 11878 deletions(-) diff --git a/demos/bombs/bombs.h b/demos/bombs/bombs.h index 82270cfc8a..65b73ec7b0 100644 --- a/demos/bombs/bombs.h +++ b/demos/bombs/bombs.h @@ -21,7 +21,7 @@ class BombsFrame; class BombsApp: public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; private : BombsFrame *m_frame; diff --git a/demos/forty/canvas.h b/demos/forty/canvas.h index cdfac4086e..2b46b3c793 100644 --- a/demos/forty/canvas.h +++ b/demos/forty/canvas.h @@ -23,7 +23,7 @@ public: FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size); virtual ~FortyCanvas(); - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; bool OnCloseCanvas(); void OnMouseEvent(wxMouseEvent& event); void SetCursorStyle(int x, int y); diff --git a/demos/forty/forty.h b/demos/forty/forty.h index 6753b19417..6f2e871486 100644 --- a/demos/forty/forty.h +++ b/demos/forty/forty.h @@ -17,7 +17,7 @@ class FortyApp: public wxApp public: FortyApp(){} virtual ~FortyApp(); - bool OnInit() wxOVERRIDE; + bool OnInit() override; static const wxColour& BackgroundColour(); static const wxColour& TextColour(); diff --git a/demos/forty/game.h b/demos/forty/game.h index 1e3a1296c4..06314e6940 100644 --- a/demos/forty/game.h +++ b/demos/forty/game.h @@ -24,11 +24,11 @@ class Pack : public Pile { public: Pack(int x, int y); virtual ~Pack(); - void Redraw(wxDC& dc) wxOVERRIDE; - void ResetPile() wxOVERRIDE { m_topCard = NumCards - 1; } + void Redraw(wxDC& dc) override; + void ResetPile() override { m_topCard = NumCards - 1; } void Shuffle(); - void AddCard(Card* card) wxOVERRIDE; // Add card - void AddCard(wxDC& dc, Card* card) wxOVERRIDE { AddCard(card); Redraw(dc); } + void AddCard(Card* card) override; // Add card + void AddCard(wxDC& dc, Card* card) override { AddCard(card); Redraw(dc); } }; @@ -39,7 +39,7 @@ class Base : public Pile { public: Base(int x, int y); virtual ~Base(){} - bool AcceptCard(Card* card) wxOVERRIDE; + bool AcceptCard(Card* card) override; }; @@ -50,7 +50,7 @@ class Foundation : public Pile { public: Foundation(int x, int y); virtual ~Foundation(){} - bool AcceptCard(Card* card) wxOVERRIDE; + bool AcceptCard(Card* card) override; }; @@ -61,9 +61,9 @@ class Discard : public Pile { public: Discard(int x, int y); virtual ~Discard(){} - void Redraw(wxDC& dc) wxOVERRIDE; - void GetTopCardPos(int& x, int& y) wxOVERRIDE; - Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset) wxOVERRIDE; + void Redraw(wxDC& dc) override; + void GetTopCardPos(int& x, int& y) override; + Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset) override; }; diff --git a/demos/fractal/fractal.cpp b/demos/fractal/fractal.cpp index 28d8e1541a..6b2113899c 100644 --- a/demos/fractal/fractal.cpp +++ b/demos/fractal/fractal.cpp @@ -51,7 +51,7 @@ static wxMenuBar *menuBar = NULL; class MyApp: public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; wxIMPLEMENT_APP(MyApp); diff --git a/demos/life/game.cpp b/demos/life/game.cpp index 2a0cb3356c..1e1d1f7e67 100644 --- a/demos/life/game.cpp +++ b/demos/life/game.cpp @@ -923,8 +923,8 @@ class LifeModule: public wxModule public: LifeModule() {} - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; + bool OnInit() override; + void OnExit() override; }; wxIMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule); diff --git a/demos/life/life.h b/demos/life/life.h index b2144f5170..1890d9eab5 100644 --- a/demos/life/life.h +++ b/demos/life/life.h @@ -153,7 +153,7 @@ private: class LifeApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; #endif // _LIFE_APP_H_ diff --git a/demos/poem/wxpoem.h b/demos/poem/wxpoem.h index a3c7aead9f..c92be2491e 100644 --- a/demos/poem/wxpoem.h +++ b/demos/poem/wxpoem.h @@ -21,8 +21,8 @@ class MyApp: public wxApp { public: - bool OnInit() wxOVERRIDE; - int OnExit() wxOVERRIDE; + bool OnInit() override; + int OnExit() override; }; wxDECLARE_APP(MyApp); diff --git a/include/wx/activityindicator.h b/include/wx/activityindicator.h index 2d01bdb6cf..c166000717 100644 --- a/include/wx/activityindicator.h +++ b/include/wx/activityindicator.h @@ -33,12 +33,12 @@ public: virtual bool IsRunning() const = 0; // Override some base class virtual methods. - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool AcceptsFocus() const override { return false; } + virtual bool HasTransparentBackground() override { return true; } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } }; #ifndef __WXUNIVERSAL__ diff --git a/include/wx/addremovectrl.h b/include/wx/addremovectrl.h index 617dfa1ee2..d58abaf06e 100644 --- a/include/wx/addremovectrl.h +++ b/include/wx/addremovectrl.h @@ -90,7 +90,7 @@ public: void SetButtonsToolTips(const wxString& addtip, const wxString& removetip); protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; private: // Common part of all ctors. diff --git a/include/wx/affinematrix2d.h b/include/wx/affinematrix2d.h index ce383a96ac..b1c6b94c2a 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) 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; + virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) override; + virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const override; + virtual void Concat(const wxAffineMatrix2DBase& t) override; + virtual bool Invert() override; + virtual bool IsIdentity() const override; + virtual bool IsEqual(const wxAffineMatrix2DBase& t) const override; + virtual void Translate(wxDouble dx, wxDouble dy) override; + virtual void Scale(wxDouble xScale, wxDouble yScale) override; + virtual void Rotate(wxDouble cRadians) override; protected: - virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const wxOVERRIDE; - virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const wxOVERRIDE; + virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const override; + virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const override; 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 bc24dd57ca..b7d7d0a6bf 100644 --- a/include/wx/anidecod.h +++ b/include/wx/anidecod.h @@ -36,26 +36,26 @@ public: ~wxANIDecoder(); - 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; + virtual wxSize GetFrameSize(unsigned int frame) const override; + virtual wxPoint GetFramePosition(unsigned int frame) const override; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const override; + virtual long GetDelay(unsigned int frame) const override; + virtual wxColour GetTransparentColour(unsigned int frame) const override; // implementation of wxAnimationDecoder's pure virtuals - virtual bool Load( wxInputStream& stream ) wxOVERRIDE; + virtual bool Load( wxInputStream& stream ) override; - bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE; + bool ConvertToImage(unsigned int frame, wxImage *image) const override; - wxAnimationDecoder *Clone() const wxOVERRIDE + wxAnimationDecoder *Clone() const override { return new wxANIDecoder; } - wxAnimationType GetType() const wxOVERRIDE + wxAnimationType GetType() const override { return wxANIMATION_TYPE_ANI; } protected: // wxAnimationDecoder pure virtual: - virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) const override; // modifies current stream position (see wxAnimationDecoder::CanRead) private: diff --git a/include/wx/any.h b/include/wx/any.h index 6a26e68fee..3f3eb47c1e 100644 --- a/include/wx/any.h +++ b/include/wx/any.h @@ -166,7 +166,7 @@ public: \ { \ return AreSameClasses(*sm_instance.get(), *otherType); \ } \ - virtual bool IsSameType(const wxAnyValueType* otherType) const wxOVERRIDE \ + virtual bool IsSameType(const wxAnyValueType* otherType) const override \ { \ return IsSameClass(otherType); \ } \ @@ -292,13 +292,13 @@ public: wxAnyValueTypeImplBase() : wxAnyValueType() { } virtual ~wxAnyValueTypeImplBase() { } - virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE + virtual void DeleteValue(wxAnyValueBuffer& buf) const override { Ops::DeleteValue(buf); } virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { Ops::SetValue(Ops::GetValue(src), dst); } @@ -344,7 +344,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { wxUnusedVar(src); wxUnusedVar(dstType); @@ -422,7 +422,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; + wxAnyValueBuffer& dst) const override; }; @@ -437,7 +437,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; + wxAnyValueBuffer& dst) const override; }; @@ -473,7 +473,7 @@ public: \ virtual ~wxAnyValueTypeImpl##TYPENAME() { } \ virtual bool ConvertValue(const wxAnyValueBuffer& src, \ wxAnyValueType* dstType, \ - wxAnyValueBuffer& dst) const wxOVERRIDE \ + wxAnyValueBuffer& dst) const override \ { \ GV value = GetValue(src); \ return CONVFUNC(value, dstType, dst); \ @@ -526,7 +526,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; + wxAnyValueBuffer& dst) const override; }; // @@ -543,7 +543,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE; + wxAnyValueBuffer& dst) const override; }; // WX_ANY_DEFINE_SUB_TYPE requires this @@ -571,7 +571,7 @@ public: \ \ virtual bool ConvertValue(const wxAnyValueBuffer& src, \ wxAnyValueType* dstType, \ - wxAnyValueBuffer& dst) const wxOVERRIDE \ + wxAnyValueBuffer& dst) const override \ { \ wxUnusedVar(src); \ wxUnusedVar(dstType); \ @@ -620,7 +620,7 @@ public: wxAnyValueTypeImplBase() { } virtual ~wxAnyValueTypeImplVariantData() { } - virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE + virtual void DeleteValue(wxAnyValueBuffer& buf) const override { wxVariantData* data = static_cast(buf.m_ptr); if ( data ) @@ -628,7 +628,7 @@ public: } virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { wxVariantData* data = static_cast(src.m_ptr); if ( data ) @@ -650,7 +650,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { wxUnusedVar(src); wxUnusedVar(dstType); diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h index f6a015b63b..411c06a853 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 wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { return false; } // backwards compatible names for pressed/current bitmaps: they're not // deprecated as there is nothing really wrong with using them and no real @@ -152,7 +152,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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 e6ac097aaf..b95b905cd9 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) wxOVERRIDE; + virtual int FilterEvent(wxEvent& event) override; // return true if we're running event loop, i.e. if the events can // (already) be dispatched @@ -567,7 +567,7 @@ public: // very first initialization function // // Override: very rarely - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; + virtual bool Initialize(int& argc, wxChar **argv) override; // a platform-dependent version of OnInit(): the code here is likely to // depend on the toolkit. default version does nothing. @@ -582,15 +582,15 @@ public: // of the program really starts here // // Override: rarely in GUI applications, always in console ones. - virtual int OnRun() wxOVERRIDE; + virtual int OnRun() override; // a matching function for OnInit() - virtual int OnExit() wxOVERRIDE; + virtual int OnExit() override; // very last clean up function // // Override: very rarely - virtual void CleanUp() wxOVERRIDE; + virtual void CleanUp() override; // the worker functions - usually not used directly by the user code @@ -605,10 +605,10 @@ public: // parties // // it should return true if more idle events are needed, false if not - virtual bool ProcessIdle() wxOVERRIDE; + virtual bool ProcessIdle() override; // override base class version: GUI apps always use an event loop - virtual bool UsesEventLoop() const wxOVERRIDE { return true; } + virtual bool UsesEventLoop() const override { return true; } // top level window functions @@ -675,8 +675,8 @@ public: // ------------------------------------------------------------------------ #if wxUSE_CMDLINE_PARSER - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; #endif // miscellaneous other stuff @@ -687,7 +687,7 @@ public: // deactivated virtual void SetActive(bool isActive, wxWindow *lastFocus); - virtual bool IsGUI() const wxOVERRIDE { return true; } + virtual bool IsGUI() const override { return true; } // returns non-null pointer only if we have a GUI application object: this // is only useful in the rare cases when the same code can be used in both @@ -702,7 +702,7 @@ public: protected: // override base class method to use GUI traits - virtual wxAppTraits *CreateTraits() wxOVERRIDE; + virtual wxAppTraits *CreateTraits() override; // Helper method deleting all existing top level windows: this is used // during the application shutdown. diff --git a/include/wx/appprogress.h b/include/wx/appprogress.h index 63bd6e5a14..72293c3c33 100644 --- a/include/wx/appprogress.h +++ b/include/wx/appprogress.h @@ -42,12 +42,12 @@ private: { } - virtual bool IsAvailable() const wxOVERRIDE { return false; } + virtual bool IsAvailable() const override { return false; } - virtual void SetValue(int WXUNUSED(value)) wxOVERRIDE { } - virtual void SetRange(int WXUNUSED(range)) wxOVERRIDE { } - virtual void Pulse() wxOVERRIDE { } - virtual void Reset() wxOVERRIDE { } + virtual void SetValue(int WXUNUSED(value)) override { } + virtual void SetRange(int WXUNUSED(range)) override { } + virtual void Pulse() override { } + virtual void Reset() override { } }; #endif diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index de26e6e771..cc86eeba90 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -206,27 +206,27 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits { public: #if !wxUSE_CONSOLE_EVENTLOOP - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE { return NULL; } + virtual wxEventLoopBase *CreateEventLoop() override { return NULL; } #endif // !wxUSE_CONSOLE_EVENTLOOP #if wxUSE_LOG - virtual wxLog *CreateLogTarget() wxOVERRIDE; + virtual wxLog *CreateLogTarget() override; #endif // wxUSE_LOG - virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE; + virtual wxMessageOutput *CreateMessageOutput() override; #if wxUSE_FONTMAP - virtual wxFontMapper *CreateFontMapper() wxOVERRIDE; + virtual wxFontMapper *CreateFontMapper() override; #endif // wxUSE_FONTMAP - virtual wxRendererNative *CreateRenderer() wxOVERRIDE; + virtual wxRendererNative *CreateRenderer() override; - virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; - virtual bool HasStderr() wxOVERRIDE; + virtual bool ShowAssertDialog(const wxString& msg) override; + virtual bool HasStderr() override; virtual bool SafeMessageBox(const wxString& text, - const wxString& title) wxOVERRIDE; + const wxString& title) override; // the GetToolkitVersion for console application is always the same wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL, - int *verMicro = NULL) const wxOVERRIDE + int *verMicro = NULL) const override { // no toolkits (wxBase is for console applications without GUI support) // NB: zero means "no toolkit", -1 means "not initialized yet" @@ -237,8 +237,8 @@ public: return wxPORT_BASE; } - virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { return false; } - virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; } + virtual bool IsUsingUniversalWidgets() const override { return false; } + virtual wxString GetDesktopEnvironment() const override { return wxEmptyString; } }; // ---------------------------------------------------------------------------- @@ -251,25 +251,25 @@ class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits { public: #if wxUSE_LOG - virtual wxLog *CreateLogTarget() wxOVERRIDE; + virtual wxLog *CreateLogTarget() override; #endif // wxUSE_LOG - virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE; + virtual wxMessageOutput *CreateMessageOutput() override; #if wxUSE_FONTMAP - virtual wxFontMapper *CreateFontMapper() wxOVERRIDE; + virtual wxFontMapper *CreateFontMapper() override; #endif // wxUSE_FONTMAP - virtual wxRendererNative *CreateRenderer() wxOVERRIDE; + virtual wxRendererNative *CreateRenderer() override; - virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; - virtual bool HasStderr() wxOVERRIDE; + virtual bool ShowAssertDialog(const wxString& msg) override; + virtual bool HasStderr() override; // Win32 has its own implementation using native message box directly in // the base class, don't override it. #ifndef __WIN32__ virtual bool SafeMessageBox(const wxString& text, - const wxString& title) wxOVERRIDE; + const wxString& title) override; #endif // !__WIN32__ - virtual bool IsUsingUniversalWidgets() const wxOVERRIDE + virtual bool IsUsingUniversalWidgets() const override { #ifdef __WXUNIVERSAL__ return true; @@ -278,7 +278,7 @@ public: #endif } - virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; } + virtual wxString GetDesktopEnvironment() const override { return wxEmptyString; } }; #endif // wxUSE_GUI diff --git a/include/wx/archive.h b/include/wx/archive.h index 2e32e7a497..1cd6c55d47 100644 --- a/include/wx/archive.h +++ b/include/wx/archive.h @@ -99,7 +99,7 @@ public: wxArchiveEntry *GetNextEntry() { return DoGetNextEntry(); } - virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); } + virtual char Peek() override { return wxInputStream::Peek(); } protected: wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv); diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index c8abbcebd6..6d0f74638b 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -76,7 +76,7 @@ public: m_isDropdownClicked = false; m_toolId = -1; } - wxEvent *Clone() const wxOVERRIDE { return new wxAuiToolBarEvent(*this); } + wxEvent *Clone() const override { return new wxAuiToolBarEvent(*this); } bool IsDropDownClicked() const { return m_isDropdownClicked; } void SetDropDownClicked(bool c) { m_isDropdownClicked = c; } @@ -356,80 +356,80 @@ public: wxAuiGenericToolBarArt(); virtual ~wxAuiGenericToolBarArt(); - virtual wxAuiToolBarArt* Clone() wxOVERRIDE; - virtual void SetFlags(unsigned int flags) wxOVERRIDE; - virtual unsigned int GetFlags() wxOVERRIDE; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual wxFont GetFont() wxOVERRIDE; - virtual void SetTextOrientation(int orientation) wxOVERRIDE; - virtual int GetTextOrientation() wxOVERRIDE; + virtual wxAuiToolBarArt* Clone() override; + virtual void SetFlags(unsigned int flags) override; + virtual unsigned int GetFlags() override; + virtual void SetFont(const wxFont& font) override; + virtual wxFont GetFont() override; + virtual void SetTextOrientation(int orientation) override; + virtual int GetTextOrientation() override; virtual void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawPlainBackground(wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawDropDownButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawControlLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawSeparator( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawGripper( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawOverflowButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, - int state) wxOVERRIDE; + int state) override; virtual wxSize GetLabelSize( wxDC& dc, wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; + const wxAuiToolBarItem& item) override; virtual wxSize GetToolSize( wxDC& dc, wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; + const wxAuiToolBarItem& item) override; - virtual int GetElementSize(int element) wxOVERRIDE; - virtual void SetElementSize(int elementId, int size) wxOVERRIDE; + virtual int GetElementSize(int element) override; + virtual void SetElementSize(int elementId, int size) override; virtual int ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items) wxOVERRIDE; + const wxAuiToolBarItemArray& items) override; - virtual void UpdateColoursFromSystem() wxOVERRIDE; + virtual void UpdateColoursFromSystem() override; protected: @@ -480,12 +480,12 @@ public: const wxSize& size = wxDefaultSize, long style = wxAUI_TB_DEFAULT_STYLE); - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; void SetArtProvider(wxAuiToolBarArt* art); wxAuiToolBarArt* GetArtProvider() const; - bool SetFont(const wxFont& font) wxOVERRIDE; + bool SetFont(const wxFont& font) override; wxAuiToolBarItem* AddTool(int toolId, @@ -616,7 +616,7 @@ public: bool IsPaneValid(const wxAuiPaneInfo& pane) const; // Override to call DoIdleUpdate(). - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE; + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) override; protected: void Init(); diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h index 1fb144ad6c..eee31b50aa 100644 --- a/include/wx/aui/auibook.h +++ b/include/wx/aui/auibook.h @@ -70,7 +70,7 @@ public: { m_dragSource = NULL; } - wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); } + wxEvent *Clone() const override { return new wxAuiNotebookEvent(*this); } void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; } wxAuiNotebook* GetDragSource() const { return m_dragSource; } @@ -204,7 +204,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } void OnPaint(wxPaintEvent& evt); void OnEraseBackground(wxEraseEvent& evt); @@ -269,7 +269,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0); - void SetWindowStyleFlag(long style) wxOVERRIDE; + void SetWindowStyleFlag(long style) override; void SetArtProvider(wxAuiTabArt* art); wxAuiTabArt* GetArtProvider() const; @@ -287,19 +287,19 @@ public: bool select = false, const wxBitmapBundle& bitmap = wxBitmapBundle()); - bool DeletePage(size_t page) wxOVERRIDE; - bool RemovePage(size_t page) wxOVERRIDE; + bool DeletePage(size_t page) override; + bool RemovePage(size_t page) override; - virtual size_t GetPageCount() const wxOVERRIDE; - virtual wxWindow* GetPage(size_t pageIdx) const wxOVERRIDE; - virtual int FindPage(const wxWindow* page) const wxOVERRIDE; + virtual size_t GetPageCount() const override; + virtual wxWindow* GetPage(size_t pageIdx) const override; + virtual int FindPage(const wxWindow* page) const override; // This is wxAUI-specific equivalent of FindPage(), prefer to use the other // function. int GetPageIndex(wxWindow* pageWnd) const { return FindPage(pageWnd); } - bool SetPageText(size_t page, const wxString& text) wxOVERRIDE; - wxString GetPageText(size_t pageIdx) const wxOVERRIDE; + bool SetPageText(size_t page, const wxString& text) override; + wxString GetPageText(size_t pageIdx) const override; bool SetPageToolTip(size_t page, const wxString& text); wxString GetPageToolTip(size_t pageIdx) const; @@ -307,8 +307,8 @@ public: bool SetPageBitmap(size_t page, const wxBitmapBundle& bitmap); wxBitmap GetPageBitmap(size_t pageIdx) const; - int SetSelection(size_t newPage) wxOVERRIDE; - int GetSelection() const wxOVERRIDE; + int SetSelection(size_t newPage) override; + int GetSelection() const override; virtual void Split(size_t page, int direction); @@ -324,7 +324,7 @@ public: void SetMeasuringFont(const wxFont& font); // Sets the tab font - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; // Gets the tab control height int GetTabCtrlHeight() const; @@ -336,28 +336,28 @@ public: bool ShowWindowMenu(); // we do have multiple pages - virtual bool HasMultiplePages() const wxOVERRIDE { return true; } + virtual bool HasMultiplePages() const override { return true; } // we don't want focus for ourselves // virtual bool AcceptsFocus() const { return false; } //wxBookCtrlBase functions - virtual void SetPageSize (const wxSize &size) wxOVERRIDE; - virtual int HitTest (const wxPoint &pt, long *flags=NULL) const wxOVERRIDE; + virtual void SetPageSize (const wxSize &size) override; + virtual int HitTest (const wxPoint &pt, long *flags=NULL) const override; - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; + virtual int GetPageImage(size_t n) const override; + virtual bool SetPageImage(size_t n, int imageId) override; - virtual int ChangeSelection(size_t n) wxOVERRIDE; + virtual int ChangeSelection(size_t n) override; virtual bool AddPage(wxWindow *page, const wxString &text, bool select, - int imageId) wxOVERRIDE; - virtual bool DeleteAllPages() wxOVERRIDE; + int imageId) override; + virtual bool DeleteAllPages() override; virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text, - bool select, int imageId) wxOVERRIDE; + bool select, int imageId) override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt); wxAuiTabCtrl* GetActiveTabCtrl(); @@ -368,10 +368,10 @@ protected: void Init(); // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // Redo sizing after thawing - virtual void DoThaw() wxOVERRIDE; + virtual void DoThaw() override; // these can be overridden @@ -383,7 +383,7 @@ protected: virtual wxSize CalculateNewSplitSize(); // remove the page and return a pointer to it - virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) wxOVERRIDE { return NULL; } + virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) override { return NULL; } //A general selection function virtual int DoModifySelection(size_t n, bool events); diff --git a/include/wx/aui/barartmsw.h b/include/wx/aui/barartmsw.h index 59602f0098..92fc6bc627 100644 --- a/include/wx/aui/barartmsw.h +++ b/include/wx/aui/barartmsw.h @@ -15,68 +15,68 @@ class WXDLLIMPEXP_AUI wxAuiMSWToolBarArt : public wxAuiGenericToolBarArt public: wxAuiMSWToolBarArt(); - virtual wxAuiToolBarArt* Clone() wxOVERRIDE; + virtual wxAuiToolBarArt* Clone() override; virtual void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawDropDownButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawControlLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawSeparator( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawGripper( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; virtual void DrawOverflowButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, - int state) wxOVERRIDE; + int state) override; virtual wxSize GetLabelSize( wxDC& dc, wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; + const wxAuiToolBarItem& item) override; virtual wxSize GetToolSize( wxDC& dc, wxWindow* wnd, - const wxAuiToolBarItem& item) wxOVERRIDE; + const wxAuiToolBarItem& item) override; - virtual int GetElementSize(int element) wxOVERRIDE; - virtual void SetElementSize(int elementId, int size) wxOVERRIDE; + virtual int GetElementSize(int element) override; + virtual void SetElementSize(int elementId, int size) override; virtual int ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items) wxOVERRIDE; + const wxAuiToolBarItemArray& items) override; private: bool m_themed; diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h index 84bdb5c10a..be380579fb 100644 --- a/include/wx/aui/dockart.h +++ b/include/wx/aui/dockart.h @@ -93,46 +93,46 @@ public: wxAuiDefaultDockArt(); - wxAuiDockArt* Clone() wxOVERRIDE; - int GetMetric(int metricId) wxOVERRIDE; - void SetMetric(int metricId, int newVal) wxOVERRIDE; - wxColour GetColour(int id) wxOVERRIDE; - void SetColour(int id, const wxColor& colour) wxOVERRIDE; - void SetFont(int id, const wxFont& font) wxOVERRIDE; - wxFont GetFont(int id) wxOVERRIDE; + wxAuiDockArt* Clone() override; + int GetMetric(int metricId) override; + void SetMetric(int metricId, int newVal) override; + wxColour GetColour(int id) override; + void SetColour(int id, const wxColor& colour) override; + void SetFont(int id, const wxFont& font) override; + wxFont GetFont(int id) override; void DrawSash(wxDC& dc, wxWindow *window, int orientation, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawBackground(wxDC& dc, wxWindow *window, int orientation, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawCaption(wxDC& dc, wxWindow *window, const wxString& text, const wxRect& rect, - wxAuiPaneInfo& pane) wxOVERRIDE; + wxAuiPaneInfo& pane) override; void DrawGripper(wxDC& dc, wxWindow *window, const wxRect& rect, - wxAuiPaneInfo& pane) wxOVERRIDE; + wxAuiPaneInfo& pane) override; void DrawBorder(wxDC& dc, wxWindow *window, const wxRect& rect, - wxAuiPaneInfo& pane) wxOVERRIDE; + wxAuiPaneInfo& pane) override; void DrawPaneButton(wxDC& dc, wxWindow *window, int button, int buttonState, const wxRect& rect, - wxAuiPaneInfo& pane) wxOVERRIDE; + wxAuiPaneInfo& pane) override; #if WXWIN_COMPATIBILITY_3_0 wxDEPRECATED_MSG("This is not intended for the public API") @@ -141,7 +141,7 @@ public: wxAuiPaneInfo& pane); #endif - virtual void UpdateColoursFromSystem() wxOVERRIDE; + virtual void UpdateColoursFromSystem() override; protected: diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h index 3a81bf8ede..12a8f3fdb9 100644 --- a/include/wx/aui/floatpane.h +++ b/include/wx/aui/floatpane.h @@ -44,7 +44,7 @@ public: wxAuiManager* GetOwnerManager() const; // Allow processing accelerators to the parent frame - virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE; + virtual bool IsTopNavigationDomain(NavigationKind kind) const override; wxAuiManager& GetAuiManager() { return m_mgr; } diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index 333f626ff5..7c7929ba8a 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -637,7 +637,7 @@ public: canveto_flag = true; dc = NULL; } - wxEvent *Clone() const wxOVERRIDE { return new wxAuiManagerEvent(*this); } + wxEvent *Clone() const override { 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 1dde8225da..23fddd423d 100644 --- a/include/wx/aui/tabart.h +++ b/include/wx/aui/tabart.h @@ -124,27 +124,27 @@ public: wxAuiGenericTabArt(); virtual ~wxAuiGenericTabArt(); - wxAuiTabArt* Clone() wxOVERRIDE; - void SetFlags(unsigned int flags) wxOVERRIDE; + wxAuiTabArt* Clone() override; + void SetFlags(unsigned int flags) override; void SetSizingInfo(const wxSize& tabCtrlSize, size_t tabCount, - wxWindow* wnd = NULL) wxOVERRIDE; + wxWindow* wnd = NULL) override; - 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 SetNormalFont(const wxFont& font) override; + void SetSelectedFont(const wxFont& font) override; + void SetMeasuringFont(const wxFont& font) override; + void SetColour(const wxColour& colour) override; + void SetActiveColour(const wxColour& colour) override; void DrawBorder( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawTab(wxDC& dc, wxWindow* wnd, @@ -153,7 +153,7 @@ public: int closeButtonState, wxRect* outTabRect, wxRect* outButtonRect, - int* xExtent) wxOVERRIDE; + int* xExtent) override; void DrawButton( wxDC& dc, @@ -162,15 +162,15 @@ public: int bitmapId, int buttonState, int orientation, - wxRect* outRect) wxOVERRIDE; + wxRect* outRect) override; - int GetIndentSize() wxOVERRIDE; + int GetIndentSize() override; int GetBorderWidth( - wxWindow* wnd) wxOVERRIDE; + wxWindow* wnd) override; int GetAdditionalBorderSpace( - wxWindow* wnd) wxOVERRIDE; + wxWindow* wnd) override; wxSize GetTabSize( wxDC& dc, @@ -179,19 +179,19 @@ public: const wxBitmapBundle& bitmap, bool active, int closeButtonState, - int* xExtent) wxOVERRIDE; + int* xExtent) override; int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int activeIdx) wxOVERRIDE; + int activeIdx) override; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) wxOVERRIDE; + const wxSize& requiredBmpSize) override; // Provide opportunity for subclasses to recalculate colours - virtual void UpdateColoursFromSystem() wxOVERRIDE; + virtual void UpdateColoursFromSystem() override; protected: @@ -226,28 +226,28 @@ public: wxAuiSimpleTabArt(); virtual ~wxAuiSimpleTabArt(); - wxAuiTabArt* Clone() wxOVERRIDE; - void SetFlags(unsigned int flags) wxOVERRIDE; + wxAuiTabArt* Clone() override; + void SetFlags(unsigned int flags) override; void SetSizingInfo(const wxSize& tabCtrlSize, size_t tabCount, - wxWindow* wnd = NULL) wxOVERRIDE; + wxWindow* wnd = NULL) override; - 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 SetNormalFont(const wxFont& font) override; + void SetSelectedFont(const wxFont& font) override; + void SetMeasuringFont(const wxFont& font) override; + void SetColour(const wxColour& colour) override; + void SetActiveColour(const wxColour& colour) override; void DrawBorder( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawTab(wxDC& dc, wxWindow* wnd, @@ -256,7 +256,7 @@ public: int closeButtonState, wxRect* outTabRect, wxRect* outButtonRect, - int* xExtent) wxOVERRIDE; + int* xExtent) override; void DrawButton( wxDC& dc, @@ -265,15 +265,15 @@ public: int bitmapId, int buttonState, int orientation, - wxRect* outRect) wxOVERRIDE; + wxRect* outRect) override; - int GetIndentSize() wxOVERRIDE; + int GetIndentSize() override; int GetBorderWidth( - wxWindow* wnd) wxOVERRIDE; + wxWindow* wnd) override; int GetAdditionalBorderSpace( - wxWindow* wnd) wxOVERRIDE; + wxWindow* wnd) override; wxSize GetTabSize( wxDC& dc, @@ -282,16 +282,16 @@ public: const wxBitmapBundle& bitmap, bool active, int closeButtonState, - int* xExtent) wxOVERRIDE; + int* xExtent) override; int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int activeIdx) wxOVERRIDE; + int activeIdx) override; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) wxOVERRIDE; + const wxSize& requiredBmpSize) override; protected: diff --git a/include/wx/aui/tabartgtk.h b/include/wx/aui/tabartgtk.h index 5ba7a8168a..5ea5f66171 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() wxOVERRIDE; - virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE; - virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE; + virtual wxAuiTabArt* Clone() override; + virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) override; + virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) override; 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) wxOVERRIDE; + int* x_extent) override; void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, - int button_state, int orientation, wxRect* out_rect) wxOVERRIDE; + int button_state, int orientation, wxRect* out_rect) override; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size) wxOVERRIDE; - int GetBorderWidth(wxWindow* wnd) wxOVERRIDE; - int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE; + const wxSize& required_bmp_size) override; + int GetBorderWidth(wxWindow* wnd) override; + int GetAdditionalBorderSpace(wxWindow* wnd) override; virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmapBundle& bitmap, bool active, - int close_button_state, int* x_extent) wxOVERRIDE; + int close_button_state, int* x_extent) override; }; #endif // wxUSE_AUI diff --git a/include/wx/aui/tabartmsw.h b/include/wx/aui/tabartmsw.h index 32063af2a5..8a6b15ba11 100644 --- a/include/wx/aui/tabartmsw.h +++ b/include/wx/aui/tabartmsw.h @@ -18,17 +18,17 @@ public: wxAuiMSWTabArt(); virtual ~wxAuiMSWTabArt(); - wxAuiTabArt* Clone() wxOVERRIDE; + wxAuiTabArt* Clone() override; void DrawBorder( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawTab(wxDC& dc, wxWindow* wnd, @@ -37,7 +37,7 @@ public: int closeButtonState, wxRect* outTabRect, wxRect* outButtonRect, - int* xExtent) wxOVERRIDE; + int* xExtent) override; void DrawButton( wxDC& dc, @@ -46,15 +46,15 @@ public: int bitmapId, int buttonState, int orientation, - wxRect* outRect) wxOVERRIDE; + wxRect* outRect) override; - int GetIndentSize() wxOVERRIDE; + int GetIndentSize() override; int GetBorderWidth( - wxWindow* wnd) wxOVERRIDE; + wxWindow* wnd) override; int GetAdditionalBorderSpace( - wxWindow* wnd) wxOVERRIDE; + wxWindow* wnd) override; wxSize GetTabSize( wxDC& dc, @@ -63,16 +63,16 @@ public: const wxBitmapBundle& bitmap, bool active, int closeButtonState, - int* xExtent) wxOVERRIDE; + int* xExtent) override; int ShowDropDown( wxWindow* wnd, const wxAuiNotebookPageArray& items, - int activeIdx) wxOVERRIDE; + int activeIdx) override; int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) wxOVERRIDE; + const wxSize& requiredBmpSize) override; private: bool m_themed; diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index a8ee5d38e6..8c5339e997 100644 --- a/include/wx/aui/tabmdi.h +++ b/include/wx/aui/tabmdi.h @@ -66,7 +66,7 @@ public: wxMenu* GetWindowMenu() const { return m_pWindowMenu; } void SetWindowMenu(wxMenu* pMenu); - virtual void SetMenuBar(wxMenuBar *pMenuBar) wxOVERRIDE; + virtual void SetMenuBar(wxMenuBar *pMenuBar) override; #endif // wxUSE_MENUS void SetChildMenuBar(wxAuiMDIChildFrame *pChild); @@ -103,9 +103,9 @@ protected: void DoHandleUpdateUI(wxUpdateUIEvent &event); #endif // wxUSE_MENUS - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; + virtual bool ProcessEvent(wxEvent& event) override; - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; private: void OnClose(wxCloseEvent& event); @@ -143,18 +143,18 @@ public: const wxString& name = wxASCII_STR(wxFrameNameStr)); #if wxUSE_MENUS - virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE; - virtual wxMenuBar *GetMenuBar() const wxOVERRIDE; + virtual void SetMenuBar(wxMenuBar *menuBar) override; + virtual wxMenuBar *GetMenuBar() const override; #endif // wxUSE_MENUS - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; - virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; + virtual void SetIcons(const wxIconBundle& icons) override; - virtual void Activate() wxOVERRIDE; - virtual bool Destroy() wxOVERRIDE; + virtual void Activate() override; + virtual bool Destroy() override; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; void OnMenuHighlight(wxMenuEvent& evt); diff --git a/include/wx/bannerwindow.h b/include/wx/bannerwindow.h index 6c9ac86f0e..0c91201d61 100644 --- a/include/wx/bannerwindow.h +++ b/include/wx/bannerwindow.h @@ -86,7 +86,7 @@ public: void SetGradient(const wxColour& start, const wxColour& end); protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; private: // Common part of all constructors. diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index 33bf6145cd..8531b617e7 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -224,10 +224,10 @@ public: // we do have multiple pages - virtual bool HasMultiplePages() const wxOVERRIDE { return true; } + virtual bool HasMultiplePages() const override { return true; } // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } // Implementation only from now on. @@ -246,7 +246,7 @@ protected: }; // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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 @@ -314,7 +314,7 @@ protected: virtual wxWindow *DoRemovePage(size_t page) = 0; // our best size is the size which fits all our pages - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // helper: get the next page wrapping if we reached the end int GetNextPage(bool forward) const; @@ -325,7 +325,7 @@ protected: // It is better to make this control transparent so that by default the controls on // its pages are on the same colour background as the rest of the window. If the user // prefers a coloured background they can set the background colour on the page panel - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool HasTransparentBackground() override { return true; } // This method also invalidates the size of the controller and should be // called instead of just InvalidateBestSize() whenever pages are added or @@ -402,7 +402,7 @@ public: m_nOldSel = event.m_nOldSel; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxBookCtrlEvent(*this); } + virtual wxEvent *Clone() const override { 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 8af0a54bd8..14f4782e38 100644 --- a/include/wx/calctrl.h +++ b/include/wx/calctrl.h @@ -167,7 +167,7 @@ public: void SetWeekDay(wxDateTime::WeekDay wd) { m_wday = wd; } wxDateTime::WeekDay GetWeekDay() const { return m_wday; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalendarEvent(*this); } + virtual wxEvent *Clone() const override { return new wxCalendarEvent(*this); } private: wxDateTime::WeekDay m_wday; diff --git a/include/wx/catch_cppunit.h b/include/wx/catch_cppunit.h index 652367c7e6..413554c6e4 100644 --- a/include/wx/catch_cppunit.h +++ b/include/wx/catch_cppunit.h @@ -157,7 +157,7 @@ public: void addTest(Test* test) { m_tests.push_back(test); } size_t getChildTestCount() const { return m_tests.size(); } - void runTest() wxOVERRIDE + void runTest() override { for ( size_t n = 0; n < m_tests.size(); ++n ) { @@ -226,7 +226,7 @@ inline std::string wxGetCurrentTestName() // below and there just doesn't seem to be any way around it. #define CPPUNIT_TEST_SUITE(testclass) \ public: \ - void runTest() wxOVERRIDE \ + void runTest() override \ { \ using namespace wxPrivate; \ TempStringAssign setClass(wxTheCurrentTestClass, #testclass) diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 36f5276ace..134fdac4ed 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -97,7 +97,7 @@ public: return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER); } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool HasTransparentBackground() override { return true; } // This semi-private function is currently used to allow wxMSW checkbox to // blend in with its parent background colour without changing the @@ -105,7 +105,7 @@ public: virtual void SetTransparentPartColour(const wxColour& WXUNUSED(col)) { } // wxCheckBox-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override { wxControl::DoUpdateWindowUI(event); @@ -115,7 +115,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } diff --git a/include/wx/choice.h b/include/wx/choice.h index b5bfac3b1a..d8970afbc6 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) wxOVERRIDE; + void Command(wxCommandEvent& event) override; // override wxItemContainer::IsSorted - virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); } + virtual bool IsSorted() const override { 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 wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: wxDECLARE_NO_COPY_CLASS(wxChoiceBase); diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 8df8221ebd..65c04b0266 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -60,37 +60,37 @@ public: const wxString& name = wxEmptyString); - 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 SetPageText(size_t n, const wxString& strText) override; + virtual wxString GetPageText(size_t n) const override; + virtual int GetPageImage(size_t n) const override; + virtual bool SetPageImage(size_t n, int imageId) override; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; - virtual int SetSelection(size_t n) wxOVERRIDE + int imageId = NO_IMAGE) override; + virtual int SetSelection(size_t n) override { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); } - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; + virtual int ChangeSelection(size_t n) override { return DoSetSelection(n); } + virtual void SetImageList(wxImageList *imageList) override; - virtual bool DeleteAllPages() wxOVERRIDE; + virtual bool DeleteAllPages() override; // returns the choice control wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; } protected: - virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE; + virtual void DoSetWindowVariant(wxWindowVariant variant) override; - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; + virtual wxWindow *DoRemovePage(size_t page) override; - void UpdateSelectedPage(size_t newsel) wxOVERRIDE + void UpdateSelectedPage(size_t newsel) override { GetChoiceCtrl()->Select(static_cast(newsel)); } - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; + wxBookCtrlEvent* CreatePageChangingEvent() const override; + void MakeChangedEvent(wxBookCtrlEvent &event) override; // event handlers void OnChoiceSelected(wxCommandEvent& event); diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 2c37937c58..5263837d48 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 wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxClipboardEvent(*this); } diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 0917ff627b..079eee5eb7 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -137,16 +137,16 @@ public: // public API public: // internal functions // update the button colour to match the text control contents - void UpdatePickerFromTextCtrl() wxOVERRIDE; + void UpdatePickerFromTextCtrl() override; // update the text control to match the button's colour - void UpdateTextCtrlFromPicker() wxOVERRIDE; + void UpdateTextCtrlFromPicker() override; // event handler for our picker void OnColourChange(wxColourPickerEvent &); protected: - virtual long GetPickerStyle(long style) const wxOVERRIDE + virtual long GetPickerStyle(long style) const override { return (style & (wxCLRP_SHOW_LABEL | wxCLRP_SHOW_ALPHA)); } private: @@ -178,7 +178,7 @@ public: // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxColourPickerEvent(*this); } + virtual wxEvent *Clone() const override { return new wxColourPickerEvent(*this); } private: wxColour m_colour; diff --git a/include/wx/collpane.h b/include/wx/collpane.h index 9965463e63..a27d0db603 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -41,13 +41,13 @@ public: virtual wxWindow *GetPane() const = 0; - virtual wxString GetLabel() const wxOVERRIDE = 0; - virtual void SetLabel(const wxString& label) wxOVERRIDE = 0; + virtual wxString GetLabel() const override = 0; + virtual void SetLabel(const wxString& label) override = 0; virtual bool InformFirstDirection(int direction, int size, - int availableOtherDir) wxOVERRIDE + int availableOtherDir) override { wxWindow* const p = GetPane(); if ( !p ) @@ -87,7 +87,7 @@ public: // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCollapsiblePaneEvent(*this); } + virtual wxEvent *Clone() const override { return new wxCollapsiblePaneEvent(*this); } private: bool m_bCollapsed; diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 5e724f48f1..39981ff57e 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -57,7 +57,7 @@ public: wxColour GetColour() const { return m_colour; } void SetColour(const wxColour& colour) { m_colour = colour; } - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxColourDialogEvent(*this); } diff --git a/include/wx/colour.h b/include/wx/colour.h index 22a145ab22..5f4e68afd0 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -202,14 +202,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 wxOVERRIDE + virtual wxGDIRefData *CreateGDIRefData() const override { wxFAIL_MSG( "must be overridden if used" ); return NULL; } - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const override { wxFAIL_MSG( "must be overridden if used" ); diff --git a/include/wx/combo.h b/include/wx/combo.h index f9c1675367..080536cf01 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -209,9 +209,9 @@ public: wxWindow *GetButton() const { return m_btn; } // forward these methods to all subcontrols - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; + virtual bool Show(bool show = true) override; + virtual bool SetFont(const wxFont& font) override; // // wxTextEntry methods @@ -219,49 +219,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) wxOVERRIDE + virtual void SetValue(const wxString& value) override { wxTextEntryBase::SetValue(value); } - virtual void ChangeValue(const wxString& value) wxOVERRIDE + virtual void ChangeValue(const wxString& value) override { wxTextEntryBase::ChangeValue(value); } - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void AppendText(const wxString& text) wxOVERRIDE + virtual void WriteText(const wxString& text) override; + virtual void AppendText(const wxString& text) override { wxTextEntryBase::AppendText(text); } - virtual wxString GetValue() const wxOVERRIDE + virtual wxString GetValue() const override { return wxTextEntryBase::GetValue(); } - virtual wxString GetRange(long from, long to) const wxOVERRIDE + virtual wxString GetRange(long from, long to) const override { 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) wxOVERRIDE; + virtual void Replace(long from, long to, const wxString& value) override; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void Remove(long from, long to) override; - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual long GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void GetSelection(long *from, long *to) const override; - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual bool IsEditable() const override; + virtual void SetEditable(bool editable) override; - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual wxString GetHint() const wxOVERRIDE; + virtual bool SetHint(const wxString& hint) override; + virtual wxString GetHint() const override; // This method sets the text without affecting list selection // (ie. wxComboPopup::SetStringValue doesn't get called). @@ -459,12 +459,12 @@ public: void SetCtrlMainWnd( wxWindow* wnd ) { m_mainCtrlWnd = wnd; } // This is public so we can access it from wxComboCtrlTextCtrl - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE + virtual wxWindow *GetMainWindowOfCompositeControl() override { return m_mainCtrlWnd; } // also set the embedded wxTextCtrl colours - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetForegroundColour(const wxColour& colour) override; + virtual bool SetBackgroundColour(const wxColour& colour) override; protected: @@ -535,8 +535,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 wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; // NULL popup can be used to indicate default in a derived class virtual void DoSetPopupControl(wxComboPopup* popup); @@ -600,17 +600,17 @@ protected: virtual bool AnimateShow( const wxRect& rect, int flags ); #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; + virtual void DoSetToolTip( wxToolTip *tip ) override; #endif // protected wxTextEntry methods - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual void DoSetValue(const wxString& value, int flags) override; + virtual wxString DoGetValue() const override; + virtual wxWindow *GetEditableWindow() override { return this; } // margins functions - virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; - virtual wxPoint DoGetMargins() const wxOVERRIDE; + virtual bool DoSetMargins(const wxPoint& pt) override; + virtual wxPoint DoGetMargins() const override; // 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 35d7368c60..314386ea5d 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() wxOVERRIDE + virtual void Clear() override { wxItemContainer::Clear(); wxTextEntry::Clear(); @@ -53,8 +53,8 @@ public: // but still make it pure virtual because for some platforms it's not // implemented there and also because the derived class has to override // it anyhow to avoid ambiguity with the other GetSelection() - virtual int GetSelection() const wxOVERRIDE = 0; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE = 0; + virtual int GetSelection() const override = 0; + virtual void GetSelection(long *from, long *to) const override = 0; virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); } virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); } diff --git a/include/wx/commandlinkbutton.h b/include/wx/commandlinkbutton.h index d42322ba42..85683da55a 100644 --- a/include/wx/commandlinkbutton.h +++ b/include/wx/commandlinkbutton.h @@ -120,7 +120,7 @@ public: const wxString& name = wxASCII_STR(wxButtonNameStr)); virtual void SetMainLabelAndNote(const wxString& mainLabel, - const wxString& note) wxOVERRIDE + const wxString& note) override { wxButton::SetLabel(mainLabel + '\n' + note); } diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h index 8e9e2e83c4..9fefa6edad 100644 --- a/include/wx/compositewin.h +++ b/include/wx/compositewin.h @@ -48,7 +48,7 @@ public: // it non-virtually and we need to do this to avoid infinite recursion, // so we work around this by calling the method of this object itself // manually in each function. - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE + virtual bool SetForegroundColour(const wxColour& colour) override { if ( !BaseWindowClass::SetForegroundColour(colour) ) return false; @@ -58,7 +58,7 @@ public: return true; } - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE + virtual bool SetBackgroundColour(const wxColour& colour) override { if ( !BaseWindowClass::SetBackgroundColour(colour) ) return false; @@ -68,7 +68,7 @@ public: return true; } - virtual bool SetFont(const wxFont& font) wxOVERRIDE + virtual bool SetFont(const wxFont& font) override { if ( !BaseWindowClass::SetFont(font) ) return false; @@ -78,7 +78,7 @@ public: return true; } - virtual bool SetCursor(const wxCursor& cursor) wxOVERRIDE + virtual bool SetCursor(const wxCursor& cursor) override { if ( !BaseWindowClass::SetCursor(cursor) ) return false; @@ -88,7 +88,7 @@ public: return true; } - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE + virtual void SetLayoutDirection(wxLayoutDirection dir) override { BaseWindowClass::SetLayoutDirection(dir); @@ -107,7 +107,7 @@ public: } #if wxUSE_TOOLTIPS - virtual void DoSetToolTipText(const wxString &tip) wxOVERRIDE + virtual void DoSetToolTipText(const wxString &tip) override { BaseWindowClass::DoSetToolTipText(tip); @@ -117,7 +117,7 @@ public: SetForAllParts(func, tip); } - virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE + virtual void DoSetToolTip(wxToolTip *tip) override { BaseWindowClass::DoSetToolTip(tip); @@ -163,7 +163,7 @@ template class wxCompositeWindow : public wxCompositeWindowSettersOnly { public: - virtual void SetFocus() wxOVERRIDE + virtual void SetFocus() override { wxSetFocusToChild(this, NULL); } diff --git a/include/wx/containr.h b/include/wx/containr.h index d7d1848912..133fc9e4f7 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -144,7 +144,7 @@ class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase { protected: // set the focus to the child which had it the last time - virtual bool SetFocusToChild() wxOVERRIDE; + virtual bool SetFocusToChild() override; }; #else // !wxHAS_NATIVE_TAB_TRAVERSAL @@ -206,22 +206,22 @@ public: #endif // !wxHAS_NATIVE_TAB_TRAVERSAL } - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const override { return m_container.AcceptsFocus(); } - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const override { return m_container.AcceptsFocusRecursively(); } - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const override { return m_container.AcceptsFocusFromKeyboard(); } - WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) override { BaseWindowClass::AddChild(child); @@ -234,7 +234,7 @@ public: } } - WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) override { #ifndef wxHAS_NATIVE_TAB_TRAVERSAL m_container.HandleOnWindowDestroy(child); @@ -247,7 +247,7 @@ public: m_container.UpdateCanFocusChildren(); } - WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() override { if ( !m_container.DoSetFocus() ) BaseWindowClass::SetFocus(); @@ -259,13 +259,13 @@ public: } #ifdef __WXMSW__ - WXDLLIMPEXP_INLINE_CORE virtual bool HasTransparentBackground() wxOVERRIDE + WXDLLIMPEXP_INLINE_CORE virtual bool HasTransparentBackground() override { return m_container.HasTransparentBackground(); } WXDLLIMPEXP_INLINE_CORE - virtual void WXSetPendingFocus(wxWindow* win) wxOVERRIDE + virtual void WXSetPendingFocus(wxWindow* win) override { return m_container.SetLastFocus(win); } diff --git a/include/wx/control.h b/include/wx/control.h index 21dc74a9c1..ff945c1bd4 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -48,7 +48,7 @@ public: int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } // set label with mnemonics - virtual void SetLabel(const wxString& label) wxOVERRIDE + virtual void SetLabel(const wxString& label) override { m_labelOrig = label; @@ -59,7 +59,7 @@ public: // return the original string, as it was passed to SetLabel() // (i.e. with wx-style mnemonics) - virtual wxString GetLabel() const wxOVERRIDE { return m_labelOrig; } + virtual wxString GetLabel() const override { return m_labelOrig; } // set label text (mnemonics will be escaped) virtual void SetLabelText(const wxString& text) @@ -96,7 +96,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 wxOVERRIDE { return true; } + virtual bool ShouldInheritColours() const override { return true; } // WARNING: this doesn't work for all controls nor all platforms! @@ -105,10 +105,10 @@ public: // if the button was clicked) virtual void Command(wxCommandEvent &event); - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; // wxControl-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override; wxSize GetSizeFromTextSize(int xlen, int ylen = -1) const { return DoGetSizeFromTextSize(xlen, ylen); } @@ -158,7 +158,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override; // 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 626da6302b..e020969cf1 100644 --- a/include/wx/convauto.h +++ b/include/wx/convauto.h @@ -71,16 +71,16 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; - virtual size_t GetMBNulLen() const wxOVERRIDE { return m_conv->GetMBNulLen(); } + virtual size_t GetMBNulLen() const override { return m_conv->GetMBNulLen(); } - virtual bool IsUTF8() const wxOVERRIDE { return m_conv && m_conv->IsUTF8(); } + virtual bool IsUTF8() const override { return m_conv && m_conv->IsUTF8(); } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvAuto(*this); } + virtual wxMBConv *Clone() const override { 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 a1b0e53a6e..62e18a70bb 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) wxOVERRIDE; + virtual wxString GetHelp(const wxWindowBase *window) override; // override ShowHelp() and not ShowHelpAtPoint() as explained above - virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE; + virtual bool ShowHelp(wxWindowBase *window) override; - virtual void AddHelp(wxWindowBase *window, const wxString& text) wxOVERRIDE; - virtual void AddHelp(wxWindowID id, const wxString& text) wxOVERRIDE; - virtual void RemoveHelp(wxWindowBase* window) wxOVERRIDE; + virtual void AddHelp(wxWindowBase *window, const wxString& text) override; + virtual void AddHelp(wxWindowID id, const wxString& text) override; + virtual void RemoveHelp(wxWindowBase* window) override; 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) wxOVERRIDE; + virtual bool ShowHelp(wxWindowBase *window) override; // Other accessors void SetHelpController(wxHelpControllerBase* hc) { m_helpController = hc; } diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 7897268732..0a72aff82a 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -456,7 +456,7 @@ public: // usually the controls like list/combo boxes have their own background // colour - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { return false; } // Implementation only from now on. diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index ef0c385df5..bbe43993d5 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -223,20 +223,20 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE + virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override { return m_format; } - virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE + virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override { return 1; } virtual void GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE + wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override { *formats = m_format; } - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE + void *buf) const override { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE + size_t len, const void *buf) override { return SetData(len, buf); } private: @@ -284,18 +284,18 @@ public: // implement base class pure virtuals // ---------------------------------- - 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; + virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const override; + virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const override; + virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const override; + virtual size_t GetDataSize(const wxDataFormat& format) const override; + virtual bool GetDataHere(const wxDataFormat& format, void *buf) const override; + virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) override; #if defined(__WXMSW__) virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, - const wxDataFormat& format ) wxOVERRIDE; + const wxDataFormat& format ) override; virtual void* SetSizeInBuffer( void* buffer, size_t size, - const wxDataFormat& format ) wxOVERRIDE; - virtual size_t GetBufferOffset( const wxDataFormat& format ) wxOVERRIDE; + const wxDataFormat& format ) override; + virtual size_t GetBufferOffset( const wxDataFormat& format ) override; #endif private: @@ -348,20 +348,20 @@ public: virtual wxString GetHTML() const { return m_html; } virtual void SetHTML(const wxString& html) { m_html = html; } - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } @@ -398,31 +398,31 @@ 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 wxOVERRIDE { return 2; } + virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const override { return 2; } virtual void GetAllFormats(wxDataFormat *formats, - wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE; + wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override; - 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); } + virtual size_t GetDataSize() const override { return GetDataSize(GetPreferredFormat()); } + virtual bool GetDataHere(void *buf) const override { return GetDataHere(GetPreferredFormat(), buf); } + virtual bool SetData(size_t len, const void *buf) override { return SetData(GetPreferredFormat(), len, buf); } - 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; + size_t GetDataSize(const wxDataFormat& format) const override; + bool GetDataHere(const wxDataFormat& format, void *pBuf) const override; + bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) override; #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } @@ -431,7 +431,7 @@ public: private: #if defined(__WXQT__) // Overridden to set text directly instead of extracting byte array - void QtSetDataSingleFormat(const class QMimeData &mimeData, const wxDataFormat &format) wxOVERRIDE; + void QtSetDataSingleFormat(const class QMimeData &mimeData, const wxDataFormat &format) override; #endif wxString m_text; @@ -523,19 +523,19 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t size, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t size, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 6ebdff9f4e..55782889c0 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -346,13 +346,13 @@ public: // implement some base class pure virtual directly virtual wxDataViewItem - GetParent( const wxDataViewItem & WXUNUSED(item) ) const wxOVERRIDE + GetParent( const wxDataViewItem & WXUNUSED(item) ) const override { // items never have valid parent in this model return wxDataViewItem(); } - virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE + virtual bool IsContainer( const wxDataViewItem &item ) const override { // only the invisible (and invalid) root item has children return !item.IsOk(); @@ -360,30 +360,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 wxOVERRIDE + const wxDataViewItem &item, unsigned int col ) const override { GetValueByRow(variant, GetRow(item), col); } virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) wxOVERRIDE + const wxDataViewItem &item, unsigned int col ) override { return SetValueByRow( variant, GetRow(item), col ); } virtual bool GetAttr(const wxDataViewItem &item, unsigned int col, - wxDataViewItemAttr &attr) const wxOVERRIDE + wxDataViewItemAttr &attr) const override { return GetAttrByRow( GetRow(item), col, attr ); } - virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE + virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const override { return IsEnabledByRow( GetRow(item), col ); } - virtual bool IsListModel() const wxOVERRIDE { return true; } + virtual bool IsListModel() const override { return true; } }; // --------------------------------------------------------- @@ -406,13 +406,13 @@ public: // convert to/from row/wxDataViewItem - virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE; + virtual unsigned GetRow( const wxDataViewItem &item ) const override; wxDataViewItem GetItem( unsigned int row ) const; // implement base methods - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; + virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const override; - unsigned int GetCount() const wxOVERRIDE { return (unsigned int)m_hash.GetCount(); } + unsigned int GetCount() const override { return (unsigned int)m_hash.GetCount(); } private: wxDataViewItemArray m_hash; @@ -445,22 +445,22 @@ public: // convert to/from row/wxDataViewItem - virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE; + virtual unsigned GetRow( const wxDataViewItem &item ) const override; 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 wxOVERRIDE; - virtual bool HasDefaultCompare() const wxOVERRIDE; + unsigned int column, bool ascending ) const override; + virtual bool HasDefaultCompare() const override; // implement base methods - virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE; + virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const override; - unsigned int GetCount() const wxOVERRIDE { return m_size; } + unsigned int GetCount() const override { return m_size; } // internal - virtual bool IsVirtualListModel() const wxOVERRIDE { return true; } + virtual bool IsVirtualListModel() const override { return true; } private: unsigned int m_size; @@ -518,9 +518,9 @@ 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 wxBitmapBundle& bitmap ) wxOVERRIDE { m_bitmap = bitmap; } - virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap.GetBitmap(wxDefaultSize); } - virtual wxBitmapBundle GetBitmapBundle() const wxOVERRIDE { return m_bitmap; } + virtual void SetBitmap( const wxBitmapBundle& bitmap ) override { m_bitmap = bitmap; } + virtual wxBitmap GetBitmap() const override { return m_bitmap.GetBitmap(wxDefaultSize); } + virtual wxBitmapBundle GetBitmapBundle() const override { return m_bitmap; } // Special accessor for use by wxWidgets only returning the width that was // explicitly set, either by the application, using SetWidth(), or by the @@ -798,7 +798,7 @@ public: virtual bool SetAlternateRowColour(const wxColour& WXUNUSED(colour)) { return false; } - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -949,7 +949,7 @@ public: void InitData(wxDataObjectComposite* obj, wxDataFormat format); #endif // wxUSE_DRAG_AND_DROP - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDataViewEvent(*this); } + virtual wxEvent *Clone() const override { return new wxDataViewEvent(*this); } // These methods shouldn't be used outside of wxWidgets and wxWidgets // itself doesn't use them any longer either as it constructs the events @@ -1120,10 +1120,10 @@ public: // override base virtuals virtual void GetValueByRow( wxVariant &value, - unsigned int row, unsigned int col ) const wxOVERRIDE; + unsigned int row, unsigned int col ) const override; virtual bool SetValueByRow( const wxVariant &value, - unsigned int row, unsigned int col ) wxOVERRIDE; + unsigned int row, unsigned int col ) override; public: @@ -1172,10 +1172,10 @@ public: bool InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ); // overridden from base class - 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; + virtual bool PrependColumn( wxDataViewColumn *col ) override; + virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) override; + virtual bool AppendColumn( wxDataViewColumn *col ) override; + virtual bool ClearColumns() override; wxDataViewColumn *AppendTextColumn( const wxString &label, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, @@ -1306,7 +1306,7 @@ public: bool IsExpanded() const { return m_isExpanded; } - virtual bool IsContainer() wxOVERRIDE + virtual bool IsContainer() override { return true; } void DestroyChildren(); @@ -1375,17 +1375,17 @@ public: // implement base methods virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE; + const wxDataViewItem &item, unsigned int col ) const override; virtual bool SetValue( const wxVariant &variant, - 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; + const wxDataViewItem &item, unsigned int col ) override; + virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const override; + virtual bool IsContainer( const wxDataViewItem &item ) const override; + virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const override; virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const wxOVERRIDE; + unsigned int column, bool ascending ) const override; - virtual bool HasDefaultCompare() const wxOVERRIDE + virtual bool HasDefaultCompare() const override { return true; } wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const; @@ -1475,7 +1475,7 @@ public: void OnSize( wxSizeEvent &event ); protected: - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; private: wxDECLARE_EVENT_TABLE(); diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h index 5354199b8b..13294eb821 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 wxOVERRIDE { return new wxDateEvent(*this); } + virtual wxEvent *Clone() const override { return new wxDateEvent(*this); } private: wxDateTime m_date; diff --git a/include/wx/datetime.h b/include/wx/datetime.h index ffea66c9cf..2eafe4470a 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1590,10 +1590,10 @@ private: class WXDLLIMPEXP_BASE wxDateTimeWorkDays : public wxDateTimeHolidayAuthority { protected: - virtual bool DoIsHoliday(const wxDateTime& dt) const wxOVERRIDE; + virtual bool DoIsHoliday(const wxDateTime& dt) const override; virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart, const wxDateTime& dtEnd, - wxDateTimeArray& holidays) const wxOVERRIDE; + wxDateTimeArray& holidays) const override; }; // ============================================================================ diff --git a/include/wx/dc.h b/include/wx/dc.h index ceb129fe64..4dbb616a71 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -145,15 +145,15 @@ class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory public: wxNativeDCFactory() {} - 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; + virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) override; + virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) override; + virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) override; + virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) override; + virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) override; + virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) override; + virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) override; #if wxUSE_PRINTING_ARCHITECTURE - virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ) wxOVERRIDE; + virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data ) override; #endif }; diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 5b832d87b9..67c013017c 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -39,8 +39,8 @@ public: #ifdef __WXMSW__ // override wxDC virtual functions to provide access to HDC associated with // underlying wxGraphicsContext - virtual WXHDC AcquireHDC() wxOVERRIDE; - virtual void ReleaseHDC(WXHDC hdc) wxOVERRIDE; + virtual WXHDC AcquireHDC() override; + virtual void ReleaseHDC(WXHDC hdc) override; #endif // __WXMSW__ private: @@ -71,116 +71,116 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; - virtual bool StartDoc( const wxString& message ) wxOVERRIDE; - virtual void EndDoc() wxOVERRIDE; + virtual bool StartDoc( const wxString& message ) override; + virtual void EndDoc() override; - virtual void StartPage() wxOVERRIDE; - virtual void EndPage() wxOVERRIDE; + virtual void StartPage() override; + virtual void EndPage() override; // flushing the content of this dc immediately onto screen - virtual void Flush() wxOVERRIDE; + virtual void Flush() override; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual void SetPen(const wxPen& pen) wxOVERRIDE; - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackgroundMode(int mode) wxOVERRIDE; + virtual void SetFont(const wxFont& font) override; + virtual void SetPen(const wxPen& pen) override; + virtual void SetBrush(const wxBrush& brush) override; + virtual void SetBackground(const wxBrush& brush) override; + virtual void SetBackgroundMode(int mode) override; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; + virtual void SetPalette(const wxPalette& palette) override; #endif - virtual void DestroyClippingRegion() wxOVERRIDE; + virtual void DestroyClippingRegion() override; - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; + virtual wxCoord GetCharHeight() const override; + virtual wxCoord GetCharWidth() const override; - virtual bool CanDrawBitmap() const wxOVERRIDE; - virtual bool CanGetTextExtent() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - virtual wxSize GetPPI() const wxOVERRIDE; + virtual bool CanDrawBitmap() const override; + virtual bool CanGetTextExtent() const override; + virtual int GetDepth() const override; + virtual wxSize GetPPI() const override; - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; + virtual void SetLogicalFunction(wxRasterOperationMode function) override; - virtual void SetTextForeground(const wxColour& colour) wxOVERRIDE; - virtual void SetTextBackground(const wxColour& colour) wxOVERRIDE; + virtual void SetTextForeground(const wxColour& colour) override; + virtual void SetTextBackground(const wxColour& colour) override; - virtual void ComputeScaleAndOrigin() wxOVERRIDE; + virtual void ComputeScaleAndOrigin() override; - wxGraphicsContext* GetGraphicsContext() const wxOVERRIDE { return m_graphicContext; } - virtual void SetGraphicsContext( wxGraphicsContext* ctx ) wxOVERRIDE; + wxGraphicsContext* GetGraphicsContext() const override { return m_graphicContext; } + virtual void SetGraphicsContext( wxGraphicsContext* ctx ) override; - virtual void* GetHandle() const wxOVERRIDE; + virtual void* GetHandle() const override; #if wxUSE_DC_TRANSFORM_MATRIX - virtual bool CanUseTransformMatrix() const wxOVERRIDE; - virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) wxOVERRIDE; - virtual wxAffineMatrix2D GetTransformMatrix() const wxOVERRIDE; - virtual void ResetTransformMatrix() wxOVERRIDE; + virtual bool CanUseTransformMatrix() const override; + virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) override; + virtual wxAffineMatrix2D GetTransformMatrix() const override; + virtual void ResetTransformMatrix() override; #endif // wxUSE_DC_TRANSFORM_MATRIX // coordinates conversions and transforms - virtual wxPoint DeviceToLogical(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual wxPoint LogicalToDevice(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual wxSize DeviceToLogicalRel(int x, int y) const wxOVERRIDE; - virtual wxSize LogicalToDeviceRel(int x, int y) const wxOVERRIDE; + virtual wxPoint DeviceToLogical(wxCoord x, wxCoord y) const override; + virtual wxPoint LogicalToDevice(wxCoord x, wxCoord y) const override; + virtual wxSize DeviceToLogicalRel(int x, int y) const override; + virtual wxSize LogicalToDeviceRel(int x, int y) const override; // the true implementations virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; + wxFloodFillStyle style = wxFLOOD_SURFACE) override; virtual void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, - wxDirection nDirection = wxEAST) wxOVERRIDE; + wxDirection nDirection = wxEAST) override; virtual void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, - const wxPoint& circleCenter) wxOVERRIDE; + const wxPoint& circleCenter) override; - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const override; - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawPoint(wxCoord x, wxCoord y) override; #if wxUSE_SPLINES - virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE; + virtual void DoDrawSpline(const wxPointList *points) override; #endif - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE; + wxCoord xc, wxCoord yc) override; virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; + wxCoord width, wxCoord height) override; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; + double sa, double ea) override; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius) wxOVERRIDE; - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + double radius) override; + virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoCrossHair(wxCoord x, wxCoord y) override; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override; virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; + bool useMask = false) override; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override; virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; + double angle) override; virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1) wxOVERRIDE; + wxCoord xsrcMask = -1, wxCoord ysrcMask = -1) override; virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight, @@ -188,35 +188,35 @@ public: wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight, wxRasterOperationMode = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override; - virtual void DoGetSize(int *,int *) const wxOVERRIDE; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; + virtual void DoGetSize(int *,int *) const override; + virtual void DoGetSizeMM(int* width, int* height) const override; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE; + wxCoord xoffset, wxCoord yoffset) override; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) wxOVERRIDE; + wxPolygonFillMode fillStyle) override; - virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; + virtual void DoSetDeviceClippingRegion(const wxRegion& region) override; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; - virtual bool DoGetClippingRect(wxRect& rect) const wxOVERRIDE; + wxCoord width, wxCoord height) override; + virtual bool DoGetClippingRect(wxRect& rect) const override; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; + virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const override; #ifdef __WXMSW__ - virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const wxOVERRIDE; + virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const override; #endif // __WXMSW__ // update the internal clip box variables diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h index 44747c1582..ff93325e48 100644 --- a/include/wx/dcmirror.h +++ b/include/wx/dcmirror.h @@ -35,39 +35,39 @@ public: } // wxDCBase operations - 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 + virtual void Clear() override { m_dc.Clear(); } + virtual void SetFont(const wxFont& font) override { m_dc.SetFont(font); } + virtual void SetPen(const wxPen& pen) override { m_dc.SetPen(pen); } + virtual void SetBrush(const wxBrush& brush) override { m_dc.SetBrush(brush); } + virtual void SetBackground(const wxBrush& brush) override { m_dc.SetBackground(brush); } - virtual void SetBackgroundMode(int mode) wxOVERRIDE { m_dc.SetBackgroundMode(mode); } + virtual void SetBackgroundMode(int mode) override { m_dc.SetBackgroundMode(mode); } #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE + virtual void SetPalette(const wxPalette& palette) override { m_dc.SetPalette(palette); } #endif // wxUSE_PALETTE - 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 + virtual void DestroyClippingRegion() override { m_dc.DestroyClippingRegion(); } + virtual wxCoord GetCharHeight() const override { return m_dc.GetCharHeight(); } + virtual wxCoord GetCharWidth() const override { return m_dc.GetCharWidth(); } + virtual bool CanDrawBitmap() const override { return m_dc.CanDrawBitmap(); } + virtual bool CanGetTextExtent() const override { return m_dc.CanGetTextExtent(); } + virtual int GetDepth() const override { return m_dc.GetDepth(); } + virtual wxSize GetPPI() const override { return m_dc.GetPPI(); } + virtual bool IsOk() const override { return m_dc.IsOk(); } + virtual void SetMapMode(wxMappingMode mode) override { m_dc.SetMapMode(mode); } + virtual void SetUserScale(double x, double y) override { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); } - virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE + virtual void SetLogicalOrigin(wxCoord x, wxCoord y) override { m_dc.SetLogicalOrigin(GetX(x, y), GetY(x, y)); } - virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE + virtual void SetDeviceOrigin(wxCoord x, wxCoord y) override { m_dc.SetDeviceOrigin(GetX(x, y), GetY(x, y)); } - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE + virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) override { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp), GetY(xLeftRight, yBottomUp)); } - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE + virtual void SetLogicalFunction(wxRasterOperationMode function) override { m_dc.SetLogicalFunction(function); } - virtual void* GetHandle() const wxOVERRIDE + virtual void* GetHandle() const override { return m_dc.GetHandle(); } protected: @@ -102,30 +102,30 @@ protected: // wxDCBase functions virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE + wxFloodFillStyle style = wxFLOOD_SURFACE) override { return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style); } - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const override { return m_dc.DoGetPixel(GetX(x, y), GetY(x, y), col); } - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE + virtual void DoDrawPoint(wxCoord x, wxCoord y) override { m_dc.DoDrawPoint(GetX(x, y), GetY(x, y)); } - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override { 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) wxOVERRIDE + wxCoord xc, wxCoord yc) override { wxFAIL_MSG( wxT("this is probably wrong") ); @@ -135,14 +135,14 @@ protected: } virtual void DoDrawCheckMark(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) wxOVERRIDE + wxCoord w, wxCoord h) override { 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) wxOVERRIDE + double sa, double ea) override { wxFAIL_MSG( wxT("this is probably wrong") ); @@ -151,49 +151,49 @@ protected: sa, ea); } - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) override { 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) wxOVERRIDE + double radius) override { 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) wxOVERRIDE + virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) override { m_dc.DoDrawEllipse(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); } - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE + virtual void DoCrossHair(wxCoord x, wxCoord y) override { m_dc.DoCrossHair(GetX(x, y), GetY(x, y)); } - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override { m_dc.DoDrawIcon(icon, GetX(x, y), GetY(x, y)); } virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE + bool useMask = false) override { m_dc.DoDrawBitmap(bmp, GetX(x, y), GetY(x, y), useMask); } - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override { // this is never mirrored m_dc.DoDrawText(text, x, y); } virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle) wxOVERRIDE + wxCoord x, wxCoord y, double angle) override { // this is never mirrored m_dc.DoDrawRotatedText(text, x, y, angle); @@ -204,7 +204,7 @@ protected: wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override { return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest), GetX(w, h), GetY(w, h), @@ -213,18 +213,18 @@ protected: GetX(xsrcMask, ysrcMask), GetX(xsrcMask, ysrcMask)); } - virtual void DoGetSize(int *w, int *h) const wxOVERRIDE + virtual void DoGetSize(int *w, int *h) const override { m_dc.DoGetSize(GetX(w, h), GetY(w, h)); } - virtual void DoGetSizeMM(int *w, int *h) const wxOVERRIDE + virtual void DoGetSizeMM(int *w, int *h) const override { m_dc.DoGetSizeMM(GetX(w, h), GetY(w, h)); } virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE + wxCoord xoffset, wxCoord yoffset) override { wxScopedArray 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) wxOVERRIDE + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override { wxScopedArray points_alloc(Mirror(n, points)); @@ -243,13 +243,13 @@ protected: fillStyle); } - virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE + virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) override { wxFAIL_MSG( wxT("not implemented") ); } virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) wxOVERRIDE + wxCoord w, wxCoord h) override { m_dc.DoSetClippingRegion(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h)); } @@ -258,7 +258,7 @@ protected: wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE + const wxFont *theFont = NULL) const override { // never mirrored m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont); diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h index 2e98c7e43b..0108748450 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 wxOVERRIDE; + int GetResolution() const override; protected: wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { } diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h index fcdecc036c..fa8be003f8 100644 --- a/include/wx/dcsvg.h +++ b/include/wx/dcsvg.h @@ -66,7 +66,7 @@ public: virtual bool ProcessBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, - wxOutputStream& stream) const wxOVERRIDE; + wxOutputStream& stream) const override; private: wxFileName m_path; // When set, name will be appended with _image#.png @@ -79,7 +79,7 @@ class WXDLLIMPEXP_CORE wxSVGBitmapEmbedHandler : public wxSVGBitmapHandler public: virtual bool ProcessBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, - wxOutputStream& stream) const wxOVERRIDE; + wxOutputStream& stream) const override; }; class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl @@ -91,51 +91,51 @@ public: virtual ~wxSVGFileDCImpl(); - bool IsOk() const wxOVERRIDE { return m_OK; } + bool IsOk() const override { return m_OK; } - virtual bool CanDrawBitmap() const wxOVERRIDE { return true; } - virtual bool CanGetTextExtent() const wxOVERRIDE { return true; } + virtual bool CanDrawBitmap() const override { return true; } + virtual bool CanGetTextExtent() const override { return true; } - virtual int GetDepth() const wxOVERRIDE + virtual int GetDepth() const override { wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1; } - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; - virtual void DestroyClippingRegion() wxOVERRIDE; + virtual void DestroyClippingRegion() override; - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; + virtual wxCoord GetCharHeight() const override; + virtual wxCoord GetCharWidth() const override; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE + virtual void SetPalette(const wxPalette& WXUNUSED(palette)) override { wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented")); } #endif - virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE + virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) override { wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented")); } - virtual wxRasterOperationMode GetLogicalFunction() const wxOVERRIDE + virtual wxRasterOperationMode GetLogicalFunction() const override { wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented")); return wxCOPY; } - virtual void ComputeScaleAndOrigin() wxOVERRIDE; + virtual void ComputeScaleAndOrigin() override; - 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 SetBackground(const wxBrush& brush) override; + virtual void SetBackgroundMode(int mode) override; + virtual void SetBrush(const wxBrush& brush) override; + virtual void SetFont(const wxFont& font) override; + virtual void SetPen(const wxPen& pen) override; - virtual void* GetHandle() const wxOVERRIDE { return NULL; } + virtual void* GetHandle() const override { return NULL; } void SetBitmapHandler(wxSVGBitmapHandler* handler); @@ -143,7 +143,7 @@ public: private: virtual bool DoGetPixel(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxColour* WXUNUSED(col)) const wxOVERRIDE + wxColour* WXUNUSED(col)) const override { wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; @@ -156,60 +156,60 @@ private: wxRasterOperationMode rop, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + wxCoord ysrcMask = wxDefaultCoord) override; - virtual void DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) wxOVERRIDE + virtual void DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) override { wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented")); } virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE; + wxCoord xc, wxCoord yc) override; virtual void DoDrawBitmap(const wxBitmap& bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; + bool useMask = false) override; virtual void DoDrawEllipse(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; + wxCoord width, wxCoord height) override; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; + double sa, double ea) override; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override; - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE; + wxCoord xoffset, wxCoord yoffset) override; #if wxUSE_SPLINES - void DoDrawSpline(const wxPointList* points) wxOVERRIDE; + void DoDrawSpline(const wxPointList* points) override; #endif // wxUSE_SPLINES - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawPoint(wxCoord x, wxCoord y) override; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle) wxOVERRIDE; + wxPolygonFillMode fillStyle) override; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; + double angle) override; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius) wxOVERRIDE; + double radius) override; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override; virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col), - wxFloodFillStyle WXUNUSED(style)) wxOVERRIDE + wxFloodFillStyle WXUNUSED(style)) override { wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false; @@ -218,14 +218,14 @@ private: virtual void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, - wxDirection nDirection) wxOVERRIDE; + wxDirection nDirection) override; virtual void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, - const wxPoint& circleCenter) wxOVERRIDE; + const wxPoint& circleCenter) override; - virtual void DoGetSize(int* width, int* height) const wxOVERRIDE + virtual void DoGetSize(int* width, int* height) const override { if ( width ) *width = m_width; @@ -237,20 +237,20 @@ private: wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, - const wxFont* theFont = NULL) const wxOVERRIDE; + const wxFont* theFont = NULL) const override; - virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; + virtual void DoSetDeviceClippingRegion(const wxRegion& region) override; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) wxOVERRIDE; + wxCoord w, wxCoord h) override; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; + virtual void DoGetSizeMM(int* width, int* height) const override; - virtual wxSize GetPPI() const wxOVERRIDE; + virtual wxSize GetPPI() const override; - virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE; + virtual wxSize FromDIP(const wxSize& sz) const override; - virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE; + virtual wxSize ToDIP(const wxSize& sz) const override; void Init(const wxString& filename, int width, int height, double dpi, const wxString& title); diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h index 96150af48e..e7819cbcb2 100644 --- a/include/wx/debugrpt.h +++ b/include/wx/debugrpt.h @@ -152,10 +152,10 @@ public: const wxString& GetCompressedFileName() const { return m_zipfile; } protected: - virtual bool DoProcess() wxOVERRIDE; + virtual bool DoProcess() override; // return the location where the report will be saved - wxFileName GetSaveLocation() const wxOVERRIDE; + wxFileName GetSaveLocation() const override; private: // user-specified file directory/base name, use defaults if empty @@ -185,7 +185,7 @@ public: const wxString& curl = wxT("curl")); protected: - virtual bool DoProcess() wxOVERRIDE; + virtual bool DoProcess() override; // 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 @@ -246,7 +246,7 @@ class WXDLLIMPEXP_QA wxDebugReportPreviewStd : public wxDebugReportPreview public: wxDebugReportPreviewStd() { } - virtual bool Show(wxDebugReport& dbgrpt) const wxOVERRIDE; + virtual bool Show(wxDebugReport& dbgrpt) const override; }; #endif // wxUSE_GUI diff --git a/include/wx/dfb/private/overlay.h b/include/wx/dfb/private/overlay.h index bfa262da37..22f477d3dc 100644 --- a/include/wx/dfb/private/overlay.h +++ b/include/wx/dfb/private/overlay.h @@ -25,12 +25,12 @@ public: wxOverlayImpl(); ~wxOverlayImpl(); - virtual void Reset() wxOVERRIDE; - virtual bool IsOk() wxOVERRIDE; - virtual void Init(wxDC* dc, int x, int y, int width, int height) wxOVERRIDE; - virtual void BeginDrawing(wxDC* dc) wxOVERRIDE; - virtual void EndDrawing(wxDC* dc) wxOVERRIDE; - virtual void Clear(wxDC* dc) wxOVERRIDE; + virtual void Reset() override; + virtual bool IsOk() override; + virtual void Init(wxDC* dc, int x, int y, int width, int height) override; + virtual void BeginDrawing(wxDC* dc) override; + virtual void EndDrawing(wxDC* dc) override; + virtual void Clear(wxDC* dc) override; // wxDFB specific methods: bool IsEmpty() const { return m_isEmpty; } diff --git a/include/wx/dialog.h b/include/wx/dialog.h index e56174c5b0..5611de5a60 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -324,10 +324,10 @@ public: // Overrides // Indicate that adaptation should be done - virtual bool CanDoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE; + virtual bool CanDoLayoutAdaptation(wxDialog* dialog) override; // Do layout adaptation - virtual bool DoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE; + virtual bool DoLayoutAdaptation(wxDialog* dialog) override; // Implementation @@ -394,7 +394,7 @@ public: int GetReturnCode() const { return GetDialog()->GetReturnCode(); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowModalDialogEvent (*this); } + virtual wxEvent *Clone() const override { return new wxWindowModalDialogEvent (*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxWindowModalDialogEvent); diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 448f7ed95f..8c7e3f1c6b 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -176,7 +176,7 @@ public: bool IsOwnEvent() const { return m_id != 0; } // implement the base class pure virtual - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDialUpEvent(*this); } + virtual wxEvent *Clone() const override { return new wxDialUpEvent(*this); } private: wxDECLARE_NO_ASSIGN_DEF_COPY(wxDialUpEvent); diff --git a/include/wx/dnd.h b/include/wx/dnd.h index c43083645b..b1a45d61b7 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) wxOVERRIDE; + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override; 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) wxOVERRIDE; + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override; private: wxDECLARE_NO_COPY_CLASS(wxFileDropTarget); diff --git a/include/wx/docview.h b/include/wx/docview.h index 8f99d50749..af8eeb78d4 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -285,7 +285,7 @@ public: protected: // hook the document into event handlers chain here - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; + virtual bool TryBefore(wxEvent& event) override; wxDocument* m_viewDocument; wxString m_viewTypeName; @@ -540,7 +540,7 @@ protected: #endif // wxUSE_PRINTING_ARCHITECTURE // hook the currently active view into event handlers chain here - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; + virtual bool TryBefore(wxEvent& event) override; // return the command processor for the current document, if any wxCommandProcessor *GetCurrentCommandProcessor() const; @@ -716,7 +716,7 @@ public: protected: // hook the child view into event handlers chain here - virtual bool TryBefore(wxEvent& event) wxOVERRIDE + virtual bool TryBefore(wxEvent& event) override { return TryProcessEvent(event) || BaseClass::TryBefore(event); } @@ -869,7 +869,7 @@ public: protected: // hook the document manager into event handling chain here - virtual bool TryBefore(wxEvent& event) wxOVERRIDE + virtual bool TryBefore(wxEvent& event) override { // It is important to send the event to the base class first as // wxMDIParentFrame overrides its TryBefore() to send the menu events @@ -952,11 +952,11 @@ public: wxDocPrintout(wxView *view = NULL, const wxString& title = wxString()); // implement wxPrintout methods - virtual bool OnPrintPage(int page) wxOVERRIDE; - virtual bool HasPage(int page) wxOVERRIDE; - virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; + virtual bool OnPrintPage(int page) override; + virtual bool HasPage(int page) override; + virtual bool OnBeginDocument(int startPage, int endPage) override; virtual void GetPageInfo(int *minPage, int *maxPage, - int *selPageFrom, int *selPageTo) wxOVERRIDE; + int *selPageFrom, int *selPageTo) override; virtual wxView *GetView() { return m_printoutView; } diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h index f1b3fc1c04..831f44b2e2 100644 --- a/include/wx/dvrenderers.h +++ b/include/wx/dvrenderers.h @@ -376,12 +376,12 @@ public: // Override the base class virtual method to simply store the attribute so // that it can be accessed using GetAttr() from Render() if needed. - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE { m_attr = attr; } + virtual void SetAttr(const wxDataViewItemAttr& attr) override { m_attr = attr; } const wxDataViewItemAttr& GetAttr() const { return m_attr; } // Store the enabled state of the item so that it can be accessed from // Render() via GetEnabled() if needed. - virtual void SetEnabled(bool enabled) wxOVERRIDE; + virtual void SetEnabled(bool enabled) override; bool GetEnabled() const { return m_enabled; } @@ -397,7 +397,7 @@ public: // Prepare DC to use attributes and call Render(). void WXCallRender(wxRect rect, wxDC *dc, int state); - virtual bool IsCustomRenderer() const wxOVERRIDE { return true; } + virtual bool IsCustomRenderer() const override { return true; } protected: // helper for GetSize() implementations, respects attributes @@ -441,15 +441,15 @@ public: wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; - virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool HasEditorCtrl() const override { return true; } + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) override; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override; + virtual bool Render( wxRect rect, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY private: @@ -471,15 +471,15 @@ public: wxDataViewChoiceRenderer( const wxArrayString &choices, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; - virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool HasEditorCtrl() const override { return true; } + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) override; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override; + virtual bool Render( wxRect rect, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY wxString GetChoice(size_t index) const { return m_choices[index]; } @@ -501,13 +501,13 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) override; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override; - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY }; @@ -530,16 +530,16 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } - virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value) wxOVERRIDE; - virtual bool SetValue(const wxVariant &value) wxOVERRIDE; - virtual bool GetValue(wxVariant& value) const wxOVERRIDE; + virtual bool HasEditorCtrl() const override { return true; } + virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value) override; + virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value) override; + virtual bool SetValue(const wxVariant &value) override; + virtual bool GetValue(wxVariant& value) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render( wxRect cell, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; private: wxString FormatDate() const; @@ -576,20 +576,20 @@ public: // this to happen. void Allow3rdStateForUser(bool allow = true); - virtual bool SetValue(const wxVariant& value) wxOVERRIDE; - virtual bool GetValue(wxVariant& value) const wxOVERRIDE; + virtual bool SetValue(const wxVariant& value) override; + virtual bool GetValue(wxVariant& value) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual wxSize GetSize() const wxOVERRIDE; - virtual bool Render(wxRect cell, wxDC* dc, int state) wxOVERRIDE; + virtual wxSize GetSize() const override; + virtual bool Render(wxRect cell, wxDC* dc, int state) override; virtual bool ActivateCell(const wxRect& cell, wxDataViewModel *model, const wxDataViewItem & item, unsigned int col, - const wxMouseEvent *mouseEvent) wxOVERRIDE; + const wxMouseEvent *mouseEvent) override; private: wxSize GetCheckSize() const; diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index f412c12197..96d4e8ea48 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -252,7 +252,7 @@ public: } protected: - SCMPFUNC GetCompareFunction() const wxNOEXCEPT { return m_fnCompare; } + SCMPFUNC GetCompareFunction() const noexcept { return m_fnCompare; } private: SCMPFUNC m_fnCompare; diff --git a/include/wx/event.h b/include/wx/event.h index 3f176a9f7a..d6f647f4b7 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -262,9 +262,9 @@ public: : m_handler( handler ), m_method( method ) { } - virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE; + virtual void operator()(wxEvtHandler *handler, wxEvent& event) override; - virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE + virtual bool IsMatching(const wxEventFunctor& functor) const override { if ( wxTypeId(functor) == wxTypeId(*this) ) { @@ -278,10 +278,10 @@ public: return false; } - virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE + virtual wxEvtHandler *GetEvtHandler() const override { return m_handler; } - virtual wxEventFunction GetEvtMethod() const wxOVERRIDE + virtual wxEventFunction GetEvtMethod() const override { return m_method; } private: @@ -419,7 +419,7 @@ public: CheckHandlerArgument(static_cast(NULL)); } - virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE + virtual void operator()(wxEvtHandler *handler, wxEvent& event) override { Class * realHandler = m_handler; if ( !realHandler ) @@ -436,7 +436,7 @@ public: (realHandler->*m_method)(static_cast(event)); } - virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE + virtual bool IsMatching(const wxEventFunctor& functor) const override { if ( wxTypeId(functor) != wxTypeId(*this) ) return false; @@ -451,10 +451,10 @@ public: (m_handler == other.m_handler || other.m_handler == NULL); } - virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE + virtual wxEvtHandler *GetEvtHandler() const override { return this->ConvertToEvtHandler(m_handler); } - virtual wxEventFunction GetEvtMethod() const wxOVERRIDE + virtual wxEventFunction GetEvtMethod() const override { return this->ConvertToEvtMethod(m_method); } private: @@ -490,7 +490,7 @@ public: CheckHandlerArgument(static_cast(NULL)); } - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE + virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) override { // If you get an error here like "must use .* or ->* to call // pointer-to-member function" then you probably tried to call @@ -502,7 +502,7 @@ public: m_handler(static_cast(event)); } - virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE + virtual bool IsMatching(const wxEventFunctor &functor) const override { if ( wxTypeId(functor) != wxTypeId(*this) ) return false; @@ -535,7 +535,7 @@ public: : m_handler(handler), m_handlerAddr(&handler) { } - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE + virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) override { // If you get an error here like "must use '.*' or '->*' to call // pointer-to-member function" then you probably tried to call @@ -547,7 +547,7 @@ public: m_handler(static_cast(event)); } - virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE + virtual bool IsMatching(const wxEventFunctor &functor) const override { if ( wxTypeId(functor) != wxTypeId(*this) ) return false; @@ -1339,7 +1339,7 @@ public: void RequestMore(bool needMore = true) { m_requestMore = needMore; } bool MoreRequested() const { return m_requestMore; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxIdleEvent(*this); } + virtual wxEvent *Clone() const override { return new wxIdleEvent(*this); } // Specify how wxWidgets will send idle events: to // all windows, or only to those which specify that they @@ -1377,14 +1377,14 @@ public: SetString(GetString().Clone()); } - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { 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 wxOVERRIDE + virtual wxEventCategory GetEventCategory() const override { return wxEVT_CATEGORY_THREAD; } private: @@ -1439,12 +1439,12 @@ public: { } - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxAsyncMethodCallEvent0(*this); } - virtual void Execute() wxOVERRIDE + virtual void Execute() override { (m_object->*m_method)(); } @@ -1481,12 +1481,12 @@ public: { } - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxAsyncMethodCallEvent1(*this); } - virtual void Execute() wxOVERRIDE + virtual void Execute() override { (m_object->*m_method)(m_param1); } @@ -1528,12 +1528,12 @@ public: { } - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxAsyncMethodCallEvent2(*this); } - virtual void Execute() wxOVERRIDE + virtual void Execute() override { (m_object->*m_method)(m_param1, m_param2); } @@ -1564,12 +1564,12 @@ public: { } - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxAsyncMethodCallEventFunctor(*this); } - virtual void Execute() wxOVERRIDE + virtual void Execute() override { m_fn(); } @@ -1648,8 +1648,8 @@ public: // true if the listbox event was a selection. bool IsSelection() const { return (m_extraLong != 0); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCommandEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } + virtual wxEvent *Clone() const override { return new wxCommandEvent(*this); } + virtual wxEventCategory GetEventCategory() const override { return wxEVT_CATEGORY_USER_INPUT; } protected: void* m_clientData; // Arbitrary client data @@ -1682,7 +1682,7 @@ public: // for implementation code only: is the operation allowed? bool IsAllowed() const { return m_bAllow; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxNotifyEvent(*this); } + virtual wxEvent *Clone() const override { return new wxNotifyEvent(*this); } private: bool m_bAllow; @@ -1717,7 +1717,7 @@ public: void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetPosition(int pos) { m_commandInt = pos; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollEvent(*this); } + virtual wxEvent *Clone() const override { return new wxScrollEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxScrollEvent); @@ -1750,7 +1750,7 @@ public: void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetPosition(int pos) { m_commandInt = pos; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollWinEvent(*this); } + virtual wxEvent *Clone() const override { return new wxScrollWinEvent(*this); } protected: int m_commandInt; @@ -1895,8 +1895,8 @@ public: bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); } float GetMagnification() const { return m_magnification; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } + virtual wxEvent *Clone() const override { return new wxMouseEvent(*this); } + virtual wxEventCategory GetEventCategory() const override { return wxEVT_CATEGORY_USER_INPUT; } wxMouseEvent& operator=(const wxMouseEvent& event) { @@ -1951,7 +1951,7 @@ public: const wxCursor& GetCursor() const { return m_cursor; } bool HasCursor() const { return m_cursor.IsOk(); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSetCursorEvent(*this); } + virtual wxEvent *Clone() const override { return new wxSetCursorEvent(*this); } private: wxCoord m_x, m_y; @@ -1989,7 +1989,7 @@ public: bool IsGestureEnd() const { return m_isEnd; } void SetGestureEnd(bool isEnd = true) { m_isEnd = isEnd; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGestureEvent(*this); } + virtual wxEvent *Clone() const override { return new wxGestureEvent(*this); } protected: wxPoint m_pos; @@ -2022,7 +2022,7 @@ public: wxPoint GetDelta() const { return m_delta; } void SetDelta(const wxPoint& delta) { m_delta = delta; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPanGestureEvent(*this); } + virtual wxEvent *Clone() const override { return new wxPanGestureEvent(*this); } private: wxPoint m_delta; @@ -2051,7 +2051,7 @@ public: double GetZoomFactor() const { return m_zoomFactor; } void SetZoomFactor(double zoomFactor) { m_zoomFactor = zoomFactor; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxZoomGestureEvent(*this); } + virtual wxEvent *Clone() const override { return new wxZoomGestureEvent(*this); } private: double m_zoomFactor; @@ -2080,7 +2080,7 @@ public: double GetRotationAngle() const { return m_rotationAngle; } void SetRotationAngle(double rotationAngle) { m_rotationAngle = rotationAngle; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxRotateGestureEvent(*this); } + virtual wxEvent *Clone() const override { return new wxRotateGestureEvent(*this); } private: double m_rotationAngle; @@ -2104,7 +2104,7 @@ public: wxTwoFingerTapEvent(const wxTwoFingerTapEvent& event) : wxGestureEvent(event) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTwoFingerTapEvent(*this); } + virtual wxEvent *Clone() const override { return new wxTwoFingerTapEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTwoFingerTapEvent); @@ -2126,7 +2126,7 @@ public: wxLongPressEvent(const wxLongPressEvent& event) : wxGestureEvent(event) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxLongPressEvent(*this); } + virtual wxEvent *Clone() const override { return new wxLongPressEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxLongPressEvent); }; @@ -2147,7 +2147,7 @@ public: wxPressAndTapEvent(const wxPressAndTapEvent& event) : wxGestureEvent(event) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPressAndTapEvent(*this); } + virtual wxEvent *Clone() const override { return new wxPressAndTapEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPressAndTapEvent); }; @@ -2257,8 +2257,8 @@ public: bool IsNextEventAllowed() const { return m_allowNext; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxKeyEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; } + virtual wxEvent *Clone() const override { return new wxKeyEvent(*this); } + virtual wxEventCategory GetEventCategory() const override { return wxEVT_CATEGORY_USER_INPUT; } // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for // example) @@ -2357,7 +2357,7 @@ public: wxRect GetRect() const { return m_rect; } void SetRect(const wxRect& rect) { m_rect = rect; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSizeEvent(*this); } + virtual wxEvent *Clone() const override { return new wxSizeEvent(*this); } public: // For internal usage only. Will be converted to protected members. @@ -2397,7 +2397,7 @@ public: wxRect GetRect() const { return m_rect; } void SetRect(const wxRect& rect) { m_rect = rect; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMoveEvent(*this); } + virtual wxEvent *Clone() const override { return new wxMoveEvent(*this); } protected: wxPoint m_pos; @@ -2425,7 +2425,7 @@ public: public: // default copy ctor and dtor are fine - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaintEvent(*this); } + virtual wxEvent *Clone() const override { return new wxPaintEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxPaintEvent); @@ -2441,7 +2441,7 @@ public: explicit wxNcPaintEvent(wxWindowBase* window = NULL); public: - virtual wxEvent *Clone() const wxOVERRIDE { return new wxNcPaintEvent(*this); } + virtual wxEvent *Clone() const override { return new wxNcPaintEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxNcPaintEvent); @@ -2467,7 +2467,7 @@ public: wxDC *GetDC() const { return m_dc; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxEraseEvent(*this); } + virtual wxEvent *Clone() const override { return new wxEraseEvent(*this); } protected: wxDC *m_dc; @@ -2499,7 +2499,7 @@ public: wxWindow *GetWindow() const { return m_win; } void SetWindow(wxWindow *win) { m_win = win; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFocusEvent(*this); } + virtual wxEvent *Clone() const override { return new wxFocusEvent(*this); } private: wxWindow *m_win; @@ -2517,7 +2517,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxChildFocusEvent(*this); } + virtual wxEvent *Clone() const override { return new wxChildFocusEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxChildFocusEvent); @@ -2558,7 +2558,7 @@ public: bool GetActive() const { return m_active; } Reason GetActivationReason() const { return m_activationReason;} - virtual wxEvent *Clone() const wxOVERRIDE { return new wxActivateEvent(*this); } + virtual wxEvent *Clone() const override { return new wxActivateEvent(*this); } private: bool m_active; @@ -2580,7 +2580,7 @@ public: : wxEvent(Id, wxEVT_INIT_DIALOG) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxInitDialogEvent(*this); } + virtual wxEvent *Clone() const override { return new wxInitDialogEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxInitDialogEvent); @@ -2612,7 +2612,7 @@ public: // only for wxEVT_MENU_OPEN/CLOSE wxMenu* GetMenu() const { return m_menu; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMenuEvent(*this); } + virtual wxEvent *Clone() const override { return new wxMenuEvent(*this); } private: int m_menuId; @@ -2666,7 +2666,7 @@ public: bool CanVeto() const { return m_canVeto; } bool GetVeto() const { return m_canVeto && m_veto; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxCloseEvent(*this); } + virtual wxEvent *Clone() const override { return new wxCloseEvent(*this); } protected: bool m_loggingOff, @@ -2696,7 +2696,7 @@ public: // return true if the window was shown, false if hidden bool IsShown() const { return m_show; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxShowEvent(*this); } + virtual wxEvent *Clone() const override { return new wxShowEvent(*this); } protected: bool m_show; @@ -2722,7 +2722,7 @@ public: // return true if the frame was iconized, false if restored bool IsIconized() const { return m_iconized; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxIconizeEvent(*this); } + virtual wxEvent *Clone() const override { return new wxIconizeEvent(*this); } protected: bool m_iconized; @@ -2741,7 +2741,7 @@ public: : wxEvent(winid, wxEVT_MAXIMIZE) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMaximizeEvent(*this); } + virtual wxEvent *Clone() const override { return new wxMaximizeEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxMaximizeEvent); @@ -2762,7 +2762,7 @@ public: bool IsFullScreen() const { return m_fullscreen; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFullScreenEvent(*this); } + virtual wxEvent *Clone() const override { return new wxFullScreenEvent(*this); } protected: bool m_fullscreen; @@ -2865,7 +2865,7 @@ public: { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) || ((m_buttonState & but) == but)); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxJoystickEvent(*this); } + virtual wxEvent *Clone() const override { return new wxJoystickEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent); @@ -2915,7 +2915,7 @@ public: int GetNumberOfFiles() const { return m_noFiles; } wxString *GetFiles() const { return m_files; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDropFilesEvent(*this); } + virtual wxEvent *Clone() const override { return new wxDropFilesEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent); @@ -3008,7 +3008,7 @@ public: // Returns the UI update mode static wxUpdateUIMode GetMode() { return sm_updateMode; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxUpdateUIEvent(*this); } + virtual wxEvent *Clone() const override { return new wxUpdateUIEvent(*this); } protected: bool m_checked; @@ -3042,7 +3042,7 @@ public: : wxEvent(0, wxEVT_SYS_COLOUR_CHANGED) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSysColourChangedEvent(*this); } + virtual wxEvent *Clone() const override { return new wxSysColourChangedEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxSysColourChangedEvent); @@ -3067,7 +3067,7 @@ public: m_gainedCapture(event.m_gainedCapture) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureChangedEvent(*this); } + virtual wxEvent *Clone() const override { return new wxMouseCaptureChangedEvent(*this); } wxWindow* GetCapturedWindow() const { return m_gainedCapture; } @@ -3095,7 +3095,7 @@ public: : wxEvent(event) {} - virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureLostEvent(*this); } + virtual wxEvent *Clone() const override { return new wxMouseCaptureLostEvent(*this); } wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent); }; @@ -3110,7 +3110,7 @@ public: : wxEvent(0, wxEVT_DISPLAY_CHANGED) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDisplayChangedEvent(*this); } + virtual wxEvent *Clone() const override { return new wxDisplayChangedEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxDisplayChangedEvent); @@ -3140,7 +3140,7 @@ public: int ScaleX(int x) const { return Scale(wxSize(x, -1)).x; } int ScaleY(int y) const { return Scale(wxSize(-1, y)).y; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxDPIChangedEvent(*this); } + virtual wxEvent *Clone() const override { return new wxDPIChangedEvent(*this); } private: wxSize m_oldDPI; @@ -3169,7 +3169,7 @@ public: void SetChangedWindow(wxWindow* win) { m_changedWindow = win; } wxWindow* GetChangedWindow() const { return m_changedWindow; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaletteChangedEvent(*this); } + virtual wxEvent *Clone() const override { return new wxPaletteChangedEvent(*this); } protected: wxWindow* m_changedWindow; @@ -3199,7 +3199,7 @@ public: void SetPaletteRealized(bool realized) { m_paletteRealized = realized; } bool GetPaletteRealized() const { return m_paletteRealized; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryNewPaletteEvent(*this); } + virtual wxEvent *Clone() const override { return new wxQueryNewPaletteEvent(*this); } protected: bool m_paletteRealized; @@ -3258,7 +3258,7 @@ public: // Set flags void SetFlags(long flags) { m_flags = flags; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxNavigationKeyEvent(*this); } + virtual wxEvent *Clone() const override { return new wxNavigationKeyEvent(*this); } enum wxNavigationKeyEventFlags { @@ -3292,7 +3292,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowCreateEvent(*this); } + virtual wxEvent *Clone() const override { return new wxWindowCreateEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxWindowCreateEvent); @@ -3305,7 +3305,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowDestroyEvent(*this); } + virtual wxEvent *Clone() const override { return new wxWindowDestroyEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN_DEF_COPY(wxWindowDestroyEvent); @@ -3356,7 +3356,7 @@ public: const wxString& GetTarget() const { return m_target; } void SetTarget(const wxString& target) { m_target = target; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHelpEvent(*this); } + virtual wxEvent *Clone() const override { return new wxHelpEvent(*this); } // optional indication of the event source Origin GetOrigin() const { return m_origin; } @@ -3398,7 +3398,7 @@ public: : wxCommandEvent(event) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardTextEvent(*this); } + virtual wxEvent *Clone() const override { return new wxClipboardTextEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent); @@ -3430,7 +3430,7 @@ public: const wxPoint& GetPosition() const { return m_pos; } void SetPosition(const wxPoint& pos) { m_pos = pos; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxContextMenuEvent(*this); } + virtual wxEvent *Clone() const override { return new wxContextMenuEvent(*this); } protected: wxPoint m_pos; @@ -4107,14 +4107,14 @@ public: } // The sink is being destroyed - virtual void OnObjectDestroy( ) wxOVERRIDE + virtual void OnObjectDestroy( ) override { if ( m_src ) m_src->OnSinkDestroyed( m_sink ); delete this; } - virtual wxEventConnectionRef *ToEventConnection() wxOVERRIDE { return this; } + virtual wxEventConnectionRef *ToEventConnection() override { return this; } void IncRef() { m_refCount++; } void DecRef() @@ -4187,7 +4187,7 @@ public: m_eventsToBlock.push_back(type); } - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; + virtual bool ProcessEvent(wxEvent& event) override; protected: wxArrayInt m_eventsToBlock; diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 257b7574dc..34f8641b59 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) wxOVERRIDE; + virtual void ScheduleExit(int rc = 0) override; protected: // enters a loop calling OnNextIteration(), Pending() and Dispatch() and // terminating when Exit() is called - virtual int DoRun() wxOVERRIDE; + virtual int DoRun() override; // 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() wxOVERRIDE + virtual void OnExit() override { delete m_windowDisabler; m_windowDisabler = NULL; diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index e01a4bf91c..56d9a4f941 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 wxOVERRIDE { return new wxFindDialogEvent(*this); } + virtual wxEvent *Clone() const override { return new wxFindDialogEvent(*this); } private: wxString m_strReplace; diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index fd392da194..0e8cbf4e10 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) wxOVERRIDE; - virtual const wxString& GetPath() const wxOVERRIDE; + virtual void SetPath(const wxString& strPath) override; + virtual const wxString& GetPath() const override; - 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 bool GetFirstGroup(wxString& str, long& lIndex) const override; + virtual bool GetNextGroup (wxString& str, long& lIndex) const override; + virtual bool GetFirstEntry(wxString& str, long& lIndex) const override; + virtual bool GetNextEntry (wxString& str, long& lIndex) const override; - virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE; + virtual size_t GetNumberOfEntries(bool bRecursive = false) const override; + virtual size_t GetNumberOfGroups(bool bRecursive = false) const override; - virtual bool HasGroup(const wxString& strName) const wxOVERRIDE; - virtual bool HasEntry(const wxString& strName) const wxOVERRIDE; + virtual bool HasGroup(const wxString& strName) const override; + virtual bool HasEntry(const wxString& strName) const override; - virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE; + virtual bool Flush(bool bCurrentOnly = false) override; - virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE; - virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE; + virtual bool RenameEntry(const wxString& oldName, const wxString& newName) override; + virtual bool RenameGroup(const wxString& oldName, const wxString& newName) override; - virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE; - virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE; - virtual bool DeleteAll() wxOVERRIDE; + virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) override; + virtual bool DeleteGroup(const wxString& szKey) override; + virtual bool DeleteAll() override; // additional, wxFileConfig-specific, functionality #if wxUSE_STREAMS @@ -194,16 +194,16 @@ public: bool LineListIsEmpty(); protected: - virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE; - virtual bool DoReadLong(const wxString& key, long *pl) const wxOVERRIDE; + virtual bool DoReadString(const wxString& key, wxString *pStr) const override; + virtual bool DoReadLong(const wxString& key, long *pl) const override; #if wxUSE_BASE64 - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE; + virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const override; #endif // wxUSE_BASE64 - virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE; - virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE; + virtual bool DoWriteString(const wxString& key, const wxString& szValue) override; + virtual bool DoWriteLong(const wxString& key, long lValue) override; #if wxUSE_BASE64 - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE; + virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) override; #endif // wxUSE_BASE64 private: diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h index d543958e3d..23a267ea41 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 wxOVERRIDE { return new wxFileCtrlEvent( *this ); } + virtual wxEvent *Clone() const override { 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/filedlgcustomize.h b/include/wx/filedlgcustomize.h index 4821e5ed8e..f8d7196013 100644 --- a/include/wx/filedlgcustomize.h +++ b/include/wx/filedlgcustomize.h @@ -49,7 +49,7 @@ protected: // By default custom controls don't generate any events, but some of them // override this function to allow connecting to the selected events. - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; + virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override; wxFileDialogCustomControlImpl* const m_impl; @@ -65,7 +65,7 @@ public: explicit wxFileDialogButton(wxFileDialogButtonImpl* impl); protected: - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; + virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override; private: wxFileDialogButtonImpl* GetImpl() const; @@ -84,7 +84,7 @@ public: explicit wxFileDialogCheckBox(wxFileDialogCheckBoxImpl* impl); protected: - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; + virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override; private: wxFileDialogCheckBoxImpl* GetImpl() const; @@ -103,7 +103,7 @@ public: explicit wxFileDialogRadioButton(wxFileDialogRadioButtonImpl* impl); protected: - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; + virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override; private: wxFileDialogRadioButtonImpl* GetImpl() const; @@ -122,7 +122,7 @@ public: explicit wxFileDialogChoice(wxFileDialogChoiceImpl* impl); protected: - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; + virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override; private: wxFileDialogChoiceImpl* GetImpl() const; diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index f7f6728d60..f940a565f9 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 wxOVERRIDE { return new wxFileDirPickerEvent(*this); } + virtual wxEvent *Clone() const override { return new wxFileDirPickerEvent(*this); } private: wxString m_path; @@ -179,8 +179,8 @@ public: // public API public: // internal functions - void UpdatePickerFromTextCtrl() wxOVERRIDE; - void UpdateTextCtrlFromPicker() wxOVERRIDE; + void UpdatePickerFromTextCtrl() override; + void UpdateTextCtrlFromPicker() override; // event handler for our picker void OnFileDirChange(wxFileDirPickerEvent &); @@ -270,15 +270,15 @@ public: public: // overrides // return the text control value in canonical form - wxString GetTextCtrlValue() const wxOVERRIDE; + wxString GetTextCtrlValue() const override; - bool IsCwdToUpdate() const wxOVERRIDE + bool IsCwdToUpdate() const override { return HasFlag(wxFLP_CHANGE_DIR); } - wxEventType GetEventType() const wxOVERRIDE + wxEventType GetEventType() const override { return wxEVT_FILEPICKER_CHANGED; } - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE + virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) override { sender->Bind(wxEVT_FILEPICKER_CHANGED, &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink ); @@ -290,7 +290,7 @@ protected: wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, const wxString& path, const wxString& message, - const wxString& wildcard) wxOVERRIDE + const wxString& wildcard) override { return new wxFilePickerWidget(parent, wxID_ANY, wxGetTranslation(wxFilePickerWidgetLabel), @@ -300,7 +300,7 @@ protected: } // extracts the style for our picker from wxFileDirPickerCtrlBase's style - long GetPickerStyle(long style) const wxOVERRIDE + long GetPickerStyle(long style) const override { return style & (wxFLP_OPEN | wxFLP_SAVE | @@ -369,15 +369,15 @@ public: public: // overrides - wxString GetTextCtrlValue() const wxOVERRIDE; + wxString GetTextCtrlValue() const override; - bool IsCwdToUpdate() const wxOVERRIDE + bool IsCwdToUpdate() const override { return HasFlag(wxDIRP_CHANGE_DIR); } - wxEventType GetEventType() const wxOVERRIDE + wxEventType GetEventType() const override { return wxEVT_DIRPICKER_CHANGED; } - virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE + virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) override { sender->Bind( wxEVT_DIRPICKER_CHANGED, &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink ); @@ -389,7 +389,7 @@ protected: wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent, const wxString& path, const wxString& message, - const wxString& WXUNUSED(wildcard)) wxOVERRIDE + const wxString& WXUNUSED(wildcard)) override { return new wxDirPickerWidget(parent, wxID_ANY, wxGetTranslation(wxDirPickerWidgetLabel), @@ -399,7 +399,7 @@ protected: } // extracts the style for our picker from wxFileDirPickerCtrlBase's style - long GetPickerStyle(long style) const wxOVERRIDE + long GetPickerStyle(long style) const override { return style & (wxDIRP_DIR_MUST_EXIST | wxDIRP_CHANGE_DIR | diff --git a/include/wx/filesys.h b/include/wx/filesys.h index c16af4941b..4ff3b5d549 100644 --- a/include/wx/filesys.h +++ b/include/wx/filesys.h @@ -269,10 +269,10 @@ special characters : class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler { public: - 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; + virtual bool CanOpen(const wxString& location) override; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; + virtual wxString FindFirst(const wxString& spec, int flags = 0) override; + virtual wxString FindNext() override; // 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/fontmap.h b/include/wx/fontmap.h index 26883deeec..404a0cd08a 100644 --- a/include/wx/fontmap.h +++ b/include/wx/fontmap.h @@ -202,7 +202,7 @@ public: // returns the encoding for the given charset (in the form of RFC 2046) or // wxFONTENCODING_SYSTEM if couldn't decode it virtual wxFontEncoding CharsetToEncoding(const wxString& charset, - bool interactive = true) wxOVERRIDE; + bool interactive = true) override; // find an alternative for the given encoding (which is supposed to not be // available on this system). If successful, return true and fill info @@ -242,7 +242,7 @@ public: static wxFontMapper *Get(); // pseudo-RTTI since we aren't a wxObject. - virtual bool IsDummy() wxOVERRIDE { return false; } + virtual bool IsDummy() override { return false; } protected: // GetAltForEncoding() helper: tests for the existence of the given diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index 8b3faef983..1bb36e816a 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -162,8 +162,8 @@ public: // public API public: // internal functions - void UpdatePickerFromTextCtrl() wxOVERRIDE; - void UpdateTextCtrlFromPicker() wxOVERRIDE; + void UpdatePickerFromTextCtrl() override; + void UpdateTextCtrlFromPicker() override; // event handler for our picker void OnFontChange(wxFontPickerEvent &); @@ -175,7 +175,7 @@ public: // internal functions protected: // extracts the style for our picker from wxFontPickerCtrl's style - long GetPickerStyle(long style) const wxOVERRIDE + long GetPickerStyle(long style) const override { return (style & (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)); } // the minimum pointsize allowed to the user @@ -213,7 +213,7 @@ public: void SetFont(const wxFont &c) { m_font = c; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxFontPickerEvent(*this); } + virtual wxEvent *Clone() const override { return new wxFontPickerEvent(*this); } private: wxFont m_font; diff --git a/include/wx/frame.h b/include/wx/frame.h index c202f57527..8df25b3078 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -73,7 +73,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 wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; // menu bar functions @@ -167,10 +167,10 @@ public: #endif // wxUSE_MENUS // do the UI update processing for this window - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE; + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) override; // Implement internal behaviour (menu updating on some platforms) - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; #if wxUSE_MENUS || wxUSE_TOOLBAR // show help text for the currently selected menu or toolbar item @@ -179,7 +179,7 @@ public: virtual void DoGiveHelp(const wxString& text, bool show); #endif - virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE + virtual bool IsClientAreaChild(const wxWindow *child) const override { return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); } @@ -193,7 +193,7 @@ protected: void DeleteAllBars(); // test whether this window makes part of the frame - virtual bool IsOneOfBars(const wxWindow *win) const wxOVERRIDE; + virtual bool IsOneOfBars(const wxWindow *win) const override; #if wxUSE_MENUBAR // 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 014270d609..0412cd26ef 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) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; + virtual bool CanOpen(const wxString& location) override; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; + virtual wxString FindFirst(const wxString& spec, int flags = 0) override; + virtual wxString FindNext() override; void Cleanup(); virtual ~wxArchiveFSHandler(); diff --git a/include/wx/fs_filter.h b/include/wx/fs_filter.h index 4391921252..9efb8cdf14 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) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + virtual bool CanOpen(const wxString& location) override; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; + virtual wxString FindFirst(const wxString& spec, int flags = 0) override; + virtual wxString FindNext() override; private: wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler); diff --git a/include/wx/fs_inet.h b/include/wx/fs_inet.h index 58b74ab64a..b6c6ed2a0a 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) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + virtual bool CanOpen(const wxString& location) override; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; }; #endif diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 08f879b4d1..9e6e126bb2 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) wxOVERRIDE; - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; - virtual wxString FindNext() wxOVERRIDE; + virtual bool CanOpen(const wxString& location) override; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; + virtual wxString FindFirst(const wxString& spec, int flags = 0) override; + virtual wxString FindNext() override; 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 700c92df2f..b28d2f2d74 100644 --- a/include/wx/fswatcher.h +++ b/include/wx/fswatcher.h @@ -159,7 +159,7 @@ public: return m_changeType; } - virtual wxEvent* Clone() const wxOVERRIDE + virtual wxEvent* Clone() const override { wxFileSystemWatcherEvent* evt = new wxFileSystemWatcherEvent(*this); evt->m_errorMsg = m_errorMsg.Clone(); @@ -169,7 +169,7 @@ public: return evt; } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE + virtual wxEventCategory GetEventCategory() const override { // 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 6e642cee0a..199adbe34f 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -84,7 +84,7 @@ public: bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } // overridden base class virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } // Deprecated methods not doing anything since a long time. wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything") @@ -100,7 +100,7 @@ public: int GetBezelFace() const { return 0; } protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // Initialize m_appProgressIndicator if necessary, i.e. if this object has // wxGA_PROGRESS style. This method is supposed to be called from the diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index 3ddb9be5c4..23cb73f803 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 wxSize CalcMin() wxOVERRIDE; - virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE; + virtual wxSize CalcMin() override; + virtual void RepositionChildren(const wxSize& minSize) override; // 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 ) wxOVERRIDE; + virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ) override; 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 d8e7956006..a66e2c49d1 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 wxOVERRIDE + virtual wxObjectRefData *CreateRefData() const override { return CreateGDIRefData(); } - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override { return CloneGDIRefData(static_cast(data)); } diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 0195f4642b..6310f2b05d 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 wxOVERRIDE; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; + virtual wxObjectRefData *CreateRefData() const override; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); diff --git a/include/wx/generic/activityindicator.h b/include/wx/generic/activityindicator.h index 1fbeb8e624..745c98d4fe 100644 --- a/include/wx/generic/activityindicator.h +++ b/include/wx/generic/activityindicator.h @@ -49,12 +49,12 @@ public: virtual ~wxActivityIndicatorGeneric(); - virtual void Start() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual bool IsRunning() const override; protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; private: class wxActivityIndicatorImpl *m_impl; diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index 0ec40a217f..6b7fc55ce9 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -48,21 +48,21 @@ public: public: - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) override; + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) override; - virtual void Stop() wxOVERRIDE; - virtual bool Play() wxOVERRIDE + virtual void Stop() override; + virtual bool Play() override { return Play(true /* looped */); } - virtual bool IsPlaying() const wxOVERRIDE + virtual bool IsPlaying() const override { return m_isPlaying; } - void SetAnimation(const wxAnimation &animation) wxOVERRIDE; + void SetAnimation(const wxAnimation &animation) override; - virtual void SetInactiveBitmap(const wxBitmapBundle &bmp) wxOVERRIDE; + virtual void SetInactiveBitmap(const wxBitmapBundle &bmp) override; // override base class method - virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& col) override; static wxAnimation CreateCompatibleAnimation(); @@ -93,7 +93,7 @@ public: // extended API specific to this implementation of wxAnimateCtrl { return m_backingStore; } protected: // internal utilities - virtual wxAnimationImpl* DoCreateAnimationImpl() const wxOVERRIDE; + virtual wxAnimationImpl* DoCreateAnimationImpl() const override; // resize this control to fit m_animation void FitToAnimation(); @@ -107,8 +107,8 @@ protected: // internal utilities bool RebuildBackingStoreUpToFrame(unsigned int); void DrawFrame(wxDC &dc, unsigned int); - virtual void DisplayStaticImage() wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DisplayStaticImage() override; + virtual wxSize DoGetBestSize() const override; // This function can be used as event handler for wxEVT_DPI_CHANGED event // and simply calls UpdateStaticImage() to refresh the m_bmpStaticReal when it happens. diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h index eaec30a24d..96e6846a0d 100644 --- a/include/wx/generic/bmpcbox.h +++ b/include/wx/generic/bmpcbox.h @@ -84,7 +84,7 @@ public: virtual ~wxBitmapComboBox(); - virtual wxString GetStringSelection() const wxOVERRIDE; + virtual wxString GetStringSelection() const override; // Adds item with image to the end of the combo box. int Append(const wxString& item, const wxBitmapBundle& bitmap = wxBitmapBundle()); @@ -100,30 +100,30 @@ public: unsigned int pos, wxClientData *clientData); // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) override; + virtual bool SetFont(const wxFont& font) override; protected: - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE; - virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE; - virtual wxCoord OnMeasureItem(size_t item) const wxOVERRIDE; - virtual wxCoord OnMeasureItemWidth(size_t item) const wxOVERRIDE; + virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const override; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const override; + virtual wxCoord OnMeasureItem(size_t item) const override; + virtual wxCoord OnMeasureItemWidth(size_t item) const override; // Event handlers void OnSize(wxSizeEvent& event); - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; } - virtual wxWindow* GetControl() wxOVERRIDE { return this; } + virtual wxItemContainer* GetItemContainer() override { return this; } + virtual wxWindow* GetControl() override { return this; } // wxItemContainer implementation virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + void **clientData, wxClientDataType type) override; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; private: bool m_inResize; diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h index 2d8d6e0506..274ba08f40 100644 --- a/include/wx/generic/buttonbar.h +++ b/include/wx/generic/buttonbar.h @@ -47,22 +47,22 @@ public: virtual ~wxButtonToolBar(); - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; - virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual void SetToolShortHelp(int id, const wxString& helpString) override; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const override; protected: // common part of all ctors void Init(); // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) override; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) override; - 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 void DoEnableTool(wxToolBarToolBase *tool, bool enable) override; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) override; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) override; virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, @@ -71,11 +71,11 @@ protected: wxItemKind kind, wxObject *clientData, const wxString& shortHelp, - const wxString& longHelp) wxOVERRIDE; + const wxString& longHelp) override; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; + const wxString& label) override; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // calculate layout void DoLayout(); diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h index 0ce0fe5a83..c84a5b0b2f 100644 --- a/include/wx/generic/calctrlg.h +++ b/include/wx/generic/calctrlg.h @@ -46,22 +46,22 @@ public: virtual ~wxGenericCalendarCtrl(); - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; // set/get the current date // ------------------------ - virtual bool SetDate(const wxDateTime& date) wxOVERRIDE; - virtual wxDateTime GetDate() const wxOVERRIDE { return m_date; } + virtual bool SetDate(const wxDateTime& date) override; + virtual wxDateTime GetDate() const override { return m_date; } // set/get the range in which selection can occur // --------------------------------------------- virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; + const wxDateTime& upperdate = wxDefaultDateTime) override; - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const override; // these functions are for generic version only, don't use them but use the // Set/GetDateRange() above instead @@ -79,7 +79,7 @@ public: // should be used instead for them // corresponds to wxCAL_NO_MONTH_CHANGE bit - virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; + virtual bool EnableMonthChange(bool enable = true) override; // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only void EnableYearChange(bool enable = true); @@ -88,48 +88,48 @@ public: // customization // ------------- - virtual void Mark(size_t day, bool mark) wxOVERRIDE; + virtual void Mark(size_t day, bool mark) override; // all other functions in this section are for generic version only // header colours are used for painting the weekdays at the top - virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE + virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) override { m_colHeaderFg = colFg; m_colHeaderBg = colBg; } - virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; } - virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; } + virtual const wxColour& GetHeaderColourFg() const override { return m_colHeaderFg; } + virtual const wxColour& GetHeaderColourBg() const override { return m_colHeaderBg; } // highlight colour is used for the currently selected date - virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE + virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg) override { m_colHighlightFg = colFg; m_colHighlightBg = colBg; } - virtual const wxColour& GetHighlightColourFg() const wxOVERRIDE { return m_colHighlightFg; } - virtual const wxColour& GetHighlightColourBg() const wxOVERRIDE { return m_colHighlightBg; } + virtual const wxColour& GetHighlightColourFg() const override { return m_colHighlightFg; } + virtual const wxColour& GetHighlightColourBg() const override { return m_colHighlightBg; } // holiday colour is used for the holidays (if style & wxCAL_SHOW_HOLIDAYS) - virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE + virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) override { m_colHolidayFg = colFg; m_colHolidayBg = colBg; } - virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; } - virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; } + virtual const wxColour& GetHolidayColourFg() const override { return m_colHolidayFg; } + virtual const wxColour& GetHolidayColourBg() const override { return m_colHolidayBg; } - virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE + virtual wxCalendarDateAttr *GetAttr(size_t day) const override { wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") ); return m_attrs[day - 1]; } - virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE + virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) override { wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") ); @@ -137,24 +137,24 @@ public: m_attrs[day - 1] = attr; } - virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); } + virtual void ResetAttr(size_t day) override { SetAttr(day, NULL); } - virtual void SetHoliday(size_t day) wxOVERRIDE; + virtual void SetHoliday(size_t day) override; virtual wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime *date = NULL, - wxDateTime::WeekDay *wd = NULL) wxOVERRIDE; + wxDateTime::WeekDay *wd = NULL) override; // implementation only from now on // ------------------------------- // forward these functions to all subcontrols - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; + virtual bool Show(bool show = true) override; - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } static wxVisualAttributes @@ -164,9 +164,9 @@ public: protected: // override some base class virtuals - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoGetSize(int *width, int *height) const override; private: // common part of all ctors @@ -248,8 +248,8 @@ public: wxControl *GetYearControl() const; private: - virtual void ResetHolidayAttrs() wxOVERRIDE; - virtual void RefreshHolidays() wxOVERRIDE { Refresh(); } + virtual void ResetHolidayAttrs() override; + virtual void RefreshHolidays() override { Refresh(); } // OnPaint helper-methods diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 7223983297..a9b8e32ec3 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; private: wxCaret *m_caret; @@ -46,17 +46,17 @@ public: // -------------- // called by wxWindow (not using the event tables) - virtual void OnSetFocus() wxOVERRIDE; - virtual void OnKillFocus() wxOVERRIDE; + virtual void OnSetFocus() override; + virtual void OnKillFocus() override; // called by wxCaretTimer void OnTimer(); protected: - virtual void DoShow() wxOVERRIDE; - virtual void DoHide() wxOVERRIDE; - virtual void DoMove() wxOVERRIDE; - virtual void DoSize() wxOVERRIDE; + virtual void DoShow() override; + virtual void DoHide() override; + virtual void DoMove() override; + virtual void DoSize() override; // blink the caret once void Blink(); diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index c8c8bc8b86..524eb23320 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -201,13 +201,13 @@ public: wxArrayInt GetSelections() const { return m_selections; } // implementation from now on - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; protected: #if wxUSE_CHECKLISTBOX virtual wxListBoxBase *CreateList(int n, const wxString *choices, - long styleLbox) wxOVERRIDE; + long styleLbox) override; #endif // wxUSE_CHECKLISTBOX wxArrayInt m_selections; diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 2194d72c14..2616f80f26 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -67,9 +67,9 @@ public: protected: wxBitmap m_bitmap; - wxSize DoGetBestSize() const wxOVERRIDE; + wxSize DoGetBestSize() const override; - void UpdateColour() wxOVERRIDE; + void UpdateColour() override; void OnDPIChanged(wxDPIChangedEvent& event); diff --git a/include/wx/generic/collheaderctrl.h b/include/wx/generic/collheaderctrl.h index 0fbddf7db9..fbde283461 100644 --- a/include/wx/generic/collheaderctrl.h +++ b/include/wx/generic/collheaderctrl.h @@ -39,14 +39,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr)); - virtual void SetCollapsed(bool collapsed = true) wxOVERRIDE; + virtual void SetCollapsed(bool collapsed = true) override; - virtual bool IsCollapsed() const wxOVERRIDE + virtual bool IsCollapsed() const override { return m_collapsed; } protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; private: bool m_collapsed; diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h index d45bde12bc..a731cbb8c1 100644 --- a/include/wx/generic/collpaneg.h +++ b/include/wx/generic/collpaneg.h @@ -52,16 +52,16 @@ public: const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr)); // public wxCollapsiblePane API - virtual void Collapse(bool collapse = true) wxOVERRIDE; - virtual void SetLabel(const wxString &label) wxOVERRIDE; + virtual void Collapse(bool collapse = true) override; + virtual void SetLabel(const wxString &label) override; - virtual bool IsCollapsed() const wxOVERRIDE + virtual bool IsCollapsed() const override { return m_pPane==NULL || !m_pPane->IsShown(); } - virtual wxWindow *GetPane() const wxOVERRIDE + virtual wxWindow *GetPane() const override { return m_pPane; } - virtual wxString GetLabel() const wxOVERRIDE; + virtual wxString GetLabel() const override; - virtual bool Layout() wxOVERRIDE; + virtual bool Layout() override; // for the generic collapsible pane only: @@ -73,7 +73,7 @@ public: protected: // overridden methods - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; int GetBorder() const; diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 98fe616a4b..c0cb7b2d8c 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -44,7 +44,7 @@ public: wxColourData &GetColourData() { return m_colourData; } - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; // Internal functions void OnMouseEvent(wxMouseEvent& event); diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h index 3733b3215d..ce5d5c54a6 100644 --- a/include/wx/generic/combo.h +++ b/include/wx/generic/combo.h @@ -68,7 +68,7 @@ public: void SetCustomPaintWidth( int width ); - virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE; + virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const override; static int GetFeatures() { return wxComboCtrlFeatures::All; } @@ -88,18 +88,18 @@ protected: virtual WXWidget GetTextWidget() const { return NULL; } #elif defined(__WXGTK__) #if defined(__WXGTK20__) - virtual GtkEditable *GetEditable() const wxOVERRIDE { return NULL; } - virtual GtkEntry *GetEntry() const wxOVERRIDE { return NULL; } + virtual GtkEditable *GetEditable() const override { return NULL; } + virtual GtkEntry *GetEntry() const override { return NULL; } #endif #elif defined(__WXOSX__) - virtual wxTextWidgetImpl * GetTextPeer() const wxOVERRIDE; + virtual wxTextWidgetImpl * GetTextPeer() const override; #endif // For better transparent background rendering - virtual bool HasTransparentBackground() wxOVERRIDE; + virtual bool HasTransparentBackground() override; // Mandatory virtuals - virtual void OnResize() wxOVERRIDE; + virtual void OnResize() override; // Event handlers void OnPaintEvent( wxPaintEvent& event ); diff --git a/include/wx/generic/custombgwin.h b/include/wx/generic/custombgwin.h index c646b700c8..aa7e6892ff 100644 --- a/include/wx/generic/custombgwin.h +++ b/include/wx/generic/custombgwin.h @@ -61,7 +61,7 @@ public: wxCustomBackgroundWindow() { } protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) override { m_bitmapBg = bmp; diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index 6602b4a0d1..02b1fad6d6 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -58,17 +58,17 @@ public: } // implement wxHeaderColumnBase methods - virtual void SetTitle(const wxString& title) wxOVERRIDE + virtual void SetTitle(const wxString& title) override { m_title = title; UpdateWidth(); } - virtual wxString GetTitle() const wxOVERRIDE + virtual wxString GetTitle() const override { return m_title; } - virtual void SetWidth(int width) wxOVERRIDE + virtual void SetWidth(int width) override { // Call the actual update method, used for both automatic and "manual" // width changes. @@ -79,53 +79,53 @@ public: // this size. m_manuallySetWidth = width; } - virtual int GetWidth() const wxOVERRIDE; + virtual int GetWidth() const override; - virtual void SetMinWidth(int minWidth) wxOVERRIDE + virtual void SetMinWidth(int minWidth) override { m_minWidth = minWidth; UpdateWidth(); } - virtual int GetMinWidth() const wxOVERRIDE + virtual int GetMinWidth() const override { return m_minWidth; } - virtual void SetAlignment(wxAlignment align) wxOVERRIDE + virtual void SetAlignment(wxAlignment align) override { m_align = align; UpdateDisplay(); } - virtual wxAlignment GetAlignment() const wxOVERRIDE + virtual wxAlignment GetAlignment() const override { return m_align; } - virtual void SetFlags(int flags) wxOVERRIDE + virtual void SetFlags(int flags) override { m_flags = flags; UpdateDisplay(); } - virtual int GetFlags() const wxOVERRIDE + virtual int GetFlags() const override { return m_flags; } - virtual bool IsSortKey() const wxOVERRIDE + virtual bool IsSortKey() const override { return m_sort; } - virtual void UnsetAsSortKey() wxOVERRIDE; + virtual void UnsetAsSortKey() override; - virtual void SetSortOrder(bool ascending) wxOVERRIDE; + virtual void SetSortOrder(bool ascending) override; - virtual bool IsSortOrderAscending() const wxOVERRIDE + virtual bool IsSortOrderAscending() const override { return m_sortAscending; } - virtual void SetBitmap( const wxBitmapBundle& bitmap ) wxOVERRIDE + virtual void SetBitmap( const wxBitmapBundle& bitmap ) override { wxDataViewColumnBase::SetBitmap(bitmap); UpdateWidth(); @@ -146,7 +146,7 @@ public: // user interactively. void WXOnResize(int width); - virtual int WXGetSpecifiedWidth() const wxOVERRIDE; + virtual int WXGetSpecifiedWidth() const override; private: // common part of all ctors @@ -222,78 +222,78 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxDataViewCtrlNameStr)); - virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE; + virtual bool AssociateModel( wxDataViewModel *model ) override; - virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE; + virtual bool AppendColumn( wxDataViewColumn *col ) override; + virtual bool PrependColumn( wxDataViewColumn *col ) override; + virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) override; - virtual void DoSetExpanderColumn() wxOVERRIDE; - virtual void DoSetIndent() wxOVERRIDE; + virtual void DoSetExpanderColumn() override; + virtual void DoSetIndent() override; - 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 unsigned int GetColumnCount() const override; + virtual wxDataViewColumn* GetColumn( unsigned int pos ) const override; + virtual bool DeleteColumn( wxDataViewColumn *column ) override; + virtual bool ClearColumns() override; + virtual int GetColumnPosition( const wxDataViewColumn *column ) const override; - virtual wxDataViewColumn *GetSortingColumn() const wxOVERRIDE; - virtual wxVector GetSortingColumns() const wxOVERRIDE; + virtual wxDataViewColumn *GetSortingColumn() const override; + virtual wxVector GetSortingColumns() const override; - virtual wxDataViewItem GetTopItem() const wxOVERRIDE; - virtual int GetCountPerPage() const wxOVERRIDE; + virtual wxDataViewItem GetTopItem() const override; + virtual int GetCountPerPage() const override; - 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 int GetSelectedItemsCount() const override; + virtual int GetSelections( wxDataViewItemArray & sel ) const override; + virtual void SetSelections( const wxDataViewItemArray & sel ) override; + virtual void Select( const wxDataViewItem & item ) override; + virtual void Unselect( const wxDataViewItem & item ) override; + virtual bool IsSelected( const wxDataViewItem & item ) const override; - virtual void SelectAll() wxOVERRIDE; - virtual void UnselectAll() wxOVERRIDE; + virtual void SelectAll() override; + virtual void UnselectAll() override; virtual void EnsureVisible( const wxDataViewItem & item, - const wxDataViewColumn *column = NULL ) wxOVERRIDE; + const wxDataViewColumn *column = NULL ) override; virtual void HitTest( const wxPoint & point, wxDataViewItem & item, - wxDataViewColumn* &column ) const wxOVERRIDE; + wxDataViewColumn* &column ) const override; virtual wxRect GetItemRect( const wxDataViewItem & item, - const wxDataViewColumn *column = NULL ) const wxOVERRIDE; + const wxDataViewColumn *column = NULL ) const override; - virtual bool SetRowHeight( int rowHeight ) wxOVERRIDE; + virtual bool SetRowHeight( int rowHeight ) override; - virtual void Collapse( const wxDataViewItem & item ) wxOVERRIDE; - virtual bool IsExpanded( const wxDataViewItem & item ) const wxOVERRIDE; + virtual void Collapse( const wxDataViewItem & item ) override; + virtual bool IsExpanded( const wxDataViewItem & item ) const override; - virtual void SetFocus() wxOVERRIDE; + virtual void SetFocus() override; - virtual bool SetFont(const wxFont & font) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetFont(const wxFont & font) override; + virtual bool SetForegroundColour(const wxColour& colour) override; + virtual bool SetBackgroundColour(const wxColour& colour) override; #if wxUSE_ACCESSIBILITY - virtual bool Show(bool show = true) wxOVERRIDE; - virtual void SetName(const wxString &name) wxOVERRIDE; - virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual void SetName(const wxString &name) override; + virtual bool Reparent(wxWindowBase *newParent) override; #endif // wxUSE_ACCESSIBILITY - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; - virtual bool AllowMultiColumnSort(bool allow) wxOVERRIDE; - virtual bool IsMultiColumnSortAllowed() const wxOVERRIDE { return m_allowMultiColumnSort; } - virtual void ToggleSortByColumn(int column) wxOVERRIDE; + virtual bool AllowMultiColumnSort(bool allow) override; + virtual bool IsMultiColumnSortAllowed() const override { return m_allowMultiColumnSort; } + virtual void ToggleSortByColumn(int column) override; #if wxUSE_DRAG_AND_DROP - virtual bool EnableDragSource( const wxDataFormat &format ) wxOVERRIDE; - virtual bool DoEnableDropTarget(const wxVector& formats) wxOVERRIDE; + virtual bool EnableDragSource( const wxDataFormat &format ) override; + virtual bool DoEnableDropTarget(const wxVector& formats) override; #endif // wxUSE_DRAG_AND_DROP - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override; - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) override; - virtual bool SetHeaderAttr(const wxItemAttr& attr) wxOVERRIDE; + virtual bool SetHeaderAttr(const wxItemAttr& attr) override; - virtual bool SetAlternateRowColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetAlternateRowColour(const wxColour& colour) override; // This method is specific to generic wxDataViewCtrl implementation and // should not be used in portable code. @@ -322,7 +322,7 @@ protected: // Reset all columns currently used for sorting. void ResetAllSortColumns(); - virtual void DoEnableSystemTheme(bool enable, wxWindow* window) wxOVERRIDE; + virtual void DoEnableSystemTheme(bool enable, wxWindow* window) override; void OnDPIChanged(wxDPIChangedEvent& event); @@ -358,22 +358,22 @@ public: // utility functions not part of the API // return the column displayed at the given position in the control wxDataViewColumn *GetColumnAt(unsigned int pos) const; - virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; + virtual wxDataViewColumn *GetCurrentColumn() const override; - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; #if wxUSE_ACCESSIBILITY - virtual wxAccessible* CreateAccessible() wxOVERRIDE; + virtual wxAccessible* CreateAccessible() override; #endif // wxUSE_ACCESSIBILITY private: // Implement pure virtual method inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; - virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; - virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; + virtual wxDataViewItem DoGetCurrentItem() const override; + virtual void DoSetCurrentItem(const wxDataViewItem& item) override; - virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) wxOVERRIDE; + virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) override; void InvalidateColBestWidths(); void InvalidateColBestWidth(int idx); @@ -411,12 +411,12 @@ private: private: void OnSize( wxSizeEvent &event ); - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) override; // we need to return a special WM_GETDLGCODE value to process just the // arrows but let the other navigation characters through #ifdef __WXMSW__ - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; #endif // __WXMSW__ WX_FORWARD_TO_SCROLL_HELPER() @@ -439,43 +439,43 @@ public: virtual ~wxDataViewCtrlAccessible() {} virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, - wxAccessible** childObject) wxOVERRIDE; + wxAccessible** childObject) override; - virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE; + virtual wxAccStatus GetLocation(wxRect& rect, int elementId) override; virtual wxAccStatus Navigate(wxNavDir navDir, int fromId, - int* toId, wxAccessible** toObject) wxOVERRIDE; + int* toId, wxAccessible** toObject) override; - virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE; + virtual wxAccStatus GetName(int childId, wxString* name) override; - virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE; + virtual wxAccStatus GetChildCount(int* childCount) override; - virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE; + virtual wxAccStatus GetChild(int childId, wxAccessible** child) override; // wxWindowAccessible::GetParent() implementation is enough. - // virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE; + // virtual wxAccStatus GetParent(wxAccessible** parent) override; - virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE; + virtual wxAccStatus DoDefaultAction(int childId) override; - virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE; + virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) override; - virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE; + virtual wxAccStatus GetDescription(int childId, wxString* description) override; - virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE; + virtual wxAccStatus GetHelpText(int childId, wxString* helpText) override; - virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE; + virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) override; - virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE; + virtual wxAccStatus GetRole(int childId, wxAccRole* role) override; - virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE; + virtual wxAccStatus GetState(int childId, long* state) override; - virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE; + virtual wxAccStatus GetValue(int childId, wxString* strValue) override; - virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE; + virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) override; - virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE; + virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) override; - virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE; + virtual wxAccStatus GetSelections(wxVariant* selections) override; }; #endif // wxUSE_ACCESSIBILITY diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 365f5681e2..c0a0433510 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -52,11 +52,11 @@ public: const wxString& name = wxDatePickerCtrlNameStr); // wxDatePickerCtrl methods - void SetValue(const wxDateTime& date) wxOVERRIDE; - wxDateTime GetValue() const wxOVERRIDE; + void SetValue(const wxDateTime& date) override; + wxDateTime GetValue() const override; - bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE; - void SetRange(const wxDateTime &dt1, const wxDateTime &dt2) wxOVERRIDE; + bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const override; + void SetRange(const wxDateTime &dt1, const wxDateTime &dt2) override; bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, const wxDateTime& upperdate = wxDefaultDateTime); @@ -69,16 +69,16 @@ public: // ------------------------------- // overridden base class methods - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: void Init(); // return the list of the windows composing this one - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; void OnText(wxCommandEvent &event); void OnSize(wxSizeEvent& event); diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index cf3e1356ff..430fc06ff1 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -51,97 +51,97 @@ public: virtual ~wxPostScriptDCImpl(); virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; + virtual bool IsOk() const override; - bool CanDrawBitmap() const wxOVERRIDE { return true; } + bool CanDrawBitmap() const override { 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 Clear() override; + void SetFont( const wxFont& font ) override; + void SetPen( const wxPen& pen ) override; + void SetBrush( const wxBrush& brush ) override; + void SetLogicalFunction( wxRasterOperationMode function ) override; + void SetBackground( const wxBrush& brush ) override; - void DestroyClippingRegion() wxOVERRIDE; + void DestroyClippingRegion() override; - bool StartDoc(const wxString& message) wxOVERRIDE; - void EndDoc() wxOVERRIDE; - void StartPage() wxOVERRIDE; - void EndPage() wxOVERRIDE; + bool StartDoc(const wxString& message) override; + void EndDoc() override; + void StartPage() override; + void EndPage() override; - wxCoord GetCharHeight() const wxOVERRIDE; - wxCoord GetCharWidth() const wxOVERRIDE; - bool CanGetTextExtent() const wxOVERRIDE { return true; } + wxCoord GetCharHeight() const override; + wxCoord GetCharWidth() const override; + bool CanGetTextExtent() const override { return true; } // Resolution in pixels per logical inch - wxSize GetPPI() const wxOVERRIDE; + wxSize GetPPI() const override; - virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE; + virtual wxSize FromDIP(const wxSize& sz) const override; - virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE; + virtual wxSize ToDIP(const wxSize& sz) const override; - virtual void ComputeScaleAndOrigin() wxOVERRIDE; + virtual void ComputeScaleAndOrigin() override; - void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { } + void SetBackgroundMode(int WXUNUSED(mode)) override { } #if wxUSE_PALETTE - void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } + void SetPalette(const wxPalette& WXUNUSED(palette)) override { } #endif void SetPrintData(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } - virtual int GetDepth() const wxOVERRIDE { return 24; } + virtual int GetDepth() const override { return 24; } void PsPrint( const wxString& psdata ); // Overridden for wxPrinterDC Impl - virtual int GetResolution() const wxOVERRIDE; - virtual wxRect GetPaperRect() const wxOVERRIDE; + virtual int GetResolution() const override; + virtual wxRect GetPaperRect() const override; - virtual void* GetHandle() const wxOVERRIDE { return NULL; } + virtual void* GetHandle() const override { return NULL; } protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - 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; + wxFloodFillStyle style = wxFLOOD_SURFACE) override; + bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const override; + void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; + void DoCrossHair(wxCoord x, wxCoord y) override ; + void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) override; + void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) override; + void DoDrawPoint(wxCoord x, wxCoord y) override; + void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) override; void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; 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) wxOVERRIDE; - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; + void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; + void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20) override; + void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; #if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points) wxOVERRIDE; + void DoDrawSpline(const wxPointList *points) override; #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) 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 + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override; + void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override; + void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false) override; + void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override; + void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) override; + void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; + void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip)) override { wxFAIL_MSG( "not implemented" ); } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; - void DoGetSize(int* width, int* height) const wxOVERRIDE; - void DoGetSizeMM(int *width, int *height) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; + void DoGetSize(int* width, int* height) const override; + void DoGetSizeMM(int *width, int *height) const override; // Common part of DoDrawText() and DoDrawRotatedText() void DrawAnyText(const wxWX2MBbuf& textbuf, wxCoord testDescent, double lineHeight); diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 35bb3063d4..8ec71ba8e0 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -176,7 +176,7 @@ public: virtual void CollapseTree(); // overridden base class methods - virtual void SetFocus() wxOVERRIDE; + virtual void SetFocus() override; protected: virtual void ExpandRoot(); diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 5656ef5bd2..9763662d6e 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -54,12 +54,12 @@ public: const wxString& name = wxASCII_STR(wxDirDialogNameStr)); //// Accessors - void SetPath(const wxString& path) wxOVERRIDE; - wxString GetPath() const wxOVERRIDE; + void SetPath(const wxString& path) override; + wxString GetPath() const override; //// Overrides - virtual int ShowModal() wxOVERRIDE; - virtual void EndModal(int retCode) wxOVERRIDE; + virtual int ShowModal() override; + virtual void EndModal(int retCode) override; // this one is specific to wxGenericDirDialog wxTextCtrl* GetInputCtrl() const { return m_input; } diff --git a/include/wx/generic/dvrenderer.h b/include/wx/generic/dvrenderer.h index a2acca831e..083a12b66a 100644 --- a/include/wx/generic/dvrenderer.h +++ b/include/wx/generic/dvrenderer.h @@ -23,19 +23,19 @@ public: int align = wxDVR_DEFAULT_ALIGNMENT ); virtual ~wxDataViewRenderer(); - virtual wxDC *GetDC() wxOVERRIDE; + virtual wxDC *GetDC() override; - virtual void SetAlignment( int align ) wxOVERRIDE; - virtual int GetAlignment() const wxOVERRIDE; + virtual void SetAlignment( int align ) override; + virtual int GetAlignment() const override; - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE + virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) override { m_ellipsizeMode = mode; } - virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE + virtual wxEllipsizeMode GetEllipsizeMode() const override { return m_ellipsizeMode; } - virtual void SetMode( wxDataViewCellMode mode ) wxOVERRIDE + virtual void SetMode( wxDataViewCellMode mode ) override { m_mode = mode; } - virtual wxDataViewCellMode GetMode() const wxOVERRIDE + virtual wxDataViewCellMode GetMode() const override { return m_mode; } // implementation @@ -55,7 +55,7 @@ public: void SetState(int state) { m_state = state; } protected: - virtual bool IsHighlighted() const wxOVERRIDE + virtual bool IsHighlighted() const override { return m_state & wxDATAVIEW_CELL_SELECTED; } private: diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h index 17d963ecdb..1cc2ad93e3 100644 --- a/include/wx/generic/dvrenderers.h +++ b/include/wx/generic/dvrenderers.h @@ -31,13 +31,13 @@ public: wxDataViewModel *model, const wxDataViewItem& item, unsigned int col, - const wxMouseEvent *mouseEvent) wxOVERRIDE + const wxMouseEvent *mouseEvent) override { return ActivateCell(cell, model, item, col, mouseEvent); } #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY private: @@ -63,20 +63,20 @@ public: void EnableMarkup(bool enable = true); #endif // wxUSE_MARKUP - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render(wxRect cell, wxDC *dc, int state) override; + virtual wxSize GetSize() const override; // in-place editing - virtual bool HasEditorCtrl() const wxOVERRIDE; + virtual bool HasEditorCtrl() const override; virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; + const wxVariant &value ) override; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override; protected: wxString m_text; @@ -102,18 +102,18 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; virtual - bool IsCompatibleVariantType(const wxString& variantType) const wxOVERRIDE; + bool IsCompatibleVariantType(const wxString& variantType) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render( wxRect cell, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; private: wxBitmapBundle m_bitmapBundle; @@ -137,21 +137,21 @@ public: void ShowAsRadio() { m_radio = true; } - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render( wxRect cell, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; // Implementation only, don't use nor override virtual bool WXActivateCell(const wxRect& cell, wxDataViewModel *model, const wxDataViewItem& item, unsigned int col, - const wxMouseEvent *mouseEvent) wxOVERRIDE; + const wxMouseEvent *mouseEvent) override; private: bool m_toggle; bool m_radio; @@ -174,14 +174,14 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant& value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant& value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render(wxRect cell, wxDC *dc, int state) override; + virtual wxSize GetSize() const override; private: wxString m_label; @@ -204,19 +204,19 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE; + virtual wxString GetAccessibleDescription() const override; #endif // wxUSE_ACCESSIBILITY - virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render(wxRect cell, wxDC *dc, int state) override; + virtual wxSize GetSize() const override; - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } + virtual bool HasEditorCtrl() const override { return true; } virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ) wxOVERRIDE; - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; + const wxVariant &value ) override; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override; private: wxDataViewIconText m_value; diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h index 76ca57eb73..d278d91146 100644 --- a/include/wx/generic/filectrlg.h +++ b/include/wx/generic/filectrlg.h @@ -218,32 +218,32 @@ public: const wxSize& size = wxDefaultSize, const wxString& name = wxASCII_STR(wxFileCtrlNameStr) ); - virtual void SetWildcard( const wxString& wildCard ) wxOVERRIDE; - virtual void SetFilterIndex( int filterindex ) wxOVERRIDE; - virtual bool SetDirectory( const wxString& dir ) wxOVERRIDE; + virtual void SetWildcard( const wxString& wildCard ) override; + virtual void SetFilterIndex( int filterindex ) override; + virtual bool SetDirectory( const wxString& dir ) override; // Selects a certain file. // In case the filename specified isn't found/couldn't be shown with // currently selected filter, false is returned and nothing happens - virtual bool SetFilename( const wxString& name ) wxOVERRIDE; + virtual bool SetFilename( const wxString& name ) override; // Changes to a certain directory and selects a certain file. // In case the filename specified isn't found/couldn't be shown with // currently selected filter, false is returned and if directory exists // it's chdir'ed to - virtual bool SetPath( const wxString& path ) wxOVERRIDE; + virtual bool SetPath( const wxString& path ) override; - 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_filterIndex; } + virtual wxString GetFilename() const override; + virtual wxString GetDirectory() const override; + virtual wxString GetWildcard() const override { return this->m_wildCard; } + virtual wxString GetPath() const override; + virtual void GetPaths( wxArrayString& paths ) const override; + virtual void GetFilenames( wxArrayString& files ) const override; + virtual int GetFilterIndex() const override { return m_filterIndex; } - virtual bool HasMultipleFileSelection() const wxOVERRIDE + virtual bool HasMultipleFileSelection() const override { return HasFlag(wxFC_MULTIPLE); } - virtual void ShowHidden(bool show) wxOVERRIDE { m_list->ShowHidden( show ); } + virtual void ShowHidden(bool show) override { m_list->ShowHidden( show ); } void GoToParentDir(); void GoToHomeDir(); diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index 9ec1b51c56..a08e2ce7ef 100644 --- a/include/wx/generic/filedlgg.h +++ b/include/wx/generic/filedlgg.h @@ -60,45 +60,45 @@ public: virtual ~wxGenericFileDialog(); - virtual void SetDirectory(const wxString& dir) wxOVERRIDE + virtual void SetDirectory(const wxString& dir) override { m_filectrl->SetDirectory(dir); } - virtual void SetFilename(const wxString& name) wxOVERRIDE + virtual void SetFilename(const wxString& name) override { m_filectrl->SetFilename(name); } - virtual void SetMessage(const wxString& message) wxOVERRIDE { SetTitle(message); } - virtual void SetPath(const wxString& path) wxOVERRIDE + virtual void SetMessage(const wxString& message) override { SetTitle(message); } + virtual void SetPath(const wxString& path) override { m_filectrl->SetPath(path); } - virtual void SetFilterIndex(int filterIndex) wxOVERRIDE + virtual void SetFilterIndex(int filterIndex) override { m_filectrl->SetFilterIndex(filterIndex); } - virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE + virtual void SetWildcard(const wxString& wildCard) override { m_filectrl->SetWildcard(wildCard); } - virtual wxString GetPath() const wxOVERRIDE + virtual wxString GetPath() const override { wxCHECK_MSG( !HasFlag(wxFD_MULTIPLE), wxString(), "When using wxFD_MULTIPLE, must call GetPaths() instead" ); return m_filectrl->GetPath(); } - virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE + virtual void GetPaths(wxArrayString& paths) const override { m_filectrl->GetPaths(paths); } - virtual wxString GetDirectory() const wxOVERRIDE + virtual wxString GetDirectory() const override { return m_filectrl->GetDirectory(); } - virtual wxString GetFilename() const wxOVERRIDE + virtual wxString GetFilename() const override { wxCHECK_MSG( !HasFlag(wxFD_MULTIPLE), wxString(), "When using wxFD_MULTIPLE, must call GetFilenames() instead" ); return m_filectrl->GetFilename(); } - virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE + virtual void GetFilenames(wxArrayString& files) const override { m_filectrl->GetFilenames(files); } - virtual wxString GetWildcard() const wxOVERRIDE + virtual wxString GetWildcard() const override { return m_filectrl->GetWildcard(); } - virtual int GetFilterIndex() const wxOVERRIDE + virtual int GetFilterIndex() const override { return m_filectrl->GetFilterIndex(); } - virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } + virtual bool SupportsExtraControl() const override { return true; } // implementation only from now on // ------------------------------- - virtual int ShowModal() wxOVERRIDE; - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual int ShowModal() override; + virtual bool Show( bool show = true ) override; void OnList( wxCommandEvent &event ); void OnReport( wxCommandEvent &event ); diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h index 762dc4fb7a..060e9ccd2c 100644 --- a/include/wx/generic/filepickerg.h +++ b/include/wx/generic/filepickerg.h @@ -46,7 +46,7 @@ public: pos, size, style, validator, name); } - virtual wxControl *AsControl() wxOVERRIDE { return this; } + virtual wxControl *AsControl() override { return this; } public: // overridable @@ -57,7 +57,7 @@ public: // overridable virtual wxEventType GetEventType() const = 0; - virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE; + virtual void SetInitialDirectory(const wxString& dir) override; public: @@ -144,15 +144,15 @@ public: // overridable return filedlgstyle; } - virtual wxDialog *CreateDialog() wxOVERRIDE; + virtual wxDialog *CreateDialog() override; - wxEventType GetEventType() const wxOVERRIDE + wxEventType GetEventType() const override { return wxEVT_FILEPICKER_CHANGED; } protected: - void UpdateDialogPath(wxDialog *p) wxOVERRIDE + void UpdateDialogPath(wxDialog *p) override { wxStaticCast(p, wxFileDialog)->SetPath(m_path); } - void UpdatePathFromDialog(wxDialog *p) wxOVERRIDE + void UpdatePathFromDialog(wxDialog *p) override { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); } private: @@ -199,15 +199,15 @@ public: // overridable return dirdlgstyle; } - virtual wxDialog *CreateDialog() wxOVERRIDE; + virtual wxDialog *CreateDialog() override; - wxEventType GetEventType() const wxOVERRIDE + wxEventType GetEventType() const override { return wxEVT_DIRPICKER_CHANGED; } protected: - void UpdateDialogPath(wxDialog *p) wxOVERRIDE + void UpdateDialogPath(wxDialog *p) override { wxStaticCast(p, wxDirDialog)->SetPath(m_path); } - void UpdatePathFromDialog(wxDialog *p) wxOVERRIDE + void UpdatePathFromDialog(wxDialog *p) override { m_path = wxStaticCast(p, wxDirDialog)->GetPath(); } private: diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index 0df6d3b0ce..02d3cfccdd 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -45,7 +45,7 @@ public: : wxFontDialogBase(parent, data) { Init(); } virtual ~wxGenericFontDialog(); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; // Internal functions void OnCloseWindow(wxCloseEvent& event); @@ -61,7 +61,7 @@ public: protected: - virtual bool DoCreate(wxWindow *parent) wxOVERRIDE; + virtual bool DoCreate(wxWindow *parent) override; private: diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h index 2273d1d3bf..14c61d785c 100644 --- a/include/wx/generic/fontpickerg.h +++ b/include/wx/generic/fontpickerg.h @@ -35,10 +35,10 @@ public: Create(parent, id, initial, pos, size, style, validator, name); } - virtual wxColour GetSelectedColour() const wxOVERRIDE + virtual wxColour GetSelectedColour() const override { return m_data.GetColour(); } - virtual void SetSelectedColour(const wxColour &colour) wxOVERRIDE + virtual void SetSelectedColour(const wxColour &colour) override { m_data.SetColour(colour); UpdateFont(); } virtual ~wxGenericFontButton() {} @@ -69,7 +69,7 @@ public: protected: - void UpdateFont() wxOVERRIDE; + void UpdateFont() override; wxFontData m_data; diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 8fb7357755..97cf9941dd 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -566,24 +566,24 @@ public: // In this class these methods must be overridden. virtual wxGridActivationResult TryActivate(int row, int col, wxGrid* grid, - const wxGridActivationSource& actSource) wxOVERRIDE = 0; - virtual void DoActivate(int row, int col, wxGrid* grid) wxOVERRIDE = 0; + const wxGridActivationSource& actSource) override = 0; + virtual void DoActivate(int row, int col, wxGrid* grid) override = 0; // All the other methods that normally must be implemented in an editor are // defined as just stubs below, as they should be never called. - virtual void Create(wxWindow*, wxWindowID, wxEvtHandler*) wxOVERRIDE + virtual void Create(wxWindow*, wxWindowID, wxEvtHandler*) override { wxFAIL; } - virtual void BeginEdit(int, int, wxGrid*) wxOVERRIDE + virtual void BeginEdit(int, int, wxGrid*) override { wxFAIL; } virtual bool EndEdit(int, int, const wxGrid*, - const wxString&, wxString*) wxOVERRIDE + const wxString&, wxString*) override { wxFAIL; return false; } - virtual void ApplyEdit(int, int, wxGrid*) wxOVERRIDE + virtual void ApplyEdit(int, int, wxGrid*) override { wxFAIL; } - virtual void Reset() wxOVERRIDE + virtual void Reset() override { wxFAIL; } - virtual wxString GetValue() const wxOVERRIDE + virtual wxString GetValue() const override { wxFAIL; return wxString(); } }; @@ -639,7 +639,7 @@ class WXDLLIMPEXP_CORE wxGridRowHeaderRendererDefault public: virtual void DrawBorder(const wxGrid& grid, wxDC& dc, - wxRect& rect) const wxOVERRIDE; + wxRect& rect) const override; }; // Column header cells renderers @@ -649,7 +649,7 @@ class WXDLLIMPEXP_CORE wxGridColumnHeaderRendererDefault public: virtual void DrawBorder(const wxGrid& grid, wxDC& dc, - wxRect& rect) const wxOVERRIDE; + wxRect& rect) const override; }; // Header corner renderer @@ -659,7 +659,7 @@ class WXDLLIMPEXP_CORE wxGridCornerHeaderRendererDefault public: virtual void DrawBorder(const wxGrid& grid, wxDC& dc, - wxRect& rect) const wxOVERRIDE; + wxRect& rect) const override; }; // ---------------------------------------------------------------------------- @@ -1400,27 +1400,27 @@ public: // these are pure virtual in wxGridTableBase // - 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; + virtual int GetNumberRows() override { return static_cast(m_data.size()); } + virtual int GetNumberCols() override { return m_numCols; } + virtual wxString GetValue( int row, int col ) override; + virtual void SetValue( int row, int col, const wxString& s ) override; // overridden functions from wxGridTableBase // - 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 Clear() override; + bool InsertRows( size_t pos = 0, size_t numRows = 1 ) override; + bool AppendRows( size_t numRows = 1 ) override; + bool DeleteRows( size_t pos = 0, size_t numRows = 1 ) override; + bool InsertCols( size_t pos = 0, size_t numCols = 1 ) override; + bool AppendCols( size_t numCols = 1 ) override; + bool DeleteCols( size_t pos = 0, size_t numCols = 1 ) override; - void SetRowLabelValue( int row, const wxString& ) wxOVERRIDE; - void SetColLabelValue( int col, const wxString& ) wxOVERRIDE; - void SetCornerLabelValue( const wxString& ) wxOVERRIDE; - wxString GetRowLabelValue( int row ) wxOVERRIDE; - wxString GetColLabelValue( int col ) wxOVERRIDE; - wxString GetCornerLabelValue() const wxOVERRIDE; + void SetRowLabelValue( int row, const wxString& ) override; + void SetColLabelValue( int col, const wxString& ) override; + void SetCornerLabelValue( const wxString& ) override; + wxString GetRowLabelValue( int row ) override; + wxString GetColLabelValue( int col ) override; + wxString GetCornerLabelValue() const override; private: wxGridStringArray m_data; @@ -1632,7 +1632,7 @@ public: void DrawFrozenBorder( wxDC& dc, wxGridWindow *gridWindow ); void DrawLabelFrozenBorder( wxDC& dc, wxWindow *window, bool isRow ); - void ScrollWindow( int dx, int dy, const wxRect *rect ) wxOVERRIDE; + void ScrollWindow( int dx, int dy, const wxRect *rect ) override; void UpdateGridWindows() const; @@ -1703,7 +1703,7 @@ public: int GetBatchCount() const { return m_batchCount; } - virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL) wxOVERRIDE; + virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL) override; // Use this, rather than wxWindow::Refresh(), to force an // immediate repainting of the grid. Has no effect if you are @@ -2368,7 +2368,7 @@ public: // ------- drag and drop #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE; + virtual void SetDropTarget(wxDropTarget *dropTarget) override; #endif // wxUSE_DRAG_AND_DROP @@ -2398,15 +2398,15 @@ public: void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); } // override some base class functions - virtual void Fit() wxOVERRIDE; - virtual void SetFocus() wxOVERRIDE; + virtual void Fit() override; + virtual void SetFocus() override; // implementation only void CancelMouseCapture(); protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoEnable(bool enable) override; bool m_created; @@ -2745,7 +2745,7 @@ protected: { return SetCurrentCell( wxGridCellCoords(row, col) ); } - virtual bool ShouldScrollToChildOnFocus(wxWindow* WXUNUSED(win)) wxOVERRIDE + virtual bool ShouldScrollToChildOnFocus(wxWindow* WXUNUSED(win)) override { return false; } friend class WXDLLIMPEXP_FWD_CORE wxGridSelection; @@ -2773,7 +2773,7 @@ private: void OnDPIChanged(wxDPIChangedEvent& event); // implement wxScrolledCanvas method to return m_gridWin size - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) override; // depending on the values of m_numFrozenRows and m_numFrozenCols, it will // create and initialize or delete the frozen windows @@ -3144,7 +3144,7 @@ public: wxPoint GetPosition() const { return wxPoint( m_x, m_y ); } bool Selecting() const { return m_selecting; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEvent(*this); } + virtual wxEvent *Clone() const override { return new wxGridEvent(*this); } protected: int m_row; @@ -3204,7 +3204,7 @@ public: int GetRowOrCol() const { return m_rowOrCol; } wxPoint GetPosition() const { return wxPoint( m_x, m_y ); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridSizeEvent(*this); } + virtual wxEvent *Clone() const override { return new wxGridSizeEvent(*this); } protected: int m_rowOrCol; @@ -3268,7 +3268,7 @@ public: int GetRightCol() const { return m_bottomRight.GetCol(); } bool Selecting() const { return m_selecting; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridRangeSelectEvent(*this); } + virtual wxEvent *Clone() const override { return new wxGridRangeSelectEvent(*this); } protected: void Init(const wxGridCellCoords& topLeft, @@ -3314,7 +3314,7 @@ public: wxControl* GetControl() { return wxDynamicCast(m_window, wxControl); } void SetControl(wxControl* ctrl) { m_window = ctrl; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEditorCreatedEvent(*this); } + virtual wxEvent *Clone() const override { return new wxGridEditorCreatedEvent(*this); } private: int m_row; diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 1e61c4b750..7b99aa5f5f 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -39,15 +39,15 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; // return the string extent virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellStringRenderer(*this); } protected: @@ -82,21 +82,21 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; virtual wxSize GetMaxBestSize(wxGrid& grid, wxGridCellAttr& attr, - wxDC& dc) wxOVERRIDE; + wxDC& dc) override; // Optional parameters for this renderer are ",". - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellNumberRenderer(*this); } protected: @@ -136,18 +136,18 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; // parameters string format is "width[,precision[,format]]" // with format being one of f|e|g|E|F|G - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellFloatRenderer(*this); } protected: @@ -182,19 +182,19 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; // return the checkmark size virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; virtual wxSize GetMaxBestSize(wxGrid& grid, wxGridCellAttr& attr, - wxDC& dc) wxOVERRIDE; + wxDC& dc) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellBoolRenderer(*this); } }; @@ -224,22 +224,22 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; virtual wxSize GetMaxBestSize(wxGrid& grid, wxGridCellAttr& attr, - wxDC& dc) wxOVERRIDE; + wxDC& dc) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellDateRenderer(*this); } // output strptime()-like format string - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; protected: wxString GetString(const wxGrid& grid, int row, int col); @@ -266,12 +266,12 @@ public: { } - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellDateTimeRenderer(*this); } protected: virtual void - GetDateParseParams(wxGridPrivate::DateParseParams& params) const wxOVERRIDE; + GetDateParseParams(wxGridPrivate::DateParseParams& params) const override; wxString m_iformat; }; @@ -289,12 +289,12 @@ public: virtual wxSize GetMaxBestSize(wxGrid& grid, wxGridCellAttr& attr, - wxDC& dc) wxOVERRIDE; + wxDC& dc) override; // Parameters string is a comma-separated list of values. - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellChoiceRenderer(*this); } @@ -325,14 +325,14 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellEnumRenderer(*this); } protected: @@ -358,26 +358,26 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) wxOVERRIDE; + int row, int col) override; virtual int GetBestHeight(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, int row, int col, - int width) wxOVERRIDE; + int width) override; virtual int GetBestWidth(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, int row, int col, - int height) wxOVERRIDE; + int height) override; - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new wxGridCellAutoWrapStringRenderer(*this); } private: diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h index 7837de4709..3759b37128 100644 --- a/include/wx/generic/grideditors.h +++ b/include/wx/generic/grideditors.h @@ -65,30 +65,30 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; - virtual void SetSize(const wxRect& rect) wxOVERRIDE; + wxEvtHandler* evtHandler) override; + virtual void SetSize(const wxRect& rect) override; - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual bool IsAcceptedKey(wxKeyEvent& event) override; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; - virtual void Reset() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; - virtual void HandleReturn(wxKeyEvent& event) wxOVERRIDE; + virtual void Reset() override; + virtual void StartingKey(wxKeyEvent& event) override; + virtual void HandleReturn(wxKeyEvent& event) override; // parameters string format is "max_width" - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; #if wxUSE_VALIDATORS virtual void SetValidator(const wxValidator& validator); #endif - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellTextEditor(*this); } // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const wxOVERRIDE; + virtual wxString GetValue() const override; protected: wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; } @@ -131,27 +131,27 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; + wxEvtHandler* evtHandler) override; - virtual void SetSize(const wxRect& rect) wxOVERRIDE; + virtual void SetSize(const wxRect& rect) override; - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual bool IsAcceptedKey(wxKeyEvent& event) override; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; - virtual void Reset() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; + virtual void Reset() override; + virtual void StartingKey(wxKeyEvent& event) override; // parameters string format is "min,max" - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellNumberEditor(*this); } // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const wxOVERRIDE; + virtual wxString GetValue() const override; protected: #if wxUSE_SPINCTRL @@ -231,23 +231,23 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; + wxEvtHandler* evtHandler) override; - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual bool IsAcceptedKey(wxKeyEvent& event) override; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; - virtual void Reset() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; + virtual void Reset() override; + virtual void StartingKey(wxKeyEvent& event) override; - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellFloatEditor(*this); } // parameters string format is "width[,precision[,format]]" // format to choose between f|e|g|E|G (f is used by default) - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; protected: // string representation of our value @@ -284,32 +284,32 @@ public: virtual wxGridActivationResult TryActivate(int row, int col, wxGrid* grid, - const wxGridActivationSource& actSource) wxOVERRIDE; - virtual void DoActivate(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxGridActivationSource& actSource) override; + virtual void DoActivate(int row, int col, wxGrid* grid) override; virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; + wxEvtHandler* evtHandler) override; - virtual void SetSize(const wxRect& rect) wxOVERRIDE; - virtual void Show(bool show, wxGridCellAttr *attr = NULL) wxOVERRIDE; + virtual void SetSize(const wxRect& rect) override; + virtual void Show(bool show, wxGridCellAttr *attr = NULL) override; - virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual bool IsAcceptedKey(wxKeyEvent& event) override; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; - virtual void Reset() wxOVERRIDE; - virtual void StartingClick() wxOVERRIDE; - virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE; + virtual void Reset() override; + virtual void StartingClick() override; + virtual void StartingKey(wxKeyEvent& event) override; - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellBoolEditor(*this); } // added GetValue so we can get the value which is in the control, see // also UseStringValues() - virtual wxString GetValue() const wxOVERRIDE; + virtual wxString GetValue() const override; // set the string values returned by GetValue() for the true and false // states, respectively @@ -368,25 +368,25 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; + wxEvtHandler* evtHandler) override; - virtual void SetSize(const wxRect& rect) wxOVERRIDE; + virtual void SetSize(const wxRect& rect) override; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; - virtual void Reset() wxOVERRIDE; + virtual void Reset() override; // parameters string format is "item1[,item2[...,itemN]]" - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellChoiceEditor(*this); } // added GetValue so we can get the value which is in the control - virtual wxString GetValue() const wxOVERRIDE; + virtual wxString GetValue() const override; protected: wxComboBox *Combo() const { return (wxComboBox *)m_control; } @@ -415,13 +415,13 @@ public: virtual ~wxGridCellEnumEditor() {} - virtual wxGridCellEditor* Clone() const wxOVERRIDE + virtual wxGridCellEditor* Clone() const override { return new wxGridCellEnumEditor(*this); } - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; private: long m_index; @@ -444,9 +444,9 @@ public: virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; + wxEvtHandler* evtHandler) override; - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellAutoWrapStringEditor(*this); } }; @@ -464,25 +464,25 @@ public: { } - virtual void SetParameters(const wxString& params) wxOVERRIDE; + virtual void SetParameters(const wxString& params) override; virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE; + wxEvtHandler* evtHandler) override; - virtual void SetSize(const wxRect& rect) wxOVERRIDE; + virtual void SetSize(const wxRect& rect) override; - virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + virtual void BeginEdit(int row, int col, wxGrid* grid) override; virtual bool EndEdit(int row, int col, const wxGrid* grid, - const wxString& oldval, wxString *newval) wxOVERRIDE; - virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE; + const wxString& oldval, wxString *newval) override; + virtual void ApplyEdit(int row, int col, wxGrid* grid) override; - virtual void Reset() wxOVERRIDE; + virtual void Reset() override; - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new wxGridCellDateEditor(*this); } - virtual wxString GetValue() const wxOVERRIDE; + virtual wxString GetValue() const override; protected: wxDatePickerCtrl* DatePicker() const; diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h index 77da772496..5797d1aa0e 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 wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: // implement base class pure virtuals - virtual void DoSetCount(unsigned int count) wxOVERRIDE; - virtual unsigned int DoGetCount() const wxOVERRIDE; - virtual void DoUpdate(unsigned int idx) wxOVERRIDE; + virtual void DoSetCount(unsigned int count) override; + virtual unsigned int DoGetCount() const override; + virtual void DoUpdate(unsigned int idx) override; - virtual void DoScrollHorz(int dx) wxOVERRIDE; + virtual void DoScrollHorz(int dx) override; - virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE; - virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE; + virtual void DoSetColumnsOrder(const wxArrayInt& order) override; + virtual wxArrayInt DoGetColumnsOrder() const override; // common part of all ctors void Init(); diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h index ed05b6d459..10b8217115 100644 --- a/include/wx/generic/helpext.h +++ b/include/wx/generic/helpext.h @@ -33,36 +33,36 @@ public: // Set viewer: new name for SetBrowser virtual void SetViewer(const wxString& viewer = wxEmptyString, - long flags = wxHELP_NETSCAPE) wxOVERRIDE; + long flags = wxHELP_NETSCAPE) override; - virtual bool Initialize(const wxString& dir, int WXUNUSED(server)) wxOVERRIDE + virtual bool Initialize(const wxString& dir, int WXUNUSED(server)) override { return Initialize(dir); } - virtual bool Initialize(const wxString& dir) wxOVERRIDE; - virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE; - virtual bool DisplayContents() wxOVERRIDE; - virtual bool DisplaySection(int sectionNo) wxOVERRIDE; - virtual bool DisplaySection(const wxString& section) wxOVERRIDE; - virtual bool DisplayBlock(long blockNo) wxOVERRIDE; + virtual bool Initialize(const wxString& dir) override; + virtual bool LoadFile(const wxString& file = wxEmptyString) override; + virtual bool DisplayContents() override; + virtual bool DisplaySection(int sectionNo) override; + virtual bool DisplaySection(const wxString& section) override; + virtual bool DisplayBlock(long blockNo) override; virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE; + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) override; - virtual bool Quit() wxOVERRIDE; - virtual void OnQuit() wxOVERRIDE; + virtual bool Quit() override; + virtual void OnQuit() override; virtual bool DisplayHelp(const wxString &) ; virtual void SetFrameParameters(const wxString& WXUNUSED(title), const wxSize& WXUNUSED(size), const wxPoint& WXUNUSED(pos) = wxDefaultPosition, - bool WXUNUSED(newFrameEachTime) = false) wxOVERRIDE + bool WXUNUSED(newFrameEachTime) = false) override { // does nothing by default } virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, wxPoint *WXUNUSED(pos) = NULL, - bool *WXUNUSED(newFrameEachTime) = NULL) wxOVERRIDE + bool *WXUNUSED(newFrameEachTime) = NULL) override { return NULL; // does nothing by default } diff --git a/include/wx/generic/hyperlink.h b/include/wx/generic/hyperlink.h index 0c238e1029..451b59dccf 100644 --- a/include/wx/generic/hyperlink.h +++ b/include/wx/generic/hyperlink.h @@ -45,20 +45,20 @@ public: // get/set - wxColour GetHoverColour() const wxOVERRIDE { return m_hoverColour; } - void SetHoverColour(const wxColour &colour) wxOVERRIDE { m_hoverColour = colour; } + wxColour GetHoverColour() const override { return m_hoverColour; } + void SetHoverColour(const wxColour &colour) override { m_hoverColour = colour; } - wxColour GetNormalColour() const wxOVERRIDE { return m_normalColour; } - void SetNormalColour(const wxColour &colour) wxOVERRIDE; + wxColour GetNormalColour() const override { return m_normalColour; } + void SetNormalColour(const wxColour &colour) override; - wxColour GetVisitedColour() const wxOVERRIDE { return m_visitedColour; } - void SetVisitedColour(const wxColour &colour) wxOVERRIDE; + wxColour GetVisitedColour() const override { return m_visitedColour; } + void SetVisitedColour(const wxColour &colour) override; - wxString GetURL() const wxOVERRIDE { return m_url; } - void SetURL (const wxString &url) wxOVERRIDE { m_url=url; } + wxString GetURL() const override { return m_url; } + void SetURL (const wxString &url) override { m_url=url; } - void SetVisited(bool visited = true) wxOVERRIDE { m_visited=visited; } - bool GetVisited() const wxOVERRIDE { return m_visited; } + void SetVisited(bool visited = true) override { m_visited=visited; } + bool GetVisited() const override { return m_visited; } // NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour, // wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important ! @@ -110,7 +110,7 @@ protected: // Returns the best size for the window, which is the size needed // to display the text label. - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // creates a context menu with "Copy URL" menuitem virtual void DoContextMenu(const wxPoint &); diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index df215e21f7..bab1aaa6fe 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -44,7 +44,7 @@ public: // unhide the base class version virtual bool LoadFile(const wxString& name, - wxBitmapType flags = wxICON_DEFAULT_TYPE) wxOVERRIDE + wxBitmapType flags = wxICON_DEFAULT_TYPE) override { 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 2fb2312db2..c748ded76a 100644 --- a/include/wx/generic/infobar.h +++ b/include/wx/generic/infobar.h @@ -38,17 +38,17 @@ public: // ---------------------------- virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION) wxOVERRIDE; + int flags = wxICON_INFORMATION) override; - virtual void Dismiss() wxOVERRIDE; + virtual void Dismiss() override; - virtual void AddButton(wxWindowID btnid, const wxString& label = wxString()) wxOVERRIDE; + virtual void AddButton(wxWindowID btnid, const wxString& label = wxString()) override; - virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE; + virtual void RemoveButton(wxWindowID btnid) override; - virtual size_t GetButtonCount() const wxOVERRIDE; - virtual wxWindowID GetButtonId(size_t idx) const wxOVERRIDE; - virtual bool HasButtonId(wxWindowID btnid) const wxOVERRIDE; + virtual size_t GetButtonCount() const override; + virtual wxWindowID GetButtonId(size_t idx) const override; + virtual bool HasButtonId(wxWindowID btnid) const override; // methods specific to this version // -------------------------------- @@ -81,15 +81,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) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; // same thing with the colour: this affects the text colour - virtual bool SetForegroundColour(const wxColor& colour) wxOVERRIDE; + virtual bool SetForegroundColour(const wxColor& colour) override; 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 wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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 0066be9312..e215da530f 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 wxOVERRIDE { return new wxQueryLayoutInfoEvent(*this); } + virtual wxEvent *Clone() const override { 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 wxOVERRIDE { return new wxCalculateLayoutEvent(*this); } + virtual wxEvent *Clone() const override { return new wxCalculateLayoutEvent(*this); } protected: int m_flags; diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index ff2d2f9401..aef37a4951 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -64,17 +64,17 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxASCII_STR(wxListCtrlNameStr)); - 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; + bool GetColumn( int col, wxListItem& item ) const override; + bool SetColumn( int col, const wxListItem& item ) override; + int GetColumnWidth( int col ) const override; + bool SetColumnWidth( int col, int width) override; // Column ordering functions - int GetColumnOrder(int col) const wxOVERRIDE; - int GetColumnIndexFromOrder(int order) const wxOVERRIDE; + int GetColumnOrder(int col) const override; + int GetColumnIndexFromOrder(int order) const override; - wxArrayInt GetColumnsOrder() const wxOVERRIDE; - bool SetColumnsOrder(const wxArrayInt& orders) wxOVERRIDE; + wxArrayInt GetColumnsOrder() const override; + bool SetColumnsOrder(const wxArrayInt& orders) override; int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think wxRect GetViewRect() const; @@ -95,8 +95,8 @@ public: bool GetSubItemRect( long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const; bool GetItemPosition( long item, wxPoint& pos ) const; bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC - int GetItemCount() const wxOVERRIDE; - int GetColumnCount() const wxOVERRIDE; + int GetItemCount() const override; + int GetColumnCount() const override; void SetItemSpacing( int spacing, bool isSmall = false ); wxSize GetItemSpacing() const; void SetItemTextColour( long item, const wxColour& col); @@ -110,17 +110,17 @@ public: void SetTextColour(const wxColour& col); long GetTopItem() const; - bool HasCheckBoxes() const wxOVERRIDE; - bool EnableCheckBoxes(bool enable = true) wxOVERRIDE; - bool IsItemChecked(long item) const wxOVERRIDE; - void CheckItem(long item, bool check) wxOVERRIDE; + bool HasCheckBoxes() const override; + bool EnableCheckBoxes(bool enable = true) override; + bool IsItemChecked(long item) const override; + void CheckItem(long item, bool check) override; - void ShowSortIndicator(int idx, bool ascending = true) wxOVERRIDE; - int GetSortIndicator() const wxOVERRIDE; - bool IsAscendingSortIndicator() const wxOVERRIDE; + void ShowSortIndicator(int idx, bool ascending = true) override; + int GetSortIndicator() const override; + bool IsAscendingSortIndicator() const override; void SetSingleStyle( long style, bool add = true ) ; - void SetWindowStyleFlag( long style ) wxOVERRIDE; + void SetWindowStyleFlag( long style ) override; void RecreateWindow() {} long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const; bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC @@ -128,8 +128,8 @@ public: void ClearAll(); bool DeleteItem( long item ); bool DeleteAllItems(); - bool DeleteAllColumns() wxOVERRIDE; - bool DeleteColumn( int col ) wxOVERRIDE; + bool DeleteAllColumns() override; + bool DeleteColumn( int col ) override; void SetItemCount(long count); @@ -140,7 +140,7 @@ public: bool EndEditLabel(bool cancel); wxTextCtrl* GetEditControl() const; - bool IsVisible(long item) const wxOVERRIDE; + bool IsVisible(long item) const override; void Edit( long item ) { EditLabel(item); } bool EnsureVisible( long item ); @@ -163,12 +163,12 @@ public: void RefreshItem(long item); void RefreshItems(long itemFrom, long itemTo); - virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE; + virtual void EnableBellOnNoMatch(bool on = true) override; // overridden base class virtuals // ------------------------------ - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -176,7 +176,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual void Update() wxOVERRIDE; + virtual void Update() override; // implementation only from now on @@ -185,27 +185,27 @@ public: // generic version extension, don't use in portable code bool Update( long item ); - void OnInternalIdle( ) wxOVERRIDE; + void OnInternalIdle( ) override; // We have to hand down a few functions virtual void Refresh(bool eraseBackground = true, - const wxRect *rect = NULL) wxOVERRIDE; + const wxRect *rect = NULL) override; - virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetBackgroundColour( const wxColour &colour ) override; + virtual bool SetForegroundColour( const wxColour &colour ) override; virtual wxColour GetBackgroundColour() const; virtual wxColour GetForegroundColour() const; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) override; + virtual bool SetCursor( const wxCursor &cursor ) override; - virtual void ExtendRulesAndAlternateColour(bool extend = true) wxOVERRIDE; + virtual void ExtendRulesAndAlternateColour(bool extend = true) override; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; - virtual wxDropTarget *GetDropTarget() const wxOVERRIDE; + virtual void SetDropTarget( wxDropTarget *dropTarget ) override; + virtual wxDropTarget *GetDropTarget() const override; #endif - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { return false; } // implementation // -------------- @@ -215,17 +215,17 @@ public: protected: // Implement base class pure virtual methods. - long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE; - void DoUpdateImages(int which) wxOVERRIDE; + long DoInsertColumn(long col, const wxListItem& info) override; + void DoUpdateImages(int which) override; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // it calls our OnGetXXX() functions friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow; - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override; - virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE; + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) override; private: void CreateOrDestroyHeaderWindowAsNeeded(); @@ -236,7 +236,7 @@ private: // arrows but let the other navigation characters through #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) virtual WXLRESULT - MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; #endif // __WXMSW__ WX_FORWARD_TO_SCROLL_HELPER() diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index f45731d358..ef95432170 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) wxOVERRIDE; + virtual void DoLogText(const wxString& msg) override; private: // the control we use @@ -57,12 +57,12 @@ public: wxLogGui(); // show all messages that were logged since the last Flush() - virtual void Flush() wxOVERRIDE; + virtual void Flush() override; protected: virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE; + const wxLogRecordInfo& info) override; // 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) wxOVERRIDE; + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) override; private: wxLogFrame *m_pLogFrame; // the log frame diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index e85744a3f6..454a76af64 100644 --- a/include/wx/generic/msgdlgg.h +++ b/include/wx/generic/msgdlgg.h @@ -22,7 +22,7 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; protected: // Creates a message dialog taking any options that have been set after diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index a475c7d18f..0c9e12aae9 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -37,11 +37,11 @@ public: int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const; bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const; - virtual int GetColoursCount() const wxOVERRIDE; + virtual int GetColoursCount() const override; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxPalette); diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h index 7d83738677..9ad7fb24e3 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) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) override; + virtual wxDC* PrintDialog(wxWindow *parent) override; + virtual bool Setup(wxWindow *parent) override; private: wxDECLARE_DYNAMIC_CLASS(wxPostScriptPrinter); @@ -51,8 +51,8 @@ public: virtual ~wxPostScriptPrintPreview(); - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; + virtual bool Print(bool interactive) override; + virtual void DetermineScaling() override; private: void Init(wxPrintout *printout, wxPrintout *printoutForPrinting); diff --git a/include/wx/generic/private/animate.h b/include/wx/generic/private/animate.h index 9906b0c893..1e57abd288 100644 --- a/include/wx/generic/private/animate.h +++ b/include/wx/generic/private/animate.h @@ -23,19 +23,19 @@ public: wxAnimationGenericImpl() : m_decoder(NULL) {} virtual ~wxAnimationGenericImpl() { UnRef(); } - virtual bool IsOk() const wxOVERRIDE + virtual bool IsOk() const override { return m_decoder != NULL; } - virtual bool IsCompatibleWith(wxClassInfo* ci) const wxOVERRIDE; + virtual bool IsCompatibleWith(wxClassInfo* ci) const override; - virtual unsigned int GetFrameCount() const wxOVERRIDE; - virtual int GetDelay(unsigned int i) const wxOVERRIDE; - virtual wxImage GetFrame(unsigned int i) const wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual unsigned int GetFrameCount() const override; + virtual int GetDelay(unsigned int i) const override; + virtual wxImage GetFrame(unsigned int i) const override; + virtual wxSize GetSize() const override; virtual bool LoadFile(const wxString& filename, - wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + wxAnimationType type = wxANIMATION_TYPE_ANY) override; virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + wxAnimationType type = wxANIMATION_TYPE_ANY) override; // extended interface used only by the generic implementation of wxAnimationCtrl virtual wxPoint GetFramePosition(unsigned int frame) const; diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h index 9ada5661c0..e3bd211928 100644 --- a/include/wx/generic/private/grid.h +++ b/include/wx/generic/private/grid.h @@ -47,12 +47,12 @@ public: { } - virtual wxString GetTitle() const wxOVERRIDE { return m_grid->GetColLabelValue(m_col); } - virtual wxBitmap GetBitmap() const wxOVERRIDE { return wxNullBitmap; } - virtual wxBitmapBundle GetBitmapBundle() const wxOVERRIDE { return wxBitmapBundle(); } - virtual int GetWidth() const wxOVERRIDE { return m_grid->GetColSize(m_col); } - virtual int GetMinWidth() const wxOVERRIDE { return m_grid->GetColMinimalWidth(m_col); } - virtual wxAlignment GetAlignment() const wxOVERRIDE + virtual wxString GetTitle() const override { return m_grid->GetColLabelValue(m_col); } + virtual wxBitmap GetBitmap() const override { return wxNullBitmap; } + virtual wxBitmapBundle GetBitmapBundle() const override { return wxBitmapBundle(); } + virtual int GetWidth() const override { return m_grid->GetColSize(m_col); } + virtual int GetMinWidth() const override { return m_grid->GetColMinimalWidth(m_col); } + virtual wxAlignment GetAlignment() const override { int horz, vert; @@ -61,7 +61,7 @@ public: return static_cast(horz); } - virtual int GetFlags() const wxOVERRIDE + virtual int GetFlags() const override { // we can't know in advance whether we can sort by this column or not // with wxGrid API so suppose we can by default @@ -76,12 +76,12 @@ public: return flags; } - virtual bool IsSortKey() const wxOVERRIDE + virtual bool IsSortKey() const override { return m_grid->IsSortingBy(m_col); } - virtual bool IsSortOrderAscending() const wxOVERRIDE + virtual bool IsSortOrderAscending() const override { return m_grid->IsSortOrderAscending(); } @@ -117,7 +117,7 @@ public: } protected: - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const override { return m_columns[idx]; } @@ -136,7 +136,7 @@ private: } // override the base class method to update our m_columns array - virtual void OnColumnCountChanging(unsigned int count) wxOVERRIDE + virtual void OnColumnCountChanging(unsigned int count) override { const unsigned countOld = m_columns.size(); if ( count < countOld ) @@ -156,7 +156,7 @@ private: } // override to implement column auto sizing - virtual bool UpdateColumnWidthToFit(unsigned int idx, int WXUNUSED(widthTitle)) wxOVERRIDE + virtual bool UpdateColumnWidthToFit(unsigned int idx, int WXUNUSED(widthTitle)) override { GetOwner()->HandleColumnAutosize(idx, GetDummyMouseEvent()); @@ -164,7 +164,7 @@ private: } // overridden to react to the actions using the columns popup menu - virtual void UpdateColumnVisibility(unsigned int idx, bool show) wxOVERRIDE + virtual void UpdateColumnVisibility(unsigned int idx, bool show) override { GetOwner()->SetColSize(idx, show ? wxGRID_AUTOSIZE : 0); @@ -176,7 +176,7 @@ private: // overridden to react to the columns order changes in the customization // dialog - virtual void UpdateColumnsOrder(const wxArrayInt& order) wxOVERRIDE + virtual void UpdateColumnsOrder(const wxArrayInt& order) override { GetOwner()->SetColumnsOrder(order); } @@ -278,9 +278,9 @@ public: m_owner = owner; } - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return m_owner; } + virtual wxWindow *GetMainWindowOfCompositeControl() override { return m_owner; } - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } wxGrid *GetOwner() { return m_owner; } @@ -321,7 +321,7 @@ public: { } - virtual bool IsFrozen() const wxOVERRIDE { return true; } + virtual bool IsFrozen() const override { return true; } }; @@ -351,7 +351,7 @@ public: { } - virtual bool IsFrozen() const wxOVERRIDE { return true; } + virtual bool IsFrozen() const override { return true; } }; @@ -395,9 +395,9 @@ public: } - virtual void ScrollWindow( int dx, int dy, const wxRect *rect ) wxOVERRIDE; + virtual void ScrollWindow( int dx, int dy, const wxRect *rect ) override; - virtual bool AcceptsFocus() const wxOVERRIDE { return true; } + virtual bool AcceptsFocus() const override { return true; } wxGridWindowType GetType() const { return m_type; } @@ -652,113 +652,113 @@ public: class wxGridRowOperations : public wxGridOperations { public: - virtual wxGridOperations& Dual() const wxOVERRIDE; + virtual wxGridOperations& Dual() const override; - virtual int GetOrientation() const wxOVERRIDE + virtual int GetOrientation() const override { return wxVERTICAL; } - virtual wxGrid::CursorMode GetCursorModeResize() const wxOVERRIDE + virtual wxGrid::CursorMode GetCursorModeResize() const override { return wxGrid::WXGRID_CURSOR_RESIZE_ROW; } - virtual wxGrid::CursorMode GetCursorModeSelect() const wxOVERRIDE + virtual wxGrid::CursorMode GetCursorModeSelect() const override { return wxGrid::WXGRID_CURSOR_SELECT_ROW; } - virtual wxGrid::CursorMode GetCursorModeMove() const wxOVERRIDE + virtual wxGrid::CursorMode GetCursorModeMove() const override { return wxGrid::WXGRID_CURSOR_MOVE_ROW; } - virtual int GetTotalNumberOfLines(const wxGrid *grid) const wxOVERRIDE + virtual int GetTotalNumberOfLines(const wxGrid *grid) const override { return grid->GetNumberRows(); } - virtual int GetNumberOfLines(const wxGrid *grid, wxGridWindow *gridWindow) const wxOVERRIDE; + virtual int GetNumberOfLines(const wxGrid *grid, wxGridWindow *gridWindow) const override; - virtual int GetFirstLine(const wxGrid *grid, wxGridWindow *gridWindow) const wxOVERRIDE; + virtual int GetFirstLine(const wxGrid *grid, wxGridWindow *gridWindow) const override; - virtual wxGrid::wxGridSelectionModes GetSelectionMode() const wxOVERRIDE + virtual wxGrid::wxGridSelectionModes GetSelectionMode() const override { return wxGrid::wxGridSelectRows; } - virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const wxOVERRIDE + virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const override { return wxGridCellCoords(thisDir, otherDir); } - virtual int CalcScrolledPosition(wxGrid *grid, int pos) const wxOVERRIDE + virtual int CalcScrolledPosition(wxGrid *grid, int pos) const override { return grid->CalcScrolledPosition(wxPoint(pos, 0)).x; } - virtual int Select(const wxGridCellCoords& c) const wxOVERRIDE { return c.GetRow(); } - virtual int Select(const wxPoint& pt) const wxOVERRIDE { return pt.x; } - virtual int Select(const wxSize& sz) const wxOVERRIDE { return sz.x; } - virtual int Select(const wxRect& r) const wxOVERRIDE { return r.x; } - virtual int& Select(wxRect& r) const wxOVERRIDE { return r.x; } - virtual int SelectFirst(const wxGridBlockCoords& block) const wxOVERRIDE + virtual int Select(const wxGridCellCoords& c) const override { return c.GetRow(); } + virtual int Select(const wxPoint& pt) const override { return pt.x; } + virtual int Select(const wxSize& sz) const override { return sz.x; } + virtual int Select(const wxRect& r) const override { return r.x; } + virtual int& Select(wxRect& r) const override { return r.x; } + virtual int SelectFirst(const wxGridBlockCoords& block) const override { return block.GetTopRow(); } - virtual int SelectLast(const wxGridBlockCoords& block) const wxOVERRIDE + virtual int SelectLast(const wxGridBlockCoords& block) const override { return block.GetBottomRow(); } - virtual void SetFirst(wxGridBlockCoords& block, int line) const wxOVERRIDE + virtual void SetFirst(wxGridBlockCoords& block, int line) const override { block.SetTopRow(line); } - virtual void SetLast(wxGridBlockCoords& block, int line) const wxOVERRIDE + virtual void SetLast(wxGridBlockCoords& block, int line) const override { block.SetBottomRow(line); } - virtual int& SelectSize(wxRect& r) const wxOVERRIDE { return r.width; } - virtual wxSize MakeSize(int first, int second) const wxOVERRIDE + virtual int& SelectSize(wxRect& r) const override { return r.width; } + virtual wxSize MakeSize(int first, int second) const override { return wxSize(first, second); } - virtual void Set(wxGridCellCoords& coords, int line) const wxOVERRIDE + virtual void Set(wxGridCellCoords& coords, int line) const override { coords.SetRow(line); } - virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const wxOVERRIDE + virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const override { dc.DrawLine(start, pos, end, pos); } - virtual int PosToLine(const wxGrid *grid, int pos, wxGridWindow *gridWindow , bool clip = false) const wxOVERRIDE + virtual int PosToLine(const wxGrid *grid, int pos, wxGridWindow *gridWindow , bool clip = false) const override { return grid->YToRow(pos, clip, gridWindow); } - virtual int GetLineStartPos(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineStartPos(const wxGrid *grid, int line) const override { return grid->GetRowTop(line); } - virtual int GetLineEndPos(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineEndPos(const wxGrid *grid, int line) const override { return grid->GetRowBottom(line); } - virtual int GetLineSize(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineSize(const wxGrid *grid, int line) const override { return grid->GetRowHeight(line); } - virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const wxOVERRIDE + virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const override { return grid->m_rowBottoms; } - virtual int GetDefaultLineSize(const wxGrid *grid) const wxOVERRIDE + virtual int GetDefaultLineSize(const wxGrid *grid) const override { return grid->GetDefaultRowSize(); } - virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const wxOVERRIDE + virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const override { return grid->GetRowMinimalAcceptableHeight(); } - virtual int GetMinimalLineSize(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetMinimalLineSize(const wxGrid *grid, int line) const override { return grid->GetRowMinimalHeight(line); } - virtual void SetLineSize(wxGrid *grid, int line, int size) const wxOVERRIDE + virtual void SetLineSize(wxGrid *grid, int line, int size) const override { grid->SetRowSize(line, size); } - virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const wxOVERRIDE + virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const override { grid->SetDefaultRowSize(size, resizeExisting); } - virtual void HandleLineAutosize(wxGrid *grid, int line, const wxMouseEvent& event) const wxOVERRIDE + virtual void HandleLineAutosize(wxGrid *grid, int line, const wxMouseEvent& event) const override { grid->HandleRowAutosize(line, event); } - virtual int GetLineAt(const wxGrid *grid, int pos) const wxOVERRIDE + virtual int GetLineAt(const wxGrid *grid, int pos) const override { return grid->GetRowAt(pos); } - virtual int GetLinePos(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLinePos(const wxGrid *grid, int line) const override { return grid->GetRowPos(line); } - virtual int GetLineBefore(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineBefore(const wxGrid *grid, int line) const override { int posBefore = grid->GetRowPos(line) - 1; return posBefore >= 0 ? grid->GetRowAt(posBefore) : wxNOT_FOUND; } - virtual wxWindow *GetHeaderWindow(wxGrid *grid) const wxOVERRIDE + virtual wxWindow *GetHeaderWindow(wxGrid *grid) const override { return grid->GetGridRowLabelWindow(); } - virtual int GetHeaderWindowSize(wxGrid *grid) const wxOVERRIDE + virtual int GetHeaderWindowSize(wxGrid *grid) const override { return grid->GetRowLabelSize(); } - virtual wxGridWindow *GetFrozenGrid(wxGrid* grid) const wxOVERRIDE + virtual wxGridWindow *GetFrozenGrid(wxGrid* grid) const override { return (wxGridWindow*)grid->GetFrozenRowGridWindow(); } - virtual bool CanDragMove(wxGrid *grid) const wxOVERRIDE + virtual bool CanDragMove(wxGrid *grid) const override { return grid->m_canDragRowMove; } - virtual void DoEndMove(wxGrid* grid, int line) const wxOVERRIDE + virtual void DoEndMove(wxGrid* grid, int line) const override { grid->DoEndMoveRow(line); } - virtual bool CanDragLineSize(wxGrid *grid, int line) const wxOVERRIDE + virtual bool CanDragLineSize(wxGrid *grid, int line) const override { return grid->CanDragRowSize(line); } virtual void DoEndLineResize(wxGrid *grid, const wxMouseEvent& event, - wxGridWindow* gridWindow) const wxOVERRIDE + wxGridWindow* gridWindow) const override { grid->DoEndDragResizeRow(event, gridWindow); } virtual bool SelectionExtendCurrentBlock(wxGrid *grid, int line, const wxMouseEvent &event, - wxEventType eventType = wxEVT_GRID_RANGE_SELECTED) const wxOVERRIDE + wxEventType eventType = wxEVT_GRID_RANGE_SELECTED) const override { return grid->m_selection->ExtendCurrentBlock ( @@ -769,24 +769,24 @@ public: ); } - virtual void SelectLine(wxGrid *grid, int line, wxMouseEvent &event) const wxOVERRIDE + virtual void SelectLine(wxGrid *grid, int line, wxMouseEvent &event) const override { grid->m_selection->SelectRow(line, event); }; - virtual void DeselectLine(wxGrid * grid, int line) const wxOVERRIDE + virtual void DeselectLine(wxGrid * grid, int line) const override { grid->DeselectRow(line); } - virtual bool IsLineInSelection(wxGrid *grid, int line) const wxOVERRIDE + virtual bool IsLineInSelection(wxGrid *grid, int line) const override { return grid->m_selection->IsInSelection(line, 0); } virtual wxGrid::EventResult SendEvent(wxGrid *grid, wxEventType eventType, - int line, const wxMouseEvent& event) const wxOVERRIDE + int line, const wxMouseEvent& event) const override { return grid->SendEvent(eventType, line, -1, event ); } - virtual void DrawLineLabel(wxGrid *grid, wxDC& dc, int line) const wxOVERRIDE + virtual void DrawLineLabel(wxGrid *grid, wxDC& dc, int line) const override { grid->DrawRowLabel(dc, line); } - virtual void MakeLineVisible(wxGrid *grid, int line) const wxOVERRIDE + virtual void MakeLineVisible(wxGrid *grid, int line) const override { grid->MakeCellVisible(line, -1); } - virtual void MakeLineCurrent(wxGrid *grid, int line) const wxOVERRIDE + virtual void MakeLineCurrent(wxGrid *grid, int line) const override { grid->SetCurrentCell(line, grid->GetFirstFullyVisibleColumn()); } }; @@ -795,112 +795,112 @@ class wxGridColumnOperations : public wxGridOperations { public: - virtual wxGridOperations& Dual() const wxOVERRIDE; + virtual wxGridOperations& Dual() const override; - virtual int GetOrientation() const wxOVERRIDE + virtual int GetOrientation() const override { return wxHORIZONTAL; } - virtual wxGrid::CursorMode GetCursorModeResize() const wxOVERRIDE + virtual wxGrid::CursorMode GetCursorModeResize() const override { return wxGrid::WXGRID_CURSOR_RESIZE_COL; } - virtual wxGrid::CursorMode GetCursorModeSelect() const wxOVERRIDE + virtual wxGrid::CursorMode GetCursorModeSelect() const override { return wxGrid::WXGRID_CURSOR_SELECT_COL; } - virtual wxGrid::CursorMode GetCursorModeMove() const wxOVERRIDE + virtual wxGrid::CursorMode GetCursorModeMove() const override { return wxGrid::WXGRID_CURSOR_MOVE_COL; } - virtual int GetTotalNumberOfLines(const wxGrid *grid) const wxOVERRIDE + virtual int GetTotalNumberOfLines(const wxGrid *grid) const override { return grid->GetNumberCols(); } - virtual int GetNumberOfLines(const wxGrid *grid, wxGridWindow *gridWindow) const wxOVERRIDE; + virtual int GetNumberOfLines(const wxGrid *grid, wxGridWindow *gridWindow) const override; - virtual int GetFirstLine(const wxGrid *grid, wxGridWindow *gridWindow) const wxOVERRIDE; + virtual int GetFirstLine(const wxGrid *grid, wxGridWindow *gridWindow) const override; - virtual wxGrid::wxGridSelectionModes GetSelectionMode() const wxOVERRIDE + virtual wxGrid::wxGridSelectionModes GetSelectionMode() const override { return wxGrid::wxGridSelectColumns; } - virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const wxOVERRIDE + virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const override { return wxGridCellCoords(otherDir, thisDir); } - virtual int CalcScrolledPosition(wxGrid *grid, int pos) const wxOVERRIDE + virtual int CalcScrolledPosition(wxGrid *grid, int pos) const override { return grid->CalcScrolledPosition(wxPoint(0, pos)).y; } - virtual int Select(const wxGridCellCoords& c) const wxOVERRIDE { return c.GetCol(); } - virtual int Select(const wxPoint& pt) const wxOVERRIDE { return pt.y; } - virtual int Select(const wxSize& sz) const wxOVERRIDE { return sz.y; } - virtual int Select(const wxRect& r) const wxOVERRIDE { return r.y; } - virtual int& Select(wxRect& r) const wxOVERRIDE { return r.y; } - virtual int SelectFirst(const wxGridBlockCoords& block) const wxOVERRIDE + virtual int Select(const wxGridCellCoords& c) const override { return c.GetCol(); } + virtual int Select(const wxPoint& pt) const override { return pt.y; } + virtual int Select(const wxSize& sz) const override { return sz.y; } + virtual int Select(const wxRect& r) const override { return r.y; } + virtual int& Select(wxRect& r) const override { return r.y; } + virtual int SelectFirst(const wxGridBlockCoords& block) const override { return block.GetLeftCol(); } - virtual int SelectLast(const wxGridBlockCoords& block) const wxOVERRIDE + virtual int SelectLast(const wxGridBlockCoords& block) const override { return block.GetRightCol(); } - virtual void SetFirst(wxGridBlockCoords& block, int line) const wxOVERRIDE + virtual void SetFirst(wxGridBlockCoords& block, int line) const override { block.SetLeftCol(line); } - virtual void SetLast(wxGridBlockCoords& block, int line) const wxOVERRIDE + virtual void SetLast(wxGridBlockCoords& block, int line) const override { block.SetRightCol(line); } - virtual int& SelectSize(wxRect& r) const wxOVERRIDE { return r.height; } - virtual wxSize MakeSize(int first, int second) const wxOVERRIDE + virtual int& SelectSize(wxRect& r) const override { return r.height; } + virtual wxSize MakeSize(int first, int second) const override { return wxSize(second, first); } - virtual void Set(wxGridCellCoords& coords, int line) const wxOVERRIDE + virtual void Set(wxGridCellCoords& coords, int line) const override { coords.SetCol(line); } - virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const wxOVERRIDE + virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const override { dc.DrawLine(pos, start, pos, end); } - virtual int PosToLine(const wxGrid *grid, int pos, wxGridWindow *gridWindow, bool clip = false) const wxOVERRIDE + virtual int PosToLine(const wxGrid *grid, int pos, wxGridWindow *gridWindow, bool clip = false) const override { return grid->XToCol(pos, clip, gridWindow); } - virtual int GetLineStartPos(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineStartPos(const wxGrid *grid, int line) const override { return grid->GetColLeft(line); } - virtual int GetLineEndPos(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineEndPos(const wxGrid *grid, int line) const override { return grid->GetColRight(line); } - virtual int GetLineSize(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLineSize(const wxGrid *grid, int line) const override { return grid->GetColWidth(line); } - virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const wxOVERRIDE + virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const override { return grid->m_colRights; } - virtual int GetDefaultLineSize(const wxGrid *grid) const wxOVERRIDE + virtual int GetDefaultLineSize(const wxGrid *grid) const override { return grid->GetDefaultColSize(); } - virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const wxOVERRIDE + virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const override { return grid->GetColMinimalAcceptableWidth(); } - virtual int GetMinimalLineSize(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetMinimalLineSize(const wxGrid *grid, int line) const override { return grid->GetColMinimalWidth(line); } - virtual void SetLineSize(wxGrid *grid, int line, int size) const wxOVERRIDE + virtual void SetLineSize(wxGrid *grid, int line, int size) const override { grid->SetColSize(line, size); } - virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const wxOVERRIDE + virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const override { grid->SetDefaultColSize(size, resizeExisting); } - virtual void HandleLineAutosize(wxGrid *grid, int line, const wxMouseEvent& event) const wxOVERRIDE + virtual void HandleLineAutosize(wxGrid *grid, int line, const wxMouseEvent& event) const override { grid->HandleColumnAutosize(line, event); } - virtual int GetLineAt(const wxGrid *grid, int pos) const wxOVERRIDE + virtual int GetLineAt(const wxGrid *grid, int pos) const override { return grid->GetColAt(pos); } - virtual int GetLinePos(const wxGrid *grid, int line) const wxOVERRIDE + virtual int GetLinePos(const wxGrid *grid, int line) const override { return grid->GetColPos(line); } - virtual int GetLineBefore(const wxGrid* grid, int line) const wxOVERRIDE + virtual int GetLineBefore(const wxGrid* grid, int line) const override { int posBefore = grid->GetColPos(line) - 1; return posBefore >= 0 ? grid->GetColAt(posBefore) : wxNOT_FOUND; } - virtual wxWindow *GetHeaderWindow(wxGrid *grid) const wxOVERRIDE + virtual wxWindow *GetHeaderWindow(wxGrid *grid) const override { return grid->GetGridColLabelWindow(); } - virtual int GetHeaderWindowSize(wxGrid *grid) const wxOVERRIDE + virtual int GetHeaderWindowSize(wxGrid *grid) const override { return grid->GetColLabelSize(); } - virtual wxGridWindow *GetFrozenGrid(wxGrid* grid) const wxOVERRIDE + virtual wxGridWindow *GetFrozenGrid(wxGrid* grid) const override { return (wxGridWindow*)grid->GetFrozenColGridWindow(); } - virtual bool CanDragMove(wxGrid *grid) const wxOVERRIDE + virtual bool CanDragMove(wxGrid *grid) const override { return grid->m_canDragColMove; } - virtual void DoEndMove(wxGrid* grid, int line) const wxOVERRIDE + virtual void DoEndMove(wxGrid* grid, int line) const override { grid->DoEndMoveCol(line); } - virtual bool CanDragLineSize(wxGrid *grid, int line) const wxOVERRIDE + virtual bool CanDragLineSize(wxGrid *grid, int line) const override { return grid->CanDragColSize(line); } virtual void DoEndLineResize(wxGrid *grid, const wxMouseEvent& event, - wxGridWindow* gridWindow) const wxOVERRIDE + wxGridWindow* gridWindow) const override { grid->DoEndDragResizeCol(event, gridWindow); } virtual bool SelectionExtendCurrentBlock(wxGrid *grid, int line, const wxMouseEvent &event, - wxEventType eventType = wxEVT_GRID_RANGE_SELECTED) const wxOVERRIDE + wxEventType eventType = wxEVT_GRID_RANGE_SELECTED) const override { return grid->m_selection->ExtendCurrentBlock ( @@ -911,24 +911,24 @@ public: ); } - virtual void SelectLine(wxGrid *grid, int line, wxMouseEvent &event) const wxOVERRIDE + virtual void SelectLine(wxGrid *grid, int line, wxMouseEvent &event) const override { grid->m_selection->SelectCol(line, event); }; - virtual void DeselectLine(wxGrid * grid, int line) const wxOVERRIDE + virtual void DeselectLine(wxGrid * grid, int line) const override { grid->DeselectCol(line); } - virtual bool IsLineInSelection(wxGrid *grid, int line) const wxOVERRIDE + virtual bool IsLineInSelection(wxGrid *grid, int line) const override { return grid->m_selection->IsInSelection(line, 0); } virtual wxGrid::EventResult SendEvent(wxGrid *grid, wxEventType eventType, - int line, const wxMouseEvent& event) const wxOVERRIDE + int line, const wxMouseEvent& event) const override { return grid->SendEvent(eventType, -1, line, event ); } - virtual void DrawLineLabel(wxGrid *grid, wxDC& dc, int line) const wxOVERRIDE + virtual void DrawLineLabel(wxGrid *grid, wxDC& dc, int line) const override { grid->DrawColLabel(dc, line); } - virtual void MakeLineVisible(wxGrid *grid, int line) const wxOVERRIDE + virtual void MakeLineVisible(wxGrid *grid, int line) const override { grid->MakeCellVisible(-1, line); } - virtual void MakeLineCurrent(wxGrid *grid, int line) const wxOVERRIDE + virtual void MakeLineCurrent(wxGrid *grid, int line) const override { grid->SetCurrentCell(grid->GetFirstFullyVisibleRow(), line); } }; @@ -1042,7 +1042,7 @@ public: { } - virtual bool IsAtBoundary(const wxGridCellCoords& coords) const wxOVERRIDE + virtual bool IsAtBoundary(const wxGridCellCoords& coords) const override { wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" ); @@ -1063,7 +1063,7 @@ public: return true; } - virtual void Advance(wxGridCellCoords& coords) const wxOVERRIDE + virtual void Advance(wxGridCellCoords& coords) const override { int pos = GetLinePos(coords); for ( ;; ) @@ -1080,7 +1080,7 @@ public: } } - virtual int MoveByPixelDistance(int line, int distance) const wxOVERRIDE + virtual int MoveByPixelDistance(int line, int distance) const override { int pos = m_oper.GetLineStartPos(m_grid, line); return m_oper.PosToLine(m_grid, pos - distance + 1, NULL, true); @@ -1098,7 +1098,7 @@ public: { } - virtual bool IsAtBoundary(const wxGridCellCoords& coords) const wxOVERRIDE + virtual bool IsAtBoundary(const wxGridCellCoords& coords) const override { wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" ); @@ -1113,7 +1113,7 @@ public: return true; } - virtual void Advance(wxGridCellCoords& coords) const wxOVERRIDE + virtual void Advance(wxGridCellCoords& coords) const override { int pos = GetLinePos(coords); for ( ;; ) @@ -1130,7 +1130,7 @@ public: } } - virtual int MoveByPixelDistance(int line, int distance) const wxOVERRIDE + virtual int MoveByPixelDistance(int line, int distance) const override { int pos = m_oper.GetLineStartPos(m_grid, line); return m_oper.PosToLine(m_grid, pos + distance, NULL, true); diff --git a/include/wx/generic/private/listctrl.h b/include/wx/generic/private/listctrl.h index fa2e725aff..8aee6bded4 100644 --- a/include/wx/generic/private/listctrl.h +++ b/include/wx/generic/private/listctrl.h @@ -365,7 +365,7 @@ public: virtual ~wxListHeaderWindow(); // We never need focus as we don't have any keyboard interface. - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } void DrawCurrent(); void AdjustDC( wxDC& dc ); @@ -384,9 +384,9 @@ public: bool m_sortAsc; int m_sortCol; - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return GetParent(); } + virtual wxWindow *GetMainWindowOfCompositeControl() override { return GetParent(); } - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; private: // common part of all ctors @@ -410,7 +410,7 @@ private: public: wxListRenameTimer( wxListMainWindow *owner ); - void Notify() wxOVERRIDE; + void Notify() override; }; //----------------------------------------------------------------------------- @@ -428,7 +428,7 @@ public: { } - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; private: wxListMainWindow *m_owner; @@ -733,7 +733,7 @@ public: const wxPoint& point = wxDefaultPosition ); // override base class virtual to reset m_lineHeight when the font changes - virtual bool SetFont(const wxFont& font) wxOVERRIDE + virtual bool SetFont(const wxFont& font) override { if ( !wxWindow::SetFont(font) ) return false; @@ -769,7 +769,7 @@ public: return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush; } - bool HasFocus() const wxOVERRIDE + bool HasFocus() const override { return m_hasFocus; } @@ -844,7 +844,7 @@ protected: bool m_hasCheckBoxes; protected: - wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return GetParent(); } + wxWindow *GetMainWindowOfCompositeControl() override { return GetParent(); } // the total count of items selected in a non virtual list control with // multiple selections (always 0 otherwise) diff --git a/include/wx/generic/private/markuptext.h b/include/wx/generic/private/markuptext.h index 4fa7286a2f..d2e3425b9f 100644 --- a/include/wx/generic/private/markuptext.h +++ b/include/wx/generic/private/markuptext.h @@ -93,7 +93,7 @@ public: void Render(wxDC& dc, const wxRect& rect, int flags); protected: - virtual wxString GetMarkupForMeasuring() const wxOVERRIDE; + virtual wxString GetMarkupForMeasuring() const override; }; @@ -132,7 +132,7 @@ public: wxEllipsizeMode ellipsizeMode); protected: - virtual wxString GetMarkupForMeasuring() const wxOVERRIDE { return m_markup; } + virtual wxString GetMarkupForMeasuring() const override { return m_markup; } }; #endif // _WX_GENERIC_PRIVATE_MARKUPTEXT_H_ diff --git a/include/wx/generic/private/notifmsg.h b/include/wx/generic/private/notifmsg.h index 6c5fd90874..d02cc9922b 100644 --- a/include/wx/generic/private/notifmsg.h +++ b/include/wx/generic/private/notifmsg.h @@ -19,21 +19,21 @@ public: virtual ~wxGenericNotificationMessageImpl(); - virtual bool Show(int timeout) wxOVERRIDE; + virtual bool Show(int timeout) override; - virtual bool Close() wxOVERRIDE; + virtual bool Close() override; - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; - virtual void SetMessage(const wxString& message) wxOVERRIDE; + virtual void SetMessage(const wxString& message) override; - virtual void SetParent(wxWindow *parent) wxOVERRIDE; + virtual void SetParent(wxWindow *parent) override; - virtual void SetFlags(int flags) wxOVERRIDE; + virtual void SetFlags(int flags) override; - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE; + virtual void SetIcon(const wxIcon& icon) override; - virtual bool AddAction(wxWindowID actionid, const wxString &label) wxOVERRIDE; + virtual bool AddAction(wxWindowID actionid, const wxString &label) override; // get/set the default timeout (used if Timeout_Auto is specified) static int GetDefaultTimeout() { return ms_timeout; } diff --git a/include/wx/generic/private/richtooltip.h b/include/wx/generic/private/richtooltip.h index 4d9736404d..75a9e076dd 100644 --- a/include/wx/generic/private/richtooltip.h +++ b/include/wx/generic/private/richtooltip.h @@ -33,15 +33,15 @@ public: } virtual void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd) wxOVERRIDE; - virtual void SetCustomIcon(const wxBitmapBundle& icon) wxOVERRIDE; - virtual void SetStandardIcon(int icon) wxOVERRIDE; + const wxColour& colEnd) override; + virtual void SetCustomIcon(const wxBitmapBundle& icon) override; + virtual void SetStandardIcon(int icon) override; virtual void SetTimeout(unsigned milliseconds, - unsigned millisecondsDelay = 0) wxOVERRIDE; - virtual void SetTipKind(wxTipKind tipKind) wxOVERRIDE; - virtual void SetTitleFont(const wxFont& font) wxOVERRIDE; + unsigned millisecondsDelay = 0) override; + virtual void SetTipKind(wxTipKind tipKind) override; + virtual void SetTitleFont(const wxFont& font) override; - virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL) wxOVERRIDE; + virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL) override; protected: wxString m_title, diff --git a/include/wx/generic/private/textmeasure.h b/include/wx/generic/private/textmeasure.h index c6145b91e2..4b2e8f9918 100644 --- a/include/wx/generic/private/textmeasure.h +++ b/include/wx/generic/private/textmeasure.h @@ -27,11 +27,11 @@ protected: wxCoord *width, wxCoord *height, wxCoord *descent = NULL, - wxCoord *externalLeading = NULL) wxOVERRIDE; + wxCoord *externalLeading = NULL) override; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths, - double scaleX) wxOVERRIDE; + double scaleX) override; wxDECLARE_NO_COPY_CLASS(wxTextMeasure); }; diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 7c4cd1b7fe..673bb0aaed 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -83,11 +83,11 @@ public: wxPostScriptPrintNativeData(); virtual ~wxPostScriptPrintNativeData(); - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; + virtual bool TransferTo( wxPrintData &data ) override; + virtual bool TransferFrom( const wxPrintData &data ) override; - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE { return true; } + virtual bool Ok() const override { return IsOk(); } + virtual bool IsOk() const override { return true; } const wxString& GetPrinterCommand() const { return m_printerCommand; } const wxString& GetPrinterOptions() const { return m_printerOptions; } @@ -149,16 +149,16 @@ public: void OnRange(wxCommandEvent& event); void OnOK(wxCommandEvent& event); - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - wxPrintData& GetPrintData() wxOVERRIDE + wxPrintData& GetPrintData() override { return m_printDialogData.GetPrintData(); } - wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; } - wxDC *GetPrintDC() wxOVERRIDE; + wxPrintDialogData& GetPrintDialogData() override { return m_printDialogData; } + wxDC *GetPrintDC() override; public: // wxStaticText* m_printerMessage; @@ -193,8 +193,8 @@ public: void OnPrinter(wxListEvent& event); - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; virtual wxComboBox *CreatePaperTypeChoice(); @@ -226,10 +226,10 @@ public: wxPageSetupDialogData* data = NULL); virtual ~wxGenericPageSetupDialog(); - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE; + virtual wxPageSetupDialogData& GetPageSetupDialogData() override; void OnPrinter(wxCommandEvent& event); wxComboBox *CreatePaperTypeChoice(int* x, int* y); diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 0252498569..2ff6619d85 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -58,9 +58,9 @@ public: virtual bool WasSkipped() const; // Must provide overload to avoid hiding it (and warnings about it) - virtual void Update() wxOVERRIDE { wxDialog::Update(); } + virtual void Update() override { wxDialog::Update(); } - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual bool Show( bool show = true ) override; // 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 4dc1befce9..5777c8395e 100644 --- a/include/wx/generic/propdlg.h +++ b/include/wx/generic/propdlg.h @@ -103,7 +103,7 @@ public: wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; } // Override function in base - virtual wxWindow* GetContentWindow() const wxOVERRIDE; + virtual wxWindow* GetContentWindow() const override; // Set and get the inner sizer void SetInnerSizer(wxSizer* sizer) { m_innerSizer = sizer; } diff --git a/include/wx/generic/richmsgdlgg.h b/include/wx/generic/richmsgdlgg.h index bf1d9d5721..969a6eceeb 100644 --- a/include/wx/generic/richmsgdlgg.h +++ b/include/wx/generic/richmsgdlgg.h @@ -27,15 +27,15 @@ public: m_detailsPane(NULL) { } - virtual bool IsCheckBoxChecked() const wxOVERRIDE; + virtual bool IsCheckBoxChecked() const override; protected: wxCheckBox *m_checkBox; wxCollapsiblePane *m_detailsPane; // overrides methods in the base class - virtual void AddMessageDialogCheckBox(wxSizer *sizer) wxOVERRIDE; - virtual void AddMessageDialogDetails(wxSizer *sizer) wxOVERRIDE; + virtual void AddMessageDialogCheckBox(wxSizer *sizer) override; + virtual void AddMessageDialogDetails(wxSizer *sizer) override; private: void OnPaneChanged(wxCollapsiblePaneEvent& event); diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index 595ecf12fe..2f82d8321c 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 wxOVERRIDE { return new wxSashEvent(*this); } + virtual wxEvent *Clone() const override { return new wxSashEvent(*this); } private: wxSashEdgePosition m_edge; diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index 4ea57253f1..3c3c39ce97 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -22,13 +22,13 @@ public: wxScrollHelper(wxWindow *winToScroll); // implement base class pure virtuals - virtual void AdjustScrollbars() wxOVERRIDE; - virtual bool IsScrollbarShown(int orient) const wxOVERRIDE; + virtual void AdjustScrollbars() override; + virtual bool IsScrollbarShown(int orient) const override; protected: - virtual void DoScroll(int x, int y) wxOVERRIDE; + virtual void DoScroll(int x, int y) override; virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert) wxOVERRIDE; + wxScrollbarVisibility vert) override; private: // helper of AdjustScrollbars(): does the work for the single scrollbar diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 594a4d02ed..11d442d802 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -60,32 +60,32 @@ public: virtual ~wxSpinCtrlGenericBase(); // accessors - virtual wxString GetTextValue() const wxOVERRIDE; + virtual wxString GetTextValue() const override; // T GetValue() const // T GetMin() const // T GetMax() const // T GetIncrement() const - virtual bool GetSnapToTicks() const wxOVERRIDE { return m_snap_to_ticks; } + virtual bool GetSnapToTicks() const override { return m_snap_to_ticks; } // unsigned GetDigits() const - wxSpinCtrlDouble only // operations - virtual void SetValue(const wxString& text) wxOVERRIDE; + virtual void SetValue(const wxString& text) override; // void SetValue(T val) // void SetRange(T minVal, T maxVal) // void SetIncrement(T inc) - virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE; + virtual void SetSnapToTicks(bool snap_to_ticks) override; // void SetDigits(unsigned digits) - wxSpinCtrlDouble only // Select text in the textctrl - void SetSelection(long from, long to) wxOVERRIDE; + void SetSelection(long from, long to) override; // implementation from now on // forward these functions to all subcontrols - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; + virtual bool Show(bool show = true) override; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; // get the subcontrols wxTextCtrl *GetText() const { return m_textCtrl; } @@ -99,20 +99,20 @@ public: // this window itself is used only as a container for its sub windows so it // shouldn't accept the focus at all and any attempts to explicitly set // focus to it should give focus to its text constol part - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual void SetFocus() wxOVERRIDE; + virtual bool AcceptsFocus() const override { return false; } + virtual void SetFocus() override; friend class wxSpinCtrlTextGeneric; protected: // override the base class virtuals involved into geometry calculations - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; #ifdef __WXMSW__ // and, for MSW, enabling this window itself - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; #endif // __WXMSW__ enum SendEvent @@ -171,7 +171,7 @@ private: void Init(); // Implement pure virtual function inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; wxDECLARE_EVENT_TABLE(); }; @@ -323,21 +323,21 @@ public: int GetIncrement() const { return int(m_increment); } // operations - virtual void SetValue(const wxString& value) wxOVERRIDE + virtual void SetValue(const wxString& value) override { wxSpinCtrlGenericBase::SetValue(value); } void SetValue( int value ) { DoSetValue(value, SendEvent_None); } void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); } void SetIncrement(int inc) { DoSetIncrement(inc); } - virtual int GetBase() const wxOVERRIDE { return m_base; } - virtual bool SetBase(int base) wxOVERRIDE; + virtual int GetBase() const override { return m_base; } + virtual bool SetBase(int base) override; protected: - virtual void DoSendEvent() wxOVERRIDE; + virtual void DoSendEvent() override; - virtual bool DoTextToValue(const wxString& text, double *val) wxOVERRIDE; - virtual wxString DoValueToText(double val) wxOVERRIDE; - virtual void ResetTextValidator() wxOVERRIDE; + virtual bool DoTextToValue(const wxString& text, double *val) override; + virtual wxString DoValueToText(double val) override; + virtual void ResetTextValidator() override; private: // Common part of all ctors. @@ -395,7 +395,7 @@ public: unsigned GetDigits() const { return m_digits; } // operations - void SetValue(const wxString& value) wxOVERRIDE + void SetValue(const wxString& value) override { wxSpinCtrlGenericBase::SetValue(value); } void SetValue(double value) { DoSetValue(value, SendEvent_None); } void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } @@ -404,15 +404,15 @@ public: // We don't implement bases support for floating point numbers, this is not // very useful in practice. - virtual int GetBase() const wxOVERRIDE { return 10; } - virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } + virtual int GetBase() const override { return 10; } + virtual bool SetBase(int WXUNUSED(base)) override { return false; } protected: - virtual void DoSendEvent() wxOVERRIDE; + virtual void DoSendEvent() override; - virtual bool DoTextToValue(const wxString& text, double *val) wxOVERRIDE; - virtual wxString DoValueToText(double val) wxOVERRIDE; - virtual void ResetTextValidator() wxOVERRIDE; + virtual bool DoTextToValue(const wxString& text, double *val) override; + virtual wxString DoValueToText(double val) override; + virtual void ResetTextValidator() override; unsigned m_digits; diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index 58a0adde3e..d14c3082f6 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) wxOVERRIDE; + virtual int FilterEvent(wxEvent& event) override; protected: // Common part of all ctors. diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index 17089c53c1..9f5b9c029e 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -204,7 +204,7 @@ public: void OnDPIChanged(wxDPIChangedEvent& event); // In live mode, resize child windows in idle time - void OnInternalIdle() wxOVERRIDE; + void OnInternalIdle() override; // Draws the sash virtual void DrawSash(wxDC& dc); @@ -219,7 +219,7 @@ public: virtual void SizeWindows(); #ifdef __WXMAC__ - virtual bool MacClipGrandChildren() const wxOVERRIDE { return true ; } + virtual bool MacClipGrandChildren() const override { return true ; } #endif // Sets the sash size: this doesn't do anything and shouldn't be used at @@ -272,7 +272,7 @@ protected: // return the best size of the splitter equal to best sizes of its // subwindows - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; wxSplitMode m_splitMode; @@ -396,7 +396,7 @@ public: return m_data.pt.y; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSplitterEvent(*this); } + virtual wxEvent *Clone() const override { 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 47acfb1242..453c3cbc1a 100644 --- a/include/wx/generic/srchctlg.h +++ b/include/wx/generic/srchctlg.h @@ -49,68 +49,68 @@ public: #if wxUSE_MENUS // get/set search button menu // -------------------------- - virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; - virtual wxMenu* GetMenu() wxOVERRIDE; + virtual void SetMenu( wxMenu* menu ) override; + virtual wxMenu* GetMenu() override; #endif // wxUSE_MENUS // get/set search options // ---------------------- - virtual void ShowSearchButton( bool show ) wxOVERRIDE; - virtual bool IsSearchButtonVisible() const wxOVERRIDE; + virtual void ShowSearchButton( bool show ) override; + virtual bool IsSearchButtonVisible() const override; - virtual void ShowCancelButton( bool show ) wxOVERRIDE; - virtual bool IsCancelButtonVisible() const wxOVERRIDE; + virtual void ShowCancelButton( bool show ) override; + virtual bool IsCancelButtonVisible() const override; - virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE; - virtual wxString GetDescriptiveText() const wxOVERRIDE; + virtual void SetDescriptiveText(const wxString& text) override; + virtual wxString GetDescriptiveText() const override; // accessors // --------- - virtual wxString GetRange(long from, long to) const wxOVERRIDE; + virtual wxString GetRange(long from, long to) const override; - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; + virtual int GetLineLength(long lineNo) const override; + virtual wxString GetLineText(long lineNo) const override; + virtual int GetNumberOfLines() const override; - virtual bool IsModified() const wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual bool IsModified() const override; + virtual bool IsEditable() const override; // 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 wxOVERRIDE; + virtual void GetSelection(long* from, long* to) const override; - virtual wxString GetStringSelection() const wxOVERRIDE; + virtual wxString GetStringSelection() const override; // operations // ---------- - virtual void ChangeValue(const wxString& value) wxOVERRIDE; + virtual void ChangeValue(const wxString& value) override; // editing - virtual void Clear() wxOVERRIDE; - virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void Clear() override; + virtual void Replace(long from, long to, const wxString& value) override; + virtual void Remove(long from, long to) override; // 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() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; + virtual void MarkDirty() override; + virtual void DiscardEdits() override; // set the max number of characters which may be entered in a single line // text control - virtual void SetMaxLength(unsigned long WXUNUSED(len)) wxOVERRIDE; + virtual void SetMaxLength(unsigned long WXUNUSED(len)) override; // writing text inserts it at the current position, appending always // inserts it at the end - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void AppendText(const wxString& text) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; + virtual void AppendText(const wxString& text) override; // insert the character which would have resulted from this key event, // return true if anything has been inserted @@ -119,64 +119,64 @@ 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) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; - virtual const wxTextAttr& GetDefaultStyle() const wxOVERRIDE; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) override; + virtual bool GetStyle(long position, wxTextAttr& style) override; + virtual bool SetDefaultStyle(const wxTextAttr& style) override; + virtual const wxTextAttr& GetDefaultStyle() const override; // 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 wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; + virtual long XYToPosition(long x, long y) const override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; - virtual void ShowPosition(long pos) wxOVERRIDE; + virtual void ShowPosition(long pos) override; // 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 wxOVERRIDE; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE; + wxTextCoord *row) const override; // Clipboard operations - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; - virtual bool CanCopy() const wxOVERRIDE; - virtual bool CanCut() const wxOVERRIDE; - virtual bool CanPaste() const wxOVERRIDE; + virtual bool CanCopy() const override; + virtual bool CanCut() const override; + virtual bool CanPaste() const override; // Undo/redo - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; // Insertion point - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual void SetInsertionPointEnd() wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual void SetInsertionPointEnd() override; + virtual long GetInsertionPoint() const override; + virtual wxTextPos GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void SelectAll() override; + virtual void SetEditable(bool editable) override; // Autocomplete - virtual bool DoAutoCompleteStrings(const wxArrayString &choices) wxOVERRIDE; - virtual bool DoAutoCompleteFileNames(int flags) wxOVERRIDE; - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE; + virtual bool DoAutoCompleteStrings(const wxArrayString &choices) override; + virtual bool DoAutoCompleteFileNames(int flags) override; + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) override; - virtual bool ShouldInheritColours() const wxOVERRIDE; + virtual bool ShouldInheritColours() const override; // wxWindow overrides - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; + virtual bool SetBackgroundColour(const wxColour& colour) override; // search control generic only void SetSearchBitmap( const wxBitmap& bitmap ); @@ -186,14 +186,14 @@ public: #endif // wxUSE_MENUS protected: - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; + virtual void DoSetValue(const wxString& value, int flags) override; + virtual wxString DoGetValue() const override; - virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE; - virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE; + virtual bool DoLoadFile(const wxString& file, int fileType) override; + virtual bool DoSaveFile(const wxString& file, int fileType) override; // override the base class virtuals involved into geometry calculations - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; virtual void RecalcBitmaps(); @@ -221,7 +221,7 @@ private: friend class wxSearchButton; // Implement pure virtual function inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; // Position the child controls using the current window size. void LayoutControls(); diff --git a/include/wx/generic/statbmpg.h b/include/wx/generic/statbmpg.h index 2f547114ef..73d47e8a9c 100644 --- a/include/wx/generic/statbmpg.h +++ b/include/wx/generic/statbmpg.h @@ -35,7 +35,7 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBitmapNameStr)); - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE + virtual void SetBitmap(const wxBitmapBundle& bitmap) override { m_bitmapBundle = bitmap; InvalidateBestSize(); @@ -43,13 +43,13 @@ public: Refresh(); } - virtual void SetScaleMode(ScaleMode scaleMode) wxOVERRIDE + virtual void SetScaleMode(ScaleMode scaleMode) override { m_scaleMode = scaleMode; Refresh(); } - virtual ScaleMode GetScaleMode() const wxOVERRIDE { return m_scaleMode; } + virtual ScaleMode GetScaleMode() const override { return m_scaleMode; } private: void OnPaint(wxPaintEvent& event); diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h index 6b98f6c064..732fdbbdc4 100644 --- a/include/wx/generic/stattextg.h +++ b/include/wx/generic/stattextg.h @@ -48,19 +48,19 @@ public: // overridden base class virtual methods - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual bool SetFont(const wxFont &font) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual bool SetFont(const wxFont &font) override; protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; - virtual wxString WXGetVisibleLabel() const wxOVERRIDE { return m_label; } - virtual void WXSetVisibleLabel(const wxString& label) wxOVERRIDE; + virtual wxString WXGetVisibleLabel() const override { return m_label; } + virtual void WXSetVisibleLabel(const wxString& label) override; - void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; + void DoSetSize(int x, int y, int width, int height, int sizeFlags) override; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP private: diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index a13ca9e133..cdd4855585 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -44,12 +44,12 @@ public: const wxString& name = wxASCII_STR(wxStatusBarNameStr)); // implement base class methods - 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 void SetStatusWidths(int n, const int widths_field[]) override; + virtual bool GetFieldRect(int i, wxRect& rect) const override; + virtual void SetMinHeight(int height) override; - virtual int GetBorderX() const wxOVERRIDE { return m_borderX; } - virtual int GetBorderY() const wxOVERRIDE { return m_borderY; } + virtual int GetBorderX() const override { return m_borderX; } + virtual int GetBorderY() const override { 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) wxOVERRIDE; + virtual void DoUpdateStatusText(int number) override; // event handlers void OnPaint(wxPaintEvent& event); @@ -103,7 +103,7 @@ protected: wxPen m_mediumShadowPen; wxPen m_hilightPen; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; 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 bd10dc3bd8..a9305aa42f 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() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; // implementation only void OnOK(wxCommandEvent& event); diff --git a/include/wx/generic/timectrl.h b/include/wx/generic/timectrl.h index 84f7a4f261..0337b573d9 100644 --- a/include/wx/generic/timectrl.h +++ b/include/wx/generic/timectrl.h @@ -48,19 +48,19 @@ public: const wxString& name = wxTimePickerCtrlNameStr); // Implement pure virtual wxTimePickerCtrlBase methods. - virtual void SetValue(const wxDateTime& date) wxOVERRIDE; - virtual wxDateTime GetValue() const wxOVERRIDE; + virtual void SetValue(const wxDateTime& date) override; + virtual wxDateTime GetValue() const override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; private: void Init(); // Return the list of the windows composing this one. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; // Implementation data. class wxTimePickerGenericImpl* m_impl; diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index dda068bf4f..063e32036a 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -68,74 +68,74 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual unsigned int GetCount() const wxOVERRIDE; + virtual unsigned int GetCount() const override; - virtual unsigned int GetIndent() const wxOVERRIDE { return m_indent; } - virtual void SetIndent(unsigned int indent) wxOVERRIDE; + virtual unsigned int GetIndent() const override { return m_indent; } + virtual void SetIndent(unsigned int indent) override; - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE; + virtual void SetImageList(wxImageList *imageList) override; + virtual void SetStateImageList(wxImageList *imageList) override; - virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxString GetItemText(const wxTreeItemId& item) const override; virtual int GetItemImage(const wxTreeItemId& item, - 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; + wxTreeItemIcon which = wxTreeItemIcon_Normal) const override; + virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const override; + virtual wxColour GetItemTextColour(const wxTreeItemId& item) const override; + virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const override; + virtual wxFont GetItemFont(const wxTreeItemId& item) const override; - virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE; + virtual void SetItemText(const wxTreeItemId& item, const wxString& text) override; virtual void SetItemImage(const wxTreeItemId& item, int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE; - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE; + wxTreeItemIcon which = wxTreeItemIcon_Normal) override; + virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) override; - 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 void SetItemHasChildren(const wxTreeItemId& item, bool has = true) override; + virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) override; + virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true) override; + virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) override; + virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) override; + virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) override; - 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 bool IsVisible(const wxTreeItemId& item) const override; + virtual bool ItemHasChildren(const wxTreeItemId& item) const override; + virtual bool IsExpanded(const wxTreeItemId& item) const override; + virtual bool IsSelected(const wxTreeItemId& item) const override; + virtual bool IsBold(const wxTreeItemId& item) const override; virtual size_t GetChildrenCount(const wxTreeItemId& item, - bool recursively = true) const wxOVERRIDE; + bool recursively = true) const override; // navigation // ---------- - virtual wxTreeItemId GetRootItem() const wxOVERRIDE { return m_anchor; } - virtual wxTreeItemId GetSelection() const wxOVERRIDE + virtual wxTreeItemId GetRootItem() const override { return m_anchor; } + virtual wxTreeItemId GetSelection() const override { wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE), wxT("must use GetSelections() with this control") ); return m_current; } - virtual size_t GetSelections(wxArrayTreeItemIds&) const wxOVERRIDE; - virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE { return m_current; } + virtual size_t GetSelections(wxArrayTreeItemIds&) const override; + virtual wxTreeItemId GetFocusedItem() const override { return m_current; } - virtual void ClearFocusedItem() wxOVERRIDE; - virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE; + virtual void ClearFocusedItem() override; + virtual void SetFocusedItem(const wxTreeItemId& item) override; - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const override; virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const wxOVERRIDE; + wxTreeItemIdValue& cookie) const override; virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, - 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; + wxTreeItemIdValue& cookie) const override; + virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const override; - virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE; - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetFirstVisibleItem() const override; + virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const override; // operations @@ -143,41 +143,41 @@ public: virtual wxTreeItemId AddRoot(const wxString& text, int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; + wxTreeItemData *data = NULL) override; - virtual void Delete(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteAllItems() wxOVERRIDE; + virtual void Delete(const wxTreeItemId& item) override; + virtual void DeleteChildren(const wxTreeItemId& item) override; + virtual void DeleteAllItems() override; - 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 Expand(const wxTreeItemId& item) override; + virtual void Collapse(const wxTreeItemId& item) override; + virtual void CollapseAndReset(const wxTreeItemId& item) override; + virtual void Toggle(const wxTreeItemId& item) override; - 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 Unselect() override; + virtual void UnselectAll() override; + virtual void SelectItem(const wxTreeItemId& item, bool select = true) override; + virtual void SelectChildren(const wxTreeItemId& parent) override; - virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE; - virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE; + virtual void EnsureVisible(const wxTreeItemId& item) override; + virtual void ScrollTo(const wxTreeItemId& item) override; virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE; - virtual wxTextCtrl *GetEditControl() const wxOVERRIDE; + wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) override; + virtual wxTextCtrl *GetEditControl() const override; virtual void EndEditLabel(const wxTreeItemId& item, - bool discardChanges = false) wxOVERRIDE; + bool discardChanges = false) override; - virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE; + virtual void EnableBellOnNoMatch(bool on = true) override; - virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE; + virtual void SortChildren(const wxTreeItemId& item) override; // items geometry // -------------- virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, - bool textOnly = false) const wxOVERRIDE; + bool textOnly = false) const override; // this version specific methods @@ -198,13 +198,13 @@ public: // implementation only from now on // overridden base class virtuals - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; + virtual bool SetForegroundColour(const wxColour& colour) override; - virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; + virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) override; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual void SetWindowStyleFlag(long styles) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) override; + virtual void SetWindowStyleFlag(long styles) override; // callbacks void OnPaint( wxPaintEvent &event ); @@ -215,9 +215,9 @@ public: void OnMouse( wxMouseEvent &event ); void OnGetToolTip( wxTreeEvent &event ); void OnSize( wxSizeEvent &event ); - void OnInternalIdle( ) wxOVERRIDE; + void OnInternalIdle( ) override; - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -285,9 +285,9 @@ protected: void Init(); // overridden wxWindow methods - virtual void DoThaw() wxOVERRIDE; + virtual void DoThaw() override; - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; void UpdateAfterImageListChange(); // misc helpers @@ -301,21 +301,21 @@ protected: bool unselect_others = true, bool extended_select = false); - virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE; - virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE; + virtual int DoGetItemState(const wxTreeItemId& item) const override; + virtual void DoSetItemState(const wxTreeItemId& item, int state) override; virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, size_t previous, const wxString& text, int image, int selectedImage, - wxTreeItemData *data) wxOVERRIDE; + wxTreeItemData *data) override; virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, const wxTreeItemId& idPrevious, const wxString& text, int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE; + wxTreeItemData *data = NULL) override; + virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const override; // called by wxTextTreeCtrl when it marks itself for deletion void ResetTextControl(); @@ -355,7 +355,7 @@ protected: void DoDirtyProcessing(); - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: void OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index 06c86da064..bb1926b136 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) 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; + virtual bool RunWizard(wxWizardPage *firstPage) override; + virtual wxWizardPage *GetCurrentPage() const override; + virtual void SetPageSize(const wxSize& size) override; + virtual wxSize GetPageSize() const override; + virtual void FitToPage(const wxWizardPage *firstPage) override; + virtual wxSizer *GetPageAreaSizer() const override; + virtual void SetBorder(int border) override; /// set/get bitmap wxBitmap GetBitmap() const { return m_bitmap.GetBitmapFor(this); } @@ -74,7 +74,7 @@ public: virtual void DoCreateControls(); // Do the adaptation - virtual bool DoLayoutAdaptation() wxOVERRIDE; + virtual bool DoLayoutAdaptation() override; // 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 5dee4caf24..7e07440a7e 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 wxOVERRIDE; + wxColour GetTransparentColour(unsigned int frame) const override; - 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 wxSize GetFrameSize(unsigned int frame) const override; + virtual wxPoint GetFramePosition(unsigned int frame) const override; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const override; + virtual long GetDelay(unsigned int frame) const override; // 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 ) wxOVERRIDE + virtual bool Load( wxInputStream& stream ) override { return LoadGIF(stream) == wxGIF_OK; } - bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE; + bool ConvertToImage(unsigned int frame, wxImage *image) const override; - wxAnimationDecoder *Clone() const wxOVERRIDE + wxAnimationDecoder *Clone() const override { return new wxGIFDecoder; } - wxAnimationType GetType() const wxOVERRIDE + wxAnimationType GetType() const override { return wxANIMATION_TYPE_GIF; } protected: // wxAnimationDecoder pure virtual - virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) const override; // modifies current stream position (see wxAnimationDecoder::CanRead) private: diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h index 7a26925590..7534407869 100644 --- a/include/wx/glcanvas.h +++ b/include/wx/glcanvas.h @@ -326,7 +326,7 @@ class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase public: wxGLApp() : wxGLAppBase() { } - virtual bool InitGLVisual(const int *attribList) wxOVERRIDE; + virtual bool InitGLVisual(const int *attribList) override; private: wxDECLARE_DYNAMIC_CLASS(wxGLApp); diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 0986a2cf3f..95f715e0e7 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -137,8 +137,8 @@ public: wxGraphicsRenderer* GetRenderer() const; wxGraphicsObjectRefData* GetGraphicsData() const; protected: - virtual wxObjectRefData* CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE; + virtual wxObjectRefData* CreateRefData() const override; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const override; wxDECLARE_DYNAMIC_CLASS(wxGraphicsObject); }; diff --git a/include/wx/gtk/activityindicator.h b/include/wx/gtk/activityindicator.h index 72889dfcd0..d275ef7c19 100644 --- a/include/wx/gtk/activityindicator.h +++ b/include/wx/gtk/activityindicator.h @@ -51,12 +51,12 @@ public: long style = 0, const wxString& name = wxActivityIndicatorNameStr); - virtual void Start() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual bool IsRunning() const override; protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; private: wxDECLARE_DYNAMIC_CLASS(wxActivityIndicator); diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index c1fc33155e..4d92c958c1 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -53,25 +53,25 @@ public: // event handler public: // public API - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) override; + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) override; - void SetAnimation(const wxAnimation &anim) wxOVERRIDE; + void SetAnimation(const wxAnimation &anim) override; - virtual bool Play() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; + virtual bool Play() override; + virtual void Stop() override; - virtual bool IsPlaying() const wxOVERRIDE; + virtual bool IsPlaying() const override; - bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; + bool SetBackgroundColour( const wxColour &colour ) override; static wxAnimation CreateCompatibleAnimation(); protected: - virtual wxAnimationImpl* DoCreateAnimationImpl() const wxOVERRIDE; + virtual wxAnimationImpl* DoCreateAnimationImpl() const override; - virtual void DisplayStaticImage() wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DisplayStaticImage() override; + virtual wxSize DoGetBestSize() const override; void FitToAnimation(); void ClearToBackgroundColour(); diff --git a/include/wx/gtk/anybutton.h b/include/wx/gtk/anybutton.h index d62e849857..d7d9123392 100644 --- a/include/wx/gtk/anybutton.h +++ b/include/wx/gtk/anybutton.h @@ -37,13 +37,13 @@ public: void GTKReleased(); protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; - virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) wxOVERRIDE; - virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; + virtual wxBitmap DoGetBitmap(State which) const override; + virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) override; + virtual void DoSetBitmapPosition(wxDirection dir) override; // update the bitmap to correspond to the current button state void GTKUpdateBitmap(); diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 29f808f80d..b32a310210 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -27,20 +27,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) wxOVERRIDE; - virtual bool OnInitGui() wxOVERRIDE; + virtual bool SetNativeTheme(const wxString& theme) override; + virtual bool OnInitGui() override; // override base class (pure) virtuals - virtual void WakeUpIdle() wxOVERRIDE; + virtual void WakeUpIdle() override; - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; - virtual void CleanUp() wxOVERRIDE; + virtual bool Initialize(int& argc, wxChar **argv) override; + virtual void CleanUp() override; virtual void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, - const wxChar *msg) wxOVERRIDE; + const wxChar *msg) override; // GTK-specific methods // ------------------- diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index ba6902db6d..10331e5045 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -42,9 +42,9 @@ public: #endif protected: - virtual void FreeData() wxOVERRIDE; - virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE; - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE; + virtual void FreeData() override; + virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) override; + virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) override; private: #ifdef __WXGTK3__ @@ -81,38 +81,38 @@ public: explicit wxBitmap(const wxCursor& cursor); virtual ~wxBitmap(); - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) override; + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) override { return Create(sz.GetWidth(), sz.GetHeight(), depth); } #ifdef __WXGTK3__ bool Create(int width, int height, const wxDC& dc); - virtual void SetScaleFactor(double scale) wxOVERRIDE; - virtual double GetScaleFactor() const wxOVERRIDE; + virtual void SetScaleFactor(double scale) override; + virtual double GetScaleFactor() const override; #else bool Create(int width, int height, const wxDC& WXUNUSED(dc)) { return Create(width,height); } #endif - virtual int GetHeight() const wxOVERRIDE; - virtual int GetWidth() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; + virtual int GetHeight() const override; + virtual int GetWidth() const override; + virtual int GetDepth() const override; #if wxUSE_IMAGE - wxImage ConvertToImage() const wxOVERRIDE; + wxImage ConvertToImage() const override; #endif // wxUSE_IMAGE - wxMask *GetMask() const wxOVERRIDE; - void SetMask( wxMask *mask ) wxOVERRIDE; + wxMask *GetMask() const override; + void SetMask( wxMask *mask ) override; - wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE; + wxBitmap GetSubBitmap( const wxRect& rect ) const override; bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const wxOVERRIDE; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; + const wxPalette *palette = NULL) const override; + bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) override; #if wxUSE_PALETTE - wxPalette *GetPalette() const wxOVERRIDE; - void SetPalette(const wxPalette& palette) wxOVERRIDE; + wxPalette *GetPalette() const override; + void SetPalette(const wxPalette& palette) override; wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE @@ -122,9 +122,9 @@ public: // -------------- #if WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED(void SetHeight( int height ) wxOVERRIDE); - wxDEPRECATED(void SetWidth( int width ) wxOVERRIDE); - wxDEPRECATED(void SetDepth( int depth ) wxOVERRIDE); + wxDEPRECATED(void SetHeight( int height ) override); + wxDEPRECATED(void SetWidth( int width ) override); + wxDEPRECATED(void SetDepth( int depth ) override); #endif #ifdef __WXGTK3__ @@ -145,7 +145,7 @@ public: void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); - bool HasAlpha() const wxOVERRIDE; + bool HasAlpha() const override; protected: #if wxUSE_IMAGE @@ -155,11 +155,11 @@ protected: #endif #endif // wxUSE_IMAGE - virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE; + virtual wxGDIRefData* CreateGDIRefData() const override; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const override; #ifdef __WXGTK3__ - virtual bool DoCreate(const wxSize& sz, double scale, int depth) wxOVERRIDE; + virtual bool DoCreate(const wxSize& sz, double scale, int depth) override; #endif private: diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h index ca6270947c..d05934e255 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 wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) override; // Returns the image of the item with the given index. - virtual wxBitmap GetItemBitmap(unsigned int n) const wxOVERRIDE; + virtual wxBitmap GetItemBitmap(unsigned int n) const override; // Returns size of the image used in list - virtual wxSize GetBitmapSize() const wxOVERRIDE + virtual wxSize GetBitmapSize() const override { return m_bitmapSize; } @@ -106,33 +106,33 @@ public: unsigned int pos, wxClientData *clientData); // Override some wxTextEntry interface. - virtual void WriteText(const wxString& value) wxOVERRIDE; + virtual void WriteText(const wxString& value) override; - virtual wxString GetValue() const wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual wxString GetValue() const override; + virtual void Remove(long from, long to) override; - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual long GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void GetSelection(long *from, long *to) const override; - virtual void SetSelection(int n) wxOVERRIDE { wxComboBox::SetSelection(n); } - virtual int GetSelection() const wxOVERRIDE { return wxComboBox::GetSelection(); } + virtual void SetSelection(int n) override { wxComboBox::SetSelection(n); } + virtual int GetSelection() const override { return wxComboBox::GetSelection(); } - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual bool IsEditable() const override; + virtual void SetEditable(bool editable) override; - virtual GtkWidget* GetConnectWidget() wxOVERRIDE; + virtual GtkWidget* GetConnectWidget() override; protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void GTKCreateComboBoxWidget() wxOVERRIDE; - virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) wxOVERRIDE; + virtual void GTKCreateComboBoxWidget() override; + virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; wxSize m_bitmapSize; int m_bitmapCellIndex; diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 7f88eb1aef..3dcdedb533 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 wxOVERRIDE; - wxColour GetColour() const wxOVERRIDE; - wxBitmap *GetStipple() const wxOVERRIDE; + wxBrushStyle GetStyle() const override; + wxColour GetColour() const override; + wxBitmap *GetStipple() const override; - 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; + void SetColour( const wxColour& col ) override; + void SetColour( unsigned char r, unsigned char g, unsigned char b ) override; + void SetStyle( wxBrushStyle style ) override; + void SetStipple( const wxBitmap& stipple ) override; 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 wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; wxDECLARE_DYNAMIC_CLASS(wxBrush); }; diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index e6fb1b57d3..a41ad50a47 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 = wxASCII_STR(wxButtonNameStr)); - virtual wxWindow *SetDefault() wxOVERRIDE; - virtual void SetLabel( const wxString &label ) wxOVERRIDE; + virtual wxWindow *SetDefault() override; + virtual void SetLabel( const wxString &label ) override; // implementation // -------------- @@ -54,11 +54,11 @@ public: void GTKReleased(); protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP private: diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h index 5682cee257..c54d9c7fde 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) wxOVERRIDE; - virtual wxDateTime GetDate() const wxOVERRIDE; + virtual bool SetDate(const wxDateTime& date) override; + virtual wxDateTime GetDate() const override; virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; + const wxDateTime& upperdate = wxDefaultDateTime) override; + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const override; - virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; + virtual bool EnableMonthChange(bool enable = true) override; - virtual void Mark(size_t day, bool mark) wxOVERRIDE; + virtual void Mark(size_t day, bool mark) override; // implementation // -------------- diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h index e20b834c8a..c98615db7b 100644 --- a/include/wx/gtk/checkbox.h +++ b/include/wx/gtk/checkbox.h @@ -35,10 +35,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr) ); - void SetValue( bool state ) wxOVERRIDE; - bool GetValue() const wxOVERRIDE; + void SetValue( bool state ) override; + bool GetValue() const override; - virtual void SetLabel( const wxString& label ) wxOVERRIDE; + virtual void SetLabel( const wxString& label ) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -48,13 +48,13 @@ public: void GTKEnableEvents(); protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; - void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE; - wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; + void DoSet3StateValue(wxCheckBoxState state) override; + wxCheckBoxState DoGet3StateValue() const override; private: typedef wxCheckBoxBase base_type; diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h index 6f9a2645f7..6ba578f3b2 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 = wxASCII_STR(wxListBoxNameStr)); - virtual bool IsChecked(unsigned int index) const wxOVERRIDE; - virtual void Check(unsigned int index, bool check = true) wxOVERRIDE; + virtual bool IsChecked(unsigned int index) const override; + virtual void Check(unsigned int index, bool check = true) override; int GetItemHeight() const; diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index ed8a514877..89aff99bed 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 = wxASCII_STR(wxChoiceNameStr) ); - int GetSelection() const wxOVERRIDE; - void SetSelection(int n) wxOVERRIDE; + int GetSelection() const override; + void SetSelection(int n) override; - 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 unsigned int GetCount() const override; + virtual int FindString(const wxString& s, bool bCase = false) const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& string) override; - virtual void SetColumns(int n=1) wxOVERRIDE; - virtual int GetColumns() const wxOVERRIDE; + virtual void SetColumns(int n=1) override; + virtual int GetColumns() const override; virtual void GTKDisableEvents(); virtual void GTKEnableEvents(); @@ -91,19 +91,19 @@ protected: // index to GtkListStore cell which displays the item text int m_stringCellIndex; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - 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; + void **clientData, wxClientDataType type) override; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; - virtual bool GTKHandleFocusOut() wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual bool GTKHandleFocusOut() override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; // 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 588472e8c8..70f23b858e 100644 --- a/include/wx/gtk/clipbrd.h +++ b/include/wx/gtk/clipbrd.h @@ -30,36 +30,36 @@ public: virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() - virtual bool Open() wxOVERRIDE; + virtual bool Open() override; // close the clipboard after SetData() and GetData() - virtual void Close() wxOVERRIDE; + virtual void Close() override; // query whether the clipboard is opened - virtual bool IsOpened() const wxOVERRIDE; + virtual bool IsOpened() const override; // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ) wxOVERRIDE; + virtual bool SetData( wxDataObject *data ) override; // add to the clipboard data. - virtual bool AddData( wxDataObject *data ) wxOVERRIDE; + virtual bool AddData( wxDataObject *data ) override; // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; + virtual bool IsSupported( const wxDataFormat& format ) override; // ask if data in correct format is available - virtual bool IsSupportedAsync( wxEvtHandler *sink ) wxOVERRIDE; + virtual bool IsSupportedAsync( wxEvtHandler *sink ) override; // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ) wxOVERRIDE; + virtual bool GetData( wxDataObject& data ) override; // flushes the clipboard; that means that the data which is currently on // clipboard will stay available even after the application exits (possibly // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush() wxOVERRIDE; + virtual bool Flush() override; // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h index 395fb9ffdc..4fec58017e 100644 --- a/include/wx/gtk/clrpicker.h +++ b/include/wx/gtk/clrpicker.h @@ -47,7 +47,7 @@ public: virtual ~wxColourButton(); protected: - void UpdateColour() wxOVERRIDE; + void UpdateColour() override; public: // used by the GTK callback only diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h index 053b9b5573..8c30c97cb3 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 = wxASCII_STR(wxCollapsiblePaneNameStr)); - virtual void Collapse(bool collapse = true) wxOVERRIDE; - virtual bool IsCollapsed() const wxOVERRIDE; - virtual void SetLabel(const wxString& str) wxOVERRIDE; + virtual void Collapse(bool collapse = true) override; + virtual bool IsCollapsed() const override; + virtual void SetLabel(const wxString& str) override; - virtual wxWindow *GetPane() const wxOVERRIDE { return m_pPane; } - virtual wxString GetLabel() const wxOVERRIDE { return m_strLabel; } + virtual wxWindow *GetPane() const override { return m_pPane; } + virtual wxString GetLabel() const override { return m_strLabel; } protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; public: // used by GTK callbacks bool m_bIgnoreNextChange; @@ -69,8 +69,8 @@ private: } void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; - GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void AddChildGTK(wxWindowGTK* child) override; + GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; wxDECLARE_DYNAMIC_CLASS(wxCollapsiblePane); wxDECLARE_EVENT_TABLE(); diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h index 08bf264921..56cd8bc622 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() wxOVERRIDE; + virtual int ShowModal() override; 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) wxOVERRIDE {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) override {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} + int WXUNUSED(width), int WXUNUSED(height)) override {} // 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 86e74e5720..159730e0a4 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 wxOVERRIDE; - unsigned char Green() const wxOVERRIDE; - unsigned char Blue() const wxOVERRIDE; - unsigned char Alpha() const wxOVERRIDE; + unsigned char Red() const override; + unsigned char Green() const override; + unsigned char Blue() const override; + unsigned char Alpha() const override; // 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) wxOVERRIDE; + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) override; - virtual bool FromString(const wxString& str) wxOVERRIDE; + virtual bool FromString(const wxString& str) override; wxDECLARE_DYNAMIC_CLASS(wxColour); }; diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 982caa183b..520fc463b2 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) wxOVERRIDE { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) wxOVERRIDE + virtual void SetSelection(int n) override { wxChoice::SetSelection(n); } + virtual void SetSelection(long from, long to) override { wxTextEntry::SetSelection(from, to); } - virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); } - virtual void GetSelection(long *from, long *to) const wxOVERRIDE + virtual int GetSelection() const override { return wxChoice::GetSelection(); } + virtual void GetSelection(long *from, long *to) const override { return wxTextEntry::GetSelection(from, to); } - virtual wxString GetStringSelection() const wxOVERRIDE + virtual wxString GetStringSelection() const override { return wxItemContainer::GetStringSelection(); } - virtual void SetString(unsigned int n, const wxString& string) wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& string) override; virtual void Popup(); virtual void Dismiss(); - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // See wxComboBoxBase discussion of IsEmpty(). bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } @@ -102,7 +102,7 @@ public: void OnChar( wxKeyEvent &event ); - virtual void SetValue(const wxString& value) wxOVERRIDE; + virtual void SetValue(const wxString& value) override; // Standard event handling void OnCut(wxCommandEvent& event); @@ -121,33 +121,33 @@ public: void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event); - virtual void GTKDisableEvents() wxOVERRIDE; - virtual void GTKEnableEvents() wxOVERRIDE; - GtkWidget* GetConnectWidget() wxOVERRIDE; + virtual void GTKDisableEvents() override; + virtual void GTKEnableEvents() override; + GtkWidget* GetConnectWidget() override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } protected: // From wxWindowGTK: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; // Widgets that use the style->base colour for the BG colour should // override this and return true. - virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } + virtual bool UseGTKStyleBase() const override { 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 wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; - virtual GtkEntry *GetEntry() const wxOVERRIDE + virtual GtkEntry *GetEntry() const override { return m_entry; } - virtual int GTKIMFilterKeypress(GdkEventKey* event) const wxOVERRIDE + virtual int GTKIMFilterKeypress(GdkEventKey* event) const override { return GTKEntryIMFilterKeypress(event); } @@ -155,8 +155,8 @@ protected: private: // From wxTextEntry: - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } - virtual GtkEditable *GetEditable() const wxOVERRIDE; + virtual wxWindow *GetEditableWindow() override { return this; } + virtual GtkEditable *GetEditable() const override; void Init(); diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index fcfe03d169..684c3a5f41 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 = wxASCII_STR(wxControlNameStr)); - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; + virtual wxVisualAttributes GetDefaultAttributes() const override; #ifdef __WXGTK3__ - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; #endif protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; 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 ba91a03cf9..8cee2c1175 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -32,7 +32,7 @@ public: const char maskBits[] = NULL, const wxColour* fg = NULL, const wxColour* bg = NULL); - virtual wxPoint GetHotSpot() const wxOVERRIDE; + virtual wxPoint GetHotSpot() const override; virtual ~wxCursor(); @@ -46,8 +46,8 @@ protected: void InitFromImage(const wxImage& image); #endif - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxCursor); diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h index 5e94b4e49c..f1cb738928 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) wxOVERRIDE; + virtual void SetBitmap(const wxBitmap& bitmap) override; // implement base class pure virtuals // ---------------------------------- - 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; + virtual size_t GetDataSize() const override { return m_pngSize; } + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } @@ -72,19 +72,19 @@ public: void AddFile( const wxString &filename ); - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h index f3633ce052..1b95e330b3 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -34,45 +34,45 @@ public: // setters: - virtual void SetTitle( const wxString &title ) wxOVERRIDE; - virtual void SetBitmap( const wxBitmapBundle &bitmap ) wxOVERRIDE; + virtual void SetTitle( const wxString &title ) override; + virtual void SetBitmap( const wxBitmapBundle &bitmap ) override; - virtual void SetOwner( wxDataViewCtrl *owner ) wxOVERRIDE; + virtual void SetOwner( wxDataViewCtrl *owner ) override; - virtual void SetAlignment( wxAlignment align ) wxOVERRIDE; + virtual void SetAlignment( wxAlignment align ) override; - virtual void SetSortable( bool sortable ) wxOVERRIDE; - virtual void SetSortOrder( bool ascending ) wxOVERRIDE; - virtual void UnsetAsSortKey() wxOVERRIDE; + virtual void SetSortable( bool sortable ) override; + virtual void SetSortOrder( bool ascending ) override; + virtual void UnsetAsSortKey() override; - virtual void SetResizeable( bool resizable ) wxOVERRIDE; - virtual void SetHidden( bool hidden ) wxOVERRIDE; + virtual void SetResizeable( bool resizable ) override; + virtual void SetHidden( bool hidden ) override; - virtual void SetMinWidth( int minWidth ) wxOVERRIDE; - virtual void SetWidth( int width ) wxOVERRIDE; + virtual void SetMinWidth( int minWidth ) override; + virtual void SetWidth( int width ) override; - virtual void SetReorderable( bool reorderable ) wxOVERRIDE; + virtual void SetReorderable( bool reorderable ) override; - virtual void SetFlags(int flags) wxOVERRIDE { SetIndividualFlags(flags); } + virtual void SetFlags(int flags) override { SetIndividualFlags(flags); } // getters: - virtual wxString GetTitle() const wxOVERRIDE; - virtual wxAlignment GetAlignment() const wxOVERRIDE; + virtual wxString GetTitle() const override; + virtual wxAlignment GetAlignment() const override; - virtual bool IsSortable() const wxOVERRIDE; - virtual bool IsSortOrderAscending() const wxOVERRIDE; - virtual bool IsSortKey() const wxOVERRIDE; + virtual bool IsSortable() const override; + virtual bool IsSortOrderAscending() const override; + virtual bool IsSortKey() const override; - virtual bool IsResizeable() const wxOVERRIDE; - virtual bool IsHidden() const wxOVERRIDE; + virtual bool IsResizeable() const override; + virtual bool IsHidden() const override; - virtual int GetWidth() const wxOVERRIDE; - virtual int GetMinWidth() const wxOVERRIDE; + virtual int GetWidth() const override; + virtual int GetMinWidth() const override; - virtual bool IsReorderable() const wxOVERRIDE; + virtual bool IsReorderable() const override; - virtual int GetFlags() const wxOVERRIDE { return GetFromIndividualFlags(); } + virtual int GetFlags() const override { return GetFromIndividualFlags(); } // implementation GtkWidget* GetGtkHandle() const { return m_column; } @@ -127,51 +127,51 @@ public: virtual ~wxDataViewCtrl(); - virtual bool AssociateModel( wxDataViewModel *model ) wxOVERRIDE; + virtual bool AssociateModel( wxDataViewModel *model ) override; - virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE; - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE; + virtual bool PrependColumn( wxDataViewColumn *col ) override; + virtual bool AppendColumn( wxDataViewColumn *col ) override; + virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) override; - 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 unsigned int GetColumnCount() const override; + virtual wxDataViewColumn* GetColumn( unsigned int pos ) const override; + virtual bool DeleteColumn( wxDataViewColumn *column ) override; + virtual bool ClearColumns() override; + virtual int GetColumnPosition( const wxDataViewColumn *column ) const override; - virtual wxDataViewColumn *GetSortingColumn() const wxOVERRIDE; + virtual wxDataViewColumn *GetSortingColumn() const override; - 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 int GetSelectedItemsCount() const override; + virtual int GetSelections( wxDataViewItemArray & sel ) const override; + virtual void SetSelections( const wxDataViewItemArray & sel ) override; + virtual void Select( const wxDataViewItem & item ) override; + virtual void Unselect( const wxDataViewItem & item ) override; + virtual bool IsSelected( const wxDataViewItem & item ) const override; + virtual void SelectAll() override; + virtual void UnselectAll() override; virtual void EnsureVisible( const wxDataViewItem& item, - const wxDataViewColumn *column = NULL ) wxOVERRIDE; + const wxDataViewColumn *column = NULL ) override; virtual void HitTest( const wxPoint &point, wxDataViewItem &item, - wxDataViewColumn *&column ) const wxOVERRIDE; + wxDataViewColumn *&column ) const override; virtual wxRect GetItemRect( const wxDataViewItem &item, - const wxDataViewColumn *column = NULL ) const wxOVERRIDE; + const wxDataViewColumn *column = NULL ) const override; - virtual bool SetRowHeight( int rowHeight ) wxOVERRIDE; + virtual bool SetRowHeight( int rowHeight ) override; - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) override; - virtual void Collapse( const wxDataViewItem & item ) wxOVERRIDE; - virtual bool IsExpanded( const wxDataViewItem & item ) const wxOVERRIDE; + virtual void Collapse( const wxDataViewItem & item ) override; + virtual bool IsExpanded( const wxDataViewItem & item ) const override; - virtual bool EnableDragSource( const wxDataFormat &format ) wxOVERRIDE; - virtual bool DoEnableDropTarget( const wxVector& formats ) wxOVERRIDE; + virtual bool EnableDragSource( const wxDataFormat &format ) override; + virtual bool DoEnableDropTarget( const wxVector& formats ) override; - virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; + virtual wxDataViewColumn *GetCurrentColumn() const override; - virtual wxDataViewItem GetTopItem() const wxOVERRIDE; - virtual int GetCountPerPage() const wxOVERRIDE; + virtual wxDataViewItem GetTopItem() const override; + virtual int GetCountPerPage() const override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -191,7 +191,7 @@ public: // the matching column and assert if we didn't. wxDataViewColumn* GTKColumnToWX(GtkTreeViewColumn *gtk_col) const; - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } @@ -215,19 +215,19 @@ public: }; protected: - virtual void DoSetExpanderColumn() wxOVERRIDE; - virtual void DoSetIndent() wxOVERRIDE; + virtual void DoSetExpanderColumn() override; + virtual void DoSetIndent() override; - virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) wxOVERRIDE; + virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) override; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow* GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow* GTKGetWindow(wxArrayGdkWindows& windows) const override; private: void Init(); - virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; - virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; + virtual wxDataViewItem DoGetCurrentItem() const override; + virtual void DoSetCurrentItem(const wxDataViewItem& item) override; friend class wxDataViewCtrlDCImpl; friend class wxDataViewColumn; @@ -243,7 +243,7 @@ private: // value to force the height of all rows to the given value. int m_uniformRowHeight; - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; + virtual void AddChildGTK(wxWindowGTK* child) override; void GtkEnableSelectionEvents(); void GtkDisableSelectionEvents(); diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index 67008e4f03..48ada6e298 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -20,23 +20,23 @@ public: wxGTKCairoDCImpl(wxDC* owner); wxGTKCairoDCImpl(wxDC* owner, wxWindow* window, wxLayoutDirection dir = wxLayout_Default, int width = 0); - virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask) wxOVERRIDE; - virtual void DoDrawCheckMark(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoDrawIcon(const wxIcon& icon, int x, int y) wxOVERRIDE; - virtual void DoDrawText(const wxString& text, int x, int y) wxOVERRIDE; - virtual void DoDrawRotatedText(const wxString& text, int x, int y, double angle) wxOVERRIDE; + virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask) override; + virtual void DoDrawCheckMark(int x, int y, int width, int height) override; + virtual void DoDrawIcon(const wxIcon& icon, int x, int y) override; + virtual void DoDrawText(const wxString& text, int x, int y) override; + virtual void DoDrawRotatedText(const wxString& text, int x, int y, double angle) override; #if wxUSE_IMAGE - virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style) wxOVERRIDE; + virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style) override; #endif - 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; + virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const override; + virtual bool DoGetPixel(int x, int y, wxColour* col) const override; + virtual void DoGetSize(int* width, int* height) const override; + 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) override; + virtual void* GetCairoContext() const override; - virtual wxSize GetPPI() const wxOVERRIDE; - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; + virtual wxSize GetPPI() const override; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; + virtual wxLayoutDirection GetLayoutDirection() const override; protected: // Set m_size from the given (valid) GdkWindow. @@ -73,7 +73,7 @@ class wxPaintDCImpl: public wxGTKCairoDCImpl typedef wxGTKCairoDCImpl BaseType; public: wxPaintDCImpl(wxPaintDC* owner, wxWindow* window); - virtual void DestroyClippingRegion() wxOVERRIDE; + virtual void DestroyClippingRegion() override; private: const wxRegion& m_clip; @@ -87,7 +87,7 @@ class wxScreenDCImpl: public wxGTKCairoDCImpl public: wxScreenDCImpl(wxScreenDC* owner); - virtual wxSize GetPPI() const wxOVERRIDE; + virtual wxSize GetPPI() const override; wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); }; @@ -99,10 +99,10 @@ public: wxMemoryDCImpl(wxMemoryDC* owner); wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap); wxMemoryDCImpl(wxMemoryDC* owner, wxDC* dc); - 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; + virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const override; + virtual void DoSelect(const wxBitmap& bitmap) override; + virtual const wxBitmap& GetSelectedBitmap() const override; + virtual wxBitmap& GetSelectedBitmap() override; private: void Setup(); @@ -139,19 +139,19 @@ public: #endif // wxUSE_PALETTE // Resolution in pixels per logical inch - virtual wxSize GetPPI() const wxOVERRIDE; + virtual wxSize GetPPI() const override; - virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE { return true; } - virtual void EndDoc() wxOVERRIDE { } - virtual void StartPage() wxOVERRIDE { } - virtual void EndPage() wxOVERRIDE { } + virtual bool StartDoc( const wxString& WXUNUSED(message) ) override { return true; } + virtual void EndDoc() override { } + virtual void StartPage() override { } + virtual void EndPage() override { } virtual GdkWindow* GetGDKWindow() const { return NULL; } - virtual void* GetHandle() const wxOVERRIDE { return GetGDKWindow(); } + virtual void* GetHandle() const override { return GetGDKWindow(); } // base class pure virtuals implemented here - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; + virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; + virtual void DoGetSizeMM(int* width, int* height) const override; wxDECLARE_ABSTRACT_CLASS(wxGTKDCImpl); }; diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 5c04100c69..007547be7c 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -23,83 +23,83 @@ public: virtual ~wxWindowDCImpl(); - virtual bool CanDrawBitmap() const wxOVERRIDE { return true; } - virtual bool CanGetTextExtent() const wxOVERRIDE { return true; } + virtual bool CanDrawBitmap() const override { return true; } + virtual bool CanGetTextExtent() const override { return true; } - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style=wxFLOOD_SURFACE ) wxOVERRIDE; - virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const wxOVERRIDE; + wxFloodFillStyle style=wxFLOOD_SURFACE ) override; + virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const override; - virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) wxOVERRIDE; - virtual void DoCrossHair( wxCoord x, wxCoord y ) wxOVERRIDE; + virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) override; + virtual void DoCrossHair( wxCoord x, wxCoord y ) override; virtual void DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc ) wxOVERRIDE; + wxCoord xc, wxCoord yc ) override; virtual void DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double sa, double ea ) wxOVERRIDE; - virtual void DoDrawPoint( wxCoord x, wxCoord y ) wxOVERRIDE; + double sa, double ea ) override; + virtual void DoDrawPoint( wxCoord x, wxCoord y ) override; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE; + wxCoord xoffset, wxCoord yoffset) override; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; - 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 DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) override; + virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ) override; + virtual void DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) override; - virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) wxOVERRIDE; + virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) override; virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = false ) wxOVERRIDE; + bool useMask = false ) override; 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 ) wxOVERRIDE; + wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ) override; - virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ) wxOVERRIDE; + virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ) override; virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; + double angle) override; virtual void DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - 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 bool DoGetClippingRect(wxRect& rect) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; + virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const override; + virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) override; + virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ) override; + virtual bool DoGetClippingRect(wxRect& rect) const override; - virtual wxCoord GetCharWidth() const wxOVERRIDE; - virtual wxCoord GetCharHeight() const wxOVERRIDE; + virtual wxCoord GetCharWidth() const override; + virtual wxCoord GetCharHeight() const override; - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; - 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 SetFont( const wxFont &font ) override; + virtual void SetPen( const wxPen &pen ) override; + virtual void SetBrush( const wxBrush &brush ) override; + virtual void SetBackground( const wxBrush &brush ) override; + virtual void SetLogicalFunction( wxRasterOperationMode function ) override; + virtual void SetTextForeground( const wxColour &col ) override; + virtual void SetTextBackground( const wxColour &col ) override; + virtual void SetBackgroundMode( int mode ) override; #if wxUSE_PALETTE - virtual void SetPalette( const wxPalette& palette ) wxOVERRIDE; + virtual void SetPalette( const wxPalette& palette ) override; #endif - virtual void DestroyClippingRegion() wxOVERRIDE; + virtual void DestroyClippingRegion() override; // Resolution in pixels per logical inch - virtual wxSize GetPPI() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; + virtual wxSize GetPPI() const override; + virtual int GetDepth() const override; // overridden here for RTL - virtual void SetDeviceOrigin( wxCoord x, wxCoord y ) wxOVERRIDE; - virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) wxOVERRIDE; + virtual void SetDeviceOrigin( wxCoord x, wxCoord y ) override; + virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) override; // protected: // implementation @@ -124,9 +124,9 @@ public: void SetUpDC( bool ismem = false ); void Destroy(); - virtual void ComputeScaleAndOrigin() wxOVERRIDE; + virtual void ComputeScaleAndOrigin() override; - virtual GdkWindow *GetGDKWindow() const wxOVERRIDE { return m_gdkwindow; } + virtual GdkWindow *GetGDKWindow() const override { return m_gdkwindow; } // Update the internal clip box variables void UpdateClipBox(); @@ -148,7 +148,7 @@ public: wxClientDCImpl( wxDC *owner ); wxClientDCImpl( wxDC *owner, wxWindow *win ); - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; wxDECLARE_ABSTRACT_CLASS(wxClientDCImpl); }; diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index 08036ac9c8..bd9883f261 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -29,22 +29,22 @@ public: // more like their Win32 counterparts. They now interpret // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0 // and everything else as drawing 1. - 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; + virtual void SetPen( const wxPen &pen ) override; + virtual void SetBrush( const wxBrush &brush ) override; + virtual void SetBackground( const wxBrush &brush ) override; + virtual void SetTextForeground( const wxColour &col ) override; + virtual void SetTextBackground( const wxColour &col ) override; // overridden from wxDCImpl - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; - virtual void* GetHandle() const wxOVERRIDE; + virtual void DoGetSize( int *width, int *height ) const override; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const override; + virtual void* GetHandle() const override; // overridden for wxMemoryDC Impl - virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; + virtual void DoSelect(const wxBitmap& bitmap) override; - virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE; - virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE; + virtual const wxBitmap& GetSelectedBitmap() const override; + virtual wxBitmap& GetSelectedBitmap() override; private: wxBitmap m_selected; diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h index f59d6e3636..275db17b0d 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 wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; private: void Init(); diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 29f2fb5fd7..651083c538 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -34,10 +34,10 @@ public: const wxString &name = wxASCII_STR(wxDialogNameStr) ); virtual ~wxDialog(); - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual int ShowModal() wxOVERRIDE; - virtual void EndModal( int retCode ) wxOVERRIDE; - virtual bool IsModal() const wxOVERRIDE; + virtual bool Show( bool show = true ) override; + virtual int ShowModal() override; + virtual void EndModal( int retCode ) override; + virtual bool IsModal() const override; private: // common part of all ctors diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h index e25e0b293d..b55e89ea97 100644 --- a/include/wx/gtk/dirdlg.h +++ b/include/wx/gtk/dirdlg.h @@ -37,7 +37,7 @@ public: public: // overrides from wxGenericDirDialog - void SetPath(const wxString& path) wxOVERRIDE; + void SetPath(const wxString& path) override; // Implementation only. @@ -50,7 +50,7 @@ protected: // form doesn't have any m_wxwindow virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; private: diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h index 3c771e2f68..900e24668d 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) wxOVERRIDE; - virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE; - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - virtual bool GetData() wxOVERRIDE; + virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) override; + virtual bool OnDrop(wxCoord x, wxCoord y) override; + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override; + virtual bool GetData() override; // Can only be called during OnXXX methods. wxDataFormat GetMatchingPair(); @@ -92,7 +92,7 @@ public: } // start drag action - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) override; void PrepareIcon( int action, GdkDragContext *context ); diff --git a/include/wx/gtk/dvrenderer.h b/include/wx/gtk/dvrenderer.h index 0704b89ff6..07ecf13e6b 100644 --- a/include/wx/gtk/dvrenderer.h +++ b/include/wx/gtk/dvrenderer.h @@ -25,16 +25,16 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual void SetMode( wxDataViewCellMode mode ) wxOVERRIDE; - virtual wxDataViewCellMode GetMode() const wxOVERRIDE; + virtual void SetMode( wxDataViewCellMode mode ) override; + virtual wxDataViewCellMode GetMode() const override; - virtual void SetAlignment( int align ) wxOVERRIDE; - virtual int GetAlignment() const wxOVERRIDE; + virtual void SetAlignment( int align ) override; + virtual int GetAlignment() const override; - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE; - virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE; + virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) override; + virtual wxEllipsizeMode GetEllipsizeMode() const override; - virtual bool FinishEditing() wxOVERRIDE; + virtual bool FinishEditing() override; // GTK-specific implementation // --------------------------- @@ -74,10 +74,10 @@ private: void GtkSetMode(wxDataViewCellMode mode); protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; - virtual void SetEnabled(bool enabled) wxOVERRIDE; + virtual void SetAttr(const wxDataViewItemAttr& attr) override; + virtual void SetEnabled(bool enabled) override; - virtual bool IsHighlighted() const wxOVERRIDE; + virtual bool IsHighlighted() const override; // Apply our effective alignment (i.e. m_alignment if specified or the // associated column alignment by default) to the given renderer. diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h index e8a65c37b1..ba75ead80e 100644 --- a/include/wx/gtk/dvrenderers.h +++ b/include/wx/gtk/dvrenderers.h @@ -35,12 +35,12 @@ public: void EnableMarkup(bool enable = true); #endif // wxUSE_MARKUP - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE + virtual bool SetValue( const wxVariant &value ) override { return SetTextValue(value); } - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE + virtual bool GetValue( wxVariant &value ) const override { wxString str; if ( !GetTextValue(str) ) @@ -51,12 +51,12 @@ public: return true; } - virtual void GtkUpdateAlignment() wxOVERRIDE; + virtual void GtkUpdateAlignment() override; - virtual GtkCellRendererText *GtkGetTextRenderer() const wxOVERRIDE; + virtual GtkCellRendererText *GtkGetTextRenderer() const override; protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; + virtual void SetAttr(const wxDataViewItemAttr& attr) override; // implementation of Set/GetValue() bool SetTextValue(const wxString& str); @@ -87,11 +87,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; + bool SetValue( const wxVariant &value ) override; + bool GetValue( wxVariant &value ) const override; virtual - bool IsCompatibleVariantType(const wxString& variantType) const wxOVERRIDE; + bool IsCompatibleVariantType(const wxString& variantType) const override; protected: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); @@ -112,8 +112,8 @@ public: void ShowAsRadio(); - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; + bool SetValue( const wxVariant &value ) override; + bool GetValue( wxVariant &value ) const override; protected: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer); @@ -136,14 +136,14 @@ public: // Create DC on request - virtual wxDC *GetDC() wxOVERRIDE; + virtual wxDC *GetDC() override; // override the base class function to use GTK text cell renderer virtual void RenderText(const wxString& text, int xoffset, wxRect cell, wxDC *dc, - int state) wxOVERRIDE; + int state) override; struct GTKRenderParams; @@ -153,10 +153,10 @@ public: m_renderParams = renderParams; } - virtual GtkCellRendererText *GtkGetTextRenderer() const wxOVERRIDE; - virtual GtkWidget* GtkGetEditorWidget() const wxOVERRIDE; + virtual GtkCellRendererText *GtkGetTextRenderer() const override; + virtual GtkWidget* GtkGetEditorWidget() const override; - virtual void GtkUpdateAlignment() wxOVERRIDE; + virtual void GtkUpdateAlignment() override; private: bool Init(wxDataViewCellMode mode, int align); @@ -191,11 +191,11 @@ public: int align = wxDVR_DEFAULT_ALIGNMENT ); virtual ~wxDataViewProgressRenderer(); - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; + bool SetValue( const wxVariant &value ) override; + bool GetValue( wxVariant &value ) const override; - virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; + virtual bool Render( wxRect cell, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; private: void GTKSetLabel(); @@ -228,14 +228,14 @@ public: int align = wxDVR_DEFAULT_ALIGNMENT ); virtual ~wxDataViewIconTextRenderer(); - bool SetValue( const wxVariant &value ) wxOVERRIDE; - bool GetValue( wxVariant &value ) const wxOVERRIDE; + bool SetValue( const wxVariant &value ) override; + bool GetValue( wxVariant &value ) const override; - virtual void GtkPackIntoColumn(GtkTreeViewColumn *column) wxOVERRIDE; + virtual void GtkPackIntoColumn(GtkTreeViewColumn *column) override; protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; - virtual wxVariant GtkGetValueFromString(const wxString& str) const wxOVERRIDE; + virtual void SetAttr(const wxDataViewItemAttr& attr) override; + virtual wxVariant GtkGetValueFromString(const wxString& str) const override; private: wxDataViewIconText m_value; @@ -256,12 +256,12 @@ public: wxDataViewChoiceRenderer(const wxArrayString &choices, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool Render( wxRect rect, wxDC *dc, int state ) override; + virtual wxSize GetSize() const override; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; - virtual void GtkUpdateAlignment() wxOVERRIDE; + virtual void GtkUpdateAlignment() override; wxString GetChoice(size_t index) const { return m_choices[index]; } const wxArrayString& GetChoices() const { return m_choices; } @@ -282,11 +282,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; - virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) override; + virtual bool GetValue( wxVariant &value ) const override; private: - virtual wxVariant GtkGetValueFromString(const wxString& str) const wxOVERRIDE; + virtual wxVariant GtkGetValueFromString(const wxString& str) const override; }; diff --git a/include/wx/gtk/evtloop.h b/include/wx/gtk/evtloop.h index 0e3c1b15ea..fb325d4ee0 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) wxOVERRIDE; - virtual bool Pending() const wxOVERRIDE; - virtual bool Dispatch() wxOVERRIDE; - virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; - virtual void WakeUp() wxOVERRIDE; + virtual void ScheduleExit(int rc = 0) override; + virtual bool Pending() const override; + virtual bool Dispatch() override; + virtual int DispatchTimeout(unsigned long timeout) override; + virtual void WakeUp() override; void StoreGdkEventForLaterProcessing(GdkEvent* ev) { m_arrGdkEvents.Add(ev); } protected: - virtual int DoRun() wxOVERRIDE; - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; + virtual int DoRun() override; + virtual void DoYieldFor(long eventsToProcess) override; private: // the exit code of this event loop diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h index 870c5753cc..4c82443c32 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 = wxASCII_STR(wxFileCtrlNameStr) ); - 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 void SetWildcard( const wxString& wildCard ) override; + virtual void SetFilterIndex( int filterIndex ) override; + virtual bool SetDirectory( const wxString& dir ) override; + virtual bool SetFilename( const wxString& name ) override; + virtual bool SetPath( const wxString& path ) override; - 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 wxString GetFilename() const override; + virtual wxString GetDirectory() const override; + virtual wxString GetWildcard() const override { return this->m_wildCard; } + virtual wxString GetPath() const override; + virtual void GetPaths( wxArrayString& paths ) const override; + virtual void GetFilenames( wxArrayString& files ) const override; + virtual int GetFilterIndex() const override { return m_fc.GetFilterIndex(); } - virtual bool HasMultipleFileSelection() const wxOVERRIDE { return HasFlag( wxFC_MULTIPLE ); } - virtual void ShowHidden(bool show) wxOVERRIDE; + virtual bool HasMultipleFileSelection() const override { return HasFlag( wxFC_MULTIPLE ); } + virtual void ShowHidden(bool show) override; virtual bool HasFilterChoice() const { return m_fc.HasFilterChoice(); } diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index 04bb92a2e7..b41dc0de33 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -40,23 +40,23 @@ public: const wxString& name = wxASCII_STR(wxFileDialogNameStr)); virtual ~wxFileDialog(); - 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 wxString GetPath() const override; + virtual void GetPaths(wxArrayString& paths) const override; + virtual wxString GetFilename() const override; + virtual void GetFilenames(wxArrayString& files) const override; + virtual int GetFilterIndex() const override; - 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 void SetMessage(const wxString& message) override; + virtual void SetPath(const wxString& path) override; + virtual void SetDirectory(const wxString& dir) override; + virtual void SetFilename(const wxString& name) override; + virtual void SetWildcard(const wxString& wildCard) override; + virtual void SetFilterIndex(int filterIndex) override; - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - virtual bool AddShortcut(const wxString& directory, int flags = 0) wxOVERRIDE; - virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } + virtual bool AddShortcut(const wxString& directory, int flags = 0) override; + virtual bool SupportsExtraControl() const override { return true; } // Implementation only. void GTKSelectionChanged(const wxString& filename); @@ -67,13 +67,13 @@ protected: // form doesn't have any m_wxwindow virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; private: void OnFakeOk( wxCommandEvent &event ); void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; + virtual void AddChildGTK(wxWindowGTK* child) override; wxGtkFileChooser m_fc; diff --git a/include/wx/gtk/filehistory.h b/include/wx/gtk/filehistory.h index edeb175455..f575bf1bbe 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) wxOVERRIDE; + virtual void AddFileToHistory(const wxString& file) override; wxDECLARE_DYNAMIC_CLASS(wxFileHistory); }; diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index b2ab35c2a8..b4549858c6 100644 --- a/include/wx/gtk/filepicker.h +++ b/include/wx/gtk/filepicker.h @@ -28,7 +28,7 @@ /* needs to create the dialog in ::Create() and not for each user */ \ /* request in response to the user click as the generic implementation */ \ /* does. */ \ - virtual wxWindow *GetDialogParent() wxOVERRIDE \ + virtual wxWindow *GetDialogParent() override \ { \ return NULL; \ } \ @@ -42,7 +42,7 @@ /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ protected: \ virtual GdkWindow * \ - GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const wxOVERRIDE \ + GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const override \ { return NULL; } @@ -92,8 +92,8 @@ public: // overrides // event handler for the click void OnDialogOK(wxCommandEvent &); - virtual void SetPath(const wxString &str) wxOVERRIDE; - virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE; + virtual void SetPath(const wxString &str) override; + virtual void SetInitialDirectory(const wxString& dir) override; // see macro defined above FILEDIRBTN_OVERRIDES @@ -101,7 +101,7 @@ public: // overrides protected: wxDialog *m_dialog; - virtual void DoApplyWidgetStyle(GtkRcStyle*) wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle*) override; private: // common part of all ctors @@ -158,13 +158,13 @@ public: // overrides // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER // thus we must ensure that the wxDD_DIR_MUST_EXIST style was given - long GetDialogStyle() const wxOVERRIDE + long GetDialogStyle() const override { return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST); } - virtual void SetPath(const wxString &str) wxOVERRIDE; - virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE; + virtual void SetPath(const wxString &str) override; + virtual void SetInitialDirectory(const wxString& dir) override; // see macro defined above FILEDIRBTN_OVERRIDES @@ -172,7 +172,7 @@ public: // overrides protected: wxDialog *m_dialog; - virtual void DoApplyWidgetStyle(GtkRcStyle*) wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle*) override; public: // used by the GTK callback only diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index e2e57b146d..5ef305a46d 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 double GetFractionalPointSize() const wxOVERRIDE; - virtual wxFontStyle GetStyle() const wxOVERRIDE; - virtual int GetNumericWeight() 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 double GetFractionalPointSize() const override; + virtual wxFontStyle GetStyle() const override; + virtual int GetNumericWeight() const override; + virtual wxString GetFaceName() const override; + virtual bool GetUnderlined() const override; + virtual bool GetStrikethrough() const override; + virtual wxFontEncoding GetEncoding() const override; + virtual const wxNativeFontInfo *GetNativeFontInfo() const override; + virtual bool IsFixedWidth() const override; - virtual void SetFractionalPointSize(double pointSize) wxOVERRIDE; - virtual void SetFamily(wxFontFamily family) wxOVERRIDE; - virtual void SetStyle(wxFontStyle style) wxOVERRIDE; - virtual void SetNumericWeight(int 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; + virtual void SetFractionalPointSize(double pointSize) override; + virtual void SetFamily(wxFontFamily family) override; + virtual void SetStyle(wxFontStyle style) override; + virtual void SetNumericWeight(int weight) override; + virtual bool SetFaceName( const wxString& faceName ) override; + virtual void SetUnderlined( bool underlined ) override; + virtual void SetStrikethrough(bool strikethrough) override; + virtual void SetEncoding(wxFontEncoding encoding) override; wxDECLARE_COMMON_FONT_METHODS(); @@ -105,12 +105,12 @@ public: bool GTKSetPangoAttrs(PangoLayout* layout) const; protected: - virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ) wxOVERRIDE; + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ) override; - virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE; + virtual wxGDIRefData* CreateGDIRefData() const override; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const override; - virtual wxFontFamily DoGetFamily() const wxOVERRIDE; + virtual wxFontFamily DoGetFamily() const override; private: void Init(); diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index bab724c904..f6f7a2a8e5 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) wxOVERRIDE; + virtual bool DoCreate(wxWindow *parent) override; wxDECLARE_DYNAMIC_CLASS(wxFontDialog); }; diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h index 46d1304f71..72bbf08bd6 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 = wxASCII_STR(wxFontPickerWidgetNameStr)); - virtual wxColour GetSelectedColour() const wxOVERRIDE + virtual wxColour GetSelectedColour() const override { return m_selectedColour; } - void SetSelectedColour(const wxColour &colour) wxOVERRIDE + void SetSelectedColour(const wxColour &colour) override { m_selectedColour = colour; } virtual ~wxFontButton(); protected: - void UpdateFont() wxOVERRIDE; + void UpdateFont() override; public: // used by the GTK callback only diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index dce878b590..51c1170e07 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -40,28 +40,28 @@ public: const wxString& name = wxASCII_STR(wxFrameNameStr)); #if wxUSE_STATUSBAR - void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE; + void SetStatusBar(wxStatusBar *statbar) override; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; + void SetToolBar(wxToolBar *toolbar) override; #endif // wxUSE_TOOLBAR - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - wxPoint GetClientAreaOrigin() const wxOVERRIDE { return wxPoint(0, 0); } + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + wxPoint GetClientAreaOrigin() const override { return wxPoint(0, 0); } // implementation from now on // -------------------------- - virtual bool SendIdleEvents(wxIdleEvent& event) wxOVERRIDE; + virtual bool SendIdleEvents(wxIdleEvent& event) override; protected: // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; + virtual void DoGetClientSize( int *width, int *height ) const override; #if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar() wxOVERRIDE; - virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; + virtual void DetachMenuBar() override; + virtual void AttachMenuBar(wxMenuBar *menubar) override; #endif // wxUSE_MENUS_NATIVE private: diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index cad2bc6934..55689dbd26 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -41,18 +41,18 @@ public: const wxString& name = wxASCII_STR(wxGaugeNameStr) ); // implement base class virtual methods - void SetRange(int range) wxOVERRIDE; - int GetRange() const wxOVERRIDE; + void SetRange(int range) override; + int GetRange() const override; - void SetValue(int pos) wxOVERRIDE; - int GetValue() const wxOVERRIDE; + void SetValue(int pos) override; + int GetValue() const override; - virtual void Pulse() wxOVERRIDE; + virtual void Pulse() override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; + virtual wxVisualAttributes GetDefaultAttributes() const override; // implementation // ------------- diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index fe4de011de..9dd5d1fc5b 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -66,16 +66,16 @@ public: const int *attribList = NULL, const wxPalette& palette = wxNullPalette); - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) override; // implement wxGLCanvasX11 methods // -------------------------------- - virtual unsigned long GetXWindow() const wxOVERRIDE; + virtual unsigned long GetXWindow() const override; void* GetNativeWindow() const; // implementation from now on - virtual void GTKHandleRealized() wxOVERRIDE; + virtual void GTKHandleRealized() override; #ifdef __WXGTK3__ wxSize m_size; diff --git a/include/wx/gtk/hyperlink.h b/include/wx/gtk/hyperlink.h index b8776e15b2..7d794edc18 100644 --- a/include/wx/gtk/hyperlink.h +++ b/include/wx/gtk/hyperlink.h @@ -43,28 +43,28 @@ public: // get/set - virtual wxColour GetHoverColour() const wxOVERRIDE; - virtual void SetHoverColour(const wxColour &colour) wxOVERRIDE; + virtual wxColour GetHoverColour() const override; + virtual void SetHoverColour(const wxColour &colour) override; - virtual wxColour GetNormalColour() const wxOVERRIDE; - virtual void SetNormalColour(const wxColour &colour) wxOVERRIDE; + virtual wxColour GetNormalColour() const override; + virtual void SetNormalColour(const wxColour &colour) override; - virtual wxColour GetVisitedColour() const wxOVERRIDE; - virtual void SetVisitedColour(const wxColour &colour) wxOVERRIDE; + virtual wxColour GetVisitedColour() const override; + virtual void SetVisitedColour(const wxColour &colour) override; - virtual wxString GetURL() const wxOVERRIDE; - virtual void SetURL(const wxString &url) wxOVERRIDE; + virtual wxString GetURL() const override; + virtual void SetURL(const wxString &url) override; - virtual void SetVisited(bool visited = true) wxOVERRIDE; - virtual bool GetVisited() const wxOVERRIDE; + virtual void SetVisited(bool visited = true) override; + virtual bool GetVisited() const override; - virtual void SetLabel(const wxString &label) wxOVERRIDE; + virtual void SetLabel(const wxString &label) override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetBestClientSize() const override; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; wxDECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl); }; diff --git a/include/wx/gtk/infobar.h b/include/wx/gtk/infobar.h index 26653df2f5..2c27b5d85f 100644 --- a/include/wx/gtk/infobar.h +++ b/include/wx/gtk/infobar.h @@ -38,18 +38,18 @@ public: // ---------------------------- virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION) wxOVERRIDE; + int flags = wxICON_INFORMATION) override; - virtual void Dismiss() wxOVERRIDE; + virtual void Dismiss() override; virtual void AddButton(wxWindowID btnid, - const wxString& label = wxString()) wxOVERRIDE; + const wxString& label = wxString()) override; - virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE; + virtual void RemoveButton(wxWindowID btnid) override; - virtual size_t GetButtonCount() const wxOVERRIDE; - virtual wxWindowID GetButtonId(size_t idx) const wxOVERRIDE; - virtual bool HasButtonId(wxWindowID btnid) const wxOVERRIDE; + virtual size_t GetButtonCount() const override; + virtual wxWindowID GetButtonId(size_t idx) const override; + virtual bool HasButtonId(wxWindowID btnid) const override; // implementation only // ------------------- @@ -57,7 +57,7 @@ public: void GTKResponse(int btnid); protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; private: void Init() { m_impl = NULL; } diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h index e597bd283e..557b6f589e 100644 --- a/include/wx/gtk/listbox.h +++ b/include/wx/gtk/listbox.h @@ -63,28 +63,28 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxListBoxNameStr)); - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; - virtual bool IsSelected(int n) const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; + virtual bool IsSelected(int n) const override; + virtual int GetSelection() const override; + virtual int GetSelections(wxArrayInt& aSelections) const override; - virtual void EnsureVisible(int n) wxOVERRIDE; + virtual void EnsureVisible(int n) override; - virtual int GetTopItem() const wxOVERRIDE; - virtual int GetCountPerPage() const wxOVERRIDE; + virtual int GetTopItem() const override; + virtual int GetCountPerPage() const override; - virtual void Update() wxOVERRIDE; + virtual void Update() override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // implementation from now on - virtual GtkWidget *GetConnectWidget() wxOVERRIDE; + virtual GtkWidget *GetConnectWidget() override; struct _GtkTreeView *m_treeview; struct _GtkListStore *m_liststore; @@ -102,23 +102,23 @@ public: void GTKOnActivated(int item); protected: - 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 DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual wxSize DoGetBestSize() const override; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; + virtual void DoSetSelection(int n, bool select) override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE; + void **clientData, wxClientDataType type) override; + virtual int DoInsertOneItem(const wxString& item, unsigned int pos) override; - 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; + virtual void DoSetFirstItem(int n) override; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; + virtual int DoListHitTest(const wxPoint& point) const override; // 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 69f372cf62..1b9f335520 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 wxOVERRIDE; + virtual wxMDIChildFrame *GetActiveChild() const override; // implement base class pure virtuals // ---------------------------------- - virtual void ActivateNext() wxOVERRIDE; - virtual void ActivatePrevious() wxOVERRIDE; + virtual void ActivateNext() override; + virtual void ActivatePrevious() override; static bool IsTDI() { return true; } @@ -63,10 +63,10 @@ public: bool m_justInserted; - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; protected: - virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE; + virtual void DoGetClientSize(int* width, int* height) const override; private: friend class wxMDIChildFrame; @@ -106,24 +106,24 @@ public: virtual ~wxMDIChildFrame(); - virtual void SetMenuBar( wxMenuBar *menu_bar ) wxOVERRIDE; - virtual wxMenuBar *GetMenuBar() const wxOVERRIDE; + virtual void SetMenuBar( wxMenuBar *menu_bar ) override; + virtual wxMenuBar *GetMenuBar() const override; - virtual void Activate() wxOVERRIDE; + virtual void Activate() override; - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; // implementation void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event ); - virtual void GTKHandleRealized() wxOVERRIDE; + virtual void GTKHandleRealized() override; wxMenuBar *m_menuBar; bool m_justInserted; protected: - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; + virtual void DoGetPosition(int *x, int *y) const override; private: void Init(); @@ -145,10 +145,10 @@ public: ~wxMDIClientWindow(); virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; + long style = wxVSCROLL | wxHSCROLL) override; private: - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; + virtual void AddChildGTK(wxWindowGTK* child) override; wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); }; diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 0b2f4a33b1..3a3360f5e8 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 ) 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 bool Append( wxMenu *menu, const wxString &title ) override; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Remove(size_t pos) override; virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const wxOVERRIDE; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const wxOVERRIDE; + const wxString& itemString) const override; + virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const override; - virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE; - virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; - virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE; - virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE; + virtual void EnableTop( size_t pos, bool flag ) override; + virtual bool IsEnabledTop(size_t pos) const override; + virtual void SetMenuLabel( size_t pos, const wxString& label ) override; + virtual wxString GetMenuLabel( size_t pos ) const override; - void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; + void SetLayoutDirection(wxLayoutDirection dir) override; + wxLayoutDirection GetLayoutDirection() const override; - virtual void Attach(wxFrame *frame) wxOVERRIDE; - virtual void Detach() wxOVERRIDE; + virtual void Attach(wxFrame *frame) override; + virtual void Detach() override; 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 wxOVERRIDE { return false; } + virtual bool GTKNeedsParent() const override { return false; } GtkWidget* m_menubar; @@ -73,7 +73,7 @@ public: virtual ~wxMenu(); - void Attach(wxMenuBarBase *menubar) wxOVERRIDE; + void Attach(wxMenuBarBase *menubar) override; void SetupBitmaps(wxWindow *win); @@ -84,7 +84,7 @@ public: wxString GetTitle() const; // Sets the title, with mnemonics translated to gtk format - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; // implementation GTK only GtkWidget *m_menu; // GtkMenu @@ -93,9 +93,9 @@ public: bool m_popupShown; protected: - virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem* DoAppend(wxMenuItem *item) override; + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) override; + virtual wxMenuItem* DoRemove(wxMenuItem *item) override; private: // common code for all constructors: diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index 8430f6f828..5c1d0f72b5 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -25,15 +25,15 @@ public: virtual ~wxMenuItem(); // implement base class virtuals - 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 SetItemLabel( const wxString& str ) override; + virtual void Enable( bool enable = true ) override; + virtual void Check( bool check = true ) override; + virtual bool IsChecked() const override; void SetupBitmaps(wxWindow *win); #if wxUSE_ACCEL - virtual void AddExtraAccel(const wxAcceleratorEntry& accel) wxOVERRIDE; - virtual void ClearExtraAccels() wxOVERRIDE; + virtual void AddExtraAccel(const wxAcceleratorEntry& accel) override; + virtual void ClearExtraAccels() override; #endif // wxUSE_ACCEL // implementation diff --git a/include/wx/gtk/mimetype.h b/include/wx/gtk/mimetype.h index ed645c6de3..f3e0779e49 100644 --- a/include/wx/gtk/mimetype.h +++ b/include/wx/gtk/mimetype.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_CORE wxGTKMimeTypesManagerImpl : public wxMimeTypesManagerImpl { protected: #if defined(__UNIX__) - wxString GetIconFromMimeType(const wxString& mime) wxOVERRIDE; + wxString GetIconFromMimeType(const wxString& mime) override; #endif }; @@ -32,7 +32,7 @@ protected: class WXDLLIMPEXP_CORE wxGTKMimeTypesManagerFactory : public wxMimeTypesManagerFactory { public: - wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl() wxOVERRIDE; + wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl() override; }; #endif // wxUSE_MIMETYPE diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h index 318af566a1..bebd06db8e 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 = wxASCII_STR(wxFrameNameStr)); - virtual void SetTitle( const wxString &title ) wxOVERRIDE; + virtual void SetTitle( const wxString &title ) override; protected: virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH ) wxOVERRIDE; - virtual void DoGetClientSize(int* width, int* height) const wxOVERRIDE; + int incW, int incH ) override; + virtual void DoGetClientSize(int* width, int* height) const override; // implementation public: diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h index e0ad8cca45..2ce786cf2e 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() wxOVERRIDE; - virtual bool Show(bool WXUNUSED(show) = true) wxOVERRIDE { return false; } + virtual int ShowModal() override; + virtual bool Show(bool WXUNUSED(show) = true) override { 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) wxOVERRIDE {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) override {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} + int WXUNUSED(width), int WXUNUSED(height)) override {} // override to convert wx mnemonics to GTK+ ones and handle stock ids - virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label) wxOVERRIDE; + virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label) override; private: // override to use stock GTK+ defaults instead of just string ones - 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; + virtual wxString GetDefaultYesLabel() const override; + virtual wxString GetDefaultNoLabel() const override; + virtual wxString GetDefaultOKLabel() const override; + virtual wxString GetDefaultCancelLabel() const override; + virtual wxString GetDefaultHelpLabel() const override; // 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 bc4687b5c5..c9c8129be7 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() wxOVERRIDE; + virtual void GTKHandleRealized() override; protected: - virtual bool DoClearShape() wxOVERRIDE; - virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; + virtual bool DoClearShape() override; + virtual bool DoSetRegionShape(const wxRegion& region) override; #if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE; + virtual bool DoSetPathShape(const wxGraphicsPath& path) override; #endif // wxUSE_GRAPHICS_CONTEXT diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 65cecbce8f..c38dd6847e 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) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } + int SetSelection(size_t nPage) override { return DoSetSelection(nPage, SetSelection_SendEvent); } // get the currently selected page - int GetSelection() const wxOVERRIDE; + int GetSelection() const override; // changes selected page without sending events - int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } + int ChangeSelection(size_t nPage) override { return DoSetSelection(nPage); } // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; - wxString GetPageText(size_t nPage) const wxOVERRIDE; + bool SetPageText(size_t nPage, const wxString& strText) override; + wxString GetPageText(size_t nPage) const override; // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const wxOVERRIDE; - bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; + int GetPageImage(size_t nPage) const override; + bool SetPageImage(size_t nPage, int nImage) override; // control the appearance of the notebook pages // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding) wxOVERRIDE; + void SetPadding(const wxSize& padding) override; // sets the size of the tabs (assumes all tabs are the same size) - void SetTabSize(const wxSize& sz) wxOVERRIDE; + void SetTabSize(const wxSize& sz) override; // geometry - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const override; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; // operations // ---------- // remove all pages - bool DeleteAllPages() wxOVERRIDE; + bool DeleteAllPages() override; // 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 ) wxOVERRIDE; + int imageId = NO_IMAGE ) override; // handler for tab navigation // -------------------------- @@ -102,8 +102,8 @@ public: // -------------- #if wxUSE_CONSTRAINTS - void SetConstraintSizes(bool recurse) wxOVERRIDE; - bool DoPhase(int phase) wxOVERRIDE; + void SetConstraintSizes(bool recurse) override; + bool DoPhase(int phase) override; #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) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; // remove one page from the notebook but do not destroy it - virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE; + virtual wxNotebookPage *DoRemovePage(size_t nPage) override; - int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; + int DoSetSelection(size_t nPage, int flags = 0) override; private: // the padding set by SetPadding() int m_padding; void Init(); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; + virtual void AddChildGTK(wxWindowGTK* child) override; wxDECLARE_DYNAMIC_CLASS(wxNotebook); wxDECLARE_EVENT_TABLE(); diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 6e95eb9c40..0a2f9d5936 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 ) 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; + void SetColour( const wxColour &colour ) override; + void SetColour( unsigned char red, unsigned char green, unsigned char blue ) override; + void SetCap( wxPenCap capStyle ) override; + void SetJoin( wxPenJoin joinStyle ) override; + void SetStyle( wxPenStyle style ) override; + void SetWidth( int width ) override; + void SetDashes( int number_of_dashes, const wxDash *dash ) override; + void SetStipple(const wxBitmap& stipple) override; - 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; + wxColour GetColour() const override; + wxPenCap GetCap() const override; + wxPenJoin GetJoin() const override; + wxPenStyle GetStyle() const override; + int GetWidth() const override; + int GetDashes(wxDash **ptr) const override; int GetDashCount() const; wxDash* GetDash() const; - wxBitmap *GetStipple() const wxOVERRIDE; + wxBitmap *GetStipple() const override; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") @@ -54,8 +54,8 @@ public: void SetStyle(int style) { SetStyle((wxPenStyle)style); } protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; wxDECLARE_DYNAMIC_CLASS(wxPen); }; diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h index 566a7c05b4..8f4316c52c 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) wxOVERRIDE; + virtual bool Show(bool show = true) override; - virtual void SetFocus() wxOVERRIDE; + virtual void SetFocus() override; // implementation // -------------- @@ -37,9 +37,9 @@ public: protected: virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; #ifdef __WXUNIVERSAL__ wxDECLARE_EVENT_TABLE(); diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h index 22b2b86f21..44d6b83f16 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 ) wxOVERRIDE; + virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ) override; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ) wxOVERRIDE; + wxPrintDialogData *data = NULL ) override; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout, - wxPrintData *data ) wxOVERRIDE; + wxPrintData *data ) override; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ) wxOVERRIDE; + wxPrintDialogData *data = NULL ) override; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ) wxOVERRIDE; + wxPrintData *data ) override; virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ) wxOVERRIDE; + wxPageSetupDialogData * data = NULL ) override; - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxOVERRIDE; + virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) override; - 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 bool HasPrintSetupDialog() override; + virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) override; + virtual bool HasOwnPrintToFile() override; + virtual bool HasPrinterLine() override; + virtual wxString CreatePrinterLine() override; + virtual bool HasStatusLine() override; + virtual wxString CreateStatusLine() override; - virtual wxPrintNativeDataBase *CreatePrintNativeData() wxOVERRIDE; + virtual wxPrintNativeDataBase *CreatePrintNativeData() override; }; //---------------------------------------------------------------------------- @@ -75,18 +75,18 @@ public: wxGtkPrintDialog( wxWindow *parent, wxPrintData* data); virtual ~wxGtkPrintDialog(); - wxPrintData& GetPrintData() wxOVERRIDE + wxPrintData& GetPrintData() override { return m_printDialogData.GetPrintData(); } - wxPrintDialogData& GetPrintDialogData() wxOVERRIDE + wxPrintDialogData& GetPrintDialogData() override { return m_printDialogData; } - wxDC *GetPrintDC() wxOVERRIDE; + wxDC *GetPrintDC() override; - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - virtual bool Validate() wxOVERRIDE { return true; } - virtual bool TransferDataToWindow() wxOVERRIDE { return true; } - virtual bool TransferDataFromWindow() wxOVERRIDE { return true; } + virtual bool Validate() override { return true; } + virtual bool TransferDataToWindow() override { return true; } + virtual bool TransferDataFromWindow() override { return true; } void SetShowDialog(bool show) { m_showDialog = show; } bool GetShowDialog() { return m_showDialog; } @@ -96,9 +96,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) wxOVERRIDE {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) override {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} + int WXUNUSED(width), int WXUNUSED(height)) override {} private: wxPrintDialogData m_printDialogData; @@ -119,22 +119,22 @@ public: wxPageSetupDialogData* data = NULL ); virtual ~wxGtkPageSetupDialog(); - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE { return m_pageDialogData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() override { return m_pageDialogData; } - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - virtual bool Validate() wxOVERRIDE { return true; } - virtual bool TransferDataToWindow() wxOVERRIDE { return true; } - virtual bool TransferDataFromWindow() wxOVERRIDE { return true; } + virtual bool Validate() override { return true; } + virtual bool TransferDataToWindow() override { return true; } + virtual bool TransferDataFromWindow() override { 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) wxOVERRIDE {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) override {} virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {} + int WXUNUSED(width), int WXUNUSED(height)) override {} private: wxPageSetupDialogData m_pageDialogData; @@ -155,9 +155,9 @@ public: virtual bool Print(wxWindow *parent, wxPrintout *printout, - bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; + bool prompt = true) override; + virtual wxDC* PrintDialog(wxWindow *parent) override; + virtual bool Setup(wxWindow *parent) override; GtkPrintContext *GetPrintContext() { return m_gpc; } void SetPrintContext(GtkPrintContext *context) {m_gpc = context;} @@ -182,11 +182,11 @@ public: wxGtkPrintNativeData(); virtual ~wxGtkPrintNativeData(); - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; + virtual bool TransferTo( wxPrintData &data ) override; + virtual bool TransferFrom( const wxPrintData &data ) override; - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE { return true; } + virtual bool Ok() const override { return IsOk(); } + virtual bool IsOk() const override { return true; } GtkPrintSettings* GetPrintConfig() { return m_config; } void SetPrintConfig( GtkPrintSettings * config ); @@ -218,78 +218,78 @@ public: virtual ~wxGtkPrinterDCImpl(); bool Ok() const { return IsOk(); } - bool IsOk() const wxOVERRIDE; + bool IsOk() const override; - virtual void* GetCairoContext() const wxOVERRIDE; - virtual void* GetHandle() const wxOVERRIDE; + virtual void* GetCairoContext() const override; + virtual void* GetHandle() const override; - 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; + bool CanDrawBitmap() const override { return true; } + void Clear() override; + void SetFont( const wxFont& font ) override; + void SetPen( const wxPen& pen ) override; + void SetBrush( const wxBrush& brush ) override; + void SetLogicalFunction( wxRasterOperationMode function ) override; + void SetBackground( const wxBrush& brush ) override; + void DestroyClippingRegion() override; + bool StartDoc(const wxString& message) override; + void EndDoc() override; + void StartPage() override; + void EndPage() override; + wxCoord GetCharHeight() const override; + wxCoord GetCharWidth() const override; + bool CanGetTextExtent() const override { return true; } + wxSize GetPPI() const override; + virtual int GetDepth() const override { return 24; } + void SetBackgroundMode(int mode) override; #if wxUSE_PALETTE - void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } + void SetPalette(const wxPalette& WXUNUSED(palette)) override { } #endif void SetResolution(int ppi); // overridden for wxPrinterDC Impl - virtual int GetResolution() const wxOVERRIDE; - virtual wxRect GetPaperRect() const wxOVERRIDE; + virtual int GetResolution() const override; + virtual wxRect GetPaperRect() const override; protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - 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; + wxFloodFillStyle style=wxFLOOD_SURFACE ) override; + void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter) override; + void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST) override; + bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const override; + void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; + void DoCrossHair(wxCoord x, wxCoord y) override; + void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) override; + void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) override; + void DoDrawPoint(wxCoord x, wxCoord y) override; + void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) override; + void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE) override; + void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE) override; + void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; + void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0) override; + void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; #if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points) wxOVERRIDE; + void DoDrawSpline(const wxPointList *points) override; #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) 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 + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override; + void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) override; + void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ) override; + void DoDrawText(const wxString& text, wxCoord x, wxCoord y ) override; + void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) override; + void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; + void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) ) override { wxFAIL_MSG( "not implemented" ); } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL ) const wxOVERRIDE; - bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; - void DoGetSize(int* width, int* height) const wxOVERRIDE; - void DoGetSizeMM(int *width, int *height) const wxOVERRIDE; + const wxFont *theFont = NULL ) const override; + bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const override; + void DoGetSize(int* width, int* height) const override; + void DoGetSizeMM(int *width, int *height) const override; wxPrintData& GetPrintData() { return m_printData; } void SetPrintData(const wxPrintData& data); @@ -332,8 +332,8 @@ public: virtual ~wxGtkPrintPreview(); - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; + virtual bool Print(bool interactive) override; + virtual void DetermineScaling() override; private: void Init(wxPrintout *printout, diff --git a/include/wx/gtk/private/addremovectrl.h b/include/wx/gtk/private/addremovectrl.h index fe5c51149a..d8dbc9b594 100644 --- a/include/wx/gtk/private/addremovectrl.h +++ b/include/wx/gtk/private/addremovectrl.h @@ -56,7 +56,7 @@ public: } virtual void SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) wxOVERRIDE + const wxString& removetip) override { m_tbar->SetToolShortHelp(wxID_ADD, addtip); m_tbar->SetToolShortHelp(wxID_REMOVE, removetip); diff --git a/include/wx/gtk/private/animate.h b/include/wx/gtk/private/animate.h index 214ae7db7e..156efdf890 100644 --- a/include/wx/gtk/private/animate.h +++ b/include/wx/gtk/private/animate.h @@ -30,23 +30,23 @@ public: : m_pixbuf(NULL) {} ~wxAnimationGTKImpl() { UnRef(); } - virtual bool IsOk() const wxOVERRIDE + virtual bool IsOk() const override { return m_pixbuf != NULL; } - virtual bool IsCompatibleWith(wxClassInfo* ci) const wxOVERRIDE; + virtual bool IsCompatibleWith(wxClassInfo* ci) const override; // unfortunately GdkPixbufAnimation does not expose these info: - virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; } - virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE; + virtual unsigned int GetFrameCount() const override { return 0; } + virtual wxImage GetFrame(unsigned int frame) const override; // we can retrieve the delay for a frame only after building // a GdkPixbufAnimationIter... - virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; } - virtual wxSize GetSize() const wxOVERRIDE; + virtual int GetDelay(unsigned int WXUNUSED(frame)) const override { return 0; } + virtual wxSize GetSize() const override; - virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) override; + virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) override; // Implementation public: // used by GTK callbacks diff --git a/include/wx/gtk/private/log.h b/include/wx/gtk/private/log.h index e54677b7c9..4c3d9f74fd 100644 --- a/include/wx/gtk/private/log.h +++ b/include/wx/gtk/private/log.h @@ -95,7 +95,7 @@ public: protected: bool Filter(GLogLevelFlags log_level, const GLogField* WXUNUSED(fields), - gsize WXUNUSED(n_fields)) const wxOVERRIDE + gsize WXUNUSED(n_fields)) const override { return log_level & m_logLevelToIgnore; } @@ -129,7 +129,7 @@ public: protected: bool Filter(GLogLevelFlags WXUNUSED(log_level), const GLogField* fields, - gsize n_fields) const wxOVERRIDE; + gsize n_fields) const override; private: const char* const m_message; diff --git a/include/wx/gtk/private/textmeasure.h b/include/wx/gtk/private/textmeasure.h index dab7a26f7a..6689236c8f 100644 --- a/include/wx/gtk/private/textmeasure.h +++ b/include/wx/gtk/private/textmeasure.h @@ -35,18 +35,18 @@ protected: // Common part of both ctors. void Init(); - virtual void BeginMeasuring() wxOVERRIDE; - virtual void EndMeasuring() wxOVERRIDE; + virtual void BeginMeasuring() override; + virtual void EndMeasuring() override; virtual void DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *descent = NULL, - wxCoord *externalLeading = NULL) wxOVERRIDE; + wxCoord *externalLeading = NULL) override; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths, - double scaleX) wxOVERRIDE; + double scaleX) override; // This class is only used for DC text measuring with GTK+ 2 as GTK+ 3 uses // Cairo and not Pango for this. However it's still used even with GTK+ 3 diff --git a/include/wx/gtk/private/timer.h b/include/wx/gtk/private/timer.h index cb8d44becc..c40f00bab2 100644 --- a/include/wx/gtk/private/timer.h +++ b/include/wx/gtk/private/timer.h @@ -22,9 +22,9 @@ class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl public: wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; } - virtual bool Start( int millisecs = -1, bool oneShot = false ) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE { return m_sourceId != 0; } + virtual bool Start( int millisecs = -1, bool oneShot = false ) override; + virtual void Stop() override; + virtual bool IsRunning() const override { return m_sourceId != 0; } protected: int m_sourceId; diff --git a/include/wx/gtk/private/tlwgeom.h b/include/wx/gtk/private/tlwgeom.h index 448cc4ac71..a6a7b7e632 100644 --- a/include/wx/gtk/private/tlwgeom.h +++ b/include/wx/gtk/private/tlwgeom.h @@ -14,7 +14,7 @@ class wxTLWGeometry : public wxTLWGeometryGeneric { typedef wxTLWGeometryGeneric BaseType; public: - virtual bool Save(const Serializer& ser) const wxOVERRIDE + virtual bool Save(const Serializer& ser) const override { if ( !wxTLWGeometryGeneric::Save(ser) ) return false; @@ -33,7 +33,7 @@ public: return true; } - virtual bool Restore(Serializer& ser) wxOVERRIDE + virtual bool Restore(Serializer& ser) override { if ( !wxTLWGeometryGeneric::Restore(ser) ) return false; @@ -46,7 +46,7 @@ public: return true; } - virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE + virtual bool GetFrom(const wxTopLevelWindow* tlw) override { if ( !wxTLWGeometryGeneric::GetFrom(tlw) ) return false; @@ -56,7 +56,7 @@ public: return true; } - virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE + virtual bool ApplyTo(wxTopLevelWindow* tlw) override { // Don't overwrite the current decoration size if we already have it. if ( !tlw->m_decorSize.left && !tlw->m_decorSize.right && diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index e915770079..40372e104f 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 wxOVERRIDE; + virtual unsigned int GetCount() const override; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; - virtual void SetSelection(int n) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; + virtual void SetSelection(int n) override; + virtual int GetSelection() const override; // implement wxRadioBoxBase methods - virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; - virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; + virtual bool Show(unsigned int n, bool show = true) override; + virtual bool Enable(unsigned int n, bool enable = true) override; - virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; - virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; + virtual bool IsItemEnabled(unsigned int n) const override; + virtual bool IsItemShown(unsigned int n) const override; // override some base class methods to operate on radiobox itself too - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; + virtual bool Show( bool show = true ) override; + virtual bool Enable( bool enable = true ) override; - virtual void SetLabel( const wxString& label ) wxOVERRIDE; + virtual void SetLabel( const wxString& label ) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual int GetItemFromPoint( const wxPoint& pt ) const wxOVERRIDE; + virtual int GetItemFromPoint( const wxPoint& pt ) const override; #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 wxOVERRIDE + virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const override { return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); } @@ -126,27 +126,27 @@ public: void GtkDisableEvents(); void GtkEnableEvents(); #if wxUSE_TOOLTIPS - virtual void GTKApplyToolTip(const char* tip) wxOVERRIDE; + virtual void GTKApplyToolTip(const char* tip) override; #endif // wxUSE_TOOLTIPS wxRadioBoxButtonsInfoList m_buttonsInfo; protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } #if wxUSE_TOOLTIPS - virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) wxOVERRIDE; + virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) override; #endif - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; - virtual bool GTKNeedsToFilterSameWindowFocus() const wxOVERRIDE { return true; } + virtual bool GTKNeedsToFilterSameWindowFocus() const override { return true; } - virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; + virtual bool GTKWidgetNeedsMnemonic() const override; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) override; private: wxDECLARE_DYNAMIC_CLASS(wxRadioBox); diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h index 8a19a022dd..8f39ea11fc 100644 --- a/include/wx/gtk/radiobut.h +++ b/include/wx/gtk/radiobut.h @@ -38,20 +38,20 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxRadioButtonNameStr) ); - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual void SetValue(bool val) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual void SetValue(bool val) override; + virtual bool GetValue() const override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; private: typedef wxControl base_type; diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index f8282c6ba8..2259ac7973 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() wxOVERRIDE; - virtual bool IsEmpty() const wxOVERRIDE; + virtual void Clear() override; + virtual bool IsEmpty() const override; #ifdef __WXGTK3__ cairo_region_t* GetRegion() const; @@ -67,21 +67,21 @@ public: #endif protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; // wxRegionBase pure virtuals - 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 DoIsEqual(const wxRegion& region) const override; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const override; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const override; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const override; - 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; + virtual bool DoOffset(wxCoord x, wxCoord y) override; + virtual bool DoUnionWithRect(const wxRect& rect) override; + virtual bool DoUnionWithRegion(const wxRegion& region) override; + virtual bool DoIntersect(const wxRegion& region) override; + virtual bool DoSubtract(const wxRegion& region) override; + virtual bool DoXor(const wxRegion& region) override; // 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 442a153b0d..1b80a6b98f 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 = wxASCII_STR(wxScrollBarNameStr) ); virtual ~wxScrollBar(); - int GetThumbPosition() const wxOVERRIDE; - int GetThumbSize() const wxOVERRIDE; - int GetPageSize() const wxOVERRIDE; - int GetRange() const wxOVERRIDE; - virtual void SetThumbPosition( int viewStart ) wxOVERRIDE; + int GetThumbPosition() const override; + int GetThumbSize() const override; + int GetPageSize() const override; + int GetRange() const override; + virtual void SetThumbPosition( int viewStart ) override; virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool refresh = true ) wxOVERRIDE; + bool refresh = true ) override; void SetThumbSize(int thumbSize); void SetPageSize( int pageLength ); diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index 5ed38a7456..5b2da7542b 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -26,15 +26,15 @@ public: virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos = 0, int yPos = 0, - bool noRefresh = false) wxOVERRIDE; - virtual void AdjustScrollbars() wxOVERRIDE; + bool noRefresh = false) override; + virtual void AdjustScrollbars() override; - virtual bool IsScrollbarShown(int orient) const wxOVERRIDE; + virtual bool IsScrollbarShown(int orient) const override; protected: - virtual void DoScroll(int x, int y) wxOVERRIDE; + virtual void DoScroll(int x, int y) override; virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert) wxOVERRIDE; + wxScrollbarVisibility vert) override; private: // this does (each) half of AdjustScrollbars() work diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h index b59afd3c8b..0245b70c52 100644 --- a/include/wx/gtk/slider.h +++ b/include/wx/gtk/slider.h @@ -41,24 +41,24 @@ public: const wxString& name = wxASCII_STR(wxSliderNameStr)); // implement the base class pure virtuals - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int value) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int value) override; - virtual void SetRange(int minValue, int maxValue) wxOVERRIDE; - virtual int GetMin() const wxOVERRIDE; - virtual int GetMax() const wxOVERRIDE; + virtual void SetRange(int minValue, int maxValue) override; + virtual int GetMin() const override; + virtual int GetMax() const override; - virtual void SetLineSize(int lineSize) wxOVERRIDE; - virtual void SetPageSize(int pageSize) wxOVERRIDE; - virtual int GetLineSize() const wxOVERRIDE; - virtual int GetPageSize() const wxOVERRIDE; + virtual void SetLineSize(int lineSize) override; + virtual void SetPageSize(int pageSize) override; + virtual int GetLineSize() const override; + virtual int GetPageSize() const override; - virtual void SetThumbLength(int lenPixels) wxOVERRIDE; - virtual int GetThumbLength() const wxOVERRIDE; + virtual void SetThumbLength(int lenPixels) override; + virtual int GetThumbLength() const override; - virtual void ClearTicks() wxOVERRIDE; - virtual void SetTick(int tickPos) wxOVERRIDE; - int GetTickFreq() const wxOVERRIDE; + virtual void ClearTicks() override; + virtual void SetTick(int tickPos) override; + int GetTickFreq() const override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -74,7 +74,7 @@ public: GtkWidget *m_scale; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; GtkWidget *m_minLabel,*m_maxLabel; bool m_blockScrollEvent; @@ -82,13 +82,13 @@ protected: // Note the following member is not used in GTK+2 < 2.16. int m_tickFreq; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; // set the slider value unconditionally void GTKSetValue(int value); // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq) wxOVERRIDE; + virtual void DoSetTickFreq(int freq) override; private: void Init(); diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h index 437198173c..4257b0e2a9 100644 --- a/include/wx/gtk/spinbutt.h +++ b/include/wx/gtk/spinbutt.h @@ -35,11 +35,11 @@ public: long style = wxSP_VERTICAL, const wxString& name = wxSPIN_BUTTON_NAME); - 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; + virtual int GetValue() const override; + virtual void SetValue( int value ) override; + virtual void SetRange( int minVal, int maxVal ) override; + virtual int GetMin() const override; + virtual int GetMax() const override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -51,10 +51,10 @@ protected: void GtkDisableEvents() const; void GtkEnableEvents() const; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; private: typedef wxSpinButtonBase base_type; diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index 5fb19b4162..9ce48607c1 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -35,22 +35,22 @@ public: // wxSpinCtrl(Double) methods call DoXXX functions of the same name // accessors - virtual wxString GetTextValue() const wxOVERRIDE; + virtual wxString GetTextValue() const override; // T GetValue() const // T GetMin() const // T GetMax() const // T GetIncrement() const - virtual bool GetSnapToTicks() const wxOVERRIDE; + virtual bool GetSnapToTicks() const override; // operations - virtual void SetValue(const wxString& value) wxOVERRIDE; + virtual void SetValue(const wxString& value) override; // void SetValue(T val) // void SetRange(T minVal, T maxVal) // void SetIncrement(T inc) - void SetSnapToTicks( bool snap_to_ticks ) wxOVERRIDE; + void SetSnapToTicks( bool snap_to_ticks ) override; // Select text in the textctrl - void SetSelection(long from, long to) wxOVERRIDE; + void SetSelection(long from, long to) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -95,12 +95,12 @@ protected: // base or number of digits depending on the derived class). virtual void GtkSetEntryWidth() = 0; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; // Widgets that use the style->base colour for the BG colour should // override this and return true. - virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } + virtual bool UseGTKStyleBase() const override { return true; } // Set m_textOverride to use the given text instead of the numeric value. void GTKSetTextOverride(const wxString& text); @@ -169,20 +169,20 @@ public: int GetIncrement() const { return int(DoGetIncrement()); } // operations - void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc + void SetValue(const wxString& value) override { 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 wxOVERRIDE { return m_base; } - virtual bool SetBase(int base) wxOVERRIDE; + virtual int GetBase() const override { return m_base; } + virtual bool SetBase(int base) override; - virtual GTKInputResult GTKInput(double* value) const wxOVERRIDE; - virtual bool GTKOutput(wxString* text) const wxOVERRIDE; - virtual void GTKValueChanged() wxOVERRIDE; + virtual GTKInputResult GTKInput(double* value) const override; + virtual bool GTKOutput(wxString* text) const override; + virtual void GTKValueChanged() override; protected: - virtual void GtkSetEntryWidth() wxOVERRIDE; + virtual void GtkSetEntryWidth() override; private: // Common part of all ctors. @@ -240,21 +240,21 @@ public: unsigned GetDigits() const; // operations - void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc + void SetValue(const wxString& value) override { 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); void SetDigits(unsigned digits); - virtual int GetBase() const wxOVERRIDE { return 10; } - virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } + virtual int GetBase() const override { return 10; } + virtual bool SetBase(int WXUNUSED(base)) override { return false; } - virtual GTKInputResult GTKInput(double* value) const wxOVERRIDE; - virtual bool GTKOutput(wxString* text) const wxOVERRIDE; - virtual void GTKValueChanged() wxOVERRIDE; + virtual GTKInputResult GTKInput(double* value) const override; + virtual bool GTKOutput(wxString* text) const override; + virtual void GTKValueChanged() override; protected: - virtual void GtkSetEntryWidth() wxOVERRIDE; + virtual void GtkSetEntryWidth() override; wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble); }; diff --git a/include/wx/gtk/srchctrl.h b/include/wx/gtk/srchctrl.h index f4531c3571..8b68f196d9 100644 --- a/include/wx/gtk/srchctrl.h +++ b/include/wx/gtk/srchctrl.h @@ -52,22 +52,22 @@ public: #if wxUSE_MENUS // get/set search button menu // -------------------------- - virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; - virtual wxMenu* GetMenu() wxOVERRIDE; + virtual void SetMenu( wxMenu* menu ) override; + virtual wxMenu* GetMenu() override; #endif // wxUSE_MENUS // get/set search options // ---------------------- - virtual void ShowSearchButton( bool show ) wxOVERRIDE; - virtual bool IsSearchButtonVisible() const wxOVERRIDE; + virtual void ShowSearchButton( bool show ) override; + virtual bool IsSearchButtonVisible() const override; - virtual void ShowCancelButton( bool show ) wxOVERRIDE; - virtual bool IsCancelButtonVisible() const wxOVERRIDE; + virtual void ShowCancelButton( bool show ) override; + virtual bool IsCancelButtonVisible() const override; - virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE; - virtual wxString GetDescriptiveText() const wxOVERRIDE; + virtual void SetDescriptiveText(const wxString& text) override; + virtual wxString GetDescriptiveText() const override; - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; #if wxUSE_MENUS void PopupSearchMenu(); @@ -75,7 +75,7 @@ public: private: // From wxTextEntry: - virtual GtkEditable *GetEditable() const wxOVERRIDE; + virtual GtkEditable *GetEditable() const override; void Init(); @@ -97,7 +97,7 @@ private: } private: - virtual GtkEntry *GetEntry() const wxOVERRIDE + virtual GtkEntry *GetEntry() const override { return m_entry; } GtkEntry *m_entry; diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h index c90f1ea59c..329f52dc23 100644 --- a/include/wx/gtk/statbmp.h +++ b/include/wx/gtk/statbmp.h @@ -34,7 +34,7 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBitmapNameStr)); - virtual void SetBitmap( const wxBitmapBundle& bitmap ) wxOVERRIDE; + virtual void SetBitmap( const wxBitmapBundle& bitmap ) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h index 563f1cc4be..031f727b48 100644 --- a/include/wx/gtk/statbox.h +++ b/include/wx/gtk/statbox.h @@ -64,18 +64,18 @@ public: return DoCreate( parent, id, NULL, label, pos, size, style, name ); } - virtual void SetLabel( const wxString &label ) wxOVERRIDE; + virtual void SetLabel( const wxString &label ) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // implementation - virtual bool GTKIsTransparentForMouse() const wxOVERRIDE { return true; } + virtual bool GTKIsTransparentForMouse() const override { return true; } - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const override; - virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; + virtual void AddChild( wxWindowBase *child ) override; protected: // Common implementation of both Create() overloads: exactly one of @@ -89,10 +89,10 @@ protected: long style, const wxString& name); - virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; + virtual bool GTKWidgetNeedsMnemonic() const override; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) override; - void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + void DoApplyWidgetStyle(GtkRcStyle *style) override; wxDECLARE_DYNAMIC_CLASS(wxStaticBox); }; diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h index 6763447b5e..13c2124c33 100644 --- a/include/wx/gtk/stattext.h +++ b/include/wx/gtk/stattext.h @@ -33,9 +33,9 @@ public: long style = 0, const wxString &name = wxASCII_STR(wxStaticTextNameStr) ); - void SetLabel( const wxString &label ) wxOVERRIDE; + void SetLabel( const wxString &label ) override; - bool SetFont( const wxFont &font ) wxOVERRIDE; + bool SetFont( const wxFont &font ) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -44,15 +44,15 @@ public: // -------------- protected: - virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE; + virtual bool GTKWidgetNeedsMnemonic() const override; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual wxString WXGetVisibleLabel() const wxOVERRIDE; - virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE; + virtual wxString WXGetVisibleLabel() const override; + virtual void WXSetVisibleLabel(const wxString& str) override; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP private: diff --git a/include/wx/gtk/taskbar.h b/include/wx/gtk/taskbar.h index 3b334982d5..c995174ce2 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 wxBitmapBundle& icon, const wxString& tooltip = wxString()) wxOVERRIDE; - virtual bool RemoveIcon() wxOVERRIDE; - virtual bool PopupMenu(wxMenu* menu) wxOVERRIDE; + virtual bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxString()) override; + virtual bool RemoveIcon() override; + virtual bool PopupMenu(wxMenu* menu) override; bool IsOk() const { return true; } bool IsIconInstalled() const; diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index b4d6e6b595..802ff28fed 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -43,64 +43,64 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual wxString GetValue() const wxOVERRIDE; + virtual void WriteText(const wxString& text) override; + virtual wxString GetValue() const override; virtual bool IsEmpty() const; - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; + virtual int GetLineLength(long lineNo) const override; + virtual wxString GetLineText(long lineNo) const override; + virtual int GetNumberOfLines() const override; - virtual bool IsModified() const wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual bool IsModified() const override; + virtual bool IsEditable() const override; - virtual void GetSelection(long* from, long* to) const wxOVERRIDE; + virtual void GetSelection(long* from, long* to) const override; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void Remove(long from, long to) override; - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; + virtual void MarkDirty() override; + virtual void DiscardEdits() override; - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) override; + virtual bool GetStyle(long position, wxTextAttr& style) override; // 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 wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; + virtual long XYToPosition(long x, long y) const override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; - virtual void ShowPosition(long pos) wxOVERRIDE; + virtual void ShowPosition(long pos) override; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE + wxTextCoord *row) const override { return wxTextCtrlBase::HitTest(pt, col, row); } // Clipboard operations - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; // Insertion point - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual wxTextPos GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void SetEditable(bool editable) override; // Overridden wxWindow methods - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; #if wxUSE_SPELLCHECK && defined(__WXGTK3__) // Use native spelling and grammar checking functions. virtual bool EnableProofCheck(const wxTextProofOptions& options - = wxTextProofOptions::Default()) wxOVERRIDE; - virtual wxTextProofOptions GetProofCheckOptions() const wxOVERRIDE; + = wxTextProofOptions::Default()) override; + virtual wxTextProofOptions GetProofCheckOptions() const override; #endif // wxUSE_SPELLCHECK && __WXGTK3__ // Implementation from now on @@ -119,11 +119,11 @@ public: void OnUpdateUndo(wxUpdateUIEvent& event); void OnUpdateRedo(wxUpdateUIEvent& event); - bool SetFont(const wxFont& font) wxOVERRIDE; - bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + bool SetFont(const wxFont& font) override; + bool SetForegroundColour(const wxColour& colour) override; + bool SetBackgroundColour(const wxColour& colour) override; - GtkWidget* GetConnectWidget() wxOVERRIDE; + GtkWidget* GetConnectWidget() override; void SetUpdateFont(bool WXUNUSED(update)) { } @@ -143,39 +143,39 @@ public: bool MarkDirtyOnChange(); // always let GTK have mouse release events for multiline controls - virtual bool GTKProcessEvent(wxEvent& event) const wxOVERRIDE; + virtual bool GTKProcessEvent(wxEvent& event) const override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - void GTKOnTextChanged() wxOVERRIDE; + void GTKOnTextChanged() override; void GTKAfterLayout(); protected: // overridden wxWindow virtual methods - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; + virtual void DoFreeze() override; + virtual void DoThaw() override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; // Widgets that use the style->base colour for the BG colour should // override this and return true. - virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; } + virtual bool UseGTKStyleBase() const override { return true; } - virtual wxString DoGetValue() const wxOVERRIDE; + virtual wxString DoGetValue() const override; // Override this to use either GtkEntry or GtkTextView IME depending on the // kind of control we are. - virtual int GTKIMFilterKeypress(GdkEventKey* event) const wxOVERRIDE; + virtual int GTKIMFilterKeypress(GdkEventKey* event) const override; - virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE; + virtual wxPoint DoPositionToCoords(long pos) const override; // wrappers hiding the differences between functions doing the same thing // for GtkTextView and GtkEntry (all of them use current window style to @@ -190,8 +190,8 @@ private: void Init(); // overridden wxTextEntry virtual methods - virtual GtkEditable *GetEditable() const wxOVERRIDE; - virtual GtkEntry *GetEntry() const wxOVERRIDE; + virtual GtkEditable *GetEditable() const override; + virtual GtkEntry *GetEntry() const override; // change the font for everything in this control void ChangeFontGlobally(); @@ -205,7 +205,7 @@ private: // returns either m_text or m_buffer depending on whether the control is // single- or multi-line; convenient for the GTK+ functions which work with // both - void *GetTextObject() const wxOVERRIDE + void *GetTextObject() const override { return IsMultiLine() ? static_cast(m_buffer) : static_cast(m_text); diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h index 579447fef5..0c119c156d 100644 --- a/include/wx/gtk/textentry.h +++ b/include/wx/gtk/textentry.h @@ -28,34 +28,34 @@ public: virtual ~wxTextEntry(); // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; + virtual void Remove(long from, long to) override; - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual long GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void GetSelection(long *from, long *to) const override; - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual bool IsEditable() const override; + virtual void SetEditable(bool editable) override; - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; - virtual void ForceUpper() wxOVERRIDE; + virtual void SetMaxLength(unsigned long len) override; + virtual void ForceUpper() override; #ifdef __WXGTK3__ - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual wxString GetHint() const wxOVERRIDE; + virtual bool SetHint(const wxString& hint) override; + virtual wxString GetHint() const override; #endif // implementation only from now on @@ -86,15 +86,15 @@ protected: void GTKConnectChangedSignal(); - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; + virtual void DoSetValue(const wxString& value, int flags) override; + virtual wxString DoGetValue() const override; // margins functions - virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; - virtual wxPoint DoGetMargins() const wxOVERRIDE; + virtual bool DoSetMargins(const wxPoint& pt) override; + virtual wxPoint DoGetMargins() const override; - virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE; - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE; + virtual bool DoAutoCompleteStrings(const wxArrayString& choices) override; + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) override; // Call this from the overridden wxWindow::GTKIMFilterKeypress() to use // GtkEntry IM context. @@ -112,7 +112,7 @@ protected: // // Note that we make it protected in wxGTK as it is called from wxComboBox // currently. - virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; + virtual void EnableTextChangedEvents(bool enable) override; // Helper for wxTE_PROCESS_ENTER handling: activates the default button in // the dialog containing this control if any. diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index 4ce47303a4..8f4896c102 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -45,11 +45,11 @@ public: const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); // Get/set the value - void SetValue(bool state) wxOVERRIDE; - bool GetValue() const wxOVERRIDE; + void SetValue(bool state) override; + bool GetValue() const override; // Set the label - void SetLabel(const wxString& label) wxOVERRIDE; + void SetLabel(const wxString& label) override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -58,11 +58,11 @@ public: void GTKEnableEvents(); protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoApplyWidgetStyle(GtkRcStyle *style) override; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #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) wxOVERRIDE { wxToggleButton::SetLabel(label); } + virtual void SetLabel(const wxString& label) override { wxToggleButton::SetLabel(label); } private: typedef wxToggleButtonBase base_type; diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h index 105fea9da4..ed5e53d5fe 100644 --- a/include/wx/gtk/toolbar.h +++ b/include/wx/gtk/toolbar.h @@ -41,16 +41,16 @@ public: virtual ~wxToolBar(); - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const override; - virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; + virtual void SetToolShortHelp(int id, const wxString& helpString) override; - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; - virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) override; + virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) override; - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -62,9 +62,9 @@ public: wxItemKind kind = wxITEM_NORMAL, wxObject *clientData = NULL, const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) wxOVERRIDE; + const wxString& longHelpString = wxEmptyString) override; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; + const wxString& label) override; // implementation from now on // -------------------------- @@ -73,24 +73,24 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_DEFAULT; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_DEFAULT; } - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) override; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) override; - 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 void DoEnableTool(wxToolBarToolBase *tool, bool enable) override; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) override; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) override; private: void Init(); void GtkSetStyle(); GSList* GetRadioGroup(size_t pos); - virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE; + virtual void AddChildGTK(wxWindowGTK* child) override; GtkToolbar* m_toolbar; GtkTooltips* m_tooltips; diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index b057a4a0ce..37b201e98c 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -45,39 +45,39 @@ public: virtual ~wxTopLevelWindowGTK(); // implement base class pure virtuals - 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 void Maximize(bool maximize = true) override; + virtual bool IsMaximized() const override; + virtual void Iconize(bool iconize = true) override; + virtual bool IsIconized() const override; + virtual void SetIcons(const wxIconBundle& icons) override; + virtual void Restore() override; - virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE; + virtual bool EnableCloseButton(bool enable = true) override; - virtual void ShowWithoutActivating() wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool IsFullScreen() const wxOVERRIDE { return m_fsIsShowing; } + virtual void ShowWithoutActivating() override; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + virtual bool IsFullScreen() const override { return m_fsIsShowing; } - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) override; - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; - virtual void Raise() wxOVERRIDE; + virtual void Raise() override; - virtual bool IsActive() wxOVERRIDE; + virtual bool IsActive() override; - virtual void SetTitle( const wxString &title ) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } + virtual void SetTitle( const wxString &title ) override; + virtual wxString GetTitle() const override { return m_title; } - virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } - virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } + virtual void SetLabel(const wxString& label) override { SetTitle( label ); } + virtual wxString GetLabel() const override { return GetTitle(); } - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE; + virtual wxVisualAttributes GetDefaultAttributes() const override; - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE; + virtual bool SetTransparent(wxByte alpha) override; + virtual bool CanSetTransparent() override; // Experimental, to allow help windows to be // viewable from within modal dialogs @@ -87,13 +87,13 @@ public: virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; // implementation from now on // -------------------------- // GTK callbacks - virtual void GTKHandleRealized() wxOVERRIDE; + virtual void GTKHandleRealized() override; void GTKConfigureEvent(int x, int y); @@ -141,9 +141,9 @@ public: #ifdef __WXGTK3__ void GTKUpdateClientSizeIfNecessary(); - virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE; + virtual void SetMinSize(const wxSize& minSize) override; - virtual void WXSetInitialFittingClientSize(int flags, wxSizer* sizer = NULL) wxOVERRIDE; + virtual void WXSetInitialFittingClientSize(int flags, wxSizer* sizer = NULL) override; private: // Flags to call WXSetInitialFittingClientSize() with if != 0. @@ -155,17 +155,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) wxOVERRIDE; + int incW, int incH) override; // move the window to the specified location and resize it - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; // take into account WM decorations here virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) override; + virtual void DoGetClientSize(int *width, int *height) const override; // 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 b43e98f283..8016717720 100644 --- a/include/wx/gtk/webview_webkit.h +++ b/include/wx/gtk/webview_webkit.h @@ -49,11 +49,11 @@ public: const wxString& url = wxWebViewDefaultURLStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxWebViewNameStr)) override; virtual ~wxWebViewWebKit(); - virtual bool Enable( bool enable = true ) wxOVERRIDE; + virtual bool Enable( bool enable = true ) override; // implementation // -------------- @@ -61,82 +61,82 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - 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; + virtual void Stop() override; + virtual void LoadURL(const wxString& url) override; + virtual void GoBack() override; + virtual void GoForward() override; + virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) override; + virtual bool CanGoBack() const override; + virtual bool CanGoForward() const override; + virtual void ClearHistory() override; + virtual void EnableContextMenu(bool enable = true) override; + virtual void EnableHistory(bool enable = true) override; + virtual wxVector > GetBackwardHistory() override; + virtual wxVector > GetForwardHistory() override; + virtual void LoadHistoryItem(wxSharedPtr item) override; + virtual wxString GetCurrentURL() const override; + virtual wxString GetCurrentTitle() const override; + virtual wxString GetPageSource() const override; + virtual wxString GetPageText() const override; + virtual void Print() override; + virtual bool IsBusy() const override; #if wxUSE_WEBVIEW_WEBKIT2 - virtual void EnableAccessToDevTools(bool enable = true) wxOVERRIDE; - virtual bool IsAccessToDevToolsEnabled() const wxOVERRIDE; - virtual bool SetUserAgent(const wxString& userAgent) wxOVERRIDE; + virtual void EnableAccessToDevTools(bool enable = true) override; + virtual bool IsAccessToDevToolsEnabled() const override; + virtual bool SetUserAgent(const wxString& userAgent) override; #endif - void SetZoomType(wxWebViewZoomType) wxOVERRIDE; - wxWebViewZoomType GetZoomType() const wxOVERRIDE; - bool CanSetZoomType(wxWebViewZoomType) const wxOVERRIDE; - virtual float GetZoomFactor() const wxOVERRIDE; - virtual void SetZoomFactor(float) wxOVERRIDE; + void SetZoomType(wxWebViewZoomType) override; + wxWebViewZoomType GetZoomType() const override; + bool CanSetZoomType(wxWebViewZoomType) const override; + virtual float GetZoomFactor() const override; + virtual void SetZoomFactor(float) override; //Clipboard functions - 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; + virtual bool CanCut() const override; + virtual bool CanCopy() const override; + virtual bool CanPaste() const override; + virtual void Cut() override; + virtual void Copy() override; + virtual void Paste() override; //Undo / redo functionality - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; + virtual void Undo() override; + virtual void Redo() override; //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE; + virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) override; //Editing functions - virtual void SetEditable(bool enable = true) wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual void SetEditable(bool enable = true) override; + virtual bool IsEditable() const override; //Selection - 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 DeleteSelection() override; + virtual bool HasSelection() const override; + virtual void SelectAll() override; + virtual wxString GetSelectedText() const override; + virtual wxString GetSelectedSource() const override; + virtual void ClearSelection() override; #if wxUSE_WEBVIEW_WEBKIT2 - virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const wxOVERRIDE; - virtual bool AddScriptMessageHandler(const wxString& name) wxOVERRIDE; - virtual bool RemoveScriptMessageHandler(const wxString& name) wxOVERRIDE; + virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const override; + virtual bool AddScriptMessageHandler(const wxString& name) override; + virtual bool RemoveScriptMessageHandler(const wxString& name) override; virtual bool AddUserScript(const wxString& javascript, - wxWebViewUserScriptInjectionTime injectionTime = wxWEBVIEW_INJECT_AT_DOCUMENT_START) wxOVERRIDE; - virtual void RemoveAllUserScripts() wxOVERRIDE; + wxWebViewUserScriptInjectionTime injectionTime = wxWEBVIEW_INJECT_AT_DOCUMENT_START) override; + virtual void RemoveAllUserScripts() override; #else - virtual bool RunScript(const wxString& javascript, wxString* output = NULL) const wxOVERRIDE; + virtual bool RunScript(const wxString& javascript, wxString* output = NULL) const override; #endif //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; + virtual void RegisterHandler(wxSharedPtr handler) override; virtual wxVector > GetHandlers() { return m_handlerList; } - virtual void* GetNativeBackend() const wxOVERRIDE { return m_web_view; } + virtual void* GetNativeBackend() const override { 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 @@ -161,9 +161,9 @@ public: #endif protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; + virtual void DoSetPage(const wxString& html, const wxString& baseUrl) override; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const override; private: @@ -208,17 +208,17 @@ private: class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory { public: - virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewWebKit; } + virtual wxWebView* Create() override { 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 = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE + const wxString& name = wxASCII_STR(wxWebViewNameStr)) override { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); } #if wxUSE_WEBVIEW_WEBKIT2 - virtual wxVersionInfo GetVersionInfo() wxOVERRIDE; + virtual wxVersionInfo GetVersionInfo() override; #endif }; diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index a28bec5902..ee4e0a78a3 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -61,88 +61,88 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; + virtual void Raise() override; + virtual void Lower() override; - virtual bool Show( bool show = true ) wxOVERRIDE; - virtual bool IsShown() const wxOVERRIDE; + virtual bool Show( bool show = true ) override; + virtual bool IsShown() const override; - virtual bool IsRetained() const wxOVERRIDE; + virtual bool IsRetained() const override; - virtual void SetFocus() wxOVERRIDE; + virtual void SetFocus() override; // hint from wx to native GTK+ tab traversal code - virtual void SetCanFocus(bool canFocus) wxOVERRIDE; + virtual void SetCanFocus(bool canFocus) override; - virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; + virtual bool Reparent( wxWindowBase *newParent ) override; - virtual wxSize GetWindowBorderSize() const wxOVERRIDE; + virtual wxSize GetWindowBorderSize() const override; - virtual void WarpPointer(int x, int y) wxOVERRIDE; + virtual void WarpPointer(int x, int y) override; #ifdef __WXGTK3__ - virtual bool EnableTouchEvents(int eventsMask) wxOVERRIDE; + virtual bool EnableTouchEvents(int eventsMask) override; #endif // __WXGTK3__ virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; - virtual void Update() wxOVERRIDE; - virtual void ClearBackground() wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; + virtual void Update() override; + virtual void ClearBackground() override; - 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 SetBackgroundColour( const wxColour &colour ) override; + virtual bool SetForegroundColour( const wxColour &colour ) override; + virtual bool SetCursor( const wxCursor &cursor ) override; + virtual bool SetFont( const wxFont &font ) override; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE ; - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) override ; + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const override; - virtual int GetCharHeight() const wxOVERRIDE; - virtual int GetCharWidth() const wxOVERRIDE; - virtual double GetContentScaleFactor() const wxOVERRIDE; - virtual double GetDPIScaleFactor() const wxOVERRIDE; + virtual int GetCharHeight() const override; + virtual int GetCharWidth() const override; + virtual double GetContentScaleFactor() const override; + virtual double GetDPIScaleFactor() const override; virtual void SetScrollbar( int orient, int pos, int thumbVisible, - 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; + int range, bool refresh = true ) override; + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) override; + virtual int GetScrollPos( int orient ) const override; + virtual int GetScrollThumb( int orient ) const override; + virtual int GetScrollRange( int orient ) const override; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) wxOVERRIDE; - virtual bool ScrollLines(int lines) wxOVERRIDE; - virtual bool ScrollPages(int pages) wxOVERRIDE; + const wxRect* rect = NULL ) override; + virtual bool ScrollLines(int lines) override; + virtual bool ScrollPages(int pages) override; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; + virtual void SetDropTarget( wxDropTarget *dropTarget ) override; #endif // wxUSE_DRAG_AND_DROP - virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; - virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; + virtual void AddChild( wxWindowBase *child ) override; + virtual void RemoveChild( wxWindowBase *child ) override; - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; + virtual wxLayoutDirection GetLayoutDirection() const override; virtual wxCoord AdjustForLayoutDirection(wxCoord x, wxCoord width, - wxCoord widthTotal) const wxOVERRIDE; + wxCoord widthTotal) const override; - virtual bool DoIsExposed( int x, int y ) const wxOVERRIDE; - virtual bool DoIsExposed( int x, int y, int w, int h ) const wxOVERRIDE; + virtual bool DoIsExposed( int x, int y ) const override; + virtual bool DoIsExposed( int x, int y, int w, int h ) const override; - virtual void SetDoubleBuffered(bool on) wxOVERRIDE; - virtual bool IsDoubleBuffered() const wxOVERRIDE; + virtual void SetDoubleBuffered(bool on) override; + virtual bool IsDoubleBuffered() const override; // SetLabel(), which does nothing in wxWindow - virtual void SetLabel(const wxString& label) wxOVERRIDE { m_gtkLabel = label; } - virtual wxString GetLabel() const wxOVERRIDE { return m_gtkLabel; } + virtual void SetLabel(const wxString& label) override { m_gtkLabel = label; } + virtual wxString GetLabel() const override { return m_gtkLabel; } // implementation // -------------- - virtual WXWidget GetHandle() const wxOVERRIDE { return m_widget; } + virtual WXWidget GetHandle() const override { return m_widget; } // many important things are done here, this function must be called // regularly - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} @@ -376,28 +376,28 @@ protected: int *x, int *y, int *descent = NULL, int *externalLeading = NULL, - 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; + const wxFont *font = NULL) const override; + virtual void DoClientToScreen( int *x, int *y ) const override; + virtual void DoScreenToClient( int *x, int *y ) const override; + virtual void DoGetPosition( int *x, int *y ) const override; + virtual void DoGetSize( int *width, int *height ) const override; + virtual void DoGetClientSize( int *width, int *height ) const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoEnable(bool enable) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual void DoSetClientSize(int width, int height) override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoEnable(bool enable) override; #if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) override; #endif // wxUSE_MENUS_NATIVE - virtual void DoCaptureMouse() wxOVERRIDE; - virtual void DoReleaseMouse() wxOVERRIDE; + virtual void DoCaptureMouse() override; + virtual void DoReleaseMouse() override; - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; + virtual void DoFreeze() override; + virtual void DoThaw() override; void GTKConnectFreezeWidget(GtkWidget* widget); void GTKFreezeWidget(GtkWidget *w); @@ -405,7 +405,7 @@ protected: void GTKDisconnect(void* instance); #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; + virtual void DoSetToolTip( wxToolTip *tip ) override; #endif // wxUSE_TOOLTIPS // Create a GtkScrolledWindow containing the given widget (usually @@ -416,8 +416,8 @@ protected: // style. void GTKCreateScrolledWindowWith(GtkWidget* view); - virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move) wxOVERRIDE; - virtual bool DoNavigateIn(int flags) wxOVERRIDE; + virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move) override; + virtual bool DoNavigateIn(int flags) override; // Copies m_children tab order to GTK focus chain: diff --git a/include/wx/gtk1/private/addremovectrl.h b/include/wx/gtk1/private/addremovectrl.h index 3e25f6e88f..f068a0f0b6 100644 --- a/include/wx/gtk1/private/addremovectrl.h +++ b/include/wx/gtk1/private/addremovectrl.h @@ -56,7 +56,7 @@ public: } virtual void SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) wxOVERRIDE + const wxString& removetip) override { m_tbar->SetToolShortHelp(wxID_ADD, addtip); m_tbar->SetToolShortHelp(wxID_REMOVE, removetip); diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h index 66941c6bb0..4ea0883239 100644 --- a/include/wx/gtk1/stattext.h +++ b/include/wx/gtk1/stattext.h @@ -48,8 +48,8 @@ protected: int sizeFlags = wxSIZE_AUTO); virtual wxSize DoGetBestSize() const; - virtual wxString WXGetVisibleLabel() const wxOVERRIDE; - virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE; + virtual wxString WXGetVisibleLabel() const override; + virtual void WXSetVisibleLabel(const wxString& str) override; wxDECLARE_DYNAMIC_CLASS(wxStaticText); }; diff --git a/include/wx/hash.h b/include/wx/hash.h index b28738bacc..bd987a32a0 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -244,7 +244,7 @@ protected: // m_curr to it and m_currBucket to its bucket void GetNextNode( size_t bucketStart ); private: - virtual void DoDeleteContents( wxHashTableBase_Node* node ) wxOVERRIDE; + virtual void DoDeleteContents( wxHashTableBase_Node* node ) override; // current node Node* m_curr; @@ -275,7 +275,7 @@ private: eltype *Delete(long lhash, long key) \ { return (eltype*)DoDelete(key, lhash); } \ private: \ - virtual void DoDeleteContents( wxHashTableBase_Node* node ) wxOVERRIDE\ + virtual void DoDeleteContents( wxHashTableBase_Node* node ) override\ { delete (eltype*)node->GetData(); } \ \ wxDECLARE_NO_COPY_CLASS(hashclass); \ diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 1c09d722b6..2d7948c52f 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -459,16 +459,16 @@ private: #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG public: - wxIntegerHash() wxNOEXCEPT { } - size_t operator()( long x ) const wxNOEXCEPT { return longHash( x ); } - size_t operator()( unsigned long x ) const wxNOEXCEPT { return ulongHash( x ); } - size_t operator()( int x ) const wxNOEXCEPT { return intHash( x ); } - size_t operator()( unsigned int x ) const wxNOEXCEPT { return uintHash( x ); } - size_t operator()( short x ) const wxNOEXCEPT { return shortHash( x ); } - size_t operator()( unsigned short x ) const wxNOEXCEPT { return ushortHash( x ); } + wxIntegerHash() noexcept { } + size_t operator()( long x ) const noexcept { return longHash( x ); } + size_t operator()( unsigned long x ) const noexcept { return ulongHash( x ); } + size_t operator()( int x ) const noexcept { return intHash( x ); } + size_t operator()( unsigned int x ) const noexcept { return uintHash( x ); } + size_t operator()( short x ) const noexcept { return shortHash( x ); } + size_t operator()( unsigned short x ) const noexcept { return ushortHash( x ); } #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - size_t operator()( wxLongLong_t x ) const wxNOEXCEPT { return longlongHash(x); } - size_t operator()( wxULongLong_t x ) const wxNOEXCEPT { return longlongHash(x); } + size_t operator()( wxLongLong_t x ) const noexcept { return longlongHash(x); } + size_t operator()( wxULongLong_t x ) const noexcept { return longlongHash(x); } #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG }; @@ -477,16 +477,16 @@ public: // integer types struct WXDLLIMPEXP_BASE wxIntegerHash { - wxIntegerHash() wxNOEXCEPT { } - unsigned long operator()( long x ) const wxNOEXCEPT { return (unsigned long)x; } - unsigned long operator()( unsigned long x ) const wxNOEXCEPT { return x; } - unsigned long operator()( int x ) const wxNOEXCEPT { return (unsigned long)x; } - unsigned long operator()( unsigned int x ) const wxNOEXCEPT { return x; } - unsigned long operator()( short x ) const wxNOEXCEPT { return (unsigned long)x; } - unsigned long operator()( unsigned short x ) const wxNOEXCEPT { return x; } + wxIntegerHash() noexcept { } + unsigned long operator()( long x ) const noexcept { return (unsigned long)x; } + unsigned long operator()( unsigned long x ) const noexcept { return x; } + unsigned long operator()( int x ) const noexcept { return (unsigned long)x; } + unsigned long operator()( unsigned int x ) const noexcept { return x; } + unsigned long operator()( short x ) const noexcept { return (unsigned long)x; } + unsigned long operator()( unsigned short x ) const noexcept { return x; } #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - wxULongLong_t operator()( wxLongLong_t x ) const wxNOEXCEPT { return static_cast(x); } - wxULongLong_t operator()( wxULongLong_t x ) const wxNOEXCEPT { return x; } + wxULongLong_t operator()( wxLongLong_t x ) const noexcept { return static_cast(x); } + wxULongLong_t operator()( wxULongLong_t x ) const noexcept { return x; } #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG }; @@ -494,46 +494,46 @@ struct WXDLLIMPEXP_BASE wxIntegerHash struct WXDLLIMPEXP_BASE wxIntegerEqual { - wxIntegerEqual() wxNOEXCEPT { } - bool operator()( long a, long b ) const wxNOEXCEPT { return a == b; } - bool operator()( unsigned long a, unsigned long b ) const wxNOEXCEPT { return a == b; } - bool operator()( int a, int b ) const wxNOEXCEPT { return a == b; } - bool operator()( unsigned int a, unsigned int b ) const wxNOEXCEPT { return a == b; } - bool operator()( short a, short b ) const wxNOEXCEPT { return a == b; } - bool operator()( unsigned short a, unsigned short b ) const wxNOEXCEPT { return a == b; } + wxIntegerEqual() noexcept { } + bool operator()( long a, long b ) const noexcept { return a == b; } + bool operator()( unsigned long a, unsigned long b ) const noexcept { return a == b; } + bool operator()( int a, int b ) const noexcept { return a == b; } + bool operator()( unsigned int a, unsigned int b ) const noexcept { return a == b; } + bool operator()( short a, short b ) const noexcept { return a == b; } + bool operator()( unsigned short a, unsigned short b ) const noexcept { return a == b; } #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG - bool operator()( wxLongLong_t a, wxLongLong_t b ) const wxNOEXCEPT { return a == b; } - bool operator()( wxULongLong_t a, wxULongLong_t b ) const wxNOEXCEPT { return a == b; } + bool operator()( wxLongLong_t a, wxLongLong_t b ) const noexcept { return a == b; } + bool operator()( wxULongLong_t a, wxULongLong_t b ) const noexcept { return a == b; } #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG }; // pointers struct WXDLLIMPEXP_BASE wxPointerHash { - wxPointerHash() wxNOEXCEPT { } + wxPointerHash() noexcept { } #ifdef wxNEEDS_WX_HASH_MAP - wxUIntPtr operator()( const void* k ) const wxNOEXCEPT { return wxPtrToUInt(k); } + wxUIntPtr operator()( const void* k ) const noexcept { return wxPtrToUInt(k); } #else - size_t operator()( const void* k ) const wxNOEXCEPT { return (size_t)k; } + size_t operator()( const void* k ) const noexcept { return (size_t)k; } #endif }; struct WXDLLIMPEXP_BASE wxPointerEqual { - wxPointerEqual() wxNOEXCEPT { } - bool operator()( const void* a, const void* b ) const wxNOEXCEPT { return a == b; } + wxPointerEqual() noexcept { } + bool operator()( const void* a, const void* b ) const noexcept { return a == b; } }; // wxString, char*, wchar_t* struct WXDLLIMPEXP_BASE wxStringHash { - wxStringHash() wxNOEXCEPT {} - unsigned long operator()( const wxString& x ) const wxNOEXCEPT + wxStringHash() noexcept {} + unsigned long operator()( const wxString& x ) const noexcept { return stringHash( x.wx_str() ); } - unsigned long operator()( const wchar_t* x ) const wxNOEXCEPT + unsigned long operator()( const wchar_t* x ) const noexcept { return stringHash( x ); } - unsigned long operator()( const char* x ) const wxNOEXCEPT + unsigned long operator()( const char* x ) const noexcept { return stringHash( x ); } static unsigned long stringHash( const wchar_t* ); @@ -542,13 +542,13 @@ struct WXDLLIMPEXP_BASE wxStringHash struct WXDLLIMPEXP_BASE wxStringEqual { - wxStringEqual() wxNOEXCEPT {} - bool operator()( const wxString& a, const wxString& b ) const wxNOEXCEPT + wxStringEqual() noexcept {} + bool operator()( const wxString& a, const wxString& b ) const noexcept { return a == b; } - bool operator()( const wxChar* a, const wxChar* b ) const wxNOEXCEPT + bool operator()( const wxChar* a, const wxChar* b ) const noexcept { return wxStrcmp( a, b ) == 0; } #if wxUSE_UNICODE - bool operator()( const char* a, const char* b ) const wxNOEXCEPT + bool operator()( const char* a, const char* b ) const noexcept { return strcmp( a, b ) == 0; } #endif // wxUSE_UNICODE }; diff --git a/include/wx/headercol.h b/include/wx/headercol.h index 9397b141b3..5c488a5873 100644 --- a/include/wx/headercol.h +++ b/include/wx/headercol.h @@ -241,35 +241,35 @@ public: } // implement base class pure virtuals - virtual void SetTitle(const wxString& title) wxOVERRIDE { m_title = title; } - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } + virtual void SetTitle(const wxString& title) override { m_title = title; } + virtual wxString GetTitle() const override { return m_title; } - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE { m_bitmap = bitmap; } - wxBitmap GetBitmap() const wxOVERRIDE { wxFAIL_MSG("unreachable"); return wxNullBitmap; } - wxBitmapBundle GetBitmapBundle() const wxOVERRIDE { return m_bitmap; } + virtual void SetBitmap(const wxBitmapBundle& bitmap) override { m_bitmap = bitmap; } + wxBitmap GetBitmap() const override { wxFAIL_MSG("unreachable"); return wxNullBitmap; } + wxBitmapBundle GetBitmapBundle() const override { return m_bitmap; } - virtual void SetWidth(int width) wxOVERRIDE { m_width = width; } - virtual int GetWidth() const wxOVERRIDE { return m_width; } + virtual void SetWidth(int width) override { m_width = width; } + virtual int GetWidth() const override { return m_width; } - virtual void SetMinWidth(int minWidth) wxOVERRIDE { m_minWidth = minWidth; } - virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; } + virtual void SetMinWidth(int minWidth) override { m_minWidth = minWidth; } + virtual int GetMinWidth() const override { return m_minWidth; } - virtual void SetAlignment(wxAlignment align) wxOVERRIDE { m_align = align; } - virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_align; } + virtual void SetAlignment(wxAlignment align) override { m_align = align; } + virtual wxAlignment GetAlignment() const override { return m_align; } - virtual void SetFlags(int flags) wxOVERRIDE { m_flags = flags; } - virtual int GetFlags() const wxOVERRIDE { return m_flags; } + virtual void SetFlags(int flags) override { m_flags = flags; } + virtual int GetFlags() const override { return m_flags; } - virtual bool IsSortKey() const wxOVERRIDE { return m_sort; } - virtual void UnsetAsSortKey() wxOVERRIDE { m_sort = false; } + virtual bool IsSortKey() const override { return m_sort; } + virtual void UnsetAsSortKey() override { m_sort = false; } - virtual void SetSortOrder(bool ascending) wxOVERRIDE + virtual void SetSortOrder(bool ascending) override { m_sort = true; m_sortAscending = ascending; } - virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_sortAscending; } + virtual bool IsSortOrderAscending() const override { return m_sortAscending; } private: // common part of all ctors diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h index 3216890f99..be5ec62a5f 100644 --- a/include/wx/headerctrl.h +++ b/include/wx/headerctrl.h @@ -169,12 +169,12 @@ public: // ------------------------------- // the user doesn't need to TAB to this control - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } + virtual bool AcceptsFocusFromKeyboard() const override { 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) wxOVERRIDE; + virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) override; protected: // this method must be implemented by the derived classes to return the @@ -220,7 +220,7 @@ protected: protected: // this window doesn't look nice with the border so don't use it by default - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } private: // methods implementing our public API and defined in platform-specific @@ -340,8 +340,8 @@ public: protected: // implement/override base class methods - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE; - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE; + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const override; + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) override; // 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 @@ -417,7 +417,7 @@ public: unsigned int GetNewOrder() const { return m_order; } void SetNewOrder(unsigned int order) { m_order = order; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHeaderCtrlEvent(*this); } + virtual wxEvent *Clone() const override { 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 cad8d6458e..7ddfe6ff92 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() wxOVERRIDE; + bool DisplayContents() override; bool DisplayIndex(); bool KeywordSearch(const wxString& keyword, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE; + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) override; 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) ) 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 bool Initialize(const wxString& file, int WXUNUSED(server) ) override { return Initialize(file); } + virtual bool Initialize(const wxString& file) override; + virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) override {} + virtual bool LoadFile(const wxString& file = wxT("")) override; + virtual bool DisplaySection(int sectionNo) override; + virtual bool DisplaySection(const wxString& section) override { return Display(section); } + virtual bool DisplayBlock(long blockNo) override { return DisplaySection(blockNo); } + virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) override; virtual void SetFrameParameters(const wxString& titleFormat, const wxSize& size, const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = false) wxOVERRIDE; + bool newFrameEachTime = false) override; /// 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) wxOVERRIDE; + bool *newFrameEachTime = NULL) override; // Get direct access to help data: wxHtmlHelpData *GetHelpData() { return &m_helpData; } - virtual bool Quit() wxOVERRIDE ; - virtual void OnQuit() wxOVERRIDE {} + virtual bool Quit() override ; + virtual void OnQuit() override {} void OnCloseFrame(wxCloseEvent& evt); diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index ac25907dcc..fe9f013b4c 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 wxOVERRIDE { return m_shouldPreventAppExit; } + virtual bool ShouldPreventAppExit() const override { return m_shouldPreventAppExit; } protected: void Init(wxHtmlHelpData* data = NULL); diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index d1644060b9..b9d689bcfc 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -131,8 +131,8 @@ public: : m_wnd(wnd) {} - virtual wxColour GetSelectedTextColour(const wxColour& clr) wxOVERRIDE; - virtual wxColour GetSelectedTextBgColour(const wxColour& clr) wxOVERRIDE; + virtual wxColour GetSelectedTextColour(const wxColour& clr) override; + virtual wxColour GetSelectedTextBgColour(const wxColour& clr) override; private: const wxWindowBase* const m_wnd; @@ -425,15 +425,15 @@ 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) wxOVERRIDE; - virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const wxOVERRIDE; - virtual wxString ConvertToText(wxHtmlSelection *sel) const wxOVERRIDE; - bool IsLinebreakAllowed() const wxOVERRIDE { return m_allowLinebreak; } + wxHtmlRenderingInfo& info) override; + virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const override; + virtual wxString ConvertToText(wxHtmlSelection *sel) const override; + bool IsLinebreakAllowed() const override { return m_allowLinebreak; } void SetPreviousWord(wxHtmlWordCell *cell); protected: - virtual wxString GetDescription() const wxOVERRIDE; + virtual wxString GetDescription() const override; virtual wxString GetAllAsText() const { return m_Word; } @@ -470,8 +470,8 @@ public: {} protected: - virtual wxString GetAllAsText() const wxOVERRIDE; - virtual wxString GetPartAsText(int begin, int end) const wxOVERRIDE; + virtual wxString GetAllAsText() const override; + virtual wxString GetPartAsText(int begin, int end) const override; wxString m_wordOrig; size_t m_linepos; @@ -486,13 +486,13 @@ public: explicit wxHtmlContainerCell(wxHtmlContainerCell *parent); virtual ~wxHtmlContainerCell(); - virtual void Layout(int w) wxOVERRIDE; + virtual void Layout(int w) override; virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; - virtual bool AdjustPagebreak(int *pagebreak, int pageHeight) const wxOVERRIDE; + virtual bool AdjustPagebreak(int *pagebreak, int pageHeight) const override; // insert cell at the end of m_Cells list void InsertCell(wxHtmlCell *cell); @@ -531,26 +531,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 wxOVERRIDE; - virtual const wxHtmlCell* Find(int condition, const void* param) const wxOVERRIDE; + virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const override; + virtual const wxHtmlCell* Find(int condition, const void* param) const override; virtual bool ProcessMouseClick(wxHtmlWindowInterface *window, const wxPoint& pos, - const wxMouseEvent& event) wxOVERRIDE; + const wxMouseEvent& event) override; - virtual wxHtmlCell* GetFirstChild() const wxOVERRIDE { return m_Cells; } + virtual wxHtmlCell* GetFirstChild() const override { return m_Cells; } // returns last child cell: wxHtmlCell* GetLastChild() const { return m_LastCell; } // see comment in wxHtmlCell about this method - virtual bool IsTerminalCell() const wxOVERRIDE { return false; } + virtual bool IsTerminalCell() const override { return false; } virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y, - unsigned flags = wxHTML_FIND_EXACT) const wxOVERRIDE; + unsigned flags = wxHTML_FIND_EXACT) const override; - virtual wxHtmlCell *GetFirstTerminal() const wxOVERRIDE; - virtual wxHtmlCell *GetLastTerminal() const wxOVERRIDE; + virtual wxHtmlCell *GetFirstTerminal() const override; + virtual wxHtmlCell *GetLastTerminal() const override; // Removes indentation on top or bottom of the container (i.e. above or @@ -559,9 +559,9 @@ public: // Returns the maximum possible length of the container. // Call Layout at least once before using GetMaxTotalWidth() - virtual int GetMaxTotalWidth() const wxOVERRIDE { return m_MaxTotalWidth; } + virtual int GetMaxTotalWidth() const override { return m_MaxTotalWidth; } - virtual wxString Dump(int indent = 0) const wxOVERRIDE; + virtual wxString Dump(int indent = 0) const override; protected: void UpdateRenderingStatePre(wxHtmlRenderingInfo& info, @@ -612,11 +612,11 @@ 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) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; - virtual wxString GetDescription() const wxOVERRIDE; + virtual wxString GetDescription() const override; protected: wxColour m_Colour; @@ -639,11 +639,11 @@ 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) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; - virtual wxString GetDescription() const wxOVERRIDE; + virtual wxString GetDescription() const override; protected: wxFont m_Font; @@ -674,10 +674,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) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info) wxOVERRIDE; - virtual void Layout(int w) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; + virtual void Layout(int w) override; protected: wxWindow* m_Wnd; diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h index 4340fd3c72..bd85c482c6 100644 --- a/include/wx/html/htmlfilt.h +++ b/include/wx/html/htmlfilt.h @@ -55,8 +55,8 @@ class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText); public: - virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE; - virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE; + virtual bool CanRead(const wxFSFile& file) const override; + virtual wxString ReadFile(const wxFSFile& file) const override; }; //-------------------------------------------------------------------------------- @@ -69,8 +69,8 @@ class wxHtmlFilterHTML : public wxHtmlFilter wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML); public: - virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE; - virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE; + virtual bool CanRead(const wxFSFile& file) const override; + virtual wxString ReadFile(const wxFSFile& file) const override; }; diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index ebc5695dbc..7d64cdcb0d 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() wxOVERRIDE; + virtual void OnInternalIdle() override; /// Returns standard HTML cursor as used by wxHtmlWindow static wxCursor GetDefaultHTMLCursor(HTMLCursor type); @@ -450,19 +450,19 @@ protected: public: // wxHtmlWindowInterface methods: - virtual void SetHTMLWindowTitle(const wxString& title) wxOVERRIDE; - virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) wxOVERRIDE; + virtual void SetHTMLWindowTitle(const wxString& title) override; + virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) override; virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, const wxString& url, - wxString *redirect) const wxOVERRIDE; + wxString *redirect) const override; virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, - 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 wxBitmapBundle& bmpBg) wxOVERRIDE; - virtual void SetHTMLStatusText(const wxString& text) wxOVERRIDE; - virtual wxCursor GetHTMLCursor(HTMLCursor type) const wxOVERRIDE; + const wxPoint& pos) const override; + virtual wxWindow* GetHTMLWindow() override; + virtual wxColour GetHTMLBackgroundColour() const override; + virtual void SetHTMLBackgroundColour(const wxColour& clr) override; + virtual void SetHTMLBackgroundImage(const wxBitmapBundle& bmpBg) override; + virtual void SetHTMLStatusText(const wxString& text) override; + virtual wxCursor GetHTMLCursor(HTMLCursor type) const override; // implementation of SetPage() bool DoSetPage(const wxString& source); @@ -595,7 +595,7 @@ public: bool GetLinkClicked() const { return m_bLinkWasClicked; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHtmlCellEvent(*this); } + virtual wxEvent *Clone() const override { return new wxHtmlCellEvent(*this); } private: wxHtmlCell *m_cell; @@ -626,7 +626,7 @@ public: const wxHtmlLinkInfo &GetLinkInfo() const { return m_linkInfo; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHtmlLinkEvent(*this); } + virtual wxEvent *Clone() const override { return new wxHtmlLinkEvent(*this); } private: wxHtmlLinkInfo m_linkInfo; diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index 00a318983d..0c746276c0 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -159,11 +159,11 @@ public: void SetMargins(const wxPageSetupDialogData& pageSetupData); // wxPrintout stuff: - 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; + bool OnPrintPage(int page) override; + bool HasPage(int page) override; + void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override; + bool OnBeginDocument(int startPage, int endPage) override; + void OnPreparePrinting() override; // Adds input filter static void AddFilter(wxHtmlFilter *filter); diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h index 8001c8680a..d1b643e392 100644 --- a/include/wx/html/m_templ.h +++ b/include/wx/html/m_templ.h @@ -31,7 +31,7 @@ I STRONGLY recommend reading and understanding these macros!! class wxHTML_Handler_##name : public wxHtmlWinTagHandler \ { \ public: \ - wxString GetSupportedTags() wxOVERRIDE {return wxT(tags);} + wxString GetSupportedTags() override {return wxT(tags);} @@ -45,7 +45,7 @@ I STRONGLY recommend reading and understanding these macros!! #define TAG_HANDLER_PROC(varib) \ public: \ - bool HandleTag(const wxHtmlTag& varib) wxOVERRIDE + bool HandleTag(const wxHtmlTag& varib) override @@ -60,7 +60,7 @@ I STRONGLY recommend reading and understanding these macros!! { \ wxDECLARE_DYNAMIC_CLASS(wxHTML_Module##name ); \ public: \ - void FillHandlersTable(wxHtmlWinParser *parser) wxOVERRIDE \ + void FillHandlersTable(wxHtmlWinParser *parser) override \ { diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 97d5a87f02..9cde03d074 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) wxOVERRIDE; - virtual void DoneParser() wxOVERRIDE; - virtual wxObject* GetProduct() wxOVERRIDE; + virtual void InitParser(const wxString& source) override; + virtual void DoneParser() override; + virtual wxObject* GetProduct() override; - virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const wxOVERRIDE; + virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const override; // 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) wxOVERRIDE; + virtual void AddText(const wxString& txt) override; 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) wxOVERRIDE {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} + virtual void SetParser(wxHtmlParser *parser) override {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() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; // 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 9705a833cd..5ca51ad202 100644 --- a/include/wx/htmllbox.h +++ b/include/wx/htmllbox.h @@ -72,10 +72,10 @@ public: virtual ~wxHtmlListBox(); // override some base class virtuals - 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; + virtual void RefreshRow(size_t line) override; + virtual void RefreshRows(size_t from, size_t to) override; + virtual void RefreshAll() override; + virtual void SetItemCount(size_t count) override; #if wxUSE_FILESYSTEM // retrieve the file system used by the wxHtmlWinParser: if you use @@ -84,7 +84,7 @@ public: const wxFileSystem& GetFileSystem() const { return m_filesystem; } #endif // wxUSE_FILESYSTEM - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; protected: // this method must be implemented in the derived class and should return @@ -111,11 +111,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 wxOVERRIDE; - virtual wxCoord OnMeasureItem(size_t n) const wxOVERRIDE; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const override; + virtual wxCoord OnMeasureItem(size_t n) const override; // override this one to draw custom background for selected items correctly - virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; + virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const override; // this method may be overridden to handle clicking on a link in the // listbox (by default, clicks on links are simply ignored) @@ -135,19 +135,19 @@ protected: private: // wxHtmlWindowInterface methods: - virtual void SetHTMLWindowTitle(const wxString& title) wxOVERRIDE; - virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) wxOVERRIDE; + virtual void SetHTMLWindowTitle(const wxString& title) override; + virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) override; virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, const wxString& url, - wxString *redirect) const wxOVERRIDE; + wxString *redirect) const override; virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, - 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 wxBitmapBundle& bmpBg) wxOVERRIDE; - virtual void SetHTMLStatusText(const wxString& text) wxOVERRIDE; - virtual wxCursor GetHTMLCursor(HTMLCursor type) const wxOVERRIDE; + const wxPoint& pos) const override; + virtual wxWindow* GetHTMLWindow() override; + virtual wxColour GetHTMLBackgroundColour() const override; + virtual void SetHTMLBackgroundColour(const wxColour& clr) override; + virtual void SetHTMLBackgroundImage(const wxBitmapBundle& bmpBg) override; + virtual void SetHTMLStatusText(const wxString& text) override; + virtual wxCursor GetHTMLCursor(HTMLCursor type) const override; // returns index of item that contains given HTML cell size_t GetItemForCell(const wxHtmlCell *cell) const; @@ -255,58 +255,58 @@ public: // these must be overloaded otherwise the compiler will complain // about wxItemContainerImmutable::[G|S]etSelection being pure virtuals... - void SetSelection(int n) wxOVERRIDE + void SetSelection(int n) override { wxVListBox::SetSelection(n); } - int GetSelection() const wxOVERRIDE + int GetSelection() const override { return wxVListBox::GetSelection(); } // accessing strings // ----------------- - virtual unsigned int GetCount() const wxOVERRIDE + virtual unsigned int GetCount() const override { return static_cast(m_items.GetCount()); } - virtual wxString GetString(unsigned int n) const wxOVERRIDE; + virtual wxString GetString(unsigned int n) const override; // override default unoptimized wxItemContainer::GetStrings() function wxArrayString GetStrings() const { return m_items; } - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual void SetString(unsigned int n, const wxString& s) override; // resolve ambiguity between wxItemContainer and wxVListBox versions - void Clear() wxOVERRIDE; + void Clear() override; protected: virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE + virtual void DoSetItemClientData(unsigned int n, void *clientData) override { m_HTMLclientData[n] = clientData; } - virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE + virtual void *DoGetItemClientData(unsigned int n) const override { return m_HTMLclientData[n]; } // wxItemContainer methods - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; // 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) wxOVERRIDE + virtual void SetItemCount(size_t count) override { wxHtmlListBox::SetItemCount(count); } virtual void SetRowCount(size_t count) { wxHtmlListBox::SetRowCount(count); } - virtual wxString OnGetItem(size_t n) const wxOVERRIDE + virtual wxString OnGetItem(size_t n) const override { return m_items[n]; } - virtual void InitEvent(wxCommandEvent& event, int n) wxOVERRIDE + virtual void InitEvent(wxCommandEvent& event, int n) override { // 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 d635f0350e..127f19291d 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() wxOVERRIDE { return true; } + virtual bool HasTransparentBackground() override { return true; } protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // checks for validity some of the ctor/Create() function parameters void CheckParams(const wxString& label, const wxString& url, long style); @@ -113,7 +113,7 @@ public: void SetURL(const wxString &url) { m_url=url; } // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxHyperlinkEvent(*this); } + virtual wxEvent *Clone() const override { return new wxHyperlinkEvent(*this); } private: diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index ffe152a0a5..36c40e7c41 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -111,8 +111,8 @@ public: bool IsEmpty() const { return GetIconCount() == 0; } protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: // delete all icons diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 3184cf5f37..2848ef63b9 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 ) wxOVERRIDE; - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; bool SaveDib(wxImage *image, wxOutputStream& stream, bool verbose, bool IsBmp, bool IsMask); bool LoadDib(wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp); @@ -82,13 +82,13 @@ public: } #if wxUSE_STREAMS - 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 SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ); protected: - virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual int DoGetImageCount( wxInputStream& stream ) override; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif // wxUSE_STREAMS private: @@ -117,7 +117,7 @@ public: protected: #if wxUSE_STREAMS - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif // wxUSE_STREAMS private: @@ -140,12 +140,12 @@ public: #if wxUSE_STREAMS - 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; + virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ) override{return false ;} + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; protected: - virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual int DoGetImageCount( wxInputStream& stream ) override; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif // wxUSE_STREAMS private: diff --git a/include/wx/image.h b/include/wx/image.h index dbbd0f9acb..7358bb7368 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -603,8 +603,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 wxOVERRIDE; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE; + virtual wxObjectRefData* CreateRefData() const override; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const override; // Helper function used internally by wxImage class only. template diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h index 48b07dc147..fb052310ee 100644 --- a/include/wx/imaggif.h +++ b/include/wx/imaggif.h @@ -42,17 +42,17 @@ public: #if wxUSE_STREAMS virtual bool LoadFile(wxImage *image, wxInputStream& stream, - bool verbose = true, int index = -1) wxOVERRIDE; + bool verbose = true, int index = -1) override; virtual bool SaveFile(wxImage *image, wxOutputStream& stream, - bool verbose=true) wxOVERRIDE; + bool verbose=true) override; // Save animated gif bool SaveAnimation(const wxImageArray& images, wxOutputStream *stream, bool verbose = true, int delayMilliSecs = 1000); protected: - virtual int DoGetImageCount(wxInputStream& stream) wxOVERRIDE; - virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; + virtual int DoGetImageCount(wxInputStream& stream) override; + virtual bool DoCanRead(wxInputStream& stream) override; 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 78c6561088..81f84e98b2 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) wxOVERRIDE; - virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true) wxOVERRIDE; + virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1) override; + virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true) override; protected: - virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; + virtual bool DoCanRead(wxInputStream& stream) override; #endif wxDECLARE_DYNAMIC_CLASS(wxIFFHandler); diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h index 342aa7e99c..06594324f2 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 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif private: diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h index 210bbb3233..aa144029c6 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 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif // wxUSE_STREAMS private: diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h index e30cf73845..ae4155b734 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 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif private: diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h index 0f3f460ad8..ab8f6fce57 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 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif private: diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h index 0c2c7d0a0d..f080838235 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) wxOVERRIDE; + bool verbose = true, int index = -1) override; virtual bool SaveFile(wxImage* image, wxOutputStream& stream, - bool verbose = true) wxOVERRIDE; + bool verbose = true) override; protected: - virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE; + virtual bool DoCanRead(wxInputStream& stream) override; #endif // wxUSE_STREAMS wxDECLARE_DYNAMIC_CLASS(wxTGAHandler); diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 0c7be8884a..4442cbfb21 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 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; protected: - virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE; - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual int DoGetImageCount( wxInputStream& stream ) override; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif private: diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h index 1af34875e4..ef871529eb 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 ) wxOVERRIDE; - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE; + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) override; + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) override; protected: - virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE; + virtual bool DoCanRead( wxInputStream& stream ) override; #endif private: diff --git a/include/wx/list.h b/include/wx/list.h index b11d1702e5..e93b3b43ff 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -659,7 +659,7 @@ private: { wxNodeBase::SetData(data); } \ \ protected: \ - virtual void DeleteData() wxOVERRIDE; \ + virtual void DeleteData() override; \ \ wxDECLARE_NO_COPY_CLASS(nodetype); \ }; \ @@ -747,7 +747,7 @@ private: virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \ void *data, \ const wxListKey& key = wxDefaultListKey) \ - wxOVERRIDE \ + override \ { \ return new nodetype(this, \ (nodetype *)prev, (nodetype *)next, \ diff --git a/include/wx/listbase.h b/include/wx/listbase.h index 9b200d1412..2082c6a016 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -472,7 +472,7 @@ protected: virtual void DoUpdateImages(int which) = 0; // Overridden methods of the base class. - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // these functions are only used for virtual list view controls, i.e. the // ones with wxLC_VIRTUAL style @@ -562,7 +562,7 @@ public: bool IsEditCancelled() const { return m_editCancelled; } void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxListEvent(*this); } + virtual wxEvent *Clone() const override { 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 4a4d7a660f..a9f7f90f23 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -61,32 +61,32 @@ public: // overridden base class methods - 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 SetPageText(size_t n, const wxString& strText) override; + virtual wxString GetPageText(size_t n) const override; + virtual int GetPageImage(size_t n) const override; + virtual bool SetPageImage(size_t n, int imageId) override; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, bool bSelect = false, - 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; + int imageId = NO_IMAGE) override; + virtual int SetSelection(size_t n) override { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) override { return DoSetSelection(n); } + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; - virtual bool DeleteAllPages() wxOVERRIDE; + virtual bool DeleteAllPages() override; wxListView* GetListView() const { return (wxListView*)m_bookctrl; } protected: - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; + virtual wxWindow *DoRemovePage(size_t page) override; - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; - void UpdateSelectedPage(size_t newsel) wxOVERRIDE; + void UpdateSelectedPage(size_t newsel) override; - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; + wxBookCtrlEvent* CreatePageChangingEvent() const override; + void MakeChangedEvent(wxBookCtrlEvent &event) override; // event handlers void OnListSelected(wxListEvent& event); diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 69525e219f..59b7ab739b 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) wxOVERRIDE; + virtual void SetSelection(int n) override; void SetSelection(int n, bool select) { DoSetSelection(n, select); } void Deselect(int n) { DoSetSelection(n, false); } void DeselectAll(int itemToLeaveSelected = -1); @@ -87,11 +87,11 @@ public: } // override wxItemContainer::IsSorted - virtual bool IsSorted() const wxOVERRIDE { return HasFlag( wxLB_SORT ); } + virtual bool IsSorted() const override { return HasFlag( wxLB_SORT ); } // emulate selecting or deselecting the item event.GetInt() (depending on // event.GetExtraLong()) - void Command(wxCommandEvent& event) wxOVERRIDE; + void Command(wxCommandEvent& event) override; // 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 60e7a73cdc..644c0a44cf 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -661,10 +661,10 @@ public: // show the buffer contents to the user in the best possible way (this uses // wxMessageOutputMessageBox) and clear it - virtual void Flush() wxOVERRIDE; + virtual void Flush() override; protected: - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE; + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) override; private: wxString m_str; @@ -684,7 +684,7 @@ public: protected: // implement sink function - virtual void DoLogText(const wxString& msg) wxOVERRIDE; + virtual void DoLogText(const wxString& msg) override; wxDECLARE_NO_COPY_CLASS(wxLogStderr); }; @@ -702,7 +702,7 @@ public: protected: // implement sink function - virtual void DoLogText(const wxString& msg) wxOVERRIDE; + virtual void DoLogText(const wxString& msg) override; // using ptr here to avoid including from this file wxSTD ostream *m_ostr; @@ -771,7 +771,7 @@ public: wxLog *GetOldLog() const { return m_logOld; } // override base class version to flush the old logger as well - virtual void Flush() wxOVERRIDE; + virtual void Flush() override; // call to avoid destroying the old log target void DetachOldLog() { m_logOld = NULL; } @@ -780,7 +780,7 @@ protected: // pass the record to the old logger if needed virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE; + const wxLogRecordInfo& info) override; private: // the current log target diff --git a/include/wx/lzmastream.h b/include/wx/lzmastream.h index 9bd2ab1bab..ef64cbab9a 100644 --- a/include/wx/lzmastream.h +++ b/include/wx/lzmastream.h @@ -60,12 +60,12 @@ public: Init(); } - char Peek() wxOVERRIDE { return wxInputStream::Peek(); } - wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); } + char Peek() override { return wxInputStream::Peek(); } + wxFileOffset GetLength() const override { return wxInputStream::GetLength(); } protected: - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + size_t OnSysRead(void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { return m_pos; } private: void Init(); @@ -93,13 +93,13 @@ public: virtual ~wxLZMAOutputStream() { Close(); } - void Sync() wxOVERRIDE { DoFlush(false); } - bool Close() wxOVERRIDE; - wxFileOffset GetLength() const wxOVERRIDE { return m_pos; } + void Sync() override { DoFlush(false); } + bool Close() override; + wxFileOffset GetLength() const override { return m_pos; } protected: - size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + size_t OnSysWrite(const void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { return m_pos; } private: void Init(int level); @@ -126,17 +126,17 @@ class WXDLLIMPEXP_BASE wxLZMAClassFactory: public wxFilterClassFactory public: wxLZMAClassFactory(); - wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE + wxFilterInputStream *NewStream(wxInputStream& stream) const override { return new wxLZMAInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE + wxFilterOutputStream *NewStream(wxOutputStream& stream) const override { return new wxLZMAOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE + wxFilterInputStream *NewStream(wxInputStream *stream) const override { return new wxLZMAInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE + wxFilterOutputStream *NewStream(wxOutputStream *stream) const override { return new wxLZMAOutputStream(stream, -1); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; + = wxSTREAM_PROTOCOL) const override; private: wxDECLARE_DYNAMIC_CLASS(wxLZMAClassFactory); diff --git a/include/wx/mdi.h b/include/wx/mdi.h index 75eeaf44b3..0a913222e7 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) wxOVERRIDE; + virtual bool TryBefore(wxEvent& event) override; // This is wxMDIClientWindow for all the native implementations but not for @@ -177,12 +177,12 @@ 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 wxOVERRIDE { return false; } + virtual bool IsTopLevel() const override { 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(NavigationKind kind) const wxOVERRIDE + virtual bool IsTopNavigationDomain(NavigationKind kind) const override { switch ( kind ) { @@ -201,7 +201,7 @@ public: // 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() wxOVERRIDE { Activate(); } + virtual void Raise() override { Activate(); } protected: wxMDIParentFrame *m_mdiParent; @@ -224,16 +224,16 @@ public: long WXUNUSED(style) = 1, wxWindowID WXUNUSED(id) = 1, const wxString& WXUNUSED(name) - = wxEmptyString) wxOVERRIDE + = wxEmptyString) override { return NULL; } - virtual wxStatusBar *GetStatusBar() const wxOVERRIDE + virtual wxStatusBar *GetStatusBar() const override { return NULL; } virtual void SetStatusText(const wxString &WXUNUSED(text), - int WXUNUSED(number)=0) wxOVERRIDE + int WXUNUSED(number)=0) override { } virtual void SetStatusWidths(int WXUNUSED(n), - const int WXUNUSED(widths)[]) wxOVERRIDE + const int WXUNUSED(widths)[]) override { } #endif // wxUSE_STATUSBAR @@ -243,29 +243,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)) wxOVERRIDE + const wxString& WXUNUSED(name)) override { return NULL; } - virtual wxToolBar *GetToolBar() const wxOVERRIDE { return NULL; } + virtual wxToolBar *GetToolBar() const override { return NULL; } #endif // wxUSE_TOOLBAR // no icon - virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) wxOVERRIDE { } + virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) override { } // title is used as the tab label - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - virtual void SetTitle(const wxString& title) wxOVERRIDE = 0; + virtual wxString GetTitle() const override { return m_title; } + virtual void SetTitle(const wxString& title) override = 0; // no maximize etc - 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 void Maximize(bool WXUNUSED(maximize) = true) override { } + virtual bool IsMaximized() const override { return true; } + virtual bool IsAlwaysMaximized() const override { return true; } + virtual void Iconize(bool WXUNUSED(iconize) = true) override { } + virtual bool IsIconized() const override { return false; } + virtual void Restore() override { } virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style)) wxOVERRIDE { return false; } - virtual bool IsFullScreen() const wxOVERRIDE { return false; } + long WXUNUSED(style)) override { return false; } + virtual bool IsFullScreen() const override { return false; } // we need to override these functions to ensure that a child window is @@ -273,55 +273,55 @@ public: // behave as just a wxWindow by short-circuiting wxTLW changes to the base // class behaviour - virtual void AddChild(wxWindowBase *child) wxOVERRIDE { wxWindow::AddChild(child); } + virtual void AddChild(wxWindowBase *child) override { wxWindow::AddChild(child); } - virtual bool Destroy() wxOVERRIDE { return wxWindow::Destroy(); } + virtual bool Destroy() override { return wxWindow::Destroy(); } // extra platform-specific hacks #ifdef __WXMSW__ - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override { return wxWindow::MSWGetStyle(flags, exstyle); } - virtual WXHWND MSWGetParent() const wxOVERRIDE + virtual WXHWND MSWGetParent() const override { return wxWindow::MSWGetParent(); } - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE + WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) override { return wxWindow::MSWWindowProc(message, wParam, lParam); } #endif // __WXMSW__ protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE + virtual void DoGetSize(int *width, int *height) const override { wxWindow::DoGetSize(width, height); } - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) override { wxWindow::DoSetSize(x, y, width, height, sizeFlags); } - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE + virtual void DoGetClientSize(int *width, int *height) const override { wxWindow::DoGetClientSize(width, height); } - virtual void DoSetClientSize(int width, int height) wxOVERRIDE + virtual void DoSetClientSize(int width, int height) override { wxWindow::DoSetClientSize(width, height); } - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE + virtual void DoMoveWindow(int x, int y, int width, int height) override { wxWindow::DoMoveWindow(x, y, width, height); } - virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE + virtual void DoGetScreenPosition(int *x, int *y) const override { wxWindow::DoGetScreenPosition(x, y); } @@ -329,7 +329,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)) wxOVERRIDE { } + int WXUNUSED(incW), int WXUNUSED(incH)) override { } wxString m_title; }; diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index ff159817ee..123967d287 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -108,7 +108,7 @@ public: // Allocates a copy of this object. // Required for wxEvtHandler::AddPendingEvent // ------------------------------------------------------------------------ - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxMediaEvent(*this); } @@ -217,8 +217,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) wxOVERRIDE; - wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int w, int h) override; + wxSize DoGetBestSize() const override; class wxMediaBackend* m_imp; bool m_bLoaded; diff --git a/include/wx/memtext.h b/include/wx/memtext.h index 86ff7760d0..39d553826f 100644 --- a/include/wx/memtext.h +++ b/include/wx/memtext.h @@ -27,21 +27,21 @@ public: wxMemoryText(const wxString& name) : wxTextBuffer(name) { } protected: - virtual bool OnExists() const wxOVERRIDE + virtual bool OnExists() const override { return false; } virtual bool OnOpen(const wxString & WXUNUSED(strBufferName), - wxTextBufferOpenMode WXUNUSED(OpenMode)) wxOVERRIDE + wxTextBufferOpenMode WXUNUSED(OpenMode)) override { return true; } - virtual bool OnClose() wxOVERRIDE + virtual bool OnClose() override { return true; } - virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) wxOVERRIDE + virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) override { return true; } virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew), - const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) wxOVERRIDE + const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) override { return true; } private: diff --git a/include/wx/menu.h b/include/wx/menu.h index 1ab139de20..41fd019962 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -547,17 +547,17 @@ public: virtual void Detach(); // need to override these ones to avoid virtual function hiding - 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(); } + virtual bool Enable(bool enable = true) override { return wxWindow::Enable(enable); } + virtual void SetLabel(const wxString& s) override { wxWindow::SetLabel(s); } + virtual wxString GetLabel() const override { return wxWindow::GetLabel(); } // don't want menu bars to accept the focus by tabbing to them - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } + virtual bool AcceptsFocusFromKeyboard() const override { return false; } // update all menu item states in all menus virtual void UpdateMenus(); - virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; } + virtual bool CanBeOutsideClientArea() const override { return true; } #if wxUSE_EXTENDED_RTTI // XTI helpers: diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 3606e0e416..f8be3e2f72 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -105,8 +105,8 @@ public: // Title and caption are the same thing, GetCaption() mostly exists just // for compatibility. - virtual void SetTitle(const wxString& title) wxOVERRIDE { m_caption = title; } - virtual wxString GetTitle() const wxOVERRIDE { return m_caption; } + virtual void SetTitle(const wxString& title) override { m_caption = title; } + virtual wxString GetTitle() const override { return m_caption; } virtual void SetMessage(const wxString& message) diff --git a/include/wx/msgout.h b/include/wx/msgout.h index c687661c41..96b0d527a0 100644 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -97,7 +97,7 @@ public: wxMessageOutputStderr(FILE *fp = stderr, const wxMBConv &conv = wxConvWhateverWorks); - virtual void Output(const wxString& str) wxOVERRIDE; + virtual void Output(const wxString& str) override; protected: FILE *m_fp; @@ -122,7 +122,7 @@ public: wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR) : m_flags(flags) { } - virtual void Output(const wxString& str) wxOVERRIDE; + virtual void Output(const wxString& str) override; private: wxMessageOutputFlags m_flags; @@ -139,7 +139,7 @@ class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput public: wxMessageOutputMessageBox() { } - virtual void Output(const wxString& str) wxOVERRIDE; + virtual void Output(const wxString& str) override; }; #endif // wxUSE_GUI && wxUSE_MSGDLG @@ -153,7 +153,7 @@ class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr public: wxMessageOutputDebug() { } - virtual void Output(const wxString& str) wxOVERRIDE; + virtual void Output(const wxString& str) override; }; // ---------------------------------------------------------------------------- @@ -165,7 +165,7 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput public: wxMessageOutputLog() { } - virtual void Output(const wxString& str) wxOVERRIDE; + virtual void Output(const wxString& str) override; }; #endif // _WX_MSGOUT_H_ diff --git a/include/wx/mstream.h b/include/wx/mstream.h index b4e7303eaa..d3ea88b1ce 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -36,20 +36,20 @@ public: } virtual ~wxMemoryInputStream(); - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_length; } - virtual bool IsSeekable() const wxOVERRIDE { return true; } + virtual wxFileOffset GetLength() const override { return m_length; } + virtual bool IsSeekable() const override { return true; } - virtual char Peek() wxOVERRIDE; - virtual bool CanRead() const wxOVERRIDE; + virtual char Peek() override; + virtual bool CanRead() const override; wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } protected: wxStreamBuffer *m_i_streambuf; - size_t OnSysRead(void *buffer, size_t nbytes) wxOVERRIDE; - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; + size_t OnSysRead(void *buffer, size_t nbytes) override; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + wxFileOffset OnSysTell() const override; 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 wxOVERRIDE { return m_o_streambuf->GetLastAccess(); } - virtual bool IsSeekable() const wxOVERRIDE { return true; } + virtual wxFileOffset GetLength() const override { return m_o_streambuf->GetLastAccess(); } + virtual bool IsSeekable() const override { 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) wxOVERRIDE; - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; + size_t OnSysWrite(const void *buffer, size_t nbytes) override; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + wxFileOffset OnSysTell() const override; wxDECLARE_DYNAMIC_CLASS(wxMemoryOutputStream); wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream); diff --git a/include/wx/msw/anybutton.h b/include/wx/msw/anybutton.h index be548f4468..26329cef3f 100644 --- a/include/wx/msw/anybutton.h +++ b/include/wx/msw/anybutton.h @@ -28,30 +28,30 @@ public: virtual ~wxAnyButton(); // overridden base class methods - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour &colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour &colour) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual bool SetBackgroundColour(const wxColour &colour) override; + virtual bool SetForegroundColour(const wxColour &colour) override; // implementation from now on - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE; + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: // usually overridden base class virtuals - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) wxOVERRIDE; - virtual wxSize DoGetBitmapMargins() const wxOVERRIDE; - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; + virtual wxBitmap DoGetBitmap(State which) const override; + virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) override; + virtual wxSize DoGetBitmapMargins() const override; + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) override; + virtual void DoSetBitmapPosition(wxDirection dir) override; #if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP // Increases the passed in size to account for the button image. diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index 6a8c8baf0d..5ece28e3b0 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -29,12 +29,12 @@ public: virtual ~wxApp(); // override base class (pure) virtuals - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; - virtual void CleanUp() wxOVERRIDE; + virtual bool Initialize(int& argc, wxChar **argv) override; + virtual void CleanUp() override; - virtual void WakeUpIdle() wxOVERRIDE; + virtual void WakeUpIdle() override; - virtual void SetPrintMode(int mode) wxOVERRIDE { m_printMode = mode; } + virtual void SetPrintMode(int mode) override { m_printMode = mode; } virtual int GetPrintMode() const { return m_printMode; } // implementation only @@ -43,7 +43,7 @@ public: void OnQueryEndSession(wxCloseEvent& event); #if wxUSE_EXCEPTIONS - virtual bool OnExceptionInMainLoop() wxOVERRIDE; + virtual bool OnExceptionInMainLoop() override; #endif // wxUSE_EXCEPTIONS // MSW-specific from now on diff --git a/include/wx/msw/appprogress.h b/include/wx/msw/appprogress.h index 0840c075d4..5926a3032c 100644 --- a/include/wx/msw/appprogress.h +++ b/include/wx/msw/appprogress.h @@ -21,12 +21,12 @@ public: wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100); virtual ~wxAppProgressIndicator(); - virtual bool IsAvailable() const wxOVERRIDE; + virtual bool IsAvailable() const override; - virtual void SetValue(int value) wxOVERRIDE; - virtual void SetRange(int range) wxOVERRIDE; - virtual void Pulse() wxOVERRIDE; - virtual void Reset() wxOVERRIDE; + virtual void SetValue(int value) override; + virtual void SetRange(int range) override; + virtual void Pulse() override; + virtual void Reset() override; private: int m_maxValue; diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h index 2dea2f5eed..b056409f7d 100644 --- a/include/wx/msw/apptbase.h +++ b/include/wx/msw/apptbase.h @@ -63,7 +63,7 @@ public: // implement this base class function for both console and GUI applications virtual bool SafeMessageBox(const wxString& text, - const wxString& title) wxOVERRIDE; + const wxString& title) override; protected: #if wxUSE_THREADS diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h index 4f96bfbd1a..0f63592f39 100644 --- a/include/wx/msw/apptrait.h +++ b/include/wx/msw/apptrait.h @@ -18,19 +18,19 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; - virtual void *BeforeChildWaitLoop() wxOVERRIDE; - virtual void AfterChildWaitLoop(void *data) wxOVERRIDE; + virtual wxEventLoopBase *CreateEventLoop() override; + virtual void *BeforeChildWaitLoop() override; + virtual void AfterChildWaitLoop(void *data) override; #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) override; #endif // wxUSE_TIMER #if wxUSE_THREADS - virtual bool DoMessageFromThreadWait() wxOVERRIDE; - virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) wxOVERRIDE; + virtual bool DoMessageFromThreadWait() override; + virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) override; #endif // wxUSE_THREADS - virtual bool CanUseStderr() wxOVERRIDE { return true; } - virtual bool WriteToStderr(const wxString& text) wxOVERRIDE; - virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; } + virtual bool CanUseStderr() override { return true; } + virtual bool WriteToStderr(const wxString& text) override; + virtual WXHWND GetMainHWND() const override { return NULL; } }; #if wxUSE_GUI @@ -40,23 +40,23 @@ public: class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; - virtual void *BeforeChildWaitLoop() wxOVERRIDE; - virtual void AfterChildWaitLoop(void *data) wxOVERRIDE; + virtual wxEventLoopBase *CreateEventLoop() override; + virtual void *BeforeChildWaitLoop() override; + virtual void AfterChildWaitLoop(void *data) override; #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) override; #endif // wxUSE_TIMER #if wxUSE_THREADS - virtual bool DoMessageFromThreadWait() wxOVERRIDE; - virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) wxOVERRIDE; + virtual bool DoMessageFromThreadWait() override; + virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) override; #endif // wxUSE_THREADS wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL, - int *microVer = NULL) const wxOVERRIDE; + int *microVer = NULL) const override; - virtual bool CanUseStderr() wxOVERRIDE; - virtual bool WriteToStderr(const wxString& text) wxOVERRIDE; - virtual WXHWND GetMainHWND() const wxOVERRIDE; + virtual bool CanUseStderr() override; + virtual bool WriteToStderr(const wxString& text) override; + virtual WXHWND GetMainHWND() const override; }; #elif defined(__WXGTK__) @@ -64,31 +64,31 @@ public: class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; - virtual void *BeforeChildWaitLoop() wxOVERRIDE { return NULL; } - virtual void AfterChildWaitLoop(void *WXUNUSED(data)) wxOVERRIDE { } + virtual wxEventLoopBase *CreateEventLoop() override; + virtual void *BeforeChildWaitLoop() override { return NULL; } + virtual void AfterChildWaitLoop(void *WXUNUSED(data)) override { } #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) override; #endif #if wxUSE_THREADS && defined(__WXGTK20__) - virtual void MutexGuiEnter() wxOVERRIDE; - virtual void MutexGuiLeave() wxOVERRIDE; + virtual void MutexGuiEnter() override; + virtual void MutexGuiLeave() override; #endif #if wxUSE_THREADS - virtual bool DoMessageFromThreadWait() wxOVERRIDE { return true; } - virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) wxOVERRIDE + virtual bool DoMessageFromThreadWait() override { return true; } + virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) override { return DoSimpleWaitForThread(hThread); } #endif // wxUSE_THREADS virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL, - int *microVer = NULL) const wxOVERRIDE; + int *microVer = NULL) const override; - virtual bool CanUseStderr() wxOVERRIDE { return false; } - virtual bool WriteToStderr(const wxString& WXUNUSED(text)) wxOVERRIDE + virtual bool CanUseStderr() override { return false; } + virtual bool WriteToStderr(const wxString& WXUNUSED(text)) override { return false; } - virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; } + virtual WXHWND GetMainHWND() const override { return NULL; } }; #elif defined(__WXQT__) @@ -96,25 +96,25 @@ public: class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; - virtual void *BeforeChildWaitLoop() wxOVERRIDE { return NULL; } - virtual void AfterChildWaitLoop(void*) wxOVERRIDE { } + virtual wxEventLoopBase *CreateEventLoop() override; + virtual void *BeforeChildWaitLoop() override { return NULL; } + virtual void AfterChildWaitLoop(void*) override { } #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) override; #endif #if wxUSE_THREADS - virtual bool DoMessageFromThreadWait() wxOVERRIDE { return true; } - virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) wxOVERRIDE + virtual bool DoMessageFromThreadWait() override { return true; } + virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) override { return DoSimpleWaitForThread(hThread); } #endif // wxUSE_THREADS virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL, - int *microVer = NULL) const wxOVERRIDE; + int *microVer = NULL) const override; - virtual bool CanUseStderr() wxOVERRIDE { return false; } - virtual bool WriteToStderr(const wxString&) wxOVERRIDE { return false; } - virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; } + virtual bool CanUseStderr() override { return false; } + virtual bool WriteToStderr(const wxString&) override { return false; } + virtual WXHWND GetMainHWND() const override { return NULL; } }; #endif diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index a49b2e6d96..b28d559b47 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -209,8 +209,8 @@ public: wxDC *GetSelectedInto() const; protected: - virtual wxGDIImageRefData *CreateData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIImageRefData *CreateData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; // creates an uninitialized bitmap, called from Create()s above bool DoCreate(int w, int h, int depth, WXHDC hdc); @@ -302,14 +302,14 @@ public: virtual bool Create(wxGDIImage *image, const void* data, wxBitmapType type, - int width, int height, int depth = 1) wxOVERRIDE; + int width, int height, int depth = 1) override; virtual bool Load(wxGDIImage *image, const wxString& name, wxBitmapType type, - int desiredWidth, int desiredHeight) wxOVERRIDE; + int desiredWidth, int desiredHeight) override; virtual bool Save(const wxGDIImage *image, const wxString& name, - wxBitmapType type) const wxOVERRIDE; + wxBitmapType type) const override; // make wxBitmapHandler compatible with the wxBitmapHandler interface diff --git a/include/wx/msw/bmpcbox.h b/include/wx/msw/bmpcbox.h index 2a62858e6a..872f09887f 100644 --- a/include/wx/msw/bmpcbox.h +++ b/include/wx/msw/bmpcbox.h @@ -82,9 +82,9 @@ public: virtual ~wxBitmapComboBox(); // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) override; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; // Adds item with image to the end of the combo box. int Append(const wxString& item, const wxBitmapBundle& bitmap = wxBitmapBundle()); @@ -101,26 +101,26 @@ public: protected: - WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE; - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE; - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) override; + virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) override; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // Event handlers void OnSize(wxSizeEvent& event); - virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; } - virtual wxWindow* GetControl() wxOVERRIDE { return this; } + virtual wxItemContainer* GetItemContainer() override { return this; } + virtual wxWindow* GetControl() override { return this; } // wxItemContainer implementation virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + void **clientData, wxClientDataType type) override; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; - virtual bool OnAddBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual bool OnAddBitmap(const wxBitmapBundle& bitmap) override; + virtual wxSize DoGetBestSize() const override; void RecreateControl(); private: diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 3b38824c44..24c20b99d1 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -27,17 +27,17 @@ public: wxBrush(const wxBitmap& stipple); virtual ~wxBrush(); - virtual void SetColour(const wxColour& col) wxOVERRIDE; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; - virtual void SetStyle(wxBrushStyle style) wxOVERRIDE; - virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; + virtual void SetColour(const wxColour& col) override; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override; + virtual void SetStyle(wxBrushStyle style) override; + virtual void SetStipple(const wxBitmap& stipple) override; bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - wxColour GetColour() const wxOVERRIDE; - wxBrushStyle GetStyle() const wxOVERRIDE; - wxBitmap *GetStipple() const wxOVERRIDE; + wxColour GetColour() const override; + wxBrushStyle GetStyle() const override; + wxBitmap *GetStipple() const override; wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") @@ -47,11 +47,11 @@ public: void SetStyle(int style) { SetStyle((wxBrushStyle)style); } // return the HBRUSH for this brush - virtual WXHANDLE GetResourceHandle() const wxOVERRIDE; + virtual WXHANDLE GetResourceHandle() const override; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxBrush); diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 20d62b7d84..61b6aaa641 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -44,14 +44,14 @@ public: virtual ~wxButton(); - virtual wxWindow *SetDefault() wxOVERRIDE; + virtual wxWindow *SetDefault() override; // implementation from now on - virtual void Command(wxCommandEvent& event) wxOVERRIDE; - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; + virtual void Command(wxCommandEvent& event) override; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: // send a notification event, return true if processed @@ -64,8 +64,8 @@ protected: // set or unset BS_DEFPUSHBUTTON style static void SetDefaultStyle(wxButton *btn, bool on); - virtual bool DoGetAuthNeeded() const wxOVERRIDE; - virtual void DoSetAuthNeeded(bool show) wxOVERRIDE; + virtual bool DoGetAuthNeeded() const override; + virtual void DoSetAuthNeeded(bool show) override; // true if the UAC symbol is shown bool m_authNeeded; diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h index 1f15b1b617..5ace14826e 100644 --- a/include/wx/msw/calctrl.h +++ b/include/wx/msw/calctrl.h @@ -34,30 +34,30 @@ public: long style = wxCAL_SHOW_HOLIDAYS, const wxString& name = wxASCII_STR(wxCalendarNameStr)); - virtual bool SetDate(const wxDateTime& date) wxOVERRIDE; - virtual wxDateTime GetDate() const wxOVERRIDE; + virtual bool SetDate(const wxDateTime& date) override; + virtual wxDateTime GetDate() const override; virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; + const wxDateTime& upperdate = wxDefaultDateTime) override; + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const override; - virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; + virtual bool EnableMonthChange(bool enable = true) override; - virtual void Mark(size_t day, bool mark) wxOVERRIDE; - virtual void SetHoliday(size_t day) wxOVERRIDE; + virtual void Mark(size_t day, bool mark) override; + virtual void SetHoliday(size_t day) override; virtual wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime *date = NULL, - wxDateTime::WeekDay *wd = NULL) wxOVERRIDE; + wxDateTime::WeekDay *wd = NULL) override; - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; void MSWOnClick(wxMouseEvent& event); void MSWOnDoubleClick(wxMouseEvent& event); @@ -73,10 +73,10 @@ private: void UpdateFirstDayOfWeek(); // reset holiday information - virtual void ResetHolidayAttrs() wxOVERRIDE { m_holidays = 0; } + virtual void ResetHolidayAttrs() override { m_holidays = 0; } // redisplay holidays - virtual void RefreshHolidays() wxOVERRIDE { UpdateMarks(); } + virtual void RefreshHolidays() override { UpdateMarks(); } // current date, we need to store it instead of simply retrieving it from diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h index 60fd79fb16..a72d2cf01f 100644 --- a/include/wx/msw/caret.h +++ b/include/wx/msw/caret.h @@ -32,15 +32,15 @@ public: } // process wxWindow notifications - virtual void OnSetFocus() wxOVERRIDE; - virtual void OnKillFocus() wxOVERRIDE; + virtual void OnSetFocus() override; + virtual void OnKillFocus() override; protected: // override base class virtuals - virtual void DoMove() wxOVERRIDE; - virtual void DoShow() wxOVERRIDE; - virtual void DoHide() wxOVERRIDE; - virtual void DoSize() wxOVERRIDE; + virtual void DoMove() override; + virtual void DoShow() override; + virtual void DoHide() override; + virtual void DoSize() override; // helper function which creates the system caret bool MSWCreateCaret(); diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h index b4cc0bf37f..0fc9d84099 100644 --- a/include/wx/msw/checkbox.h +++ b/include/wx/msw/checkbox.h @@ -39,38 +39,38 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; // override some base class virtuals - virtual void SetLabel(const wxString& label) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; - virtual void SetTransparentPartColour(const wxColour& col) wxOVERRIDE + virtual void SetTransparentPartColour(const wxColour& col) override { SetBackgroundColour(col); } - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual void Command(wxCommandEvent& event) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } // implementation only from now on - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override; protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; - virtual void DoSet3StateValue(wxCheckBoxState value) wxOVERRIDE; - virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; + virtual void DoSet3StateValue(wxCheckBoxState value) override; + virtual wxCheckBoxState DoGet3StateValue() const override; // Implement wxMSWOwnerDrawnButtonBase methods. - virtual int MSWGetButtonStyle() const wxOVERRIDE; - virtual void MSWOnButtonResetOwnerDrawn() wxOVERRIDE; - virtual int MSWGetButtonCheckedFlag() const wxOVERRIDE; + virtual int MSWGetButtonStyle() const override; + virtual void MSWOnButtonResetOwnerDrawn() override; + virtual int MSWGetButtonCheckedFlag() const override; virtual void - MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) wxOVERRIDE; + MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) override; private: // common part of all ctors diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h index e00797787b..ec946612cc 100644 --- a/include/wx/msw/checklst.h +++ b/include/wx/msw/checklst.h @@ -55,17 +55,17 @@ public: const wxString& name = wxASCII_STR(wxListBoxNameStr)); // items may be checked - virtual bool IsChecked(unsigned int uiIndex) const wxOVERRIDE; - virtual void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE; + virtual bool IsChecked(unsigned int uiIndex) const override; + virtual void Check(unsigned int uiIndex, bool bCheck = true) override; virtual void Toggle(unsigned int uiIndex); // we create our items ourselves and they have non-standard size, // so we need to override these functions - virtual wxOwnerDrawn *CreateLboxItem(size_t n) wxOVERRIDE; - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE; + virtual wxOwnerDrawn *CreateLboxItem(size_t n) override; + virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) override; protected: - virtual wxSize MSWGetFullItemSize(int w, int h) const wxOVERRIDE; + virtual wxSize MSWGetFullItemSize(int w, int h) const override; // pressing space or clicking the check box toggles the item void OnKeyDown(wxKeyEvent& event); @@ -81,9 +81,9 @@ protected: ProcessCommand(event); } - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; - wxSize DoGetBestClientSize() const wxOVERRIDE; + wxSize DoGetBestClientSize() const override; wxDECLARE_EVENT_TABLE(); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox); diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 6c8badd69f..fd16c852b5 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -67,20 +67,20 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxChoiceNameStr)); - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; - virtual void SetLabel(const wxString& label) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; - virtual unsigned int GetCount() const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual int GetCurrentSelection() const wxOVERRIDE; - virtual void SetSelection(int n) wxOVERRIDE; + virtual unsigned int GetCount() const override; + virtual int GetSelection() const override; + virtual int GetCurrentSelection() const override; + virtual void SetSelection(int n) override; - 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& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -89,18 +89,18 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // MSW only - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE; - virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg) wxOVERRIDE; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; + virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) override; + virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg) override; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // common part of all ctors void Init() @@ -110,24 +110,24 @@ protected: m_heightOwn = wxDefaultCoord; } - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual void DoClear() override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; // MSW implementation - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoGetSize(int *w, int *h) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoGetSize(int *w, int *h) const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; // Show or hide the popup part of the control. void MSWDoPopupOrDismiss(bool show); @@ -155,7 +155,7 @@ protected: int SetHeightSimpleComboBox(int nItems) const; #if wxUSE_DEFERRED_SIZING - virtual void MSWEndDeferWindowPos() wxOVERRIDE; + virtual void MSWEndDeferWindowPos() override; #endif // wxUSE_DEFERRED_SIZING // These variables are only used while the drop down is opened. diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index 1e4a8af52f..de57970b76 100644 --- a/include/wx/msw/clipbrd.h +++ b/include/wx/msw/clipbrd.h @@ -49,33 +49,33 @@ public: virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() - virtual bool Open() wxOVERRIDE; + virtual bool Open() override; // close the clipboard after SetData() and GetData() - virtual void Close() wxOVERRIDE; + virtual void Close() override; // query whether the clipboard is opened - virtual bool IsOpened() const wxOVERRIDE; + virtual bool IsOpened() const override; // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ) wxOVERRIDE; + virtual bool SetData( wxDataObject *data ) override; // add to the clipboard data. - virtual bool AddData( wxDataObject *data ) wxOVERRIDE; + virtual bool AddData( wxDataObject *data ) override; // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; + virtual bool IsSupported( const wxDataFormat& format ) override; // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ) wxOVERRIDE; + virtual bool GetData( wxDataObject& data ) override; // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // flushes the clipboard: this means that the data which is currently on // clipboard will stay available even after the application exits (possibly // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush() wxOVERRIDE; + virtual bool Flush() override; private: IDataObject *m_lastDataObject; diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index 27a021f531..819d1b2643 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -33,10 +33,10 @@ public: wxColourData& GetColourData() { return m_colourData; } // override some base class virtuals - virtual void SetTitle(const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; + virtual wxString GetTitle() const override; - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; // wxMSW-specific implementation from now on // ----------------------------------------- @@ -51,11 +51,11 @@ protected: // common part of all ctors void Init(); - 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 DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoCentre(int dir) wxOVERRIDE; + virtual void DoGetPosition( int *x, int *y ) const override; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoCentre(int dir) override; wxColourData m_colourData; wxString m_title; diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index afb54011c8..afac0cd5a8 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -27,12 +27,12 @@ public: // accessors // --------- - virtual bool IsOk() const wxOVERRIDE { return m_isInit; } + virtual bool IsOk() const override { return m_isInit; } - unsigned char Red() const wxOVERRIDE { return m_red; } - unsigned char Green() const wxOVERRIDE { return m_green; } - unsigned char Blue() const wxOVERRIDE { return m_blue; } - unsigned char Alpha() const wxOVERRIDE { return m_alpha ; } + unsigned char Red() const override { return m_red; } + unsigned char Green() const override { return m_green; } + unsigned char Blue() const override { return m_blue; } + unsigned char Alpha() const override { return m_alpha ; } // comparison bool operator==(const wxColour& colour) const @@ -56,7 +56,7 @@ protected: void Init(); virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) wxOVERRIDE; + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) override; private: bool m_isInit; diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index f96222f875..b472c20e62 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -64,8 +64,8 @@ public: virtual ~wxComboCtrl(); - virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const wxOVERRIDE; - virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE; + virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const override; + virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const override; static int GetFeatures() { return wxComboCtrlFeatures::All; } @@ -75,23 +75,23 @@ public: protected: void DoTimerEvent(); - virtual bool AnimateShow( const wxRect& rect, int flags ) wxOVERRIDE; + virtual bool AnimateShow( const wxRect& rect, int flags ) override; #endif // wxUSE_COMBOCTRL_POPUP_ANIMATION protected: // Dummy method - we override all functions that call this - virtual WXHWND GetEditHWND() const wxOVERRIDE { return NULL; } + virtual WXHWND GetEditHWND() const override { return NULL; } // customization - virtual void OnResize() wxOVERRIDE; - virtual wxCoord GetNativeTextIndent() const wxOVERRIDE; + virtual void OnResize() override; + virtual wxCoord GetNativeTextIndent() const override; // event handlers void OnPaintEvent( wxPaintEvent& event ); void OnMouseEvent( wxMouseEvent& event ); - virtual bool HasTransparentBackground() wxOVERRIDE { return IsDoubleBuffered(); } + virtual bool HasTransparentBackground() override { return IsDoubleBuffered(); } private: void Init(); diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 0b72ba65ef..1320a7dac2 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -80,27 +80,27 @@ public: // resolve ambiguities among virtual functions inherited from both base // classes - virtual void Clear() wxOVERRIDE; - virtual wxString GetValue() const wxOVERRIDE; - virtual void SetValue(const wxString& value) wxOVERRIDE; - virtual wxString GetStringSelection() const wxOVERRIDE + virtual void Clear() override; + virtual wxString GetValue() const override; + virtual void SetValue(const wxString& value) override; + virtual wxString GetStringSelection() const override { return wxChoice::GetStringSelection(); } virtual void Popup() { MSWDoPopupOrDismiss(true); } virtual void Dismiss() { MSWDoPopupOrDismiss(false); } - virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) wxOVERRIDE + virtual void SetSelection(int n) override { wxChoice::SetSelection(n); } + virtual void SetSelection(long from, long to) override { wxTextEntry::SetSelection(from, to); } - virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); } - virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual int GetSelection() const override { return wxChoice::GetSelection(); } + virtual bool ContainsHWND(WXHWND hWnd) const override; + virtual void GetSelection(long *from, long *to) const override; - virtual bool IsEditable() const wxOVERRIDE; + virtual bool IsEditable() const override; // implementation only from now on - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam); - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - bool MSWShouldPreProcessMessage(WXMSG *pMsg) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; + bool MSWShouldPreProcessMessage(WXMSG *pMsg) override; // Standard event handling void OnCut(wxCommandEvent& event); @@ -119,26 +119,26 @@ public: void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event); - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; #if wxUSE_UXTHEME // override wxTextEntry method to work around Windows bug - virtual bool SetHint(const wxString& hint) wxOVERRIDE; + virtual bool SetHint(const wxString& hint) override; #endif // wxUSE_UXTHEME - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } protected: #if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE; + virtual void DoSetToolTip(wxToolTip *tip) override; #endif - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; // Override this one to avoid eating events from our popup listbox. - virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const wxOVERRIDE; + virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const override; // this is the implementation of GetEditHWND() which can also be used when // we don't have the edit control, it simply returns NULL then @@ -149,7 +149,7 @@ protected: // just testing for IsEditable() and using GetEditHWND() should be enough WXHWND GetEditHWNDIfAvailable() const; - virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE + virtual void EnableTextChangedEvents(bool enable) override { m_allowTextEvents = enable; } @@ -163,15 +163,15 @@ protected: private: // there are the overridden wxTextEntry methods which should only be called // when we do have an edit control so they assert if this is not the case - virtual wxWindow *GetEditableWindow() wxOVERRIDE; - virtual WXHWND GetEditHWND() const wxOVERRIDE; + virtual wxWindow *GetEditableWindow() override; + virtual WXHWND GetEditHWND() const override; // Common part of MSWProcessEditMsg() and MSWProcessSpecialKey(), return // true if the key was processed. bool MSWProcessEditSpecialKey(WXWPARAM vkey); #if wxUSE_OLE - virtual void MSWProcessSpecialKey(wxKeyEvent& event) wxOVERRIDE; + virtual void MSWProcessSpecialKey(wxKeyEvent& event) override; #endif // wxUSE_OLE // common part of all ctors diff --git a/include/wx/msw/commandlinkbutton.h b/include/wx/msw/commandlinkbutton.h index 8930e33127..fef510f718 100644 --- a/include/wx/msw/commandlinkbutton.h +++ b/include/wx/msw/commandlinkbutton.h @@ -51,20 +51,20 @@ public: // ----------------------------- // do the same thing as in the generic case here - virtual void SetLabel(const wxString& label) wxOVERRIDE + virtual void SetLabel(const wxString& label) override { SetMainLabelAndNote(label.BeforeFirst('\n'), label.AfterFirst('\n')); } virtual void SetMainLabelAndNote(const wxString& mainLabel, - const wxString& note) wxOVERRIDE; + const wxString& note) override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual bool HasNativeBitmap() const wxOVERRIDE; + virtual bool HasNativeBitmap() const override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton); diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 346c2174b7..b136ca2bf9 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -36,13 +36,13 @@ public: // Simulates an event - virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); } + virtual void Command(wxCommandEvent& event) override { ProcessCommand(event); } // implementation from now on // -------------------------- - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -54,7 +54,7 @@ public: bool ProcessCommand(wxCommandEvent& event); // MSW-specific - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; // For ownerdraw items virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; } @@ -67,7 +67,7 @@ public: virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); // default style for the control include WS_TABSTOP if it AcceptsFocus() - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: // Hook for common controls for which we don't want to set the default font @@ -77,10 +77,10 @@ protected: virtual bool MSWShouldSetDefaultFont() const { return true; } // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override; // return default best size (doesn't really make any sense, override this) - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // create the control of the given Windows class: this is typically called // from Create() method of the derived class passing its label, pos and @@ -122,7 +122,7 @@ protected: virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd); // Look in our GetSubcontrols() for the windows with the given ID. - virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const wxOVERRIDE; + virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const override; // for controls like radiobuttons which are really composite this array diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 72dae07dc8..2b2eb22cde 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -28,7 +28,7 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(wxStockCursor id) { InitFromStock(id); } - virtual wxPoint GetHotSpot() const wxOVERRIDE; + virtual wxPoint GetHotSpot() const override; virtual ~wxCursor(); @@ -39,7 +39,7 @@ public: protected: void InitFromStock(wxStockCursor); - virtual wxGDIImageRefData *CreateData() const wxOVERRIDE; + virtual wxGDIImageRefData *CreateData() const override; private: #if wxUSE_IMAGE diff --git a/include/wx/msw/custombgwin.h b/include/wx/msw/custombgwin.h index 027e2b77f5..36bfe2252e 100644 --- a/include/wx/msw/custombgwin.h +++ b/include/wx/msw/custombgwin.h @@ -29,7 +29,7 @@ public: virtual ~wxCustomBackgroundWindow() { delete m_backgroundBrush; } protected: - virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) override { delete m_backgroundBrush; m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL; @@ -41,7 +41,7 @@ protected: || BaseWindowClass::UseBgCol(); } - virtual WXHBRUSH MSWGetCustomBgBrush() wxOVERRIDE + virtual WXHBRUSH MSWGetCustomBgBrush() override { if ( m_backgroundBrush ) return (WXHBRUSH)m_backgroundBrush->GetResourceHandle(); diff --git a/include/wx/msw/datectrl.h b/include/wx/msw/datectrl.h index b78b28f7a0..9fdc87f2b8 100644 --- a/include/wx/msw/datectrl.h +++ b/include/wx/msw/datectrl.h @@ -43,22 +43,22 @@ public: const wxString& name = wxDatePickerCtrlNameStr); // Override this one to add date-specific (and time-ignoring) checks. - virtual void SetValue(const wxDateTime& dt) wxOVERRIDE; - virtual wxDateTime GetValue() const wxOVERRIDE; + virtual void SetValue(const wxDateTime& dt) override; + virtual wxDateTime GetValue() const override; // Implement the base class pure virtuals. - virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE; - virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE; + virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) override; + virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const override; // Override MSW-specific functions used during control creation. - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: #if wxUSE_INTL - virtual wxLocaleInfo MSWGetFormat() const wxOVERRIDE; + virtual wxLocaleInfo MSWGetFormat() const override; #endif // wxUSE_INTL - virtual bool MSWAllowsNone() const wxOVERRIDE { return HasFlag(wxDP_ALLOWNONE); } - virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) wxOVERRIDE; + virtual bool MSWAllowsNone() const override { return HasFlag(wxDP_ALLOWNONE); } + virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) override; private: wxDateTime MSWGetControlValue() const; diff --git a/include/wx/msw/datetimectrl.h b/include/wx/msw/datetimectrl.h index a56c87d580..178cdb998f 100644 --- a/include/wx/msw/datetimectrl.h +++ b/include/wx/msw/datetimectrl.h @@ -23,19 +23,19 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase { public: // set/get the date - virtual void SetValue(const wxDateTime& dt) wxOVERRIDE; - virtual wxDateTime GetValue() const wxOVERRIDE; + virtual void SetValue(const wxDateTime& dt) override; + virtual wxDateTime GetValue() const override; - virtual void SetNullText(const wxString& text) wxOVERRIDE; + virtual void SetNullText(const wxString& text) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const override; // Helper for the derived classes Create(): creates a native control with // the specified attributes. diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index 6af3637c97..a63739e3b4 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -51,53 +51,53 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; - virtual bool StartDoc(const wxString& message) wxOVERRIDE; - virtual void EndDoc() wxOVERRIDE; + virtual bool StartDoc(const wxString& message) override; + virtual void EndDoc() override; - virtual void StartPage() wxOVERRIDE; - virtual void EndPage() wxOVERRIDE; + virtual void StartPage() override; + virtual void EndPage() override; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual void SetPen(const wxPen& pen) wxOVERRIDE; - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackgroundMode(int mode) wxOVERRIDE; + virtual void SetFont(const wxFont& font) override; + virtual void SetPen(const wxPen& pen) override; + virtual void SetBrush(const wxBrush& brush) override; + virtual void SetBackground(const wxBrush& brush) override; + virtual void SetBackgroundMode(int mode) override; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; + virtual void SetPalette(const wxPalette& palette) override; #endif // wxUSE_PALETTE - virtual void DestroyClippingRegion() wxOVERRIDE; + virtual void DestroyClippingRegion() override; - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; + virtual wxCoord GetCharHeight() const override; + virtual wxCoord GetCharWidth() const override; - virtual bool CanDrawBitmap() const wxOVERRIDE; - virtual bool CanGetTextExtent() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - virtual wxSize GetPPI() const wxOVERRIDE; + virtual bool CanDrawBitmap() const override; + virtual bool CanGetTextExtent() const override; + virtual int GetDepth() const override; + virtual wxSize GetPPI() const override; - virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE; - virtual void SetUserScale(double x, double y) wxOVERRIDE; - virtual void SetLogicalScale(double x, double y) wxOVERRIDE; - virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE; + virtual void SetMapMode(wxMappingMode mode) override; + virtual void SetUserScale(double x, double y) override; + virtual void SetLogicalScale(double x, double y) override; + virtual void SetLogicalOrigin(wxCoord x, wxCoord y) override; + virtual void SetDeviceOrigin(wxCoord x, wxCoord y) override; + virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) override; - virtual wxPoint DeviceToLogical(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual wxPoint LogicalToDevice(wxCoord x, wxCoord y) const wxOVERRIDE; - virtual wxSize DeviceToLogicalRel(int x, int y) const wxOVERRIDE; - virtual wxSize LogicalToDeviceRel(int x, int y) const wxOVERRIDE; + virtual wxPoint DeviceToLogical(wxCoord x, wxCoord y) const override; + virtual wxPoint LogicalToDevice(wxCoord x, wxCoord y) const override; + virtual wxSize DeviceToLogicalRel(int x, int y) const override; + virtual wxSize LogicalToDeviceRel(int x, int y) const override; #if wxUSE_DC_TRANSFORM_MATRIX - virtual bool CanUseTransformMatrix() const wxOVERRIDE; - virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) wxOVERRIDE; - virtual wxAffineMatrix2D GetTransformMatrix() const wxOVERRIDE; - virtual void ResetTransformMatrix() wxOVERRIDE; + virtual bool CanUseTransformMatrix() const override; + virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) override; + virtual wxAffineMatrix2D GetTransformMatrix() const override; + virtual void ResetTransformMatrix() override; #endif // wxUSE_DC_TRANSFORM_MATRIX - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; + virtual void SetLogicalFunction(wxRasterOperationMode function) override; // implementation from now on // -------------------------- @@ -128,10 +128,10 @@ public: m_isClipBoxValid = false; } - void* GetHandle() const wxOVERRIDE { return (void*)GetHDC(); } + void* GetHandle() const override { return (void*)GetHDC(); } - const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selectedBitmap; } - wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selectedBitmap; } + const wxBitmap& GetSelectedBitmap() const override { return m_selectedBitmap; } + wxBitmap& GetSelectedBitmap() override { return m_selectedBitmap; } // update the internal clip box variables void UpdateClipBox(); @@ -150,8 +150,8 @@ public: // get or change the layout direction (LTR or RTL) for this dc, // wxLayout_Default is returned if layout direction is not supported - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; + virtual wxLayoutDirection GetLayoutDirection() const override; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; protected: void Init() @@ -185,57 +185,57 @@ public: int *descent, int *internalLeading, int *externalLeading, - int *averageWidth) const wxOVERRIDE; + int *averageWidth) const override; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; + virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const override; virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; + wxFloodFillStyle style = wxFLOOD_SURFACE) override; virtual void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, - wxDirection nDirection = wxEAST) wxOVERRIDE; + wxDirection nDirection = wxEAST) override; - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const override; - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + virtual void DoDrawPoint(wxCoord x, wxCoord y) override; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE; + wxCoord xc, wxCoord yc) override; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; + double sa, double ea) override; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius) wxOVERRIDE; - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + double radius) override; + virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; #if wxUSE_SPLINES - virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE; + virtual void DoDrawSpline(const wxPointList *points) override; #endif - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoCrossHair(wxCoord x, wxCoord y) override; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override; virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; + bool useMask = false) override; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override; virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) wxOVERRIDE; + double angle) override; virtual 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) wxOVERRIDE; + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override; virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight, @@ -243,24 +243,24 @@ public: wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight, wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; - virtual bool DoGetClippingRect(wxRect& rect) const wxOVERRIDE; + wxCoord width, wxCoord height) override; + virtual void DoSetDeviceClippingRegion(const wxRegion& region) override; + virtual bool DoGetClippingRect(wxRect& rect) const override; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; + virtual void DoGetSizeMM(int* width, int* height) const override; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset) wxOVERRIDE; + wxCoord xoffset, wxCoord yoffset) override; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const override { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); @@ -352,7 +352,7 @@ public: SetHDC((WXHDC)NULL); } - virtual void DoGetSize(int *w, int *h) const wxOVERRIDE + virtual void DoGetSize(int *w, int *h) const override { wxASSERT_MSG( m_size.IsFullySpecified(), wxT("size of this DC hadn't been set and is unknown") ); diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index 0f31890418..b0f0236f79 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -34,7 +34,7 @@ public: // Create a DC corresponding to the whole window wxWindowDCImpl( wxDC *owner, wxWindow *win ); - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; protected: // initialize the newly created DC @@ -55,7 +55,7 @@ public: virtual ~wxClientDCImpl(); - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; protected: void InitDC(); diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h index 2fe0fadbce..37cf5321ef 100644 --- a/include/wx/msw/dcmemory.h +++ b/include/wx/msw/dcmemory.h @@ -22,14 +22,14 @@ public: wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC // override some base class virtuals - virtual wxSize GetPPI() const wxOVERRIDE; - virtual void SetFont(const wxFont& font) wxOVERRIDE; + virtual wxSize GetPPI() const override; + virtual void SetFont(const wxFont& font) override; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; - virtual void DoGetSize(int* width, int* height) const wxOVERRIDE; - virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; + virtual void DoGetSize(int* width, int* height) const override; + virtual void DoSelect(const wxBitmap& bitmap) override; - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const wxOVERRIDE + virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const override { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );} protected: diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h index 845c0d64ab..aa7a5bfde5 100644 --- a/include/wx/msw/dcprint.h +++ b/include/wx/msw/dcprint.h @@ -29,28 +29,28 @@ public: wxPrinterDCImpl( wxPrinterDC *owner, WXHDC theDC ); // override some base class virtuals - virtual bool StartDoc(const wxString& message) wxOVERRIDE; - virtual void EndDoc() wxOVERRIDE; - virtual void StartPage() wxOVERRIDE; - virtual void EndPage() wxOVERRIDE; + virtual bool StartDoc(const wxString& message) override; + virtual void EndDoc() override; + virtual void StartPage() override; + virtual void EndPage() override; - virtual wxRect GetPaperRect() const wxOVERRIDE; + virtual wxRect GetPaperRect() const override; - virtual wxSize FromDIP(const wxSize& sz) const wxOVERRIDE; + virtual wxSize FromDIP(const wxSize& sz) const override; - virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE; + virtual wxSize ToDIP(const wxSize& sz) const override; - void SetFont(const wxFont& font) wxOVERRIDE; + void SetFont(const wxFont& font) override; protected: virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; + bool useMask = false) override; virtual 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) wxOVERRIDE; - virtual void DoGetSize(int *w, int *h) const wxOVERRIDE + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) override; + virtual void DoGetSize(int *w, int *h) const override { GetDeviceSize(w, h); } diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h index e7918c44b0..bd07a1ed58 100644 --- a/include/wx/msw/dcscreen.h +++ b/include/wx/msw/dcscreen.h @@ -21,7 +21,7 @@ public: wxScreenDCImpl( wxScreenDC *owner ); // Return the size of the whole virtual screen (all monitors) - virtual void DoGetSize(int *w, int *h) const wxOVERRIDE; + virtual void DoGetSize(int *w, int *h) const override; wxDECLARE_CLASS(wxScreenDCImpl); wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 64ec55677a..05d190a3d0 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -50,17 +50,17 @@ public: // implement base class pure virtual methods virtual const void *Request(const wxString& item, size_t *size = NULL, - wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE; - virtual bool StartAdvise(const wxString& item) wxOVERRIDE; - virtual bool StopAdvise(const wxString& item) wxOVERRIDE; - virtual bool Disconnect() wxOVERRIDE; + wxIPCFormat format = wxIPC_TEXT) override; + virtual bool StartAdvise(const wxString& item) override; + virtual bool StopAdvise(const wxString& item) override; + virtual bool Disconnect() override; protected: - virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE; + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override; virtual bool DoPoke(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; + wxIPCFormat format) override; virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; + wxIPCFormat format) override; public: wxString m_topicName; @@ -79,10 +79,10 @@ class WXDLLIMPEXP_BASE wxDDEServer : public wxServerBase { public: wxDDEServer(); - bool Create(const wxString& server_name) wxOVERRIDE; + bool Create(const wxString& server_name) override; virtual ~wxDDEServer(); - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override; // Find/delete wxDDEConnection corresponding to the HCONV wxDDEConnection *FindConnection(WXHCONV conv); @@ -107,15 +107,15 @@ public: wxDDEClient(); virtual ~wxDDEClient(); - bool ValidHost(const wxString& host) wxOVERRIDE; + bool ValidHost(const wxString& host) override; // Call this to make a connection. Returns NULL if cannot. virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, - const wxString& topic) wxOVERRIDE; + const wxString& topic) override; // Tailor this to return own connection. - virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE; + virtual wxConnectionBase *OnMakeConnection() override; // Find/delete wxDDEConnection corresponding to the HCONV wxDDEConnection *FindConnection(WXHCONV conv); diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index ce9e534e02..610cb691d6 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -46,24 +46,24 @@ public: virtual ~wxDialog(); // return true if we're showing the dialog modally - virtual bool IsModal() const wxOVERRIDE { return m_modalData != NULL; } + virtual bool IsModal() const override { return m_modalData != NULL; } // show the dialog modally and return the value passed to EndModal() - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode) wxOVERRIDE; + virtual void EndModal(int retCode) override; // implementation only from now on // ------------------------------- // override some base class virtuals - virtual bool Show(bool show = true) wxOVERRIDE; - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual void SetWindowStyleFlag(long style) override; // Windows callbacks - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) override; protected: // common part of all ctors diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h index e17af4b65c..49ace38843 100644 --- a/include/wx/msw/dirdlg.h +++ b/include/wx/msw/dirdlg.h @@ -22,9 +22,9 @@ public: const wxSize& size = wxDefaultSize, const wxString& name = wxASCII_STR(wxDirDialogNameStr)); - void SetPath(const wxString& path) wxOVERRIDE; + void SetPath(const wxString& path) override; - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; private: // The real implementations of ShowModal(), used for Windows versions diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index 7b5934ef8d..413785f675 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -43,7 +43,7 @@ public: bool Play(wxDC *dc, wxRect *rectBound = NULL); // accessors - virtual bool IsOk() const wxOVERRIDE { return m_hMF != NULL; } + virtual bool IsOk() const override { return m_hMF != NULL; } wxSize GetSize() const; int GetWidth() const { return GetSize().x; } @@ -75,8 +75,8 @@ protected: // we don't use these functions (but probably should) but have to implement // them as they're pure virtual in the base class - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxString m_filename; @@ -137,13 +137,13 @@ public: { return m_metafile; } // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat(Direction dir) const wxOVERRIDE; - virtual size_t GetFormatCount(Direction dir) const wxOVERRIDE; - virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const wxOVERRIDE; - virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE; - virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE; + virtual wxDataFormat GetPreferredFormat(Direction dir) const override; + virtual size_t GetFormatCount(Direction dir) const override; + virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const override; + virtual size_t GetDataSize(const wxDataFormat& format) const override; + virtual bool GetDataHere(const wxDataFormat& format, void *buf) const override; virtual bool SetData(const wxDataFormat& format, size_t len, - const void *buf) wxOVERRIDE; + const void *buf) override; protected: wxEnhMetaFile m_metafile; @@ -175,17 +175,17 @@ public: { return m_metafile; } // implement base class pure virtuals - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE + void *buf) const override { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE + size_t len, const void *buf) override { return SetData(len, buf); } protected: diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h index 5616631f94..ccb17371ff 100644 --- a/include/wx/msw/evtloop.h +++ b/include/wx/msw/evtloop.h @@ -51,12 +51,12 @@ public: } // override/implement base class virtuals - virtual bool Dispatch() wxOVERRIDE; - virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; + virtual bool Dispatch() override; + virtual int DispatchTimeout(unsigned long timeout) override; protected: - virtual void OnNextIteration() wxOVERRIDE; - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; + virtual void OnNextIteration() override; + virtual void DoYieldFor(long eventsToProcess) override; private: // check if the given window is a child of ms_winCritical (which must be diff --git a/include/wx/msw/evtloopconsole.h b/include/wx/msw/evtloopconsole.h index a552225e15..700ca7d40c 100644 --- a/include/wx/msw/evtloopconsole.h +++ b/include/wx/msw/evtloopconsole.h @@ -18,8 +18,8 @@ public: virtual ~wxMSWEventLoopBase(); // implement base class pure virtuals - virtual bool Pending() const wxOVERRIDE; - virtual void WakeUp() wxOVERRIDE; + virtual bool Pending() const override; + virtual void WakeUp() override; #if wxUSE_THREADS // MSW-specific method to wait for the termination of the specified (by its @@ -57,14 +57,14 @@ public: wxConsoleEventLoop() { } // override/implement base class virtuals - virtual bool Dispatch() wxOVERRIDE; - virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; + virtual bool Dispatch() override; + virtual int DispatchTimeout(unsigned long timeout) override; // Windows-specific function to process a single message virtual void ProcessMessage(WXMSG *msg); protected: - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; + virtual void DoYieldFor(long eventsToProcess) override; }; #endif // wxUSE_CONSOLE_EVENTLOOP diff --git a/include/wx/msw/fdrepdlg.h b/include/wx/msw/fdrepdlg.h index e8d6eb4844..5884351cd4 100644 --- a/include/wx/msw/fdrepdlg.h +++ b/include/wx/msw/fdrepdlg.h @@ -37,16 +37,16 @@ public: wxFindReplaceDialogImpl *GetImpl() const { return m_impl; } // override some base class virtuals - virtual bool Show(bool show = true) wxOVERRIDE; - virtual void SetTitle( const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual void SetTitle( const wxString& title) override; + virtual wxString GetTitle() const override; protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoGetClientSize(int *width, int *height) const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; void Init(); diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h index b3f798c2b5..5acf8a8b2f 100644 --- a/include/wx/msw/filedlg.h +++ b/include/wx/msw/filedlg.h @@ -31,19 +31,19 @@ public: const wxString& name = wxASCII_STR(wxFileDialogNameStr)); virtual ~wxFileDialog(); - virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE; - virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE; - virtual bool AddShortcut(const wxString& directory, int flags = 0) wxOVERRIDE; - virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } + virtual void GetPaths(wxArrayString& paths) const override; + virtual void GetFilenames(wxArrayString& files) const override; + virtual bool AddShortcut(const wxString& directory, int flags = 0) override; + virtual bool SupportsExtraControl() const override { return true; } - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; protected: - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoCentre(int dir) wxOVERRIDE; - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoCentre(int dir) override; + virtual void DoGetSize( int *width, int *height ) const override; + virtual void DoGetPosition( int *x, int *y ) const override; private: // Allow it to call MSWOnXXX() functions below. diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 0f9768b44e..c0f4178869 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -95,30 +95,30 @@ public: virtual ~wxFont(); // implement base class pure virtuals - virtual double GetFractionalPointSize() const wxOVERRIDE; - virtual wxSize GetPixelSize() const wxOVERRIDE; - virtual bool IsUsingSizeInPixels() const wxOVERRIDE; - virtual wxFontStyle GetStyle() const wxOVERRIDE; - virtual int GetNumericWeight() const wxOVERRIDE; - virtual bool GetUnderlined() const wxOVERRIDE; - virtual bool GetStrikethrough() const wxOVERRIDE; - virtual wxString GetFaceName() const wxOVERRIDE; - virtual wxFontEncoding GetEncoding() const wxOVERRIDE; - virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE; + virtual double GetFractionalPointSize() const override; + virtual wxSize GetPixelSize() const override; + virtual bool IsUsingSizeInPixels() const override; + virtual wxFontStyle GetStyle() const override; + virtual int GetNumericWeight() const override; + virtual bool GetUnderlined() const override; + virtual bool GetStrikethrough() const override; + virtual wxString GetFaceName() const override; + virtual wxFontEncoding GetEncoding() const override; + virtual const wxNativeFontInfo *GetNativeFontInfo() const override; - virtual void SetFractionalPointSize(double pointSize) wxOVERRIDE; - virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE; - virtual void SetFamily(wxFontFamily family) wxOVERRIDE; - virtual void SetStyle(wxFontStyle style) wxOVERRIDE; - virtual void SetNumericWeight(int 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; + virtual void SetFractionalPointSize(double pointSize) override; + virtual void SetPixelSize(const wxSize& pixelSize) override; + virtual void SetFamily(wxFontFamily family) override; + virtual void SetStyle(wxFontStyle style) override; + virtual void SetNumericWeight(int weight) override; + virtual bool SetFaceName(const wxString& faceName) override; + virtual void SetUnderlined(bool underlined) override; + virtual void SetStrikethrough(bool strikethrough) override; + virtual void SetEncoding(wxFontEncoding encoding) override; wxDECLARE_COMMON_FONT_METHODS(); - virtual bool IsFixedWidth() const wxOVERRIDE; + virtual bool IsFixedWidth() const override; // MSW needs to modify the font object when the DPI of the window it // is used with changes, this function can be used to do it. @@ -154,10 +154,10 @@ public: // implementation only from now on // ------------------------------- - virtual bool IsFree() const wxOVERRIDE; - virtual bool RealizeResource() wxOVERRIDE; - virtual WXHANDLE GetResourceHandle() const wxOVERRIDE; - virtual bool FreeResource(bool force = false) wxOVERRIDE; + virtual bool IsFree() const override; + virtual bool RealizeResource() override; + virtual WXHANDLE GetResourceHandle() const override; + virtual bool FreeResource(bool force = false) override; // for consistency with other wxMSW classes WXHFONT GetHFONT() const; @@ -166,12 +166,12 @@ protected: // Common helper of overloaded Create() methods. bool DoCreate(const wxFontInfo& info); - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE; - virtual wxFontFamily DoGetFamily() const wxOVERRIDE; + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) override; + virtual wxFontFamily DoGetFamily() const override; // implement wxObject virtuals which are used by AllocExclusive() - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxFont); diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h index 38d0d463bc..802a3c3ac6 100644 --- a/include/wx/msw/fontdlg.h +++ b/include/wx/msw/fontdlg.h @@ -24,9 +24,9 @@ public: wxFontDialog(wxWindow *parent, const wxFontData& data) : wxFontDialogBase(parent, data) { Create(parent, data); } - virtual int ShowModal() wxOVERRIDE; - virtual void SetTitle(const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; + virtual int ShowModal() override; + virtual void SetTitle(const wxString& title) override; + virtual wxString GetTitle() const override; protected: wxString m_title; diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index afee10d7df..6e9ad844a9 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -43,7 +43,7 @@ public: virtual ~wxFrame(); // implement base class pure virtuals - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; // implementation only from now on // ------------------------------- @@ -55,7 +55,7 @@ public: #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = wxID_ANY, - const wxString& name = wxASCII_STR(wxToolBarNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxToolBarNameStr)) override; #endif // wxUSE_TOOLBAR // Status bar @@ -63,7 +63,7 @@ public: virtual wxStatusBar* OnCreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, - const wxString& name = wxASCII_STR(wxStatusLineNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxStatusLineNameStr)) override; // Hint to tell framework which status bar to use: the default is to use // native one for the platforms which support it (Win32), the generic one @@ -87,12 +87,12 @@ public: #endif // tooltips // override the base class function to handle iconized/maximized frames - virtual void SendSizeEvent(int flags = 0) wxOVERRIDE; + virtual void SendSizeEvent(int flags = 0) override; - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; // override base class version to add menu bar accel processing - virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE + virtual bool MSWTranslateMessage(WXMSG *msg) override { return MSWDoTranslateMessage(this, msg); } @@ -100,18 +100,18 @@ public: // window proc for the frames virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, - WXLPARAM lParam) wxOVERRIDE; + WXLPARAM lParam) override; #if wxUSE_MENUS // get the currently active menu: this is the same as the frame menu for // normal frames but is overridden by wxMDIParentFrame virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; } - virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu) wxOVERRIDE; - virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu) wxOVERRIDE; + virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu) override; + virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu) override; // Look up the menu in the menu bar. - virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE; + virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) override; #endif // wxUSE_MENUS #if wxUSE_TASKBARBUTTON @@ -128,12 +128,12 @@ protected: void Init(); // override base class virtuals - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual void DoSetClientSize(int width, int height) override; #if wxUSE_MENUS_NATIVE // perform MSW-specific action when menubar is changed - virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; + virtual void AttachMenuBar(wxMenuBar *menubar) override; // a plug in for MDI frame classes which need to do something special when // the menubar is set @@ -153,11 +153,11 @@ protected: virtual WXHICON GetDefaultIcon() const; #if wxUSE_TOOLBAR - virtual void PositionToolBar() wxOVERRIDE; + virtual void PositionToolBar() override; #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR - virtual void PositionStatusBar() wxOVERRIDE; + virtual void PositionStatusBar() override; static bool m_useNativeStatusBar; #endif // wxUSE_STATUSBAR diff --git a/include/wx/msw/fswatcher.h b/include/wx/msw/fswatcher.h index e41bee045d..37801136ce 100644 --- a/include/wx/msw/fswatcher.h +++ b/include/wx/msw/fswatcher.h @@ -26,7 +26,7 @@ public: // implementation for it using the platform native support for watching the // entire directory trees. virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, - const wxString& filter = wxEmptyString) wxOVERRIDE; + const wxString& filter = wxEmptyString) override; protected: bool Init(); diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h index bd12b0192f..1c9598cc52 100644 --- a/include/wx/msw/gauge.h +++ b/include/wx/msw/gauge.h @@ -45,22 +45,22 @@ public: const wxString& name = wxASCII_STR(wxGaugeNameStr)); // set gauge range/value - virtual void SetRange(int range) wxOVERRIDE; - virtual void SetValue(int pos) wxOVERRIDE; + virtual void SetRange(int range) override; + virtual void SetValue(int pos) override; // overridden base class virtuals - virtual bool SetForegroundColour(const wxColour& col) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; + virtual bool SetForegroundColour(const wxColour& col) override; + virtual bool SetBackgroundColour(const wxColour& col) override; - virtual void Pulse() wxOVERRIDE; + virtual void Pulse() override; - WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: // returns true if the control is currently in indeterminate (a.k.a. diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index 2424b93324..a056d0e789 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -54,7 +54,7 @@ public: } // accessors - virtual bool IsOk() const wxOVERRIDE { return m_handle != NULL; } + virtual bool IsOk() const override { return m_handle != NULL; } void SetSize(int w, int h) { m_width = w; m_height = h; } @@ -148,19 +148,19 @@ public: #endif // WXWIN_COMPATIBILITY_3_0 // forward some of base class virtuals to wxGDIImageRefData - bool FreeResource(bool force = false) wxOVERRIDE; - virtual WXHANDLE GetResourceHandle() const wxOVERRIDE; + bool FreeResource(bool force = false) override; + virtual WXHANDLE GetResourceHandle() const override; protected: // create the data for the derived class here virtual wxGDIImageRefData *CreateData() const = 0; // implement the wxGDIObject method in terms of our, more specific, one - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE { return CreateData(); } + virtual wxGDIRefData *CreateGDIRefData() const override { return CreateData(); } // we can't [efficiently] clone objects of this class virtual wxGDIRefData * - CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE + CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const override { wxFAIL_MSG( wxT("must be implemented if used") ); diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h index b625319b40..0ba7cbba12 100644 --- a/include/wx/msw/glcanvas.h +++ b/include/wx/msw/glcanvas.h @@ -29,7 +29,7 @@ public: const wxGLContextAttrs *ctxAttrs = NULL); virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; + virtual bool SetCurrent(const wxGLCanvas& win) const override; HGLRC GetGLRC() const { return m_glContext; } @@ -88,7 +88,7 @@ public: virtual ~wxGLCanvas(); // implement wxGLCanvasBase methods - virtual bool SwapBuffers() wxOVERRIDE; + virtual bool SwapBuffers() override; // MSW-specific helpers @@ -109,7 +109,7 @@ public: #if wxUSE_PALETTE // palette stuff bool SetupPalette(const wxPalette& palette); - virtual wxPalette CreateDefaultPalette() wxOVERRIDE; + virtual wxPalette CreateDefaultPalette() override; void OnQueryNewPalette(wxQueryNewPaletteEvent& event); void OnPaletteChanged(wxPaletteChangedEvent& event); #endif // wxUSE_PALETTE diff --git a/include/wx/msw/headerctrl.h b/include/wx/msw/headerctrl.h index b099ccd412..7a1acb6cfc 100644 --- a/include/wx/msw/headerctrl.h +++ b/include/wx/msw/headerctrl.h @@ -46,25 +46,25 @@ public: const wxString& name = wxASCII_STR(wxHeaderCtrlNameStr)); // Window style handling. - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; protected: // Override wxWindow methods which must be implemented by a new control. - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: // Implement base class pure virtuals. - virtual void DoSetCount(unsigned int count) wxOVERRIDE; - virtual unsigned int DoGetCount() const wxOVERRIDE; - virtual void DoUpdate(unsigned int idx) wxOVERRIDE; + virtual void DoSetCount(unsigned int count) override; + virtual unsigned int DoGetCount() const override; + virtual void DoUpdate(unsigned int idx) override; - virtual void DoScrollHorz(int dx) wxOVERRIDE; + virtual void DoScrollHorz(int dx) override; - virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE; - virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE; + virtual void DoSetColumnsOrder(const wxArrayInt& order) override; + virtual wxArrayInt DoGetColumnsOrder() const override; // Pure virtual method inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; // Common part of all ctors. void Init(); diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index 394a2a47fe..cb38514567 100644 --- a/include/wx/msw/helpbest.h +++ b/include/wx/msw/helpbest.h @@ -32,52 +32,52 @@ public: virtual ~wxBestHelpController() { delete m_helpController; } // Must call this to set the filename - virtual bool Initialize(const wxString& file) wxOVERRIDE; - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); } + virtual bool Initialize(const wxString& file) override; + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) override { return Initialize( file ); } // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE + virtual bool LoadFile(const wxString& file = wxEmptyString) override { return m_helpController->LoadFile( GetValidFilename( file ) ); } - virtual bool DisplayContents() wxOVERRIDE + virtual bool DisplayContents() override { return m_helpController->DisplayContents(); } - virtual bool DisplaySection(int sectionNo) wxOVERRIDE + virtual bool DisplaySection(int sectionNo) override { return m_helpController->DisplaySection( sectionNo ); } - virtual bool DisplaySection(const wxString& section) wxOVERRIDE + virtual bool DisplaySection(const wxString& section) override { return m_helpController->DisplaySection( section ); } - virtual bool DisplayBlock(long blockNo) wxOVERRIDE + virtual bool DisplayBlock(long blockNo) override { return m_helpController->DisplayBlock( blockNo ); } - virtual bool DisplayContextPopup(int contextId) wxOVERRIDE + virtual bool DisplayContextPopup(int contextId) override { return m_helpController->DisplayContextPopup( contextId ); } - virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE + virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) override { return m_helpController->DisplayTextPopup( text, pos ); } virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) override { return m_helpController->KeywordSearch( k, mode ); } - virtual bool Quit() wxOVERRIDE + virtual bool Quit() override { return m_helpController->Quit(); } @@ -86,7 +86,7 @@ public: virtual void SetFrameParameters(const wxString& title, const wxSize& size, const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = false) wxOVERRIDE + bool newFrameEachTime = false) override { m_helpController->SetFrameParameters( title, size, pos, newFrameEachTime ); @@ -95,17 +95,17 @@ public: // 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) wxOVERRIDE + bool *newFrameEachTime = NULL) override { return m_helpController->GetFrameParameters( size, pos, newFrameEachTime ); } /// Set the window that can optionally be used for the help window's parent. - virtual void SetParentWindow(wxWindow* win) wxOVERRIDE { m_helpController->SetParentWindow(win); } + virtual void SetParentWindow(wxWindow* win) override { m_helpController->SetParentWindow(win); } /// Get the window that can optionally be used for the help window's parent. - virtual wxWindow* GetParentWindow() const wxOVERRIDE { return m_helpController->GetParentWindow(); } + virtual wxWindow* GetParentWindow() const override { return m_helpController->GetParentWindow(); } protected: // Append/change extension if necessary. diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index 4db165d68d..eb1c3de891 100644 --- a/include/wx/msw/helpchm.h +++ b/include/wx/msw/helpchm.h @@ -21,20 +21,20 @@ public: wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { } // Must call this to set the filename - virtual bool Initialize(const wxString& file) wxOVERRIDE; - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); } + virtual bool Initialize(const wxString& file) override; + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) override { return Initialize( file ); } // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE; - virtual bool DisplayContents() wxOVERRIDE; - virtual bool DisplaySection(int sectionNo) wxOVERRIDE; - virtual bool DisplaySection(const wxString& section) wxOVERRIDE; - virtual bool DisplayBlock(long blockNo) wxOVERRIDE; - virtual bool DisplayContextPopup(int contextId) wxOVERRIDE; - virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE; + virtual bool LoadFile(const wxString& file = wxEmptyString) override; + virtual bool DisplayContents() override; + virtual bool DisplaySection(int sectionNo) override; + virtual bool DisplaySection(const wxString& section) override; + virtual bool DisplayBlock(long blockNo) override; + virtual bool DisplayContextPopup(int contextId) override; + virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) override; virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE; - virtual bool Quit() wxOVERRIDE; + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) override; + virtual bool Quit() override; wxString GetHelpFile() const { return m_helpFile; } diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index 82bd694ed6..1370093bdd 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -26,19 +26,19 @@ public: virtual ~wxWinHelpController() {} // Must call this to set the filename - virtual bool Initialize(const wxString& file) wxOVERRIDE; - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); } + virtual bool Initialize(const wxString& file) override; + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) override { return Initialize( file ); } // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE; - virtual bool DisplayContents() wxOVERRIDE; - virtual bool DisplaySection(int sectionNo) wxOVERRIDE; - virtual bool DisplaySection(const wxString& section) wxOVERRIDE { return KeywordSearch(section); } - virtual bool DisplayBlock(long blockNo) wxOVERRIDE; - virtual bool DisplayContextPopup(int contextId) wxOVERRIDE; + virtual bool LoadFile(const wxString& file = wxEmptyString) override; + virtual bool DisplayContents() override; + virtual bool DisplaySection(int sectionNo) override; + virtual bool DisplaySection(const wxString& section) override { return KeywordSearch(section); } + virtual bool DisplayBlock(long blockNo) override; + virtual bool DisplayContextPopup(int contextId) override; virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE; - virtual bool Quit() wxOVERRIDE; + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) override; + virtual bool Quit() override; inline wxString GetHelpFile() const { return m_helpFile; } diff --git a/include/wx/msw/hyperlink.h b/include/wx/msw/hyperlink.h index fe54820774..e33d891e12 100644 --- a/include/wx/msw/hyperlink.h +++ b/include/wx/msw/hyperlink.h @@ -47,16 +47,16 @@ public: // overridden base class methods // ----------------------------- - virtual void SetURL(const wxString &url) wxOVERRIDE; + virtual void SetURL(const wxString &url) override; - virtual void SetLabel(const wxString &label) wxOVERRIDE; + virtual void SetLabel(const wxString &label) override; protected: - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; + virtual wxSize DoGetBestClientSize() const override; private: - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; wxDECLARE_DYNAMIC_CLASS( wxHyperlinkCtrl ); }; diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 294e4577b1..4a7b478a9c 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -29,7 +29,7 @@ public: wxIconRefData() { } virtual ~wxIconRefData() { Free(); } - virtual void Free() wxOVERRIDE; + virtual void Free() override; }; // --------------------------------------------------------------------------- @@ -79,12 +79,12 @@ public: void CopyFromBitmap(const wxBitmap& bmp); protected: - virtual wxGDIImageRefData *CreateData() const wxOVERRIDE + virtual wxGDIImageRefData *CreateData() const override { return new wxIconRefData; } - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override; // create from XPM data void CreateIconFromXpm(const char* const* data); diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h index 5f3f3435e7..c8c41e7b4f 100644 --- a/include/wx/msw/iniconf.h +++ b/include/wx/msw/iniconf.h @@ -51,44 +51,44 @@ public: virtual ~wxIniConfig(); // implement inherited pure virtual functions - virtual void SetPath(const wxString& strPath) wxOVERRIDE; - virtual const wxString& GetPath() const wxOVERRIDE; + virtual void SetPath(const wxString& strPath) override; + virtual const wxString& GetPath() const override; - 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 bool GetFirstGroup(wxString& str, long& lIndex) const override; + virtual bool GetNextGroup (wxString& str, long& lIndex) const override; + virtual bool GetFirstEntry(wxString& str, long& lIndex) const override; + virtual bool GetNextEntry (wxString& str, long& lIndex) const override; - virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE; + virtual size_t GetNumberOfEntries(bool bRecursive = false) const override; + virtual size_t GetNumberOfGroups(bool bRecursive = false) const override; - virtual bool HasGroup(const wxString& strName) const wxOVERRIDE; - virtual bool HasEntry(const wxString& strName) const wxOVERRIDE; + virtual bool HasGroup(const wxString& strName) const override; + virtual bool HasEntry(const wxString& strName) const override; // return true if the current group is empty bool IsEmpty() const; - virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE; + virtual bool Flush(bool bCurrentOnly = false) override; - virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE; - virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE; + virtual bool RenameEntry(const wxString& oldName, const wxString& newName) override; + virtual bool RenameGroup(const wxString& oldName, const wxString& newName) override; - virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true) wxOVERRIDE; - virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE; - virtual bool DeleteAll() wxOVERRIDE; + virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true) override; + virtual bool DeleteGroup(const wxString& szKey) override; + virtual bool DeleteAll() override; protected: // read/write - bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE; - bool DoReadLong(const wxString& key, long *plResult) const wxOVERRIDE; + bool DoReadString(const wxString& key, wxString *pStr) const override; + bool DoReadLong(const wxString& key, long *plResult) const override; #if wxUSE_BASE64 - bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const wxOVERRIDE; + bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const override; #endif // wxUSE_BASE64 - bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE; - bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE; + bool DoWriteString(const wxString& key, const wxString& szValue) override; + bool DoWriteLong(const wxString& key, long lValue) override; #if wxUSE_BASE64 - bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE; + bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) override; #endif // wxUSE_BASE64 private: diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 88eff303a1..cf489e52a6 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -80,31 +80,31 @@ public: virtual ~wxListBox(); - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; - virtual bool IsSelected(int n) const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; + virtual bool IsSelected(int n) const override; + virtual int GetSelection() const override; + virtual int GetSelections(wxArrayInt& aSelections) const override; // return the index of the item at this position or wxNOT_FOUND int HitTest(const wxPoint& pt) const { return DoHitTestList(pt); } int HitTest(wxCoord x, wxCoord y) const { return DoHitTestList(wxPoint(x, y)); } - virtual void EnsureVisible(int n) wxOVERRIDE; + virtual void EnsureVisible(int n) override; - virtual int GetTopItem() const wxOVERRIDE; - virtual int GetCountPerPage() const wxOVERRIDE; + virtual int GetTopItem() const override; + virtual int GetCountPerPage() const override; // ownerdrawn wxListBox and wxCheckListBox support #if wxUSE_OWNER_DRAWN // override base class virtuals - virtual bool SetFont(const wxFont &font) wxOVERRIDE; + virtual bool SetFont(const wxFont &font) override; - bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE; - bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE; + bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) override; + bool MSWOnDraw(WXDRAWITEMSTRUCT *item) override; // plug-in for derived classes virtual wxOwnerDrawn *CreateLboxItem(size_t n); @@ -133,17 +133,17 @@ public: virtual bool MSWSetTabStops(const wxVector& tabStops); // Windows callbacks - bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + bool MSWCommand(WXUINT param, WXWORD id) override; + WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // under XP when using "transition effect for menus and tooltips" if we // return true for WM_PRINTCLIENT here then it causes noticeable slowdown - virtual bool MSWShouldPropagatePrintChild() wxOVERRIDE + virtual bool MSWShouldPropagatePrintChild() override { return false; } - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -155,25 +155,25 @@ public: } // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; + virtual void DoSetSelection(int n, bool select) override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoSetFirstItem(int n) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetFirstItem(int n) override; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; // this can't be called DoHitTest() because wxWindow already has this method virtual int DoHitTestList(const wxPoint& point) const; @@ -185,7 +185,7 @@ protected: return wxSize(w, h); } - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // free memory (common part of Clear() and dtor) void Free(); diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h index f796132418..4a3362bf84 100644 --- a/include/wx/msw/listctrl.h +++ b/include/wx/msw/listctrl.h @@ -109,34 +109,34 @@ public: //////////////////////////////////////////////////////////////////////////// // Set the control colours - bool SetForegroundColour(const wxColour& col) wxOVERRIDE; - bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; + bool SetForegroundColour(const wxColour& col) override; + bool SetBackgroundColour(const wxColour& col) override; // Header attributes - virtual bool SetHeaderAttr(const wxItemAttr& attr) wxOVERRIDE; + virtual bool SetHeaderAttr(const wxItemAttr& attr) override; // Gets information about this column - bool GetColumn(int col, wxListItem& item) const wxOVERRIDE; + bool GetColumn(int col, wxListItem& item) const override; // Sets information about this column - bool SetColumn(int col, const wxListItem& item) wxOVERRIDE; + bool SetColumn(int col, const wxListItem& item) override; // Gets the column width - int GetColumnWidth(int col) const wxOVERRIDE; + int GetColumnWidth(int col) const override; // Sets the column width - bool SetColumnWidth(int col, int width) wxOVERRIDE; + bool SetColumnWidth(int col, int width) override; // Gets the column order from its index or index from its order - int GetColumnOrder(int col) const wxOVERRIDE; - int GetColumnIndexFromOrder(int order) const wxOVERRIDE; + int GetColumnOrder(int col) const override; + int GetColumnIndexFromOrder(int order) const override; // Gets the column order for all columns - wxArrayInt GetColumnsOrder() const wxOVERRIDE; + wxArrayInt GetColumnsOrder() const override; // Sets the column order for all columns - bool SetColumnsOrder(const wxArrayInt& orders) wxOVERRIDE; + bool SetColumnsOrder(const wxArrayInt& orders) override; // Gets the number of items that can fit vertically in the @@ -155,7 +155,7 @@ public: bool GetItem(wxListItem& info) const; // Check if the item is visible - bool IsVisible(long item) const wxOVERRIDE; + bool IsVisible(long item) const override; // Sets information about the item bool SetItem(wxListItem& info); @@ -199,10 +199,10 @@ public: bool SetItemPosition(long item, const wxPoint& pos); // Gets the number of items in the list control - int GetItemCount() const wxOVERRIDE; + int GetItemCount() const override; // Gets the number of columns in the list control - int GetColumnCount() const wxOVERRIDE { return m_colCount; } + int GetColumnCount() const override { return m_colCount; } // get the horizontal and vertical components of the item spacing wxSize GetItemSpacing() const; @@ -220,15 +220,15 @@ public: wxFont GetItemFont( long item ) const; // Checkbox state of an item - bool HasCheckBoxes() const wxOVERRIDE; - bool EnableCheckBoxes(bool enable = true) wxOVERRIDE; - bool IsItemChecked(long item) const wxOVERRIDE; - void CheckItem(long item, bool check) wxOVERRIDE; + bool HasCheckBoxes() const override; + bool EnableCheckBoxes(bool enable = true) override; + bool IsItemChecked(long item) const override; + void CheckItem(long item, bool check) override; // Sort indicator in header - void ShowSortIndicator(int idx, bool ascending = true) wxOVERRIDE; - int GetSortIndicator() const wxOVERRIDE; - bool IsAscendingSortIndicator() const wxOVERRIDE; + void ShowSortIndicator(int idx, bool ascending = true) override; + int GetSortIndicator() const override; + bool IsAscendingSortIndicator() const override; // Gets the number of selected items in the list control int GetSelectedItemCount() const; @@ -247,7 +247,7 @@ public: void SetSingleStyle(long style, bool add = true); // Set the whole window style - void SetWindowStyleFlag(long style) wxOVERRIDE; + void SetWindowStyleFlag(long style) override; // Searches for an item, starting from 'item'. // item can be -1 to find the first item that matches the @@ -272,10 +272,10 @@ public: bool DeleteAllItems(); // Deletes a column - bool DeleteColumn(int col) wxOVERRIDE; + bool DeleteColumn(int col) override; // Deletes all columns - bool DeleteAllColumns() wxOVERRIDE; + bool DeleteAllColumns() override; // Clears items, and columns if there are any. void ClearAll(); @@ -343,9 +343,9 @@ public: bool SortItems(wxListCtrlCompare fn, wxIntPtr data); // IMPLEMENTATION - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; - virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; + virtual bool MSWShouldPreProcessMessage(WXMSG* msg) override; #if WXWIN_COMPATIBILITY_3_0 // bring the control in sync with current m_windowStyle value @@ -361,12 +361,12 @@ public: // Override SetDoubleBuffered() to do nothing, its implementation in the // base class is incompatible with the double buffering done by this native // control. - virtual bool IsDoubleBuffered() const wxOVERRIDE; - virtual void SetDoubleBuffered(bool on) wxOVERRIDE; + virtual bool IsDoubleBuffered() const override; + virtual void SetDoubleBuffered(bool on) override; - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { return false; } - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -375,37 +375,37 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); // convert our styles to Windows - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // special Windows message handling virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, - WXLPARAM lParam) wxOVERRIDE; + WXLPARAM lParam) override; protected: // common part of all ctors void Init(); - virtual bool MSWShouldSetDefaultFont() const wxOVERRIDE { return false; } + virtual bool MSWShouldSetDefaultFont() const override { return false; } // Implement constrained best size calculation. - virtual int DoGetBestClientHeight(int width) const wxOVERRIDE + virtual int DoGetBestClientHeight(int width) const override { return MSWGetBestViewRect(width, -1).y; } - virtual int DoGetBestClientWidth(int height) const wxOVERRIDE + virtual int DoGetBestClientWidth(int height) const override { return MSWGetBestViewRect(-1, height).x; } #if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE; + virtual void DoSetToolTip(wxToolTip *tip) override; #endif // wxUSE_TOOLTIPS - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; void OnDPIChanged(wxDPIChangedEvent& event); wxSize MSWGetBestViewRect(int x, int y) const; // Implement base class pure virtual methods. - long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE; - void DoUpdateImages(int which) wxOVERRIDE; + long DoInsertColumn(long col, const wxListItem& info) override; + void DoUpdateImages(int which) override; // free memory taken by all internal data void FreeAllInternalData(); diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 209fdd5277..55004e9ebc 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -54,21 +54,21 @@ public: // we don't store the active child in m_currentChild so override this // function to find it dynamically - virtual wxMDIChildFrame *GetActiveChild() const wxOVERRIDE; + virtual wxMDIChildFrame *GetActiveChild() const override; - virtual void Cascade() wxOVERRIDE; - virtual void Tile(wxOrientation orient = wxHORIZONTAL) wxOVERRIDE; - virtual void ArrangeIcons() wxOVERRIDE; - virtual void ActivateNext() wxOVERRIDE; - virtual void ActivatePrevious() wxOVERRIDE; + virtual void Cascade() override; + virtual void Tile(wxOrientation orient = wxHORIZONTAL) override; + virtual void ArrangeIcons() override; + virtual void ActivateNext() override; + virtual void ActivatePrevious() override; #if wxUSE_MENUS - virtual void SetWindowMenu(wxMenu* menu) wxOVERRIDE; + virtual void SetWindowMenu(wxMenu* menu) override; - virtual void DoMenuUpdates(wxMenu* menu = NULL) wxOVERRIDE; + virtual void DoMenuUpdates(wxMenu* menu = NULL) override; // return the active child menu, if any - virtual WXHMENU MSWGetActiveMenu() const wxOVERRIDE; + virtual WXHMENU MSWGetActiveMenu() const override; #endif // wxUSE_MENUS @@ -105,24 +105,24 @@ public: bool HandleActivate(int state, bool minimized, WXHWND activate); // override window proc for MDI-specific message processing - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; - virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM) wxOVERRIDE; - virtual bool MSWTranslateMessage(WXMSG* msg) wxOVERRIDE; + virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM) override; + virtual bool MSWTranslateMessage(WXMSG* msg) override; #if wxUSE_MENUS // override the menu-relayed methods to also look in the active child menu // bar and the "Window" menu - virtual wxMenuItem *FindItemInMenuBar(int menuId) const wxOVERRIDE; - virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE; + virtual wxMenuItem *FindItemInMenuBar(int menuId) const override; + virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) override; #endif // wxUSE_MENUS protected: #if wxUSE_MENUS_NATIVE - virtual void InternalSetMenuBar() wxOVERRIDE; + virtual void InternalSetMenuBar() override; #endif // wxUSE_MENUS_NATIVE - virtual WXHICON GetDefaultIcon() const wxOVERRIDE; + virtual WXHICON GetDefaultIcon() const override; // set the size of the MDI client window to match the frame size void UpdateClientSize(); @@ -200,13 +200,13 @@ public: virtual ~wxMDIChildFrame(); // implement MDI operations - virtual void Activate() wxOVERRIDE; + virtual void Activate() override; // Override some frame operations too - virtual void Maximize(bool maximize = true) wxOVERRIDE; - virtual void Restore() wxOVERRIDE; + virtual void Maximize(bool maximize = true) override; + virtual void Restore() override; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; // Implementation only from now on // ------------------------------- @@ -216,26 +216,26 @@ public: bool HandleWindowPosChanging(void *lpPos); bool HandleGetMinMaxInfo(void *mmInfo); - virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) override; + virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) override; + virtual bool MSWTranslateMessage(WXMSG *msg) override; - virtual void MSWDestroyWindow() wxOVERRIDE; + virtual void MSWDestroyWindow() override; bool ResetWindowStyle(void *vrect); void OnIdle(wxIdleEvent& event); protected: - virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE; - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual void InternalSetMenuBar() wxOVERRIDE; - virtual bool IsMDIChild() const wxOVERRIDE { return true; } - virtual void DetachMenuBar() wxOVERRIDE; + virtual void DoGetScreenPosition(int *x, int *y) const override; + virtual void DoGetPosition(int *x, int *y) const override; + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) override; + virtual void DoSetClientSize(int width, int height) override; + virtual void InternalSetMenuBar() override; + virtual bool IsMDIChild() const override { return true; } + virtual void DetachMenuBar() override; - virtual WXHICON GetDefaultIcon() const wxOVERRIDE; + virtual WXHICON GetDefaultIcon() const override; // common part of all ctors void Init(); @@ -258,7 +258,7 @@ public: // Note: this is virtual, to allow overridden behaviour. virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; + long style = wxVSCROLL | wxHSCROLL) override; // Explicitly call default scroll behaviour void OnScroll(wxScrollEvent& event); @@ -266,7 +266,7 @@ public: protected: virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; void Init() { m_scrollX = m_scrollY = 0; } diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 9a7635acbc..de146172de 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -40,9 +40,9 @@ public: virtual ~wxMenu(); - virtual void Break() wxOVERRIDE; + virtual void Break() override; - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; // MSW-only methods // ---------------- @@ -113,9 +113,9 @@ private: #endif // wxUSE_OWNER_DRAWN protected: - virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem* DoAppend(wxMenuItem *item) override; + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) override; + virtual wxMenuItem* DoRemove(wxMenuItem *item) override; private: // This constructor is private, use MSWNewFromHMENU() to use it. @@ -181,20 +181,20 @@ public: virtual ~wxMenuBar(); // menubar construction - 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 bool Append( wxMenu *menu, const wxString &title ) override; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Remove(size_t pos) override; - virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE; - virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; - virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE; - virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE; + virtual void EnableTop( size_t pos, bool flag ) override; + virtual bool IsEnabledTop(size_t pos) const override; + virtual void SetMenuLabel( size_t pos, const wxString& label ) override; + virtual wxString GetMenuLabel( size_t pos ) const override; // implementation from now on WXHMENU Create(); - virtual void Detach() wxOVERRIDE; - virtual void Attach(wxFrame *frame) wxOVERRIDE; + virtual void Detach() override; + virtual void Attach(wxFrame *frame) override; #if wxUSE_ACCEL // update the accel table (must be called after adding/deleting a menu) @@ -210,7 +210,7 @@ public: // To avoid compile warning void Refresh( bool eraseBackground, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE { wxWindow::Refresh(eraseBackground, rect); } + const wxRect *rect = (const wxRect *) NULL ) override { wxWindow::Refresh(eraseBackground, rect); } // Get a top level menu position or wxNOT_FOUND from its handle. int MSWGetTopMenuPos(WXHMENU hMenu) const; diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index efd234de05..fa6f8babd8 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -41,11 +41,11 @@ public: virtual ~wxMenuItem(); // override base class virtuals - virtual void SetItemLabel(const wxString& strName) wxOVERRIDE; + virtual void SetItemLabel(const wxString& strName) override; - virtual void Enable(bool bDoEnable = true) wxOVERRIDE; - virtual void Check(bool bDoCheck = true) wxOVERRIDE; - virtual bool IsChecked() const wxOVERRIDE; + virtual void Enable(bool bDoEnable = true) override; + virtual void Check(bool bDoCheck = true) override; + virtual bool IsChecked() const override; // unfortunately needed to resolve ambiguity between // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable() @@ -66,12 +66,12 @@ public: DoSetBitmap(bmpUnchecked, false); } - virtual void SetBitmap(const wxBitmapBundle& bmp) wxOVERRIDE + virtual void SetBitmap(const wxBitmapBundle& bmp) override { DoSetBitmap(bmp, true); } - virtual wxBitmap GetBitmap() const wxOVERRIDE + virtual wxBitmap GetBitmap() const override { return GetBitmap(true); } @@ -98,13 +98,13 @@ public: int MeasureAccelWidth() const; // override wxOwnerDrawn base class virtuals - virtual wxString GetName() const wxOVERRIDE; - virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight) wxOVERRIDE; - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) wxOVERRIDE; + virtual wxString GetName() const override; + virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight) override; + virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) override; protected: - virtual void GetFontToUse(wxFont& font) const wxOVERRIDE; - virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const wxOVERRIDE; + virtual void GetFontToUse(wxFont& font) const override; + virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const override; private: // helper function for draw std menu check mark diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index 961f46687e..fe1ca8f438 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -30,7 +30,7 @@ public: wxMetafileRefData(); virtual ~wxMetafileRefData(); - virtual bool IsOk() const wxOVERRIDE { return m_metafile != 0; } + virtual bool IsOk() const override { return m_metafile != 0; } public: WXHANDLE m_metafile; @@ -69,8 +69,8 @@ public: void SetWindowsMappingMode(int mm); protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxMetafile); @@ -85,12 +85,12 @@ public: virtual ~wxMetafileDCImpl(); virtual wxMetafile *Close(); - virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE; + virtual void SetMapMode(wxMappingMode mode) override; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; // Implementation wxMetafile *GetMetaFile() const { return m_metaFile; } @@ -99,7 +99,7 @@ public: void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; int m_windowsMappingMode; wxMetafile* m_metaFile; @@ -174,9 +174,9 @@ public: { return m_metafile; } // implement base class pure virtuals - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; protected: wxMetafile m_metafile; diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h index 39c9ed4693..f357258ed0 100644 --- a/include/wx/msw/mfc.h +++ b/include/wx/msw/mfc.h @@ -61,7 +61,7 @@ class wxMFCApp : public T public: typedef T BaseApp; - BOOL InitInstance() wxOVERRIDE + BOOL InitInstance() override { if ( !BaseApp::InitInstance() ) return FALSE; @@ -78,7 +78,7 @@ public: return TRUE; } - int ExitInstance() wxOVERRIDE + int ExitInstance() override { delete BaseApp::m_pMainWnd; BaseApp::m_pMainWnd = NULL; @@ -92,7 +92,7 @@ public: } // Override this to provide messages pre-processing for wxWidgets windows. - BOOL PreTranslateMessage(MSG *msg) wxOVERRIDE + BOOL PreTranslateMessage(MSG *msg) override { // Use the current event loop if there is one, or just fall back to the // standard one otherwise, but make sure we pre-process messages in any @@ -109,7 +109,7 @@ public: return BaseApp::PreTranslateMessage(msg); } - BOOL OnIdle(LONG lCount) wxOVERRIDE + BOOL OnIdle(LONG lCount) override { BOOL moreIdle = BaseApp::OnIdle(lCount); @@ -171,14 +171,14 @@ typedef wxMFCApp wxMFCWinApp; class wxAppWithMFC : public wxApp { public: - void ExitMainLoop() wxOVERRIDE + void ExitMainLoop() override { // There is no wxEventLoop to exit, tell MFC to stop pumping messages // instead. ::PostQuitMessage(0); } - void WakeUpIdle() wxOVERRIDE + void WakeUpIdle() override { // As above, we can't wake up any wx event loop, so try to wake up the // MFC one instead. diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h index 8996ee9c1b..ac937d7c77 100644 --- a/include/wx/msw/msgdlg.h +++ b/include/wx/msw/msgdlg.h @@ -24,9 +24,9 @@ public: m_hook = NULL; } - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - virtual long GetEffectiveIcon() const wxOVERRIDE; + virtual long GetEffectiveIcon() const override; // implementation-specific @@ -35,7 +35,7 @@ public: protected: // Override this as task dialogs are always centered on parent. - virtual void DoCentre(int dir) wxOVERRIDE; + virtual void DoCentre(int dir) override; private: // hook procedure used to adjust the message box beyond what the standard diff --git a/include/wx/msw/nonownedwnd.h b/include/wx/msw/nonownedwnd.h index 10749287eb..d0eca40627 100644 --- a/include/wx/msw/nonownedwnd.h +++ b/include/wx/msw/nonownedwnd.h @@ -22,17 +22,17 @@ public: wxNonOwnedWindow(); virtual ~wxNonOwnedWindow(); - virtual bool Reparent(wxWindowBase* newParent) wxOVERRIDE; - virtual bool IsThisEnabled() const wxOVERRIDE; + virtual bool Reparent(wxWindowBase* newParent) override; + virtual bool IsThisEnabled() const override; protected: - virtual bool DoClearShape() wxOVERRIDE; - virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; + virtual bool DoClearShape() override; + virtual bool DoSetRegionShape(const wxRegion& region) override; #if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE; + virtual bool DoSetPathShape(const wxGraphicsPath& path) override; #endif // wxUSE_GRAPHICS_CONTEXT - virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) override; private: bool HandleDPIChange(const wxSize& newDPI, const wxRect& newRect); diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 12bf1ac87a..8bb965239d 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -48,38 +48,38 @@ public: // accessors // --------- // get number of pages in the dialog - virtual size_t GetPageCount() const wxOVERRIDE; + virtual size_t GetPageCount() const override; // 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) wxOVERRIDE; + int SetSelection(size_t nPage) override; // changes selected page without sending events - int ChangeSelection(size_t nPage) wxOVERRIDE; + int ChangeSelection(size_t nPage) override; // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; - wxString GetPageText(size_t nPage) const wxOVERRIDE; + bool SetPageText(size_t nPage, const wxString& strText) override; + wxString GetPageText(size_t nPage) const override; // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const wxOVERRIDE; - bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; + int GetPageImage(size_t nPage) const override; + bool SetPageImage(size_t nPage, int nImage) override; // currently it's always 1 because wxGTK doesn't support multi-row // tab controls - int GetRowCount() const wxOVERRIDE; + int GetRowCount() const override; // control the appearance of the notebook pages // set the size (the same for all pages) - void SetPageSize(const wxSize& size) wxOVERRIDE; + void SetPageSize(const wxSize& size) override; // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding) wxOVERRIDE; + void SetPadding(const wxSize& padding) override; // operations // ---------- // remove all pages - bool DeleteAllPages() wxOVERRIDE; + bool DeleteAllPages() override; // inserts a new page to the notebook (it will be deleted ny the notebook, // don't delete it yourself). If bSelect, this page becomes active. @@ -87,17 +87,17 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; + int imageId = NO_IMAGE) override; // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. - void SetTabSize(const wxSize& sz) wxOVERRIDE; + void SetTabSize(const wxSize& sz) override; // hit test - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; // calculate the size of the notebook from the size of its page - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const override; // callbacks // --------- @@ -107,32 +107,32 @@ public: // base class virtuals // ------------------- - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, - WXWORD pos, WXHWND control) wxOVERRIDE; + WXWORD pos, WXHWND control) override; #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE; - virtual bool DoPhase(int nPhase) wxOVERRIDE; + virtual void SetConstraintSizes(bool recurse = true) override; + virtual bool DoPhase(int nPhase) override; #endif // wxUSE_CONSTRAINTS // Attempts to get colour for UX theme page background - wxColour GetThemeBackgroundColour() const wxOVERRIDE; + wxColour GetThemeBackgroundColour() const override; // implementation only // ------------------- - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; #if wxUSE_UXTHEME // draw child background - virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win) wxOVERRIDE; + virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win) override; - virtual bool MSWHasInheritableBackground() const wxOVERRIDE { return true; } + virtual bool MSWHasInheritableBackground() const override { return true; } #endif // wxUSE_UXTHEME // translate wxWin styles to the Windows ones - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override; protected: // common part of all ctors @@ -143,10 +143,10 @@ protected: void UpdateSelection(int selNew); // remove one page from the notebook, without deleting - virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE; + virtual wxNotebookPage *DoRemovePage(size_t nPage) override; // update the image list used by the native control - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; // get the page rectangle for the current notebook size // @@ -157,14 +157,14 @@ protected: void AdjustPageSize(wxNotebookPage *page); #if wxUSE_UXTHEME - virtual void MSWAdjustBrushOrg(int *xOrg, int* yOrg) const wxOVERRIDE + virtual void MSWAdjustBrushOrg(int *xOrg, int* yOrg) const override { *xOrg -= m_bgBrushAdj.x; *yOrg -= m_bgBrushAdj.y; } // return the themed brush for painting our children - virtual WXHBRUSH MSWGetCustomBgBrush() wxOVERRIDE { return m_hbrBackground; } + virtual WXHBRUSH MSWGetCustomBgBrush() override { return m_hbrBackground; } // gets the bitmap of notebook background and returns a brush from it and // sets m_bgBrushAdj diff --git a/include/wx/msw/ole/activex.h b/include/wx/msw/ole/activex.h index 8cae401497..c0f933c040 100644 --- a/include/wx/msw/ole/activex.h +++ b/include/wx/msw/ole/activex.h @@ -159,7 +159,7 @@ public: void OnPaint(wxPaintEvent&); void OnSetFocus(wxFocusEvent&); void OnKillFocus(wxFocusEvent&); - virtual bool MSWTranslateMessage(WXMSG* pMsg) wxOVERRIDE; + virtual bool MSWTranslateMessage(WXMSG* pMsg) override; virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); protected: @@ -214,7 +214,7 @@ private: DISPID m_dispid; public: - virtual wxEvent *Clone() const wxOVERRIDE + virtual wxEvent *Clone() const override { return new wxActiveXEvent(*this); } size_t ParamCount() const; diff --git a/include/wx/msw/ole/comimpl.h b/include/wx/msw/ole/comimpl.h index 3f8b1c7996..731f8035c6 100644 --- a/include/wx/msw/ole/comimpl.h +++ b/include/wx/msw/ole/comimpl.h @@ -85,9 +85,9 @@ private: #define DECLARE_IUNKNOWN_METHODS \ public: \ - STDMETHODIMP QueryInterface(REFIID, void **) wxOVERRIDE; \ - STDMETHODIMP_(ULONG) AddRef() wxOVERRIDE; \ - STDMETHODIMP_(ULONG) Release() wxOVERRIDE; \ + STDMETHODIMP QueryInterface(REFIID, void **) override; \ + STDMETHODIMP_(ULONG) AddRef() override; \ + STDMETHODIMP_(ULONG) Release() override; \ private: \ static const IID *ms_aIids[]; \ wxAutoULong m_cRef diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h index 3f881c6db1..248568df62 100644 --- a/include/wx/msw/ole/dataobj2.h +++ b/include/wx/msw/ole/dataobj2.h @@ -33,17 +33,17 @@ public: } // implement base class pure virtuals - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE + void *buf) const override { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE + size_t len, const void *buf) override { return SetData(len, buf); } private: @@ -69,17 +69,17 @@ public: } // implement base class pure virtuals - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE + void *buf) const override { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE + size_t len, const void *buf) override { return SetData(len, buf); } private: @@ -96,18 +96,18 @@ public: wxFileDataObject() { } // implement base class pure virtuals - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *pData) const wxOVERRIDE; + virtual bool SetData(size_t len, const void *buf) override; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *pData) const override; virtual void AddFile(const wxString& file); - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE + void *buf) const override { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE + size_t len, const void *buf) override { return SetData(len, buf); } private: @@ -133,7 +133,7 @@ public: // override to set m_textFormat virtual bool SetData(const wxDataFormat& format, size_t len, - const void *buf) wxOVERRIDE; + const void *buf) override; private: // last data object we got data in diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h index 3fcfe9bc94..52271b448e 100644 --- a/include/wx/msw/ole/dropsrc.h +++ b/include/wx/msw/ole/dropsrc.h @@ -57,12 +57,12 @@ public: // do it (call this in response to a mouse button press, for example) // params: if bAllowMove is false, data can be only copied - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) override; // overridable: you may give some custom UI feedback during d&d operation // in this function (it's called on each mouse move, so it shouldn't be // too slow). Just return false if you want default feedback. - virtual bool GiveFeedback(wxDragResult effect) wxOVERRIDE; + virtual bool GiveFeedback(wxDragResult effect) override; protected: void Init(); diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h index 2602e05ddd..6dd6ac2055 100644 --- a/include/wx/msw/ole/droptgt.h +++ b/include/wx/msw/ole/droptgt.h @@ -44,8 +44,8 @@ public: void Revoke(WXHWND hwnd); // provide default implementation for base class pure virtuals - virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE; - virtual bool GetData() wxOVERRIDE; + virtual bool OnDrop(wxCoord x, wxCoord y) override; + virtual bool GetData() override; // Can only be called during OnXXX methods. wxDataFormat GetMatchingPair(); diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h index ed45e592d0..2393e74d2c 100644 --- a/include/wx/msw/ole/oleutils.h +++ b/include/wx/msw/ole/oleutils.h @@ -122,15 +122,15 @@ public: CURRENCY GetValue() const { return m_value; } void SetValue(CURRENCY value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataCurrency(m_value); } - virtual wxString GetType() const wxOVERRIDE { return wxS("currency"); } + wxVariantData* Clone() const override { return new wxVariantDataCurrency(m_value); } + virtual wxString GetType() const override { return wxS("currency"); } DECLARE_WXANY_CONVERSION() @@ -148,15 +148,15 @@ public: SCODE GetValue() const { return m_value; } void SetValue(SCODE value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataErrorCode(m_value); } - virtual wxString GetType() const wxOVERRIDE { return wxS("errorcode"); } + wxVariantData* Clone() const override { return new wxVariantDataErrorCode(m_value); } + virtual wxString GetType() const override { return wxS("errorcode"); } DECLARE_WXANY_CONVERSION() @@ -176,15 +176,15 @@ public: SAFEARRAY* GetValue() const { return m_value; } void SetValue(SAFEARRAY* value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataSafeArray(m_value); } - virtual wxString GetType() const wxOVERRIDE { return wxS("safearray"); } + wxVariantData* Clone() const override { return new wxVariantDataSafeArray(m_value); } + virtual wxString GetType() const override { return wxS("safearray"); } DECLARE_WXANY_CONVERSION() diff --git a/include/wx/msw/ownerdrawnbutton.h b/include/wx/msw/ownerdrawnbutton.h index 054076e675..725f050bee 100644 --- a/include/wx/msw/ownerdrawnbutton.h +++ b/include/wx/msw/ownerdrawnbutton.h @@ -110,7 +110,7 @@ public: { } - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE + virtual bool SetForegroundColour(const wxColour& colour) override { if ( !Base::SetForegroundColour(colour) ) return false; @@ -120,7 +120,7 @@ public: return true; } - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) override { return MSWDrawButton(item) || Base::MSWOnDraw(item); } diff --git a/include/wx/msw/ownerdrw.h b/include/wx/msw/ownerdrw.h index 5c70add41c..571e7a1b69 100644 --- a/include/wx/msw/ownerdrw.h +++ b/include/wx/msw/ownerdrw.h @@ -20,7 +20,7 @@ public: virtual ~wxOwnerDrawn() {} virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, - wxODAction act, wxODStatus stat) wxOVERRIDE; + wxODAction act, wxODStatus stat) override; protected: // get the type of the text to draw in OnDrawItem(), by default is diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 4edaa7d643..ad6b450bb6 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -26,7 +26,7 @@ public: bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - virtual int GetColoursCount() const wxOVERRIDE; + virtual int GetColoursCount() const override; int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; @@ -40,8 +40,8 @@ public: void SetHPALETTE(WXHPALETTE pal); protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxPalette); diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 451da2d06f..09d4013a39 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -34,27 +34,27 @@ public: bool operator!=(const wxPen& pen) const { return !(*this == pen); } // Override in order to recreate the pen - void SetColour(const wxColour& col) wxOVERRIDE; - void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; + void SetColour(const wxColour& col) override; + void SetColour(unsigned char r, unsigned char g, unsigned char b) override; - void SetWidth(int width) wxOVERRIDE; - void SetStyle(wxPenStyle style) wxOVERRIDE; - void SetStipple(const wxBitmap& stipple) wxOVERRIDE; - void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE; - void SetJoin(wxPenJoin join) wxOVERRIDE; - void SetCap(wxPenCap cap) wxOVERRIDE; - void SetQuality(wxPenQuality quality) wxOVERRIDE; + void SetWidth(int width) override; + void SetStyle(wxPenStyle style) override; + void SetStipple(const wxBitmap& stipple) override; + void SetDashes(int nb_dashes, const wxDash *dash) override; + void SetJoin(wxPenJoin join) override; + void SetCap(wxPenCap cap) override; + void SetQuality(wxPenQuality quality) override; - wxColour GetColour() const wxOVERRIDE; - int GetWidth() const wxOVERRIDE; - wxPenStyle GetStyle() const wxOVERRIDE; - wxPenJoin GetJoin() const wxOVERRIDE; - wxPenCap GetCap() const wxOVERRIDE; - wxPenQuality GetQuality() const wxOVERRIDE; - int GetDashes(wxDash** ptr) const wxOVERRIDE; + wxColour GetColour() const override; + int GetWidth() const override; + wxPenStyle GetStyle() const override; + wxPenJoin GetJoin() const override; + wxPenCap GetCap() const override; + wxPenQuality GetQuality() const override; + int GetDashes(wxDash** ptr) const override; wxDash* GetDash() const; int GetDashCount() const; - wxBitmap* GetStipple() const wxOVERRIDE; + wxBitmap* GetStipple() const override; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") @@ -65,14 +65,14 @@ public: // internal: wxGDIObject methods - virtual bool RealizeResource() wxOVERRIDE; - virtual bool FreeResource(bool force = false) wxOVERRIDE; - virtual WXHANDLE GetResourceHandle() const wxOVERRIDE; - virtual bool IsFree() const wxOVERRIDE; + virtual bool RealizeResource() override; + virtual bool FreeResource(bool force = false) override; + virtual WXHANDLE GetResourceHandle() const override; + virtual bool IsFree() const override; protected: - virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE; + virtual wxGDIRefData* CreateGDIRefData() const override; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const override; // same as FreeResource() + RealizeResource() bool Recreate(); diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h index 7e486933e5..9cd329c6fd 100644 --- a/include/wx/msw/popupwin.h +++ b/include/wx/msw/popupwin.h @@ -27,14 +27,14 @@ public: virtual ~wxPopupWindow(); - virtual void SetFocus() wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual void SetFocus() override; + virtual bool Show(bool show = true) override; // return the style to be used for the popup windows - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const override; // get the HWND to be used as parent of this window with CreateWindow() - virtual WXHWND MSWGetParent() const wxOVERRIDE; + virtual WXHWND MSWGetParent() const override; // Implementation only from now on. diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h index bceef2a630..da9c5d486e 100644 --- a/include/wx/msw/printdlg.h +++ b/include/wx/msw/printdlg.h @@ -31,11 +31,11 @@ public: wxWindowsPrintNativeData(); virtual ~wxWindowsPrintNativeData(); - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; + virtual bool TransferTo( wxPrintData &data ) override; + virtual bool TransferFrom( const wxPrintData &data ) override; - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; + virtual bool Ok() const override { return IsOk(); } + virtual bool IsOk() const override; void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL); void* GetDevMode() const { return m_devMode; } @@ -65,12 +65,12 @@ public: virtual ~wxWindowsPrintDialog(); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; } - wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); } + wxPrintDialogData& GetPrintDialogData() override { return m_printDialogData; } + wxPrintData& GetPrintData() override { return m_printDialogData.GetPrintData(); } - virtual wxDC *GetPrintDC() wxOVERRIDE; + virtual wxDC *GetPrintDC() override; private: wxPrintDialogData m_printDialogData; @@ -102,11 +102,11 @@ public: virtual ~wxWindowsPageSetupDialog(); bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; bool ConvertToNative( wxPageSetupDialogData &data ); bool ConvertFromNative( wxPageSetupDialogData &data ); - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE { return m_pageSetupData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() override { return m_pageSetupData; } private: wxPageSetupDialogData m_pageSetupData; diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h index 5d3c2085f9..8249a03ede 100644 --- a/include/wx/msw/printwin.h +++ b/include/wx/msw/printwin.h @@ -26,10 +26,10 @@ public: virtual bool Print(wxWindow *parent, wxPrintout *printout, - bool prompt = true) wxOVERRIDE; + bool prompt = true) override; - virtual wxDC *PrintDialog(wxWindow *parent) wxOVERRIDE; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; + virtual wxDC *PrintDialog(wxWindow *parent) override; + virtual bool Setup(wxWindow *parent) override; private: wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter); @@ -51,12 +51,12 @@ public: wxPrintData *data); virtual ~wxWindowsPrintPreview(); - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; + virtual bool Print(bool interactive) override; + virtual void DetermineScaling() override; protected: #if wxUSE_ENH_METAFILE - virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum) wxOVERRIDE; + virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum) override; #endif wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview); diff --git a/include/wx/msw/private/comstream.h b/include/wx/msw/private/comstream.h index 97ea81490b..96dbc31fc3 100644 --- a/include/wx/msw/private/comstream.h +++ b/include/wx/msw/private/comstream.h @@ -22,7 +22,7 @@ public: virtual ~wxCOMBaseStreamAdapter() { } // IUnknown - STDMETHODIMP QueryInterface(REFIID riid, void** ppv) wxOVERRIDE + STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override { if (riid == IID_IUnknown || riid == IID_ISequentialStream || @@ -37,12 +37,12 @@ public: return E_NOINTERFACE; } - STDMETHODIMP_(ULONG) AddRef() wxOVERRIDE + STDMETHODIMP_(ULONG) AddRef() override { return ++m_cRef; } - STDMETHODIMP_(ULONG) Release() wxOVERRIDE + STDMETHODIMP_(ULONG) Release() override { if (--m_cRef == wxAutoULong(0)) { @@ -56,7 +56,7 @@ public: // IStream virtual HRESULT STDMETHODCALLTYPE Seek( LARGE_INTEGER WXUNUSED(dlibMove), DWORD WXUNUSED(dwOrigin), - ULARGE_INTEGER *WXUNUSED(plibNewPosition)) wxOVERRIDE + ULARGE_INTEGER *WXUNUSED(plibNewPosition)) override { return E_NOTIMPL; } @@ -68,34 +68,34 @@ public: virtual HRESULT STDMETHODCALLTYPE CopyTo(IStream *WXUNUSED(pstm), ULARGE_INTEGER WXUNUSED(cb), ULARGE_INTEGER *WXUNUSED(pcbRead), - ULARGE_INTEGER *WXUNUSED(pcbWritten)) wxOVERRIDE + ULARGE_INTEGER *WXUNUSED(pcbWritten)) override { return E_NOTIMPL; } - virtual HRESULT STDMETHODCALLTYPE Commit(DWORD WXUNUSED(grfCommitFlags)) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Commit(DWORD WXUNUSED(grfCommitFlags)) override { return E_NOTIMPL; } - virtual HRESULT STDMETHODCALLTYPE Revert(void) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Revert(void) override { return E_NOTIMPL; } virtual HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER WXUNUSED(libOffset), - ULARGE_INTEGER WXUNUSED(cb), DWORD WXUNUSED(dwLockType)) wxOVERRIDE + ULARGE_INTEGER WXUNUSED(cb), DWORD WXUNUSED(dwLockType)) override { return E_NOTIMPL; } virtual HRESULT STDMETHODCALLTYPE UnlockRegion(ULARGE_INTEGER WXUNUSED(libOffset), - ULARGE_INTEGER WXUNUSED(cb), DWORD WXUNUSED(dwLockType)) wxOVERRIDE + ULARGE_INTEGER WXUNUSED(cb), DWORD WXUNUSED(dwLockType)) override { return E_NOTIMPL; } - virtual HRESULT STDMETHODCALLTYPE Stat(STATSTG *pstatstg, DWORD WXUNUSED(grfStatFlag)) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Stat(STATSTG *pstatstg, DWORD WXUNUSED(grfStatFlag)) override { pstatstg->type = STGTY_STREAM; pstatstg->cbSize.QuadPart = m_stream->GetSize(); @@ -103,7 +103,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Clone(IStream **WXUNUSED(ppstm)) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Clone(IStream **WXUNUSED(ppstm)) override { return E_NOTIMPL; } @@ -111,13 +111,13 @@ public: // ISequentialStream virtual HRESULT STDMETHODCALLTYPE Read(void *WXUNUSED(pv), - ULONG WXUNUSED(cb), ULONG *WXUNUSED(pcbRead)) wxOVERRIDE + ULONG WXUNUSED(cb), ULONG *WXUNUSED(pcbRead)) override { return E_NOTIMPL; } virtual HRESULT STDMETHODCALLTYPE Write(const void *WXUNUSED(pv), - ULONG WXUNUSED(cb), ULONG *WXUNUSED(pcbWritten)) wxOVERRIDE + ULONG WXUNUSED(cb), ULONG *WXUNUSED(pcbWritten)) override { return E_NOTIMPL; } @@ -155,7 +155,7 @@ public: virtual HRESULT STDMETHODCALLTYPE Seek( LARGE_INTEGER dlibMove, DWORD dwOrigin, - ULARGE_INTEGER *plibNewPosition) wxOVERRIDE + ULARGE_INTEGER *plibNewPosition) override { wxFileOffset newOffset = reinterpret_cast(m_stream)->SeekI(dlibMove.QuadPart, OriginToSeekMode(dwOrigin)); if (plibNewPosition) @@ -163,7 +163,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead) override { wxInputStream* inputStr = reinterpret_cast(m_stream); inputStr->Read(pv, cb); @@ -182,7 +182,7 @@ public: virtual HRESULT STDMETHODCALLTYPE Seek( LARGE_INTEGER dlibMove, DWORD dwOrigin, - ULARGE_INTEGER *plibNewPosition) wxOVERRIDE + ULARGE_INTEGER *plibNewPosition) override { wxFileOffset newOffset = reinterpret_cast(m_stream)->SeekO(dlibMove.QuadPart, OriginToSeekMode(dwOrigin)); if (plibNewPosition) @@ -190,7 +190,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Write(const void *pv, ULONG cb, ULONG *pcbWritten) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Write(const void *pv, ULONG cb, ULONG *pcbWritten) override { wxOutputStream* outputStr = reinterpret_cast(m_stream); outputStr->Write(pv, cb); diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h index 44b9c92871..508f8ada90 100644 --- a/include/wx/msw/private/fswatcher.h +++ b/include/wx/msw/private/fswatcher.h @@ -309,7 +309,7 @@ protected: const wxFSWatchEntryMSW* watch; }; - virtual ExitCode Entry() wxOVERRIDE; + virtual ExitCode Entry() override; // wait for events to occur, read them and send to interested parties // returns false it empty status was read, which means we would exit diff --git a/include/wx/msw/private/pipestream.h b/include/wx/msw/private/pipestream.h index b163ae4267..6d3a0ecba9 100644 --- a/include/wx/msw/private/pipestream.h +++ b/include/wx/msw/private/pipestream.h @@ -20,10 +20,10 @@ public: bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; } // returns true if there is any data to be read from the pipe - virtual bool CanRead() const wxOVERRIDE; + virtual bool CanRead() const override; protected: - virtual size_t OnSysRead(void *buffer, size_t len) wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t len) override; protected: HANDLE m_hInput; @@ -36,10 +36,10 @@ class wxPipeOutputStream: public wxOutputStream public: explicit wxPipeOutputStream(HANDLE hOutput); virtual ~wxPipeOutputStream() { Close(); } - bool Close() wxOVERRIDE; + bool Close() override; protected: - size_t OnSysWrite(const void *buffer, size_t len) wxOVERRIDE; + size_t OnSysWrite(const void *buffer, size_t len) override; protected: HANDLE m_hOutput; diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h index d6010fbc1b..3c517a0f42 100644 --- a/include/wx/msw/private/sockmsw.h +++ b/include/wx/msw/private/sockmsw.h @@ -47,9 +47,9 @@ public: virtual ~wxSocketImplMSW(); - virtual wxSocketError GetLastError() const wxOVERRIDE; + virtual wxSocketError GetLastError() const override; - virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags)) wxOVERRIDE + virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags)) override { // notifications are never disabled in this implementation, there is no // need for this as WSAAsyncSelect() only sends notification once when @@ -57,7 +57,7 @@ public: // anything here } - virtual void UpdateBlockingState() wxOVERRIDE + virtual void UpdateBlockingState() override { if ( GetSocketFlags() & wxSOCKET_BLOCK ) { @@ -84,7 +84,7 @@ public: } private: - virtual void DoClose() wxOVERRIDE; + virtual void DoClose() override; int m_msgnumber; diff --git a/include/wx/msw/private/textmeasure.h b/include/wx/msw/private/textmeasure.h index 5ac95e29fb..bd6ce2c0ed 100644 --- a/include/wx/msw/private/textmeasure.h +++ b/include/wx/msw/private/textmeasure.h @@ -34,18 +34,18 @@ public: protected: void Init(); - virtual void BeginMeasuring() wxOVERRIDE; - virtual void EndMeasuring() wxOVERRIDE; + virtual void BeginMeasuring() override; + virtual void EndMeasuring() override; virtual void DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *descent = NULL, - wxCoord *externalLeading = NULL) wxOVERRIDE; + wxCoord *externalLeading = NULL) override; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths, - double scaleX) wxOVERRIDE; + double scaleX) override; diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h index db1da306d3..29ffcdaa3a 100644 --- a/include/wx/msw/private/timer.h +++ b/include/wx/msw/private/timer.h @@ -20,10 +20,10 @@ class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl public: wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; } - virtual bool Start(int milliseconds = -1, bool oneShot = false) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; + virtual bool Start(int milliseconds = -1, bool oneShot = false) override; + virtual void Stop() override; - virtual bool IsRunning() const wxOVERRIDE { return m_id != 0; } + virtual bool IsRunning() const override { return m_id != 0; } protected: // this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit diff --git a/include/wx/msw/private/tlwgeom.h b/include/wx/msw/private/tlwgeom.h index 5b9933ddad..33ec4da23b 100644 --- a/include/wx/msw/private/tlwgeom.h +++ b/include/wx/msw/private/tlwgeom.h @@ -27,7 +27,7 @@ public: m_placement.length = sizeof(m_placement); } - virtual bool Save(const Serializer& ser) const wxOVERRIDE + virtual bool Save(const Serializer& ser) const override { // For compatibility with the existing saved positions/sizes, use the // same keys as the generic version (which was previously used under @@ -65,7 +65,7 @@ public: return true; } - virtual bool Restore(Serializer& ser) wxOVERRIDE + virtual bool Restore(Serializer& ser) override { // Normal position and size. wxRect r; @@ -105,7 +105,7 @@ public: return true; } - virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE + virtual bool GetFrom(const wxTopLevelWindow* tlw) override { if ( !::GetWindowPlacement(GetHwndOf(tlw), &m_placement) ) { @@ -148,7 +148,7 @@ public: return true; } - virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE + virtual bool ApplyTo(wxTopLevelWindow* tlw) override { // There is a subtlety here: if the window is currently hidden, // restoring its geometry shouldn't show it, so we must use SW_HIDE as diff --git a/include/wx/msw/private/webrequest_winhttp.h b/include/wx/msw/private/webrequest_winhttp.h index 1e961fb811..82ab0a2a7b 100644 --- a/include/wx/msw/private/webrequest_winhttp.h +++ b/include/wx/msw/private/webrequest_winhttp.h @@ -24,15 +24,15 @@ class wxWebResponseWinHTTP : public wxWebResponseImpl public: wxWebResponseWinHTTP(wxWebRequestWinHTTP& request); - wxFileOffset GetContentLength() const wxOVERRIDE { return m_contentLength; } + wxFileOffset GetContentLength() const override { return m_contentLength; } - wxString GetURL() const wxOVERRIDE; + wxString GetURL() const override; - wxString GetHeader(const wxString& name) const wxOVERRIDE; + wxString GetHeader(const wxString& name) const override; - int GetStatus() const wxOVERRIDE; + int GetStatus() const override; - wxString GetStatusText() const wxOVERRIDE; + wxString GetStatusText() const override; bool ReadData(); @@ -53,7 +53,7 @@ public: bool Init(); - void SetCredentials(const wxWebCredentials& cred) wxOVERRIDE; + void SetCredentials(const wxWebCredentials& cred) override; private: wxWebRequestWinHTTP& m_request; @@ -74,30 +74,30 @@ public: ~wxWebRequestWinHTTP(); - void Start() wxOVERRIDE; + void Start() override; - wxWebResponseImplPtr GetResponse() const wxOVERRIDE + wxWebResponseImplPtr GetResponse() const override { return m_response; } - wxWebAuthChallengeImplPtr GetAuthChallenge() const wxOVERRIDE + wxWebAuthChallengeImplPtr GetAuthChallenge() const override { return m_authChallenge; } - wxFileOffset GetBytesSent() const wxOVERRIDE { return m_dataWritten; } + wxFileOffset GetBytesSent() const override { return m_dataWritten; } - wxFileOffset GetBytesExpectedToSend() const wxOVERRIDE { return m_dataSize; } + wxFileOffset GetBytesExpectedToSend() const override { return m_dataSize; } void HandleCallback(DWORD dwInternetStatus, LPVOID lpvStatusInformation, DWORD dwStatusInformationLength); HINTERNET GetHandle() const { return m_request; } - wxWebRequestHandle GetNativeHandle() const wxOVERRIDE + wxWebRequestHandle GetNativeHandle() const override { return (wxWebRequestHandle)GetHandle(); } private: - void DoCancel() wxOVERRIDE; + void DoCancel() override; wxWebSessionWinHTTP& m_sessionImpl; wxString m_url; @@ -142,13 +142,13 @@ public: CreateRequest(wxWebSession& session, wxEvtHandler* handler, const wxString& url, - int id) wxOVERRIDE; + int id) override; - wxVersionInfo GetLibraryVersionInfo() wxOVERRIDE; + wxVersionInfo GetLibraryVersionInfo() override; HINTERNET GetHandle() const { return m_handle; } - wxWebSessionHandle GetNativeHandle() const wxOVERRIDE + wxWebSessionHandle GetNativeHandle() const override { return (wxWebSessionHandle)GetHandle(); } @@ -164,12 +164,12 @@ private: class wxWebSessionFactoryWinHTTP : public wxWebSessionFactory { public: - wxWebSessionImpl* Create() wxOVERRIDE + wxWebSessionImpl* Create() override { return new wxWebSessionWinHTTP(); } - bool Initialize() wxOVERRIDE + bool Initialize() override { return wxWebSessionWinHTTP::Initialize(); } diff --git a/include/wx/msw/private/webview_ie.h b/include/wx/msw/private/webview_ie.h index 091167f17b..e4e465fd91 100644 --- a/include/wx/msw/private/webview_ie.h +++ b/include/wx/msw/private/webview_ie.h @@ -92,49 +92,49 @@ public: //IInternetProtocolRoot HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), - DWORD WXUNUSED(dwOptions)) wxOVERRIDE + DWORD WXUNUSED(dwOptions)) override { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) wxOVERRIDE + HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) override { return S_OK; } - HRESULT STDMETHODCALLTYPE Resume() wxOVERRIDE { return S_OK; } + HRESULT STDMETHODCALLTYPE Resume() override { return S_OK; } HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink, wxIInternetBindInfo *pOIBindInfo, DWORD grfPI, - HANDLE_PTR dwReserved) wxOVERRIDE; - HRESULT STDMETHODCALLTYPE Suspend() wxOVERRIDE { return S_OK; } - HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) wxOVERRIDE { return S_OK; } + HANDLE_PTR dwReserved) override; + HRESULT STDMETHODCALLTYPE Suspend() override { return S_OK; } + HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) override { return S_OK; } //IInternetProtocol - HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) wxOVERRIDE + HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) override { return S_OK; } - HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead) wxOVERRIDE; + HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead) override; HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), DWORD WXUNUSED(dwOrigin), - ULARGE_INTEGER* WXUNUSED(plibNewPosition)) wxOVERRIDE + ULARGE_INTEGER* WXUNUSED(plibNewPosition)) override { return E_FAIL; } - HRESULT STDMETHODCALLTYPE UnlockRequest() wxOVERRIDE { return S_OK; } + HRESULT STDMETHODCALLTYPE UnlockRequest() override { return S_OK; } //IInternetProtocolInfo HRESULT STDMETHODCALLTYPE CombineUrl( LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, - DWORD dwReserved) wxOVERRIDE; + DWORD dwReserved) override; HRESULT STDMETHODCALLTYPE ParseUrl( LPCWSTR pwzUrl, wxPARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, - DWORD dwReserved) wxOVERRIDE; + DWORD dwReserved) override; HRESULT STDMETHODCALLTYPE CompareUrl( LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, - DWORD dwCompareFlags) wxOVERRIDE; + DWORD dwCompareFlags) override; HRESULT STDMETHODCALLTYPE QueryInfo( LPCWSTR pwzUrl, wxQUERYOPTION OueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD *pcbBuf, - DWORD dwReserved) wxOVERRIDE; + DWORD dwReserved) override; }; class ClassFactory : public IClassFactory @@ -148,8 +148,8 @@ public: //IClassFactory HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, - REFIID riid, void** ppvObject) wxOVERRIDE; - HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock) wxOVERRIDE; + REFIID riid, void** ppvObject) override; + HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock) override; //IUnknown DECLARE_IUNKNOWN_METHODS; @@ -163,7 +163,7 @@ class wxIEContainer : public wxActiveXContainer public: wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL); virtual ~wxIEContainer(); - virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc) wxOVERRIDE; + virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc) override; private: DocHostUIHandler* m_uiHandler; }; @@ -176,48 +176,48 @@ public: virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, - IDispatch *pdispReserved) wxOVERRIDE; + IDispatch *pdispReserved) override; - virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) wxOVERRIDE; + virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) override; virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, IOleInPlaceFrame *pFrame, - IOleInPlaceUIWindow *pDoc) wxOVERRIDE; + IOleInPlaceUIWindow *pDoc) override; - virtual HRESULT wxSTDCALL HideUI(void) wxOVERRIDE; + virtual HRESULT wxSTDCALL HideUI(void) override; - virtual HRESULT wxSTDCALL UpdateUI(void) wxOVERRIDE; + virtual HRESULT wxSTDCALL UpdateUI(void) override; - virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) wxOVERRIDE; + virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) override; - virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) wxOVERRIDE; + virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) override; - virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) wxOVERRIDE; + virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) override; virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, - BOOL fRameWindow) wxOVERRIDE; + BOOL fRameWindow) override; virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, const GUID *pguidCmdGroup, - DWORD nCmdID) wxOVERRIDE; + DWORD nCmdID) override; virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, - DWORD dw) wxOVERRIDE; + DWORD dw) override; virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget, - IDropTarget **ppDropTarget) wxOVERRIDE; + IDropTarget **ppDropTarget) override; - virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) wxOVERRIDE; + virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) override; virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate, OLECHAR *pchURLIn, - OLECHAR **ppchURLOut) wxOVERRIDE; + OLECHAR **ppchURLOut) override; virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO, - IDataObject **ppDORet) wxOVERRIDE; + IDataObject **ppDORet) override; //IUnknown DECLARE_IUNKNOWN_METHODS; diff --git a/include/wx/msw/progdlg.h b/include/wx/msw/progdlg.h index 7e285bc0ed..a375935799 100644 --- a/include/wx/msw/progdlg.h +++ b/include/wx/msw/progdlg.h @@ -23,36 +23,36 @@ public: virtual ~wxProgressDialog(); - virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE; - virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE; + virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL) override; + virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL) override; - virtual void Resume() wxOVERRIDE; + virtual void Resume() override; - virtual int GetValue() const wxOVERRIDE; - virtual wxString GetMessage() const wxOVERRIDE; + virtual int GetValue() const override; + virtual wxString GetMessage() const override; - virtual void SetRange(int maximum) wxOVERRIDE; + virtual void SetRange(int maximum) override; // Return whether "Cancel" or "Skip" button was pressed, always return // false if the corresponding button is not shown. - virtual bool WasSkipped() const wxOVERRIDE; - virtual bool WasCancelled() const wxOVERRIDE; + virtual bool WasSkipped() const override; + virtual bool WasCancelled() const override; - virtual void SetTitle(const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; + virtual wxString GetTitle() const override; - virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual void Fit() wxOVERRIDE; + virtual void SetIcons(const wxIconBundle& icons) override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoGetPosition(int *x, int *y) const override; + virtual void DoGetSize(int *width, int *height) const override; + virtual void Fit() override; - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual bool Show( bool show = true ) override; // Must provide overload to avoid hiding it (and warnings about it) - virtual void Update() wxOVERRIDE { wxGenericProgressDialog::Update(); } + virtual void Update() override { wxGenericProgressDialog::Update(); } - virtual WXWidget GetHandle() const wxOVERRIDE; + virtual WXWidget GetHandle() const override; private: // Common part of Update() and Pulse(). diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index 6c46e7e16b..5262ef88ad 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -82,41 +82,41 @@ public: const wxString& name = wxASCII_STR(wxRadioBoxNameStr)); // implement the radiobox interface - virtual void SetSelection(int n) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE { return m_selectedButton; } - virtual unsigned int GetCount() const wxOVERRIDE; - 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) wxOVERRIDE; - virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; - virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; - virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; - virtual int GetItemFromPoint(const wxPoint& pt) const wxOVERRIDE; + virtual void SetSelection(int n) override; + virtual int GetSelection() const override { return m_selectedButton; } + virtual unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& label) override; + virtual bool Enable(unsigned int n, bool enable = true) override; + virtual bool Show(unsigned int n, bool show = true) override; + virtual bool IsItemEnabled(unsigned int n) const override; + virtual bool IsItemShown(unsigned int n) const override; + virtual int GetItemFromPoint(const wxPoint& pt) const override; // override some base class methods - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool CanBeFocused() const wxOVERRIDE; - virtual void SetFocus() wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual bool Enable(bool enable = true) override; + virtual bool CanBeFocused() const override; + virtual void SetFocus() override; + virtual bool SetFont(const wxFont& font) override; + virtual bool ContainsHWND(WXHWND hWnd) const override; + virtual bool SetForegroundColour(const wxColour& colour) override; + virtual bool SetBackgroundColour(const wxColour& colour) override; #if wxUSE_TOOLTIPS - virtual bool HasToolTips() const wxOVERRIDE; + virtual bool HasToolTips() const override; #endif // wxUSE_TOOLTIPS #if wxUSE_HELP // override virtual function with a platform-independent implementation - virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const wxOVERRIDE + virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const override { return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); } #endif // wxUSE_HELP - virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE; + virtual bool Reparent(wxWindowBase *newParent) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetButtonFont(const wxFont& font) { SetFont(font); } @@ -129,8 +129,8 @@ public: // belongs to one of our radio boxes. If it doesn't, NULL is returned. static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd); - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - void Command(wxCommandEvent& event) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + void Command(wxCommandEvent& event) override; void SendNotificationEvent(); @@ -152,20 +152,20 @@ protected: virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual wxSize DoGetBestSize() const override; #if wxUSE_TOOLTIPS - virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip) wxOVERRIDE; + virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip) override; #endif - virtual WXHRGN MSWGetRegionWithoutChildren() wxOVERRIDE; + virtual WXHRGN MSWGetRegionWithoutChildren() override; - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // resolve ambiguity in base classes - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); } + virtual wxBorder GetDefaultBorder() const override { return wxRadioBoxBase::GetDefaultBorder(); } // the buttons we contain wxSubwindows *m_radioButtons; diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h index 765f6bcc8f..3676cc32e7 100644 --- a/include/wx/msw/radiobut.h +++ b/include/wx/msw/radiobut.h @@ -43,27 +43,27 @@ public: const wxString& name = wxASCII_STR(wxRadioButtonNameStr)); // implement the radio button interface - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; // implementation only from now on - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual void Command(wxCommandEvent& event) override; - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool HasTransparentBackground() override { return true; } - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const override; // Implement wxMSWOwnerDrawnButtonBase methods. - virtual int MSWGetButtonStyle() const wxOVERRIDE; - virtual void MSWOnButtonResetOwnerDrawn() wxOVERRIDE; - virtual int MSWGetButtonCheckedFlag() const wxOVERRIDE; + virtual int MSWGetButtonStyle() const override; + virtual void MSWOnButtonResetOwnerDrawn() override; + virtual int MSWGetButtonCheckedFlag() const override; virtual void - MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) wxOVERRIDE; + MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) override; private: diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h index 6c7c0a98af..b2e2ecc166 100644 --- a/include/wx/msw/regconf.h +++ b/include/wx/msw/regconf.h @@ -42,36 +42,36 @@ public: // ------------------------------------------ // path management - virtual void SetPath(const wxString& strPath) wxOVERRIDE; - virtual const wxString& GetPath() const wxOVERRIDE { return m_strPath; } + virtual void SetPath(const wxString& strPath) override; + virtual const wxString& GetPath() const override { return m_strPath; } // entry/subgroup info // enumerate all of them - 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 bool GetFirstGroup(wxString& str, long& lIndex) const override; + virtual bool GetNextGroup (wxString& str, long& lIndex) const override; + virtual bool GetFirstEntry(wxString& str, long& lIndex) const override; + virtual bool GetNextEntry (wxString& str, long& lIndex) const override; // tests for existence - virtual bool HasGroup(const wxString& strName) const wxOVERRIDE; - virtual bool HasEntry(const wxString& strName) const wxOVERRIDE; - virtual EntryType GetEntryType(const wxString& name) const wxOVERRIDE; + virtual bool HasGroup(const wxString& strName) const override; + virtual bool HasEntry(const wxString& strName) const override; + virtual EntryType GetEntryType(const wxString& name) const override; // get number of entries/subgroups in the current group, with or without // it's subgroups - virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE; - virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE; + virtual size_t GetNumberOfEntries(bool bRecursive = false) const override; + virtual size_t GetNumberOfGroups(bool bRecursive = false) const override; - virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) wxOVERRIDE { return true; } + virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) override { return true; } // rename - virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE; - virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE; + virtual bool RenameEntry(const wxString& oldName, const wxString& newName) override; + virtual bool RenameGroup(const wxString& oldName, const wxString& newName) override; // delete - virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE; - virtual bool DeleteGroup(const wxString& key) wxOVERRIDE; - virtual bool DeleteAll() wxOVERRIDE; + virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) override; + virtual bool DeleteGroup(const wxString& key) override; + virtual bool DeleteAll() override; protected: // opens the local key creating it if necessary and returns it @@ -95,18 +95,18 @@ protected: bool DoWriteValue(const wxString& key, const T& value); // implement read/write methods - virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE; - virtual bool DoReadLong(const wxString& key, long *plResult) const wxOVERRIDE; - virtual bool DoReadLongLong(const wxString& key, wxLongLong_t *pll) const wxOVERRIDE; + virtual bool DoReadString(const wxString& key, wxString *pStr) const override; + virtual bool DoReadLong(const wxString& key, long *plResult) const override; + virtual bool DoReadLongLong(const wxString& key, wxLongLong_t *pll) const override; #if wxUSE_BASE64 - virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE; + virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const override; #endif // wxUSE_BASE64 - virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE; - virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE; - virtual bool DoWriteLongLong(const wxString& key, wxLongLong_t llValue) wxOVERRIDE; + virtual bool DoWriteString(const wxString& key, const wxString& szValue) override; + virtual bool DoWriteLong(const wxString& key, long lValue) override; + virtual bool DoWriteLongLong(const wxString& key, wxLongLong_t llValue) override; #if wxUSE_BASE64 - virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE; + virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) override; #endif // wxUSE_BASE64 private: diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index ff99698178..dcb4211e52 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -35,23 +35,23 @@ public: virtual ~wxRegion(); // wxRegionBase methods - virtual void Clear() wxOVERRIDE; - virtual bool IsEmpty() const wxOVERRIDE; + virtual void Clear() override; + virtual bool IsEmpty() const override; // Get internal region handle WXHRGN GetHRGN() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; - 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 DoIsEqual(const wxRegion& region) const override; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const override; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const override; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const override; - virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; - virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE; + virtual bool DoOffset(wxCoord x, wxCoord y) override; + virtual bool DoCombine(const wxRegion& region, wxRegionOp op) override; friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; diff --git a/include/wx/msw/richmsgdlg.h b/include/wx/msw/richmsgdlg.h index 2e24328c2c..726bd843e2 100644 --- a/include/wx/msw/richmsgdlg.h +++ b/include/wx/msw/richmsgdlg.h @@ -21,7 +21,7 @@ public: { } // overridden base class method showing the native task dialog if possible - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog); diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h index 2e8c9aff81..43ad4f4c34 100644 --- a/include/wx/msw/scrolbar.h +++ b/include/wx/msw/scrolbar.h @@ -34,34 +34,34 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxScrollBarNameStr)); - int GetThumbPosition() const wxOVERRIDE; - int GetThumbSize() const wxOVERRIDE { return m_pageSize; } - int GetPageSize() const wxOVERRIDE { return m_viewSize; } - int GetRange() const wxOVERRIDE { return m_objectSize; } + int GetThumbPosition() const override; + int GetThumbSize() const override { return m_pageSize; } + int GetPageSize() const override { return m_viewSize; } + int GetRange() const override { return m_objectSize; } - virtual void SetThumbPosition(int viewStart) wxOVERRIDE; + virtual void SetThumbPosition(int viewStart) override; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true) wxOVERRIDE; + bool refresh = true) override; // needed for RTTI void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; } void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } - void Command(wxCommandEvent& event) wxOVERRIDE; + void Command(wxCommandEvent& event) override; virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control) wxOVERRIDE; + WXWORD pos, WXHWND control) override; // override wxControl version to not use solid background here - virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd) wxOVERRIDE; + virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd) override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; int m_pageSize; int m_viewSize; diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h index 7aaad33bd5..94a28e7a38 100644 --- a/include/wx/msw/slider.h +++ b/include/wx/msw/slider.h @@ -49,52 +49,52 @@ public: virtual ~wxSlider(); // slider methods - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int) override; - void SetRange(int minValue, int maxValue) wxOVERRIDE; + void SetRange(int minValue, int maxValue) override; - int GetMin() const wxOVERRIDE { return m_rangeMin; } - int GetMax() const wxOVERRIDE { return m_rangeMax; } + int GetMin() const override { return m_rangeMin; } + int GetMax() const override { return m_rangeMax; } // Win32-specific slider methods - int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } - void SetPageSize(int pageSize) wxOVERRIDE; - int GetPageSize() const wxOVERRIDE; - void ClearSel() wxOVERRIDE; - void ClearTicks() wxOVERRIDE; - void SetLineSize(int lineSize) wxOVERRIDE; - int GetLineSize() const wxOVERRIDE; - int GetSelEnd() const wxOVERRIDE; - int GetSelStart() const wxOVERRIDE; - void SetSelection(int minPos, int maxPos) wxOVERRIDE; - void SetThumbLength(int len) wxOVERRIDE; - int GetThumbLength() const wxOVERRIDE; - void SetTick(int tickPos) wxOVERRIDE; + int GetTickFreq() const override { return m_tickFreq; } + void SetPageSize(int pageSize) override; + int GetPageSize() const override; + void ClearSel() override; + void ClearTicks() override; + void SetLineSize(int lineSize) override; + int GetLineSize() const override; + int GetSelEnd() const override; + int GetSelStart() const override; + void SetSelection(int minPos, int maxPos) override; + void SetThumbLength(int len) override; + int GetThumbLength() const override; + void SetTick(int tickPos) override; // implementation only from now on WXHWND GetStaticMin() const; WXHWND GetStaticMax() const; WXHWND GetEditValue() const; - virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE; + virtual bool ContainsHWND(WXHWND hWnd) const override; // we should let background show through the slider (and its labels) - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool HasTransparentBackground() override { return true; } // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } - void Command(wxCommandEvent& event) wxOVERRIDE; + void Command(wxCommandEvent& event) override; virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control) wxOVERRIDE; + WXWORD pos, WXHWND control) override; - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Enable(bool show = true) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual bool Enable(bool show = true) override; + virtual bool SetFont(const wxFont& font) override; + virtual bool SetForegroundColour(const wxColour& colour) override; + virtual bool SetBackgroundColour(const wxColour& colour) override; - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override; protected: // common part of all ctors @@ -115,14 +115,14 @@ protected: // overridden base class virtuals - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoGetPosition(int *x, int *y) const override; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual wxSize DoGetBestSize() const override; - WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) wxOVERRIDE; + WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) override; - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; void OnDPIChanged(wxDPIChangedEvent& event); @@ -143,7 +143,7 @@ protected: bool m_isDragging; // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq) wxOVERRIDE; + virtual void DoSetTickFreq(int freq) override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider); }; diff --git a/include/wx/msw/sound.h b/include/wx/msw/sound.h index 711e066ab9..4577ddf7e2 100644 --- a/include/wx/msw/sound.h +++ b/include/wx/msw/sound.h @@ -36,7 +36,7 @@ protected: bool CheckCreatedOk(); void Free(); - virtual bool DoPlay(unsigned flags) const wxOVERRIDE; + virtual bool DoPlay(unsigned flags) const override; private: // data of this object diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index 64fb1fb1ad..999f3d5d1b 100644 --- a/include/wx/msw/spinbutt.h +++ b/include/wx/msw/spinbutt.h @@ -43,26 +43,26 @@ public: // accessors - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int val) wxOVERRIDE; - virtual void SetRange(int minVal, int maxVal) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int val) override; + virtual void SetRange(int minVal, int maxVal) override; // implementation - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control) wxOVERRIDE; + WXWORD pos, WXHWND control) override; // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } - virtual void SetIncrement(int value) wxOVERRIDE; - virtual int GetIncrement() const wxOVERRIDE; + virtual bool CanApplyThemeBorder() const override { return false; } + virtual void SetIncrement(int value) override; + virtual int GetIncrement() const override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // ensure that the control displays a value in the current range virtual void NormalizeValue(); diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h index c350db1f10..19f2e66880 100644 --- a/include/wx/msw/spinctrl.h +++ b/include/wx/msw/spinctrl.h @@ -67,28 +67,28 @@ public: virtual bool SetBase(int base); virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; // implementation only from now on // ------------------------------- virtual ~wxSpinCtrl(); - virtual void SetValue(int val) wxOVERRIDE; - virtual int GetValue() const wxOVERRIDE; - virtual void SetRange(int minVal, int maxVal) wxOVERRIDE; - virtual bool SetFont(const wxFont &font) wxOVERRIDE; + virtual void SetValue(int val) override; + virtual int GetValue() const override; + virtual void SetRange(int minVal, int maxVal) override; + virtual bool SetFont(const wxFont &font) override; - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; + virtual bool Show(bool show = true) override; - virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE; + virtual bool Reparent(wxWindowBase *newParent) override; // wxSpinButton doesn't accept focus, but we do - virtual bool AcceptsFocus() const wxOVERRIDE { return wxWindow::AcceptsFocus(); } + virtual bool AcceptsFocus() const override { return wxWindow::AcceptsFocus(); } // we're like wxTextCtrl and not (default) wxButton - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -111,29 +111,29 @@ public: bool ProcessTextCommand(WXWORD cmd, WXWORD id); // recognize buddy window as part of this control at wx level - virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE { return hWnd == m_hwndBuddy; } + virtual bool ContainsHWND(WXHWND hWnd) const override { return hWnd == m_hwndBuddy; } - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; - virtual WXHWND MSWGetFocusHWND() const wxOVERRIDE; + virtual WXHWND MSWGetFocusHWND() const override; protected: - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual void DoGetClientSize(int *x, int *y) 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 override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoGetClientSize(int *x, int *y) const override; + virtual void DoClientToScreen(int *x, int *y) const override; + virtual void DoScreenToClient(int *x, int *y) const override; #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; + virtual void DoSetToolTip( wxToolTip *tip ) override; #endif // wxUSE_TOOLTIPS - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; virtual bool MSWOnScroll(int orientation, WXWORD wParam, - WXWORD pos, WXHWND control) wxOVERRIDE; - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + WXWORD pos, WXHWND control) override; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // handle processing of special keys void OnChar(wxKeyEvent& event); @@ -142,13 +142,13 @@ protected: // returns true for special keys like "Ctrl+C" that should be handled // by the text control - virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE; + virtual bool MSWShouldPreProcessMessage(WXMSG* msg) override; // generate spin control update event with the given value void SendSpinUpdate(int value); // called to ensure that the value is in the correct range - virtual void NormalizeValue() wxOVERRIDE; + virtual void NormalizeValue() override; // the value of the control before the latest change (which might not have // changed anything in fact -- this is why we need this field) diff --git a/include/wx/msw/stackwalk.h b/include/wx/msw/stackwalk.h index f76e76f52c..830c91f7ec 100644 --- a/include/wx/msw/stackwalk.h +++ b/include/wx/msw/stackwalk.h @@ -49,21 +49,21 @@ public: m_addrFrame = addrFrame; } - virtual size_t GetParamCount() const wxOVERRIDE + virtual size_t GetParamCount() const override { ConstCast()->OnGetParam(); return DoGetParamCount(); } virtual bool - GetParam(size_t n, wxString *type, wxString *name, wxString *value) const wxOVERRIDE; + GetParam(size_t n, wxString *type, wxString *name, wxString *value) const override; // callback used by OnGetParam(), don't call directly void OnParam(wxSYMBOL_INFO *pSymInfo); protected: - virtual void OnGetName() wxOVERRIDE; - virtual void OnGetLocation() wxOVERRIDE; + virtual void OnGetName() override; + virtual void OnGetLocation() override; void OnGetParam(); @@ -96,9 +96,9 @@ public: // only wxStackWalker(const char * WXUNUSED(argv0) = NULL) { } - virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE; + virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) override; #if wxUSE_ON_FATAL_EXCEPTION - virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE; + virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) override; #endif // wxUSE_ON_FATAL_EXCEPTION diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 384343517b..1d06f6bb24 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -77,18 +77,18 @@ public: virtual ~wxStaticBitmap() { Free(); } - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE; - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual wxBitmap GetBitmap() const wxOVERRIDE; - virtual wxIcon GetIcon() const wxOVERRIDE; + virtual void SetIcon(const wxIcon& icon) override; + virtual void SetBitmap(const wxBitmapBundle& bitmap) override; + virtual wxBitmap GetBitmap() const override; + virtual wxIcon GetIcon() const override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; private: // ctor/dtor helpers diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 4b9bc2b565..862283b193 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -59,24 +59,24 @@ public: const wxString& name = wxASCII_STR(wxStaticBoxNameStr)); /// Implementation only - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const override; - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; + virtual bool SetFont(const wxFont& font) override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; public: - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; protected: - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; // return the region with all the windows inside this static box excluded virtual WXHRGN MSWGetRegionWithoutChildren(); diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h index e90dd61d39..c57eb01408 100644 --- a/include/wx/msw/statline.h +++ b/include/wx/msw/statline.h @@ -38,10 +38,10 @@ public: const wxString &name = wxASCII_STR(wxStaticLineNameStr) ); // overridden base class virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } // usually overridden base class virtuals - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine); }; diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index 82687f2ea7..ffd34d62e0 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -36,19 +36,19 @@ public: const wxString& name = wxASCII_STR(wxStaticTextNameStr)); // override some methods to resize the window properly - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual bool SetFont( const wxFont &font ) override; - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override; protected: // implement/override some base class virtuals virtual void DoSetSize(int x, int y, int w, int h, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual wxSize DoGetBestClientSize() const override; - virtual wxString WXGetVisibleLabel() const wxOVERRIDE; - virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE; + virtual wxString WXGetVisibleLabel() const override; + virtual void WXSetVisibleLabel(const wxString& str) override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); }; diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h index bc554e9ee6..ffe012b8a1 100644 --- a/include/wx/msw/statusbar.h +++ b/include/wx/msw/statusbar.h @@ -40,39 +40,39 @@ public: virtual ~wxStatusBar(); // implement base class methods - virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE; - virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE; - virtual void SetStatusStyles(int n, const int styles[]) wxOVERRIDE; - virtual void SetMinHeight(int height) wxOVERRIDE; - virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; + virtual void SetFieldsCount(int number = 1, const int *widths = NULL) override; + virtual void SetStatusWidths(int n, const int widths_field[]) override; + virtual void SetStatusStyles(int n, const int styles[]) override; + virtual void SetMinHeight(int height) override; + virtual bool GetFieldRect(int i, wxRect& rect) const override; - virtual int GetBorderX() const wxOVERRIDE; - virtual int GetBorderY() const wxOVERRIDE; + virtual int GetBorderX() const override; + virtual int GetBorderY() const override; // override some wxWindow virtual methods too - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, - WXLPARAM lParam) wxOVERRIDE; + WXLPARAM lParam) override; protected: // implement base class pure virtual method - virtual void DoUpdateStatusText(int number) wxOVERRIDE; + virtual void DoUpdateStatusText(int number) override; // override some base class virtuals - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override; + virtual wxSize DoGetBestSize() const override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; #if wxUSE_TOOLTIPS - virtual bool MSWProcessMessage(WXMSG* pMsg) wxOVERRIDE; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) wxOVERRIDE; + virtual bool MSWProcessMessage(WXMSG* pMsg) override; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) override; #endif // implementation of the public SetStatusWidths() void MSWUpdateFieldsWidths(); - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // used by DoUpdateStatusText() wxClientDC *m_pDC; diff --git a/include/wx/msw/stdpaths.h b/include/wx/msw/stdpaths.h index bfddf168c4..d21f881939 100644 --- a/include/wx/msw/stdpaths.h +++ b/include/wx/msw/stdpaths.h @@ -21,17 +21,17 @@ class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase { public: // implement base class pure virtuals - virtual wxString GetExecutablePath() const wxOVERRIDE; - virtual wxString GetConfigDir() const wxOVERRIDE; - virtual wxString GetUserConfigDir() const wxOVERRIDE; - virtual wxString GetDataDir() const wxOVERRIDE; - virtual wxString GetUserDataDir() const wxOVERRIDE; - virtual wxString GetUserLocalDataDir() const wxOVERRIDE; - virtual wxString GetPluginsDir() const wxOVERRIDE; - virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; + virtual wxString GetExecutablePath() const override; + virtual wxString GetConfigDir() const override; + virtual wxString GetUserConfigDir() const override; + virtual wxString GetDataDir() const override; + virtual wxString GetUserDataDir() const override; + virtual wxString GetUserLocalDataDir() const override; + virtual wxString GetPluginsDir() const override; + virtual wxString GetUserDir(Dir userDir) const override; virtual wxString MakeConfigFileName(const wxString& basename, ConfigFileConv conv = ConfigFileConv_Ext - ) const wxOVERRIDE; + ) const override; // MSW-specific methods @@ -95,8 +95,8 @@ protected: class WXDLLIMPEXP_BASE wxStandardPathsWin16 : public wxStandardPaths { public: - virtual wxString GetConfigDir() const wxOVERRIDE; - virtual wxString GetUserConfigDir() const wxOVERRIDE; + virtual wxString GetConfigDir() const override; + virtual wxString GetUserConfigDir() const override; }; #endif // _WX_MSW_STDPATHS_H_ diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h index 0a8f2b4c80..51dd3533f1 100644 --- a/include/wx/msw/taskbar.h +++ b/include/wx/msw/taskbar.h @@ -29,9 +29,9 @@ public: bool IsIconInstalled() const { return m_iconAdded; } // Operations - bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE; - bool RemoveIcon() wxOVERRIDE; - bool PopupMenu(wxMenu *menu) wxOVERRIDE; + bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) override; + bool RemoveIcon() override; + bool PopupMenu(wxMenu *menu) override; // MSW-specific class methods diff --git a/include/wx/msw/taskbarbutton.h b/include/wx/msw/taskbarbutton.h index ed24df01ed..0949d57686 100644 --- a/include/wx/msw/taskbarbutton.h +++ b/include/wx/msw/taskbarbutton.h @@ -24,27 +24,27 @@ class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton public: virtual ~wxTaskBarButtonImpl(); - virtual void SetProgressRange(int range) wxOVERRIDE; - virtual void SetProgressValue(int value) wxOVERRIDE; - virtual void PulseProgress() wxOVERRIDE; - virtual void Show(bool show = true) wxOVERRIDE; - virtual void Hide() wxOVERRIDE; - virtual void SetThumbnailTooltip(const wxString& tooltip) wxOVERRIDE; - virtual void SetProgressState(wxTaskBarButtonState state) wxOVERRIDE; + virtual void SetProgressRange(int range) override; + virtual void SetProgressValue(int value) override; + virtual void PulseProgress() override; + virtual void Show(bool show = true) override; + virtual void Hide() override; + virtual void SetThumbnailTooltip(const wxString& tooltip) override; + virtual void SetProgressState(wxTaskBarButtonState state) override; virtual void SetOverlayIcon(const wxIcon& icon, - const wxString& description = wxString()) wxOVERRIDE; - virtual void SetThumbnailClip(const wxRect& rect) wxOVERRIDE; - virtual void SetThumbnailContents(const wxWindow *child) wxOVERRIDE; + const wxString& description = wxString()) override; + virtual void SetThumbnailClip(const wxRect& rect) override; + virtual void SetThumbnailContents(const wxWindow *child) override; virtual bool InsertThumbBarButton(size_t pos, - wxThumbBarButton *button) wxOVERRIDE; - virtual bool AppendThumbBarButton(wxThumbBarButton *button) wxOVERRIDE; - virtual bool AppendSeparatorInThumbBar() wxOVERRIDE; + wxThumbBarButton *button) override; + virtual bool AppendThumbBarButton(wxThumbBarButton *button) override; + virtual bool AppendSeparatorInThumbBar() override; virtual wxThumbBarButton* RemoveThumbBarButton( - wxThumbBarButton *button) wxOVERRIDE; - virtual wxThumbBarButton* RemoveThumbBarButton(int id) wxOVERRIDE; + wxThumbBarButton *button) override; + virtual wxThumbBarButton* RemoveThumbBarButton(int id) override; wxThumbBarButton* GetThumbBarButtonByIndex(size_t index); bool InitOrUpdateThumbBarButtons(); - virtual void Realize() wxOVERRIDE; + virtual void Realize() override; private: // This ctor is only used by wxTaskBarButton::New() diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index 690dfe0b6c..f00aa98233 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -38,69 +38,69 @@ public: // overridden wxTextEntry methods // ------------------------------ - virtual wxString GetValue() const wxOVERRIDE; - virtual wxString GetRange(long from, long to) const wxOVERRIDE; + virtual wxString GetValue() const override; + virtual wxString GetRange(long from, long to) const override; virtual bool IsEmpty() const; - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void AppendText(const wxString& text) wxOVERRIDE; - virtual void Clear() wxOVERRIDE; + virtual void WriteText(const wxString& text) override; + virtual void AppendText(const wxString& text) override; + virtual void Clear() override; - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; + virtual int GetLineLength(long lineNo) const override; + virtual wxString GetLineText(long lineNo) const override; + virtual int GetNumberOfLines() const override; - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; + virtual void SetMaxLength(unsigned long len) override; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const override; - virtual void Paste() wxOVERRIDE; + virtual void Paste() override; - virtual void Redo() wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual void Redo() override; + virtual bool CanRedo() const override; #if wxUSE_RICHEDIT - virtual void EmptyUndoBuffer() wxOVERRIDE; + virtual void EmptyUndoBuffer() override; #endif // wxUSE_RICHEDIT - virtual void SetInsertionPointEnd() wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPointEnd() override; + virtual long GetInsertionPoint() const override; + virtual wxTextPos GetLastPosition() const override; // implement base class pure virtuals // ---------------------------------- - virtual bool IsModified() const wxOVERRIDE; - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; + virtual bool IsModified() const override; + virtual void MarkDirty() override; + virtual void DiscardEdits() override; - virtual bool EmulateKeyPress(const wxKeyEvent& event) wxOVERRIDE; + virtual bool EmulateKeyPress(const wxKeyEvent& event) override; #if wxUSE_RICHEDIT // apply text attribute to the range of text (only works with richedit // controls) - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) override; + virtual bool SetDefaultStyle(const wxTextAttr& style) override; + virtual bool GetStyle(long position, wxTextAttr& style) override; #endif // wxUSE_RICHEDIT // 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 wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; + virtual long XYToPosition(long x, long y) const override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; - virtual void ShowPosition(long pos) wxOVERRIDE; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; + virtual void ShowPosition(long pos) override; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE + wxTextCoord *row) const override { return wxTextCtrlBase::HitTest(pt, col, row); } - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; + virtual wxLayoutDirection GetLayoutDirection() const override; // Caret handling (Windows only) bool ShowNativeCaret(bool show = true); @@ -110,34 +110,34 @@ public: // Use native spelling and grammar checking functions. // This is only available in wxTE_RICH2 controls. virtual bool EnableProofCheck(const wxTextProofOptions& options - = wxTextProofOptions::Default()) wxOVERRIDE; - virtual wxTextProofOptions GetProofCheckOptions() const wxOVERRIDE; + = wxTextProofOptions::Default()) override; + virtual wxTextProofOptions GetProofCheckOptions() const override; #endif // wxUSE_RICHEDIT && wxUSE_SPELLCHECK // Implementation from now on // -------------------------- #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT - virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE; + virtual void SetDropTarget(wxDropTarget *dropTarget) override; #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE; + virtual void Command(wxCommandEvent& event) override; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) override; #if wxUSE_RICHEDIT - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; int GetRichVersion() const { return m_verRichEdit; } bool IsRich() const { return m_verRichEdit != 0; } // rich edit controls are not compatible with normal ones and we must set // the colours and font for them otherwise - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; + virtual bool SetForegroundColour(const wxColour& colour) override; + virtual bool SetFont(const wxFont& font) override; #else bool IsRich() const { return false; } #endif // wxUSE_RICHEDIT @@ -148,12 +148,12 @@ public: bool IsInkEdit() const { return false; } #endif - virtual void AdoptAttributesFromHWND() wxOVERRIDE; + virtual void AdoptAttributesFromHWND() override; - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE; + virtual bool AcceptsFocusFromKeyboard() const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE; + virtual bool CanApplyThemeBorder() const override; // callbacks void OnDropFiles(wxDropFilesEvent& event); @@ -194,10 +194,10 @@ public: virtual bool MSWHandleMessage(WXLRESULT *result, WXUINT message, WXWPARAM wParam, - WXLPARAM lParam) wxOVERRIDE; + WXLPARAM lParam) override; - virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg) wxOVERRIDE; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg) override; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: // common part of all ctors @@ -212,9 +212,9 @@ protected: const wxPoint& pos, const wxSize& size); - virtual void DoSetValue(const wxString &value, int flags = 0) wxOVERRIDE; + virtual void DoSetValue(const wxString &value, int flags = 0) override; - virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE; + virtual wxPoint DoPositionToCoords(long pos) const override; // return true if this control has a user-set limit on amount of text (i.e. // the limit is due to a previous call to SetMaxLength() and not built in) @@ -235,7 +235,7 @@ protected: int flags = SetValue_SendEvent | SetValue_SelectionOnly); // set the selection (possibly without scrolling the caret into view) - void DoSetSelection(long from, long to, int flags) wxOVERRIDE; + void DoSetSelection(long from, long to, int flags) override; // get the length of the line containing the character at the given // position @@ -244,13 +244,13 @@ protected: // send TEXT_UPDATED event, return true if it was handled, false otherwise bool SendUpdateEvent(); - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; #if wxUSE_RICHEDIT - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // Apply m_richDPIscale zoom to rich control. void MSWSetRichZoom(); @@ -287,17 +287,17 @@ protected: int m_updatesCount; private: - virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE + virtual void EnableTextChangedEvents(bool enable) override { m_updatesCount = enable ? -1 : -2; } // implement wxTextEntry pure virtual: it implements all the operations for // the simple EDIT controls - virtual WXHWND GetEditHWND() const wxOVERRIDE { return m_hWnd; } + virtual WXHWND GetEditHWND() const override { return m_hWnd; } #if wxUSE_OLE - virtual void MSWProcessSpecialKey(wxKeyEvent& event) wxOVERRIDE; + virtual void MSWProcessSpecialKey(wxKeyEvent& event) override; #endif // wxUSE_OLE // Do we need to handle Ctrl+Backspace ourselves? diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h index 9de5182066..9b570c53f2 100644 --- a/include/wx/msw/textentry.h +++ b/include/wx/msw/textentry.h @@ -23,39 +23,39 @@ public: virtual ~wxTextEntry(); // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; + virtual void Remove(long from, long to) override; - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual long GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE + virtual void SetSelection(long from, long to) override { DoSetSelection(from, to); } - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void GetSelection(long *from, long *to) const override; - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual bool IsEditable() const override; + virtual void SetEditable(bool editable) override; - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; - virtual void ForceUpper() wxOVERRIDE; + virtual void SetMaxLength(unsigned long len) override; + virtual void ForceUpper() override; #if wxUSE_UXTHEME - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual wxString GetHint() const wxOVERRIDE; + virtual bool SetHint(const wxString& hint) override; + virtual wxString GetHint() const override; #endif // wxUSE_UXTHEME protected: - virtual wxString DoGetValue() const wxOVERRIDE; + virtual wxString DoGetValue() const override; // this is really a hook for multiline text controls as the single line // ones don't need to ever scroll to show the selection but having it here @@ -68,17 +68,17 @@ protected: virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll); // margins functions - virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; - virtual wxPoint DoGetMargins() const wxOVERRIDE; + virtual bool DoSetMargins(const wxPoint& pt) override; + virtual wxPoint DoGetMargins() const override; // auto-completion uses COM under Windows so they won't work without // wxUSE_OLE as OleInitialize() is not called then #if wxUSE_OLE - virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE; + virtual bool DoAutoCompleteStrings(const wxArrayString& choices) override; #if wxUSE_DYNLIB_CLASS - virtual bool DoAutoCompleteFileNames(int flags) wxOVERRIDE; + virtual bool DoAutoCompleteFileNames(int flags) override; #endif // wxUSE_DYNLIB_CLASS - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE; + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) override; #endif // wxUSE_OLE // Returns true if this control uses standard file names completion. diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index 65b4d7c236..1bf1988a43 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -40,21 +40,21 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual void Command(wxCommandEvent& event) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const override; - virtual bool MSWIsPushed() const wxOVERRIDE; + virtual bool MSWIsPushed() const override; void Init(); @@ -100,7 +100,7 @@ public: wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), SetBitmapLabel(bitmap); ) // prevent virtual function hiding - virtual void SetLabel(const wxString& label) wxOVERRIDE { wxToggleButton::SetLabel(label); } + virtual void SetLabel(const wxString& label) override { wxToggleButton::SetLabel(label); } private: wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton); diff --git a/include/wx/msw/timectrl.h b/include/wx/msw/timectrl.h index 3608e640fc..3adbf42af1 100644 --- a/include/wx/msw/timectrl.h +++ b/include/wx/msw/timectrl.h @@ -47,14 +47,14 @@ public: } // Override MSW-specific functions used during control creation. - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; protected: #if wxUSE_INTL - virtual wxLocaleInfo MSWGetFormat() const wxOVERRIDE; + virtual wxLocaleInfo MSWGetFormat() const override; #endif // wxUSE_INTL - virtual bool MSWAllowsNone() const wxOVERRIDE { return false; } - virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) wxOVERRIDE; + virtual bool MSWAllowsNone() const override { return false; } + virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); }; diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h index 3f8aaa4353..4c49acb371 100644 --- a/include/wx/msw/toolbar.h +++ b/include/wx/msw/toolbar.h @@ -44,46 +44,46 @@ public: virtual ~wxToolBar(); // override/implement base class virtuals - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const override; - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; - virtual wxSize GetToolSize() const wxOVERRIDE; + virtual wxSize GetToolSize() const override; - virtual void SetRows(int nRows) wxOVERRIDE; + virtual void SetRows(int nRows) override; - virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) override; + virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) override; - virtual void SetToolPacking(int packing) wxOVERRIDE; + virtual void SetToolPacking(int packing) override; // implementation only from now on // ------------------------------- - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; void OnMouseEvent(wxMouseEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); void OnEraseBackground(wxEraseEvent& event); - void SetFocus() wxOVERRIDE {} + void SetFocus() override {} static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height); // override WndProc mainly to process WM_SIZE - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } #ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK - virtual bool MSWEraseBgHook(WXHDC hDC) wxOVERRIDE; - virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child) wxOVERRIDE; + virtual bool MSWEraseBgHook(WXHDC hDC) override; + virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child) override; #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK virtual wxToolBarToolBase *CreateTool(int id, @@ -93,10 +93,10 @@ public: wxItemKind kind = wxITEM_NORMAL, wxObject *clientData = NULL, const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) wxOVERRIDE; + const wxString& longHelp = wxEmptyString) override; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; + const wxString& label) override; protected: // common part of all ctors void Init(); @@ -108,17 +108,17 @@ protected: void Recreate(); // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) override; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) override; - 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 void DoEnableTool(wxToolBarToolBase *tool, bool enable) override; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) override; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) override; - virtual void DoSetToolBitmapSize(const wxSize& size) wxOVERRIDE; + virtual void DoSetToolBitmapSize(const wxSize& size) override; // return the appropriate size and flags for the toolbar control - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // handlers for various events bool HandleSize(WXWPARAM wParam, WXLPARAM lParam); diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index c3198274ce..53f8ba7f1b 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -47,39 +47,39 @@ public: virtual ~wxTopLevelWindowMSW(); // implement base class pure virtuals - virtual void SetTitle( const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; - 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 Destroy() wxOVERRIDE; + virtual void SetTitle( const wxString& title) override; + virtual wxString GetTitle() const override; + virtual void Maximize(bool maximize = true) override; + virtual bool IsMaximized() const override; + virtual void Iconize(bool iconize = true) override; + virtual bool IsIconized() const override; + virtual void SetIcons(const wxIconBundle& icons ) override; + virtual void Restore() override; + virtual bool Destroy() override; - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) override; - virtual bool Show(bool show = true) wxOVERRIDE; - virtual void Raise() wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual void Raise() override; - virtual void ShowWithoutActivating() wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool IsFullScreen() const wxOVERRIDE { return m_fsIsShowing; } + virtual void ShowWithoutActivating() override; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + virtual bool IsFullScreen() const override { return m_fsIsShowing; } - virtual wxContentProtection GetContentProtection() const wxOVERRIDE; - virtual bool SetContentProtection(wxContentProtection contentProtection) wxOVERRIDE; + virtual wxContentProtection GetContentProtection() const override; + virtual bool SetContentProtection(wxContentProtection contentProtection) override; // wxMSW only: EnableCloseButton(false) may be used to remove the "Close" // button from the title bar - virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; + virtual bool EnableCloseButton(bool enable = true) override; + virtual bool EnableMaximizeButton(bool enable = true) override; + virtual bool EnableMinimizeButton(bool enable = true) override; // Set window transparency if the platform supports it - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE; + virtual bool SetTransparent(wxByte alpha) override; + virtual bool CanSetTransparent() override; // MSW-specific methods @@ -106,22 +106,22 @@ public: // called from wxWidgets code itself only when the pending focus, i.e. the // element which should get focus when this TLW is activated again, changes - virtual void WXSetPendingFocus(wxWindow* win) wxOVERRIDE + virtual void WXSetPendingFocus(wxWindow* win) override { m_winLastFocused = win; } // translate wxWidgets flags to Windows ones - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const override; // choose the right parent to use with CreateWindow() - virtual WXHWND MSWGetParent() const wxOVERRIDE; + virtual WXHWND MSWGetParent() const override; // window proc for the frames - virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } // This function is only for internal use. void MSWSetShowCommand(WXUINT showCmd) { m_showCmd = showCmd; } @@ -150,12 +150,12 @@ protected: // override those to return the normal window coordinates even when the // window is minimized - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetPosition(int *x, int *y) const override; + virtual void DoGetSize(int *width, int *height) const override; // Top level windows have different freeze semantics on Windows - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; + virtual void DoFreeze() override; + virtual void DoThaw() override; // helper of SetIcons(): calls gets the icon with the size specified by the // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it @@ -167,11 +167,11 @@ protected: virtual void MSWGetCreateWindowCoords(const wxPoint& pos, const wxSize& size, int& x, int& y, - int& w, int& h) const wxOVERRIDE; + int& w, int& h) const override; // override this one to update our icon on DPI change (not quite the same // thing as font, but close enough...) - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // This field contains the show command to use when showing the window the diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index 08d42f7062..1d1b863fd3 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -70,117 +70,117 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual unsigned int GetCount() const wxOVERRIDE; + virtual unsigned int GetCount() const override; - virtual unsigned int GetIndent() const wxOVERRIDE; - virtual void SetIndent(unsigned int indent) wxOVERRIDE; + virtual unsigned int GetIndent() const override; + virtual void SetIndent(unsigned int indent) override; - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE; + virtual void SetImageList(wxImageList *imageList) override; + virtual void SetStateImageList(wxImageList *imageList) override; - virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxString GetItemText(const wxTreeItemId& item) const override; virtual int GetItemImage(const wxTreeItemId& item, - 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; + wxTreeItemIcon which = wxTreeItemIcon_Normal) const override; + virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const override; + virtual wxColour GetItemTextColour(const wxTreeItemId& item) const override; + virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const override; + virtual wxFont GetItemFont(const wxTreeItemId& item) const override; - virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE; + virtual void SetItemText(const wxTreeItemId& item, const wxString& text) override; virtual void SetItemImage(const wxTreeItemId& item, int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE; - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE; - virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) wxOVERRIDE; - virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) wxOVERRIDE; + wxTreeItemIcon which = wxTreeItemIcon_Normal) override; + virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) override; + virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) override; + virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) override; virtual void SetItemDropHighlight(const wxTreeItemId& item, - bool highlight = true) wxOVERRIDE; + bool highlight = true) override; virtual void SetItemTextColour(const wxTreeItemId& item, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; virtual void SetItemBackgroundColour(const wxTreeItemId& item, - const wxColour& col) wxOVERRIDE; - virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) wxOVERRIDE; + const wxColour& col) override; + virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) override; // item status inquiries // --------------------- - 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 bool IsVisible(const wxTreeItemId& item) const override; + virtual bool ItemHasChildren(const wxTreeItemId& item) const override; + virtual bool IsExpanded(const wxTreeItemId& item) const override; + virtual bool IsSelected(const wxTreeItemId& item) const override; + virtual bool IsBold(const wxTreeItemId& item) const override; virtual size_t GetChildrenCount(const wxTreeItemId& item, - bool recursively = true) const wxOVERRIDE; + bool recursively = true) const override; // navigation // ---------- - virtual wxTreeItemId GetRootItem() const wxOVERRIDE; - virtual wxTreeItemId GetSelection() const wxOVERRIDE; - virtual size_t GetSelections(wxArrayTreeItemIds& selections) const wxOVERRIDE; - virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE; + virtual wxTreeItemId GetRootItem() const override; + virtual wxTreeItemId GetSelection() const override; + virtual size_t GetSelections(wxArrayTreeItemIds& selections) const override; + virtual wxTreeItemId GetFocusedItem() const override; - virtual void ClearFocusedItem() wxOVERRIDE; - virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE; + virtual void ClearFocusedItem() override; + virtual void SetFocusedItem(const wxTreeItemId& item) override; - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const override; virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const wxOVERRIDE; + wxTreeItemIdValue& cookie) const override; virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const wxOVERRIDE; - virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const wxOVERRIDE; + wxTreeItemIdValue& cookie) const override; + virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const override; - virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const override; - virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE; - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetFirstVisibleItem() const override; + virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const override; // operations // ---------- virtual wxTreeItemId AddRoot(const wxString& text, int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; + wxTreeItemData *data = NULL) override; - virtual void Delete(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteAllItems() wxOVERRIDE; + virtual void Delete(const wxTreeItemId& item) override; + virtual void DeleteChildren(const wxTreeItemId& item) override; + virtual void DeleteAllItems() override; - 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 Expand(const wxTreeItemId& item) override; + virtual void Collapse(const wxTreeItemId& item) override; + virtual void CollapseAndReset(const wxTreeItemId& item) override; + virtual void Toggle(const wxTreeItemId& item) override; - 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 Unselect() override; + virtual void UnselectAll() override; + virtual void SelectItem(const wxTreeItemId& item, bool select = true) override; + virtual void SelectChildren(const wxTreeItemId& parent) override; - virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE; - virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE; + virtual void EnsureVisible(const wxTreeItemId& item) override; + virtual void ScrollTo(const wxTreeItemId& item) override; virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE; - virtual wxTextCtrl *GetEditControl() const wxOVERRIDE; + wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) override; + virtual wxTextCtrl *GetEditControl() const override; virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item), - bool discardChanges = false) wxOVERRIDE + bool discardChanges = false) override { DoEndEditLabel(discardChanges); } - virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE; + virtual void SortChildren(const wxTreeItemId& item) override; virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, - bool textOnly = false) const wxOVERRIDE; + bool textOnly = false) const override; // implementation // -------------- - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -189,30 +189,30 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; - virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; - virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; + virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; + virtual bool MSWCommand(WXUINT param, WXWORD id) override; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; + virtual bool MSWShouldPreProcessMessage(WXMSG* msg) override; // override some base class virtuals - virtual bool SetBackgroundColour(const wxColour &colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour &colour) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour &colour) override; + virtual bool SetForegroundColour(const wxColour &colour) override; // returns true if the platform should explicitly apply a theme border - virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; } + virtual bool CanApplyThemeBorder() const override { return false; } - virtual bool IsDoubleBuffered() const wxOVERRIDE; - virtual void SetDoubleBuffered(bool on) wxOVERRIDE; + virtual bool IsDoubleBuffered() const override; + virtual void SetDoubleBuffered(bool on) override; protected: // Implement "update locking" in a custom way for this control. - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; + virtual void DoFreeze() override; + virtual void DoThaw() override; - virtual bool MSWShouldSetDefaultFont() const wxOVERRIDE { return false; } + virtual bool MSWShouldSetDefaultFont() const override { return false; } - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; // SetImageList helper void SetAnyImageList(wxImageList *imageList, int which); @@ -223,20 +223,20 @@ protected: // end edit label void DoEndEditLabel(bool discardChanges = false); - virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE; - virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE; + virtual int DoGetItemState(const wxTreeItemId& item) const override; + virtual void DoSetItemState(const wxTreeItemId& item, int state) override; virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, size_t pos, const wxString& text, int image, int selectedImage, - wxTreeItemData *data) wxOVERRIDE; + wxTreeItemData *data) override; virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, const wxTreeItemId& idPrevious, const wxString& text, int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE; + wxTreeItemData *data = NULL) override; + virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const override; // obtain the user data for the lParam member of TV_ITEM class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const; @@ -263,7 +263,7 @@ protected: // return true if the key was processed, false otherwise bool MSWHandleSelectionKey(unsigned vkey); - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // data used only while editing the item label: wxTextCtrl *m_textCtrl; // text control in which it is edited diff --git a/include/wx/msw/webview_edge.h b/include/wx/msw/webview_edge.h index b748e6a2d1..8d27d40a89 100644 --- a/include/wx/msw/webview_edge.h +++ b/include/wx/msw/webview_edge.h @@ -41,70 +41,70 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) wxOVERRIDE; + const wxString& name = wxWebViewNameStr) override; - virtual void LoadURL(const wxString& url) wxOVERRIDE; - virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; - virtual wxVector > GetBackwardHistory() wxOVERRIDE; - virtual wxVector > GetForwardHistory() wxOVERRIDE; + virtual void LoadURL(const wxString& url) override; + virtual void LoadHistoryItem(wxSharedPtr item) override; + virtual wxVector > GetBackwardHistory() override; + virtual wxVector > GetForwardHistory() override; - virtual bool CanGoForward() const wxOVERRIDE; - virtual bool CanGoBack() const wxOVERRIDE; - virtual void GoBack() wxOVERRIDE; - virtual void GoForward() wxOVERRIDE; - virtual void ClearHistory() wxOVERRIDE; - virtual void EnableHistory(bool enable = true) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; + virtual bool CanGoForward() const override; + virtual bool CanGoBack() const override; + virtual void GoBack() override; + virtual void GoForward() override; + virtual void ClearHistory() override; + virtual void EnableHistory(bool enable = true) override; + virtual void Stop() override; + virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) override; - virtual bool IsBusy() const wxOVERRIDE; - virtual wxString GetCurrentURL() const wxOVERRIDE; - virtual wxString GetCurrentTitle() const wxOVERRIDE; + virtual bool IsBusy() const override; + virtual wxString GetCurrentURL() const override; + virtual wxString GetCurrentTitle() const override; - virtual void SetZoomType(wxWebViewZoomType) wxOVERRIDE; - virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE; - virtual bool CanSetZoomType(wxWebViewZoomType type) const wxOVERRIDE; + virtual void SetZoomType(wxWebViewZoomType) override; + virtual wxWebViewZoomType GetZoomType() const override; + virtual bool CanSetZoomType(wxWebViewZoomType type) const override; - virtual void Print() wxOVERRIDE; + virtual void Print() override; - virtual float GetZoomFactor() const wxOVERRIDE; - virtual void SetZoomFactor(float zoom) wxOVERRIDE; + virtual float GetZoomFactor() const override; + virtual void SetZoomFactor(float zoom) override; //Undo / redo functionality - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; + virtual void Undo() override; + virtual void Redo() override; //Editing functions - virtual void SetEditable(bool enable = true) wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual void SetEditable(bool enable = true) override; + virtual bool IsEditable() const override; - virtual void EnableContextMenu(bool enable = true) wxOVERRIDE; - virtual bool IsContextMenuEnabled() const wxOVERRIDE; + virtual void EnableContextMenu(bool enable = true) override; + virtual bool IsContextMenuEnabled() const override; - virtual void EnableAccessToDevTools(bool enable = true) wxOVERRIDE; - virtual bool IsAccessToDevToolsEnabled() const wxOVERRIDE; + virtual void EnableAccessToDevTools(bool enable = true) override; + virtual bool IsAccessToDevToolsEnabled() const override; - virtual bool SetUserAgent(const wxString& userAgent) wxOVERRIDE; + virtual bool SetUserAgent(const wxString& userAgent) override; - virtual bool RunScript(const wxString& javascript, wxString* output = NULL) const wxOVERRIDE; - virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const wxOVERRIDE; - virtual bool AddScriptMessageHandler(const wxString& name) wxOVERRIDE; - virtual bool RemoveScriptMessageHandler(const wxString& name) wxOVERRIDE; + virtual bool RunScript(const wxString& javascript, wxString* output = NULL) const override; + virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const override; + virtual bool AddScriptMessageHandler(const wxString& name) override; + virtual bool RemoveScriptMessageHandler(const wxString& name) override; virtual bool AddUserScript(const wxString& javascript, - wxWebViewUserScriptInjectionTime injectionTime = wxWEBVIEW_INJECT_AT_DOCUMENT_START) wxOVERRIDE; - virtual void RemoveAllUserScripts() wxOVERRIDE; + wxWebViewUserScriptInjectionTime injectionTime = wxWEBVIEW_INJECT_AT_DOCUMENT_START) override; + virtual void RemoveAllUserScripts() override; - virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; + virtual void RegisterHandler(wxSharedPtr handler) override; - virtual void* GetNativeBackend() const wxOVERRIDE; - virtual void* GetNativeConfiguration() const wxOVERRIDE; + virtual void* GetNativeBackend() const override; + virtual void* GetNativeConfiguration() const override; static void MSWSetBrowserExecutableDir(const wxString& path); protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; + virtual void DoSetPage(const wxString& html, const wxString& baseUrl) override; private: wxWebViewEdgeImpl* m_impl; @@ -121,19 +121,19 @@ private: class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryEdge : public wxWebViewFactory { public: - virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewEdge; } + virtual wxWebView* Create() override { return new wxWebViewEdge; } 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) wxOVERRIDE + const wxString& name = wxWebViewNameStr) override { return new wxWebViewEdge(parent, id, url, pos, size, style, name); } - virtual bool IsAvailable() wxOVERRIDE; - virtual wxVersionInfo GetVersionInfo() wxOVERRIDE; + virtual bool IsAvailable() override; + virtual wxVersionInfo GetVersionInfo() override; }; #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_EDGE && defined(__WXMSW__) diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index 072b8aeb5a..7f04eef8ed 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -68,75 +68,75 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxWebViewNameStr)) override; - virtual void LoadURL(const wxString& url) wxOVERRIDE; - virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; - virtual wxVector > GetBackwardHistory() wxOVERRIDE; - virtual wxVector > GetForwardHistory() wxOVERRIDE; + virtual void LoadURL(const wxString& url) override; + virtual void LoadHistoryItem(wxSharedPtr item) override; + virtual wxVector > GetBackwardHistory() override; + virtual wxVector > GetForwardHistory() override; - virtual bool CanGoForward() const wxOVERRIDE; - virtual bool CanGoBack() const wxOVERRIDE; - virtual void GoBack() wxOVERRIDE; - virtual void GoForward() wxOVERRIDE; - virtual void ClearHistory() wxOVERRIDE; - virtual void EnableHistory(bool enable = true) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; + virtual bool CanGoForward() const override; + virtual bool CanGoBack() const override; + virtual void GoBack() override; + virtual void GoForward() override; + virtual void ClearHistory() override; + virtual void EnableHistory(bool enable = true) override; + virtual void Stop() override; + virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) override; - virtual wxString GetPageSource() const wxOVERRIDE; - virtual wxString GetPageText() const wxOVERRIDE; + virtual wxString GetPageSource() const override; + virtual wxString GetPageText() const override; - virtual bool IsBusy() const wxOVERRIDE; - virtual wxString GetCurrentURL() const wxOVERRIDE; - virtual wxString GetCurrentTitle() const wxOVERRIDE; + virtual bool IsBusy() const override; + virtual wxString GetCurrentURL() const override; + virtual wxString GetCurrentTitle() const override; - virtual void SetZoomType(wxWebViewZoomType) wxOVERRIDE; - virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE; - virtual bool CanSetZoomType(wxWebViewZoomType) const wxOVERRIDE; + virtual void SetZoomType(wxWebViewZoomType) override; + virtual wxWebViewZoomType GetZoomType() const override; + virtual bool CanSetZoomType(wxWebViewZoomType) const override; - virtual void Print() wxOVERRIDE; + virtual void Print() override; - virtual wxWebViewZoom GetZoom() const wxOVERRIDE; - virtual float GetZoomFactor() const wxOVERRIDE; - virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE; - virtual void SetZoomFactor(float zoom) wxOVERRIDE; + virtual wxWebViewZoom GetZoom() const override; + virtual float GetZoomFactor() const override; + virtual void SetZoom(wxWebViewZoom zoom) override; + virtual void SetZoomFactor(float zoom) override; //Clipboard functions - 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; + virtual bool CanCut() const override; + virtual bool CanCopy() const override; + virtual bool CanPaste() const override; + virtual void Cut() override; + virtual void Copy() override; + virtual void Paste() override; //Undo / redo functionality - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; + virtual void Undo() override; + virtual void Redo() override; //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE; + virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) override; //Editing functions - virtual void SetEditable(bool enable = true) wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual void SetEditable(bool enable = true) override; + virtual bool IsEditable() const override; //Selection - virtual void SelectAll() wxOVERRIDE; - virtual bool HasSelection() const wxOVERRIDE; - virtual void DeleteSelection() wxOVERRIDE; - virtual wxString GetSelectedText() const wxOVERRIDE; - virtual wxString GetSelectedSource() const wxOVERRIDE; - virtual void ClearSelection() wxOVERRIDE; + virtual void SelectAll() override; + virtual bool HasSelection() const override; + virtual void DeleteSelection() override; + virtual wxString GetSelectedText() const override; + virtual wxString GetSelectedSource() const override; + virtual void ClearSelection() override; - virtual bool RunScript(const wxString& javascript, wxString* output = NULL) const wxOVERRIDE; + virtual bool RunScript(const wxString& javascript, wxString* output = NULL) const override; //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; + virtual void RegisterHandler(wxSharedPtr handler) override; - virtual void* GetNativeBackend() const wxOVERRIDE; + virtual void* GetNativeBackend() const override; // ---- IE-specific methods @@ -172,7 +172,7 @@ public: wxDECLARE_EVENT_TABLE(); protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; + virtual void DoSetPage(const wxString& html, const wxString& baseUrl) override; private: wxWebViewIEImpl* m_impl; @@ -183,16 +183,16 @@ private: class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory { public: - virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewIE; } + virtual wxWebView* Create() override { return new wxWebViewIE; } 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 = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE + const wxString& name = wxASCII_STR(wxWebViewNameStr)) override { return new wxWebViewIE(parent, id, url, pos, size, style, name); } - virtual wxVersionInfo GetVersionInfo() wxOVERRIDE; + virtual wxVersionInfo GetVersionInfo() override; }; #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE && defined(__WXMSW__) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 88bbc46f0a..741d952cf3 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -71,79 +71,79 @@ public: const wxString& name = wxASCII_STR(wxPanelNameStr)); // implement base class pure virtuals - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual wxString GetLabel() const override; - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; + virtual void Raise() override; + virtual void Lower() override; #if wxUSE_DEFERRED_SIZING - virtual bool BeginRepositioningChildren() wxOVERRIDE; - virtual void EndRepositioningChildren() wxOVERRIDE; + virtual bool BeginRepositioningChildren() override; + virtual void EndRepositioningChildren() override; #endif // wxUSE_DEFERRED_SIZING - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; virtual bool ShowWithEffect(wxShowEffect effect, - unsigned timeout = 0) wxOVERRIDE + unsigned timeout = 0) override { return MSWShowWithEffect(true, effect, timeout); } virtual bool HideWithEffect(wxShowEffect effect, - unsigned timeout = 0) wxOVERRIDE + unsigned timeout = 0) override { return MSWShowWithEffect(false, effect, timeout); } - virtual void SetFocus() wxOVERRIDE; - virtual void SetFocusFromKbd() wxOVERRIDE; + virtual void SetFocus() override; + virtual void SetFocusFromKbd() override; - virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE; + virtual bool Reparent(wxWindowBase *newParent) override; - virtual wxSize GetDPI() const wxOVERRIDE; - virtual double GetDPIScaleFactor() const wxOVERRIDE; + virtual wxSize GetDPI() const override; + virtual double GetDPIScaleFactor() const override; - virtual wxSize GetWindowBorderSize() const wxOVERRIDE; + virtual wxSize GetWindowBorderSize() const override; - virtual void WarpPointer(int x, int y) wxOVERRIDE; - virtual bool EnableTouchEvents(int eventsMask) wxOVERRIDE; + virtual void WarpPointer(int x, int y) override; + virtual bool EnableTouchEvents(int eventsMask) override; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; - virtual void Update() wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; + virtual void Update() override; - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; - virtual void SetExtraStyle(long exStyle) wxOVERRIDE; - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; + virtual void SetExtraStyle(long exStyle) override; + virtual bool SetCursor( const wxCursor &cursor ) override; + virtual bool SetFont( const wxFont &font ) override; - virtual int GetCharHeight() const wxOVERRIDE; - virtual int GetCharWidth() const wxOVERRIDE; + virtual int GetCharHeight() const override; + virtual int GetCharWidth() const override; virtual void SetScrollbar( int orient, int pos, int thumbVisible, - 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; + int range, bool refresh = true ) override; + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) override; + virtual int GetScrollPos( int orient ) const override; + virtual int GetScrollThumb( int orient ) const override; + virtual int GetScrollRange( int orient ) const override; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) wxOVERRIDE; + const wxRect* rect = NULL ) override; - virtual bool ScrollLines(int lines) wxOVERRIDE; - virtual bool ScrollPages(int pages) wxOVERRIDE; + virtual bool ScrollLines(int lines) override; + virtual bool ScrollPages(int pages) override; - virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; - virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; + virtual void SetLayoutDirection(wxLayoutDirection dir) override; + virtual wxLayoutDirection GetLayoutDirection() const override; virtual wxCoord AdjustForLayoutDirection(wxCoord x, wxCoord width, - wxCoord widthTotal) const wxOVERRIDE; + wxCoord widthTotal) const override; - virtual void SetId(wxWindowID winid) wxOVERRIDE; + virtual void SetId(wxWindowID winid) override; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; + virtual void SetDropTarget( wxDropTarget *dropTarget ) override; // Accept files for dragging - virtual void DragAcceptFiles(bool accept) wxOVERRIDE; + virtual void DragAcceptFiles(bool accept) override; #endif // wxUSE_DRAG_AND_DROP #ifndef __WXUNIVERSAL__ @@ -157,8 +157,8 @@ public: #if wxUSE_HOTKEY // install and deinstall a system wide hotkey - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE; - virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE; + virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) override; + virtual bool UnregisterHotKey(int hotkeyId) override; #endif // wxUSE_HOTKEY // window handle stuff @@ -166,10 +166,10 @@ public: WXHWND GetHWND() const { return m_hWnd; } void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } - virtual WXWidget GetHandle() const wxOVERRIDE { return GetHWND(); } + virtual WXWidget GetHandle() const override { return GetHWND(); } - void AssociateHandle(WXWidget handle) wxOVERRIDE; - void DissociateHandle() wxOVERRIDE; + void AssociateHandle(WXWidget handle) override; + void DissociateHandle() override; // returns the handle of the native window to focus when this wxWindow gets // focus (i.e. in composite windows: by default, this is just the HWND for @@ -554,15 +554,15 @@ public: // check if mouse is in the window bool IsMouseInWindow() const; - virtual void SetDoubleBuffered(bool on) wxOVERRIDE; - virtual bool IsDoubleBuffered() const wxOVERRIDE; + virtual void SetDoubleBuffered(bool on) override; + virtual bool IsDoubleBuffered() const override; // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false void GenerateMouseLeave(); // virtual function for implementing internal idle // behaviour - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; #if wxUSE_MENUS && !defined(__WXUNIVERSAL__) virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); @@ -602,7 +602,7 @@ public: bool MSWUpdateOnDPIChange(const wxSize& oldDPI, const wxSize& newDPI); protected: - virtual void WXAdjustFontToOwnPPI(wxFont& font) const wxOVERRIDE; + virtual void WXAdjustFontToOwnPPI(wxFont& font) const override; // Called from MSWUpdateOnDPIChange() specifically to update the control // font, as this may need to be done differently for some specific native @@ -612,17 +612,17 @@ protected: // this allows you to implement standard control borders without // repeating the code in different classes that are not derived from // wxControl - virtual wxBorder GetDefaultBorderForControl() const wxOVERRIDE; + virtual wxBorder GetDefaultBorderForControl() const override; // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override; // Translate wxBORDER_THEME (and other border styles if necessary to the value // that makes most sense for this Windows environment virtual wxBorder TranslateBorder(wxBorder border) const; #if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) override; #endif // wxUSE_MENUS_NATIVE // the window handle @@ -644,26 +644,26 @@ protected: int *x, int *y, int *descent = NULL, int *externalLeading = NULL, - const wxFont *font = NULL) const wxOVERRIDE; + const wxFont *font = NULL) const override; static void MSWDoClientToScreen( WXHWND hWnd, int *x, int *y ); static void MSWDoScreenToClient( WXHWND hWnd, int *x, int *y ); - 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 DoClientToScreen( int *x, int *y ) const override; + virtual void DoScreenToClient( int *x, int *y ) const override; + virtual void DoGetPosition( int *x, int *y ) const override; + virtual void DoGetSize( int *width, int *height ) const override; + virtual void DoGetClientSize( int *width, int *height ) const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual void DoSetClientSize(int width, int height) override; - virtual void DoCaptureMouse() wxOVERRIDE; - virtual void DoReleaseMouse() wxOVERRIDE; + virtual void DoCaptureMouse() override; + virtual void DoReleaseMouse() override; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual void DoEnable(bool enable) override; - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; + virtual void DoFreeze() override; + virtual void DoThaw() override; // this simply moves/resizes the given HWND which is supposed to be our // sibling (this is useful for controls which are composite at MSW level @@ -677,10 +677,10 @@ protected: // from both DoSetSize() and DoSetClientSize() and would usually just call // ::MoveWindow() except for composite controls which will want to arrange // themselves inside the given rectangle - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; + virtual void DoSetToolTip( wxToolTip *tip ) override; // process TTN_NEEDTEXT message properly (i.e. fixing the bugs in // comctl32.dll in our code -- see the function body for more info) diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h index fc10767e2e..984b9b573e 100644 --- a/include/wx/nativewin.h +++ b/include/wx/nativewin.h @@ -168,55 +168,55 @@ public: // provide (trivial) implementation of the base class pure virtuals - virtual void SetTitle(const wxString& WXUNUSED(title)) wxOVERRIDE + virtual void SetTitle(const wxString& WXUNUSED(title)) override { wxFAIL_MSG( "not implemented for native windows" ); } - virtual wxString GetTitle() const wxOVERRIDE + virtual wxString GetTitle() const override { wxFAIL_MSG( "not implemented for native windows" ); return wxString(); } - virtual void Maximize(bool WXUNUSED(maximize) = true) wxOVERRIDE + virtual void Maximize(bool WXUNUSED(maximize) = true) override { wxFAIL_MSG( "not implemented for native windows" ); } - virtual bool IsMaximized() const wxOVERRIDE + virtual bool IsMaximized() const override { wxFAIL_MSG( "not implemented for native windows" ); return false; } - virtual void Iconize(bool WXUNUSED(iconize) = true) wxOVERRIDE + virtual void Iconize(bool WXUNUSED(iconize) = true) override { wxFAIL_MSG( "not implemented for native windows" ); } - virtual bool IsIconized() const wxOVERRIDE + virtual bool IsIconized() const override { // this is called by wxGTK implementation so don't assert return false; } - virtual void Restore() wxOVERRIDE + virtual void Restore() override { wxFAIL_MSG( "not implemented for native windows" ); } virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style) = wxFULLSCREEN_ALL) wxOVERRIDE + long WXUNUSED(style) = wxFULLSCREEN_ALL) override { wxFAIL_MSG( "not implemented for native windows" ); return false; } - virtual bool IsFullScreen() const wxOVERRIDE + virtual bool IsFullScreen() const override { wxFAIL_MSG( "not implemented for native windows" ); @@ -224,7 +224,7 @@ public: } #ifdef __WXMSW__ - virtual bool IsShown() const wxOVERRIDE; + virtual bool IsShown() const override; #endif // __WXMSW__ // this is an implementation detail: called when the native window is @@ -236,7 +236,7 @@ public: protected: #ifdef __WXMSW__ virtual WXLRESULT - MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; #endif // __WXMSW__ private: diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h index 0840fce538..22f191d30e 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 wxOVERRIDE + int WXUNUSED(sizeFlags) = 0) const override { // Non owned windows positions don't need to be adjusted for parent // client area origin so simply do nothing here. } - virtual void InheritAttributes() wxOVERRIDE + virtual void InheritAttributes() override { // 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 ee89a44c4c..163e132f71 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -124,7 +124,7 @@ public: // implement some base class functions - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const override; // On platforms that support it, get the theme page background colour, else invalid colour virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; } diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h index a8ffa9570a..0a49096f65 100644 --- a/include/wx/odcombo.h +++ b/include/wx/odcombo.h @@ -77,22 +77,22 @@ public: virtual ~wxVListBoxComboPopup(); // required virtuals - 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; + virtual void Init() override; + virtual bool Create(wxWindow* parent) override; + virtual void SetFocus() override; + virtual wxWindow *GetControl() override { return this; } + virtual void SetStringValue( const wxString& value ) override; + virtual wxString GetStringValue() const override; // more customization - 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; + virtual void OnPopup() override; + virtual wxSize GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ) override; + virtual void PaintComboControl( wxDC& dc, const wxRect& rect ) override; + virtual void OnComboKeyEvent( wxKeyEvent& event ) override; + virtual void OnComboCharEvent( wxKeyEvent& event ) override; + virtual void OnComboDoubleClick() override; + virtual bool LazyCreate() override; + virtual bool FindItem(const wxString& item, wxString* trueItem) override; virtual void OnDPIChanged(wxDPIChangedEvent& event); // Item management @@ -149,7 +149,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 wxOVERRIDE; + virtual wxCoord OnMeasureItem( size_t item ) const override; // Return item width, or -1 for calculating from text extent (default) virtual wxCoord OnMeasureItemWidth( size_t item ) const; @@ -159,8 +159,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 wxOVERRIDE; - void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const override; + void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const override; // filter mouse move events happening outside the list box // move selection with cursor @@ -309,12 +309,12 @@ public: } // wxControlWithItems methods - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; virtual void Select(int n); - virtual int GetSelection() const wxOVERRIDE; + virtual int GetSelection() const override; // See wxComboBoxBase discussion of IsEmpty(). bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } @@ -322,14 +322,14 @@ public: // Override these just to maintain consistency with virtual methods // between classes. - virtual void Clear() wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void Clear() override; + virtual void GetSelection(long *from, long *to) const override; - virtual void SetSelection(int n) wxOVERRIDE { Select(n); } + virtual void SetSelection(int n) override { Select(n); } // Prevent a method from being hidden - virtual void SetSelection(long from, long to) wxOVERRIDE + virtual void SetSelection(long from, long to) override { wxComboCtrl::SetSelection(from,to); } @@ -340,11 +340,11 @@ public: // Return the index of the widest item (recalculating it if necessary) virtual int GetWidestItem() { EnsurePopupControl(); return GetVListBoxComboPopup()->GetWidestItem(); } - virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); } + virtual bool IsSorted() const override { return HasFlag(wxCB_SORT); } protected: - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; // Callback for drawing. Font, background and text colour have been // prepared according to selection, focus and such. @@ -361,14 +361,14 @@ protected: // override base implementation so we can return the size for the // largest item - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // 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) wxOVERRIDE; + virtual void DoSetPopupControl(wxComboPopup* popup) override; // clears all allocated client data void ClearClientDatas(); @@ -380,9 +380,9 @@ protected: virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + void **clientData, wxClientDataType type) override; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; // temporary storage for the initial choices //const wxString* m_baseChoices; diff --git a/include/wx/osx/activityindicator.h b/include/wx/osx/activityindicator.h index a6f78231a8..eeb5766875 100644 --- a/include/wx/osx/activityindicator.h +++ b/include/wx/osx/activityindicator.h @@ -42,9 +42,9 @@ public: long style = 0, const wxString& name = wxActivityIndicatorNameStr); - virtual void Start() wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual bool IsRunning() const override; private: // Common part of all ctors. diff --git a/include/wx/osx/anybutton.h b/include/wx/osx/anybutton.h index e8d1ef03e4..6b14793fde 100644 --- a/include/wx/osx/anybutton.h +++ b/include/wx/osx/anybutton.h @@ -18,19 +18,19 @@ public: static wxSize GetDefaultSize(); - virtual void SetLabel(const wxString& label) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; void OnEnterWindow( wxMouseEvent& event); void OnLeaveWindow( wxMouseEvent& event); - virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmapBundle& bitmapBundle, State which) wxOVERRIDE; - virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; + virtual wxBitmap DoGetBitmap(State which) const override; + virtual void DoSetBitmap(const wxBitmapBundle& bitmapBundle, State which) override; + virtual void DoSetBitmapPosition(wxDirection dir) override; - virtual void DoSetBitmapMargins(int x, int y) wxOVERRIDE + virtual void DoSetBitmapMargins(int x, int y) override { m_marginX = x; m_marginY = y; @@ -38,7 +38,7 @@ protected: } #if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP && wxOSX_USE_COCOA diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h index 317a0ca96f..b0e7f365be 100644 --- a/include/wx/osx/app.h +++ b/include/wx/osx/app.h @@ -38,21 +38,21 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase wxApp(); virtual ~wxApp(); - virtual void WakeUpIdle() wxOVERRIDE; + virtual void WakeUpIdle() override; - virtual void SetPrintMode(int mode) wxOVERRIDE { m_printMode = mode; } + virtual void SetPrintMode(int mode) override { m_printMode = mode; } virtual int GetPrintMode() const { return m_printMode; } // calling OnInit with an auto-release pool ready ... - virtual bool CallOnInit() wxOVERRIDE; + virtual bool CallOnInit() override; #if wxUSE_GUI // setting up all MacOS Specific Event-Handlers etc - virtual bool OnInitGui() wxOVERRIDE; + virtual bool OnInitGui() override; #endif // wxUSE_GUI - virtual int OnRun() wxOVERRIDE; + virtual int OnRun() override; - virtual bool ProcessIdle() wxOVERRIDE; + virtual bool ProcessIdle() override; // implementation only void OnIdle(wxIdleEvent& event); @@ -67,8 +67,8 @@ public: static bool sm_isEmbedded; // Implementation - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; - virtual void CleanUp() wxOVERRIDE; + virtual bool Initialize(int& argc, wxChar **argv) override; + virtual void CleanUp() override; // the installed application event handler WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } diff --git a/include/wx/osx/appprogress.h b/include/wx/osx/appprogress.h index a64b2cc62f..31f19f0c92 100644 --- a/include/wx/osx/appprogress.h +++ b/include/wx/osx/appprogress.h @@ -19,12 +19,12 @@ public: wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100); virtual ~wxAppProgressIndicator(); - virtual bool IsAvailable() const wxOVERRIDE; + virtual bool IsAvailable() const override; - virtual void SetValue(int value) wxOVERRIDE; - virtual void SetRange(int range) wxOVERRIDE; - virtual void Pulse() wxOVERRIDE; - virtual void Reset() wxOVERRIDE; + virtual void SetValue(int value) override; + virtual void SetRange(int range) override; + virtual void Pulse() override; + virtual void Reset() override; private: int m_maxValue; diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index ff5fcef436..0a8325e46b 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -63,14 +63,14 @@ public: protected: // this function is called from Create() to free the existing mask data - virtual void FreeData() wxOVERRIDE; + virtual void FreeData() override; // these functions must be overridden to implement the corresponding public // Create() methods, they shouldn't call FreeData() as it's already called // by the public wrappers virtual bool InitFromColour(const wxBitmap& bitmap, - const wxColour& colour) wxOVERRIDE; - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE; + const wxColour& colour) override; + virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) override; private: void DoCreateMaskBitmap(int width, int height, int bytesPerRow = -1); @@ -126,13 +126,13 @@ public: virtual ~wxBitmap() {} - wxImage ConvertToImage() const wxOVERRIDE; + wxImage ConvertToImage() const override; // get the given part of bitmap - wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE; + wxBitmap GetSubBitmap( const wxRect& rect ) const override; - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE + virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) override; + virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) override { return Create(sz.GetWidth(), sz.GetHeight(), depth); } virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); @@ -144,8 +144,8 @@ public: bool Create(int width, int height, const wxDC& dc); // virtual bool Create( WXHICON icon) ; - virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; - virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const wxOVERRIDE; + virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) override; + virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const override; const wxBitmapRefData *GetBitmapData() const { return (const wxBitmapRefData *)m_refData; } @@ -153,26 +153,26 @@ public: wxBitmapRefData *GetBitmapData() { return (wxBitmapRefData *)m_refData; } - int GetWidth() const wxOVERRIDE; - int GetHeight() const wxOVERRIDE; - int GetDepth() const wxOVERRIDE; + int GetWidth() const override; + int GetHeight() const override; + int GetDepth() const override; #if WXWIN_COMPATIBILITY_3_0 wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") - void SetWidth(int width) wxOVERRIDE; + void SetWidth(int width) override; wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") - void SetHeight(int height) wxOVERRIDE; + void SetHeight(int height) override; wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") - void SetDepth(int depth) wxOVERRIDE; + void SetDepth(int depth) override; #endif #if wxUSE_PALETTE - wxPalette* GetPalette() const wxOVERRIDE; - void SetPalette(const wxPalette& palette) wxOVERRIDE; + wxPalette* GetPalette() const override; + void SetPalette(const wxPalette& palette) override; #endif // wxUSE_PALETTE - wxMask *GetMask() const wxOVERRIDE; - void SetMask(wxMask *mask) wxOVERRIDE; + wxMask *GetMask() const override; + void SetMask(wxMask *mask) override; static void InitStandardHandlers(); @@ -180,8 +180,8 @@ public: void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); - bool HasAlpha() const wxOVERRIDE; - bool UseAlpha(bool use = true) wxOVERRIDE; + bool HasAlpha() const override; + bool UseAlpha(bool use = true) override; // returns the 'native' implementation, a GWorldPtr for the content and one for the mask WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const; @@ -224,17 +224,17 @@ public: void EndRawAccess(); #endif - void SetScaleFactor(double scale) wxOVERRIDE; - double GetScaleFactor() const wxOVERRIDE; + void SetScaleFactor(double scale) override; + double GetScaleFactor() const override; void SetSelectedInto(wxDC *dc); wxDC *GetSelectedInto() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; - virtual bool DoCreate(const wxSize& sz, double scale, int depth) wxOVERRIDE; + virtual bool DoCreate(const wxSize& sz, double scale, int depth) override; private: void InitFromImage(const wxImage& image, int depth, double scale); diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h index 4fca97487e..5f17ea1538 100644 --- a/include/wx/osx/bmpbuttn.h +++ b/include/wx/osx/bmpbuttn.h @@ -42,7 +42,7 @@ public: const wxString& name = wxString()); protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; wxDECLARE_DYNAMIC_CLASS(wxBitmapButton); }; diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h index acb7702591..6db266f823 100644 --- a/include/wx/osx/brush.h +++ b/include/wx/osx/brush.h @@ -26,17 +26,17 @@ public: wxBrush(const wxBitmap& stipple); virtual ~wxBrush(); - virtual void SetColour(const wxColour& col) wxOVERRIDE; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; - virtual void SetStyle(wxBrushStyle style) wxOVERRIDE; - virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; + virtual void SetColour(const wxColour& col) override; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override; + virtual void SetStyle(wxBrushStyle style) override; + virtual void SetStipple(const wxBitmap& stipple) override; bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - wxColour GetColour() const wxOVERRIDE; - wxBrushStyle GetStyle() const wxOVERRIDE; - wxBitmap *GetStipple() const wxOVERRIDE; + wxColour GetColour() const override; + wxBrushStyle GetStyle() const override; + wxBitmap *GetStipple() const override; wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") @@ -46,8 +46,8 @@ public: void SetStyle(int style) { SetStyle((wxBrushStyle)style); } protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxBrush); diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h index 162ad27507..35280477c7 100644 --- a/include/wx/osx/button.h +++ b/include/wx/osx/button.h @@ -40,13 +40,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxButtonNameStr)); - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual wxWindow *SetDefault() wxOVERRIDE; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual wxWindow *SetDefault() override; + virtual void Command(wxCommandEvent& event) override; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; + virtual bool OSXHandleClicked(double timestampsec) override; #if wxOSX_USE_COCOA void OSXUpdateAfterLabelChange(const wxString& label); diff --git a/include/wx/osx/carbon/private/print.h b/include/wx/osx/carbon/private/print.h index fa1ce4126c..4cdb27716a 100644 --- a/include/wx/osx/carbon/private/print.h +++ b/include/wx/osx/carbon/private/print.h @@ -23,13 +23,13 @@ public: wxOSXPrintData(); virtual ~wxOSXPrintData(); - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; + virtual bool TransferTo( wxPrintData &data ) override; + virtual bool TransferFrom( const wxPrintData &data ) override; - virtual bool IsOk() const wxOVERRIDE; + virtual bool IsOk() const override; - virtual void TransferFrom( const wxPageSetupDialogData * ) wxOVERRIDE; - virtual void TransferTo( wxPageSetupDialogData * ) wxOVERRIDE; + virtual void TransferFrom( const wxPageSetupDialogData * ) override; + virtual void TransferTo( wxPageSetupDialogData * ) override; virtual void TransferFrom( const wxPrintDialogData * ); virtual void TransferTo( wxPrintDialogData * ); @@ -69,8 +69,8 @@ public: WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; } protected: - virtual void UpdateFromPMState() wxOVERRIDE; - virtual void UpdateToPMState() wxOVERRIDE; + virtual void UpdateFromPMState() override; + virtual void UpdateToPMState() override; WX_NSPrintInfo m_macPrintInfo; private: diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index a5a1b87e2b..880a713821 100644 --- a/include/wx/osx/carbon/region.h +++ b/include/wx/osx/carbon/region.h @@ -37,24 +37,24 @@ public: virtual ~wxRegion(); // wxRegionBase methods - virtual void Clear() wxOVERRIDE; - virtual bool IsEmpty() const wxOVERRIDE; + virtual void Clear() override; + virtual bool IsEmpty() const override; // Internal WXHRGN GetWXHRGN() const ; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; - 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 DoIsEqual(const wxRegion& region) const override; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const override; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const override; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const override; - virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; - virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE; - virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; + virtual bool DoOffset(wxCoord x, wxCoord y) override; + virtual bool DoCombine(const wxRegion& region, wxRegionOp op) override; + virtual bool DoUnionWithRect(const wxRect& rect) override; private: wxDECLARE_DYNAMIC_CLASS(wxRegion); diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h index 87bae724a8..af7e585107 100644 --- a/include/wx/osx/checkbox.h +++ b/include/wx/osx/checkbox.h @@ -30,17 +30,17 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual void SetValue(bool) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool) override; + virtual bool GetValue() const override; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void Command(wxCommandEvent& event) override; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) override; protected: - void DoSet3StateValue(wxCheckBoxState val) wxOVERRIDE; - virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; + void DoSet3StateValue(wxCheckBoxState val) override; + virtual wxCheckBoxState DoGet3StateValue() const override; wxDECLARE_DYNAMIC_CLASS(wxCheckBox); }; @@ -70,10 +70,10 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual void SetValue(bool) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool) override; + virtual bool GetValue() const override; virtual void SetLabel(const wxBitmap *bitmap); - virtual void SetLabel( const wxString & WXUNUSED(name) ) wxOVERRIDE {} + virtual void SetLabel( const wxString & WXUNUSED(name) ) override {} wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox); }; diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h index 5c085c6828..b3044f6fbe 100644 --- a/include/wx/osx/checklst.h +++ b/include/wx/osx/checklst.h @@ -64,19 +64,19 @@ public: const wxString& name = wxASCII_STR(wxListBoxNameStr)); // items may be checked - bool IsChecked(unsigned int uiIndex) const wxOVERRIDE; - void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE; + bool IsChecked(unsigned int uiIndex) const override; + void Check(unsigned int uiIndex, bool bCheck = true) override; // data callbacks - virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; - virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE; + virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) override; + virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) override; protected: // override all methods which add/delete items to update m_checks array as // well - virtual void OnItemInserted(unsigned int pos) wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; + virtual void OnItemInserted(unsigned int pos) override; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual void DoClear() override; // the array containing the checked status of the items wxArrayInt m_checks; diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h index 37486f8a7c..e210554ead 100644 --- a/include/wx/osx/choice.h +++ b/include/wx/osx/choice.h @@ -66,28 +66,28 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxChoiceNameStr)); - virtual unsigned int GetCount() const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual void SetSelection(int n) wxOVERRIDE; + virtual unsigned int GetCount() const override; + virtual int GetSelection() const override; + virtual void SetSelection(int n) override; - virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int pos, const wxString& s) wxOVERRIDE; + virtual int FindString(const wxString& s, bool bCase = false) const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int pos, const wxString& s) override; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; + virtual bool OSXHandleClicked(double timestampsec) override; protected: - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual void DoClear() override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; wxArrayString m_strings; wxChoiceDataArray m_datas ; diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h index 77a78f7129..f465722c64 100644 --- a/include/wx/osx/clipbrd.h +++ b/include/wx/osx/clipbrd.h @@ -26,33 +26,33 @@ public: virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() - virtual bool Open() wxOVERRIDE; + virtual bool Open() override; // close the clipboard after SetData() and GetData() - virtual void Close() wxOVERRIDE; + virtual void Close() override; // query whether the clipboard is opened - virtual bool IsOpened() const wxOVERRIDE; + virtual bool IsOpened() const override; // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ) wxOVERRIDE; + virtual bool SetData( wxDataObject *data ) override; // add to the clipboard data. - virtual bool AddData( wxDataObject *data ) wxOVERRIDE; + virtual bool AddData( wxDataObject *data ) override; // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; + virtual bool IsSupported( const wxDataFormat& format ) override; // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ) wxOVERRIDE; + virtual bool GetData( wxDataObject& data ) override; // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // flushes the clipboard: this means that the data which is currently on // clipboard will stay available even after the application exits (possibly // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush() wxOVERRIDE; + virtual bool Flush() override; private: wxDataObject *m_data; diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 7d63ed0208..7b7e19fae3 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -472,82 +472,82 @@ public: } // column related methods (inherited from wxDataViewWidgetImpl) - virtual bool ClearColumns() wxOVERRIDE; - virtual bool DeleteColumn(wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr) wxOVERRIDE; - virtual wxDataViewColumn* GetColumn(unsigned int pos) const wxOVERRIDE; - virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const wxOVERRIDE; - virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual void FitColumnWidthToContent(unsigned int pos) wxOVERRIDE; + virtual bool ClearColumns() override; + virtual bool DeleteColumn(wxDataViewColumn* columnPtr) override; + virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr) override; + virtual wxDataViewColumn* GetColumn(unsigned int pos) const override; + virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const override; + virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr) override; + virtual void FitColumnWidthToContent(unsigned int pos) override; // item related methods (inherited from wxDataViewWidgetImpl) - virtual bool Add(const wxDataViewItem& parent, const wxDataViewItem& item) wxOVERRIDE; + virtual bool Add(const wxDataViewItem& parent, const wxDataViewItem& item) override; virtual bool Add(const wxDataViewItem& parent, - const wxDataViewItemArray& items) wxOVERRIDE; - virtual void Collapse(const wxDataViewItem& item) wxOVERRIDE; + const wxDataViewItemArray& items) override; + virtual void Collapse(const wxDataViewItem& item) override; virtual void EnsureVisible(const wxDataViewItem& item, - wxDataViewColumn const* columnPtr) wxOVERRIDE; - virtual unsigned int GetCount() const wxOVERRIDE; - virtual int GetCountPerPage() const wxOVERRIDE; + wxDataViewColumn const* columnPtr) override; + virtual unsigned int GetCount() const override; + virtual int GetCountPerPage() const override; virtual wxRect GetRectangle(const wxDataViewItem& item, - wxDataViewColumn const* columnPtr) wxOVERRIDE; - virtual wxDataViewItem GetTopItem() const wxOVERRIDE; - virtual bool IsExpanded(const wxDataViewItem& item) const wxOVERRIDE; - virtual bool Reload() wxOVERRIDE; - virtual bool Remove(const wxDataViewItem& parent) wxOVERRIDE; - virtual bool Update(const wxDataViewColumn* columnPtr) wxOVERRIDE; + wxDataViewColumn const* columnPtr) override; + virtual wxDataViewItem GetTopItem() const override; + virtual bool IsExpanded(const wxDataViewItem& item) const override; + virtual bool Reload() override; + virtual bool Remove(const wxDataViewItem& parent) override; + virtual bool Update(const wxDataViewColumn* columnPtr) override; virtual bool Update(const wxDataViewItem& parent, - const wxDataViewItem& item) wxOVERRIDE; + const wxDataViewItem& item) override; virtual bool Update(const wxDataViewItem& parent, - const wxDataViewItemArray& items) wxOVERRIDE; + const wxDataViewItemArray& items) override; // model related methods - virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE; + virtual bool AssociateModel(wxDataViewModel* model) override; // // selection related methods (inherited from wxDataViewWidgetImpl) // - virtual wxDataViewItem GetCurrentItem() const wxOVERRIDE; - virtual void SetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; - virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; - virtual int GetSelectedItemsCount() const wxOVERRIDE; - virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE; - virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE; - virtual void Select(const wxDataViewItem& item) wxOVERRIDE; - virtual void Select(const wxDataViewItemArray& items) wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; - virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE; - virtual void UnselectAll() wxOVERRIDE; + virtual wxDataViewItem GetCurrentItem() const override; + virtual void SetCurrentItem(const wxDataViewItem& item) override; + virtual wxDataViewColumn *GetCurrentColumn() const override; + virtual int GetSelectedItemsCount() const override; + virtual int GetSelections(wxDataViewItemArray& sel) const override; + virtual bool IsSelected(const wxDataViewItem& item) const override; + virtual void Select(const wxDataViewItem& item) override; + virtual void Select(const wxDataViewItemArray& items) override; + virtual void SelectAll() override; + virtual void Unselect(const wxDataViewItem& item) override; + virtual void UnselectAll() override; // // sorting related methods // - virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE; - virtual void Resort() wxOVERRIDE; + virtual wxDataViewColumn* GetSortingColumn () const override; + virtual void Resort() override; // // other methods (inherited from wxDataViewWidgetImpl) // - virtual void DoSetIndent(int indent) wxOVERRIDE; + virtual void DoSetIndent(int indent) override; - virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) wxOVERRIDE; + virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) override; virtual void HitTest(const wxPoint& point, wxDataViewItem& item, - wxDataViewColumn*& columnPtr) const wxOVERRIDE; - virtual void SetRowHeight(int height) wxOVERRIDE; - virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height) wxOVERRIDE; - virtual void OnSize() wxOVERRIDE; + wxDataViewColumn*& columnPtr) const override; + virtual void SetRowHeight(int height) override; + virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height) override; + virtual void OnSize() override; - virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) wxOVERRIDE; + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) override; // Cocoa-specific helpers id GetItemAtRow(int row) const; - virtual void SetFont(const wxFont& font) wxOVERRIDE; + virtual void SetFont(const wxFont& font) override; - virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd) wxOVERRIDE; - virtual bool doCommandBySelector(void* sel, WXWidget slf, void* _cmd) wxOVERRIDE; + virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd) override; + virtual bool doCommandBySelector(void* sel, WXWidget slf, void* _cmd) override; private: void InitOutlineView(long style); diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h index 72998e5e7a..753c8c4a6f 100644 --- a/include/wx/osx/cocoa/evtloop.h +++ b/include/wx/osx/cocoa/evtloop.h @@ -20,18 +20,18 @@ public: void EndModalSession(); - virtual void WakeUp() wxOVERRIDE; + virtual void WakeUp() override; void OSXUseLowLevelWakeup(bool useIt) { m_osxLowLevelWakeUp = useIt ; } protected: - virtual int DoDispatchTimeout(unsigned long timeout) wxOVERRIDE; + virtual int DoDispatchTimeout(unsigned long timeout) override; - virtual void OSXDoRun() wxOVERRIDE; - virtual void OSXDoStop() wxOVERRIDE; + virtual void OSXDoRun() override; + virtual void OSXDoStop() override; - virtual CFRunLoopRef CFGetCurrentRunLoop() const wxOVERRIDE; + virtual CFRunLoopRef CFGetCurrentRunLoop() const override; void* m_modalSession; diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 25e2b5c9fa..cbbd93f757 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -80,8 +80,8 @@ public : void Init(); - virtual bool IsVisible() const wxOVERRIDE; - virtual void SetVisibility(bool) wxOVERRIDE; + virtual bool IsVisible() const override; + virtual void SetVisibility(bool) override; // we provide a static function which can be reused from // wxNonOwnedWindowCocoaImpl too @@ -92,75 +92,75 @@ public : virtual bool ShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout) wxOVERRIDE; + unsigned timeout) override; - virtual void Raise() wxOVERRIDE; + virtual void Raise() override; - virtual void Lower() wxOVERRIDE; + virtual void Lower() override; - virtual void ScrollRect( const wxRect *rect, int dx, int dy ) wxOVERRIDE; + virtual void ScrollRect( const wxRect *rect, int dx, int dy ) override; - virtual WXWidget GetWXWidget() const wxOVERRIDE { return m_osxView; } + virtual WXWidget GetWXWidget() const override { return m_osxView; } - virtual void SetBackgroundColour(const wxColour&) wxOVERRIDE; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - virtual void SetForegroundColour(const wxColour& col) wxOVERRIDE; + virtual void SetBackgroundColour(const wxColour&) override; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) override; + virtual void SetForegroundColour(const wxColour& col) override; - virtual void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE; - virtual void Move(int x, int y, int width, int height) wxOVERRIDE; - virtual void GetPosition( int &x, int &y ) const wxOVERRIDE; - virtual void GetSize( int &width, int &height ) const wxOVERRIDE; - virtual void SetControlSize( wxWindowVariant variant ) wxOVERRIDE; - virtual void GetLayoutInset(int &left , int &top , int &right, int &bottom) const wxOVERRIDE; - virtual void SetNeedsDisplay( const wxRect* where = NULL ) wxOVERRIDE; - virtual bool GetNeedsDisplay() const wxOVERRIDE; + virtual void GetContentArea( int &left, int &top, int &width, int &height ) const override; + virtual void Move(int x, int y, int width, int height) override; + virtual void GetPosition( int &x, int &y ) const override; + virtual void GetSize( int &width, int &height ) const override; + virtual void SetControlSize( wxWindowVariant variant ) override; + virtual void GetLayoutInset(int &left , int &top , int &right, int &bottom) const override; + virtual void SetNeedsDisplay( const wxRect* where = NULL ) override; + virtual bool GetNeedsDisplay() const override; - virtual void EnableFocusRing(bool enabled) wxOVERRIDE; + virtual void EnableFocusRing(bool enabled) override; - virtual void SetDrawingEnabled(bool enabled) wxOVERRIDE; + virtual void SetDrawingEnabled(bool enabled) override; - virtual bool CanFocus() const wxOVERRIDE; + virtual bool CanFocus() const override; // return true if successful - virtual bool SetFocus() wxOVERRIDE; - virtual bool HasFocus() const wxOVERRIDE; + virtual bool SetFocus() override; + virtual bool HasFocus() const override; - void RemoveFromParent() wxOVERRIDE; - void Embed( wxWidgetImpl *parent ) wxOVERRIDE; + void RemoveFromParent() override; + void Embed( wxWidgetImpl *parent ) override; - void SetDefaultButton( bool isDefault ) wxOVERRIDE; - void PerformClick() wxOVERRIDE; - virtual void SetLabel(const wxString& title, wxFontEncoding encoding) wxOVERRIDE; + void SetDefaultButton( bool isDefault ) override; + void PerformClick() override; + virtual void SetLabel(const wxString& title, wxFontEncoding encoding) override; - void SetCursor( const wxCursor & cursor ) wxOVERRIDE; - void CaptureMouse() wxOVERRIDE; - void ReleaseMouse() wxOVERRIDE; + void SetCursor( const wxCursor & cursor ) override; + void CaptureMouse() override; + void ReleaseMouse() override; #if wxUSE_DRAG_AND_DROP - void SetDropTarget(wxDropTarget* target) wxOVERRIDE; + void SetDropTarget(wxDropTarget* target) override; #endif - wxInt32 GetValue() const wxOVERRIDE; - void SetValue( wxInt32 v ) wxOVERRIDE; - wxBitmap GetBitmap() const wxOVERRIDE; - void SetBitmap( const wxBitmapBundle& bitmap ) wxOVERRIDE; - void SetBitmapPosition( wxDirection dir ) wxOVERRIDE; - void SetupTabs( const wxNotebook ¬ebook ) wxOVERRIDE; - void GetBestRect( wxRect *r ) const wxOVERRIDE; - bool IsEnabled() const wxOVERRIDE; - void Enable( bool enable ) wxOVERRIDE; - bool ButtonClickDidStateChange() wxOVERRIDE { return true; } - void SetMinimum( wxInt32 v ) wxOVERRIDE; - void SetMaximum( wxInt32 v ) wxOVERRIDE; - void SetIncrement(int value) wxOVERRIDE; - wxInt32 GetMinimum() const wxOVERRIDE; - wxInt32 GetMaximum() const wxOVERRIDE; - int GetIncrement() const wxOVERRIDE; - void PulseGauge() wxOVERRIDE; - void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE; + wxInt32 GetValue() const override; + void SetValue( wxInt32 v ) override; + wxBitmap GetBitmap() const override; + void SetBitmap( const wxBitmapBundle& bitmap ) override; + void SetBitmapPosition( wxDirection dir ) override; + void SetupTabs( const wxNotebook ¬ebook ) override; + void GetBestRect( wxRect *r ) const override; + bool IsEnabled() const override; + void Enable( bool enable ) override; + bool ButtonClickDidStateChange() override { return true; } + void SetMinimum( wxInt32 v ) override; + void SetMaximum( wxInt32 v ) override; + void SetIncrement(int value) override; + wxInt32 GetMinimum() const override; + wxInt32 GetMaximum() const override; + int GetIncrement() const override; + void PulseGauge() override; + void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) override; - void SetFont(const wxFont & font) wxOVERRIDE; - void SetToolTip( wxToolTip* tooltip ) wxOVERRIDE; + void SetFont(const wxFont & font) override; + void SetToolTip( wxToolTip* tooltip ) override; - void InstallEventHandler( WXWidget control = NULL ) wxOVERRIDE; - bool EnableTouchEvents(int eventsMask) wxOVERRIDE; + void InstallEventHandler( WXWidget control = NULL ) override; + bool EnableTouchEvents(int eventsMask) override; virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const; bool DoHandleKeyNavigation(const wxKeyEvent &event); @@ -189,7 +189,7 @@ public : virtual bool IsFlipped() const { return m_isFlipped; } #endif - virtual double GetContentScaleFactor() const wxOVERRIDE; + virtual double GetContentScaleFactor() const override; // cocoa thunk connected calls @@ -266,79 +266,79 @@ public : virtual ~wxNonOwnedWindowCocoaImpl(); - virtual void WillBeDestroyed() wxOVERRIDE; + virtual void WillBeDestroyed() override; void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name ) wxOVERRIDE; + long style, long extraStyle, const wxString& name ) override; void Create( wxWindow* parent, WXWindow nativeWindow ); - WXWindow GetWXWindow() const wxOVERRIDE; - void Raise() wxOVERRIDE; - void Lower() wxOVERRIDE; - bool Show(bool show) wxOVERRIDE; + WXWindow GetWXWindow() const override; + void Raise() override; + void Lower() override; + bool Show(bool show) override; virtual bool ShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout) wxOVERRIDE; + unsigned timeout) override; - void Update() wxOVERRIDE; - bool SetTransparent(wxByte alpha) wxOVERRIDE; - bool SetBackgroundColour(const wxColour& col ) wxOVERRIDE; - void SetExtraStyle( long exStyle ) wxOVERRIDE; - void SetWindowStyleFlag( long style ) wxOVERRIDE; - bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - bool CanSetTransparent() wxOVERRIDE; + void Update() override; + bool SetTransparent(wxByte alpha) override; + bool SetBackgroundColour(const wxColour& col ) override; + void SetExtraStyle( long exStyle ) override; + void SetWindowStyleFlag( long style ) override; + bool SetBackgroundStyle(wxBackgroundStyle style) override; + bool CanSetTransparent() override; - void MoveWindow(int x, int y, int width, int height) wxOVERRIDE; - void GetPosition( int &x, int &y ) const wxOVERRIDE; - void GetSize( int &width, int &height ) const wxOVERRIDE; + void MoveWindow(int x, int y, int width, int height) override; + void GetPosition( int &x, int &y ) const override; + void GetSize( int &width, int &height ) const override; - void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE; - bool SetShape(const wxRegion& region) wxOVERRIDE; + void GetContentArea( int &left, int &top, int &width, int &height ) const override; + bool SetShape(const wxRegion& region) override; - virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE; + virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) override; - virtual wxContentProtection GetContentProtection() const wxOVERRIDE; - virtual bool SetContentProtection(wxContentProtection contentProtection) wxOVERRIDE; + virtual wxContentProtection GetContentProtection() const override; + virtual bool SetContentProtection(wxContentProtection contentProtection) override; - virtual bool EnableCloseButton(bool enable) wxOVERRIDE; - virtual bool EnableMaximizeButton(bool enable) wxOVERRIDE; - virtual bool EnableMinimizeButton(bool enable) wxOVERRIDE; + virtual bool EnableCloseButton(bool enable) override; + virtual bool EnableMaximizeButton(bool enable) override; + virtual bool EnableMinimizeButton(bool enable) override; - virtual bool IsMaximized() const wxOVERRIDE; + virtual bool IsMaximized() const override; - virtual bool IsIconized() const wxOVERRIDE; + virtual bool IsIconized() const override; - virtual void Iconize( bool iconize ) wxOVERRIDE; + virtual void Iconize( bool iconize ) override; - virtual void Maximize(bool maximize) wxOVERRIDE; + virtual void Maximize(bool maximize) override; - virtual bool IsFullScreen() const wxOVERRIDE; + virtual bool IsFullScreen() const override; - bool EnableFullScreenView(bool enable, long style) wxOVERRIDE; + bool EnableFullScreenView(bool enable, long style) override; - virtual bool ShowFullScreen(bool show, long style) wxOVERRIDE; + virtual bool ShowFullScreen(bool show, long style) override; - virtual void ShowWithoutActivating() wxOVERRIDE; + virtual void ShowWithoutActivating() override; - virtual void RequestUserAttention(int flags) wxOVERRIDE; + virtual void RequestUserAttention(int flags) override; - virtual void ScreenToWindow( int *x, int *y ) wxOVERRIDE; + virtual void ScreenToWindow( int *x, int *y ) override; - virtual void WindowToScreen( int *x, int *y ) wxOVERRIDE; + virtual void WindowToScreen( int *x, int *y ) override; - virtual bool IsActive() wxOVERRIDE; + virtual bool IsActive() override; - virtual void SetModified(bool modified) wxOVERRIDE; - virtual bool IsModified() const wxOVERRIDE; + virtual void SetModified(bool modified) override; + virtual bool IsModified() const override; - virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; + virtual void SetRepresentedFilename(const wxString& filename) override; - virtual void SetBottomBorderThickness(int thickness) wxOVERRIDE; + virtual void SetBottomBorderThickness(int thickness) override; wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } - CGWindowLevel GetWindowLevel() const wxOVERRIDE { return m_macWindowLevel; } - void RestoreWindowLevel() wxOVERRIDE; + CGWindowLevel GetWindowLevel() const override { return m_macWindowLevel; } + void RestoreWindowLevel() override; bool m_macIgnoreNextFullscreenChange = false; long m_macFullscreenStyle = wxFULLSCREEN_ALL; @@ -362,12 +362,12 @@ class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl { public: wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v); - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetBitmap(const wxBitmapBundle& bitmap) override; #if wxUSE_MARKUP - virtual void SetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual void SetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP - void SetPressedBitmap( const wxBitmapBundle& bitmap ) wxOVERRIDE; + void SetPressedBitmap( const wxBitmapBundle& bitmap ) override; void SetAcceleratorFromLabel(const wxString& label); NSButton *GetNSButton() const; diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h index a2783759d9..a188f4f12c 100644 --- a/include/wx/osx/cocoa/private/textimpl.h +++ b/include/wx/osx/cocoa/private/textimpl.h @@ -31,9 +31,9 @@ public : } virtual ~wxNSTextBase() { } - virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const wxOVERRIDE; + virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const override; - virtual void SetInitialLabel(const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding)) wxOVERRIDE + virtual void SetInitialLabel(const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding)) override { // Don't do anything here, text controls don't have any label and // setting it would overwrite the string value set when creating it. @@ -53,40 +53,40 @@ public : wxNSTextFieldControl( wxWindow *wxPeer, wxTextEntry *entry, WXWidget w ); virtual ~wxNSTextFieldControl(); - virtual bool CanClipMaxLength() const wxOVERRIDE { return true; } - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; + virtual bool CanClipMaxLength() const override { return true; } + virtual void SetMaxLength(unsigned long len) override; - virtual bool CanForceUpper() wxOVERRIDE { return true; } - virtual void ForceUpper() wxOVERRIDE; + virtual bool CanForceUpper() override { return true; } + virtual void ForceUpper() override; - virtual wxString GetStringValue() const wxOVERRIDE ; - virtual void SetStringValue( const wxString &str) wxOVERRIDE ; - virtual void Copy() wxOVERRIDE ; - virtual void Cut() wxOVERRIDE ; - virtual void Paste() wxOVERRIDE ; - virtual bool CanPaste() const wxOVERRIDE ; - virtual void SetEditable(bool editable) wxOVERRIDE ; - virtual long GetLastPosition() const wxOVERRIDE; - virtual void GetSelection( long* from, long* to) const wxOVERRIDE ; - virtual void SetSelection( long from , long to ) wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual void ShowPosition(long pos) wxOVERRIDE; - virtual void WriteText(const wxString& str) wxOVERRIDE ; - virtual bool HasOwnContextMenu() const wxOVERRIDE { return true; } - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual void SetJustification() wxOVERRIDE; + virtual wxString GetStringValue() const override ; + virtual void SetStringValue( const wxString &str) override ; + virtual void Copy() override ; + virtual void Cut() override ; + virtual void Paste() override ; + virtual bool CanPaste() const override ; + virtual void SetEditable(bool editable) override ; + virtual long GetLastPosition() const override; + virtual void GetSelection( long* from, long* to) const override ; + virtual void SetSelection( long from , long to ) override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; + virtual long XYToPosition(long x, long y) const override; + virtual void ShowPosition(long pos) override; + virtual void WriteText(const wxString& str) override ; + virtual bool HasOwnContextMenu() const override { return true; } + virtual bool SetHint(const wxString& hint) override; + virtual void SetJustification() override; - virtual void controlAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE; - virtual bool becomeFirstResponder(WXWidget slf, void *_cmd) wxOVERRIDE; - virtual bool resignFirstResponder(WXWidget slf, void *_cmd) wxOVERRIDE; + virtual void controlAction(WXWidget slf, void* _cmd, void *sender) override; + virtual bool becomeFirstResponder(WXWidget slf, void *_cmd) override; + virtual bool resignFirstResponder(WXWidget slf, void *_cmd) override; - virtual void EnableNewLineReplacement(bool enable) wxOVERRIDE; - virtual bool GetNewLineReplacement() wxOVERRIDE; + virtual void EnableNewLineReplacement(bool enable) override; + virtual bool GetNewLineReplacement() override; virtual void SetInternalSelection( long from , long to ); virtual void UpdateInternalSelectionFromEditor( wxNSTextFieldEditor* editor); - virtual wxSize GetBestSize() const wxOVERRIDE; + virtual wxSize GetBestSize() const override; protected : NSTextField* m_textField; @@ -107,50 +107,50 @@ public: wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w, long style ); virtual ~wxNSTextViewControl(); - virtual void insertText(NSString* text, WXWidget slf, void *_cmd) wxOVERRIDE; + virtual void insertText(NSString* text, WXWidget slf, void *_cmd) override; - virtual wxString GetStringValue() const wxOVERRIDE ; - virtual void SetStringValue( const wxString &str) wxOVERRIDE ; - virtual void Copy() wxOVERRIDE ; - virtual void Cut() wxOVERRIDE ; - virtual void Paste() wxOVERRIDE ; - virtual bool CanPaste() const wxOVERRIDE ; - virtual void SetEditable(bool editable) wxOVERRIDE ; - virtual long GetLastPosition() const wxOVERRIDE; - virtual void GetSelection( long* from, long* to) const wxOVERRIDE ; - virtual void SetSelection( long from , long to ) wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual void ShowPosition(long pos) wxOVERRIDE; - virtual void WriteText(const wxString& str) wxOVERRIDE ; - virtual void SetFont(const wxFont & font) wxOVERRIDE; + virtual wxString GetStringValue() const override ; + virtual void SetStringValue( const wxString &str) override ; + virtual void Copy() override ; + virtual void Cut() override ; + virtual void Paste() override ; + virtual bool CanPaste() const override ; + virtual void SetEditable(bool editable) override ; + virtual long GetLastPosition() const override; + virtual void GetSelection( long* from, long* to) const override ; + virtual void SetSelection( long from , long to ) override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; + virtual long XYToPosition(long x, long y) const override; + virtual void ShowPosition(long pos) override; + virtual void WriteText(const wxString& str) override ; + virtual void SetFont(const wxFont & font) override; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual void SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; + virtual bool GetStyle(long position, wxTextAttr& style) override; + virtual void SetStyle(long start, long end, const wxTextAttr& style) override; - virtual bool CanFocus() const wxOVERRIDE; + virtual bool CanFocus() const override; - virtual bool HasOwnContextMenu() const wxOVERRIDE { return true; } + virtual bool HasOwnContextMenu() const override { return true; } #if wxUSE_SPELLCHECK - virtual void CheckSpelling(const wxTextProofOptions& options) wxOVERRIDE; - virtual wxTextProofOptions GetCheckingOptions() const wxOVERRIDE; + virtual void CheckSpelling(const wxTextProofOptions& options) override; + virtual wxTextProofOptions GetCheckingOptions() const override; #endif // wxUSE_SPELLCHECK - virtual void EnableAutomaticQuoteSubstitution(bool enable) wxOVERRIDE; - virtual void EnableAutomaticDashSubstitution(bool enable) wxOVERRIDE; - virtual void EnableNewLineReplacement(bool enable) wxOVERRIDE; - virtual bool GetNewLineReplacement() wxOVERRIDE; + virtual void EnableAutomaticQuoteSubstitution(bool enable) override; + virtual void EnableAutomaticDashSubstitution(bool enable) override; + virtual void EnableNewLineReplacement(bool enable) override; + virtual bool GetNewLineReplacement() override; - virtual wxSize GetBestSize() const wxOVERRIDE; - virtual void SetJustification() wxOVERRIDE; + virtual wxSize GetBestSize() const override; + virtual void SetJustification() override; - virtual void controlTextDidChange() wxOVERRIDE; + virtual void controlTextDidChange() override; - virtual bool CanUndo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual void EmptyUndoBuffer() wxOVERRIDE; + virtual bool CanUndo() const override; + virtual void Undo() override; + virtual bool CanRedo() const override; + virtual void Redo() override; + virtual void EmptyUndoBuffer() override; protected: void DoUpdateTextStyle(); diff --git a/include/wx/osx/cocoa/stdpaths.h b/include/wx/osx/cocoa/stdpaths.h index 1500c88dc9..623277bbcf 100644 --- a/include/wx/osx/cocoa/stdpaths.h +++ b/include/wx/osx/cocoa/stdpaths.h @@ -20,21 +20,21 @@ public: virtual ~wxStandardPaths(); // implement base class pure virtuals - 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 GetResourcesDir() const wxOVERRIDE; + virtual wxString GetExecutablePath() const override; + virtual wxString GetConfigDir() const override; + virtual wxString GetUserConfigDir() const override; + virtual wxString GetDataDir() const override; + virtual wxString GetLocalDataDir() const override; + virtual wxString GetUserDataDir() const override; + virtual wxString GetPluginsDir() const override; + virtual wxString GetResourcesDir() const override; virtual wxString GetLocalizedResourcesDir(const wxString& lang, - ResourceCat category = ResourceCat_None) const wxOVERRIDE; - virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; + ResourceCat category = ResourceCat_None) const override; + virtual wxString GetUserDir(Dir userDir) const override; virtual wxString MakeConfigFileName(const wxString& basename, ConfigFileConv conv = ConfigFileConv_Ext - ) const wxOVERRIDE; + ) const override; protected: // Ctor is protected, use wxStandardPaths::Get() instead of instantiating diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h index 978a1ac1ae..f381a661c9 100644 --- a/include/wx/osx/colordlg.h +++ b/include/wx/osx/colordlg.h @@ -27,7 +27,7 @@ public: bool Create(wxWindow *parent, const wxColourData *data = NULL); - int ShowModal() wxOVERRIDE; + int ShowModal() override; wxColourData& GetColourData() { return m_colourData; } protected: diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index 7ee424fff0..089baf818b 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -82,55 +82,55 @@ class WXDLLIMPEXP_CORE wxComboBox : const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxComboBoxNameStr)); - virtual int GetSelection() const wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; - virtual void SetSelection(int n) wxOVERRIDE; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual wxString GetStringSelection() const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; + virtual int GetSelection() const override; + virtual void GetSelection(long *from, long *to) const override; + virtual void SetSelection(int n) override; + virtual void SetSelection(long from, long to) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; + virtual wxString GetString(unsigned int n) const override; + virtual wxString GetStringSelection() const override; + virtual void SetString(unsigned int n, const wxString& s) override; - virtual unsigned int GetCount() const wxOVERRIDE; + virtual unsigned int GetCount() const override; - virtual void SetValue(const wxString& value) wxOVERRIDE; + virtual void SetValue(const wxString& value) override; // these methods are provided by wxTextEntry for the native impl. #if wxOSX_USE_COCOA - virtual void Popup() wxOVERRIDE; - virtual void Dismiss() wxOVERRIDE; + virtual void Popup() override; + virtual void Dismiss() override; #endif // wxOSX_USE_COCOA - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; + virtual bool OSXHandleClicked(double timestampsec) override; #if wxOSX_USE_COCOA wxComboWidgetImpl* GetComboPeer() const; #endif protected: // List functions - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual void DoClear() override; // wxTextEntry functions - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual wxWindow *GetEditableWindow() override { return this; } // override the base class virtuals involved in geometry calculations - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void * DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void * DoGetItemClientData(unsigned int n) const override; - virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE; + virtual void EnableTextChangedEvents(bool enable) override; // callbacks void OnChar(wxKeyEvent& event); // Process 'enter' if required diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h index f520ddac5e..4d50fd1be5 100644 --- a/include/wx/osx/control.h +++ b/include/wx/osx/control.h @@ -36,7 +36,7 @@ public: const wxString& name = wxASCII_STR(wxControlNameStr)); // Simulates an event - virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); } + virtual void Command(wxCommandEvent& event) override { ProcessCommand(event); } // implementation from now on // -------------------------- diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index c77c39e898..562c2d93b8 100644 --- a/include/wx/osx/core/colour.h +++ b/include/wx/osx/core/colour.h @@ -29,12 +29,12 @@ public: // default copy ctor and dtor are ok // accessors - virtual ChannelType Red() const wxOVERRIDE; - virtual ChannelType Green() const wxOVERRIDE; - virtual ChannelType Blue() const wxOVERRIDE; - virtual ChannelType Alpha() const wxOVERRIDE; + virtual ChannelType Red() const override; + virtual ChannelType Green() const override; + virtual ChannelType Blue() const override; + virtual ChannelType Alpha() const override; - virtual bool IsSolid() const wxOVERRIDE; + virtual bool IsSolid() const override; // comparison bool operator == (const wxColour& colour) const; @@ -71,10 +71,10 @@ public: protected : virtual void - InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE; + InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) override; - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: diff --git a/include/wx/osx/core/evtloop.h b/include/wx/osx/core/evtloop.h index 01e1155205..f0be5af535 100644 --- a/include/wx/osx/core/evtloop.h +++ b/include/wx/osx/core/evtloop.h @@ -25,22 +25,22 @@ public: // sets the "should exit" flag and wakes up the loop so that it terminates // soon - virtual void ScheduleExit(int rc = 0) wxOVERRIDE; + virtual void ScheduleExit(int rc = 0) override; // return true if any events are available - virtual bool Pending() const wxOVERRIDE; + virtual bool Pending() const override; // dispatch a single event, return false if we should exit from the loop - virtual bool Dispatch() wxOVERRIDE; + virtual bool Dispatch() override; // same as Dispatch() but doesn't wait for longer than the specified (in // ms) timeout, return true if an event was processed, false if we should // exit the loop or -1 if timeout expired - virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE; + virtual int DispatchTimeout(unsigned long timeout) override; // implement this to wake up the loop: usually done by posting a dummy event // to it (can be called from non main thread) - virtual void WakeUp() wxOVERRIDE; + virtual void WakeUp() override; bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; } @@ -53,13 +53,13 @@ public: protected: // enters a loop calling OnNextIteration(), Pending() and Dispatch() and // terminating when Exit() is called - virtual int DoRun() wxOVERRIDE; + virtual int DoRun() override; // may be overridden to perform some action at the start of each new event // loop iteration virtual void OnNextIteration() {} - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; + virtual void DoYieldFor(long eventsToProcess) override; void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); diff --git a/include/wx/osx/core/hid.h b/include/wx/osx/core/hid.h index 7446b0df31..045b6deb4f 100644 --- a/include/wx/osx/core/hid.h +++ b/include/wx/osx/core/hid.h @@ -104,7 +104,7 @@ public: static int GetCount(); bool Create(int nDev = 1); void AddCookie(CFTypeRef Data, int i); - virtual void BuildCookies(CFArrayRef Array) wxOVERRIDE; + virtual void BuildCookies(CFArrayRef Array) override; void DoBuildCookies(CFArrayRef Array); }; diff --git a/include/wx/osx/core/private/strconv_cf.h b/include/wx/osx/core/private/strconv_cf.h index e61b5a00f8..6d80c1bb9f 100644 --- a/include/wx/osx/core/private/strconv_cf.h +++ b/include/wx/osx/core/private/strconv_cf.h @@ -330,10 +330,10 @@ public: m_normalization = normalization; } - virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const wxOVERRIDE; - virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const wxOVERRIDE; + virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const override; + virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const override; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_cf(*this); } + virtual wxMBConv *Clone() const override { return new wxMBConv_cf(*this); } bool IsOk() const { diff --git a/include/wx/osx/core/private/timer.h b/include/wx/osx/core/private/timer.h index c23f9553ba..bb7ae850da 100644 --- a/include/wx/osx/core/private/timer.h +++ b/include/wx/osx/core/private/timer.h @@ -20,10 +20,10 @@ public: wxOSXTimerImpl(wxTimer *timer); virtual ~wxOSXTimerImpl(); - virtual bool Start(int milliseconds = -1, bool one_shot = false) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; + virtual bool Start(int milliseconds = -1, bool one_shot = false) override; + virtual void Stop() override; - virtual bool IsRunning() const wxOVERRIDE; + virtual bool IsRunning() const override; private: wxOSXTimerInfo *m_info; diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h index 852e362b85..1d78e3090e 100644 --- a/include/wx/osx/cursor.h +++ b/include/wx/osx/cursor.h @@ -36,8 +36,8 @@ public: WXHCURSOR GetHCURSOR() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: void InitFromStock(wxStockCursor); diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h index 46fdc484f6..ff60e02930 100644 --- a/include/wx/osx/dataobj2.h +++ b/include/wx/osx/dataobj2.h @@ -26,24 +26,24 @@ public: virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE; + virtual void SetBitmap(const wxBitmap& bitmap) override; // implement base class pure virtuals // ---------------------------------- - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } @@ -67,19 +67,19 @@ public: void AddFile( const wxString &filename ); - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h index 8651903465..68f092b1e3 100644 --- a/include/wx/osx/dataview.h +++ b/include/wx/osx/dataview.h @@ -42,29 +42,29 @@ public: virtual ~wxDataViewColumn(); // implement wxHeaderColumnBase pure virtual methods - virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_alignment; } - virtual int GetFlags() const wxOVERRIDE { return m_flags; } + virtual wxAlignment GetAlignment() const override { return m_alignment; } + virtual int GetFlags() const override { return m_flags; } virtual int GetMaxWidth() const { return m_maxWidth; } - virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; } - virtual wxString GetTitle() const wxOVERRIDE { return m_title; } - virtual int GetWidth() const wxOVERRIDE; - virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_ascending; } - virtual bool IsSortKey() const wxOVERRIDE; - virtual bool IsHidden() const wxOVERRIDE; + virtual int GetMinWidth() const override { return m_minWidth; } + virtual wxString GetTitle() const override { return m_title; } + virtual int GetWidth() const override; + virtual bool IsSortOrderAscending() const override { return m_ascending; } + virtual bool IsSortKey() const override; + virtual bool IsHidden() const override; - virtual void SetAlignment (wxAlignment align) wxOVERRIDE; - virtual void SetBitmap (wxBitmapBundle const& bitmap) wxOVERRIDE; - virtual void SetFlags (int flags) wxOVERRIDE { m_flags = flags; /*SetIndividualFlags(flags); */ } - virtual void SetHidden (bool hidden) wxOVERRIDE; + virtual void SetAlignment (wxAlignment align) override; + virtual void SetBitmap (wxBitmapBundle const& bitmap) override; + virtual void SetFlags (int flags) override { m_flags = flags; /*SetIndividualFlags(flags); */ } + virtual void SetHidden (bool hidden) override; virtual void SetMaxWidth (int maxWidth); - virtual void SetMinWidth (int minWidth) wxOVERRIDE; - virtual void SetReorderable(bool reorderable) wxOVERRIDE; - virtual void SetResizeable (bool resizable) wxOVERRIDE; - virtual void UnsetAsSortKey() wxOVERRIDE; - virtual void SetSortable (bool sortable) wxOVERRIDE; - virtual void SetSortOrder (bool ascending) wxOVERRIDE; - virtual void SetTitle (wxString const& title) wxOVERRIDE; - virtual void SetWidth (int width) wxOVERRIDE; + virtual void SetMinWidth (int minWidth) override; + virtual void SetReorderable(bool reorderable) override; + virtual void SetResizeable (bool resizable) override; + virtual void UnsetAsSortKey() override; + virtual void SetSortable (bool sortable) override; + virtual void SetSortOrder (bool ascending) override; + virtual void SetTitle (wxString const& title) override; + virtual void SetWidth (int width) override; // implementation only wxDataViewColumnNativeData* GetNativeData() const @@ -156,43 +156,43 @@ public: } // inherited methods from wxDataViewCtrlBase: - virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE; + virtual bool AssociateModel(wxDataViewModel* model) override; - virtual bool AppendColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual bool ClearColumns () wxOVERRIDE; - virtual bool DeleteColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; - virtual wxDataViewColumn* GetColumn (unsigned int pos) const wxOVERRIDE; - virtual unsigned int GetColumnCount () const wxOVERRIDE; - virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const wxOVERRIDE; - virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE; - virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col) wxOVERRIDE; - virtual bool PrependColumn (wxDataViewColumn* columnPtr) wxOVERRIDE; + virtual bool AppendColumn (wxDataViewColumn* columnPtr) override; + virtual bool ClearColumns () override; + virtual bool DeleteColumn (wxDataViewColumn* columnPtr) override; + virtual wxDataViewColumn* GetColumn (unsigned int pos) const override; + virtual unsigned int GetColumnCount () const override; + virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const override; + virtual wxDataViewColumn* GetSortingColumn () const override; + virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col) override; + virtual bool PrependColumn (wxDataViewColumn* columnPtr) override; - virtual void Collapse( const wxDataViewItem& item) wxOVERRIDE; - virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL) wxOVERRIDE; - virtual bool IsExpanded(const wxDataViewItem & item) const wxOVERRIDE; + virtual void Collapse( const wxDataViewItem& item) override; + virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL) override; + virtual bool IsExpanded(const wxDataViewItem & item) const override; virtual unsigned int GetCount() const; - virtual int GetCountPerPage() const wxOVERRIDE; + virtual int GetCountPerPage() const override; virtual wxRect GetItemRect(const wxDataViewItem& item, - const wxDataViewColumn* columnPtr = NULL) const wxOVERRIDE; - virtual int GetSelectedItemsCount() const wxOVERRIDE; - virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE; + const wxDataViewColumn* columnPtr = NULL) const override; + virtual int GetSelectedItemsCount() const override; + virtual int GetSelections(wxDataViewItemArray& sel) const override; - virtual wxDataViewItem GetTopItem() const wxOVERRIDE; + virtual wxDataViewItem GetTopItem() const override; - virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const wxOVERRIDE; + virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const override; - virtual bool SetRowHeight(int rowHeight) wxOVERRIDE; + virtual bool SetRowHeight(int rowHeight) override; - virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE; + virtual bool IsSelected(const wxDataViewItem& item) const override; - virtual void SelectAll() wxOVERRIDE; - virtual void Select(const wxDataViewItem& item) wxOVERRIDE; - virtual void SetSelections(const wxDataViewItemArray& sel) wxOVERRIDE; + virtual void SelectAll() override; + virtual void Select(const wxDataViewItem& item) override; + virtual void SetSelections(const wxDataViewItemArray& sel) override; - virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE; - virtual void UnselectAll() wxOVERRIDE; + virtual void Unselect(const wxDataViewItem& item) override; + virtual void UnselectAll() override; // // implementation @@ -206,10 +206,10 @@ public: // finishes editing of custom items; if no custom item is currently edited the method does nothing void FinishCustomItemEditing(); - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE; + virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) override; #if wxUSE_DRAG_AND_DROP - virtual bool DoEnableDropTarget( const wxVector& formats ) wxOVERRIDE; + virtual bool DoEnableDropTarget( const wxVector& formats ) override; #endif // wxUSE_DRAG_AND_DROP // returns the n-th pointer to a column; @@ -260,9 +260,9 @@ public: void AdjustAutosizedColumns() const; - virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE; + virtual wxDataViewColumn *GetCurrentColumn() const override; - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -272,24 +272,24 @@ public: protected: // inherited methods from wxDataViewCtrlBase - virtual void DoSetExpanderColumn() wxOVERRIDE; - virtual void DoSetIndent() wxOVERRIDE; + virtual void DoSetExpanderColumn() override; + virtual void DoSetIndent() override; - virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) wxOVERRIDE; + virtual void DoExpand(const wxDataViewItem& item, bool expandChildren) override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // event handling void OnSize(wxSizeEvent &event); - virtual void DoThaw() wxOVERRIDE; + virtual void DoThaw() override; private: // initializing of local variables: void Init(); - virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; - virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; + virtual wxDataViewItem DoGetCurrentItem() const override; + virtual void DoSetCurrentItem(const wxDataViewItem& item) override; // // variables diff --git a/include/wx/osx/datectrl.h b/include/wx/osx/datectrl.h index 6d37c201a1..6ba2652ea5 100644 --- a/include/wx/osx/datectrl.h +++ b/include/wx/osx/datectrl.h @@ -42,10 +42,10 @@ public: const wxString& name = wxDatePickerCtrlNameStr); // Implement the base class pure virtuals. - virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE; - virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE; + virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) override; + virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const override; - virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE; + virtual void OSXGenerateEvent(const wxDateTime& dt) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); diff --git a/include/wx/osx/datetimectrl.h b/include/wx/osx/datetimectrl.h index 9117c70510..b52193abc0 100644 --- a/include/wx/osx/datetimectrl.h +++ b/include/wx/osx/datetimectrl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase { public: // Implement the base class pure virtuals. - virtual void SetValue(const wxDateTime& dt) wxOVERRIDE; - virtual wxDateTime GetValue() const wxOVERRIDE; + virtual void SetValue(const wxDateTime& dt) override; + virtual wxDateTime GetValue() const override; // Implementation only. virtual void OSXGenerateEvent(const wxDateTime& dt) = 0; diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h index 7f0ead5d6e..093a8c1658 100644 --- a/include/wx/osx/dcclient.h +++ b/include/wx/osx/dcclient.h @@ -28,11 +28,11 @@ public: wxWindowDCImpl( wxDC *owner, wxWindow *window ); virtual ~wxWindowDCImpl(); - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; + virtual void DoGetSize( int *width, int *height ) const override; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const override; protected: - virtual wxPoint OSXGetOrigin() const wxOVERRIDE; + virtual wxPoint OSXGetOrigin() const override; bool m_release; int m_width; diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h index 787e2a6e92..b2debe1e5e 100644 --- a/include/wx/osx/dcmemory.h +++ b/include/wx/osx/dcmemory.h @@ -22,14 +22,14 @@ public: virtual ~wxMemoryDCImpl(); - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE + virtual void DoGetSize( int *width, int *height ) const override; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const override { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } - virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; + virtual void DoSelect(const wxBitmap& bitmap) override; - virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE + virtual const wxBitmap& GetSelectedBitmap() const override { return m_selected; } - virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE + virtual wxBitmap& GetSelectedBitmap() override { return m_selected; } private: diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h index d84649288f..bd0ace67c5 100644 --- a/include/wx/osx/dcprint.h +++ b/include/wx/osx/dcprint.h @@ -25,18 +25,18 @@ public: wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata ); virtual ~wxPrinterDCImpl(); - virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE; - virtual void EndDoc() wxOVERRIDE; - virtual void StartPage() wxOVERRIDE; - virtual void EndPage() wxOVERRIDE; + virtual bool StartDoc( const wxString& WXUNUSED(message) ) override; + virtual void EndDoc() override; + virtual void StartPage() override; + virtual void EndPage() override; - wxRect GetPaperRect() const wxOVERRIDE; + wxRect GetPaperRect() const override; wxPrintData& GetPrintData() { return m_printData; } - virtual wxSize GetPPI() const wxOVERRIDE; + virtual wxSize GetPPI() const override; protected: - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; + virtual void DoGetSize( int *width, int *height ) const override; wxPrintData m_printData ; wxNativePrinterDC* m_nativePrinterDC ; diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h index 1ebcc5e75d..101a78fb32 100644 --- a/include/wx/osx/dcscreen.h +++ b/include/wx/osx/dcscreen.h @@ -20,7 +20,7 @@ public: wxScreenDCImpl( wxDC *owner ); virtual ~wxScreenDCImpl(); - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const override; private: wxDECLARE_CLASS(wxScreenDCImpl); diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h index 7abbc7493a..7d5f76a244 100644 --- a/include/wx/osx/dialog.h +++ b/include/wx/osx/dialog.h @@ -46,18 +46,18 @@ public: virtual ~wxDialog(); // virtual bool Destroy(); - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; // return true if we're showing the dialog modally - virtual bool IsModal() const wxOVERRIDE; + virtual bool IsModal() const override; // show the dialog modally and return the value passed to EndModal() - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - virtual void ShowWindowModal() wxOVERRIDE; + virtual void ShowWindowModal() override; // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode) wxOVERRIDE; + virtual void EndModal(int retCode) override; static bool OSXHasModalDialogsOpen(); void OSXBeginModalDialog(); @@ -71,7 +71,7 @@ public: // implementation // -------------- - wxDialogModality GetModality() const wxOVERRIDE; + wxDialogModality GetModality() const override; #if wxOSX_USE_COCOA virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {} @@ -85,7 +85,7 @@ protected: void EndWindowModal(); // mac also takes command-period as cancel - virtual bool IsEscapeKey(const wxKeyEvent& event) wxOVERRIDE; + virtual bool IsEscapeKey(const wxKeyEvent& event) override; wxDialogModality m_modality; diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h index f8ab61110c..f1bdaf9300 100644 --- a/include/wx/osx/dirdlg.h +++ b/include/wx/osx/dirdlg.h @@ -45,15 +45,15 @@ public: ~wxDirDialog(); #endif - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; // MacOS 10.11 has removed the titlebar from the dialog, so this is provided // only for compatibility with older versions - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; #if wxOSX_USE_COCOA - virtual void ShowWindowModal() wxOVERRIDE; - virtual void ModalFinishedCallback(void* panel, int returnCode) wxOVERRIDE; + virtual void ShowWindowModal() override; + virtual void ModalFinishedCallback(void* panel, int returnCode) override; #endif private: diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h index c3a26afec1..61c907de56 100644 --- a/include/wx/osx/dnd.h +++ b/include/wx/osx/dnd.h @@ -52,10 +52,10 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase wxDropTarget(wxDataObject *dataObject = NULL ); - 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; + virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) override; + virtual bool OnDrop(wxCoord x, wxCoord y) override; + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override; + virtual bool GetData() override; // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. virtual wxDataFormat GetMatchingPair(); @@ -93,7 +93,7 @@ public: // do it (call this in response to a mouse button press, for example) // params: if bAllowMove is false, data can be only copied - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) override; wxWindow* GetWindow() { return m_window ; } void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } diff --git a/include/wx/osx/dvrenderer.h b/include/wx/osx/dvrenderer.h index 67116f1185..dc3ebdd5dd 100644 --- a/include/wx/osx/dvrenderer.h +++ b/include/wx/osx/dvrenderer.h @@ -31,31 +31,31 @@ public: // inherited methods from wxDataViewRendererBase // --------------------------------------------- - virtual int GetAlignment() const wxOVERRIDE + virtual int GetAlignment() const override { return m_alignment; } - virtual wxDataViewCellMode GetMode() const wxOVERRIDE + virtual wxDataViewCellMode GetMode() const override { return m_mode; } - virtual bool GetValue(wxVariant& value) const wxOVERRIDE + virtual bool GetValue(wxVariant& value) const override { value = m_value; return true; } // NB: in Carbon this is always identical to the header alignment - virtual void SetAlignment(int align) wxOVERRIDE; - virtual void SetMode(wxDataViewCellMode mode) wxOVERRIDE; - virtual bool SetValue(const wxVariant& newValue) wxOVERRIDE + virtual void SetAlignment(int align) override; + virtual void SetMode(wxDataViewCellMode mode) override; + virtual bool SetValue(const wxVariant& newValue) override { m_value = newValue; return true; } - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE; - virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE; + virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) override; + virtual wxEllipsizeMode GetEllipsizeMode() const override; // implementation // -------------- @@ -85,15 +85,15 @@ public: unsigned col); protected: - virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE; - virtual void SetEnabled(bool enabled) wxOVERRIDE; + virtual void SetAttr(const wxDataViewItemAttr& attr) override; + virtual void SetEnabled(bool enabled) override; #else protected: - void SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) wxOVERRIDE { }; - void SetEnabled(bool WXUNUSED(enabled)) wxOVERRIDE { }; + void SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) override { }; + void SetEnabled(bool WXUNUSED(enabled)) override { }; #endif - virtual bool IsHighlighted() const wxOVERRIDE; + virtual bool IsHighlighted() const override; private: // contains the alignment flags diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h index 218ce08d8c..74d9b878bf 100644 --- a/include/wx/osx/dvrenderers.h +++ b/include/wx/osx/dvrenderers.h @@ -29,9 +29,9 @@ public: // implementation only // ------------------- - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; - virtual wxDC* GetDC() wxOVERRIDE; // creates a device context and keeps it + virtual wxDC* GetDC() override; // creates a device context and keeps it void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer private: @@ -58,7 +58,7 @@ protected: { } - virtual void SetEnabled(bool enabled) wxOVERRIDE + virtual void SetEnabled(bool enabled) override { wxDataViewRenderer::SetEnabled(enabled && GetMode() != wxDATAVIEW_CELL_INERT); @@ -82,11 +82,11 @@ public: void EnableMarkup(bool enable = true); #endif // wxUSE_MARKUP && Cocoa - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: #if wxUSE_MARKUP && wxOSX_USE_COCOA @@ -111,9 +111,9 @@ public: int align = wxDVR_DEFAULT_ALIGNMENT); virtual - bool IsCompatibleVariantType(const wxString& variantType) const wxOVERRIDE; + bool IsCompatibleVariantType(const wxString& variantType) const override; - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); @@ -131,14 +131,14 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; wxString GetChoice(size_t index) const { return m_choices[index]; } const wxArrayString& GetChoices() const { return m_choices; } virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: wxArrayString m_choices; @@ -157,12 +157,12 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT); - virtual bool SetValue(const wxVariant& value) wxOVERRIDE; - virtual bool GetValue(wxVariant& value) const wxOVERRIDE; + virtual bool SetValue(const wxVariant& value) override; + virtual bool GetValue(wxVariant& value) const override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; }; // --------------------------------------------------------- @@ -177,11 +177,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); @@ -209,11 +209,11 @@ public: // this to happen. void Allow3rdStateForUser(bool allow = true); - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: bool m_allow3rdStateForUser; @@ -237,11 +237,11 @@ public: void ShowAsRadio(); - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: void DoInitButtonCell(int buttonType); @@ -263,11 +263,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); @@ -286,11 +286,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int align = wxDVR_DEFAULT_ALIGNMENT); - virtual bool MacRender() wxOVERRIDE; + virtual bool MacRender() override; virtual void OSXOnCellChanged(NSObject *value, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; + unsigned col) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer); diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h index af53115391..36bc462402 100644 --- a/include/wx/osx/evtloop.h +++ b/include/wx/osx/evtloop.h @@ -26,11 +26,11 @@ public: #ifdef __WXOSX_COCOA__ // skip wxGUIEventLoop to avoid missing Enter/Exit notifications - virtual int Run() wxOVERRIDE { return wxCFEventLoop::Run(); } + virtual int Run() override { return wxCFEventLoop::Run(); } #endif protected: - virtual void OSXDoRun() wxOVERRIDE; - virtual void OSXDoStop() wxOVERRIDE; + virtual void OSXDoRun() override; + virtual void OSXDoStop() override; // (in case) the modal window for this event loop wxNonOwnedWindow* m_modalWindow; diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h index 6dd887e70e..3a91dd49a8 100644 --- a/include/wx/osx/filedlg.h +++ b/include/wx/osx/filedlg.h @@ -60,17 +60,17 @@ public: ~wxFileDialog(); #endif - virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE { paths = m_paths; } - virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE { files = m_fileNames ; } + virtual void GetPaths(wxArrayString& paths) const override { paths = m_paths; } + virtual void GetFilenames(wxArrayString& files) const override { files = m_fileNames ; } - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; #if wxOSX_USE_COCOA - virtual void ShowWindowModal() wxOVERRIDE; - virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE; + virtual void ShowWindowModal() override; + virtual void ModalFinishedCallback(void* panel, int resultCode) override; #endif - virtual bool SupportsExtraControl() const wxOVERRIDE; + virtual bool SupportsExtraControl() const override; // implementation only @@ -78,7 +78,7 @@ protected: // not supported for file dialog, RR virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) override {} void SetupExtraControls(WXWindow nativeWindow); diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index 52b260e62a..9624690372 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -89,26 +89,26 @@ public: virtual ~wxFont(); // implement base class pure virtuals - virtual double GetFractionalPointSize() const wxOVERRIDE; - virtual wxSize GetPixelSize() const wxOVERRIDE; - virtual wxFontStyle GetStyle() const wxOVERRIDE; - virtual int GetNumericWeight() const wxOVERRIDE; - virtual bool GetUnderlined() const wxOVERRIDE; - virtual bool GetStrikethrough() const wxOVERRIDE; - virtual wxString GetFaceName() const wxOVERRIDE; - virtual wxFontEncoding GetEncoding() const wxOVERRIDE; - virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE; + virtual double GetFractionalPointSize() const override; + virtual wxSize GetPixelSize() const override; + virtual wxFontStyle GetStyle() const override; + virtual int GetNumericWeight() const override; + virtual bool GetUnderlined() const override; + virtual bool GetStrikethrough() const override; + virtual wxString GetFaceName() const override; + virtual wxFontEncoding GetEncoding() const override; + virtual const wxNativeFontInfo *GetNativeFontInfo() const override; - virtual bool IsFixedWidth() const wxOVERRIDE; + virtual bool IsFixedWidth() const override; - virtual void SetFractionalPointSize(double pointSize) wxOVERRIDE; - virtual void SetFamily(wxFontFamily family) wxOVERRIDE; - virtual void SetStyle(wxFontStyle style) wxOVERRIDE; - virtual void SetNumericWeight(int 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; + virtual void SetFractionalPointSize(double pointSize) override; + virtual void SetFamily(wxFontFamily family) override; + virtual void SetStyle(wxFontStyle style) override; + virtual void SetNumericWeight(int weight) override; + virtual bool SetFaceName(const wxString& faceName) override; + virtual void SetUnderlined(bool underlined) override; + virtual void SetStrikethrough(bool strikethrough) override; + virtual void SetEncoding(wxFontEncoding encoding) override; wxDECLARE_COMMON_FONT_METHODS(); @@ -145,11 +145,11 @@ public: #endif protected: - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE; - virtual wxFontFamily DoGetFamily() const wxOVERRIDE; + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) override; + virtual wxFontFamily DoGetFamily() const override; - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h index 1ac7112e32..55e488b0e7 100644 --- a/include/wx/osx/fontdlg.h +++ b/include/wx/osx/fontdlg.h @@ -41,7 +41,7 @@ public: bool Create(wxWindow *parent); bool Create(wxWindow *parent, const wxFontData& data); - int ShowModal() wxOVERRIDE; + int ShowModal() override; wxFontData& GetFontData() { return m_fontData; } protected: diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index 9fef19f146..5504c444c4 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -46,11 +46,11 @@ 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 wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; // override some more virtuals - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual bool Enable(bool enable = true) override; // event handlers void OnActivate(wxActivateEvent& event); @@ -60,9 +60,9 @@ public: #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = -1, - const wxString& name = wxASCII_STR(wxToolBarNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxToolBarNameStr)) override; - virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; + virtual void SetToolBar(wxToolBar *toolbar) override; #endif // wxUSE_TOOLBAR // Status bar @@ -70,34 +70,34 @@ public: virtual wxStatusBar* OnCreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, - const wxString& name = wxASCII_STR(wxStatusLineNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxStatusLineNameStr)) override; - virtual void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE; + virtual void SetStatusBar(wxStatusBar *statbar) override; #endif // wxUSE_STATUSBAR void PositionBars(); // internal response to size events - virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); } + virtual void MacOnInternalSize() override { PositionBars(); } protected: #if wxUSE_TOOLBAR - virtual void PositionToolBar() wxOVERRIDE; + virtual void PositionToolBar() override; #endif #if wxUSE_STATUSBAR - virtual void PositionStatusBar() wxOVERRIDE; + virtual void PositionStatusBar() override; #endif // override base class virtuals - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual void DoSetClientSize(int width, int height) override; #if wxUSE_MENUBAR - virtual void DetachMenuBar() wxOVERRIDE; - virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; + virtual void DetachMenuBar() override; + virtual void AttachMenuBar(wxMenuBar *menubar) override; #endif - virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE; + virtual bool MacIsChildOfClientArea( const wxWindow* child ) const override; wxDECLARE_EVENT_TABLE(); wxDECLARE_DYNAMIC_CLASS(wxFrame); diff --git a/include/wx/osx/fswatcher_fsevents.h b/include/wx/osx/fswatcher_fsevents.h index 69889519d9..57e792c92d 100644 --- a/include/wx/osx/fswatcher_fsevents.h +++ b/include/wx/osx/fswatcher_fsevents.h @@ -47,15 +47,15 @@ public: // reimplement adding a tree so that it does not use // kqueue at all bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, - const wxString& filespec = wxEmptyString) wxOVERRIDE; + const wxString& filespec = wxEmptyString) override; // reimplement removing a tree so that we // cleanup the opened fs streams - bool RemoveTree(const wxFileName& path) wxOVERRIDE; + bool RemoveTree(const wxFileName& path) override; // reimplement remove all so that we cleanup // watches from kqeueue and from FSEvents - bool RemoveAll() wxOVERRIDE; + bool RemoveAll() override; // post a file change event to the owner void PostChange(const wxFileName& oldFileName, diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h index fe012ad03d..dab48174bf 100644 --- a/include/wx/osx/gauge.h +++ b/include/wx/osx/gauge.h @@ -39,11 +39,11 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase const wxString& name = wxASCII_STR(wxGaugeNameStr)); // set gauge range/value - virtual void SetRange(int range) wxOVERRIDE; - virtual void SetValue(int pos) wxOVERRIDE; - virtual int GetValue() const wxOVERRIDE; + virtual void SetRange(int range) override; + virtual void SetValue(int pos) override; + virtual int GetValue() const override; - void Pulse() wxOVERRIDE; + void Pulse() override; protected: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge); diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h index b3a7dbe3ca..4b8e1c9717 100644 --- a/include/wx/osx/glcanvas.h +++ b/include/wx/osx/glcanvas.h @@ -46,7 +46,7 @@ public: const wxGLContextAttrs *ctxAttrs = NULL); virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; + virtual bool SetCurrent(const wxGLCanvas& win) const override; // Mac-specific WXGLContext GetWXGLContext() const { return m_glContext; } @@ -99,7 +99,7 @@ public: virtual ~wxGLCanvas(); // implement wxGLCanvasBase methods - virtual bool SwapBuffers() wxOVERRIDE; + virtual bool SwapBuffers() override; // Mac-specific functions // ---------------------- diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h index 902b98fd7f..24c0738c10 100644 --- a/include/wx/osx/iphone/private.h +++ b/include/wx/osx/iphone/private.h @@ -184,9 +184,9 @@ public : virtual bool ShowFullScreen(bool show, long style); - virtual wxContentProtection GetContentProtection() const wxOVERRIDE + virtual wxContentProtection GetContentProtection() const override { return wxCONTENT_PROTECTION_NONE; } - virtual bool SetContentProtection(wxContentProtection contentProtection) wxOVERRIDE + virtual bool SetContentProtection(wxContentProtection contentProtection) override { return false; } virtual void RequestUserAttention(int flags); diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h index ed86f5c7d8..5c262c7a3f 100644 --- a/include/wx/osx/listbox.h +++ b/include/wx/osx/listbox.h @@ -91,25 +91,25 @@ public: virtual ~wxListBox(); // implement base class pure virtuals - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; // data callbacks virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); - virtual bool IsSelected(int n) const wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; + virtual bool IsSelected(int n) const override; + virtual int GetSelection() const override; + virtual int GetSelections(wxArrayInt& aSelections) const override; - virtual void EnsureVisible(int n) wxOVERRIDE; + virtual void EnsureVisible(int n) override; - virtual int GetTopItem() const wxOVERRIDE; - virtual int GetCountPerPage() const wxOVERRIDE; + virtual int GetTopItem() const override; + virtual int GetCountPerPage() const override; - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -130,27 +130,27 @@ protected: // at a certain line - which cannot be predetermined for sorted list data virtual void OnItemInserted(unsigned int pos); - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; // from wxItemContainer virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; // from wxListBoxBase - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; - virtual void DoSetFirstItem(int n) wxOVERRIDE; - virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; + virtual void DoSetSelection(int n, bool select) override; + virtual void DoSetFirstItem(int n) override; + virtual int DoListHitTest(const wxPoint& point) const override; // free memory (common part of Clear() and dtor) // prevent collision with some BSD definitions of macro Free() void FreeData(); - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; bool m_blockEvents; diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h index 9557380612..743fcc417f 100644 --- a/include/wx/osx/mdi.h +++ b/include/wx/osx/mdi.h @@ -43,29 +43,29 @@ public: static bool IsTDI() { return false; } - virtual void AddChild(wxWindowBase *child) wxOVERRIDE; - virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; + virtual void AddChild(wxWindowBase *child) override; + virtual void RemoveChild(wxWindowBase *child) override; - virtual void ActivateNext() wxOVERRIDE { /* TODO */ } - virtual void ActivatePrevious() wxOVERRIDE { /* TODO */ } + virtual void ActivateNext() override { /* TODO */ } + virtual void ActivatePrevious() override { /* TODO */ } - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; // Mac-specific implementation from now on // --------------------------------------- // Mac OS activate event - virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE; + virtual void MacActivate(long timestamp, bool activating) override; // wxWidgets activate event void OnActivate(wxActivateEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); - void SetMenuBar(wxMenuBar *menu_bar) wxOVERRIDE; + void SetMenuBar(wxMenuBar *menu_bar) override; // Get rect to be used to center top-level children - virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) wxOVERRIDE; + virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) override; protected: // common part of all ctors @@ -119,14 +119,14 @@ public: virtual ~wxMDIChildFrame(); // un-override the base class override - virtual bool IsTopLevel() const wxOVERRIDE { return true; } + virtual bool IsTopLevel() const override { return true; } // implement MDI operations - virtual void Activate() wxOVERRIDE; + virtual void Activate() override; // Mac OS activate event - virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE; + virtual void MacActivate(long timestamp, bool activating) override; protected: // common part of all ctors @@ -142,10 +142,10 @@ public: virtual ~wxMDIClientWindow(); virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; + long style = wxVSCROLL | wxHSCROLL) override; protected: - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); }; diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index 2fd9d09aa8..4324cc10f0 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -34,9 +34,9 @@ public: virtual ~wxMenu(); - virtual void SetTitle(const wxString& title) wxOVERRIDE; + virtual void SetTitle(const wxString& title) override; - virtual void SetInvokingWindow(wxWindow* win) wxOVERRIDE; + virtual void SetInvokingWindow(wxWindow* win) override; bool ProcessCommand(wxCommandEvent& event); @@ -69,7 +69,7 @@ public: bool OSXGetRadioGroupRange(int pos, int *start, int *end) const; #if wxUSE_MENUBAR - virtual void Attach(wxMenuBarBase *menubar) wxOVERRIDE; + virtual void Attach(wxMenuBarBase *menubar) override; #endif void SetupBitmaps(); @@ -79,9 +79,9 @@ protected: // that are expected in the app menu void DoRearrange() ; - virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem* DoAppend(wxMenuItem *item) override; + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) override; + virtual wxMenuItem* DoRemove(wxMenuItem *item) override; private: // common part of all ctors @@ -131,16 +131,16 @@ public: virtual ~wxMenuBar(); // menubar construction - 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 bool Append( wxMenu *menu, const wxString &title ) override; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Remove(size_t pos) override; - virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE; - virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; - virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE; - virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; + virtual void EnableTop( size_t pos, bool flag ) override; + virtual bool IsEnabledTop(size_t pos) const override; + virtual void SetMenuLabel( size_t pos, const wxString& label ) override; + virtual wxString GetMenuLabel( size_t pos ) const override; + virtual bool Enable( bool enable = true ) override; // for virtual function hiding virtual void Enable( int itemid, bool enable ) { @@ -156,7 +156,7 @@ public: // if the menubar is modified, the display is not updated automatically, // call this function to update it (m_menuBarFrame should be !NULL) - void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE; + void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) override; wxMenu *OSXGetAppleMenu() const { return m_appleMenu; } @@ -169,15 +169,15 @@ public: static void MacSetCommonMenuBar(wxMenuBar* menubar) { s_macCommonMenuBar=menubar; } static wxMenuBar* MacGetCommonMenuBar() { return s_macCommonMenuBar; } - virtual void Attach(wxFrame *frame) wxOVERRIDE; + virtual void Attach(wxFrame *frame) override; void SetupBitmaps(); static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; } - 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 DoGetPosition(int *x, int *y) const override; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoGetClientSize(int *width, int *height) const override; protected: // common part of all ctors diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h index 7b29f950c9..f4ecfade12 100644 --- a/include/wx/osx/menuitem.h +++ b/include/wx/osx/menuitem.h @@ -37,14 +37,14 @@ public: virtual ~wxMenuItem(); // override base class virtuals - virtual void SetItemLabel(const wxString& strName) wxOVERRIDE; + virtual void SetItemLabel(const wxString& strName) override; - virtual void Enable(bool bDoEnable = true) wxOVERRIDE; - virtual void Check(bool bDoCheck = true) wxOVERRIDE; + virtual void Enable(bool bDoEnable = true) override; + virtual void Check(bool bDoCheck = true) override; #if wxUSE_ACCEL - virtual void AddExtraAccel(const wxAcceleratorEntry& accel) wxOVERRIDE; - virtual void ClearExtraAccels() wxOVERRIDE; + virtual void AddExtraAccel(const wxAcceleratorEntry& accel) override; + virtual void ClearExtraAccels() override; void RemoveHiddenItems(); #endif // wxUSE_ACCEL diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h index 0b6ac86a83..97f0c82962 100644 --- a/include/wx/osx/metafile.h +++ b/include/wx/osx/metafile.h @@ -56,8 +56,8 @@ public: WXHMETAFILE GetHMETAFILE() const ; void SetHMETAFILE(WXHMETAFILE mf) ; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; wxDECLARE_DYNAMIC_CLASS(wxMetafile); }; @@ -81,7 +81,7 @@ public: void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; wxMetafile* m_metaFile; @@ -149,17 +149,17 @@ public: { return m_metafile; } // implement base class pure virtuals - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *buf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *buf) const override; + virtual bool SetData(size_t len, const void *buf) override; - virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override { return GetDataSize(); } virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), - void *buf) const wxOVERRIDE + void *buf) const override { return GetDataHere(buf); } virtual bool SetData(const wxDataFormat& WXUNUSED(format), - size_t len, const void *buf) wxOVERRIDE + size_t len, const void *buf) override { return SetData(len, buf); } protected: wxMetafile m_metafile; diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h index e82e1c8e5e..ca907b10ab 100644 --- a/include/wx/osx/msgdlg.h +++ b/include/wx/osx/msgdlg.h @@ -21,18 +21,18 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; #if wxOSX_USE_COCOA - virtual void ShowWindowModal() wxOVERRIDE; - virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE; + virtual void ShowWindowModal() override; + virtual void ModalFinishedCallback(void* panel, int resultCode) override; #endif protected: // not supported for message dialog virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {} + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) override {} #if wxOSX_USE_COCOA void* ConstructNSAlert(); diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index 48dc9fac3f..1c234fc95e 100644 --- a/include/wx/osx/nonownedwnd.h +++ b/include/wx/osx/nonownedwnd.h @@ -63,16 +63,16 @@ public: virtual void SubclassWin(WXWindow nativeWindow); virtual void UnsubclassWin(); - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; // implement base class pure virtuals - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE; + virtual bool SetTransparent(wxByte alpha) override; + virtual bool CanSetTransparent() override; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) override; - virtual void Update() wxOVERRIDE; + virtual void Update() override; WXWindow GetWXWindow() const ; static wxNonOwnedWindow* GetFromWXWindow( WXWindow win ); @@ -90,21 +90,21 @@ public: static void MacDelayedDeactivation(long timestamp); virtual void MacActivate( long timestamp , bool inIsActivating ) ; - virtual void SetWindowStyleFlag(long flags) wxOVERRIDE; + virtual void SetWindowStyleFlag(long flags) override; - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual void Raise() override; + virtual void Lower() override; + virtual bool Show( bool show = true ) override; - virtual void SetExtraStyle(long exStyle) wxOVERRIDE; + virtual void SetExtraStyle(long exStyle) override; - virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetBackgroundColour( const wxColour &colour ) override; wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; } #if wxOSX_USE_COCOA_OR_IPHONE // override the base class method to return an NSWindow instead of NSView - virtual void *OSXGetViewOrWindow() const wxOVERRIDE; + virtual void *OSXGetViewOrWindow() const override; #endif // Cocoa // osx specific event handling common for all osx-ports @@ -120,25 +120,25 @@ public: void WindowWasPainted(); - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; protected: // common part of all ctors void Init(); - virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetPosition( int *x, int *y ) const override; + virtual void DoGetSize( int *width, int *height ) const override; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual void DoGetClientSize(int *width, int *height) const override; virtual bool OSXShowWithEffect(bool show, wxShowEffect effect, - unsigned timeout) wxOVERRIDE; + unsigned timeout) override; - virtual bool DoClearShape() wxOVERRIDE; - virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; + virtual bool DoClearShape() override; + virtual bool DoSetRegionShape(const wxRegion& region) override; #if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE; + virtual bool DoSetPathShape(const wxGraphicsPath& path) override; #endif // wxUSE_GRAPHICS_CONTEXT virtual void WillBeDestroyed(); diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h index 13eca4415f..cd26e3194a 100644 --- a/include/wx/osx/notebook.h +++ b/include/wx/osx/notebook.h @@ -57,44 +57,44 @@ public: // set the currently selected page, return the index of the previously // selected one (or wxNOT_FOUND on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } + int SetSelection(size_t nPage) override { return DoSetSelection(nPage, SetSelection_SendEvent); } // changes selected page without sending events - int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } + int ChangeSelection(size_t nPage) override { return DoSetSelection(nPage); } // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; - wxString GetPageText(size_t nPage) const wxOVERRIDE; + bool SetPageText(size_t nPage, const wxString& strText) override; + wxString GetPageText(size_t nPage) const override; // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const wxOVERRIDE; - bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; + int GetPageImage(size_t nPage) const override; + bool SetPageImage(size_t nPage, int nImage) override; // control the appearance of the notebook pages // set the size (the same for all pages) - virtual void SetPageSize(const wxSize& size) wxOVERRIDE; + virtual void SetPageSize(const wxSize& size) override; // set the padding between tabs (in pixels) - virtual void SetPadding(const wxSize& padding) wxOVERRIDE; + virtual void SetPadding(const wxSize& padding) override; // sets the size of the tabs (assumes all tabs are the same size) - virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; + virtual void SetTabSize(const wxSize& sz) override; // hit test - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; // calculate size for wxNotebookSizer - wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; - wxRect GetPageRect() const wxOVERRIDE; + wxSize CalcSizeFromPage(const wxSize& sizePage) const override; + wxRect GetPageRect() const override; // operations // ---------- // remove all pages - bool DeleteAllPages() wxOVERRIDE; + bool DeleteAllPages() override; // the same as AddPage(), but adds it at the specified position bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; + int imageId = NO_IMAGE) override; // callbacks // --------- @@ -106,20 +106,20 @@ public: // -------------- #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE; - virtual bool DoPhase(int nPhase) wxOVERRIDE; + virtual void SetConstraintSizes(bool recurse = true) override; + virtual bool DoPhase(int nPhase) override; #endif // base class virtuals // ------------------- - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void Command(wxCommandEvent& event) override; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) override; protected: - virtual wxNotebookPage *DoRemovePage(size_t page) wxOVERRIDE; + virtual wxNotebookPage *DoRemovePage(size_t page) override; // common part of all ctors void Init(); @@ -127,7 +127,7 @@ protected: void ChangePage(int nOldSel, int nSel); // change pages void MacSetupTabs(); - int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; + int DoSetSelection(size_t nPage, int flags = 0) override; // the icon indices wxArrayInt m_images; diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h index 982d88180a..e6fec4bc3d 100644 --- a/include/wx/osx/palette.h +++ b/include/wx/osx/palette.h @@ -27,11 +27,11 @@ public: int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; - virtual int GetColoursCount() const wxOVERRIDE; + virtual int GetColoursCount() const override; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxPalette); diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h index 9136793dea..8dc94ed862 100644 --- a/include/wx/osx/pen.h +++ b/include/wx/osx/pen.h @@ -32,25 +32,25 @@ public: bool operator!=(const wxPen& pen) const { return !(*this == pen); } // Override in order to recreate the pen - void SetColour(const wxColour& col) wxOVERRIDE; - void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; + void SetColour(const wxColour& col) override; + void SetColour(unsigned char r, unsigned char g, unsigned char b) override; - void SetWidth(int width) wxOVERRIDE; - void SetStyle(wxPenStyle style) wxOVERRIDE; - void SetStipple(const wxBitmap& stipple) wxOVERRIDE; - void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE; - void SetJoin(wxPenJoin join) wxOVERRIDE; - void SetCap(wxPenCap cap) wxOVERRIDE; + void SetWidth(int width) override; + void SetStyle(wxPenStyle style) override; + void SetStipple(const wxBitmap& stipple) override; + void SetDashes(int nb_dashes, const wxDash *dash) override; + void SetJoin(wxPenJoin join) override; + void SetCap(wxPenCap cap) override; - wxColour GetColour() const wxOVERRIDE; - int GetWidth() const wxOVERRIDE; - wxPenStyle GetStyle() const wxOVERRIDE; - wxPenJoin GetJoin() const wxOVERRIDE; - wxPenCap GetCap() const wxOVERRIDE; - int GetDashes(wxDash **ptr) const wxOVERRIDE; + wxColour GetColour() const override; + int GetWidth() const override; + wxPenStyle GetStyle() const override; + wxPenJoin GetJoin() const override; + wxPenCap GetCap() const override; + int GetDashes(wxDash **ptr) const override; int GetDashCount() const; - wxBitmap *GetStipple() const wxOVERRIDE; + wxBitmap *GetStipple() const override; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") @@ -65,8 +65,8 @@ public: bool RealizeResource(); protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: void Unshare(); diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h index 4bed655b40..52ed3cf6fa 100644 --- a/include/wx/osx/popupwin.h +++ b/include/wx/osx/popupwin.h @@ -26,7 +26,7 @@ public: bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow); }; diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h index ffaf775200..2aef596118 100644 --- a/include/wx/osx/printdlg.h +++ b/include/wx/osx/printdlg.h @@ -33,11 +33,11 @@ public: virtual ~wxMacPrintDialog(); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; - virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; } - virtual wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); } - virtual wxDC *GetPrintDC() wxOVERRIDE; + virtual wxPrintDialogData& GetPrintDialogData() override { return m_printDialogData; } + virtual wxPrintData& GetPrintData() override { return m_printDialogData.GetPrintData(); } + virtual wxDC *GetPrintDC() override; private: wxPrintDialogData m_printDialogData; @@ -60,10 +60,10 @@ public: wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual ~wxMacPageSetupDialog(); - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE; + virtual wxPageSetupDialogData& GetPageSetupDialogData() override; bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; private: wxPageSetupDialogData m_pageSetupData; @@ -86,7 +86,7 @@ class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog public: wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data); bool TransferToWindow(); - bool TransferDataFromWindow() wxOVERRIDE; + bool TransferDataFromWindow() override; virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h index 403e6fa1ab..77b2baf5d8 100644 --- a/include/wx/osx/printmac.h +++ b/include/wx/osx/printmac.h @@ -27,9 +27,9 @@ public: virtual bool Print(wxWindow *parent, wxPrintout *printout, - bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; + bool prompt = true) override; + virtual wxDC* PrintDialog(wxWindow *parent) override; + virtual bool Setup(wxWindow *parent) override; }; @@ -51,8 +51,8 @@ public: wxPrintData *data); virtual ~wxMacPrintPreview(); - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; + virtual bool Print(bool interactive) override; + virtual void DetermineScaling() override; }; #endif diff --git a/include/wx/osx/private/addremovectrl.h b/include/wx/osx/private/addremovectrl.h index a5b342a8d2..3ea09faa2f 100644 --- a/include/wx/osx/private/addremovectrl.h +++ b/include/wx/osx/private/addremovectrl.h @@ -72,7 +72,7 @@ public: } // As we don't use sizers, we also need to compute our best size ourselves. - virtual wxSize GetBestClientSize() const wxOVERRIDE + virtual wxSize GetBestClientSize() const override { wxSize size = m_ctrlItems->GetBestSize(); diff --git a/include/wx/osx/private/datatransfer.h b/include/wx/osx/private/datatransfer.h index 281164f32b..0d44506200 100644 --- a/include/wx/osx/private/datatransfer.h +++ b/include/wx/osx/private/datatransfer.h @@ -88,19 +88,19 @@ public: // sink methods - virtual wxOSXDataSinkItem* CreateItem() wxOVERRIDE; + virtual wxOSXDataSinkItem* CreateItem() override; - void Clear() wxOVERRIDE; + void Clear() override; - void Flush() wxOVERRIDE; + void Flush() override; // source methods - virtual size_t GetItemCount() const wxOVERRIDE; + virtual size_t GetItemCount() const override; - virtual const wxOSXDataSourceItem* GetItem(size_t pos) const wxOVERRIDE; + virtual const wxOSXDataSourceItem* GetItem(size_t pos) const override; - virtual bool HasData(CFArrayRef types) const wxOVERRIDE; + virtual bool HasData(CFArrayRef types) const override; static wxOSXPasteboard* GetGeneralClipboard(); private: diff --git a/include/wx/osx/private/webrequest_urlsession.h b/include/wx/osx/private/webrequest_urlsession.h index dad169703e..4b1111ef72 100644 --- a/include/wx/osx/private/webrequest_urlsession.h +++ b/include/wx/osx/private/webrequest_urlsession.h @@ -35,7 +35,7 @@ public: ~wxWebAuthChallengeURLSession(); - void SetCredentials(const wxWebCredentials& cred) wxOVERRIDE; + void SetCredentials(const wxWebCredentials& cred) override; WX_NSURLCredential GetURLCredential() const { return m_cred; } @@ -53,17 +53,17 @@ public: ~wxWebResponseURLSession(); - wxFileOffset GetContentLength() const wxOVERRIDE; + wxFileOffset GetContentLength() const override; - wxString GetURL() const wxOVERRIDE; + wxString GetURL() const override; - wxString GetHeader(const wxString& name) const wxOVERRIDE; + wxString GetHeader(const wxString& name) const override; - int GetStatus() const wxOVERRIDE; + int GetStatus() const override; - wxString GetStatusText() const wxOVERRIDE; + wxString GetStatusText() const override; - wxString GetSuggestedFileName() const wxOVERRIDE; + wxString GetSuggestedFileName() const override; void HandleData(WX_NSData data); @@ -84,23 +84,23 @@ public: ~wxWebRequestURLSession(); - void Start() wxOVERRIDE; + void Start() override; - wxWebResponseImplPtr GetResponse() const wxOVERRIDE + wxWebResponseImplPtr GetResponse() const override { return m_response; } - wxWebAuthChallengeImplPtr GetAuthChallenge() const wxOVERRIDE + wxWebAuthChallengeImplPtr GetAuthChallenge() const override { return m_authChallenge; } - wxFileOffset GetBytesSent() const wxOVERRIDE; + wxFileOffset GetBytesSent() const override; - wxFileOffset GetBytesExpectedToSend() const wxOVERRIDE; + wxFileOffset GetBytesExpectedToSend() const override; - wxFileOffset GetBytesReceived() const wxOVERRIDE; + wxFileOffset GetBytesReceived() const override; - wxFileOffset GetBytesExpectedToReceive() const wxOVERRIDE; + wxFileOffset GetBytesExpectedToReceive() const override; - wxWebRequestHandle GetNativeHandle() const wxOVERRIDE + wxWebRequestHandle GetNativeHandle() const override { return (wxWebRequestHandle)m_task; } @@ -118,7 +118,7 @@ public: { return m_authChallenge.get(); } private: - void DoCancel() wxOVERRIDE; + void DoCancel() override; wxWebSessionURLSession& m_sessionImpl; wxString m_url; @@ -140,11 +140,11 @@ public: CreateRequest(wxWebSession& session, wxEvtHandler* handler, const wxString& url, - int winid = wxID_ANY) wxOVERRIDE; + int winid = wxID_ANY) override; - wxVersionInfo GetLibraryVersionInfo() wxOVERRIDE; + wxVersionInfo GetLibraryVersionInfo() override; - wxWebSessionHandle GetNativeHandle() const wxOVERRIDE + wxWebSessionHandle GetNativeHandle() const override { return (wxWebSessionHandle)m_session; } @@ -163,7 +163,7 @@ private: class wxWebSessionFactoryURLSession : public wxWebSessionFactory { public: - wxWebSessionImpl* Create() wxOVERRIDE + wxWebSessionImpl* Create() override { return new wxWebSessionURLSession(); } }; diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h index 9f710cc3f8..3520ee346b 100644 --- a/include/wx/osx/radiobox.h +++ b/include/wx/osx/radiobox.h @@ -56,29 +56,29 @@ public: const wxString& name = wxASCII_STR(wxRadioBoxNameStr)); // Enabling - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Enable(unsigned int item, bool enable = true) wxOVERRIDE; - virtual bool IsItemEnabled(unsigned int item) const wxOVERRIDE; + virtual bool Enable(bool enable = true) override; + virtual bool Enable(unsigned int item, bool enable = true) override; + virtual bool IsItemEnabled(unsigned int item) const override; // Showing - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Show(unsigned int item, bool show = true) wxOVERRIDE; - virtual bool IsItemShown(unsigned int item) const wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual bool Show(unsigned int item, bool show = true) override; + virtual bool IsItemShown(unsigned int item) const override; // Specific functions (in wxWidgets2 reference) - virtual void SetSelection(int item) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; + virtual void SetSelection(int item) override; + virtual int GetSelection() const override; - virtual unsigned int GetCount() const wxOVERRIDE { return m_noItems; } + virtual unsigned int GetCount() const override { return m_noItems; } - virtual wxString GetString(unsigned int item) const wxOVERRIDE; - virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE; + virtual wxString GetString(unsigned int item) const override; + virtual void SetString(unsigned int item, const wxString& label) override; // protect native font of box - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) override; // Other external functions - void Command(wxCommandEvent& event) wxOVERRIDE; - void SetFocus() wxOVERRIDE; + void Command(wxCommandEvent& event) override; + void SetFocus() override; // Other variable access functions int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } @@ -88,7 +88,7 @@ public: protected: // resolve ambiguity in base classes - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); } + virtual wxBorder GetDefaultBorder() const override { return wxRadioBoxBase::GetDefaultBorder(); } wxRadioButton *m_radioButtonCycle; @@ -96,10 +96,10 @@ protected: int m_noRowsOrCols; // Internal functions - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; wxDECLARE_EVENT_TABLE(); }; diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h index 3934f839f8..35c4b7b704 100644 --- a/include/wx/osx/radiobut.h +++ b/include/wx/osx/radiobut.h @@ -35,19 +35,19 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxRadioButtonNameStr)); - virtual void SetValue(bool val) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool val) override; + virtual bool GetValue() const override; // implementation - void Command(wxCommandEvent& event) wxOVERRIDE; + void Command(wxCommandEvent& event) override; wxRadioButton *AddInCycle(wxRadioButton *cycle); void RemoveFromCycle(); wxRadioButton *NextInCycle() {return m_cycle;} // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; + virtual bool OSXHandleClicked(double timestampsec) override; protected: wxRadioButton *m_cycle; diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h index 1142ec0064..1afcaaba3a 100644 --- a/include/wx/osx/scrolbar.h +++ b/include/wx/osx/scrolbar.h @@ -36,14 +36,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxScrollBarNameStr)); - virtual int GetThumbPosition() const wxOVERRIDE; - virtual int GetThumbSize() const wxOVERRIDE { return m_viewSize; } - virtual int GetPageSize() const wxOVERRIDE { return m_pageSize; } - virtual int GetRange() const wxOVERRIDE { return m_objectSize; } + virtual int GetThumbPosition() const override; + virtual int GetThumbSize() const override { return m_viewSize; } + virtual int GetPageSize() const override { return m_pageSize; } + virtual int GetRange() const override { return m_objectSize; } - virtual void SetThumbPosition(int viewStart) wxOVERRIDE; + virtual void SetThumbPosition(int viewStart) override; virtual void SetScrollbar(int position, int thumbSize, int range, - int pageSize, bool refresh = true) wxOVERRIDE; + int pageSize, bool refresh = true) override; // needed for RTTI void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } @@ -51,11 +51,11 @@ public: void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } // implementation only from now on - void Command(wxCommandEvent& event) wxOVERRIDE; - virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + void Command(wxCommandEvent& event) override; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) override; + virtual bool OSXHandleClicked( double timestampsec ) override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; int m_pageSize; int m_viewSize; diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h index 70915e44bb..bb0bc5a881 100644 --- a/include/wx/osx/slider.h +++ b/include/wx/osx/slider.h @@ -43,52 +43,52 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxSliderNameStr)); - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int) override; - void SetRange(int minValue, int maxValue) wxOVERRIDE; + void SetRange(int minValue, int maxValue) override; - int GetMin() const wxOVERRIDE { return m_rangeMin; } - int GetMax() const wxOVERRIDE { return m_rangeMax; } + int GetMin() const override { return m_rangeMin; } + int GetMax() const override { return m_rangeMax; } void SetMin(int minValue) { SetRange(minValue, m_rangeMax); } void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } // For trackbars only - int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } - void SetPageSize(int pageSize) wxOVERRIDE; - int GetPageSize() const wxOVERRIDE; - void ClearSel() wxOVERRIDE; - void ClearTicks() wxOVERRIDE; - void SetLineSize(int lineSize) wxOVERRIDE; - int GetLineSize() const wxOVERRIDE; - int GetSelEnd() const wxOVERRIDE; - int GetSelStart() const wxOVERRIDE; - void SetSelection(int minPos, int maxPos) wxOVERRIDE; - void SetThumbLength(int len) wxOVERRIDE; - int GetThumbLength() const wxOVERRIDE; - void SetTick(int tickPos) wxOVERRIDE; + int GetTickFreq() const override { return m_tickFreq; } + void SetPageSize(int pageSize) override; + int GetPageSize() const override; + void ClearSel() override; + void ClearTicks() override; + void SetLineSize(int lineSize) override; + int GetLineSize() const override; + int GetSelEnd() const override; + int GetSelStart() const override; + void SetSelection(int minPos, int maxPos) override; + void SetThumbLength(int len) override; + int GetThumbLength() const override; + void SetTick(int tickPos) override; - void Command(wxCommandEvent& event) wxOVERRIDE; + void Command(wxCommandEvent& event) override; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; - virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) override; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) override; protected: // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq) wxOVERRIDE; + virtual void DoSetTickFreq(int freq) override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) override; // set min/max size of the slider virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH) wxOVERRIDE; + int incW, int incH) override; // Common processing to invert slider values based on wxSL_INVERSE - virtual int ValueInvertOrNot(int value) const wxOVERRIDE; + virtual int ValueInvertOrNot(int value) const override; wxStaticText* m_macMinimumStatic ; wxStaticText* m_macMaximumStatic ; @@ -100,7 +100,7 @@ protected: int m_lineSize; int m_tickFreq; private : - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE + virtual wxWindowList GetCompositeWindowParts() const override { wxWindowList parts; parts.push_back(m_macMinimumStatic); diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h index e9b9c27e02..16f8b45b6a 100644 --- a/include/wx/osx/sound.h +++ b/include/wx/osx/sound.h @@ -64,7 +64,7 @@ public: static void SoundStopped(const wxSoundData* data); protected: - bool DoPlay(unsigned flags) const wxOVERRIDE; + bool DoPlay(unsigned flags) const override; void Init(); private: diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h index 645f52f34c..95b2a4cceb 100644 --- a/include/wx/osx/spinbutt.h +++ b/include/wx/osx/spinbutt.h @@ -51,24 +51,24 @@ public: // accessors - virtual void SetRange(int minVal, int maxVal) wxOVERRIDE; - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int val) wxOVERRIDE; - virtual void SetIncrement(int value) wxOVERRIDE; - virtual int GetIncrement() const wxOVERRIDE; + virtual void SetRange(int minVal, int maxVal) override; + virtual int GetValue() const override; + virtual void SetValue(int val) override; + virtual void SetIncrement(int value) override; + virtual int GetIncrement() const override; // implementation - virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) override; // osx specific event handling common for all osx-ports - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) override; protected: void SendThumbTrackEvent() ; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; private: wxDECLARE_DYNAMIC_CLASS(wxSpinButton); diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h index 62cea42955..6d54fac290 100644 --- a/include/wx/osx/srchctrl.h +++ b/include/wx/osx/srchctrl.h @@ -42,20 +42,20 @@ public: #if wxUSE_MENUS // get/set search button menu // -------------------------- - virtual void SetMenu( wxMenu* menu ) wxOVERRIDE; - virtual wxMenu* GetMenu() wxOVERRIDE; + virtual void SetMenu( wxMenu* menu ) override; + virtual wxMenu* GetMenu() override; #endif // wxUSE_MENUS // get/set search options // ---------------------- - virtual void ShowSearchButton( bool show ) wxOVERRIDE; - virtual bool IsSearchButtonVisible() const wxOVERRIDE; + virtual void ShowSearchButton( bool show ) override; + virtual bool IsSearchButtonVisible() const override; - virtual void ShowCancelButton( bool show ) wxOVERRIDE; - virtual bool IsCancelButtonVisible() const wxOVERRIDE; + virtual void ShowCancelButton( bool show ) override; + virtual bool IsCancelButtonVisible() const override; - virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE; - virtual wxString GetDescriptiveText() const wxOVERRIDE; + virtual void SetDescriptiveText(const wxString& text) override; + virtual wxString GetDescriptiveText() const override; virtual bool HandleSearchFieldSearchHit() ; virtual bool HandleSearchFieldCancelHit() ; @@ -63,12 +63,12 @@ public: wxSearchWidgetImpl * GetSearchPeer() const; #if wxUSE_MENUS - virtual void OSXAfterMenuEvent() wxOVERRIDE; + virtual void OSXAfterMenuEvent() override; #endif // wxUSE_MENUS protected: - wxSize DoGetBestSize() const wxOVERRIDE; + wxSize DoGetBestSize() const override; void Init(); diff --git a/include/wx/osx/statbmp.h b/include/wx/osx/statbmp.h index a89c4cd4e6..a657fb5dae 100644 --- a/include/wx/osx/statbmp.h +++ b/include/wx/osx/statbmp.h @@ -26,11 +26,11 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBitmapNameStr)); - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetBitmap(const wxBitmapBundle& bitmap) override; - virtual void SetScaleMode(ScaleMode scaleMode) wxOVERRIDE; + virtual void SetScaleMode(ScaleMode scaleMode) override; - virtual ScaleMode GetScaleMode() const wxOVERRIDE { return m_scaleMode; } + virtual ScaleMode GetScaleMode() const override { return m_scaleMode; } private: void OnPaint(wxPaintEvent& event); diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h index 6c0422b9a8..11fecde7f8 100644 --- a/include/wx/osx/statbox.h +++ b/include/wx/osx/statbox.h @@ -34,15 +34,15 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBoxNameStr)); - virtual void Command(wxCommandEvent& WXUNUSED(event)) wxOVERRIDE {} + virtual void Command(wxCommandEvent& WXUNUSED(event)) override {} virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const override; - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } // protect native font of box - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) override; }; #endif diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h index 89146a18df..91bb8d534d 100644 --- a/include/wx/osx/stattext.h +++ b/include/wx/osx/stattext.h @@ -34,20 +34,20 @@ public: const wxString& name = wxASCII_STR(wxStaticTextNameStr)); // accessors - void SetLabel( const wxString &str ) wxOVERRIDE; - bool SetFont( const wxFont &font ) wxOVERRIDE; + void SetLabel( const wxString &str ) override; + bool SetFont( const wxFont &font ) override; - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } protected : - virtual wxString WXGetVisibleLabel() const wxOVERRIDE; - virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE; + virtual wxString WXGetVisibleLabel() const override; + virtual void WXSetVisibleLabel(const wxString& str) override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; #if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE; + virtual bool DoSetLabelMarkup(const wxString& markup) override; #endif // wxUSE_MARKUP && wxOSX_USE_COCOA wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h index d80d5a9d78..f9488676ca 100644 --- a/include/wx/osx/statusbr.h +++ b/include/wx/osx/statusbr.h @@ -27,13 +27,13 @@ public: const wxString& name = wxASCII_STR(wxStatusBarNameStr)); // Implementation - virtual void MacHiliteChanged() wxOVERRIDE; + virtual void MacHiliteChanged() override; void OnPaint(wxPaintEvent& event); protected: - virtual int GetEffectiveFieldStyle(int WXUNUSED(i)) const wxOVERRIDE { return wxSB_NORMAL; } + virtual int GetEffectiveFieldStyle(int WXUNUSED(i)) const override { return wxSB_NORMAL; } - virtual void InitColours() wxOVERRIDE; + virtual void InitColours() override; private: wxColour m_textActive, m_textInactive; diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index bde361ab28..618eb7ce1d 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -60,55 +60,55 @@ public: // accessors // --------- - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; + virtual int GetLineLength(long lineNo) const override; + virtual wxString GetLineText(long lineNo) const override; + virtual int GetNumberOfLines() const override; - virtual bool IsModified() const wxOVERRIDE; + virtual bool IsModified() const override; // operations // ---------- // sets/clears the dirty flag - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; + virtual void MarkDirty() override; + virtual void DiscardEdits() override; - virtual void EmptyUndoBuffer() wxOVERRIDE; + virtual void EmptyUndoBuffer() override; // text control under some platforms supports the text styles: these // methods apply the given text style to the given selection or to // set/get the style which will be used for all appended text - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; + virtual bool SetFont( const wxFont &font ) override; + virtual bool GetStyle(long position, wxTextAttr& style) override; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) override; + virtual bool SetDefaultStyle(const wxTextAttr& style) override; // translate between the position (which is just an index into the textctrl // considering all its contents as a single strings) and (x, y) coordinates // which represent column and line. - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; + virtual long XYToPosition(long x, long y) const override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; - virtual void ShowPosition(long pos) wxOVERRIDE; + virtual void ShowPosition(long pos) override; // overrides so that we can send text updated events - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; #if wxUSE_SPELLCHECK // Use native spelling and grammar checking functions (multiline only). virtual bool EnableProofCheck(const wxTextProofOptions& options - = wxTextProofOptions::Default()) wxOVERRIDE; - virtual wxTextProofOptions GetProofCheckOptions() const wxOVERRIDE; + = wxTextProofOptions::Default()) override; + virtual wxTextProofOptions GetProofCheckOptions() const override; #endif // wxUSE_SPELLCHECK // Implementation // -------------- - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void Command(wxCommandEvent& event) override; - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; // callbacks void OnDropFiles(wxDropFilesEvent& event); @@ -133,10 +133,10 @@ public: void OnContextMenu(wxContextMenuEvent& event); - virtual bool MacSetupCursor( const wxPoint& pt ) wxOVERRIDE; + virtual bool MacSetupCursor( const wxPoint& pt ) override; - virtual void MacVisibilityChanged() wxOVERRIDE; - virtual void MacSuperChangedPosition() wxOVERRIDE; + virtual void MacVisibilityChanged() override; + virtual void MacSuperChangedPosition() override; // Use portable EnableProofCheck() instead now. #if WXWIN_COMPATIBILITY_3_0 && wxUSE_SPELLCHECK @@ -152,13 +152,13 @@ protected: // common part of all ctors void Init(); - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen) const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen) const override; // flag is set to true when the user edits the controls contents bool m_dirty; - virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) wxOVERRIDE + virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) override { // nothing to do here as the events are never generated when we change // the controls value programmatically anyhow diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h index 4a563a29db..7ea1725c93 100644 --- a/include/wx/osx/textentry.h +++ b/include/wx/osx/textentry.h @@ -34,58 +34,58 @@ public: wxTextEntry(); virtual ~wxTextEntry(); - virtual bool IsEditable() const wxOVERRIDE; + virtual bool IsEditable() const override; // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const wxOVERRIDE; + virtual void GetSelection(long* from, long* to) const override; // operations // ---------- // editing - virtual void Clear() wxOVERRIDE; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void Clear() override; + virtual void Remove(long from, long to) override; // set the max number of characters which may be entered // in a single line text control - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; + virtual void SetMaxLength(unsigned long len) override; - virtual void ForceUpper() wxOVERRIDE; + virtual void ForceUpper() override; // writing text inserts it at the current position; // appending always inserts it at the end - virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; // Clipboard operations - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; - virtual bool CanCopy() const wxOVERRIDE; - virtual bool CanCut() const wxOVERRIDE; - virtual bool CanPaste() const wxOVERRIDE; + virtual bool CanCopy() const override; + virtual bool CanCut() const override; + virtual bool CanPaste() const override; // Undo/redo - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; // Insertion point - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual void SetInsertionPointEnd() wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual void SetInsertionPointEnd() override; + virtual long GetInsertionPoint() const override; + virtual wxTextPos GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void SetEditable(bool editable) override; virtual bool SendMaxLenEvent(); // set the grayed out hint text - virtual bool SetHint(const wxString& hint) wxOVERRIDE; - virtual wxString GetHint() const wxOVERRIDE; + virtual bool SetHint(const wxString& hint) override; + virtual wxString GetHint() const override; // Implementation // -------------- @@ -95,10 +95,10 @@ public: protected: - virtual wxString DoGetValue() const wxOVERRIDE; + virtual wxString DoGetValue() const override; - virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE; - virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE; + virtual bool DoAutoCompleteStrings(const wxArrayString& choices) override; + virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) override; // The object providing auto-completions or NULL if none. wxTextCompleter *m_completer; diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h index cd856e7c45..b75ced673e 100644 --- a/include/wx/osx/tglbtn.h +++ b/include/wx/osx/tglbtn.h @@ -37,15 +37,15 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; - virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE; + virtual bool OSXHandleClicked( double timestampsec ) override; - virtual void Command(wxCommandEvent& event) wxOVERRIDE; + virtual void Command(wxCommandEvent& event) override; protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton); diff --git a/include/wx/osx/timectrl.h b/include/wx/osx/timectrl.h index 4cce4e9b43..a5ad4ad0b4 100644 --- a/include/wx/osx/timectrl.h +++ b/include/wx/osx/timectrl.h @@ -41,7 +41,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTimePickerCtrlNameStr); - virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE; + virtual void OSXGenerateEvent(const wxDateTime& dt) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h index 521454feb1..334d406f28 100644 --- a/include/wx/osx/toolbar.h +++ b/include/wx/osx/toolbar.h @@ -40,34 +40,34 @@ public: long style = wxTB_DEFAULT_STYLE, const wxString& name = wxASCII_STR(wxToolBarNameStr)); - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; // override/implement base class virtuals - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const override; #ifndef __WXOSX_IPHONE__ - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool IsShown() const wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual bool IsShown() const override; #endif - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; - virtual wxSize GetToolSize() const wxOVERRIDE; + virtual wxSize GetToolSize() const override; - virtual void SetRows(int nRows) wxOVERRIDE; + virtual void SetRows(int nRows) override; - virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) override; + virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) override; #ifndef __WXOSX_IPHONE__ // Add all the buttons - virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE; + virtual wxString MacGetToolTipString( wxPoint &where ) override; void OnPaint(wxPaintEvent& event) ; void OnMouse(wxMouseEvent& event) ; - virtual void MacSuperChangedPosition() wxOVERRIDE; + virtual void MacSuperChangedPosition() override; #endif #if wxOSX_USE_NATIVE_TOOLBAR @@ -88,9 +88,9 @@ public: wxItemKind kind = wxITEM_NORMAL, wxObject *clientData = NULL, const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) wxOVERRIDE; + const wxString& longHelp = wxEmptyString) override; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; + const wxString& label) override; protected: // common part of all ctors @@ -98,23 +98,23 @@ protected: void DoLayout(); - void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE; + void DoSetSize(int x, int y, int width, int height, int sizeFlags) override; #ifndef __WXOSX_IPHONE__ - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; + virtual wxSize DoGetBestSize() const override; #endif #ifdef __WXOSX_COCOA__ - virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE; + virtual void DoGetPosition(int*x, int *y) const override; #endif - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) override; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) override; - 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 void DoEnableTool(wxToolBarToolBase *tool, bool enable) override; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) override; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) override; - virtual void DoSetToolBitmapSize(const wxSize& size) wxOVERRIDE; + virtual void DoSetToolBitmapSize(const wxSize& size) override; wxDECLARE_EVENT_TABLE(); #if wxOSX_USE_NATIVE_TOOLBAR diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h index 1935ae2eca..ebe3822763 100644 --- a/include/wx/osx/toplevel.h +++ b/include/wx/osx/toplevel.h @@ -46,50 +46,50 @@ public: bool Create(wxWindow *parent, WXWindow nativeWindow); - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; // Attracts the users attention to this window if the application is // inactive (should be called when a background event occurs) - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE; + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) override; // implement base class pure virtuals - virtual void Maximize(bool maximize = true) wxOVERRIDE; - virtual bool IsMaximized() const wxOVERRIDE; - virtual void Iconize(bool iconize = true) wxOVERRIDE; - virtual bool IsIconized() const wxOVERRIDE; - virtual void Restore() wxOVERRIDE; + virtual void Maximize(bool maximize = true) override; + virtual bool IsMaximized() const override; + virtual void Iconize(bool iconize = true) override; + virtual bool IsIconized() const override; + virtual void Restore() override; - virtual bool IsActive() wxOVERRIDE; + virtual bool IsActive() override; - virtual void ShowWithoutActivating() wxOVERRIDE; - bool EnableFullScreenView(bool enable = true, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool IsFullScreen() const wxOVERRIDE; + virtual void ShowWithoutActivating() override; + bool EnableFullScreenView(bool enable = true, long style = wxFULLSCREEN_ALL) override; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + virtual bool IsFullScreen() const override; - virtual wxContentProtection GetContentProtection() const wxOVERRIDE; - virtual bool SetContentProtection(wxContentProtection contentProtection) wxOVERRIDE; + virtual wxContentProtection GetContentProtection() const override; + virtual bool SetContentProtection(wxContentProtection contentProtection) override; // implementation from now on // -------------------------- - virtual void SetTitle( const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; + virtual void SetTitle( const wxString& title) override; + virtual wxString GetTitle() const override; // EnableCloseButton(false) used to disable the "Close" // button on the title bar - virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; - virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; + virtual bool EnableCloseButton(bool enable = true) override; + virtual bool EnableMaximizeButton(bool enable = true) override; + virtual bool EnableMinimizeButton(bool enable = true) override; - virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); } - virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); } + virtual void SetLabel(const wxString& label) override { SetTitle( label ); } + virtual wxString GetLabel() const override { return GetTitle(); } - virtual void OSXSetModified(bool modified) wxOVERRIDE; - virtual bool OSXIsModified() const wxOVERRIDE; + virtual void OSXSetModified(bool modified) override; + virtual bool OSXIsModified() const override; - virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE; + virtual void SetRepresentedFilename(const wxString& filename) override; // do *not* call this to iconize the frame, this is a private function! void OSXSetIconizeState(bool iconic); diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index 7ea1f0d688..0a28e9a71b 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -48,68 +48,68 @@ public: const wxString& strURL = wxASCII_STR(wxWebViewDefaultURLStr), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxWebViewNameStr)) override; virtual ~wxWebViewWebKit(); - virtual bool CanGoBack() const wxOVERRIDE; - virtual bool CanGoForward() const wxOVERRIDE; - virtual void GoBack() wxOVERRIDE; - virtual void GoForward() wxOVERRIDE; - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; + virtual bool CanGoBack() const override; + virtual bool CanGoForward() const override; + virtual void GoBack() override; + virtual void GoForward() override; + virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) override; + virtual void Stop() override; - virtual void Print() wxOVERRIDE; + virtual void Print() override; - virtual void LoadURL(const wxString& url) wxOVERRIDE; - virtual wxString GetCurrentURL() const wxOVERRIDE; - virtual wxString GetCurrentTitle() const wxOVERRIDE; - virtual float GetZoomFactor() const wxOVERRIDE; - virtual void SetZoomFactor(float zoom) wxOVERRIDE; + virtual void LoadURL(const wxString& url) override; + virtual wxString GetCurrentURL() const override; + virtual wxString GetCurrentTitle() const override; + virtual float GetZoomFactor() const override; + virtual void SetZoomFactor(float zoom) override; - virtual void SetZoomType(wxWebViewZoomType zoomType) wxOVERRIDE; - virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE; - virtual bool CanSetZoomType(wxWebViewZoomType type) const wxOVERRIDE; + virtual void SetZoomType(wxWebViewZoomType zoomType) override; + virtual wxWebViewZoomType GetZoomType() const override; + virtual bool CanSetZoomType(wxWebViewZoomType type) const override; - virtual bool IsBusy() const wxOVERRIDE; + virtual bool IsBusy() const override; - virtual bool IsAccessToDevToolsEnabled() const wxOVERRIDE; - virtual void EnableAccessToDevTools(bool enable = true) wxOVERRIDE; - virtual bool SetUserAgent(const wxString& userAgent) wxOVERRIDE; + virtual bool IsAccessToDevToolsEnabled() const override; + virtual void EnableAccessToDevTools(bool enable = true) override; + virtual bool SetUserAgent(const wxString& userAgent) override; //History functions - virtual void ClearHistory() wxOVERRIDE; - virtual void EnableHistory(bool enable = true) wxOVERRIDE; - virtual wxVector > GetBackwardHistory() wxOVERRIDE; - virtual wxVector > GetForwardHistory() wxOVERRIDE; - virtual void LoadHistoryItem(wxSharedPtr item) wxOVERRIDE; + virtual void ClearHistory() override; + virtual void EnableHistory(bool enable = true) override; + virtual wxVector > GetBackwardHistory() override; + virtual wxVector > GetForwardHistory() override; + virtual void LoadHistoryItem(wxSharedPtr item) override; - virtual void Paste() wxOVERRIDE; + virtual void Paste() override; //Undo / redo functionality - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; + virtual void Undo() override; + virtual void Redo() override; //Editing functions - virtual void SetEditable(bool enable = true) wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual void SetEditable(bool enable = true) override; + virtual bool IsEditable() const override; - virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const wxOVERRIDE; - virtual bool AddScriptMessageHandler(const wxString& name) wxOVERRIDE; - virtual bool RemoveScriptMessageHandler(const wxString& name) wxOVERRIDE; + virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const override; + virtual bool AddScriptMessageHandler(const wxString& name) override; + virtual bool RemoveScriptMessageHandler(const wxString& name) override; virtual bool AddUserScript(const wxString& javascript, - wxWebViewUserScriptInjectionTime injectionTime = wxWEBVIEW_INJECT_AT_DOCUMENT_START) wxOVERRIDE; - virtual void RemoveAllUserScripts() wxOVERRIDE; + wxWebViewUserScriptInjectionTime injectionTime = wxWEBVIEW_INJECT_AT_DOCUMENT_START) override; + virtual void RemoveAllUserScripts() override; //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler) wxOVERRIDE; + virtual void RegisterHandler(wxSharedPtr handler) override; - virtual void* GetNativeBackend() const wxOVERRIDE { return m_webView; } - virtual void* GetNativeConfiguration() const wxOVERRIDE { return m_webViewConfiguration; } + virtual void* GetNativeBackend() const override { return m_webView; } + virtual void* GetNativeConfiguration() const override { return m_webViewConfiguration; } protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE; + virtual void DoSetPage(const wxString& html, const wxString& baseUrl) override; wxDECLARE_EVENT_TABLE(); @@ -128,16 +128,16 @@ private: class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory { public: - virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewWebKit; } + virtual wxWebView* Create() override { 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 = wxASCII_STR(wxWebViewNameStr)) wxOVERRIDE + const wxString& name = wxASCII_STR(wxWebViewNameStr)) override { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); } - virtual wxVersionInfo GetVersionInfo() wxOVERRIDE; + virtual wxVersionInfo GetVersionInfo() override; }; #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index ac9727b7b2..2290a09077 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -51,80 +51,80 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxPanelNameStr) ); - virtual void SendSizeEvent(int flags = 0) wxOVERRIDE; + virtual void SendSizeEvent(int flags = 0) override; // implement base class pure virtuals - virtual void SetLabel( const wxString& label ) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel( const wxString& label ) override; + virtual wxString GetLabel() const override; - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; + virtual void Raise() override; + virtual void Lower() override; - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual bool Show( bool show = true ) override; virtual bool ShowWithEffect(wxShowEffect effect, - unsigned timeout = 0) wxOVERRIDE + unsigned timeout = 0) override { return OSXShowWithEffect(true, effect, timeout); } virtual bool HideWithEffect(wxShowEffect effect, - unsigned timeout = 0) wxOVERRIDE + unsigned timeout = 0) override { return OSXShowWithEffect(false, effect, timeout); } - virtual void SetFocus() wxOVERRIDE; + virtual void SetFocus() override; - virtual void WarpPointer( int x, int y ) wxOVERRIDE; - virtual bool EnableTouchEvents(int eventsMask) wxOVERRIDE; + virtual void WarpPointer( int x, int y ) override; + virtual bool EnableTouchEvents(int eventsMask) override; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = NULL ) wxOVERRIDE; + const wxRect *rect = NULL ) override; - virtual void Update() wxOVERRIDE; - virtual void ClearBackground() wxOVERRIDE; + virtual void Update() override; + virtual void ClearBackground() override; - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; - virtual bool SetFont( const wxFont &font ) wxOVERRIDE; - virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; - virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; + virtual bool SetCursor( const wxCursor &cursor ) override; + virtual bool SetFont( const wxFont &font ) override; + virtual bool SetBackgroundColour( const wxColour &colour ) override; + virtual bool SetForegroundColour( const wxColour &colour ) override; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) override; + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const override; - virtual int GetCharHeight() const wxOVERRIDE; - virtual int GetCharWidth() const wxOVERRIDE; + virtual int GetCharHeight() const override; + virtual int GetCharWidth() const override; public: virtual void SetScrollbar( int orient, int pos, int thumbVisible, - 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; + int range, bool refresh = true ) override; + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) override; + virtual int GetScrollPos( int orient ) const override; + virtual int GetScrollThumb( int orient ) const override; + virtual int GetScrollRange( int orient ) const override; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) wxOVERRIDE; - virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true) wxOVERRIDE; - virtual bool IsScrollbarAlwaysShown(int orient) const wxOVERRIDE + const wxRect* rect = NULL ) override; + virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true) override; + virtual bool IsScrollbarAlwaysShown(int orient) const override { return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown : m_vScrollBarAlwaysShown; } - virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; + virtual bool Reparent( wxWindowBase *newParent ) override; #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON // hot keys (system wide accelerators) // ----------------------------------- - virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE; - virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE; + virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) override; + virtual bool UnregisterHotKey(int hotkeyId) override; #endif // wxUSE_HOTKEY - virtual wxSize GetDPI() const wxOVERRIDE; - virtual double GetDPIScaleFactor() const wxOVERRIDE; + virtual wxSize GetDPI() const override; + virtual double GetDPIScaleFactor() const override; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; + virtual void SetDropTarget( wxDropTarget *dropTarget ) override; #endif @@ -142,10 +142,10 @@ public: // simple accessors // ---------------- - virtual WXWidget GetHandle() const wxOVERRIDE; + virtual WXWidget GetHandle() const override; - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE; + virtual bool SetTransparent(wxByte alpha) override; + virtual bool CanSetTransparent() override; virtual wxByte GetTransparent() const; // event handlers @@ -156,10 +156,10 @@ public: void MacOnScroll( wxScrollEvent&event ); - virtual bool AcceptsFocus() const wxOVERRIDE; - virtual void EnableVisibleFocus(bool enabled) wxOVERRIDE; + virtual bool AcceptsFocus() const override; + virtual void EnableVisibleFocus(bool enabled) override; - virtual bool IsDoubleBuffered() const wxOVERRIDE { return true; } + virtual bool IsDoubleBuffered() const override { return true; } public: static long MacRemoveBordersFromStyle( long style ); @@ -167,7 +167,7 @@ public: public: // For implementation purposes: // sometimes decorations make the client area smaller - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; wxWindowMac *FindItem(long id) const; wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; @@ -175,7 +175,7 @@ public: virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; // this should not be overridden in classes above wxWindowMac // because it is called from its destructor via DeleteChildren - virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; + virtual void RemoveChild( wxWindowBase *child ) override; virtual bool MacDoRedraw( long time ) ; virtual void MacPaintChildrenBorders(); @@ -233,7 +233,7 @@ public: virtual bool MacClipGrandChildren() const { return false ; } bool MacIsWindowScrollbar( const wxWindow* sb ) const { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; } - virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE + virtual bool IsClientAreaChild(const wxWindow *child) const override { return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) && wxWindowBase::IsClientAreaChild(child); @@ -288,7 +288,7 @@ public: bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; } - double GetContentScaleFactor() const wxOVERRIDE; + double GetContentScaleFactor() const override; // internal response to size events virtual void MacOnInternalSize() {} @@ -350,40 +350,40 @@ protected: int *x, int *y, int *descent = NULL, int *externalLeading = NULL, - const wxFont *theFont = NULL ) const wxOVERRIDE; + const wxFont *theFont = NULL ) const override; - virtual void DoEnable( bool enable ) wxOVERRIDE; + virtual void DoEnable( bool enable ) override; #if wxUSE_MENUS - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE; + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) override; #endif - virtual void DoFreeze() wxOVERRIDE; - virtual void DoThaw() wxOVERRIDE; + virtual void DoFreeze() override; + virtual void DoThaw() override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const; - virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE; - virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; - virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE; - virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE; + virtual void DoClientToScreen( int *x, int *y ) const override; + virtual void DoScreenToClient( int *x, int *y ) const override; + virtual void DoGetPosition( int *x, int *y ) const override; + virtual void DoGetSize( int *width, int *height ) const override; + virtual void DoGetClientSize( int *width, int *height ) const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual void DoSetClientSize(int width, int height) override; - virtual void DoCaptureMouse() wxOVERRIDE; - virtual void DoReleaseMouse() wxOVERRIDE; + virtual void DoCaptureMouse() override; + virtual void DoReleaseMouse() override; // move the window to the specified location and resize it: this is called // from both DoSetSize() and DoSetClientSize() and would usually just call // ::MoveWindow() except for composite controls which will want to arrange // themselves inside the given rectangle - virtual void DoMoveWindow( int x, int y, int width, int height ) wxOVERRIDE; - virtual void DoSetWindowVariant( wxWindowVariant variant ) wxOVERRIDE; + virtual void DoMoveWindow( int x, int y, int width, int height ) override; + virtual void DoSetWindowVariant( wxWindowVariant variant ) override; #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; + virtual void DoSetToolTip( wxToolTip *tip ) override; #endif // common part of Show/HideWithEffect() diff --git a/include/wx/panel.h b/include/wx/panel.h index d07724ae7b..3180f65cfd 100644 --- a/include/wx/panel.h +++ b/include/wx/panel.h @@ -54,7 +54,7 @@ public: // implementation from now on // -------------------------- - virtual void InitDialog() wxOVERRIDE; + virtual void InitDialog() override; private: wxDECLARE_NO_COPY_CLASS(wxPanelBase); diff --git a/include/wx/persist/bookctrl.h b/include/wx/persist/bookctrl.h index f6370cc973..468d337011 100644 --- a/include/wx/persist/bookctrl.h +++ b/include/wx/persist/bookctrl.h @@ -36,12 +36,12 @@ public: { } - virtual void Save() const wxOVERRIDE + virtual void Save() const override { SaveValue(wxPERSIST_BOOK_SELECTION, Get()->GetSelection()); } - virtual bool Restore() wxOVERRIDE + virtual bool Restore() override { long sel; if ( RestoreValue(wxPERSIST_BOOK_SELECTION, &sel) ) @@ -57,7 +57,7 @@ public: return false; } - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_BOOK_KIND; } + virtual wxString GetKind() const override { return wxPERSIST_BOOK_KIND; } }; inline wxPersistentObject *wxCreatePersistentObject(wxBookCtrlBase *book) diff --git a/include/wx/persist/combobox.h b/include/wx/persist/combobox.h index 1f69d1fa03..7270eec201 100644 --- a/include/wx/persist/combobox.h +++ b/include/wx/persist/combobox.h @@ -43,7 +43,7 @@ public: { } - virtual void Save() const wxOVERRIDE + virtual void Save() const override { const wxComboBox* const combobox = Get(); @@ -79,7 +79,7 @@ public: wxJoin(items, wxPERSIST_COMBOBOX_ITEMS_SEP)); } - virtual bool Restore() wxOVERRIDE + virtual bool Restore() override { wxString items; if ( !RestoreValue(wxPERSIST_COMBOBOX_ITEMS, &items) ) @@ -90,7 +90,7 @@ public: return true; } - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_COMBOBOX_KIND; } + virtual wxString GetKind() const override { return wxPERSIST_COMBOBOX_KIND; } }; inline wxPersistentObject *wxCreatePersistentObject(wxComboBox* combobox) diff --git a/include/wx/persist/dataview.h b/include/wx/persist/dataview.h index fe6dac1490..dbd57a3b44 100644 --- a/include/wx/persist/dataview.h +++ b/include/wx/persist/dataview.h @@ -46,7 +46,7 @@ public: { } - virtual void Save() const wxOVERRIDE + virtual void Save() const override { wxDataViewCtrl* const control = Get(); @@ -92,7 +92,7 @@ public: } } - virtual bool Restore() wxOVERRIDE + virtual bool Restore() override { wxDataViewCtrl* const control = Get(); @@ -139,7 +139,7 @@ public: return true; } - virtual wxString GetKind() const wxOVERRIDE + virtual wxString GetKind() const override { return wxASCII_STR(wxPERSIST_DVC_KIND); } diff --git a/include/wx/persist/splitter.h b/include/wx/persist/splitter.h index 7c9e6584f4..e1b452fdcf 100644 --- a/include/wx/persist/splitter.h +++ b/include/wx/persist/splitter.h @@ -35,7 +35,7 @@ public: { } - virtual void Save() const wxOVERRIDE + virtual void Save() const override { wxSplitterWindow* const splitter = Get(); @@ -43,7 +43,7 @@ public: SaveValue(wxPERSIST_SPLITTER_POSITION, pos); } - virtual bool Restore() wxOVERRIDE + virtual bool Restore() override { int pos; if ( !RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) ) @@ -57,7 +57,7 @@ public: return true; } - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_SPLITTER_KIND; } + virtual wxString GetKind() const override { return wxPERSIST_SPLITTER_KIND; } }; inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter) diff --git a/include/wx/persist/toplevel.h b/include/wx/persist/toplevel.h index 5fd78c2864..8e70d656b8 100644 --- a/include/wx/persist/toplevel.h +++ b/include/wx/persist/toplevel.h @@ -37,29 +37,29 @@ public: { } - virtual void Save() const wxOVERRIDE + virtual void Save() const override { const wxTopLevelWindow * const tlw = Get(); tlw->SaveGeometry(*this); } - virtual bool Restore() wxOVERRIDE + virtual bool Restore() override { wxTopLevelWindow * const tlw = Get(); return tlw->RestoreToGeometry(*this); } - virtual wxString GetKind() const wxOVERRIDE { return wxASCII_STR(wxPERSIST_TLW_KIND); } + virtual wxString GetKind() const override { return wxASCII_STR(wxPERSIST_TLW_KIND); } private: - virtual bool SaveField(const wxString& name, int value) const wxOVERRIDE + virtual bool SaveField(const wxString& name, int value) const override { return SaveValue(name, value); } - virtual bool RestoreField(const wxString& name, int* value) wxOVERRIDE + virtual bool RestoreField(const wxString& name, int* value) override { return RestoreValue(name, value); } diff --git a/include/wx/persist/treebook.h b/include/wx/persist/treebook.h index c7b4cf002b..c780226185 100644 --- a/include/wx/persist/treebook.h +++ b/include/wx/persist/treebook.h @@ -40,7 +40,7 @@ public: { } - virtual void Save() const wxOVERRIDE + virtual void Save() const override { const wxTreebook * const book = GetTreeBook(); @@ -62,7 +62,7 @@ public: wxPersistentBookCtrl::Save(); } - virtual bool Restore() wxOVERRIDE + virtual bool Restore() override { wxTreebook * const book = GetTreeBook(); @@ -85,7 +85,7 @@ public: return wxPersistentBookCtrl::Restore(); } - virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TREEBOOK_KIND; } + virtual wxString GetKind() const override { 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 db163a2f1a..3a523eeba8 100644 --- a/include/wx/persist/window.h +++ b/include/wx/persist/window.h @@ -30,7 +30,7 @@ public: win->Bind(wxEVT_DESTROY, &wxPersistentWindowBase::HandleDestroy, this); } - virtual wxString GetName() const wxOVERRIDE + virtual wxString GetName() const override { 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 5966cab5d9..fa230c872f 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -105,7 +105,7 @@ public: // public API protected: // overridden base class methods #if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE; + virtual void DoSetToolTip(wxToolTip *tip) override; #endif // wxUSE_TOOLTIPS diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index c3964098b6..788794a089 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -53,7 +53,7 @@ public: virtual void Position(const wxPoint& ptOrigin, const wxSize& size); - virtual bool IsTopLevel() const wxOVERRIDE { return true; } + virtual bool IsTopLevel() const override { return true; } wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase); }; @@ -109,7 +109,7 @@ public: { return false; } // Override to implement delayed destruction of this window. - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; protected: // this is called when the popup is disappeared because of anything @@ -135,17 +135,17 @@ public: { Create(parent, style); } // Implement base class pure virtuals. - virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE; - virtual void Dismiss() wxOVERRIDE; + virtual void Popup(wxWindow *focus = NULL) override; + virtual void Dismiss() override; // Override to handle WM_NCACTIVATE. virtual bool MSWHandleMessage(WXLRESULT *result, WXUINT message, WXWPARAM wParam, - WXLPARAM lParam) wxOVERRIDE; + WXLPARAM lParam) override; // Override to dismiss the popup. - virtual void MSWDismissUnfocusedPopup() wxOVERRIDE; + virtual void MSWDismissUnfocusedPopup() override; private: void DismissOnDeactivate(); @@ -169,11 +169,11 @@ public: virtual ~wxPopupTransientWindow(); // Implement base class pure virtuals. - virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE; - virtual void Dismiss() wxOVERRIDE; + virtual void Popup(wxWindow *focus = NULL) override; + virtual void Dismiss() override; // Overridden to grab the input on some platforms - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual bool Show( bool show = true ) override; protected: // common part of all ctors diff --git a/include/wx/power.h b/include/wx/power.h index eba94b9dbd..f3feeb6732 100644 --- a/include/wx/power.h +++ b/include/wx/power.h @@ -64,7 +64,7 @@ public: // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const wxOVERRIDE { return new wxPowerEvent(*this); } + virtual wxEvent *Clone() const override { return new wxPowerEvent(*this); } private: bool m_veto; diff --git a/include/wx/preferences.h b/include/wx/preferences.h index 3461604fcc..10ed71ce4b 100644 --- a/include/wx/preferences.h +++ b/include/wx/preferences.h @@ -81,9 +81,9 @@ public: wxStockPreferencesPage(Kind kind) : m_kind(kind) {} Kind GetKind() const { return m_kind; } - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; #ifdef __WXOSX_COCOA__ - virtual wxBitmapBundle GetIcon() const wxOVERRIDE; + virtual wxBitmapBundle GetIcon() const override; #endif private: diff --git a/include/wx/private/addremovectrl.h b/include/wx/private/addremovectrl.h index 13a10ade02..ac07717ce7 100644 --- a/include/wx/private/addremovectrl.h +++ b/include/wx/private/addremovectrl.h @@ -115,7 +115,7 @@ public: } virtual void SetButtonsToolTips(const wxString& addtip, - const wxString& removetip) wxOVERRIDE + const wxString& removetip) override { m_btnAdd->SetToolTip(addtip); m_btnRemove->SetToolTip(removetip); diff --git a/include/wx/private/display.h b/include/wx/private/display.h index b45bfed6c9..b4b51d2a5d 100644 --- a/include/wx/private/display.h +++ b/include/wx/private/display.h @@ -169,17 +169,17 @@ public: #if wxUSE_DISPLAY // no video modes support for us, provide just the stubs virtual wxArrayVideoModes - GetModes(const wxVideoMode& WXUNUSED(mode)) const wxOVERRIDE + GetModes(const wxVideoMode& WXUNUSED(mode)) const override { return wxArrayVideoModes(); } - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE + virtual wxVideoMode GetCurrentMode() const override { return wxVideoMode(); } - virtual bool ChangeMode(const wxVideoMode& WXUNUSED(mode)) wxOVERRIDE + virtual bool ChangeMode(const wxVideoMode& WXUNUSED(mode)) override { return false; } @@ -202,11 +202,11 @@ public: class wxDisplayFactorySingle : public wxDisplayFactory { public: - virtual unsigned GetCount() wxOVERRIDE { return 1; } - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; + virtual unsigned GetCount() override { return 1; } + virtual int GetFromPoint(const wxPoint& pt) override; protected: - virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; + virtual wxDisplayImpl *CreateDisplay(unsigned n) override; virtual wxDisplayImpl *CreateSingleDisplay() = 0; }; diff --git a/include/wx/private/fdiodispatcher.h b/include/wx/private/fdiodispatcher.h index 9af0b71172..234175941e 100644 --- a/include/wx/private/fdiodispatcher.h +++ b/include/wx/private/fdiodispatcher.h @@ -102,13 +102,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) wxOVERRIDE; + virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) override; // modify descriptor flags or handler, return true on success - virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags) wxOVERRIDE; + virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags) override; // unregister descriptor previously registered with RegisterFD() - virtual bool UnregisterFD(int fd) wxOVERRIDE; + virtual bool UnregisterFD(int fd) override; virtual ~wxMappedFDIODispatcher() { } diff --git a/include/wx/private/fdioeventloopsourcehandler.h b/include/wx/private/fdioeventloopsourcehandler.h index fcf67622bf..47acf5045f 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() wxOVERRIDE { m_handler->OnReadWaiting(); } - virtual void OnWriteWaiting() wxOVERRIDE { m_handler->OnWriteWaiting(); } - virtual void OnExceptionWaiting() wxOVERRIDE { m_handler->OnExceptionWaiting(); } + virtual void OnReadWaiting() override { m_handler->OnReadWaiting(); } + virtual void OnWriteWaiting() override { m_handler->OnWriteWaiting(); } + virtual void OnExceptionWaiting() override { m_handler->OnExceptionWaiting(); } protected: wxEventLoopSourceHandler* const m_handler; diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h index a4ca08aee7..286e4d338a 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 wxOVERRIDE; + wxFileOffset GetLength() const override; // Returns the length, reading the parent stream to the end if necessary. wxFileOffset FindLength() const; - bool IsSeekable() const wxOVERRIDE { return true; } + bool IsSeekable() const override { return true; } protected: - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; + size_t OnSysRead(void *buffer, size_t size) override; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + wxFileOffset OnSysTell() const override; private: wxBackingFile m_backer; diff --git a/include/wx/private/markupparserattr.h b/include/wx/private/markupparserattr.h index 75d8749710..e09e19060d 100644 --- a/include/wx/private/markupparserattr.h +++ b/include/wx/private/markupparserattr.h @@ -91,33 +91,33 @@ public: // Implement all pure virtual methods inherited from the base class in // terms of our own ones. - virtual void OnBoldStart() wxOVERRIDE { DoChangeFont(&wxFont::Bold); } - virtual void OnBoldEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnBoldStart() override { DoChangeFont(&wxFont::Bold); } + virtual void OnBoldEnd() override { DoEndAttr(); } - virtual void OnItalicStart() wxOVERRIDE { DoChangeFont(&wxFont::Italic); } - virtual void OnItalicEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnItalicStart() override { DoChangeFont(&wxFont::Italic); } + virtual void OnItalicEnd() override { DoEndAttr(); } - virtual void OnUnderlinedStart() wxOVERRIDE { DoChangeFont(&wxFont::Underlined); } - virtual void OnUnderlinedEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnUnderlinedStart() override { DoChangeFont(&wxFont::Underlined); } + virtual void OnUnderlinedEnd() override { DoEndAttr(); } - virtual void OnStrikethroughStart() wxOVERRIDE { DoChangeFont(&wxFont::Strikethrough); } - virtual void OnStrikethroughEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnStrikethroughStart() override { DoChangeFont(&wxFont::Strikethrough); } + virtual void OnStrikethroughEnd() override { DoEndAttr(); } - virtual void OnBigStart() wxOVERRIDE { DoChangeFont(&wxFont::Larger); } - virtual void OnBigEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnBigStart() override { DoChangeFont(&wxFont::Larger); } + virtual void OnBigEnd() override { DoEndAttr(); } - virtual void OnSmallStart() wxOVERRIDE { DoChangeFont(&wxFont::Smaller); } - virtual void OnSmallEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnSmallStart() override { DoChangeFont(&wxFont::Smaller); } + virtual void OnSmallEnd() override { DoEndAttr(); } - virtual void OnTeletypeStart() wxOVERRIDE + virtual void OnTeletypeStart() override { wxFont font(GetFont()); font.SetFamily(wxFONTFAMILY_TELETYPE); DoSetFont(font); } - virtual void OnTeletypeEnd() wxOVERRIDE { DoEndAttr(); } + virtual void OnTeletypeEnd() override { DoEndAttr(); } - virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr) wxOVERRIDE + virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr) override { wxFont font(GetFont()); if ( !spanAttr.m_fontFace.empty() ) @@ -172,7 +172,7 @@ public: m_attrs.push(attr); } - virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr)) wxOVERRIDE + virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr)) override { DoEndAttr(); } diff --git a/include/wx/private/secretstore.h b/include/wx/private/secretstore.h index 443273d627..8f7f88f286 100644 --- a/include/wx/private/secretstore.h +++ b/include/wx/private/secretstore.h @@ -55,8 +55,8 @@ public: } } - virtual size_t GetSize() const wxOVERRIDE { return m_size; } - virtual const void *GetData() const wxOVERRIDE { return m_data; } + virtual size_t GetSize() const override { return m_size; } + virtual const void *GetData() const override { return m_data; } private: const size_t m_size; diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h index ba7a59a53a..8cab8ad906 100644 --- a/include/wx/private/selectdispatcher.h +++ b/include/wx/private/selectdispatcher.h @@ -86,11 +86,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) 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; + virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) override; + virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL) override; + virtual bool UnregisterFD(int fd) override; + virtual bool HasPending() const override; + virtual int Dispatch(int timeout = TIMEOUT_INFINITE) override; private: // common part of RegisterFD() and ModifyFD() diff --git a/include/wx/private/tlwgeom.h b/include/wx/private/tlwgeom.h index 0a273b8b8d..361624bb8b 100644 --- a/include/wx/private/tlwgeom.h +++ b/include/wx/private/tlwgeom.h @@ -71,7 +71,7 @@ public: m_maximized = false; } - virtual bool Save(const Serializer& ser) const wxOVERRIDE + virtual bool Save(const Serializer& ser) const override { if ( !ser.SaveField(wxPERSIST_TLW_X, m_rectScreen.x) || !ser.SaveField(wxPERSIST_TLW_Y, m_rectScreen.y) ) @@ -90,7 +90,7 @@ public: return true; } - virtual bool Restore(Serializer& ser) wxOVERRIDE + virtual bool Restore(Serializer& ser) override { m_hasPos = ser.RestoreField(wxPERSIST_TLW_X, &m_rectScreen.x) && ser.RestoreField(wxPERSIST_TLW_Y, &m_rectScreen.y); @@ -109,7 +109,7 @@ public: return m_hasPos || m_hasSize || m_maximized || m_iconized; } - virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE + virtual bool GetFrom(const wxTopLevelWindow* tlw) override { m_rectScreen = tlw->GetScreenRect(); m_hasPos = @@ -120,7 +120,7 @@ public: return true; } - virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE + virtual bool ApplyTo(wxTopLevelWindow* tlw) override { if ( m_hasPos ) { diff --git a/include/wx/private/webrequest_curl.h b/include/wx/private/webrequest_curl.h index 81b7aecdd7..589912e741 100644 --- a/include/wx/private/webrequest_curl.h +++ b/include/wx/private/webrequest_curl.h @@ -32,7 +32,7 @@ public: wxWebAuthChallengeCURL(wxWebAuthChallenge::Source source, wxWebRequestCURL& request); - void SetCredentials(const wxWebCredentials& cred) wxOVERRIDE; + void SetCredentials(const wxWebCredentials& cred) override; private: wxWebRequestCURL& m_request; @@ -51,21 +51,21 @@ public: ~wxWebRequestCURL(); - void Start() wxOVERRIDE; + void Start() override; - wxWebResponseImplPtr GetResponse() const wxOVERRIDE + wxWebResponseImplPtr GetResponse() const override { return m_response; } - wxWebAuthChallengeImplPtr GetAuthChallenge() const wxOVERRIDE + wxWebAuthChallengeImplPtr GetAuthChallenge() const override { return m_authChallenge; } - wxFileOffset GetBytesSent() const wxOVERRIDE; + wxFileOffset GetBytesSent() const override; - wxFileOffset GetBytesExpectedToSend() const wxOVERRIDE; + wxFileOffset GetBytesExpectedToSend() const override; CURL* GetHandle() const { return m_handle; } - wxWebRequestHandle GetNativeHandle() const wxOVERRIDE + wxWebRequestHandle GetNativeHandle() const override { return (wxWebRequestHandle)GetHandle(); } @@ -80,7 +80,7 @@ public: size_t CURLOnRead(char* buffer, size_t size); private: - void DoCancel() wxOVERRIDE; + void DoCancel() override; wxWebSessionCURL& m_sessionImpl; @@ -101,15 +101,15 @@ class wxWebResponseCURL : public wxWebResponseImpl public: explicit wxWebResponseCURL(wxWebRequestCURL& request); - wxFileOffset GetContentLength() const wxOVERRIDE; + wxFileOffset GetContentLength() const override; - wxString GetURL() const wxOVERRIDE; + wxString GetURL() const override; - wxString GetHeader(const wxString& name) const wxOVERRIDE; + wxString GetHeader(const wxString& name) const override; - int GetStatus() const wxOVERRIDE; + int GetStatus() const override; - wxString GetStatusText() const wxOVERRIDE { return m_statusText; } + wxString GetStatusText() const override { return m_statusText; } // Methods called from libcurl callbacks @@ -139,11 +139,11 @@ public: CreateRequest(wxWebSession& session, wxEvtHandler* handler, const wxString& url, - int id = wxID_ANY) wxOVERRIDE; + int id = wxID_ANY) override; - wxVersionInfo GetLibraryVersionInfo() wxOVERRIDE; + wxVersionInfo GetLibraryVersionInfo() override; - wxWebSessionHandle GetNativeHandle() const wxOVERRIDE + wxWebSessionHandle GetNativeHandle() const override { return (wxWebSessionHandle)m_handle; } @@ -193,7 +193,7 @@ private: class wxWebSessionFactoryCURL : public wxWebSessionFactory { public: - wxWebSessionImpl* Create() wxOVERRIDE + wxWebSessionImpl* Create() override { return new wxWebSessionCURL(); } }; diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index c674156dfa..078f198f81 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 ) wxOVERRIDE; + virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ) override; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ) wxOVERRIDE; + wxPrintDialogData *data = NULL ) override; virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, wxPrintout *printout, - wxPrintData *data ) wxOVERRIDE; + wxPrintData *data ) override; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ) wxOVERRIDE; + wxPrintDialogData *data = NULL ) override; virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ) wxOVERRIDE; + wxPrintData *data ) override; virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ) wxOVERRIDE; + wxPageSetupDialogData * data = NULL ) override; - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxOVERRIDE; + virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) override; - 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 bool HasPrintSetupDialog() override; + virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) override; + virtual bool HasOwnPrintToFile() override; + virtual bool HasPrinterLine() override; + virtual wxString CreatePrinterLine() override; + virtual bool HasStatusLine() override; + virtual wxString CreateStatusLine() override; - virtual wxPrintNativeDataBase *CreatePrintNativeData() wxOVERRIDE; + virtual wxPrintNativeDataBase *CreatePrintNativeData() override; }; //---------------------------------------------------------------------------- @@ -233,14 +233,14 @@ public: wxPrinter(wxPrintDialogData *data = NULL); virtual ~wxPrinter(); - virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout) wxOVERRIDE; - virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message) wxOVERRIDE; + virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout) override; + virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message) override; - virtual bool Setup(wxWindow *parent) wxOVERRIDE; - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; + virtual bool Setup(wxWindow *parent) override; + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) override; + virtual wxDC* PrintDialog(wxWindow *parent) override; - virtual wxPrintDialogData& GetPrintDialogData() const wxOVERRIDE; + virtual wxPrintDialogData& GetPrintDialogData() const override; protected: wxPrinterBase *m_pimpl; @@ -698,35 +698,35 @@ public: wxPrintData *data); virtual ~wxPrintPreview(); - 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 bool SetCurrentPage(int pageNum) override; + virtual int GetCurrentPage() const override; + virtual void SetPrintout(wxPrintout *printout) override; + virtual wxPrintout *GetPrintout() const override; + virtual wxPrintout *GetPrintoutForPrinting() const override; + virtual void SetFrame(wxFrame *frame) override; + virtual void SetCanvas(wxPreviewCanvas *canvas) override; - 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 wxFrame *GetFrame() const override; + virtual wxPreviewCanvas *GetCanvas() const override; + virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc) override; + virtual bool UpdatePageRendering() override; + virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc) override; + virtual void AdjustScrollbars(wxPreviewCanvas *canvas) override; + virtual bool RenderPage(int pageNum) override; + virtual void SetZoom(int percent) override; + virtual int GetZoom() const override; - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; + virtual bool Print(bool interactive) override; + virtual void DetermineScaling() override; - virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE; + virtual wxPrintDialogData& GetPrintDialogData() override; - virtual int GetMaxPage() const wxOVERRIDE; - virtual int GetMinPage() const wxOVERRIDE; + virtual int GetMaxPage() const override; + virtual int GetMinPage() const override; - virtual bool Ok() const wxOVERRIDE { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual void SetOk(bool ok) wxOVERRIDE; + virtual bool Ok() const override { return IsOk(); } + virtual bool IsOk() const override; + virtual void SetOk(bool ok) override; private: wxPrintPreviewBase *m_pimpl; diff --git a/include/wx/process.h b/include/wx/process.h index 21a1ccc157..7d334f2cc5 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -173,7 +173,7 @@ public: int GetExitCode() const { return m_exitcode; } // implement the base class pure virtual - virtual wxEvent *Clone() const wxOVERRIDE { return new wxProcessEvent(*this); } + virtual wxEvent *Clone() const override { return new wxProcessEvent(*this); } public: int m_pid, diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h index bbfa363e03..624be4eae4 100644 --- a/include/wx/propgrid/advprops.h +++ b/include/wx/propgrid/advprops.h @@ -139,15 +139,15 @@ public: const wxString& name = wxPG_LABEL, const wxFont& value = wxFont()); virtual ~wxFontProperty(); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; }; // ----------------------------------------------------------------------- @@ -170,10 +170,10 @@ public: value = wxColourPropertyValue() ); virtual ~wxSystemColourProperty(); - virtual void OnSetValue() wxOVERRIDE; + virtual void OnSetValue() override; virtual bool IntToValue(wxVariant& variant, int number, - int argFlags = 0) const wxOVERRIDE; + int argFlags = 0) const override; // Override in derived class to customize how colours are printed as // strings. @@ -184,16 +184,16 @@ public: // (default is last). virtual int GetCustomColourIndex() const; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, - wxWindow* primary, wxEvent& event ) wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; - virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE; + wxWindow* primary, wxEvent& event ) override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; + virtual wxSize OnMeasureImage( int item ) const override; virtual void OnCustomPaint( wxDC& dc, - const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE; + const wxRect& rect, wxPGPaintData& paintdata ) override; // Helper function to show the colour dialog bool QueryColourFromUser( wxVariant& variant ) const; @@ -243,11 +243,11 @@ public: const wxColour& value = *wxWHITE ); virtual ~wxColourProperty(); - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; - virtual wxColour GetColour( int index ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; + virtual wxColour GetColour( int index ) const override; protected: - virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const wxOVERRIDE; + virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const override; private: void Init( wxColour colour ); @@ -265,10 +265,10 @@ class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty int value = 0 ); virtual ~wxCursorProperty(); - virtual wxString ValueToString(wxVariant& value, int argFlags = 0) const wxOVERRIDE; - virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE; + virtual wxString ValueToString(wxVariant& value, int argFlags = 0) const override; + virtual wxSize OnMeasureImage( int item ) const override; virtual void OnCustomPaint( wxDC& dc, - const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE; + const wxRect& rect, wxPGPaintData& paintdata ) override; }; // ----------------------------------------------------------------------- @@ -290,11 +290,11 @@ public: const wxString& value = wxEmptyString); virtual ~wxImageFileProperty(); - virtual void OnSetValue() wxOVERRIDE; + virtual void OnSetValue() override; - virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE; + virtual wxSize OnMeasureImage( int item ) const override; virtual void OnCustomPaint( wxDC& dc, - const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE; + const wxRect& rect, wxPGPaintData& paintdata ) override; protected: void SetImage(const wxImage& img); @@ -334,12 +334,12 @@ public: virtual ~wxMultiChoiceProperty(); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue(wxVariant& variant, const wxString& text, - int argFlags = 0) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int argFlags = 0) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; wxArrayInt GetValueAsArrayInt() const { @@ -347,7 +347,7 @@ public: } protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; #if WXWIN_COMPATIBILITY_3_0 wxDEPRECATED_MSG("use function GenerateValueAsString(val) returning wxString") @@ -384,13 +384,13 @@ public: const wxDateTime& value = wxDateTime() ); virtual ~wxDateProperty(); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue(wxVariant& variant, const wxString& text, - int argFlags = 0) const wxOVERRIDE; + int argFlags = 0) const override; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; void SetFormat( const wxString& format ) { @@ -459,13 +459,13 @@ class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor public: virtual ~wxPGSpinCtrlEditor(); - wxString GetName() const wxOVERRIDE; + wxString GetName() const override; virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, - wxWindow* wnd, wxEvent& event ) const wxOVERRIDE; + wxWindow* wnd, wxEvent& event ) const override; private: mutable wxString m_tempString; diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h index 937d93d973..9a42ef491e 100644 --- a/include/wx/propgrid/editors.h +++ b/include/wx/propgrid/editors.h @@ -209,24 +209,24 @@ public: virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; virtual void UpdateControl( wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, wxWindow* primaryCtrl, - wxEvent& event ) const wxOVERRIDE; + wxEvent& event ) const override; virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; //virtual wxPGCellRenderer* GetCellRenderer() const; virtual void SetControlStringValue( wxPGProperty* property, wxWindow* ctrl, - const wxString& txt ) const wxOVERRIDE; - virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE; + const wxString& txt ) const override; + virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const override; // Provided so that, for example, ComboBox editor can use the same code // (multiple inheritance would get way too messy). @@ -252,34 +252,34 @@ public: virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; virtual void UpdateControl( wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, wxWindow* primaryCtrl, - wxEvent& event ) const wxOVERRIDE; + wxEvent& event ) const override; virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; virtual void SetValueToUnspecified( wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; - virtual wxString GetName() const wxOVERRIDE; + wxWindow* ctrl ) const override; + virtual wxString GetName() const override; virtual void SetControlIntValue( wxPGProperty* property, wxWindow* ctrl, - int value ) const wxOVERRIDE; + int value ) const override; virtual void SetControlStringValue( wxPGProperty* property, wxWindow* ctrl, - const wxString& txt ) const wxOVERRIDE; + const wxString& txt ) const override; virtual int InsertItem( wxWindow* ctrl, const wxString& label, - int index ) const wxOVERRIDE; - virtual void DeleteItem( wxWindow* ctrl, int index ) const wxOVERRIDE; - virtual void SetItems(wxWindow* ctrl, const wxArrayString& labels) const wxOVERRIDE; + int index ) const override; + virtual void DeleteItem( wxWindow* ctrl, int index ) const override; + virtual void SetItems(wxWindow* ctrl, const wxArrayString& labels) const override; - virtual bool CanContainCustomImage() const wxOVERRIDE; + virtual bool CanContainCustomImage() const override; // CreateControls calls this with CB_READONLY in extraStyle wxWindow* CreateControlsBase( wxPropertyGrid* propgrid, @@ -301,20 +301,20 @@ public: virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; - virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const wxOVERRIDE; + virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, - wxWindow* ctrl, wxEvent& event ) const wxOVERRIDE; + wxWindow* ctrl, wxEvent& event ) const override; virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; - virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE; + virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const override; }; @@ -324,12 +324,12 @@ class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor public: wxPGChoiceAndButtonEditor() {} virtual ~wxPGChoiceAndButtonEditor(); - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; wxDECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor); }; @@ -340,12 +340,12 @@ wxPGTextCtrlAndButtonEditor : public wxPGTextCtrlEditor public: wxPGTextCtrlAndButtonEditor() {} virtual ~wxPGTextCtrlAndButtonEditor(); - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor); }; @@ -364,32 +364,32 @@ public: wxPGCheckBoxEditor() {} virtual ~wxPGCheckBoxEditor(); - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; + const wxSize& size) const override; virtual void UpdateControl( wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, wxWindow* primaryCtrl, - wxEvent& event ) const wxOVERRIDE; + wxEvent& event ) const override; virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; virtual void SetValueToUnspecified( wxPGProperty* property, - wxWindow* ctrl ) const wxOVERRIDE; + wxWindow* ctrl ) const override; virtual void DrawValue( wxDC& dc, const wxRect& rect, wxPGProperty* property, - const wxString& text ) const wxOVERRIDE; + const wxString& text ) const override; //virtual wxPGCellRenderer* GetCellRenderer() const; virtual void SetControlIntValue( wxPGProperty* property, wxWindow* ctrl, - int value ) const wxOVERRIDE; + int value ) const override; }; #endif diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index 5f76f03d77..069cd66b0d 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -54,7 +54,7 @@ public: virtual ~wxPropertyGridPage(); // Deletes all properties on page. - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // Reduces column sizes to minimum possible that contents are still // visibly (naturally some margin space will be applied as well). @@ -110,7 +110,7 @@ public: virtual void OnShow(); // Refreshes given property on page. - virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE; + virtual void RefreshProperty( wxPGProperty* p ) override; // Sets splitter position on page. // Splitter position cannot exceed grid size, and therefore setting it @@ -129,7 +129,7 @@ protected: // Propagate to other pages. virtual void DoSetSplitterPosition( int pos, int splitterColumn = 0, - int flags = wxPG_SPLITTER_REFRESH ) wxOVERRIDE; + int flags = wxPG_SPLITTER_REFRESH ) override; // Page label (may be referred as name in some parts of documentation). // Can be set in constructor, or passed in @@ -207,7 +207,7 @@ public: } // Deletes all properties and all pages. - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // Deletes all properties on given page. void ClearPage( int page ); @@ -309,7 +309,7 @@ public: // Similar to GetIterator, but instead returns wxPGVIterator instance, // which can be useful for forward-iterating through arbitrary property // containers. - virtual wxPGVIterator GetVIterator( int flags ) const wxOVERRIDE; + virtual wxPGVIterator GetVIterator( int flags ) const override; // Returns currently selected page. wxPropertyGridPage* GetCurrentPage() const @@ -339,7 +339,7 @@ public: protected: // Returns wxPropertyGridPageState of given page, current page's for -1. - virtual wxPropertyGridPageState* GetPageState( int page ) const wxOVERRIDE; + virtual wxPropertyGridPageState* GetPageState( int page ) const override; public: // Returns number of managed pages. @@ -500,20 +500,20 @@ protected: virtual wxPropertyGrid* CreatePropertyGrid() const; public: - virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE; + virtual void RefreshProperty( wxPGProperty* p ) override; // // Overridden functions - no documentation required. // - void SetId( wxWindowID winid ) wxOVERRIDE; - 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; + void SetId( wxWindowID winid ) override; + virtual void SetExtraStyle ( long exStyle ) override; + virtual bool SetFont ( const wxFont& font ) override; + virtual void SetWindowStyleFlag ( long style ) override; + virtual bool Reparent( wxWindowBase *newParent ) override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // // Event handlers @@ -580,10 +580,10 @@ protected: bool m_showHeader; - virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const wxOVERRIDE; + virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const override; // Select and displays a given page. - virtual bool DoSelectPage( int index ) wxOVERRIDE; + virtual bool DoSelectPage( int index ) override; // Sets some members to defaults. void Init1(); @@ -595,7 +595,7 @@ protected: virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; #endif*/ - virtual bool ProcessEvent( wxEvent& event ) wxOVERRIDE; + virtual bool ProcessEvent( wxEvent& event ) override; // Recalculates new positions for components, according to the // given size. @@ -614,8 +614,8 @@ protected: void SetDescribedProperty( wxPGProperty* p ); // Reimplement these to handle "descboxheight" state item - virtual bool SetEditableStateItem( const wxString& name, wxVariant value ) wxOVERRIDE; - virtual wxVariant GetEditableStateItem( const wxString& name ) const wxOVERRIDE; + virtual bool SetEditableStateItem( const wxString& name, wxVariant value ) override; + virtual wxVariant GetEditableStateItem( const wxString& name ) const override; // Reconnect propgrid event handlers. void ReconnectEventHandlers(wxWindowID oldId, wxWindowID newId); diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index e995189de8..03e947c8be 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -161,11 +161,11 @@ public: wxPGProperty* property, int column, int item, - int flags ) const wxOVERRIDE; + int flags ) const override; virtual wxSize GetImageSize( const wxPGProperty* property, int column, - int item ) const wxOVERRIDE; + int item ) const override; protected: }; @@ -282,10 +282,10 @@ public: } private: - virtual wxObjectRefData *CreateRefData() const wxOVERRIDE + virtual wxObjectRefData *CreateRefData() const override { return new wxPGCellData(); } - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override; }; // ----------------------------------------------------------------------- @@ -2072,7 +2072,7 @@ private: // #define WX_PG_DECLARE_DOGETEDITORCLASS \ - virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE; + virtual const wxPGEditor* DoGetEditorClass() const override; #ifndef WX_PG_DECLARE_PROPERTY_CLASS #define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \ @@ -2109,7 +2109,7 @@ public: wxPGRootProperty( const wxString& name = wxS("") ); virtual ~wxPGRootProperty(); - virtual bool StringToValue( wxVariant&, const wxString&, int ) const wxOVERRIDE + virtual bool StringToValue( wxVariant&, const wxString&, int ) const override { return false; } @@ -2135,8 +2135,8 @@ public: int GetTextExtent( const wxWindow* wnd, const wxFont& font ) const; - virtual wxString ValueToString( wxVariant& value, int argFlags ) const wxOVERRIDE; - virtual wxString GetValueAsString( int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags ) const override; + virtual wxString GetValueAsString( int argFlags = 0 ) const override; protected: void SetTextColIndex( unsigned int colInd ) diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index 3393297651..c3965ed4b1 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -707,7 +707,7 @@ public: void CenterSplitter( bool enableAutoResizing = false ); // Deletes all properties. - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // Clears action triggers for given action. // action - Which action to trigger. @@ -907,7 +907,7 @@ public: void OnTLPChanging( wxWindow* newTLP ); // Redraws given property. - virtual void RefreshProperty( wxPGProperty* p ) wxOVERRIDE; + virtual void RefreshProperty( wxPGProperty* p ) override; // Registers a new editor class. // Returns pointer to the editor class instance that should be used. @@ -1372,7 +1372,7 @@ public: // property. bool UnfocusEditor(); - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 ); @@ -1426,24 +1426,24 @@ public: bool DoSelectProperty( wxPGProperty* p, unsigned int flags = 0 ); // Overridden functions. - virtual bool Destroy() wxOVERRIDE; + virtual bool Destroy() override; // 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 ) wxOVERRIDE; - virtual bool SetFont( const wxFont& font ) wxOVERRIDE; - virtual void SetExtraStyle( long exStyle ) wxOVERRIDE; - virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; - virtual void ScrollWindow(int dx, int dy, const wxRect* rect) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; + virtual bool SetFont( const wxFont& font ) override; + virtual void SetExtraStyle( long exStyle ) override; + virtual bool Reparent( wxWindowBase *newParent ) override; + virtual void ScrollWindow(int dx, int dy, const wxRect* rect) override; virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, - int xPos, int yPos, bool noRefresh) wxOVERRIDE; + int xPos, int yPos, bool noRefresh) override; protected: - virtual void DoThaw() wxOVERRIDE; + virtual void DoThaw() override; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual void DoEnable(bool enable) wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; + virtual void DoEnable(bool enable) override; #ifndef wxPG_ICON_WIDTH wxBitmap m_expandbmp, m_collbmp; @@ -2015,7 +2015,7 @@ public: ~wxPropertyGridEvent(); // Copyer. - virtual wxEvent* Clone() const wxOVERRIDE; + virtual wxEvent* Clone() const override; // Returns the column index associated with this event. // For the column dragging events, it is the column to the left diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index 90585a0f1b..849f0469bb 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -496,11 +496,11 @@ public:\ \ const classname &GetValue() const { return m_value; } \ \ - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; \ + virtual bool Eq(wxVariantData& data) const override; \ \ - virtual wxString GetType() const wxOVERRIDE; \ + virtual wxString GetType() const override; \ \ - virtual wxVariantData* Clone() const wxOVERRIDE { return new classname##VariantData(m_value); } \ + virtual wxVariantData* Clone() const override { return new classname##VariantData(m_value); } \ \ DECLARE_WXANY_CONVERSION() \ protected:\ diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index 698f02c06b..8f2251f1fd 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -102,15 +102,15 @@ public: const wxString& value = wxEmptyString ); virtual ~wxStringProperty(); - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; // This is updated so "" special value can be handled. - virtual void OnSetValue() wxOVERRIDE; + virtual void OnSetValue() override; protected: }; @@ -147,7 +147,7 @@ public: wxNumericPropertyValidator( NumericType numericType, int base = 10 ); virtual ~wxNumericPropertyValidator() { } - virtual bool Validate(wxWindow* parent) wxOVERRIDE; + virtual bool Validate(wxWindow* parent) override; }; #endif // wxUSE_VALIDATORS @@ -160,7 +160,7 @@ class WXDLLIMPEXP_PROPGRID wxNumericProperty : public wxPGProperty public: virtual ~wxNumericProperty(); - virtual bool DoSetAttribute(const wxString& name, wxVariant& value) wxOVERRIDE; + virtual bool DoSetAttribute(const wxString& name, wxVariant& value) override; virtual wxVariant AddSpinStepValue(long stepScale) const = 0; @@ -197,18 +197,18 @@ public: const wxString& name, const wxLongLong& value ); #endif - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; virtual bool ValidateValue( wxVariant& value, - wxPGValidationInfo& validationInfo ) const wxOVERRIDE; + wxPGValidationInfo& validationInfo ) const override; virtual bool IntToValue( wxVariant& variant, int number, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; static wxValidator* GetClassValidator(); - virtual wxValidator* DoGetValidator() const wxOVERRIDE; - virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE; + virtual wxValidator* DoGetValidator() const override; + virtual wxVariant AddSpinStepValue(long stepScale) const override; private: // Validation helpers. @@ -251,18 +251,18 @@ public: const wxString& name, const wxULongLong& value ); #endif - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int argFlags = 0 ) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; virtual bool ValidateValue( wxVariant& value, - wxPGValidationInfo& validationInfo ) const wxOVERRIDE; - virtual wxValidator* DoGetValidator () const wxOVERRIDE; + wxPGValidationInfo& validationInfo ) const override; + virtual wxValidator* DoGetValidator () const override; virtual bool IntToValue( wxVariant& variant, int number, - int argFlags = 0 ) const wxOVERRIDE; - virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE; + int argFlags = 0 ) const override; + virtual wxVariant AddSpinStepValue(long stepScale) const override; protected: wxByte m_base; @@ -302,18 +302,18 @@ public: double value = 0.0 ); virtual ~wxFloatProperty(); - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int argFlags = 0 ) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; virtual bool ValidateValue( wxVariant& value, - wxPGValidationInfo& validationInfo ) const wxOVERRIDE; + wxPGValidationInfo& validationInfo ) const override; static wxValidator* GetClassValidator(); - virtual wxValidator* DoGetValidator () const wxOVERRIDE; - virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE; + virtual wxValidator* DoGetValidator () const override; + virtual wxVariant AddSpinStepValue(long stepScale) const override; protected: int m_precision; @@ -338,13 +338,13 @@ public: bool value = false ); virtual ~wxBoolProperty(); - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; virtual bool IntToValue( wxVariant& variant, - int number, int argFlags = 0 ) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int number, int argFlags = 0 ) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; }; // ----------------------------------------------------------------------- @@ -400,19 +400,19 @@ public: size_t GetItemCount() const { return m_choices.GetCount(); } - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; virtual bool ValidateValue( wxVariant& value, - wxPGValidationInfo& validationInfo ) const wxOVERRIDE; + wxPGValidationInfo& validationInfo ) const override; // If wxPG_FULL_VALUE is not set in flags, then the value is interpreted // as index to choices list. Otherwise, it is actual value. virtual bool IntToValue( wxVariant& variant, int number, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; // // Additional virtuals @@ -423,7 +423,7 @@ public: // GetChoiceSelection needs to overridden since m_index is // the true index, and various property classes derived from // this take advantage of it. - virtual int GetChoiceSelection() const wxOVERRIDE { return m_index; } + virtual int GetChoiceSelection() const override { return m_index; } protected: @@ -495,12 +495,12 @@ public: virtual ~wxEditEnumProperty(); - void OnSetValue() wxOVERRIDE; + void OnSetValue() override; bool StringToValue(wxVariant& variant, const wxString& text, - int argFlags = 0) const wxOVERRIDE; + int argFlags = 0) const override; bool ValidateValue(wxVariant& value, - wxPGValidationInfo& validationInfo) const wxOVERRIDE; + wxPGValidationInfo& validationInfo) const override; protected: }; @@ -537,20 +537,20 @@ public: int value = 0 ); virtual ~wxFlagsProperty (); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int flags ) const wxOVERRIDE; + int flags ) const override; virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; // GetChoiceSelection needs to overridden since m_choices is // used and value is integer, but it is not index. - virtual int GetChoiceSelection() const wxOVERRIDE { return wxNOT_FOUND; } + virtual int GetChoiceSelection() const override { return wxNOT_FOUND; } // helpers size_t GetItemCount() const { return m_choices.GetCount(); } @@ -580,8 +580,8 @@ class WXDLLIMPEXP_PROPGRID wxEditorDialogProperty : public wxPGProperty public: virtual ~wxEditorDialogProperty(); - virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE; - virtual bool DoSetAttribute(const wxString& name, wxVariant& value) wxOVERRIDE; + virtual wxPGEditorDialogAdapter* GetEditorDialog() const override; + virtual bool DoSetAttribute(const wxString& name, wxVariant& value) override; protected: wxEditorDialogProperty(const wxString& label, const wxString& name); @@ -608,21 +608,21 @@ public: const wxString& value = wxEmptyString ); virtual ~wxFileProperty (); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int argFlags = 0 ) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; static wxValidator* GetClassValidator(); - virtual wxValidator* DoGetValidator() const wxOVERRIDE; + virtual wxValidator* DoGetValidator() const override; // Returns filename to file represented by current value. wxFileName GetFileName() const; protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; wxString m_wildcard; wxString m_basePath; // If set, then show path relative to it @@ -648,13 +648,13 @@ public: const wxString& value = wxEmptyString ); virtual ~wxLongStringProperty(); - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; + int argFlags = 0 ) const override; protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; }; // ----------------------------------------------------------------------- @@ -670,16 +670,16 @@ public: const wxString& value = wxEmptyString ); virtual ~wxDirProperty(); - virtual wxString ValueToString(wxVariant& value, int argFlags = 0) const wxOVERRIDE; + virtual wxString ValueToString(wxVariant& value, int argFlags = 0) const override; virtual bool StringToValue(wxVariant& variant, const wxString& text, - int argFlags = 0) const wxOVERRIDE; + int argFlags = 0) const override; #if WXWIN_COMPATIBILITY_3_0 - virtual bool DoSetAttribute(const wxString& name, wxVariant& value) wxOVERRIDE; + virtual bool DoSetAttribute(const wxString& name, wxVariant& value) override; #endif // WXWIN_COMPATIBILITY_3_0 - virtual wxValidator* DoGetValidator() const wxOVERRIDE; + virtual wxValidator* DoGetValidator() const override; protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; }; // ----------------------------------------------------------------------- @@ -702,12 +702,12 @@ public: const wxArrayString& value = wxArrayString() ); virtual ~wxArrayStringProperty(); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int argFlags = 0 ) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; // Implement in derived class for custom array-to-string conversion. #if WXWIN_COMPATIBILITY_3_0 @@ -756,7 +756,7 @@ public: wxUniChar delimiter, int flags); protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; // Previously this was to be implemented in derived class for array-to- // string conversion. Now you should implement ConvertValueToString() @@ -780,8 +780,8 @@ public: \ const wxString& name = wxPG_LABEL, \ const wxArrayString& value = wxArrayString() ); \ ~PROPNAME(); \ - virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ) wxOVERRIDE; \ - virtual wxValidator* DoGetValidator() const wxOVERRIDE; \ + virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ) override; \ + virtual wxValidator* DoGetValidator() const override; \ }; #define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAM) \ @@ -943,12 +943,12 @@ public: void Init(); - virtual void SetDialogValue( const wxVariant& value ) wxOVERRIDE + virtual void SetDialogValue( const wxVariant& value ) override { m_array = value.GetArrayString(); } - virtual wxVariant GetDialogValue() const wxOVERRIDE + virtual wxVariant GetDialogValue() const override { return m_array; } @@ -964,19 +964,19 @@ public: } } - virtual bool OnCustomNewAction(wxString* resString) wxOVERRIDE; + virtual bool OnCustomNewAction(wxString* resString) override; protected: wxArrayString m_array; wxArrayStringProperty* m_pCallingClass; - 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; + virtual wxString ArrayGet( size_t index ) override; + virtual size_t ArrayGetCount() override; + virtual bool ArrayInsert( const wxString& str, int index ) override; + virtual bool ArraySet( size_t index, const wxString& str ) override; + virtual void ArrayRemoveAt( int index ) override; + virtual void ArraySwap( size_t first, size_t second ) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog); diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h index 4654728403..c703606e25 100644 --- a/include/wx/protocol/file.h +++ b/include/wx/protocol/file.h @@ -23,10 +23,10 @@ public: wxFileProto(); virtual ~wxFileProto(); - bool Abort() wxOVERRIDE { return true; } - wxString GetContentType() const wxOVERRIDE { return wxEmptyString; } + bool Abort() override { return true; } + wxString GetContentType() const override { return wxEmptyString; } - wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; + wxInputStream *GetInputStream(const wxString& path) override; protected: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto); diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h index 426b6c9914..3c04c5b811 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) wxOVERRIDE; - virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); } + virtual bool Connect(const wxSockAddress& addr, bool wait = true) override; + virtual bool Connect(const wxString& host) override { return Connect(host, 0); } virtual bool Connect(const wxString& host, unsigned short port); // disconnect - virtual bool Close() wxOVERRIDE; + virtual bool Close() override; // 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 wxOVERRIDE { return wxEmptyString; } + virtual wxString GetContentType() const override { 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() wxOVERRIDE; + bool Abort() override; - virtual wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; + virtual wxInputStream *GetInputStream(const wxString& path) override; virtual wxOutputStream *GetOutputStream(const wxString& path); // Directory listing diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h index 90e044862a..5053fed714 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) wxOVERRIDE { return Connect(host, 0); } - virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE; - bool Abort() wxOVERRIDE; + virtual bool Connect(const wxString& host) override { return Connect(host, 0); } + virtual bool Connect(const wxSockAddress& addr, bool wait = true) override; + bool Abort() override; - wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE; + wxInputStream *GetInputStream(const wxString& path) override; - wxString GetContentType() const wxOVERRIDE; + wxString GetContentType() const override; 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 24f3dd7798..89a56d3e42 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) wxOVERRIDE + virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true) override { 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) wxOVERRIDE + virtual void SetTimeout(long seconds) override { SetDefaultTimeout(seconds); } diff --git a/include/wx/qt/accel.h b/include/wx/qt/accel.h index a988ffe206..e4524fb074 100644 --- a/include/wx/qt/accel.h +++ b/include/wx/qt/accel.h @@ -52,8 +52,8 @@ public: protected: // ref counting code - virtual wxObjectRefData *CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; + virtual wxObjectRefData *CreateRefData() const override; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); diff --git a/include/wx/qt/anybutton.h b/include/wx/qt/anybutton.h index b5d0ac6e87..82fd7f5391 100644 --- a/include/wx/qt/anybutton.h +++ b/include/wx/qt/anybutton.h @@ -23,17 +23,17 @@ public: // implementation // -------------- - virtual void SetLabel( const wxString &label ) wxOVERRIDE; + virtual void SetLabel( const wxString &label ) override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; // implementation only void QtUpdateState(); virtual int QtGetEventType() const = 0; protected: - virtual wxBitmap DoGetBitmap(State state) const wxOVERRIDE; - virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) wxOVERRIDE; + virtual wxBitmap DoGetBitmap(State state) const override; + virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) override; QPushButton *m_qtPushButton; diff --git a/include/wx/qt/app.h b/include/wx/qt/app.h index b9f21141aa..c2a3ea5d4c 100644 --- a/include/wx/qt/app.h +++ b/include/wx/qt/app.h @@ -18,7 +18,7 @@ public: wxApp(); ~wxApp(); - virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE; + virtual bool Initialize(int& argc, wxChar **argv) override; private: wxScopedPtr m_qtApplication; diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h index e1ea1f6c03..9b7a44b420 100644 --- a/include/wx/qt/bitmap.h +++ b/include/wx/qt/bitmap.h @@ -32,37 +32,37 @@ public: static void InitStandardHandlers(); - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE; + virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) override; + virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) override; virtual bool Create(int width, int height, const wxDC& dc); - virtual int GetHeight() const wxOVERRIDE; - virtual int GetWidth() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; + virtual int GetHeight() const override; + virtual int GetWidth() const override; + virtual int GetDepth() const override; #if wxUSE_IMAGE - virtual wxImage ConvertToImage() const wxOVERRIDE; + virtual wxImage ConvertToImage() const override; #endif // wxUSE_IMAGE - virtual wxMask *GetMask() const wxOVERRIDE; - virtual void SetMask(wxMask *mask) wxOVERRIDE; + virtual wxMask *GetMask() const override; + virtual void SetMask(wxMask *mask) override; - virtual wxBitmap GetSubBitmap(const wxRect& rect) const wxOVERRIDE; + virtual wxBitmap GetSubBitmap(const wxRect& rect) const override; virtual bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const wxOVERRIDE; - virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE; + const wxPalette *palette = NULL) const override; + virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) override; #if wxUSE_PALETTE - virtual wxPalette *GetPalette() const wxOVERRIDE; - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; + virtual wxPalette *GetPalette() const override; + virtual void SetPalette(const wxPalette& palette) override; #endif // wxUSE_PALETTE // implementation: #if WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED(virtual void SetHeight(int height) wxOVERRIDE); - wxDEPRECATED(virtual void SetWidth(int width) wxOVERRIDE); - wxDEPRECATED(virtual void SetDepth(int depth) wxOVERRIDE); + wxDEPRECATED(virtual void SetHeight(int height) override); + wxDEPRECATED(virtual void SetWidth(int width) override); + wxDEPRECATED(virtual void SetDepth(int depth) override); #endif void *GetRawData(wxPixelDataBase& data, int bpp); @@ -70,13 +70,13 @@ public: // these functions are internal and shouldn't be used, they risk to // disappear in the future - bool HasAlpha() const wxOVERRIDE; + bool HasAlpha() const override; QPixmap *GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: void InitFromImage(const wxImage& image, int depth, double WXUNUSED(scale)); @@ -112,10 +112,10 @@ public: protected: // this function is called from Create() to free the existing mask data - void FreeData() wxOVERRIDE; + void FreeData() override; // by the public wrappers - bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE; - bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE; + bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) override; + bool InitFromMonoBitmap(const wxBitmap& bitmap) override; protected: wxDECLARE_DYNAMIC_CLASS(wxMask); diff --git a/include/wx/qt/brush.h b/include/wx/qt/brush.h index b060ce7952..5ff19022f7 100644 --- a/include/wx/qt/brush.h +++ b/include/wx/qt/brush.h @@ -21,17 +21,17 @@ public: wxBrush(const wxBitmap& stipple); - virtual void SetColour(const wxColour& col) wxOVERRIDE; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; - virtual void SetStyle(wxBrushStyle style) wxOVERRIDE; - virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; + virtual void SetColour(const wxColour& col) override; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override; + virtual void SetStyle(wxBrushStyle style) override; + virtual void SetStipple(const wxBitmap& stipple) override; bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - virtual wxColour GetColour() const wxOVERRIDE; - virtual wxBrushStyle GetStyle() const wxOVERRIDE; - virtual wxBitmap *GetStipple() const wxOVERRIDE; + virtual wxColour GetColour() const override; + virtual wxBrushStyle GetStyle() const override; + virtual wxBitmap *GetStipple() const override; wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") void SetStyle(int style) { SetStyle((wxBrushStyle)style); } @@ -39,8 +39,8 @@ public: QBrush GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxBrush); diff --git a/include/wx/qt/button.h b/include/wx/qt/button.h index efc17c646d..c38792e0a1 100644 --- a/include/wx/qt/button.h +++ b/include/wx/qt/button.h @@ -29,10 +29,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxButtonNameStr)); - virtual wxWindow *SetDefault() wxOVERRIDE; + virtual wxWindow *SetDefault() override; // implementation only - virtual int QtGetEventType() const wxOVERRIDE { return wxEVT_BUTTON; } + virtual int QtGetEventType() const override { return wxEVT_BUTTON; } private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); diff --git a/include/wx/qt/calctrl.h b/include/wx/qt/calctrl.h index dde92af2a3..7ca840139d 100644 --- a/include/wx/qt/calctrl.h +++ b/include/wx/qt/calctrl.h @@ -39,41 +39,41 @@ public: long style = wxCAL_SHOW_HOLIDAYS, const wxString& name = wxASCII_STR(wxCalendarNameStr)); - virtual bool SetDate(const wxDateTime& date) wxOVERRIDE; - virtual wxDateTime GetDate() const wxOVERRIDE; + virtual bool SetDate(const wxDateTime& date) override; + virtual wxDateTime GetDate() const override; virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE; - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE; + const wxDateTime& upperdate = wxDefaultDateTime) override; + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const override; - virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE; - virtual void Mark(size_t day, bool mark) wxOVERRIDE; + virtual bool EnableMonthChange(bool enable = true) override; + virtual void Mark(size_t day, bool mark) override; // holidays colours - virtual void SetHoliday(size_t day) wxOVERRIDE; - virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE; - virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; } - virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; } + virtual void SetHoliday(size_t day) override; + virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) override; + virtual const wxColour& GetHolidayColourFg() const override { return m_colHolidayFg; } + virtual const wxColour& GetHolidayColourBg() const override { return m_colHolidayBg; } // header colours - virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE; - virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; } - virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; } + virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) override; + virtual const wxColour& GetHeaderColourFg() const override { return m_colHeaderFg; } + virtual const wxColour& GetHeaderColourBg() const override { return m_colHeaderBg; } // day attributes - virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE; - virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE; - virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); } + virtual wxCalendarDateAttr *GetAttr(size_t day) const override; + virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) override; + virtual void ResetAttr(size_t day) override { SetAttr(day, NULL); } - virtual void SetWindowStyleFlag(long style) wxOVERRIDE; + virtual void SetWindowStyleFlag(long style) override; using wxCalendarCtrlBase::GenerateAllChangeEvents; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: - virtual void RefreshHolidays() wxOVERRIDE; + virtual void RefreshHolidays() override; private: void Init(); diff --git a/include/wx/qt/checkbox.h b/include/wx/qt/checkbox.h index 2f0500fed6..4a58740706 100644 --- a/include/wx/qt/checkbox.h +++ b/include/wx/qt/checkbox.h @@ -29,17 +29,17 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr) ); - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual wxString GetLabel() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: - virtual void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE; - virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; + virtual void DoSet3StateValue(wxCheckBoxState state) override; + virtual wxCheckBoxState DoGet3StateValue() const override; private: QCheckBox *m_qtCheckBox; diff --git a/include/wx/qt/checklst.h b/include/wx/qt/checklst.h index a0bdbda805..f611a06e2f 100644 --- a/include/wx/qt/checklst.h +++ b/include/wx/qt/checklst.h @@ -46,11 +46,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxListBoxNameStr)); - virtual bool IsChecked(unsigned int item) const wxOVERRIDE; - virtual void Check(unsigned int item, bool check = true) wxOVERRIDE; + virtual bool IsChecked(unsigned int item) const override; + virtual void Check(unsigned int item, bool check = true) override; private: - virtual void Init() wxOVERRIDE; //common construction + virtual void Init() override; //common construction wxDECLARE_DYNAMIC_CLASS(wxCheckListBox); }; diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h index 267d3410d9..a2dfc65cdb 100644 --- a/include/wx/qt/choice.h +++ b/include/wx/qt/choice.h @@ -47,29 +47,29 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxChoiceNameStr) ); - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; - virtual void SetSelection(int n) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; + virtual void SetSelection(int n) override; + virtual int GetSelection() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, - wxClientDataType type) wxOVERRIDE; - virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE; + wxClientDataType type) override; + virtual int DoInsertOneItem(const wxString& item, unsigned int pos) override; - virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE; - virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void *clientData) override; + virtual void *DoGetItemClientData(unsigned int n) const override; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int pos) override; void QtInitSort(QComboBox *combo); diff --git a/include/wx/qt/clipbrd.h b/include/wx/qt/clipbrd.h index d81d704676..8be0280524 100644 --- a/include/wx/qt/clipbrd.h +++ b/include/wx/qt/clipbrd.h @@ -18,16 +18,16 @@ public: wxClipboard(); ~wxClipboard(); - virtual bool Open() wxOVERRIDE; - virtual void Close() wxOVERRIDE; - virtual bool IsOpened() const wxOVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual bool IsOpened() const override; - virtual bool AddData( wxDataObject *data ) wxOVERRIDE; - virtual bool SetData( wxDataObject *data ) wxOVERRIDE; - virtual bool GetData( wxDataObject& data ) wxOVERRIDE; - virtual void Clear() wxOVERRIDE; - virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE; - virtual bool IsSupportedAsync(wxEvtHandler *sink) wxOVERRIDE; + virtual bool AddData( wxDataObject *data ) override; + virtual bool SetData( wxDataObject *data ) override; + virtual bool GetData( wxDataObject& data ) override; + virtual void Clear() override; + virtual bool IsSupported( const wxDataFormat& format ) override; + virtual bool IsSupportedAsync(wxEvtHandler *sink) override; private: friend class QtClipBoardSignalHandler; diff --git a/include/wx/qt/clrpicker.h b/include/wx/qt/clrpicker.h index d73c133ff7..d9ecced82f 100644 --- a/include/wx/qt/clrpicker.h +++ b/include/wx/qt/clrpicker.h @@ -42,7 +42,7 @@ public: const wxString& name = wxASCII_STR(wxColourPickerWidgetNameStr)); protected: - virtual void UpdateColour() wxOVERRIDE; + virtual void UpdateColour() override; private: }; diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h index f6d041f5fe..2b01575681 100644 --- a/include/wx/qt/colour.h +++ b/include/wx/qt/colour.h @@ -18,12 +18,12 @@ public: DEFINE_STD_WXCOLOUR_CONSTRUCTORS wxColour(const QColor& color); - virtual bool IsOk() const wxOVERRIDE { return m_valid; } + virtual bool IsOk() const override { return m_valid; } - ChannelType Red() const wxOVERRIDE { return m_red; } - ChannelType Green() const wxOVERRIDE { return m_green; } - ChannelType Blue() const wxOVERRIDE { return m_blue; } - ChannelType Alpha() const wxOVERRIDE { return m_alpha; } + ChannelType Red() const override { return m_red; } + ChannelType Green() const override { return m_green; } + ChannelType Blue() const override { return m_blue; } + ChannelType Alpha() const override { return m_alpha; } bool operator==(const wxColour& color) const; bool operator!=(const wxColour& color) const; @@ -34,7 +34,7 @@ public: protected: void Init(); - virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE; + virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) override; private: ChannelType m_red, m_green, m_blue, m_alpha; diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h index c8a596a251..79d71f2e06 100644 --- a/include/wx/qt/combobox.h +++ b/include/wx/qt/combobox.h @@ -52,48 +52,48 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxComboBoxNameStr)); - virtual void SetSelection(int n) wxOVERRIDE; - virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void SetSelection(int n) override; + virtual void SetSelection(long from, long to) override; - virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); } - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual int GetSelection() const override { return wxChoice::GetSelection(); } + virtual void GetSelection(long *from, long *to) const override; - virtual wxString GetStringSelection() const wxOVERRIDE + virtual wxString GetStringSelection() const override { return wxItemContainer::GetStringSelection(); } - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; // See wxComboBoxBase discussion of IsEmpty(). bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - virtual void SetValue(const wxString& value) wxOVERRIDE; - virtual void ChangeValue(const wxString& value) wxOVERRIDE; - virtual void AppendText(const wxString &value) wxOVERRIDE; - virtual void Replace(long from, long to, const wxString &value) wxOVERRIDE; - virtual void WriteText(const wxString &value) wxOVERRIDE; - virtual void SetInsertionPoint(long insertion) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; + virtual void SetValue(const wxString& value) override; + virtual void ChangeValue(const wxString& value) override; + virtual void AppendText(const wxString &value) override; + virtual void Replace(long from, long to, const wxString &value) override; + virtual void WriteText(const wxString &value) override; + virtual void SetInsertionPoint(long insertion) override; + virtual long GetInsertionPoint() const override; virtual void Popup(); virtual void Dismiss(); - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } - virtual bool QtHandleFocusEvent(QWidget *handler, QFocusEvent *event) wxOVERRIDE; + virtual bool QtHandleFocusEvent(QWidget *handler, QFocusEvent *event) override; protected: // From wxTextEntry: - virtual wxString DoGetValue() const wxOVERRIDE; + virtual wxString DoGetValue() const override; private: void SetActualValue(const wxString& value); bool IsReadOnly() const; // From wxTextEntry: - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual wxWindow *GetEditableWindow() override { return this; } wxDECLARE_DYNAMIC_CLASS(wxComboBox); }; diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h index 38c45f43aa..7483292594 100644 --- a/include/wx/qt/control.h +++ b/include/wx/qt/control.h @@ -24,7 +24,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxControlNameStr)); - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; protected: bool QtCreateControl( wxWindow *parent, wxWindowID id, const wxPoint &pos, diff --git a/include/wx/qt/cursor.h b/include/wx/qt/cursor.h index a196d2c303..b83d3c6b9f 100644 --- a/include/wx/qt/cursor.h +++ b/include/wx/qt/cursor.h @@ -25,7 +25,7 @@ public: wxBitmapType type = wxCURSOR_DEFAULT_TYPE, int hotSpotX = 0, int hotSpotY = 0); - virtual wxPoint GetHotSpot() const wxOVERRIDE; + virtual wxPoint GetHotSpot() const override; QCursor &GetHandle() const; protected: @@ -36,8 +36,8 @@ protected: private: void Init(); - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; wxDECLARE_DYNAMIC_CLASS(wxCursor); }; diff --git a/include/wx/qt/dataobj2.h b/include/wx/qt/dataobj2.h index 8ddb3e781e..44ca64b73a 100644 --- a/include/wx/qt/dataobj2.h +++ b/include/wx/qt/dataobj2.h @@ -15,9 +15,9 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // Overridden to set image data directly, which Qt will write to clipboard in many formats - void QtAddDataTo(QMimeData &mimeData) const wxOVERRIDE; + void QtAddDataTo(QMimeData &mimeData) const override; // Overridden to retrieve image data from any format that Qt can read from clipboard - bool QtSetDataFrom(const QMimeData &mimeData) wxOVERRIDE; + bool QtSetDataFrom(const QMimeData &mimeData) override; protected: diff --git a/include/wx/qt/dc.h b/include/wx/qt/dc.h index 94f3261780..c8d05624cb 100644 --- a/include/wx/qt/dc.h +++ b/include/wx/qt/dc.h @@ -19,73 +19,73 @@ public: wxQtDCImpl( wxDC *owner ); ~wxQtDCImpl(); - virtual bool CanDrawBitmap() const wxOVERRIDE; - virtual bool CanGetTextExtent() const wxOVERRIDE; + virtual bool CanDrawBitmap() const override; + virtual bool CanGetTextExtent() const override; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoGetSizeMM(int* width, int* height) const override; - virtual int GetDepth() const wxOVERRIDE; - virtual wxSize GetPPI() const wxOVERRIDE; + virtual int GetDepth() const override; + virtual wxSize GetPPI() const override; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual void SetPen(const wxPen& pen) wxOVERRIDE; - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackgroundMode(int mode) wxOVERRIDE; + virtual void SetFont(const wxFont& font) override; + virtual void SetPen(const wxPen& pen) override; + virtual void SetBrush(const wxBrush& brush) override; + virtual void SetBackground(const wxBrush& brush) override; + virtual void SetBackgroundMode(int mode) override; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; + virtual void SetPalette(const wxPalette& palette) override; #endif // wxUSE_PALETTE - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; + virtual void SetLogicalFunction(wxRasterOperationMode function) override; - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; + virtual wxCoord GetCharHeight() const override; + virtual wxCoord GetCharWidth() const override; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; + wxCoord width, wxCoord height) override; - virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; - virtual void DestroyClippingRegion() wxOVERRIDE; + virtual void DoSetDeviceClippingRegion(const wxRegion& region) override; + virtual void DestroyClippingRegion() override; virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; + wxFloodFillStyle style = wxFLOOD_SURFACE) override; + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const override; - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + virtual void DoDrawPoint(wxCoord x, wxCoord y) override; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE; + wxCoord xc, wxCoord yc) override; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; + double sa, double ea) override; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius) wxOVERRIDE; + double radius) override; virtual void DoDrawEllipse(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; + wxCoord width, wxCoord height) override; - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoCrossHair(wxCoord x, wxCoord y) override; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override; virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; + bool useMask = false) override; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override; virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle) wxOVERRIDE; + wxCoord x, wxCoord y, double angle) override; virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, @@ -94,21 +94,21 @@ public: wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + wxCoord ysrcMask = wxDefaultCoord) override; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE; + wxCoord xoffset, wxCoord yoffset ) override; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; // Use Qt transformations, as they automatically scale pen widths, text... - virtual void ComputeScaleAndOrigin() wxOVERRIDE; + virtual void ComputeScaleAndOrigin() override; void QtPreparePainter(); - virtual void* GetHandle() const wxOVERRIDE { return (void*) m_qtPainter; } + virtual void* GetHandle() const override { return (void*) m_qtPainter; } protected: virtual QPixmap *GetQPixmap() { return m_qtPixmap; } diff --git a/include/wx/qt/dcmemory.h b/include/wx/qt/dcmemory.h index 9dddf6e8b4..2c06094c43 100644 --- a/include/wx/qt/dcmemory.h +++ b/include/wx/qt/dcmemory.h @@ -18,11 +18,11 @@ public: wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); ~wxMemoryDCImpl(); - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; - virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const override; + virtual void DoSelect(const wxBitmap& bitmap) override; - virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE; - virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE; + virtual const wxBitmap& GetSelectedBitmap() const override; + virtual wxBitmap& GetSelectedBitmap() override; private: wxBitmap m_selected; diff --git a/include/wx/qt/dcprint.h b/include/wx/qt/dcprint.h index 51b7bee533..1713f73a5f 100644 --- a/include/wx/qt/dcprint.h +++ b/include/wx/qt/dcprint.h @@ -15,72 +15,72 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl public: wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & ); - virtual bool CanDrawBitmap() const wxOVERRIDE; - virtual bool CanGetTextExtent() const wxOVERRIDE; + virtual bool CanDrawBitmap() const override; + virtual bool CanGetTextExtent() const override; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; + virtual void DoGetSizeMM(int* width, int* height) const override; - virtual int GetDepth() const wxOVERRIDE; - virtual wxSize GetPPI() const wxOVERRIDE; + virtual int GetDepth() const override; + virtual wxSize GetPPI() const override; - virtual void SetFont(const wxFont& font) wxOVERRIDE; - virtual void SetPen(const wxPen& pen) wxOVERRIDE; - virtual void SetBrush(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackground(const wxBrush& brush) wxOVERRIDE; - virtual void SetBackgroundMode(int mode) wxOVERRIDE; + virtual void SetFont(const wxFont& font) override; + virtual void SetPen(const wxPen& pen) override; + virtual void SetBrush(const wxBrush& brush) override; + virtual void SetBackground(const wxBrush& brush) override; + virtual void SetBackgroundMode(int mode) override; #if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette) wxOVERRIDE; + virtual void SetPalette(const wxPalette& palette) override; #endif // wxUSE_PALETTE - virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE; + virtual void SetLogicalFunction(wxRasterOperationMode function) override; - virtual wxCoord GetCharHeight() const wxOVERRIDE; - virtual wxCoord GetCharWidth() const wxOVERRIDE; + virtual wxCoord GetCharHeight() const override; + virtual wxCoord GetCharWidth() const override; virtual void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const wxOVERRIDE; + const wxFont *theFont = NULL) const override; - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; + wxCoord width, wxCoord height) override; - virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE; + virtual void DoSetDeviceClippingRegion(const wxRegion& region) override; virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE; + wxFloodFillStyle style = wxFLOOD_SURFACE) override; - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE; + virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const override; - virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE; - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE; + virtual void DoDrawPoint(wxCoord x, wxCoord y) override; + virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) override; virtual void DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) wxOVERRIDE; + wxCoord xc, wxCoord yc) override; virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) wxOVERRIDE; + double sa, double ea) override; - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE; + virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) override; virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double radius) wxOVERRIDE; + double radius) override; virtual void DoDrawEllipse(wxCoord x, wxCoord y, - wxCoord width, wxCoord height) wxOVERRIDE; + wxCoord width, wxCoord height) override; - virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoCrossHair(wxCoord x, wxCoord y) override; - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) override; virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false) wxOVERRIDE; + bool useMask = false) override; - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) override; virtual void DoDrawRotatedText(const wxString& text, - wxCoord x, wxCoord y, double angle) wxOVERRIDE; + wxCoord x, wxCoord y, double angle) override; virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, @@ -89,14 +89,14 @@ public: wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, - wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE; + wxCoord ysrcMask = wxDefaultCoord) override; virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE; + wxCoord xoffset, wxCoord yoffset ) override; virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; private: wxDECLARE_CLASS(wxPrinterDCImpl); diff --git a/include/wx/qt/dcscreen.h b/include/wx/qt/dcscreen.h index f2fba75bca..057a4933d9 100644 --- a/include/wx/qt/dcscreen.h +++ b/include/wx/qt/dcscreen.h @@ -18,8 +18,8 @@ public: ~wxScreenDCImpl(); protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual QPixmap *GetQPixmap() wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; + virtual QPixmap *GetQPixmap() override; wxDECLARE_ABSTRACT_CLASS(wxScreenDCImpl); }; diff --git a/include/wx/qt/dialog.h b/include/wx/qt/dialog.h index e5a5572c82..38c3b4e17a 100644 --- a/include/wx/qt/dialog.h +++ b/include/wx/qt/dialog.h @@ -31,10 +31,10 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxASCII_STR(wxDialogNameStr) ); - virtual int ShowModal() wxOVERRIDE; - virtual void EndModal(int retCode) wxOVERRIDE; - virtual bool IsModal() const wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual int ShowModal() override; + virtual void EndModal(int retCode) override; + virtual bool IsModal() const override; + virtual bool Show(bool show = true) override; QDialog *GetDialogHandle() const; diff --git a/include/wx/qt/dirdlg.h b/include/wx/qt/dirdlg.h index 7f47474d14..15fc52bb6e 100644 --- a/include/wx/qt/dirdlg.h +++ b/include/wx/qt/dirdlg.h @@ -33,8 +33,8 @@ public: public: // overrides from wxGenericDirDialog - wxString GetPath() const wxOVERRIDE; - void SetPath(const wxString& path) wxOVERRIDE; + wxString GetPath() const override; + void SetPath(const wxString& path) override; private: diff --git a/include/wx/qt/dnd.h b/include/wx/qt/dnd.h index a2e595ec57..b70fe69cf9 100644 --- a/include/wx/qt/dnd.h +++ b/include/wx/qt/dnd.h @@ -16,11 +16,11 @@ public: wxDropTarget(wxDataObject *dataObject = NULL); virtual ~wxDropTarget(); - virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE; + virtual bool OnDrop(wxCoord x, wxCoord y) override; virtual wxDragResult OnData(wxCoord x, wxCoord y, - wxDragResult def) wxOVERRIDE; - virtual bool GetData() wxOVERRIDE; + wxDragResult def) override; + virtual bool GetData() override; wxDataFormat GetMatchingPair(); @@ -46,7 +46,7 @@ public: const wxCursor &move = wxNullCursor, const wxCursor &none = wxNullCursor); - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE; + virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) override; private: wxWindow* m_parentWindow; diff --git a/include/wx/qt/evtloop.h b/include/wx/qt/evtloop.h index 2fbac8ae6a..7bb2646382 100644 --- a/include/wx/qt/evtloop.h +++ b/include/wx/qt/evtloop.h @@ -17,13 +17,13 @@ public: wxQtEventLoopBase(); ~wxQtEventLoopBase(); - virtual int DoRun() wxOVERRIDE; - 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; - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; + virtual int DoRun() override; + virtual void ScheduleExit(int rc = 0) override; + virtual bool Pending() const override; + virtual bool Dispatch() override; + virtual int DispatchTimeout(unsigned long timeout) override; + virtual void WakeUp() override; + virtual void DoYieldFor(long eventsToProcess) override; void ScheduleIdleCheck(); diff --git a/include/wx/qt/filedlg.h b/include/wx/qt/filedlg.h index cc48f71839..715357dc08 100644 --- a/include/wx/qt/filedlg.h +++ b/include/wx/qt/filedlg.h @@ -33,20 +33,20 @@ public: const wxSize& sz = wxDefaultSize, const wxString& name = wxASCII_STR(wxFileDialogNameStr)); - 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 wxString GetPath() const override; + virtual void GetPaths(wxArrayString& paths) const override; + virtual wxString GetFilename() const override; + virtual void GetFilenames(wxArrayString& files) const override; + virtual int GetFilterIndex() const override; - 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 void SetMessage(const wxString& message) override; + virtual void SetPath(const wxString& path) override; + virtual void SetDirectory(const wxString& dir) override; + virtual void SetFilename(const wxString& name) override; + virtual void SetWildcard(const wxString& wildCard) override; + virtual void SetFilterIndex(int filterIndex) override; - virtual bool SupportsExtraControl() const wxOVERRIDE { return true; } + virtual bool SupportsExtraControl() const override { return true; } virtual QFileDialog *GetQFileDialog() const; diff --git a/include/wx/qt/font.h b/include/wx/qt/font.h index a81bf165ca..9c86bc5020 100644 --- a/include/wx/qt/font.h +++ b/include/wx/qt/font.h @@ -50,37 +50,37 @@ public: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // accessors: get the font characteristics - virtual int GetPointSize() const wxOVERRIDE; - virtual double GetFractionalPointSize() const wxOVERRIDE; - virtual wxSize GetPixelSize() const wxOVERRIDE; - virtual wxFontStyle GetStyle() const wxOVERRIDE; - virtual int GetNumericWeight() const wxOVERRIDE; - virtual bool GetUnderlined() const wxOVERRIDE; - virtual wxString GetFaceName() const wxOVERRIDE; - virtual wxFontEncoding GetEncoding() const wxOVERRIDE; - virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE; - virtual bool GetStrikethrough() const wxOVERRIDE; + virtual int GetPointSize() const override; + virtual double GetFractionalPointSize() const override; + virtual wxSize GetPixelSize() const override; + virtual wxFontStyle GetStyle() const override; + virtual int GetNumericWeight() const override; + virtual bool GetUnderlined() const override; + virtual wxString GetFaceName() const override; + virtual wxFontEncoding GetEncoding() const override; + virtual const wxNativeFontInfo *GetNativeFontInfo() const override; + virtual bool GetStrikethrough() const override; // change the font characteristics - virtual void SetFractionalPointSize(double pointSize) wxOVERRIDE; - virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE; - virtual void SetFamily( wxFontFamily family ) wxOVERRIDE; - virtual void SetStyle( wxFontStyle style ) wxOVERRIDE; - virtual void SetNumericWeight(int 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; + virtual void SetFractionalPointSize(double pointSize) override; + virtual void SetPixelSize(const wxSize& pixelSize) override; + virtual void SetFamily( wxFontFamily family ) override; + virtual void SetStyle( wxFontStyle style ) override; + virtual void SetNumericWeight(int weight) override; + virtual bool SetFaceName(const wxString& facename) override; + virtual void SetUnderlined( bool underlined ) override; + virtual void SetStrikethrough(bool strikethrough) override; + virtual void SetEncoding(wxFontEncoding encoding) override; wxDECLARE_COMMON_FONT_METHODS(); virtual QFont GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; - virtual wxFontFamily DoGetFamily() const wxOVERRIDE; - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; + virtual wxFontFamily DoGetFamily() const override; + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) override; wxDECLARE_DYNAMIC_CLASS(wxFont); diff --git a/include/wx/qt/fontdlg.h b/include/wx/qt/fontdlg.h index 91113b229d..6dd42e4f48 100644 --- a/include/wx/qt/fontdlg.h +++ b/include/wx/qt/fontdlg.h @@ -18,7 +18,7 @@ public: wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); } protected: - bool DoCreate(wxWindow *parent) wxOVERRIDE; + bool DoCreate(wxWindow *parent) override; private: diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h index fa674d93b8..353cac9a89 100644 --- a/include/wx/qt/frame.h +++ b/include/wx/qt/frame.h @@ -42,23 +42,23 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxASCII_STR(wxFrameNameStr)); - virtual void SetMenuBar(wxMenuBar *menubar) wxOVERRIDE; - virtual void SetStatusBar(wxStatusBar *statusBar ) wxOVERRIDE; - virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE; + virtual void SetMenuBar(wxMenuBar *menubar) override; + virtual void SetStatusBar(wxStatusBar *statusBar ) override; + virtual void SetToolBar(wxToolBar *toolbar) override; - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; - virtual void AddChild( wxWindowBase *child ) wxOVERRIDE; - virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE; + virtual void AddChild( wxWindowBase *child ) override; + virtual void RemoveChild( wxWindowBase *child ) override; QMainWindow *GetQMainWindow() const; - virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE; + virtual QScrollArea *QtGetScrollBarsContainer() const override; protected: - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual void DoSetClientSize(int width, int height) override; - virtual QWidget* QtGetParentWidget() const wxOVERRIDE; + virtual QWidget* QtGetParentWidget() const override; private: // Common part of all ctors. diff --git a/include/wx/qt/gauge.h b/include/wx/qt/gauge.h index 810bcea227..7cf9adeb1b 100644 --- a/include/wx/qt/gauge.h +++ b/include/wx/qt/gauge.h @@ -33,14 +33,14 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxGaugeNameStr)); - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; // set/get the control range - virtual void SetRange(int range) wxOVERRIDE; - virtual int GetRange() const wxOVERRIDE; + virtual void SetRange(int range) override; + virtual int GetRange() const override; - virtual void SetValue(int pos) wxOVERRIDE; - virtual int GetValue() const wxOVERRIDE; + virtual void SetValue(int pos) override; + virtual int GetValue() const override; private: QProgressBar *m_qtProgressBar; diff --git a/include/wx/qt/glcanvas.h b/include/wx/qt/glcanvas.h index 743ef5901a..58c16e80a5 100644 --- a/include/wx/qt/glcanvas.h +++ b/include/wx/qt/glcanvas.h @@ -22,7 +22,7 @@ public: const wxGLContextAttrs *ctxAttrs = NULL); /// virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; + virtual bool SetCurrent(const wxGLCanvas& win) const override; wxDECLARE_CLASS(wxGLContext); }; @@ -74,7 +74,7 @@ public: const int *attribList = NULL, const wxPalette& palette = wxNullPalette); - virtual bool SwapBuffers() wxOVERRIDE; + virtual bool SwapBuffers() override; static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format); diff --git a/include/wx/qt/listbox.h b/include/wx/qt/listbox.h index 2cdc98f29a..f6844b5947 100644 --- a/include/wx/qt/listbox.h +++ b/include/wx/qt/listbox.h @@ -49,37 +49,37 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxListBoxNameStr)); - virtual bool IsSelected(int n) const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; + virtual bool IsSelected(int n) const override; + virtual int GetSelections(wxArrayInt& aSelections) const override; - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; - virtual int GetSelection() const wxOVERRIDE; + virtual int GetSelection() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; void QtSendEvent(wxEventType evtType, int rowIndex, bool selected); protected: - virtual void DoSetFirstItem(int n) wxOVERRIDE; + virtual void DoSetFirstItem(int n) override; - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; + virtual void DoSetSelection(int n, bool select) override; virtual int DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, - wxClientDataType type) wxOVERRIDE; - virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE; + wxClientDataType type) override; + virtual int DoInsertOneItem(const wxString& item, unsigned int pos) override; - virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE; - virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void *clientData) override; + virtual void *DoGetItemClientData(unsigned int n) const override; - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int pos) override; - virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE; + virtual QScrollArea *QtGetScrollBarsContainer() const override; #if wxUSE_CHECKLISTBOX bool m_hasCheckBoxes; diff --git a/include/wx/qt/listctrl.h b/include/wx/qt/listctrl.h index eefb5b42f0..e58744ea7b 100644 --- a/include/wx/qt/listctrl.h +++ b/include/wx/qt/listctrl.h @@ -41,31 +41,31 @@ public: //////////////////////////////////////////////////////////////////////////// // Set the control colours - bool SetForegroundColour(const wxColour& col) wxOVERRIDE; - bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; + bool SetForegroundColour(const wxColour& col) override; + bool SetBackgroundColour(const wxColour& col) override; // Gets information about this column - bool GetColumn(int col, wxListItem& info) const wxOVERRIDE; + bool GetColumn(int col, wxListItem& info) const override; // Sets information about this column - bool SetColumn(int col, const wxListItem& info) wxOVERRIDE; + bool SetColumn(int col, const wxListItem& info) override; // Gets the column width - int GetColumnWidth(int col) const wxOVERRIDE; + int GetColumnWidth(int col) const override; // Sets the column width - bool SetColumnWidth(int col, int width) wxOVERRIDE; + bool SetColumnWidth(int col, int width) override; // Gets the column order from its index or index from its order - int GetColumnOrder(int col) const wxOVERRIDE; - int GetColumnIndexFromOrder(int order) const wxOVERRIDE; + int GetColumnOrder(int col) const override; + int GetColumnIndexFromOrder(int order) const override; // Gets the column order for all columns - wxArrayInt GetColumnsOrder() const wxOVERRIDE; + wxArrayInt GetColumnsOrder() const override; // Sets the column order for all columns - bool SetColumnsOrder(const wxArrayInt& orders) wxOVERRIDE; + bool SetColumnsOrder(const wxArrayInt& orders) override; // Gets the number of items that can fit vertically in the @@ -125,10 +125,10 @@ public: bool SetItemPosition(long item, const wxPoint& pos); // Gets the number of items in the list control - int GetItemCount() const wxOVERRIDE; + int GetItemCount() const override; // Gets the number of columns in the list control - int GetColumnCount() const wxOVERRIDE; + int GetColumnCount() const override; // get the horizontal and vertical components of the item spacing wxSize GetItemSpacing() const; @@ -158,16 +158,16 @@ public: // list or report view long GetTopItem() const; - virtual bool HasCheckBoxes() const wxOVERRIDE; - virtual bool EnableCheckBoxes(bool enable = true) wxOVERRIDE; - virtual bool IsItemChecked(long item) const wxOVERRIDE; - virtual void CheckItem(long item, bool check) wxOVERRIDE; + virtual bool HasCheckBoxes() const override; + virtual bool EnableCheckBoxes(bool enable = true) override; + virtual bool IsItemChecked(long item) const override; + virtual void CheckItem(long item, bool check) override; // Add or remove a single window style void SetSingleStyle(long style, bool add = true); // Set the whole window style - void SetWindowStyleFlag(long style) wxOVERRIDE; + void SetWindowStyleFlag(long style) override; // Searches for an item, starting from 'item'. // item can be -1 to find the first item that matches the @@ -192,10 +192,10 @@ public: bool DeleteAllItems(); // Deletes a column - bool DeleteColumn(int col) wxOVERRIDE; + bool DeleteColumn(int col) override; // Deletes all columns - bool DeleteAllColumns() wxOVERRIDE; + bool DeleteAllColumns() override; // Clears items, and columns if there are any. void ClearAll(); @@ -262,14 +262,14 @@ public: // data is arbitrary data to be passed to the sort function. bool SortItems(wxListCtrlCompare fn, wxIntPtr data); - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: void Init(); // Implement base class pure virtual methods. - virtual long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE; - void DoUpdateImages(int which) wxOVERRIDE; + virtual long DoInsertColumn(long col, const wxListItem& info) override; + void DoUpdateImages(int which) override; bool m_hasCheckBoxes; diff --git a/include/wx/qt/mdi.h b/include/wx/qt/mdi.h index 80756fdc0d..6ccbaa772f 100644 --- a/include/wx/qt/mdi.h +++ b/include/wx/qt/mdi.h @@ -33,8 +33,8 @@ public: static bool IsTDI() { return false; } - virtual void ActivateNext() wxOVERRIDE; - virtual void ActivatePrevious() wxOVERRIDE; + virtual void ActivateNext() override; + virtual void ActivatePrevious() override; protected: @@ -64,7 +64,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxASCII_STR(wxFrameNameStr)); - virtual void Activate() wxOVERRIDE; + virtual void Activate() override; wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame); }; @@ -76,7 +76,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase public: wxMDIClientWindow(); - virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE; + virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL) override; wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); }; diff --git a/include/wx/qt/menu.h b/include/wx/qt/menu.h index cd747f2461..04fa78f644 100644 --- a/include/wx/qt/menu.h +++ b/include/wx/qt/menu.h @@ -20,9 +20,9 @@ public: virtual QMenu *GetHandle() const; protected: - virtual wxMenuItem *DoAppend(wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem *DoRemove(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem *DoAppend(wxMenuItem *item) override; + virtual wxMenuItem *DoInsert(size_t pos, wxMenuItem *item) override; + virtual wxMenuItem *DoRemove(wxMenuItem *item) override; private: QMenu *m_qtMenu; @@ -39,21 +39,21 @@ public: wxMenuBar(long style); wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual bool Append(wxMenu *menu, const wxString& title) wxOVERRIDE; - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE; - virtual wxMenu *Remove(size_t pos) wxOVERRIDE; + virtual bool Append(wxMenu *menu, const wxString& title) override; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Remove(size_t pos) override; - virtual void EnableTop(size_t pos, bool enable) wxOVERRIDE; - virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; + virtual void EnableTop(size_t pos, bool enable) override; + virtual bool IsEnabledTop(size_t pos) const override; - virtual void SetMenuLabel(size_t pos, const wxString& label) wxOVERRIDE; - virtual wxString GetMenuLabel(size_t pos) const wxOVERRIDE; + virtual void SetMenuLabel(size_t pos, const wxString& label) override; + virtual wxString GetMenuLabel(size_t pos) const override; QMenuBar *GetQMenuBar() const { return m_qtMenuBar; } - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; - virtual void Attach(wxFrame *frame) wxOVERRIDE; - virtual void Detach() wxOVERRIDE; + virtual void Attach(wxFrame *frame) override; + virtual void Detach() override; private: QMenuBar *m_qtMenuBar; diff --git a/include/wx/qt/menuitem.h b/include/wx/qt/menuitem.h index 80887b5783..6067ffed1c 100644 --- a/include/wx/qt/menuitem.h +++ b/include/wx/qt/menuitem.h @@ -26,16 +26,16 @@ public: wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = NULL); - virtual void SetItemLabel(const wxString& str) wxOVERRIDE; - virtual void SetCheckable(bool checkable) wxOVERRIDE; + virtual void SetItemLabel(const wxString& str) override; + virtual void SetCheckable(bool checkable) override; - virtual void Enable(bool enable = true) wxOVERRIDE; - virtual bool IsEnabled() const wxOVERRIDE; + virtual void Enable(bool enable = true) override; + virtual bool IsEnabled() const override; - virtual void Check(bool check = true) wxOVERRIDE; - virtual bool IsChecked() const wxOVERRIDE; + virtual void Check(bool check = true) override; + virtual bool IsChecked() const override; - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetBitmap(const wxBitmapBundle& bitmap) override; virtual QAction *GetHandle() const; diff --git a/include/wx/qt/msgdlg.h b/include/wx/qt/msgdlg.h index 63e96464fe..c4b718696d 100644 --- a/include/wx/qt/msgdlg.h +++ b/include/wx/qt/msgdlg.h @@ -22,7 +22,7 @@ public: virtual ~wxMessageDialog(); // Reimplemented to translate return codes from Qt to wx - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog); diff --git a/include/wx/qt/nonownedwnd.h b/include/wx/qt/nonownedwnd.h index 87df501491..e2f18c1dbf 100644 --- a/include/wx/qt/nonownedwnd.h +++ b/include/wx/qt/nonownedwnd.h @@ -18,10 +18,10 @@ public: wxNonOwnedWindow(); protected: - virtual bool DoClearShape() wxOVERRIDE; - virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; + virtual bool DoClearShape() override; + virtual bool DoSetRegionShape(const wxRegion& region) override; #if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE; + virtual bool DoSetPathShape(const wxGraphicsPath& path) override; #endif // wxUSE_GRAPHICS_CONTEXT wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow); diff --git a/include/wx/qt/notebook.h b/include/wx/qt/notebook.h index 35e5db5ec8..d8f012699e 100644 --- a/include/wx/qt/notebook.h +++ b/include/wx/qt/notebook.h @@ -28,29 +28,29 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxNotebookNameStr)); - virtual void SetPadding(const wxSize& padding) wxOVERRIDE; - virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; + virtual void SetPadding(const wxSize& padding) override; + virtual void SetTabSize(const wxSize& sz) override; - virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE; - virtual wxString GetPageText(size_t n) const wxOVERRIDE; + virtual bool SetPageText(size_t n, const wxString& strText) override; + virtual wxString GetPageText(size_t n) const override; - virtual int GetPageImage(size_t n) const wxOVERRIDE; - virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE; + virtual int GetPageImage(size_t n) const override; + virtual bool SetPageImage(size_t n, int imageId) override; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, - bool bSelect = false, int imageId = -1) wxOVERRIDE; + bool bSelect = false, int imageId = -1) override; - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const override; - int SetSelection(size_t nPage) wxOVERRIDE; - int ChangeSelection(size_t nPage) wxOVERRIDE; + int SetSelection(size_t nPage) override; + int ChangeSelection(size_t nPage) override; - virtual bool DeleteAllPages() wxOVERRIDE; + virtual bool DeleteAllPages() override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; + virtual wxWindow *DoRemovePage(size_t page) override; private: QTabWidget *m_qtTabWidget; diff --git a/include/wx/qt/palette.h b/include/wx/qt/palette.h index 23d221bc97..c312e89579 100644 --- a/include/wx/qt/palette.h +++ b/include/wx/qt/palette.h @@ -20,8 +20,8 @@ public: int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxPalette); diff --git a/include/wx/qt/pen.h b/include/wx/qt/pen.h index a095b0bd77..132003114f 100644 --- a/include/wx/qt/pen.h +++ b/include/wx/qt/pen.h @@ -23,23 +23,23 @@ public: bool operator==(const wxPen& pen) const; bool operator!=(const wxPen& pen) const; - virtual void SetColour(const wxColour& col) wxOVERRIDE; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE; + virtual void SetColour(const wxColour& col) override; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) override; - virtual void SetWidth(int width) wxOVERRIDE; - virtual void SetStyle(wxPenStyle style) wxOVERRIDE; - virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE; - virtual void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE; - virtual void SetJoin(wxPenJoin join) wxOVERRIDE; - virtual void SetCap(wxPenCap cap) wxOVERRIDE; + virtual void SetWidth(int width) override; + virtual void SetStyle(wxPenStyle style) override; + virtual void SetStipple(const wxBitmap& stipple) override; + virtual void SetDashes(int nb_dashes, const wxDash *dash) override; + virtual void SetJoin(wxPenJoin join) override; + virtual void SetCap(wxPenCap cap) override; - virtual wxColour GetColour() const wxOVERRIDE; - virtual wxBitmap *GetStipple() const wxOVERRIDE; - virtual wxPenStyle GetStyle() const wxOVERRIDE; - virtual wxPenJoin GetJoin() const wxOVERRIDE; - virtual wxPenCap GetCap() const wxOVERRIDE; - virtual int GetWidth() const wxOVERRIDE; - virtual int GetDashes(wxDash **ptr) const wxOVERRIDE; + virtual wxColour GetColour() const override; + virtual wxBitmap *GetStipple() const override; + virtual wxPenStyle GetStyle() const override; + virtual wxPenJoin GetJoin() const override; + virtual wxPenCap GetCap() const override; + virtual int GetWidth() const override; + virtual int GetDashes(wxDash **ptr) const override; wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") void SetStyle(int style) { SetStyle((wxPenStyle)style); } @@ -47,8 +47,8 @@ public: QPen GetHandle() const; protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; private: wxDECLARE_DYNAMIC_CLASS(wxPen); diff --git a/include/wx/qt/printdlg.h b/include/wx/qt/printdlg.h index 93b62f5e78..0793642b44 100644 --- a/include/wx/qt/printdlg.h +++ b/include/wx/qt/printdlg.h @@ -16,10 +16,10 @@ class WXDLLIMPEXP_CORE wxQtPrintNativeData: public wxPrintNativeDataBase public: wxQtPrintNativeData(); - virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE; - virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE; + virtual bool TransferTo( wxPrintData &data ) override; + virtual bool TransferFrom( const wxPrintData &data ) override; - virtual bool IsOk() const wxOVERRIDE; + virtual bool IsOk() const override; }; @@ -29,9 +29,9 @@ public: wxQtPrintDialog(wxWindow *parent, wxPrintDialogData *data); wxQtPrintDialog(wxWindow *parent, wxPrintData *data); - virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE; - virtual wxPrintData& GetPrintData() wxOVERRIDE; - virtual wxDC *GetPrintDC() wxOVERRIDE; + virtual wxPrintDialogData& GetPrintDialogData() override; + virtual wxPrintData& GetPrintData() override; + virtual wxDC *GetPrintDC() override; protected: @@ -48,7 +48,7 @@ public: bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); - virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE; + virtual wxPageSetupDialogData& GetPageSetupDialogData() override; private: }; diff --git a/include/wx/qt/printqt.h b/include/wx/qt/printqt.h index 2e0e765237..0f76ee473f 100644 --- a/include/wx/qt/printqt.h +++ b/include/wx/qt/printqt.h @@ -15,9 +15,9 @@ class WXDLLIMPEXP_CORE wxQtPrinter : public wxPrinterBase public: wxQtPrinter( wxPrintDialogData *data = NULL ); - virtual bool Setup(wxWindow *parent) wxOVERRIDE; - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE; - virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE; + virtual bool Setup(wxWindow *parent) override; + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) override; + virtual wxDC* PrintDialog(wxWindow *parent) override; private: }; @@ -33,8 +33,8 @@ public: wxPrintout *printoutForPrinting, wxPrintData *data); - virtual bool Print(bool interactive) wxOVERRIDE; - virtual void DetermineScaling() wxOVERRIDE; + virtual bool Print(bool interactive) override; + virtual void DetermineScaling() override; protected: }; diff --git a/include/wx/qt/private/timer.h b/include/wx/qt/private/timer.h index ab046291c0..6e88bcbb1e 100644 --- a/include/wx/qt/private/timer.h +++ b/include/wx/qt/private/timer.h @@ -23,12 +23,12 @@ class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject public: wxQtTimerImpl( wxTimer* timer ); - virtual bool Start( int millisecs = -1, bool oneShot = false ) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; - virtual bool IsRunning() const wxOVERRIDE; + virtual bool Start( int millisecs = -1, bool oneShot = false ) override; + virtual void Stop() override; + virtual bool IsRunning() const override; protected: - virtual void timerEvent( QTimerEvent * event ) wxOVERRIDE; + virtual void timerEvent( QTimerEvent * event ) override; private: int m_timerId; diff --git a/include/wx/qt/private/treeitemdelegate.h b/include/wx/qt/private/treeitemdelegate.h index 632172f6ec..4ec514c14e 100644 --- a/include/wx/qt/private/treeitemdelegate.h +++ b/include/wx/qt/private/treeitemdelegate.h @@ -27,7 +27,7 @@ public: { } - QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &WXUNUSED(option), const QModelIndex &index) const wxOVERRIDE + QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &WXUNUSED(option), const QModelIndex &index) const override { if ( m_textCtrl != NULL ) destroyEditor(m_textCtrl->GetHandle(), m_currentModelIndex); @@ -38,7 +38,7 @@ public: return m_textCtrl->GetHandle(); } - void destroyEditor(QWidget *WXUNUSED(editor), const QModelIndex &WXUNUSED(index)) const wxOVERRIDE + void destroyEditor(QWidget *WXUNUSED(editor), const QModelIndex &WXUNUSED(index)) const override { if ( m_textCtrl != NULL ) { @@ -48,7 +48,7 @@ public: } } - void setModelData(QWidget *WXUNUSED(editor), QAbstractItemModel *WXUNUSED(model), const QModelIndex &WXUNUSED(index)) const wxOVERRIDE + void setModelData(QWidget *WXUNUSED(editor), QAbstractItemModel *WXUNUSED(model), const QModelIndex &WXUNUSED(index)) const override { // Don't set model data until wx has had a chance to send out events } diff --git a/include/wx/qt/private/treeitemfactory.h b/include/wx/qt/private/treeitemfactory.h index c15cf19d58..2004ad0752 100644 --- a/include/wx/qt/private/treeitemfactory.h +++ b/include/wx/qt/private/treeitemfactory.h @@ -91,7 +91,7 @@ public: qItemDelegate->setItemEditorFactory(this); } - QWidget* createEditor(int WXUNUSED(userType), QWidget* parent) const wxOVERRIDE + QWidget* createEditor(int WXUNUSED(userType), QWidget* parent) const override { if (m_textCtrl != NULL) ClearEditor(); diff --git a/include/wx/qt/private/winevent.h b/include/wx/qt/private/winevent.h index 54db552c44..89b45fec97 100644 --- a/include/wx/qt/private/winevent.h +++ b/include/wx/qt/private/winevent.h @@ -71,7 +71,7 @@ public: { } - virtual Handler *GetHandler() const wxOVERRIDE + virtual Handler *GetHandler() const override { // Only process the signal / event if the wxWindow is not destroyed if ( !wxWindow::QtRetrieveWindowPointer( this ) ) @@ -88,7 +88,7 @@ protected: * wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */ //wxActivateEvent - virtual void changeEvent ( QEvent * event ) wxOVERRIDE + virtual void changeEvent ( QEvent * event ) override { if ( !this->GetHandler() ) return; @@ -100,7 +100,7 @@ protected: } //wxCloseEvent - virtual void closeEvent ( QCloseEvent * event ) wxOVERRIDE + virtual void closeEvent ( QCloseEvent * event ) override { if ( !this->GetHandler() ) return; @@ -112,7 +112,7 @@ protected: } //wxContextMenuEvent - virtual void contextMenuEvent ( QContextMenuEvent * event ) wxOVERRIDE + virtual void contextMenuEvent ( QContextMenuEvent * event ) override { if ( !this->GetHandler() ) return; @@ -127,7 +127,7 @@ protected: //virtual void dropEvent ( QDropEvent * event ) { } //wxMouseEvent - virtual void enterEvent ( QEvent * event ) wxOVERRIDE + virtual void enterEvent ( QEvent * event ) override { if ( !this->GetHandler() ) return; @@ -139,7 +139,7 @@ protected: } //wxFocusEvent. - virtual void focusInEvent ( QFocusEvent * event ) wxOVERRIDE + virtual void focusInEvent ( QFocusEvent * event ) override { if ( !this->GetHandler() ) return; @@ -151,7 +151,7 @@ protected: } //wxFocusEvent. - virtual void focusOutEvent ( QFocusEvent * event ) wxOVERRIDE + virtual void focusOutEvent ( QFocusEvent * event ) override { if ( !this->GetHandler() ) return; @@ -163,7 +163,7 @@ protected: } //wxShowEvent - virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE + virtual void hideEvent ( QHideEvent * event ) override { if ( !this->GetHandler() ) return; @@ -175,7 +175,7 @@ protected: } //wxKeyEvent - virtual void keyPressEvent ( QKeyEvent * event ) wxOVERRIDE + virtual void keyPressEvent ( QKeyEvent * event ) override { if ( !this->GetHandler() ) return; @@ -187,7 +187,7 @@ protected: } //wxKeyEvent - virtual void keyReleaseEvent ( QKeyEvent * event ) wxOVERRIDE + virtual void keyReleaseEvent ( QKeyEvent * event ) override { if ( !this->GetHandler() ) return; @@ -199,7 +199,7 @@ protected: } //wxMouseEvent - virtual void leaveEvent ( QEvent * event ) wxOVERRIDE + virtual void leaveEvent ( QEvent * event ) override { if ( !this->GetHandler() ) return; @@ -211,7 +211,7 @@ protected: } //wxMouseEvent - virtual void mouseDoubleClickEvent ( QMouseEvent * event ) wxOVERRIDE + virtual void mouseDoubleClickEvent ( QMouseEvent * event ) override { if ( !this->GetHandler() ) return; @@ -223,7 +223,7 @@ protected: } //wxMouseEvent - virtual void mouseMoveEvent ( QMouseEvent * event ) wxOVERRIDE + virtual void mouseMoveEvent ( QMouseEvent * event ) override { if ( !this->GetHandler() ) return; @@ -235,7 +235,7 @@ protected: } //wxMouseEvent - virtual void mousePressEvent ( QMouseEvent * event ) wxOVERRIDE + virtual void mousePressEvent ( QMouseEvent * event ) override { if ( !this->GetHandler() ) return; @@ -247,7 +247,7 @@ protected: } //wxMouseEvent - virtual void mouseReleaseEvent ( QMouseEvent * event ) wxOVERRIDE + virtual void mouseReleaseEvent ( QMouseEvent * event ) override { if ( !this->GetHandler() ) return; @@ -259,7 +259,7 @@ protected: } //wxMoveEvent - virtual void moveEvent ( QMoveEvent * event ) wxOVERRIDE + virtual void moveEvent ( QMoveEvent * event ) override { if ( !this->GetHandler() ) return; @@ -271,7 +271,7 @@ protected: } //wxEraseEvent then wxPaintEvent - virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE + virtual void paintEvent ( QPaintEvent * event ) override { if ( !this->GetHandler() ) return; @@ -283,7 +283,7 @@ protected: } //wxSizeEvent - virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE + virtual void resizeEvent ( QResizeEvent * event ) override { if ( !this->GetHandler() ) return; @@ -295,7 +295,7 @@ protected: } //wxShowEvent - virtual void showEvent ( QShowEvent * event ) wxOVERRIDE + virtual void showEvent ( QShowEvent * event ) override { if ( !this->GetHandler() ) return; @@ -307,7 +307,7 @@ protected: } //wxMouseEvent - virtual void wheelEvent ( QWheelEvent * event ) wxOVERRIDE + virtual void wheelEvent ( QWheelEvent * event ) override { if ( !this->GetHandler() ) return; diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h index 1c56331666..f46923d462 100644 --- a/include/wx/qt/radiobox.h +++ b/include/wx/qt/radiobox.h @@ -65,21 +65,21 @@ public: using wxWindowBase::Enable; using wxRadioBoxBase::GetDefaultBorder; - virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; - virtual bool Enable(bool enable = true) wxOVERRIDE; - virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; - virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; + virtual bool Enable(unsigned int n, bool enable = true) override; + virtual bool Enable(bool enable = true) override; + virtual bool Show(unsigned int n, bool show = true) override; + virtual bool Show(bool show = true) override; + virtual bool IsItemEnabled(unsigned int n) const override; + virtual bool IsItemShown(unsigned int n) const override; - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; - virtual void SetSelection(int n) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; + virtual void SetSelection(int n) override; + virtual int GetSelection() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; private: // The 'visual' group box: diff --git a/include/wx/qt/radiobut.h b/include/wx/qt/radiobut.h index 145b97a4ea..4beac077e8 100644 --- a/include/wx/qt/radiobut.h +++ b/include/wx/qt/radiobut.h @@ -32,10 +32,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxRadioButtonNameStr) ); - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; private: QRadioButton *m_qtRadioButton; diff --git a/include/wx/qt/region.h b/include/wx/qt/region.h index a308cb0f25..ca484186dd 100644 --- a/include/wx/qt/region.h +++ b/include/wx/qt/region.h @@ -24,29 +24,29 @@ public: wxRegion(const wxBitmap& bmp); wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); - virtual bool IsEmpty() const wxOVERRIDE; - virtual void Clear() wxOVERRIDE; + virtual bool IsEmpty() const override; + virtual void Clear() override; virtual const QRegion &GetHandle() const; virtual void QtSetRegion(QRegion region); // Hangs on to this region protected: - virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE; + virtual wxGDIRefData *CreateGDIRefData() const override; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override; - 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 DoIsEqual(const wxRegion& region) const override; + virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const override; + virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const override; + virtual wxRegionContain DoContainsRect(const wxRect& rect) const override; - virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE; + virtual bool DoOffset(wxCoord x, wxCoord y) override; - virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; - virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE; + virtual bool DoUnionWithRect(const wxRect& rect) override; + virtual bool DoUnionWithRegion(const wxRegion& region) override; - virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE; - virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE; - virtual bool DoXor(const wxRegion& region) wxOVERRIDE; + virtual bool DoIntersect(const wxRegion& region) override; + virtual bool DoSubtract(const wxRegion& region) override; + virtual bool DoXor(const wxRegion& region) override; virtual bool DoCombine(const wxRegion& rgn, wxRegionOp op); diff --git a/include/wx/qt/scrolbar.h b/include/wx/qt/scrolbar.h index 3f90caf087..c4042a96de 100644 --- a/include/wx/qt/scrolbar.h +++ b/include/wx/qt/scrolbar.h @@ -32,18 +32,18 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxScrollBarNameStr) ); - virtual int GetThumbPosition() const wxOVERRIDE; - virtual int GetThumbSize() const wxOVERRIDE; - virtual int GetPageSize() const wxOVERRIDE; - virtual int GetRange() const wxOVERRIDE; + virtual int GetThumbPosition() const override; + virtual int GetThumbSize() const override; + virtual int GetPageSize() const override; + virtual int GetRange() const override; - virtual void SetThumbPosition(int viewStart) wxOVERRIDE; + virtual void SetThumbPosition(int viewStart) override; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true) wxOVERRIDE; + bool refresh = true) override; QScrollBar *GetQScrollBar() const { return m_qtScrollBar; } - QWidget *GetHandle() const wxOVERRIDE; + QWidget *GetHandle() const override; private: QScrollBar *m_qtScrollBar; diff --git a/include/wx/qt/slider.h b/include/wx/qt/slider.h index 5b6eeedaa1..54339e4a4b 100644 --- a/include/wx/qt/slider.h +++ b/include/wx/qt/slider.h @@ -32,25 +32,25 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxSliderNameStr)); - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int value) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int value) override; - virtual void SetRange(int minValue, int maxValue) wxOVERRIDE; - virtual int GetMin() const wxOVERRIDE; - virtual int GetMax() const wxOVERRIDE; + virtual void SetRange(int minValue, int maxValue) override; + virtual int GetMin() const override; + virtual int GetMax() const override; - virtual void DoSetTickFreq(int freq) wxOVERRIDE; - virtual int GetTickFreq() const wxOVERRIDE; + virtual void DoSetTickFreq(int freq) override; + virtual int GetTickFreq() const override; - virtual void SetLineSize(int lineSize) wxOVERRIDE; - virtual void SetPageSize(int pageSize) wxOVERRIDE; - virtual int GetLineSize() const wxOVERRIDE; - virtual int GetPageSize() const wxOVERRIDE; + virtual void SetLineSize(int lineSize) override; + virtual void SetPageSize(int pageSize) override; + virtual int GetLineSize() const override; + virtual int GetPageSize() const override; - virtual void SetThumbLength(int lenPixels) wxOVERRIDE; - virtual int GetThumbLength() const wxOVERRIDE; + virtual void SetThumbLength(int lenPixels) override; + virtual int GetThumbLength() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; private: QSlider *m_qtSlider; diff --git a/include/wx/qt/spinbutt.h b/include/wx/qt/spinbutt.h index fe69e878a9..20a2f44b9a 100644 --- a/include/wx/qt/spinbutt.h +++ b/include/wx/qt/spinbutt.h @@ -29,11 +29,11 @@ public: long style = wxSP_VERTICAL, const wxString& name = wxSPIN_BUTTON_NAME); - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int val) wxOVERRIDE; - virtual void SetRange(int min, int max) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int val) override; + virtual void SetRange(int min, int max) override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; private: QSpinBox *m_qtSpinBox; diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h index c6f0ca5954..cc09ead932 100644 --- a/include/wx/qt/spinctrl.h +++ b/include/wx/qt/spinctrl.h @@ -29,13 +29,13 @@ public: T min, T max, T initial, T inc, const wxString& name ); - virtual wxString GetTextValue() const wxOVERRIDE; - virtual void SetValue(const wxString&) wxOVERRIDE {} + virtual wxString GetTextValue() const override; + virtual void SetValue(const wxString&) override {} - virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE; - virtual bool GetSnapToTicks() const wxOVERRIDE; + virtual void SetSnapToTicks(bool snap_to_ticks) override; + virtual bool GetSnapToTicks() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void SetSelection(long from, long to) override; virtual void SetValue(T val); void SetRange(T minVal, T maxVal); @@ -46,7 +46,7 @@ public: T GetMax() const; T GetIncrement() const; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: Widget *m_qtSpinBox; @@ -74,10 +74,10 @@ public: long style = wxSP_ARROW_KEYS, int min = 0, int max = 100, int initial = 0, const wxString& name = wxT("wxSpinCtrl")); - virtual int GetBase() const wxOVERRIDE { return m_base; } - virtual bool SetBase(int base) wxOVERRIDE; - virtual void SetValue(const wxString & val) wxOVERRIDE; - virtual void SetValue(int val) wxOVERRIDE { wxSpinCtrlQt::SetValue(val); } + virtual int GetBase() const override { return m_base; } + virtual bool SetBase(int base) override; + virtual void SetValue(const wxString & val) override; + virtual void SetValue(int val) override { wxSpinCtrlQt::SetValue(val); } private: // Common part of all ctors. @@ -116,10 +116,10 @@ public: void SetDigits(unsigned digits); unsigned GetDigits() const; - virtual int GetBase() const wxOVERRIDE { return 10; } - virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } - virtual void SetValue(const wxString & val) wxOVERRIDE; - virtual void SetValue(double val) wxOVERRIDE { wxSpinCtrlQt::SetValue(val); } + virtual int GetBase() const override { return 10; } + virtual bool SetBase(int WXUNUSED(base)) override { return false; } + virtual void SetValue(const wxString & val) override; + virtual void SetValue(double val) override { wxSpinCtrlQt::SetValue(val); } private: wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble ); diff --git a/include/wx/qt/statbmp.h b/include/wx/qt/statbmp.h index 8abdd6b8c4..f581c58d7d 100644 --- a/include/wx/qt/statbmp.h +++ b/include/wx/qt/statbmp.h @@ -30,10 +30,10 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBitmapNameStr)); - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual wxBitmap GetBitmap() const wxOVERRIDE; + virtual void SetBitmap(const wxBitmapBundle& bitmap) override; + virtual wxBitmap GetBitmap() const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: private: diff --git a/include/wx/qt/statbox.h b/include/wx/qt/statbox.h index bec283f6d0..f935fb1ce9 100644 --- a/include/wx/qt/statbox.h +++ b/include/wx/qt/statbox.h @@ -29,12 +29,12 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBoxNameStr)); - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE; + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual wxString GetLabel() const override; protected: diff --git a/include/wx/qt/statline.h b/include/wx/qt/statline.h index bab0b6bb09..258a1f678b 100644 --- a/include/wx/qt/statline.h +++ b/include/wx/qt/statline.h @@ -29,7 +29,7 @@ public: long style = wxLI_HORIZONTAL, const wxString &name = wxASCII_STR(wxStaticLineNameStr) ); - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; private: QFrame *m_qtFrame; diff --git a/include/wx/qt/stattext.h b/include/wx/qt/stattext.h index c17202c85f..7602039e2c 100644 --- a/include/wx/qt/stattext.h +++ b/include/wx/qt/stattext.h @@ -30,13 +30,13 @@ public: long style = 0, const wxString &name = wxASCII_STR(wxStaticTextNameStr) ); - virtual void SetLabel(const wxString& label) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: - virtual wxString WXGetVisibleLabel() const wxOVERRIDE; - virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE; + virtual wxString WXGetVisibleLabel() const override; + virtual void WXSetVisibleLabel(const wxString& str) override; private: QLabel *m_qtLabel; diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h index 710bf4f768..7ce1ae87c6 100644 --- a/include/wx/qt/statusbar.h +++ b/include/wx/qt/statusbar.h @@ -27,18 +27,18 @@ public: long style = wxSTB_DEFAULT_STYLE, const wxString& name = wxASCII_STR(wxStatusBarNameStr)); - virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; - virtual void SetMinHeight(int height) wxOVERRIDE; - virtual int GetBorderX() const wxOVERRIDE; - virtual int GetBorderY() const wxOVERRIDE; + virtual bool GetFieldRect(int i, wxRect& rect) const override; + virtual void SetMinHeight(int height) override; + virtual int GetBorderX() const override; + virtual int GetBorderY() const override; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; QStatusBar *GetQStatusBar() const { return m_qtStatusBar; } - QWidget *GetHandle() const wxOVERRIDE; + QWidget *GetHandle() const override; protected: - virtual void DoUpdateStatusText(int number) wxOVERRIDE; + virtual void DoUpdateStatusText(int number) override; private: void Init(); diff --git a/include/wx/qt/taskbar.h b/include/wx/qt/taskbar.h index 7362568183..beed56b3fa 100644 --- a/include/wx/qt/taskbar.h +++ b/include/wx/qt/taskbar.h @@ -22,9 +22,9 @@ public: // Operations virtual bool SetIcon(const wxBitmapBundle& icon, - const wxString& tooltip = wxEmptyString) wxOVERRIDE; - virtual bool RemoveIcon() wxOVERRIDE; - virtual bool PopupMenu(wxMenu *menu) wxOVERRIDE; + const wxString& tooltip = wxEmptyString) override; + virtual bool RemoveIcon() override; + virtual bool PopupMenu(wxMenu *menu) override; private: QSystemTrayIcon *m_qtSystemTrayIcon; diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h index 48a2e1c8b4..514343addd 100644 --- a/include/wx/qt/textctrl.h +++ b/include/wx/qt/textctrl.h @@ -35,41 +35,41 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxASCII_STR(wxTextCtrlNameStr)); - virtual int GetLineLength(long lineNo) const wxOVERRIDE; - virtual wxString GetLineText(long lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; + virtual int GetLineLength(long lineNo) const override; + virtual wxString GetLineText(long lineNo) const override; + virtual int GetNumberOfLines() const override; - virtual bool IsModified() const wxOVERRIDE; - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; + virtual bool IsModified() const override; + virtual void MarkDirty() override; + virtual void DiscardEdits() override; - 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 bool SetStyle(long start, long end, const wxTextAttr& style) override; + virtual bool GetStyle(long position, wxTextAttr& style) override; + virtual bool SetDefaultStyle(const wxTextAttr& style) override; - virtual long XYToPosition(long x, long y) const wxOVERRIDE; - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; + virtual long XYToPosition(long x, long y) const override; + virtual bool PositionToXY(long pos, long *x, long *y) const override; - virtual void ShowPosition(long pos) wxOVERRIDE; + virtual void ShowPosition(long pos) override; - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual void SetSelection( long from, long to ) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual void SetSelection( long from, long to ) override; + virtual void GetSelection(long *from, long *to) const override; - virtual wxString DoGetValue() const wxOVERRIDE; - virtual void DoSetValue(const wxString &text, int flags = 0) wxOVERRIDE; - virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual wxString DoGetValue() const override; + virtual void DoSetValue(const wxString &text, int flags = 0) override; + virtual void WriteText(const wxString& text) override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; - virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE; - virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE; + virtual bool DoLoadFile(const wxString& file, int fileType) override; + virtual bool DoSaveFile(const wxString& file, int fileType) override; - virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE; + virtual QScrollArea *QtGetScrollBarsContainer() const override; private: wxQtEdit *m_qtEdit; diff --git a/include/wx/qt/textentry.h b/include/wx/qt/textentry.h index d9287a2819..34b2d05305 100644 --- a/include/wx/qt/textentry.h +++ b/include/wx/qt/textentry.h @@ -13,34 +13,34 @@ class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase public: wxTextEntry(); - virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void Remove(long from, long to) override; - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; - virtual void SetInsertionPoint(long pos) wxOVERRIDE; - virtual long GetInsertionPoint() const wxOVERRIDE; - virtual long GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; + virtual long GetInsertionPoint() const override; + virtual long GetLastPosition() const override; - virtual void SetSelection(long from, long to) wxOVERRIDE; - virtual void GetSelection(long *from, long *to) const wxOVERRIDE; + virtual void SetSelection(long from, long to) override; + virtual void GetSelection(long *from, long *to) const override; - virtual bool IsEditable() const wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual bool IsEditable() const override; + virtual void SetEditable(bool editable) override; protected: - virtual wxString DoGetValue() const wxOVERRIDE; - virtual void DoSetValue(const wxString& value, int flags=0) wxOVERRIDE; + virtual wxString DoGetValue() const override; + virtual void DoSetValue(const wxString& value, int flags=0) override; - virtual wxWindow *GetEditableWindow() wxOVERRIDE; + virtual wxWindow *GetEditableWindow() override; }; #endif // _WX_QT_TEXTENTRY_H_ diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h index 31fb1e17bf..f5e9b0e53b 100644 --- a/include/wx/qt/tglbtn.h +++ b/include/wx/qt/tglbtn.h @@ -32,11 +32,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual void SetValue(bool state) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool state) override; + virtual bool GetValue() const override; // implementation only - virtual int QtGetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; } + virtual int QtGetEventType() const override { return wxEVT_TOGGLEBUTTON; } private: wxDECLARE_DYNAMIC_CLASS(wxToggleButton); diff --git a/include/wx/qt/toolbar.h b/include/wx/qt/toolbar.h index d2de81bf70..5a8b1d832f 100644 --- a/include/wx/qt/toolbar.h +++ b/include/wx/qt/toolbar.h @@ -38,15 +38,15 @@ public: long style = wxTB_DEFAULT_STYLE | wxNO_BORDER, const wxString& name = wxASCII_STR(wxToolBarNameStr)); - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const override; - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; - virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; - virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; - virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetToolShortHelp(int id, const wxString& helpString) override; + virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) override; + virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) override; - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; virtual wxToolBarToolBase *CreateTool(int toolid, const wxString& label, @@ -55,22 +55,22 @@ public: wxItemKind kind = wxITEM_NORMAL, wxObject *clientData = NULL, const wxString& shortHelp = wxEmptyString, - const wxString& longHelp = wxEmptyString) wxOVERRIDE; + const wxString& longHelp = wxEmptyString) override; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; - QWidget *GetHandle() const wxOVERRIDE; + const wxString& label) override; + QWidget *GetHandle() const override; // Private, only used by wxFrame. QToolBar *GetQToolBar() const { return m_qtToolBar; } protected: QActionGroup* GetActionGroup(size_t pos); - 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) wxOVERRIDE; - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE; + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) override; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) override; + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) override; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) override; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) override; private: void Init(); diff --git a/include/wx/qt/toplevel.h b/include/wx/qt/toplevel.h index 32fb5802e5..2bf913272d 100644 --- a/include/wx/qt/toplevel.h +++ b/include/wx/qt/toplevel.h @@ -29,22 +29,22 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxASCII_STR(wxFrameNameStr)); - virtual bool Show(bool show = true) wxOVERRIDE; - virtual void Maximize(bool maximize = true) wxOVERRIDE; - virtual void Restore() wxOVERRIDE; - virtual void Iconize(bool iconize = true) wxOVERRIDE; - virtual bool IsMaximized() const wxOVERRIDE; - virtual bool IsIconized() const wxOVERRIDE; + virtual bool Show(bool show = true) override; + virtual void Maximize(bool maximize = true) override; + virtual void Restore() override; + virtual void Iconize(bool iconize = true) override; + virtual bool IsMaximized() const override; + virtual bool IsIconized() const override; - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE; - virtual bool IsFullScreen() const wxOVERRIDE; - virtual void SetTitle(const wxString& title) wxOVERRIDE; - virtual wxString GetTitle() const wxOVERRIDE; - virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + virtual bool IsFullScreen() const override; + virtual void SetTitle(const wxString& title) override; + virtual wxString GetTitle() const override; + virtual void SetIcons(const wxIconBundle& icons) override; // Styles - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual long GetWindowStyleFlag() const wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; + virtual long GetWindowStyleFlag() const override; }; #endif // _WX_QT_TOPLEVEL_H_ diff --git a/include/wx/qt/treectrl.h b/include/wx/qt/treectrl.h index 9744243bf8..b1d8d5248c 100644 --- a/include/wx/qt/treectrl.h +++ b/include/wx/qt/treectrl.h @@ -30,112 +30,112 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxTreeCtrlNameStr)); - virtual unsigned int GetCount() const wxOVERRIDE; + virtual unsigned int GetCount() const override; - virtual unsigned int GetIndent() const wxOVERRIDE; - virtual void SetIndent(unsigned int indent) wxOVERRIDE; + virtual unsigned int GetIndent() const override; + virtual void SetIndent(unsigned int indent) override; - virtual void SetImageList(wxImageList *imageList) wxOVERRIDE; - virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE; + virtual void SetImageList(wxImageList *imageList) override; + virtual void SetStateImageList(wxImageList *imageList) override; - virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxString GetItemText(const wxTreeItemId& item) const override; virtual int GetItemImage(const wxTreeItemId& item, - 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; + wxTreeItemIcon which = wxTreeItemIcon_Normal) const override; + virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const override; + virtual wxColour GetItemTextColour(const wxTreeItemId& item) const override; + virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const override; + virtual wxFont GetItemFont(const wxTreeItemId& item) const override; - virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE; + virtual void SetItemText(const wxTreeItemId& item, const wxString& text) override; virtual void SetItemImage(const wxTreeItemId& item, int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE; - virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE; - 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; + wxTreeItemIcon which = wxTreeItemIcon_Normal) override; + virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) override; + virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) override; + virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) override; + virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true) override; + virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) override; + virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) override; + virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) override; - 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 bool IsVisible(const wxTreeItemId& item) const override; + virtual bool ItemHasChildren(const wxTreeItemId& item) const override; + virtual bool IsExpanded(const wxTreeItemId& item) const override; + virtual bool IsSelected(const wxTreeItemId& item) const override; + virtual bool IsBold(const wxTreeItemId& item) const override; - virtual size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true) const wxOVERRIDE; + virtual size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true) const override; - virtual wxTreeItemId GetRootItem() const wxOVERRIDE; - virtual wxTreeItemId GetSelection() const wxOVERRIDE; - virtual size_t GetSelections(wxArrayTreeItemIds& selections) const wxOVERRIDE; + virtual wxTreeItemId GetRootItem() const override; + virtual wxTreeItemId GetSelection() const override; + virtual size_t GetSelections(wxArrayTreeItemIds& selections) const override; - virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE; - virtual void ClearFocusedItem() wxOVERRIDE; - virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE; + virtual void SetFocusedItem(const wxTreeItemId& item) override; + virtual void ClearFocusedItem() override; + virtual wxTreeItemId GetFocusedItem() const override; - virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxOVERRIDE; - virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, 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 wxOVERRIDE; - virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE; - virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE; + virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const override; + virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const override; + virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetFirstVisibleItem() const override; + virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const override; + virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const override; virtual wxTreeItemId AddRoot(const wxString& text, int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; + wxTreeItemData *data = NULL) override; - virtual void Delete(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE; - virtual void DeleteAllItems() wxOVERRIDE; + virtual void Delete(const wxTreeItemId& item) override; + virtual void DeleteChildren(const wxTreeItemId& item) override; + virtual void DeleteAllItems() override; - 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 Expand(const wxTreeItemId& item) override; + virtual void Collapse(const wxTreeItemId& item) override; + virtual void CollapseAndReset(const wxTreeItemId& item) override; + virtual void Toggle(const wxTreeItemId& item) override; - 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 Unselect() override; + virtual void UnselectAll() override; + virtual void SelectItem(const wxTreeItemId& item, bool select = true) override; + virtual void SelectChildren(const wxTreeItemId& parent) override; - virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE; - virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE; + virtual void EnsureVisible(const wxTreeItemId& item) override; + virtual void ScrollTo(const wxTreeItemId& item) override; - virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)) wxOVERRIDE; - virtual wxTextCtrl *GetEditControl() const wxOVERRIDE; - virtual void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false) wxOVERRIDE; + virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)) override; + virtual wxTextCtrl *GetEditControl() const override; + virtual void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false) override; - virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE; + virtual void SortChildren(const wxTreeItemId& item) override; - virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const wxOVERRIDE; + virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const override; - virtual void SetWindowStyleFlag(long styles) wxOVERRIDE; + virtual void SetWindowStyleFlag(long styles) override; - virtual QWidget *GetHandle() const wxOVERRIDE; + virtual QWidget *GetHandle() const override; protected: - virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE; - virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE; + virtual int DoGetItemState(const wxTreeItemId& item) const override; + virtual void DoSetItemState(const wxTreeItemId& item, int state) override; virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, size_t pos, const wxString& text, int image, int selImage, - wxTreeItemData *data) wxOVERRIDE; + wxTreeItemData *data) override; virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, const wxTreeItemId& idPrevious, const wxString& text, int image = -1, int selImage = -1, - wxTreeItemData *data = NULL) wxOVERRIDE; + wxTreeItemData *data = NULL) override; - virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE; + virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const override; - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; private: void SendDeleteEvent(const wxTreeItemId &item); diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h index 2f4d26aa28..51a5396223 100644 --- a/include/wx/qt/window.h +++ b/include/wx/qt/window.h @@ -76,74 +76,74 @@ public: // Used by all window classes in the widget creation process. void PostCreation( bool generic = true ); - void AddChild( wxWindowBase *child ) wxOVERRIDE; + void AddChild( wxWindowBase *child ) override; - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual bool Show( bool show = true ) override; - virtual void SetLabel(const wxString& label) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; + virtual wxString GetLabel() const override; - virtual void DoEnable( bool enable ) wxOVERRIDE; - virtual void SetFocus() wxOVERRIDE; + virtual void DoEnable( bool enable ) override; + virtual void SetFocus() override; // Parent/Child: static void QtReparent( QWidget *child, QWidget *parent ); - virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE; + virtual bool Reparent( wxWindowBase *newParent ) override; // Z-order - virtual void Raise() wxOVERRIDE; - virtual void Lower() wxOVERRIDE; + virtual void Raise() override; + virtual void Lower() override; // move the mouse to the specified position - virtual void WarpPointer(int x, int y) wxOVERRIDE; + virtual void WarpPointer(int x, int y) override; - virtual void Update() wxOVERRIDE; + virtual void Update() override; virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; - virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetCursor( const wxCursor &cursor ) override; + virtual bool SetFont(const wxFont& font) override; // get the (average) character size for the current font - virtual int GetCharHeight() const wxOVERRIDE; - virtual int GetCharWidth() const wxOVERRIDE; + virtual int GetCharHeight() const override; + virtual int GetCharWidth() const override; virtual void SetScrollbar( int orient, int pos, int thumbvisible, 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; + bool refresh = true ) override; + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) override; + virtual int GetScrollPos( int orient ) const override; + virtual int GetScrollThumb( int orient ) const override; + virtual int GetScrollRange( int orient ) const override; // scroll window to the specified position virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ) wxOVERRIDE; + const wxRect* rect = NULL ) override; // Styles - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual void SetExtraStyle( long exStyle ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; + virtual void SetExtraStyle( long exStyle ) override; - virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE; - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE; - virtual bool CanSetTransparent() wxOVERRIDE { return true; } + virtual bool SetBackgroundStyle(wxBackgroundStyle style) override; + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const override; + virtual bool SetTransparent(wxByte alpha) override; + virtual bool CanSetTransparent() override { return true; } - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; + virtual bool SetForegroundColour(const wxColour& colour) override; - QWidget *GetHandle() const wxOVERRIDE; + QWidget *GetHandle() const override; #if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE; + virtual void SetDropTarget( wxDropTarget *dropTarget ) override; #endif #if wxUSE_ACCEL // accelerators // ------------ - virtual void SetAcceleratorTable( const wxAcceleratorTable& accel ) wxOVERRIDE; + virtual void SetAcceleratorTable( const wxAcceleratorTable& accel ) override; #endif // wxUSE_ACCEL // wxQt implementation internals: @@ -186,34 +186,34 @@ protected: int *x, int *y, int *descent = NULL, int *externalLeading = NULL, - const wxFont *font = NULL) const wxOVERRIDE; + const wxFont *font = NULL) const override; // coordinates translation - virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE; - virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE; + virtual void DoClientToScreen( int *x, int *y ) const override; + virtual void DoScreenToClient( int *x, int *y ) const override; // capture/release the mouse, used by Capture/ReleaseMouse() - virtual void DoCaptureMouse() wxOVERRIDE; - virtual void DoReleaseMouse() wxOVERRIDE; + virtual void DoCaptureMouse() override; + virtual void DoReleaseMouse() override; // retrieve the position/size of the window - virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE; + virtual void DoGetPosition(int *x, int *y) const override; - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) override; + virtual void DoGetSize(int *width, int *height) const override; // same as DoSetSize() for the client size - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; + virtual void DoSetClientSize(int width, int height) override; + virtual void DoGetClientSize(int *width, int *height) const override; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; #if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE; + virtual void DoSetToolTip( wxToolTip *tip ) override; #endif // wxUSE_TOOLTIPS #if wxUSE_MENUS - virtual bool DoPopupMenu(wxMenu *menu, int x, int y) wxOVERRIDE; + virtual bool DoPopupMenu(wxMenu *menu, int x, int y) override; #endif // wxUSE_MENUS // Return the parent to use for children being reparented to us: this is @@ -221,7 +221,7 @@ protected: // itself. virtual QWidget* QtGetParentWidget() const { return GetHandle(); } - virtual bool EnableTouchEvents(int eventsMask) wxOVERRIDE; + virtual bool EnableTouchEvents(int eventsMask) override; QWidget *m_qtWindow; diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h index 5e2f5f9977..22c768ec42 100644 --- a/include/wx/rearrangectrl.h +++ b/include/wx/rearrangectrl.h @@ -97,12 +97,12 @@ 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) wxOVERRIDE; + virtual void Check(unsigned int item, bool check = true) override; int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; - void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - void DoClear() wxOVERRIDE; + void **clientData, wxClientDataType type) override; + void DoDeleteOneItem(unsigned int n) override; + void DoClear() override; private: // swap two items at the given positions in the listbox diff --git a/include/wx/region.h b/include/wx/region.h index 7db620b49d..2aa8a6c2fd 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -201,11 +201,11 @@ protected: virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0; // implement some wxRegionBase pure virtuals in terms of Combine() - 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; + virtual bool DoUnionWithRect(const wxRect& rect) override; + virtual bool DoUnionWithRegion(const wxRegion& region) override; + virtual bool DoIntersect(const wxRegion& region) override; + virtual bool DoSubtract(const wxRegion& region) override; + virtual bool DoXor(const wxRegion& region) override; }; #endif // ports with wxRegion::Combine() diff --git a/include/wx/renderer.h b/include/wx/renderer.h index b51af32176..ef6582093e 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -441,7 +441,7 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE + wxHeaderButtonParams* params = NULL) override { return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } virtual int DrawHeaderButtonContents(wxWindow *win, @@ -449,25 +449,25 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE + wxHeaderButtonParams* params = NULL) override { return m_rendererNative.DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } - virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE + virtual int GetHeaderButtonHeight(wxWindow *win) override { return m_rendererNative.GetHeaderButtonHeight(win); } - virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE + virtual int GetHeaderButtonMargin(wxWindow *win) override { return m_rendererNative.GetHeaderButtonMargin(win); } virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawTreeItemButton(win, dc, rect, flags); } virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawSplitterBorder(win, dc, rect, flags); } virtual void DrawSplitterSash(wxWindow *win, @@ -475,92 +475,92 @@ public: const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags); } virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags); } virtual void DrawDropArrow(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawDropArrow(win, dc, rect, flags); } virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } virtual void DrawCheckMark(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawCheckMark( win, dc, rect, flags ); } - virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) wxOVERRIDE + virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) override { return m_rendererNative.GetCheckBoxSize(win, flags); } - virtual wxSize GetCheckMarkSize(wxWindow *win) wxOVERRIDE + virtual wxSize GetCheckMarkSize(wxWindow *win) override { return m_rendererNative.GetCheckMarkSize(win); } - virtual wxSize GetExpanderSize(wxWindow *win) wxOVERRIDE + virtual wxSize GetExpanderSize(wxWindow *win) override { return m_rendererNative.GetExpanderSize(win); } virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawPushButton( win, dc, rect, flags ); } virtual void DrawCollapseButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawCollapseButton(win, dc, rect, flags); } - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE + virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) override { return m_rendererNative.GetCollapseButtonSize(win, dc); } virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); } virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); } virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawChoice( win, dc, rect, flags); } virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawComboBox( win, dc, rect, flags); } virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); } #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP @@ -568,7 +568,7 @@ public: wxDC& dc, const wxRect& rect, wxTitleBarButton button, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); } #endif // wxHAS_DRAW_TITLE_BAR_BITMAP @@ -577,7 +577,7 @@ public: const wxRect& rect, int value, int max, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_rendererNative.DrawGauge(win, dc, rect, value, max, flags); } virtual void DrawItemText(wxWindow* win, @@ -586,13 +586,13 @@ public: const wxRect& rect, int align = wxALIGN_LEFT | wxALIGN_TOP, int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE + wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) override { m_rendererNative.DrawItemText(win, dc, text, rect, align, flags, ellipsizeMode); } - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) override { return m_rendererNative.GetSplitterParams(win); } - virtual wxRendererVersion GetVersion() const wxOVERRIDE + virtual wxRendererVersion GetVersion() const override { return m_rendererNative.GetVersion(); } protected: diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h index 84dd3b8575..1dd87f402a 100644 --- a/include/wx/ribbon/art.h +++ b/include/wx/ribbon/art.h @@ -423,80 +423,80 @@ public: wxRibbonMSWArtProvider(bool set_colour_scheme = true); virtual ~wxRibbonMSWArtProvider(); - wxRibbonArtProvider* Clone() const wxOVERRIDE; - void SetFlags(long flags) wxOVERRIDE; - long GetFlags() const wxOVERRIDE; + wxRibbonArtProvider* Clone() const override; + void SetFlags(long flags) override; + long GetFlags() const override; - 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; + int GetMetric(int id) const override; + void SetMetric(int id, int new_val) override; + void SetFont(int id, const wxFont& font) override; + wxFont GetFont(int id) const override; + wxColour GetColour(int id) const override; + void SetColour(int id, const wxColor& colour) override; void GetColourScheme(wxColour* primary, wxColour* secondary, - wxColour* tertiary) const wxOVERRIDE; + wxColour* tertiary) const override; void SetColourScheme(const wxColour& primary, const wxColour& secondary, - const wxColour& tertiary) wxOVERRIDE; + const wxColour& tertiary) override; int GetTabCtrlHeight( wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfoArray& pages) wxOVERRIDE; + const wxRibbonPageTabInfoArray& pages) override; void DrawTabCtrlBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawTab(wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfo& tab) wxOVERRIDE; + const wxRibbonPageTabInfo& tab) override; void DrawTabSeparator( wxDC& dc, wxWindow* wnd, const wxRect& rect, - double visibility) wxOVERRIDE; + double visibility) override; void DrawPageBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawScrollButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, - long style) wxOVERRIDE; + long style) override; void DrawPanelBackground( wxDC& dc, wxRibbonPanel* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawGalleryBackground( wxDC& dc, wxRibbonGallery* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawGalleryItemBackground( wxDC& dc, wxRibbonGallery* wnd, const wxRect& rect, - wxRibbonGalleryItem* item) wxOVERRIDE; + wxRibbonGalleryItem* item) override; void DrawMinimisedPanel( wxDC& dc, wxRibbonPanel* wnd, const wxRect& rect, - wxBitmap& bitmap) wxOVERRIDE; + wxBitmap& bitmap) override; void DrawButtonBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawButtonBarButton( wxDC& dc, @@ -506,17 +506,17 @@ public: long state, const wxString& label, const wxBitmap& bitmap_large, - const wxBitmap& bitmap_small) wxOVERRIDE; + const wxBitmap& bitmap_small) override; void DrawToolBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawToolGroupBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawTool( wxDC& dc, @@ -524,17 +524,17 @@ public: const wxRect& rect, const wxBitmap& bitmap, wxRibbonButtonKind kind, - long state) wxOVERRIDE; + long state) override; void DrawToggleButton( wxDC& dc, wxRibbonBar* wnd, const wxRect& rect, - wxRibbonDisplayMode mode) wxOVERRIDE; + wxRibbonDisplayMode mode) override; void DrawHelpButton(wxDC& dc, wxRibbonBar* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void GetBarTabWidth( wxDC& dc, @@ -544,34 +544,34 @@ public: int* ideal, int* small_begin_need_separator, int* small_must_have_separator, - int* minimum) wxOVERRIDE; + int* minimum) override; wxSize GetScrollButtonMinimumSize( wxDC& dc, wxWindow* wnd, - long style) wxOVERRIDE; + long style) override; wxSize GetPanelSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize client_size, - wxPoint* client_offset) wxOVERRIDE; + wxPoint* client_offset) override; wxSize GetPanelClientSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize size, - wxPoint* client_offset) wxOVERRIDE; + wxPoint* client_offset) override; wxRect GetPanelExtButtonArea( wxDC& dc, const wxRibbonPanel* wnd, - wxRect rect) wxOVERRIDE; + wxRect rect) override; wxSize GetGallerySize( wxDC& dc, const wxRibbonGallery* wnd, - wxSize client_size) wxOVERRIDE; + wxSize client_size) override; wxSize GetGalleryClientSize( wxDC& dc, @@ -580,13 +580,13 @@ public: wxPoint* client_offset, wxRect* scroll_up_button, wxRect* scroll_down_button, - wxRect* extension_button) wxOVERRIDE; + wxRect* extension_button) override; wxRect GetPageBackgroundRedrawArea( wxDC& dc, const wxRibbonPage* wnd, wxSize page_old_size, - wxSize page_new_size) wxOVERRIDE; + wxSize page_new_size) override; bool GetButtonBarButtonSize( wxDC& dc, @@ -599,18 +599,18 @@ public: wxSize bitmap_size_small, wxSize* button_size, wxRect* normal_region, - wxRect* dropdown_region) wxOVERRIDE; + wxRect* dropdown_region) override; wxCoord GetButtonBarButtonTextWidth( wxDC& dc, const wxString& label, wxRibbonButtonKind kind, - wxRibbonButtonBarButtonState size) wxOVERRIDE; + wxRibbonButtonBarButtonState size) override; wxSize GetMinimisedPanelMinimumSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize* desired_bitmap_size, - wxDirection* expanded_panel_direction) wxOVERRIDE; + wxDirection* expanded_panel_direction) override; wxSize GetToolSize( wxDC& dc, @@ -619,11 +619,11 @@ public: wxRibbonButtonKind kind, bool is_first, bool is_last, - wxRect* dropdown_region) wxOVERRIDE; + wxRect* dropdown_region) override; - wxRect GetBarToggleButtonArea(const wxRect& rect) wxOVERRIDE; + wxRect GetBarToggleButtonArea(const wxRect& rect) override; - wxRect GetRibbonHelpButtonArea(const wxRect& rect) wxOVERRIDE; + wxRect GetRibbonHelpButtonArea(const wxRect& rect) override; protected: void ReallyDrawTabSeparator(wxWindow* wnd, const wxRect& rect, double visibility); @@ -796,52 +796,52 @@ public: wxRibbonAUIArtProvider(); virtual ~wxRibbonAUIArtProvider(); - wxRibbonArtProvider* Clone() const wxOVERRIDE; + wxRibbonArtProvider* Clone() const override; - wxColour GetColour(int id) const wxOVERRIDE; - void SetColour(int id, const wxColor& colour) wxOVERRIDE; + wxColour GetColour(int id) const override; + void SetColour(int id, const wxColor& colour) override; void SetColourScheme(const wxColour& primary, const wxColour& secondary, - const wxColour& tertiary) wxOVERRIDE; - void SetFont(int id, const wxFont& font) wxOVERRIDE; + const wxColour& tertiary) override; + void SetFont(int id, const wxFont& font) override; wxSize GetScrollButtonMinimumSize( wxDC& dc, wxWindow* wnd, - long style) wxOVERRIDE; + long style) override; void DrawScrollButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, - long style) wxOVERRIDE; + long style) override; wxSize GetPanelSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize client_size, - wxPoint* client_offset) wxOVERRIDE; + wxPoint* client_offset) override; wxSize GetPanelClientSize( wxDC& dc, const wxRibbonPanel* wnd, wxSize size, - wxPoint* client_offset) wxOVERRIDE; + wxPoint* client_offset) override; wxRect GetPanelExtButtonArea( wxDC& dc, const wxRibbonPanel* wnd, - wxRect rect) wxOVERRIDE; + wxRect rect) override; void DrawTabCtrlBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; int GetTabCtrlHeight( wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfoArray& pages) wxOVERRIDE; + const wxRibbonPageTabInfoArray& pages) override; void GetBarTabWidth( wxDC& dc, @@ -851,49 +851,49 @@ public: int* ideal, int* small_begin_need_separator, int* small_must_have_separator, - int* minimum) wxOVERRIDE; + int* minimum) override; void DrawTab(wxDC& dc, wxWindow* wnd, - const wxRibbonPageTabInfo& tab) wxOVERRIDE; + const wxRibbonPageTabInfo& tab) override; void DrawTabSeparator( wxDC& dc, wxWindow* wnd, const wxRect& rect, - double visibility) wxOVERRIDE; + double visibility) override; void DrawPageBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawPanelBackground( wxDC& dc, wxRibbonPanel* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawMinimisedPanel( wxDC& dc, wxRibbonPanel* wnd, const wxRect& rect, - wxBitmap& bitmap) wxOVERRIDE; + wxBitmap& bitmap) override; void DrawGalleryBackground( wxDC& dc, wxRibbonGallery* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawGalleryItemBackground( wxDC& dc, wxRibbonGallery* wnd, const wxRect& rect, - wxRibbonGalleryItem* item) wxOVERRIDE; + wxRibbonGalleryItem* item) override; void DrawButtonBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawButtonBarButton( wxDC& dc, @@ -903,17 +903,17 @@ public: long state, const wxString& label, const wxBitmap& bitmap_large, - const wxBitmap& bitmap_small) wxOVERRIDE; + const wxBitmap& bitmap_small) override; void DrawToolBarBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawToolGroupBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; void DrawTool( wxDC& dc, @@ -921,13 +921,13 @@ public: const wxRect& rect, const wxBitmap& bitmap, wxRibbonButtonKind kind, - long state) wxOVERRIDE; + long state) override; protected: void DrawPartialPanelBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect); void DrawGalleryButton(wxDC& dc, wxRect rect, - wxRibbonGalleryButtonState state, wxBitmap* bitmaps) wxOVERRIDE; + wxRibbonGalleryButtonState state, wxBitmap* bitmaps) override; 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 142e1bab3b..f9949134fe 100644 --- a/include/wx/ribbon/bar.h +++ b/include/wx/ribbon/bar.h @@ -63,7 +63,7 @@ public: , m_page(page) { } - wxEvent *Clone() const wxOVERRIDE { return new wxRibbonBarEvent(*this); } + wxEvent *Clone() const override { return new wxRibbonBarEvent(*this); } wxRibbonPage* GetPage() {return m_page;} void SetPage(wxRibbonPage* page) {m_page = page;} @@ -117,7 +117,7 @@ public: void SetTabCtrlMargins(int left, int right); - void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE; + void SetArtProvider(wxRibbonArtProvider* art) override; bool SetActivePage(size_t page); bool SetActivePage(wxRibbonPage* page); @@ -144,11 +144,11 @@ public: bool ArePanelsShown() const { return m_arePanelsShown; } wxRibbonDisplayMode GetDisplayMode() const { return m_ribbon_state; } - virtual bool HasMultiplePages() const wxOVERRIDE { return true; } + virtual bool HasMultiplePages() const override { return true; } - void SetWindowStyleFlag(long style) wxOVERRIDE; - long GetWindowStyleFlag() const wxOVERRIDE; - virtual bool Realize() wxOVERRIDE; + void SetWindowStyleFlag(long style) override; + long GetWindowStyleFlag() const override; + virtual bool Realize() override; // Implementation only. bool IsToggleButtonHovered() const { return m_toggle_button_hovered; } @@ -163,8 +163,8 @@ public: protected: friend class wxRibbonPage; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const override; + wxBorder GetDefaultBorder() const override { 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 7a57da6913..0bb9ccd41a 100644 --- a/include/wx/ribbon/buttonbar.h +++ b/include/wx/ribbon/buttonbar.h @@ -135,7 +135,7 @@ public: virtual wxRect GetItemRect(int button_id) const; - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; virtual void ClearButtons(); virtual bool DeleteButton(int button_id); virtual void EnableButton(int button_id, bool enable = true); @@ -160,18 +160,18 @@ public: virtual wxRibbonButtonBarButtonBase *GetActiveItem() const; virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const; - virtual void SetArtProvider(wxRibbonArtProvider* art) wxOVERRIDE; - virtual bool IsSizingContinuous() const wxOVERRIDE; + virtual void SetArtProvider(wxRibbonArtProvider* art) override; + virtual bool IsSizingContinuous() const override; - virtual wxSize GetMinSize() const wxOVERRIDE; + virtual wxSize GetMinSize() const override; void SetShowToolTipsForDisabled(bool show); bool GetShowToolTipsForDisabled() const; protected: friend class wxRibbonButtonBarEvent; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const override; + wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); void OnPaint(wxPaintEvent& evt); @@ -183,9 +183,9 @@ protected: void OnMouseUp(wxMouseEvent& evt); virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; void CommonInit(long style); void MakeLayouts(); @@ -194,7 +194,7 @@ protected: wxRibbonButtonBarButtonState target_size); void FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button, wxRibbonButtonBarButtonState size, wxDC& dc); - virtual void UpdateWindowUI(long flags) wxOVERRIDE; + virtual void UpdateWindowUI(long flags) override; wxArrayRibbonButtonBarLayout m_layouts; wxArrayRibbonButtonBarButtonBase m_buttons; @@ -229,7 +229,7 @@ public: , m_bar(bar), m_button(button) { } - wxEvent *Clone() const wxOVERRIDE { return new wxRibbonButtonBarEvent(*this); } + wxEvent *Clone() const override { 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 cf7b9875de..18bdb50c80 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 wxOVERRIDE; - virtual bool Realize() wxOVERRIDE; - virtual bool Layout() wxOVERRIDE; + virtual bool IsSizingContinuous() const override; + virtual bool Realize() override; + virtual bool Layout() override; - virtual bool ScrollLines(int lines) wxOVERRIDE; + virtual bool ScrollLines(int lines) override; bool ScrollPixels(int pixels); void EnsureVisible(const wxRibbonGalleryItem* item); protected: - wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + wxBorder GetDefaultBorder() const override { 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 wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; wxArrayRibbonGalleryItem m_items; wxRibbonGalleryItem* m_selected_item; @@ -140,7 +140,7 @@ public: m_item = e.m_item; } #endif - wxEvent *Clone() const wxOVERRIDE { return new wxRibbonGalleryEvent(*this); } + wxEvent *Clone() const override { 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 cbddb82211..624d0acf18 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) wxOVERRIDE; + void SetArtProvider(wxRibbonArtProvider* art) override; wxBitmap& GetIcon() {return m_icon;} - virtual wxSize GetMinSize() const wxOVERRIDE; + virtual wxSize GetMinSize() const override; void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height); void AdjustRectToIncludeScrollButtons(wxRect* rect) const; bool DismissExpandedPanel(); - virtual bool Realize() wxOVERRIDE; - virtual bool Show(bool show = true) wxOVERRIDE; - virtual bool Layout() wxOVERRIDE; - virtual bool ScrollLines(int lines) wxOVERRIDE; + virtual bool Realize() override; + virtual bool Show(bool show = true) override; + virtual bool Layout() override; + virtual bool ScrollLines(int lines) override; bool ScrollPixels(int pixels); bool ScrollSections(int sections); wxOrientation GetMajorAxis() const; - virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; + virtual void RemoveChild(wxWindowBase *child) override; void HideIfExpanded(); protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const override; + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } - void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) override; 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 c47949f81d..aba5a0ee1e 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) wxOVERRIDE; + void SetArtProvider(wxRibbonArtProvider* art) override; - virtual bool Realize() wxOVERRIDE; - virtual bool Layout() wxOVERRIDE; - virtual wxSize GetMinSize() const wxOVERRIDE; + virtual bool Realize() override; + virtual bool Layout() override; + virtual wxSize GetMinSize() const override; - virtual bool IsSizingContinuous() const wxOVERRIDE; + virtual bool IsSizingContinuous() const override; - virtual void AddChild(wxWindowBase *child) wxOVERRIDE; - virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; + virtual void AddChild(wxWindowBase *child) override; + virtual void RemoveChild(wxWindowBase *child) override; 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 wxOVERRIDE; + virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const override; long GetFlags() { return m_flags; } void HideIfExpanded(); protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual wxSize GetPanelSizerBestSize() const; wxSize GetPanelSizerMinSize() const; - wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } wxSize GetMinNotMinimisedSize() const; virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; - void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) override; 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) wxOVERRIDE; + virtual bool TryAfter(wxEvent& evt) override; void CommonInit(const wxString& label, const wxBitmap& icon, long style); static wxRect GetExpandedPosition(wxRect panel, @@ -150,7 +150,7 @@ public: , m_panel(panel) { } - wxEvent *Clone() const wxOVERRIDE { return new wxRibbonPanelEvent(*this); } + wxEvent *Clone() const override { 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 393613b7ec..a6cd66df71 100644 --- a/include/wx/ribbon/toolbar.h +++ b/include/wx/ribbon/toolbar.h @@ -145,7 +145,7 @@ public: virtual wxRect GetToolRect(int tool_id)const; virtual bool GetToolState(int tool_id)const; - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; virtual void SetRows(int nMin, int nMax = -1); virtual void SetToolClientData(int tool_id, wxObject* clientData); @@ -153,18 +153,18 @@ public: virtual void SetToolHelpString(int tool_id, const wxString& helpString); virtual void SetToolNormalBitmap(int tool_id, const wxBitmap &bitmap); - virtual bool IsSizingContinuous() const wxOVERRIDE; + virtual bool IsSizingContinuous() const override; 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 wxOVERRIDE; + virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const override; protected: friend class wxRibbonToolBarEvent; - virtual wxSize DoGetBestSize() const wxOVERRIDE; - wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const override; + wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); void OnMouseDown(wxMouseEvent& evt); @@ -176,14 +176,14 @@ protected: void OnSize(wxSizeEvent& evt); virtual wxSize DoGetNextSmallerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; virtual wxSize DoGetNextLargerSize(wxOrientation direction, - wxSize relative_to) const wxOVERRIDE; + wxSize relative_to) const override; void CommonInit(long style); void AppendGroup(); wxRibbonToolBarToolGroup* InsertGroup(size_t pos); - virtual void UpdateWindowUI(long flags) wxOVERRIDE; + virtual void UpdateWindowUI(long flags) override; static wxBitmap MakeDisabledBitmap(const wxBitmap& original); @@ -211,7 +211,7 @@ public: , m_bar(bar) { } - wxEvent *Clone() const wxOVERRIDE { return new wxRibbonToolBarEvent(*this); } + wxEvent *Clone() const override { return new wxRibbonToolBarEvent(*this); } wxRibbonToolBar* GetBar() {return m_bar;} void SetBar(wxRibbonToolBar* bar) {m_bar = bar;} diff --git a/include/wx/richtext/richtextbackgroundpage.h b/include/wx/richtext/richtextbackgroundpage.h index 98969bd492..6d1760ef47 100644 --- a/include/wx/richtext/richtextbackgroundpage.h +++ b/include/wx/richtext/richtextbackgroundpage.h @@ -72,8 +72,8 @@ public: wxRichTextAttr* GetAttributes(); /// Data transfer - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; /// Respond to colour swatch click void OnColourSwatch(wxCommandEvent& event); diff --git a/include/wx/richtext/richtextborderspage.h b/include/wx/richtext/richtextborderspage.h index 7c8bf353a3..0c6153e2d2 100644 --- a/include/wx/richtext/richtextborderspage.h +++ b/include/wx/richtext/richtextborderspage.h @@ -73,8 +73,8 @@ public: wxRichTextAttr* GetAttributes(); /// Data transfer - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; /// Updates the synchronization checkboxes to reflect the state of the attributes void UpdateSyncControls(); diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index 598d75d23c..907b6909a4 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -3120,21 +3120,21 @@ public: // Overridables - virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE; + virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) override; - virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) wxOVERRIDE; + virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) override; - virtual void CalculateRange(long start, long& end) wxOVERRIDE; + virtual void CalculateRange(long start, long& end) override; - virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE; + virtual bool DeleteRange(const wxRichTextRange& range) override; - virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE; + virtual wxString GetTextForRange(const wxRichTextRange& range) const override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; - virtual void Dump(wxTextOutputStream& stream) wxOVERRIDE; + virtual void Dump(wxTextOutputStream& stream) override; - virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL) wxOVERRIDE; + virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL) override; // Accessors @@ -3160,18 +3160,18 @@ public: /** Returns @true if this object is composite. */ - virtual bool IsComposite() const wxOVERRIDE { return true; } + virtual bool IsComposite() const override { return true; } /** Returns @true if no user editing can be done inside the object. This returns @true for simple objects, @false for most composite objects, but @true for fields, which if composite, should not be user-edited. */ - virtual bool IsAtomic() const wxOVERRIDE { return false; } + virtual bool IsAtomic() const override { return false; } /** Returns true if the buffer is empty. */ - virtual bool IsEmpty() const wxOVERRIDE { return GetChildCount() == 0; } + virtual bool IsEmpty() const override { return GetChildCount() == 0; } /** Returns the child object at the given character position. @@ -3212,7 +3212,7 @@ public: /** Moves the object recursively, by adding the offset from old to new. */ - virtual void Move(const wxPoint& pt) wxOVERRIDE; + virtual void Move(const wxPoint& pt) override; protected: wxRichTextObjectList m_children; @@ -3241,33 +3241,33 @@ public: // Overridables - virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE; + virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) override; - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; - virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE; + virtual bool DeleteRange(const wxRichTextRange& range) override; - virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE; + virtual wxString GetTextForRange(const wxRichTextRange& range) const override; #if wxUSE_XML - virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE; + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) override; #endif #if wxRICHTEXT_HAVE_DIRECT_OUTPUT - virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) override; #endif #if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT - virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) override; #endif - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("paragraphlayout"); } + virtual wxString GetXMLNodeName() const override { return wxT("paragraphlayout"); } - virtual bool AcceptsFocus() const wxOVERRIDE { return true; } + virtual bool AcceptsFocus() const override { return true; } // Accessors @@ -3296,7 +3296,7 @@ public: */ virtual wxRichTextStyleSheet* GetStyleSheet() const; - virtual bool IsTopLevel() const wxOVERRIDE { return true; } + virtual bool IsTopLevel() const override { return true; } // Operations @@ -3686,7 +3686,7 @@ public: */ virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const; - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextParagraphLayoutBox(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextParagraphLayoutBox(*this); } /** Prepares the content just before insertion (or after buffer reset). @@ -3765,7 +3765,7 @@ public: /** Invalidates the buffer. With no argument, invalidates whole buffer. */ - virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL) wxOVERRIDE; + virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL) override; /** Do the (in)validation for this object only. @@ -3854,21 +3854,21 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("textbox"); } + virtual wxString GetXMLNodeName() const override { return wxT("textbox"); } - virtual bool CanEditProperties() const wxOVERRIDE { return true; } + virtual bool CanEditProperties() const override { return true; } - virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE; + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) override; - virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Box"); } + virtual wxString GetPropertiesMenuLabel() const override { return wxGetTranslation("&Box"); } // Accessors // Operations - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextBox(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextBox(*this); } void Copy(const wxRichTextBox& obj); @@ -3936,32 +3936,32 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("field"); } + virtual wxString GetXMLNodeName() const override { return wxT("field"); } - virtual bool CanEditProperties() const wxOVERRIDE; + virtual bool CanEditProperties() const override; - virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE; + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) override; - virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE; + virtual wxString GetPropertiesMenuLabel() const override; - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } - virtual void CalculateRange(long start, long& end) wxOVERRIDE; + virtual void CalculateRange(long start, long& end) override; /** If a field has children, we don't want the user to be able to edit it. */ - virtual bool IsAtomic() const wxOVERRIDE { return true; } + virtual bool IsAtomic() const override { return true; } - virtual bool IsEmpty() const wxOVERRIDE { return false; } + virtual bool IsEmpty() const override { return false; } - virtual bool IsTopLevel() const wxOVERRIDE; + virtual bool IsTopLevel() const override; // Accessors @@ -3976,7 +3976,7 @@ public: */ virtual bool UpdateField(wxRichTextBuffer* buffer); - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextField(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextField(*this); } void Copy(const wxRichTextField& obj); @@ -4192,7 +4192,7 @@ public: Draw the item, within the given range. Some objects may ignore the range (for example paragraphs) while others must obey it (lines, to implement wrapping) */ - virtual bool Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; /** Lay the item out at the specified position with the given size constraint. @@ -4200,13 +4200,13 @@ public: and @a parentRect is the container that is used to determine a relative size or position (for example if a text box must be 50% of the parent text box). */ - virtual bool Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; /** Returns the object size for the given range. Returns @false if the range is invalid for this object. */ - virtual bool GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; /** Get the size of the field, given the label, font size, and so on. @@ -4216,7 +4216,7 @@ public: /** Returns @true if the display type is wxRICHTEXT_FIELD_STYLE_COMPOSITE, @false otherwise. */ - virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; } + virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const override { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; } /** Sets the text label for fields of this type. @@ -4511,19 +4511,19 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; - virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) wxOVERRIDE; + virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) override; - virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE; + virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) override; - virtual void CalculateRange(long start, long& end) wxOVERRIDE; + virtual void CalculateRange(long start, long& end) override; - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("paragraph"); } + virtual wxString GetXMLNodeName() const override { return wxT("paragraph"); } // Accessors @@ -4539,7 +4539,7 @@ public: */ void Copy(const wxRichTextParagraph& obj); - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextParagraph(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextParagraph(*this); } /** Clears the cached lines. @@ -4695,33 +4695,33 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; - virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) wxOVERRIDE; + virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; - virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE; + virtual wxString GetTextForRange(const wxRichTextRange& range) const override; - virtual wxRichTextObject* DoSplit(long pos) wxOVERRIDE; + virtual wxRichTextObject* DoSplit(long pos) override; - virtual void CalculateRange(long start, long& end) wxOVERRIDE; + virtual void CalculateRange(long start, long& end) override; - virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE; + virtual bool DeleteRange(const wxRichTextRange& range) override; - virtual bool IsEmpty() const wxOVERRIDE { return m_text.empty(); } + virtual bool IsEmpty() const override { return m_text.empty(); } - virtual bool CanMerge(wxRichTextObject* object, wxRichTextDrawingContext& context) const wxOVERRIDE; + virtual bool CanMerge(wxRichTextObject* object, wxRichTextDrawingContext& context) const override; - virtual bool Merge(wxRichTextObject* object, wxRichTextDrawingContext& context) wxOVERRIDE; + virtual bool Merge(wxRichTextObject* object, wxRichTextDrawingContext& context) override; - virtual void Dump(wxTextOutputStream& stream) wxOVERRIDE; + virtual void Dump(wxTextOutputStream& stream) override; - virtual bool CanSplit(wxRichTextDrawingContext& context) const wxOVERRIDE; + virtual bool CanSplit(wxRichTextDrawingContext& context) const override; - virtual wxRichTextObject* Split(wxRichTextDrawingContext& context) wxOVERRIDE; + virtual wxRichTextObject* Split(wxRichTextDrawingContext& context) override; /** Get the first position from pos that has a line break character. @@ -4729,21 +4729,21 @@ public: long GetFirstLineBreakPosition(long pos); /// Does this object take note of paragraph attributes? Text and image objects don't. - virtual bool UsesParagraphAttributes() const wxOVERRIDE { return false; } + virtual bool UsesParagraphAttributes() const override { return false; } #if wxUSE_XML - virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE; + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) override; #endif #if wxRICHTEXT_HAVE_DIRECT_OUTPUT - virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) override; #endif #if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT - virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) override; #endif - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("text"); } + virtual wxString GetXMLNodeName() const override { return wxT("text"); } // Accessors @@ -4763,7 +4763,7 @@ public: void Copy(const wxRichTextPlainText& obj); // Clones the text object. - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextPlainText(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextPlainText(*this); } private: bool DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, wxString& str, wxCoord& x, wxCoord& y, bool selected); @@ -4989,43 +4989,43 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; /** Returns the 'natural' size for this object - the image size. */ - virtual wxTextAttrSize GetNaturalSize() const wxOVERRIDE; + virtual wxTextAttrSize GetNaturalSize() const override; - virtual bool IsEmpty() const wxOVERRIDE { return false; /* !m_imageBlock.IsOk(); */ } + virtual bool IsEmpty() const override { return false; /* !m_imageBlock.IsOk(); */ } - virtual bool CanEditProperties() const wxOVERRIDE { return true; } + virtual bool CanEditProperties() const override { return true; } - virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE; + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) override; - virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Picture"); } + virtual wxString GetPropertiesMenuLabel() const override { return wxGetTranslation("&Picture"); } - virtual bool UsesParagraphAttributes() const wxOVERRIDE { return false; } + virtual bool UsesParagraphAttributes() const override { return false; } #if wxUSE_XML - virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE; + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) override; #endif #if wxRICHTEXT_HAVE_DIRECT_OUTPUT - virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) override; #endif #if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT - virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) override; #endif // Images can be floatable (optionally). - virtual bool IsFloatable() const wxOVERRIDE { return true; } + virtual bool IsFloatable() const override { return true; } - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("image"); } + virtual wxString GetXMLNodeName() const override { return wxT("image"); } // Accessors @@ -5059,7 +5059,7 @@ public: /** Clones the image object. */ - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextImage(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextImage(*this); } /** Creates a cached image at the required size. @@ -5149,7 +5149,7 @@ public: /** Returns the style sheet. */ - virtual wxRichTextStyleSheet* GetStyleSheet() const wxOVERRIDE { return m_styleSheet; } + virtual wxRichTextStyleSheet* GetStyleSheet() const override { return m_styleSheet; } /** Sets the style sheet and sends a notification of the change. @@ -5267,7 +5267,7 @@ public: /** Convenience function to add a paragraph of text. */ - virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) wxOVERRIDE { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); } + virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) override { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); } /** Begin collapsing undo/redo commands. Note that this may not work properly @@ -5607,7 +5607,7 @@ public: // Implementation - virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE; + virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) override; /** Copies the buffer. @@ -5622,7 +5622,7 @@ public: /** Clones the buffer. */ - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextBuffer(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextBuffer(*this); } /** Submits a command to insert paragraphs. @@ -5670,7 +5670,7 @@ public: Dumps contents of buffer for debugging purposes. */ virtual void Dump(); - virtual void Dump(wxTextOutputStream& stream) wxOVERRIDE { wxRichTextParagraphLayoutBox::Dump(stream); } + virtual void Dump(wxTextOutputStream& stream) override { wxRichTextParagraphLayoutBox::Dump(stream); } //@} /** @@ -5944,22 +5944,22 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE; + virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) override; - virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) wxOVERRIDE; + virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) override; - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("cell"); } + virtual wxString GetXMLNodeName() const override { return wxT("cell"); } - virtual bool CanEditProperties() const wxOVERRIDE { return true; } + virtual bool CanEditProperties() const override { return true; } - virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE; + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) override; - virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Cell"); } + virtual wxString GetPropertiesMenuLabel() const override { return wxGetTranslation("&Cell"); } /// Don't allow a cell to be deleted in Defragment - virtual bool IsEmpty() const wxOVERRIDE { return false; } + virtual bool IsEmpty() const override { return false; } // Accessors @@ -5985,7 +5985,7 @@ public: // Operations - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextCell(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextCell(*this); } void Copy(const wxRichTextCell& obj); @@ -6022,55 +6022,55 @@ public: // Overridables - virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) wxOVERRIDE; + virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) override; - virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) wxOVERRIDE; + virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0) override; - virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) wxOVERRIDE; + virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context) override; - virtual wxString GetXMLNodeName() const wxOVERRIDE { return wxT("table"); } + virtual wxString GetXMLNodeName() const override { return wxT("table"); } - virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) wxOVERRIDE; + virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) override; - virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const wxOVERRIDE; + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const override; - virtual bool DeleteRange(const wxRichTextRange& range) wxOVERRIDE; + virtual bool DeleteRange(const wxRichTextRange& range) override; - virtual wxString GetTextForRange(const wxRichTextRange& range) const wxOVERRIDE; + virtual wxString GetTextForRange(const wxRichTextRange& range) const override; #if wxUSE_XML - virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) wxOVERRIDE; + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse) override; #endif #if wxRICHTEXT_HAVE_DIRECT_OUTPUT - virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler) override; #endif #if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT - virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) wxOVERRIDE; + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler) override; #endif - virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) wxOVERRIDE; + virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart) override; - virtual void CalculateRange(long start, long& end) wxOVERRIDE; + virtual void CalculateRange(long start, long& end) override; // Can this object handle the selections of its children? FOr example, a table. - virtual bool HandlesChildSelections() const wxOVERRIDE { return true; } + virtual bool HandlesChildSelections() const override { return true; } /// Returns a selection object specifying the selections between start and end character positions. /// For example, a table would deduce what cells (of range length 1) are selected when dragging across the table. - virtual wxRichTextSelection GetSelection(long start, long end) const wxOVERRIDE; + virtual wxRichTextSelection GetSelection(long start, long end) const override; - virtual bool CanEditProperties() const wxOVERRIDE { return true; } + virtual bool CanEditProperties() const override { return true; } - virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) wxOVERRIDE; + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) override; - virtual wxString GetPropertiesMenuLabel() const wxOVERRIDE { return wxGetTranslation("&Table"); } + virtual wxString GetPropertiesMenuLabel() const override { return wxGetTranslation("&Table"); } // Returns true if objects of this class can accept the focus, i.e. a call to SetFocusObject // is possible. For example, containers supporting text, such as a text box object, can accept the focus, // but a table can't (set the focus to individual cells instead). - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } // Accessors @@ -6169,7 +6169,7 @@ public: virtual bool AddColumns(int startCol, int noCols = 1, const wxRichTextAttr& attr = wxRichTextAttr()); // Makes a clone of this object. - virtual wxRichTextObject* Clone() const wxOVERRIDE { return new wxRichTextTable(*this); } + virtual wxRichTextObject* Clone() const override { return new wxRichTextTable(*this); } // Copies this object. void Copy(const wxRichTextTable& obj); @@ -6358,12 +6358,12 @@ public: /** Performs the command. */ - bool Do() wxOVERRIDE; + bool Do() override; /** Undoes the command. */ - bool Undo() wxOVERRIDE; + bool Undo() override; /** Adds an action to the action list. @@ -6801,16 +6801,16 @@ public: { } // Can we save using this handler? - virtual bool CanSave() const wxOVERRIDE { return true; } + virtual bool CanSave() const override { return true; } // Can we load using this handler? - virtual bool CanLoad() const wxOVERRIDE { return true; } + virtual bool CanLoad() const override { return true; } protected: #if wxUSE_STREAMS - virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) wxOVERRIDE; - virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) wxOVERRIDE; + virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) override; + virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) override; #endif }; @@ -6924,16 +6924,16 @@ public: // base class pure virtuals - virtual wxDataFormat GetPreferredFormat(Direction dir) const wxOVERRIDE; - virtual size_t GetDataSize() const wxOVERRIDE; - virtual bool GetDataHere(void *pBuf) const wxOVERRIDE; - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE; + virtual wxDataFormat GetPreferredFormat(Direction dir) const override; + virtual size_t GetDataSize() const override; + virtual bool GetDataHere(void *pBuf) const override; + virtual bool SetData(size_t len, const void *buf) override; // prevent warnings - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE { return SetData(len, buf); } + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } protected: wxDataFormat m_formatRichTextBuffer; // our custom format @@ -7009,19 +7009,19 @@ public: wxRichTextStdRenderer() {} // Draw a standard bullet, as specified by the value of GetBulletName - virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) wxOVERRIDE; + virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) override; // Draw a bullet that can be described by text, such as numbered or symbol bullets - virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) wxOVERRIDE; + virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) override; // Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName - virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) wxOVERRIDE; + virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) override; // Enumerate the standard bullet names currently supported - virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames) wxOVERRIDE; + virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames) override; // Measure the bullet. - virtual bool MeasureBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, wxSize& sz) wxOVERRIDE; + virtual bool MeasureBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, wxSize& sz) override; // Set a font which may depend on text effects. static void SetFontForBullet(wxRichTextBuffer& buffer, wxDC& dc, const wxRichTextAttr& attr); diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h index 440e7bab2e..9417ced190 100644 --- a/include/wx/richtext/richtextbulletspage.h +++ b/include/wx/richtext/richtextbulletspage.h @@ -67,8 +67,8 @@ public: void UpdatePreview(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Gets the attributes associated with the main formatting dialog wxRichTextAttr* GetAttributes(); diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index cece67b085..609ad7dfec 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -278,32 +278,32 @@ public: The end point of range is specified as the last character position of the span of text, plus one. */ - virtual wxString GetRange(long from, long to) const wxOVERRIDE; + virtual wxString GetRange(long from, long to) const override; /** Returns the length of the specified line in characters. */ - virtual int GetLineLength(long lineNo) const wxOVERRIDE ; + virtual int GetLineLength(long lineNo) const override ; /** Returns the text for the given line. */ - virtual wxString GetLineText(long lineNo) const wxOVERRIDE ; + virtual wxString GetLineText(long lineNo) const override ; /** Returns the number of lines in the buffer. */ - virtual int GetNumberOfLines() const wxOVERRIDE ; + virtual int GetNumberOfLines() const override ; /** Returns @true if the buffer has been modified. */ - virtual bool IsModified() const wxOVERRIDE ; + virtual bool IsModified() const override ; /** Returns @true if the control is editable. */ - virtual bool IsEditable() const wxOVERRIDE ; + virtual bool IsEditable() const override ; /** Returns @true if the control is single-line. @@ -323,7 +323,7 @@ public: of text, plus one. If the return values @a from and @a to are the same, there is no selection. */ - virtual void GetSelection(long* from, long* to) const wxOVERRIDE; + virtual void GetSelection(long* from, long* to) const override; const wxRichTextSelection& GetSelection() const { return m_selection; } wxRichTextSelection& GetSelection() { return m_selection; } //@} @@ -331,7 +331,7 @@ public: /** Returns the text within the current selection range, if any. */ - virtual wxString GetStringSelection() const wxOVERRIDE; + virtual wxString GetStringSelection() const override; /** Gets the current filename associated with the control. @@ -548,18 +548,18 @@ public: /** Clears the buffer content, leaving a single empty paragraph. Cannot be undone. */ - virtual void Clear() wxOVERRIDE; + virtual void Clear() override; /** Replaces the content in the specified range with the string specified by @a value. */ - virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE; + virtual void Replace(long from, long to, const wxString& value) override; /** Removes the content in the specified range. */ - virtual void Remove(long from, long to) wxOVERRIDE; + virtual void Remove(long from, long to) override; #ifdef DOXYGEN /** @@ -583,7 +583,7 @@ public: This function looks for a suitable wxRichTextFileHandler object. */ - virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE; + virtual bool DoLoadFile(const wxString& file, int fileType) override; #endif // wxUSE_FFILE && wxUSE_STREAMS #ifdef DOXYGEN @@ -609,7 +609,7 @@ public: This function looks for a suitable wxRichTextFileHandler object. */ virtual bool DoSaveFile(const wxString& file = wxEmptyString, - int fileType = wxRICHTEXT_TYPE_ANY) wxOVERRIDE; + int fileType = wxRICHTEXT_TYPE_ANY) override; #endif // wxUSE_FFILE && wxUSE_STREAMS /** @@ -630,29 +630,29 @@ public: /** Marks the buffer as modified. */ - virtual void MarkDirty() wxOVERRIDE; + virtual void MarkDirty() override; /** Sets the buffer's modified status to @false, and clears the buffer's command history. */ - virtual void DiscardEdits() wxOVERRIDE; + virtual void DiscardEdits() override; /** Sets the maximum number of characters that may be entered in a single line text control. For compatibility only; currently does nothing. */ - virtual void SetMaxLength(unsigned long WXUNUSED(len)) wxOVERRIDE { } + virtual void SetMaxLength(unsigned long WXUNUSED(len)) override { } /** Writes text at the current position. */ - virtual void WriteText(const wxString& text) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; /** Sets the insertion point to the end of the buffer and writes the text. */ - virtual void AppendText(const wxString& text) wxOVERRIDE; + virtual void AppendText(const wxString& text) override; //@{ /** @@ -668,7 +668,7 @@ public: returning a 2-element list (ok, attr). @endWxPerlOnly */ - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; + virtual bool GetStyle(long position, wxTextAttr& style) override; virtual bool GetStyle(long position, wxRichTextAttr& style); virtual bool GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); //@} @@ -682,7 +682,7 @@ public: So, for example, to set the style for a character at position 5, use the range (5,6). */ - virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) override; virtual bool SetStyle(long start, long end, const wxRichTextAttr& style); virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style); virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style); @@ -764,7 +764,7 @@ public: Sets the current default style, which can be used to change how subsequently inserted text is displayed. */ - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; + virtual bool SetDefaultStyle(const wxTextAttr& style) override; virtual bool SetDefaultStyle(const wxRichTextAttr& style); //@} @@ -879,17 +879,17 @@ public: /** Translates from column and line number to position. */ - virtual long XYToPosition(long x, long y) const wxOVERRIDE; + virtual long XYToPosition(long x, long y) const override; /** Converts a text position to zero-based column and line numbers. */ - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE; + virtual bool PositionToXY(long pos, long *x, long *y) const override; /** Scrolls the buffer so that the given position is in view. */ - virtual void ShowPosition(long pos) wxOVERRIDE; + virtual void ShowPosition(long pos) override; //@{ /** @@ -897,10 +897,10 @@ public: @a pt is in device coords (not adjusted for the client area origin nor for scrolling). */ - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE; + wxTextCoord *row) const override; /** Finds the container at the given point, which is in screen coordinates. @@ -920,18 +920,18 @@ public: /** Copies the selected content (if any) to the clipboard. */ - virtual void Copy() wxOVERRIDE; + virtual void Copy() override; /** Copies the selected content (if any) to the clipboard and deletes the selection. This is undoable. */ - virtual void Cut() wxOVERRIDE; + virtual void Cut() override; /** Pastes content from the clipboard to the buffer. */ - virtual void Paste() wxOVERRIDE; + virtual void Paste() override; /** Deletes the content in the selection, if any. This is undoable. @@ -941,17 +941,17 @@ public: /** Returns @true if selected content can be copied to the clipboard. */ - virtual bool CanCopy() const wxOVERRIDE; + virtual bool CanCopy() const override; /** Returns @true if selected content can be copied to the clipboard and deleted. */ - virtual bool CanCut() const wxOVERRIDE; + virtual bool CanCut() const override; /** Returns @true if the clipboard content can be pasted to the buffer. */ - virtual bool CanPaste() const wxOVERRIDE; + virtual bool CanPaste() const override; /** Returns @true if selected content can be deleted. @@ -961,43 +961,43 @@ public: /** Undoes the command at the top of the command history, if there is one. */ - virtual void Undo() wxOVERRIDE; + virtual void Undo() override; /** Redoes the current command. */ - virtual void Redo() wxOVERRIDE; + virtual void Redo() override; /** Returns @true if there is a command in the command history that can be undone. */ - virtual bool CanUndo() const wxOVERRIDE; + virtual bool CanUndo() const override; /** Returns @true if there is a command in the command history that can be redone. */ - virtual bool CanRedo() const wxOVERRIDE; + virtual bool CanRedo() const override; /** Sets the insertion point and causes the current editing style to be taken from the new position (unlike wxRichTextCtrl::SetCaretPosition). */ - virtual void SetInsertionPoint(long pos) wxOVERRIDE; + virtual void SetInsertionPoint(long pos) override; /** Sets the insertion point to the end of the text control. */ - virtual void SetInsertionPointEnd() wxOVERRIDE; + virtual void SetInsertionPointEnd() override; /** Returns the current insertion point. */ - virtual long GetInsertionPoint() const wxOVERRIDE; + virtual long GetInsertionPoint() const override; /** Returns the last position in the buffer. */ - virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual wxTextPos GetLastPosition() const override; //@{ /** @@ -1008,14 +1008,14 @@ public: So, for example, to set the selection for a character at position 5, use the range (5,6). */ - virtual void SetSelection(long from, long to) wxOVERRIDE; + virtual void SetSelection(long from, long to) override; void SetSelection(const wxRichTextSelection& sel) { m_selection = sel; } //@} /** Makes the control editable, or not. */ - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual void SetEditable(bool editable) override; /** Returns @true if there is a selection and the object containing the selection @@ -1360,7 +1360,7 @@ public: /** Cancels any selection. */ - virtual void SelectNone() wxOVERRIDE; + virtual void SelectNone() override; /** Selects the word at the given character position. @@ -1787,7 +1787,7 @@ public: /** Sends the event to the control. */ - void Command(wxCommandEvent& event) wxOVERRIDE; + void Command(wxCommandEvent& event) override; /** Loads the first dropped file. @@ -1928,7 +1928,7 @@ public: Sets the font, and also the basic and default attributes (see wxRichTextCtrl::SetDefaultStyle). */ - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; /** A helper function setting up scrollbars, for example after a resize. @@ -1963,7 +1963,7 @@ public: virtual void DoWriteText(const wxString& value, int flags = 0); // Should we inherit colours? - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { return false; } /** Internal function to position the visible caret according to the current caret @@ -2001,7 +2001,7 @@ public: Overrides standard refresh in order to provoke delayed image loading. */ virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL ) override; /** Sets the caret position. @@ -2266,7 +2266,7 @@ public: WX_FORWARD_TO_SCROLL_HELPER() // implement wxTextEntry methods - virtual wxString DoGetValue() const wxOVERRIDE; + virtual wxString DoGetValue() const override; /** Do delayed image loading and garbage-collect other images @@ -2286,11 +2286,11 @@ public: protected: // implement the wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual wxWindow *GetEditableWindow() override { return this; } // margins functions - virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE; - virtual wxPoint DoGetMargins() const wxOVERRIDE; + virtual bool DoSetMargins(const wxPoint& pt) override; + virtual wxPoint DoGetMargins() const override; // FIXME: this does not work, it allows this code to compile but will fail // during run-time @@ -2313,11 +2313,11 @@ protected: /** Currently this simply returns @c wxSize(10, 10). */ - virtual wxSize DoGetBestSize() const wxOVERRIDE ; + virtual wxSize DoGetBestSize() const override ; - virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE; + virtual void DoSetValue(const wxString& value, int flags = 0) override; - virtual void DoThaw() wxOVERRIDE; + virtual void DoThaw() override; // Data members @@ -2430,7 +2430,7 @@ public: : wxDropSource(data, tc), m_rtc(tc) {} protected: - bool GiveFeedback(wxDragResult effect) wxOVERRIDE; + bool GiveFeedback(wxDragResult effect) override; wxRichTextCtrl* m_rtc; }; @@ -2441,7 +2441,7 @@ public: wxRichTextDropTarget(wxRichTextCtrl* tc) : wxDropTarget(new wxRichTextBufferDataObject(new wxRichTextBuffer)), m_rtc(tc) {} - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override { if ( !GetData() ) return wxDragNone; @@ -2647,7 +2647,7 @@ public: */ void SetOldContainer(wxRichTextParagraphLayoutBox* container) { m_oldContainer = container; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxRichTextEvent(*this); } + virtual wxEvent *Clone() const override { return new wxRichTextEvent(*this); } protected: int m_flags; diff --git a/include/wx/richtext/richtextfontpage.h b/include/wx/richtext/richtextfontpage.h index f52ee19b44..edc5f0f2e3 100644 --- a/include/wx/richtext/richtextfontpage.h +++ b/include/wx/richtext/richtextfontpage.h @@ -70,8 +70,8 @@ public: void CreateControls(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Updates the font preview void UpdatePreview(); diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h index 7256536f6e..af56a6e122 100644 --- a/include/wx/richtext/richtextformatdlg.h +++ b/include/wx/richtext/richtextformatdlg.h @@ -192,8 +192,8 @@ public: void SetObject(wxRichTextObject* obj) { m_object = obj; } /// Transfers the data and from to the window - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; /// Apply the styles when a different tab is selected, so the previews are /// up to date @@ -312,7 +312,7 @@ public: wxColour& GetColour() { return m_colour; } - virtual wxSize DoGetBestSize() const wxOVERRIDE { return GetSize(); } + virtual wxSize DoGetBestSize() const override { return GetSize(); } protected: wxColour m_colour; @@ -366,7 +366,7 @@ public: protected: /// Returns the HTML for this item - virtual wxString OnGetItem(size_t n) const wxOVERRIDE; + virtual wxString OnGetItem(size_t n) const override; private: diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h index 1db619b0dc..22e0f09f5a 100644 --- a/include/wx/richtext/richtexthtml.h +++ b/include/wx/richtext/richtexthtml.h @@ -31,13 +31,13 @@ public: wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML); /// Can we save using this handler? - virtual bool CanSave() const wxOVERRIDE { return true; } + virtual bool CanSave() const override { return true; } /// Can we load using this handler? - virtual bool CanLoad() const wxOVERRIDE { return false; } + virtual bool CanLoad() const override { return false; } /// Can we handle this filename (if using files)? By default, checks the extension. - virtual bool CanHandle(const wxString& filename) const wxOVERRIDE; + virtual bool CanHandle(const wxString& filename) const override; // Accessors and operations unique to this handler @@ -75,8 +75,8 @@ protected: // Implementation #if wxUSE_STREAMS - virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) wxOVERRIDE; - virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) wxOVERRIDE; + virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) override; + virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) override; /// Output character formatting void BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& paraStyle, wxTextOutputStream& stream ); diff --git a/include/wx/richtext/richtextindentspage.h b/include/wx/richtext/richtextindentspage.h index 8d6bc0e8fb..b2f09d4bcd 100644 --- a/include/wx/richtext/richtextindentspage.h +++ b/include/wx/richtext/richtextindentspage.h @@ -66,8 +66,8 @@ public: void CreateControls(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Updates the paragraph preview void UpdatePreview(); diff --git a/include/wx/richtext/richtextliststylepage.h b/include/wx/richtext/richtextliststylepage.h index d45ba86bfd..0c9c557419 100644 --- a/include/wx/richtext/richtextliststylepage.h +++ b/include/wx/richtext/richtextliststylepage.h @@ -63,8 +63,8 @@ public: void UpdatePreview(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Get attributes for selected level wxRichTextAttr* GetAttributesForSelection(); diff --git a/include/wx/richtext/richtextmarginspage.h b/include/wx/richtext/richtextmarginspage.h index afdc2a09ae..51fd49fd72 100644 --- a/include/wx/richtext/richtextmarginspage.h +++ b/include/wx/richtext/richtextmarginspage.h @@ -72,8 +72,8 @@ public: wxRichTextAttr* GetAttributes(); /// Data transfer - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; ////@begin wxRichTextMarginsPage event handler declarations diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h index 1776d47020..096d75eac9 100644 --- a/include/wx/richtext/richtextprint.h +++ b/include/wx/richtext/richtextprint.h @@ -124,11 +124,11 @@ public: void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect); // wxPrintout virtual functions - virtual bool OnPrintPage(int page) wxOVERRIDE; - virtual bool HasPage(int page) wxOVERRIDE; - virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE; - virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; - virtual void OnPreparePrinting() wxOVERRIDE; + virtual bool OnPrintPage(int page) override; + virtual bool HasPage(int page) override; + virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override; + virtual bool OnBeginDocument(int startPage, int endPage) override; + virtual void OnPreparePrinting() override; private: diff --git a/include/wx/richtext/richtextsizepage.h b/include/wx/richtext/richtextsizepage.h index e9bc149934..64f58ef1c4 100644 --- a/include/wx/richtext/richtextsizepage.h +++ b/include/wx/richtext/richtextsizepage.h @@ -73,8 +73,8 @@ public: wxRichTextAttr* GetAttributes(); /// Data transfer - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; /// Show/hide position controls static void ShowPositionControls(bool show) { sm_showPositionControls = show; } diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h index cf45582cd5..fdb28beb6c 100644 --- a/include/wx/richtext/richtextstyledlg.h +++ b/include/wx/richtext/richtextstyledlg.h @@ -99,8 +99,8 @@ public: void Init(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Set/get style sheet void SetStyleSheet(wxRichTextStyleSheet* sheet) { m_richTextStyleSheet = sheet; } diff --git a/include/wx/richtext/richtextstylepage.h b/include/wx/richtext/richtextstylepage.h index 7d031efc08..b083cc541c 100644 --- a/include/wx/richtext/richtextstylepage.h +++ b/include/wx/richtext/richtextstylepage.h @@ -50,8 +50,8 @@ public: void CreateControls(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Gets the attributes associated with the main formatting dialog wxRichTextAttr* GetAttributes(); diff --git a/include/wx/richtext/richtextstyles.h b/include/wx/richtext/richtextstyles.h index 44cd9a2ca4..0c421a9a82 100644 --- a/include/wx/richtext/richtextstyles.h +++ b/include/wx/richtext/richtextstyles.h @@ -140,7 +140,7 @@ public: virtual ~wxRichTextCharacterStyleDefinition() {} /// Clones the object - virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextCharacterStyleDefinition(*this); } + virtual wxRichTextStyleDefinition* Clone() const override { return new wxRichTextCharacterStyleDefinition(*this); } protected: }; @@ -178,7 +178,7 @@ public: bool operator ==(const wxRichTextParagraphStyleDefinition& def) const; /// Clones the object - virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextParagraphStyleDefinition(*this); } + virtual wxRichTextStyleDefinition* Clone() const override { return new wxRichTextParagraphStyleDefinition(*this); } protected: @@ -215,7 +215,7 @@ public: bool operator ==(const wxRichTextListStyleDefinition& def) const; /// Clones the object - virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextListStyleDefinition(*this); } + virtual wxRichTextStyleDefinition* Clone() const override { return new wxRichTextListStyleDefinition(*this); } /// Sets/gets the attributes for the given level void SetLevelAttributes(int i, const wxRichTextAttr& attr); @@ -281,7 +281,7 @@ public: bool operator ==(const wxRichTextBoxStyleDefinition& def) const; /// Clones the object - virtual wxRichTextStyleDefinition* Clone() const wxOVERRIDE { return new wxRichTextBoxStyleDefinition(*this); } + virtual wxRichTextStyleDefinition* Clone() const override { return new wxRichTextBoxStyleDefinition(*this); } protected: }; @@ -553,7 +553,7 @@ public: protected: /// Returns the HTML for this item - virtual wxString OnGetItem(size_t n) const wxOVERRIDE; + virtual wxString OnGetItem(size_t n) const override; private: @@ -653,23 +653,23 @@ private: class wxRichTextStyleComboPopup : public wxRichTextStyleListBox, public wxComboPopup { public: - virtual void Init() wxOVERRIDE + virtual void Init() override { m_itemHere = -1; // hot item in list m_value = -1; } - virtual bool Create( wxWindow* parent ) wxOVERRIDE; + virtual bool Create( wxWindow* parent ) override; - virtual wxWindow *GetControl() wxOVERRIDE { return this; } + virtual wxWindow *GetControl() override { return this; } - virtual void SetStringValue( const wxString& s ) wxOVERRIDE; + virtual void SetStringValue( const wxString& s ) override; - virtual wxString GetStringValue() const wxOVERRIDE; + virtual wxString GetStringValue() const override; /// Can we set the selection based on the editor caret position? // virtual bool CanAutoSetSelection() { return ((m_combo == NULL) || !m_combo->IsPopupShown()); } - virtual bool CanAutoSetSelection() wxOVERRIDE { return false; } + virtual bool CanAutoSetSelection() override { return false; } // // Popup event handlers diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h index 0096e51361..8e58328d32 100644 --- a/include/wx/richtext/richtextsymboldlg.h +++ b/include/wx/richtext/richtextsymboldlg.h @@ -103,7 +103,7 @@ public: static void SetShowToolTips(bool show) { sm_showToolTips = show; } /// Data transfer - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; ////@begin wxSymbolPickerDialog event handler declarations @@ -231,7 +231,7 @@ public: // --------- // set the current font - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; // set Unicode/ASCII mode void SetUnicodeMode(bool unicodeMode); @@ -276,7 +276,7 @@ public: // change the background colour of the selected cells void SetSelectionBackground(const wxColour& col); - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -297,7 +297,7 @@ protected: virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const; // gets the line height - virtual wxCoord OnGetRowHeight(size_t line) const wxOVERRIDE; + virtual wxCoord OnGetRowHeight(size_t line) const override; // event handlers void OnPaint(wxPaintEvent& event); diff --git a/include/wx/richtext/richtexttabspage.h b/include/wx/richtext/richtexttabspage.h index 5f6e8a5a63..4e784414a5 100644 --- a/include/wx/richtext/richtexttabspage.h +++ b/include/wx/richtext/richtexttabspage.h @@ -64,8 +64,8 @@ public: void Init(); /// Transfer data from/to window - virtual bool TransferDataFromWindow() wxOVERRIDE; - virtual bool TransferDataToWindow() wxOVERRIDE; + virtual bool TransferDataFromWindow() override; + virtual bool TransferDataToWindow() override; /// Sorts the tab array virtual void SortTabs(); diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h index 979fa09e88..67b76b6830 100644 --- a/include/wx/richtext/richtextxml.h +++ b/include/wx/richtext/richtextxml.h @@ -202,10 +202,10 @@ public: virtual wxRichTextObject* CreateObjectForXMLName(wxRichTextObject* parent, const wxString& name) const; /// Can we save using this handler? - virtual bool CanSave() const wxOVERRIDE { return true; } + virtual bool CanSave() const override { return true; } /// Can we load using this handler? - virtual bool CanLoad() const wxOVERRIDE { return true; } + virtual bool CanLoad() const override { return true; } /// Returns the XML helper object, implementing functionality /// that can be reused elsewhere. @@ -226,8 +226,8 @@ public: protected: #if wxUSE_STREAMS - virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) wxOVERRIDE; - virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) wxOVERRIDE; + virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) override; + virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) override; #endif wxRichTextXMLHelper m_helper; diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h index da3417176b..b8463382d1 100644 --- a/include/wx/sckaddr.h +++ b/include/wx/sckaddr.h @@ -115,14 +115,14 @@ class WXDLLIMPEXP_NET wxIPV4address : public wxIPaddress { public: // implement wxSockAddress pure virtuals: - virtual Family Type() wxOVERRIDE { return IPV4; } - virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxIPV4address(*this); } + virtual Family Type() override { return IPV4; } + virtual wxSockAddress *Clone() const override { return new wxIPV4address(*this); } // implement wxIPaddress pure virtuals: - virtual bool IsLocalHost() const wxOVERRIDE; + virtual bool IsLocalHost() const override; - virtual wxString IPAddress() const wxOVERRIDE; + virtual wxString IPAddress() const override; // IPv4-specific methods: @@ -134,7 +134,7 @@ public: bool BroadcastAddress(); private: - virtual void DoInitImpl() wxOVERRIDE; + virtual void DoInitImpl() override; wxDECLARE_DYNAMIC_CLASS(wxIPV4address); }; @@ -147,14 +147,14 @@ class WXDLLIMPEXP_NET wxIPV6address : public wxIPaddress { public: // implement wxSockAddress pure virtuals: - virtual Family Type() wxOVERRIDE { return IPV6; } - virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxIPV6address(*this); } + virtual Family Type() override { return IPV6; } + virtual wxSockAddress *Clone() const override { return new wxIPV6address(*this); } // implement wxIPaddress pure virtuals: - virtual bool IsLocalHost() const wxOVERRIDE; + virtual bool IsLocalHost() const override; - virtual wxString IPAddress() const wxOVERRIDE; + virtual wxString IPAddress() const override; // IPv6-specific methods: bool Hostname(unsigned char addr[16]); @@ -162,7 +162,7 @@ public: using wxIPaddress::Hostname; private: - virtual void DoInitImpl() wxOVERRIDE; + virtual void DoInitImpl() override; wxDECLARE_DYNAMIC_CLASS(wxIPV6address); }; @@ -183,8 +183,8 @@ public: void Filename(const wxString& name); wxString Filename() const; - virtual Family Type() wxOVERRIDE { return UNIX; } - virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxUNIXaddress(*this); } + virtual Family Type() override { return UNIX; } + virtual wxSockAddress *Clone() const override { return new wxUNIXaddress(*this); } private: wxSockAddressImpl& GetUNIX(); diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 4f050d0ce7..ebe23a996e 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) wxOVERRIDE; - virtual bool StartAdvise(const wxString& item) wxOVERRIDE; - virtual bool StopAdvise(const wxString& item) wxOVERRIDE; - virtual bool Disconnect() wxOVERRIDE; + wxIPCFormat format = wxIPC_TEXT) override; + virtual bool StartAdvise(const wxString& item) override; + virtual bool StopAdvise(const wxString& item) override; + virtual bool Disconnect() override; // 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) wxOVERRIDE; + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override; virtual bool DoPoke(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; + wxIPCFormat format) override; virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; + wxIPCFormat format) override; // 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) wxOVERRIDE; + virtual bool Create(const wxString& serverName) override; - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override; protected: wxSocketServer *m_server; @@ -140,15 +140,15 @@ class WXDLLIMPEXP_NET wxTCPClient : public wxClientBase public: wxTCPClient(); - virtual bool ValidHost(const wxString& host) wxOVERRIDE; + virtual bool ValidHost(const wxString& host) override; // Call this to make a connection. Returns NULL if cannot. virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, - const wxString& topic) wxOVERRIDE; + const wxString& topic) override; // Callbacks to CLIENT - override at will - virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE; + virtual wxConnectionBase *OnMakeConnection() override; private: wxDECLARE_DYNAMIC_CLASS(wxTCPClient); diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h index f90a2feeec..307d7a3bb5 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) wxOVERRIDE; + size_t OnSysWrite(const void *buffer, size_t bufsize) override; // socket streams are both un-seekable and size-less streams: - wxFileOffset OnSysTell() const wxOVERRIDE + wxFileOffset OnSysTell() const override { return wxInvalidOffset; } - wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) wxOVERRIDE + wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) override { 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) wxOVERRIDE; + size_t OnSysRead(void *buffer, size_t bufsize) override; // socket streams are both un-seekable and size-less streams: - wxFileOffset OnSysTell() const wxOVERRIDE + wxFileOffset OnSysTell() const override { return wxInvalidOffset; } - wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) wxOVERRIDE + wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) override { return wxInvalidOffset; } wxDECLARE_NO_COPY_CLASS(wxSocketInputStream); diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index 9bd54be58a..a647039829 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -53,7 +53,7 @@ public: virtual void SetThumbPosition(int viewStart) = 0; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true) wxOVERRIDE = 0; + bool refresh = true) override = 0; // implementation-only bool IsNeeded() const { return GetRange() > GetThumbSize(); } diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 69920c80d8..9786dc00b1 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -219,7 +219,7 @@ public: void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; } wxRect GetTargetRect() const { return m_rectToScroll; } - virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; + virtual void DoPrepareDC(wxDC& dc) override; // are we generating the autoscroll events? bool IsAutoScrolling() const { return m_timerAutoScroll != NULL; } @@ -355,13 +355,13 @@ protected: // methods to corresponding wxScrollHelper methods #define WX_FORWARD_TO_SCROLL_HELPER() \ public: \ - virtual void PrepareDC(wxDC& dc) wxOVERRIDE { DoPrepareDC(dc); } \ - virtual bool Layout() wxOVERRIDE { return ScrollLayout(); } \ - virtual bool CanScroll(int orient) const wxOVERRIDE \ + virtual void PrepareDC(wxDC& dc) override { DoPrepareDC(dc); } \ + virtual bool Layout() override { return ScrollLayout(); } \ + virtual bool CanScroll(int orient) const override \ { return IsScrollbarShown(orient); } \ - virtual void DoSetVirtualSize(int x, int y) wxOVERRIDE \ + virtual void DoSetVirtualSize(int x, int y) override \ { ScrollDoSetVirtualSize(x, y); } \ - virtual wxSize GetBestVirtualSize() const wxOVERRIDE \ + virtual wxSize GetBestVirtualSize() const override \ { return ScrollGetBestVirtualSize(); } // include the declaration of the real wxScrollHelper @@ -457,13 +457,13 @@ public: #ifdef __WXMSW__ // we need to return a special WM_GETDLGCODE value to process just the // arrows but let the other navigation characters through - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override { return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam)); } // Take into account the scroll origin. - virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const wxOVERRIDE + virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const override { CalcUnscrolledPosition(*xOrg, *yOrg, xOrg, yOrg); } @@ -472,7 +472,7 @@ public: WX_FORWARD_TO_SCROLL_HELPER() protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE + virtual wxSize DoGetBestSize() const override { return FilterBestSize(this, this, T::DoGetBestSize()); } diff --git a/include/wx/sharedptr.h b/include/wx/sharedptr.h index b9db5c8c38..2513647dec 100644 --- a/include/wx/sharedptr.h +++ b/include/wx/sharedptr.h @@ -126,7 +126,7 @@ private: struct reftype_with_deleter : public reftype { reftype_with_deleter(T* ptr, Deleter d) : reftype(ptr), m_deleter(d) {} - virtual void delete_ptr() wxOVERRIDE { m_deleter(this->m_ptr); } + virtual void delete_ptr() override { m_deleter(this->m_ptr); } Deleter m_deleter; }; diff --git a/include/wx/simplebook.h b/include/wx/simplebook.h index bbb593c10c..c9b6b2ac1d 100644 --- a/include/wx/simplebook.h +++ b/include/wx/simplebook.h @@ -96,7 +96,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE + int imageId = NO_IMAGE) override { if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) return false; @@ -109,19 +109,19 @@ public: return true; } - virtual int SetSelection(size_t n) wxOVERRIDE + virtual int SetSelection(size_t n) override { return DoSetSelection(n, SetSelection_SendEvent); } - virtual int ChangeSelection(size_t n) wxOVERRIDE + virtual int ChangeSelection(size_t n) override { 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) wxOVERRIDE + virtual bool SetPageText(size_t n, const wxString& strText) override { wxCHECK_MSG( n < GetPageCount(), false, wxS("Invalid page") ); @@ -130,25 +130,25 @@ public: return true; } - virtual wxString GetPageText(size_t n) const wxOVERRIDE + virtual wxString GetPageText(size_t n) const override { wxCHECK_MSG( n < GetPageCount(), wxString(), wxS("Invalid page") ); return m_pageTexts[n]; } - virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) wxOVERRIDE + virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) override { return false; } - virtual int GetPageImage(size_t WXUNUSED(n)) const wxOVERRIDE + virtual int GetPageImage(size_t WXUNUSED(n)) const override { return NO_IMAGE; } // Override some wxWindow methods too. - virtual void SetFocus() wxOVERRIDE + virtual void SetFocus() override { wxWindow* const page = GetCurrentPage(); if ( page ) @@ -156,24 +156,24 @@ public: } protected: - virtual void UpdateSelectedPage(size_t WXUNUSED(newsel)) wxOVERRIDE + virtual void UpdateSelectedPage(size_t WXUNUSED(newsel)) override { // Nothing to do here, but must be overridden to avoid the assert in // the base class version. } - virtual wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE + virtual wxBookCtrlEvent* CreatePageChangingEvent() const override { return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING, GetId()); } - virtual void MakeChangedEvent(wxBookCtrlEvent& event) wxOVERRIDE + virtual void MakeChangedEvent(wxBookCtrlEvent& event) override { event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED); } - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE + virtual wxWindow *DoRemovePage(size_t page) override { wxWindow* const win = wxBookCtrlBase::DoRemovePage(page); if ( win ) @@ -186,14 +186,14 @@ protected: return win; } - virtual void DoSize() wxOVERRIDE + virtual void DoSize() override { wxWindow* const page = GetCurrentPage(); if ( page ) page->SetSize(GetPageRect()); } - virtual void DoShowPage(wxWindow* page, bool show) wxOVERRIDE + virtual void DoShowPage(wxWindow* page, bool show) override { if ( show ) page->ShowWithEffect(m_showEffect, m_showTimeout); diff --git a/include/wx/sizer.h b/include/wx/sizer.h index b880b8c245..799a0ee8fb 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -789,8 +789,8 @@ public: wxGridSizer( int rows, int cols, int vgap, int hgap ); wxGridSizer( int rows, int cols, const wxSize& gap ); - virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; + virtual void RepositionChildren(const wxSize& minSize) override; + virtual wxSize CalcMin() override; void SetCols( int cols ) { @@ -828,7 +828,7 @@ protected: int m_vgap; int m_hgap; - virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) wxOVERRIDE; + virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) override; void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ); @@ -920,8 +920,8 @@ public: const wxArrayInt& GetColWidths() const { return m_colWidths; } // implementation - virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; + virtual void RepositionChildren(const wxSize& minSize) override; + virtual wxSize CalcMin() override; protected: void AdjustForFlexDirection(); @@ -966,7 +966,7 @@ public: wxT("invalid value for wxBoxSizer orientation") ); } - virtual wxSizerItem *AddSpacer(int size) wxOVERRIDE; + virtual wxSizerItem *AddSpacer(int size) override; int GetOrientation() const { return m_orient; } @@ -975,16 +975,16 @@ public: void SetOrientation(int orient) { m_orient = orient; } // implementation of our resizing logic - virtual wxSize CalcMin() wxOVERRIDE; - virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE; + virtual wxSize CalcMin() override; + virtual void RepositionChildren(const wxSize& minSize) override; virtual bool InformFirstDirection(int direction, int size, - int availableOtherDir) wxOVERRIDE; + int availableOtherDir) override; protected: // Only overridden to perform extra debugging checks. - virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) wxOVERRIDE; + virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item) override; // helpers for our code: this returns the component of the given wxSize in // the direction of the sizer and in the other direction, respectively @@ -1057,19 +1057,19 @@ public: wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString); virtual ~wxStaticBoxSizer(); - virtual wxSize CalcMin() wxOVERRIDE; - virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE; + virtual wxSize CalcMin() override; + virtual void RepositionChildren(const wxSize& minSize) override; wxStaticBox *GetStaticBox() const { return m_staticBox; } // override to hide/show the static box as well - virtual void ShowItems (bool show) wxOVERRIDE; - virtual bool AreAnyItemsShown() const wxOVERRIDE; + virtual void ShowItems (bool show) override; + virtual bool AreAnyItemsShown() const override; - 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); } + virtual bool Detach( wxWindow *window ) override; + virtual bool Detach( wxSizer *sizer ) override { return wxBoxSizer::Detach(sizer); } + virtual bool Detach( int index ) override { return wxBoxSizer::Detach(index); } protected: wxStaticBox *m_staticBox; diff --git a/include/wx/slider.h b/include/wx/slider.h index be992e4746..90713a62d4 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -104,7 +104,7 @@ protected: virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ } // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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 971364c7e3..74449f64e4 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -420,8 +420,8 @@ public: { return (wxSocketBase *) GetEventObject(); } void *GetClientData() const { return m_clientData; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSocketEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_SOCKET; } + virtual wxEvent *Clone() const override { return new wxSocketEvent(*this); } + virtual wxEventCategory GetEventCategory() const override { return wxEVT_CATEGORY_SOCKET; } public: wxSocketNotify m_event; diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 5204b95261..9e0e1c3ac9 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -112,7 +112,7 @@ public: int GetPosition() const { return m_commandInt; } void SetPosition(int pos) { m_commandInt = pos; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxSpinEvent(*this); } + virtual wxEvent *Clone() const override { return new wxSpinEvent(*this); } private: wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent); diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index 42d2af59c4..8e04da5049 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 wxOVERRIDE { return new wxSpinDoubleEvent(*this); } + virtual wxEvent *Clone() const override { return new wxSpinDoubleEvent(*this); } protected: double m_value; diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index bd46a27e2f..10546ddab1 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -83,12 +83,12 @@ public: virtual wxString GetDescriptiveText() const = 0; #if wxUSE_NATIVE_SEARCH_CONTROL - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } #endif // wxUSE_NATIVE_SEARCH_CONTROL private: // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual wxWindow *GetEditableWindow() override { return this; } }; diff --git a/include/wx/sstream.h b/include/wx/sstream.h index 865acd3dea..f2e7a2d5a3 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 wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return true; } + virtual wxFileOffset GetLength() const override; + virtual bool IsSeekable() const override { return true; } protected: - virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; + virtual size_t OnSysRead(void *buffer, size_t size) override; private: // the string that was passed in the ctor @@ -68,11 +68,11 @@ public: // get the string containing current output const wxString& GetString() const { return *m_str; } - virtual bool IsSeekable() const wxOVERRIDE { return true; } + virtual bool IsSeekable() const override { return true; } protected: - virtual wxFileOffset OnSysTell() const wxOVERRIDE; - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + virtual wxFileOffset OnSysTell() const override; + virtual size_t OnSysWrite(const void *buffer, size_t size) override; private: // internal string, not used if caller provided his own string diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 07817d67be..50c55005db 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -47,14 +47,14 @@ public: virtual ScaleMode GetScaleMode() const { return Scale_None; } // overridden base class virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool AcceptsFocus() const override { return false; } + virtual bool HasTransparentBackground() override { return true; } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // Bitmap bundle passed to ctor or SetBitmap(). wxBitmapBundle m_bitmapBundle; diff --git a/include/wx/statbox.h b/include/wx/statbox.h index d5d15a9f00..84bfe25df3 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -30,8 +30,8 @@ public: wxStaticBoxBase(); // overridden base class virtuals - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool HasTransparentBackground() override { return true; } + virtual bool Enable(bool enable = true) override; // implementation only: this is used by wxStaticBoxSizer to account for the // need for extra space taken by the static box @@ -48,7 +48,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // If non-null, the window used as our label. This window is owned by the // static box and will be deleted when it is. diff --git a/include/wx/statline.h b/include/wx/statline.h index 49023d58ba..70682e5dcc 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 wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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 wxOVERRIDE + virtual wxSize DoGetBestSize() const override { return AdjustSize(wxDefaultSize); } diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 369ab6dc87..f07a7fc12e 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -42,8 +42,8 @@ public: void Wrap(int width); // overridden base virtuals - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool AcceptsFocus() const override { return false; } + virtual bool HasTransparentBackground() override { return true; } bool IsEllipsized() const { @@ -53,7 +53,7 @@ public: protected: // functions required for wxST_ELLIPSIZE_* support // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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 375ee8dfc0..d723bcd797 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 wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } // the client size of a toplevel window doesn't include the status bar - virtual bool CanBeOutsideClientArea() const wxOVERRIDE { return true; } + virtual bool CanBeOutsideClientArea() const override { 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 ) wxOVERRIDE + virtual void DoSetToolTip( wxToolTip *tip ) override { 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 wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // internal helpers & data: diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index c78e8ce0bc..3b8f3153ec 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -2943,14 +2943,14 @@ public: int GetStyleAt(int pos) const; // Redoes the next action on the undo history. - void Redo() wxOVERRIDE; + void Redo() override; // Choose between collecting actions into the undo // history and discarding them. void SetUndoCollection(bool collectUndo); // Select all the text in the document. - void SelectAll() wxOVERRIDE; + void SelectAll() override; // Remember the current position in the undo history as the position // at which the document was saved. @@ -2960,7 +2960,7 @@ public: wxMemoryBuffer GetStyledText(int startPos, int endPos); // Are there any redoable actions in the undo history? - bool CanRedo() const wxOVERRIDE; + bool CanRedo() const override; // Retrieve the line number at which a particular marker is located. int MarkerLineFromHandle(int markerHandle); @@ -3636,28 +3636,28 @@ public: void SetReadOnly(bool readOnly); // Will a paste succeed? - bool CanPaste() const wxOVERRIDE; + bool CanPaste() const override; // Are there any undoable actions in the undo history? - bool CanUndo() const wxOVERRIDE; + bool CanUndo() const override; // Delete the undo history. - void EmptyUndoBuffer() wxOVERRIDE; + void EmptyUndoBuffer() override; // Undo one action in the undo history. - void Undo() wxOVERRIDE; + void Undo() override; // Cut the selection to the clipboard. - void Cut() wxOVERRIDE; + void Cut() override; // Copy the selection to the clipboard. - void Copy() wxOVERRIDE; + void Copy() override; // Paste the contents of the clipboard into the document replacing the selection. - void Paste() wxOVERRIDE; + void Paste() override; // Clear the selection. - void Clear() wxOVERRIDE; + void Clear() override; // Replace the contents of the document with the argument text. void SetText(const wxString& text); @@ -3952,7 +3952,7 @@ public: bool GetUseVerticalScrollBar() const; // Append a string to the end of the document without changing the selection. - void AppendText(const wxString& text) wxOVERRIDE; + void AppendText(const wxString& text) override; // Is drawing done in two phases with backgrounds drawn before foregrounds? bool GetTwoPhaseDraw() const; @@ -5254,16 +5254,16 @@ public: // implement wxTextEntryBase pure virtual methods // ---------------------------------------------- - virtual void WriteText(const wxString& text) wxOVERRIDE + virtual void WriteText(const wxString& text) override { ReplaceSelection(text); } - virtual void Remove(long from, long to) wxOVERRIDE + virtual void Remove(long from, long to) override { Replace(from, to, wxString()); } - virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE + virtual void Replace(long from, long to, const wxString& text) override { SetTargetStart((int)from); SetTargetEnd((int)to); @@ -5285,14 +5285,14 @@ public: */ - virtual void SetInsertionPoint(long pos) wxOVERRIDE + virtual void SetInsertionPoint(long pos) override { SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos)); } - virtual long GetInsertionPoint() const wxOVERRIDE { return GetCurrentPos(); } - virtual long GetLastPosition() const wxOVERRIDE { return GetTextLength(); } + virtual long GetInsertionPoint() const override { return GetCurrentPos(); } + virtual long GetLastPosition() const override { return GetTextLength(); } - virtual void SetSelection(long from, long to) wxOVERRIDE + virtual void SetSelection(long from, long to) override { if ( from == -1 && to == -1 ) { @@ -5305,7 +5305,7 @@ public: } } - virtual void SelectNone() wxOVERRIDE + virtual void SelectNone() override { ClearSelections(); } @@ -5313,7 +5313,7 @@ public: #ifdef SWIG void GetSelection(long* OUTPUT, long* OUTPUT) const; #else - virtual void GetSelection(long *from, long *to) const wxOVERRIDE + virtual void GetSelection(long *from, long *to) const override { if ( from ) *from = GetSelectionStart(); @@ -5333,13 +5333,13 @@ public: } #endif - virtual bool IsEditable() const wxOVERRIDE { return !GetReadOnly(); } - virtual void SetEditable(bool editable) wxOVERRIDE { SetReadOnly(!editable); } + virtual bool IsEditable() const override { return !GetReadOnly(); } + virtual void SetEditable(bool editable) override { SetReadOnly(!editable); } // implement wxTextAreaBase pure virtual methods // --------------------------------------------- - virtual int GetLineLength(long lineNo) const wxOVERRIDE + virtual int GetLineLength(long lineNo) const override { if ( lineNo < 0 || lineNo >= GetNumberOfLines() ) return -1; @@ -5347,7 +5347,7 @@ public: return static_cast(GetLineText(lineNo).length()); } - virtual wxString GetLineText(long lineNo) const wxOVERRIDE + virtual wxString GetLineText(long lineNo) const override { wxString text = GetLine(static_cast(lineNo)); size_t lastNewLine = text.find_last_not_of(wxS("\r\n")); @@ -5358,35 +5358,35 @@ public: text.clear(); return text; } - virtual int GetNumberOfLines() const wxOVERRIDE { return GetLineCount(); } + virtual int GetNumberOfLines() const override { return GetLineCount(); } - virtual bool IsModified() const wxOVERRIDE { return GetModify(); } - virtual void MarkDirty() wxOVERRIDE { wxFAIL_MSG("not implemented"); } - virtual void DiscardEdits() wxOVERRIDE { SetSavePoint(); } + virtual bool IsModified() const override { return GetModify(); } + virtual void MarkDirty() override { wxFAIL_MSG("not implemented"); } + virtual void DiscardEdits() override { SetSavePoint(); } virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end), - const wxTextAttr& WXUNUSED(style)) wxOVERRIDE + const wxTextAttr& WXUNUSED(style)) override { wxFAIL_MSG("not implemented"); return false; } - virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) wxOVERRIDE + virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) override { wxFAIL_MSG("not implemented"); return false; } - virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) wxOVERRIDE + virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) override { wxFAIL_MSG("not implemented"); return false; } - virtual long XYToPosition(long x, long y) const wxOVERRIDE + virtual long XYToPosition(long x, long y) const override { long pos = PositionFromLine((int)y); if ( pos == -1 ) @@ -5399,7 +5399,7 @@ public: return pos; } - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE + virtual bool PositionToXY(long pos, long *x, long *y) const override { int l = LineFromPosition((int)pos); if ( l == -1 ) @@ -5418,11 +5418,11 @@ public: return true; } - virtual void ShowPosition(long pos) wxOVERRIDE { GotoPos((int)pos); } + virtual void ShowPosition(long pos) override { GotoPos((int)pos); } using wxWindow::HitTest; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override { const long l = PositionFromPoint(pt); if ( l == -1 ) @@ -5437,7 +5437,7 @@ public: // just unhide it virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE + wxTextCoord *row) const override { return wxTextAreaBase::HitTest(pt, col, row); } @@ -5455,13 +5455,13 @@ public: static wxVersionInfo GetLibraryVersionInfo(); protected: - virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE { return GetText(); } - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual void DoSetValue(const wxString& value, int flags) override; + virtual wxString DoGetValue() const override { return GetText(); } + virtual wxWindow *GetEditableWindow() override { return this; } #ifndef SWIG - virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE; - virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE; + virtual bool DoLoadFile(const wxString& file, int fileType) override; + virtual bool DoSaveFile(const wxString& file, int fileType) override; // Event handlers void OnPaint(wxPaintEvent& evt); @@ -5487,14 +5487,14 @@ protected: void OnIdle(wxIdleEvent& evt); void OnMouseCaptureLost(wxMouseCaptureLostEvent& evt); - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // Turn notifications from Scintilla into events void NotifyChange(); void NotifyParent(SCNotification* scn); #ifdef __WXMSW__ - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override; #endif // __WXMSW__ private: @@ -5600,7 +5600,7 @@ public: bool GetControl() const; bool GetAlt() const; - virtual wxEvent* Clone() const wxOVERRIDE { return new wxStyledTextEvent(*this); } + virtual wxEvent* Clone() const override { return new wxStyledTextEvent(*this); } #ifndef SWIG private: diff --git a/include/wx/stdstream.h b/include/wx/stdstream.h index 3cf565b624..09efe3e58c 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) wxOVERRIDE; + virtual std::streambuf *setbuf(char *s, std::streamsize n) override; 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) wxOVERRIDE; + std::ios_base::out) override; virtual std::streampos seekpos(std::streampos sp, std::ios_base::openmode which = std::ios_base::in | - 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; + std::ios_base::out) override; + virtual std::streamsize showmanyc() override; + virtual std::streamsize xsgetn(char *s, std::streamsize n) override; + virtual int underflow() override; + virtual int uflow() override; + virtual int pbackfail(int c = EOF) override; // 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) wxOVERRIDE; + virtual std::streambuf *setbuf(char *s, std::streamsize n) override; 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) wxOVERRIDE; + std::ios_base::out) override; virtual std::streampos seekpos(std::streampos sp, std::ios_base::openmode which = std::ios_base::in | - std::ios_base::out) wxOVERRIDE; - virtual std::streamsize xsputn(const char *s, std::streamsize n) wxOVERRIDE; - virtual int overflow(int c) wxOVERRIDE; + std::ios_base::out) override; + virtual std::streamsize xsputn(const char *s, std::streamsize n) override; + virtual int overflow(int c) override; wxOutputStream& m_stream; }; diff --git a/include/wx/strconv.h b/include/wx/strconv.h index aceed78c2d..6e9debe0c4 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -186,12 +186,12 @@ private: class WXDLLIMPEXP_BASE wxMBConvLibc : public wxMBConv { public: - 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 size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const override; + virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const override; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvLibc; } + virtual wxMBConv *Clone() const override { return new wxMBConvLibc; } - virtual bool IsUTF8() const wxOVERRIDE { return wxLocaleIsUtf8; } + virtual bool IsUTF8() const override { return wxLocaleIsUtf8; } }; #ifdef __UNIX__ @@ -214,25 +214,25 @@ public: } virtual ~wxConvBrokenFileNames() { delete m_conv; } - virtual size_t MB2WC(wchar_t *out, const char *in, size_t outLen) const wxOVERRIDE + virtual size_t MB2WC(wchar_t *out, const char *in, size_t outLen) const override { return m_conv->MB2WC(out, in, outLen); } - virtual size_t WC2MB(char *out, const wchar_t *in, size_t outLen) const wxOVERRIDE + virtual size_t WC2MB(char *out, const wchar_t *in, size_t outLen) const override { return m_conv->WC2MB(out, in, outLen); } - virtual size_t GetMBNulLen() const wxOVERRIDE + virtual size_t GetMBNulLen() const override { // cast needed to call a private function return m_conv->GetMBNulLen(); } - virtual bool IsUTF8() const wxOVERRIDE { return m_conv->IsUTF8(); } + virtual bool IsUTF8() const override { return m_conv->IsUTF8(); } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvBrokenFileNames(*this); } + virtual wxMBConv *Clone() const override { return new wxConvBrokenFileNames(*this); } private: // the conversion object we forward to @@ -256,13 +256,13 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } + virtual size_t GetMaxCharLen() const override { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF7; } + virtual wxMBConv *Clone() const override { return new wxMBConvUTF7; } private: // UTF-7 decoder/encoder may be in direct mode or in shifted mode after a @@ -345,17 +345,17 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } + virtual size_t GetMaxCharLen() const override { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvStrictUTF8(); } + virtual wxMBConv *Clone() const override { return new wxMBConvStrictUTF8(); } // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't // take the shortcut in that case - virtual bool IsUTF8() const wxOVERRIDE { return true; } + virtual bool IsUTF8() const override { return true; } }; class WXDLLIMPEXP_BASE wxMBConvUTF8 : public wxMBConvStrictUTF8 @@ -371,17 +371,17 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } + virtual size_t GetMaxCharLen() const override { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF8(m_options); } + virtual wxMBConv *Clone() const override { return new wxMBConvUTF8(m_options); } // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't // take the shortcut in that case - virtual bool IsUTF8() const wxOVERRIDE { return m_options == MAP_INVALID_UTF8_NOT; } + virtual bool IsUTF8() const override { return m_options == MAP_INVALID_UTF8_NOT; } private: int m_options; @@ -396,7 +396,7 @@ class WXDLLIMPEXP_BASE wxMBConvUTF16Base : public wxMBConv public: enum { BYTES_PER_CHAR = 2 }; - virtual size_t GetMBNulLen() const wxOVERRIDE { return BYTES_PER_CHAR; } + virtual size_t GetMBNulLen() const override { return BYTES_PER_CHAR; } protected: // return the length of the buffer using srcLen if it's not wxNO_LEN and @@ -414,11 +414,11 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16LE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; + virtual size_t GetMaxCharLen() const override { return 4; } + virtual wxMBConv *Clone() const override { return new wxMBConvUTF16LE; } }; // ---------------------------------------------------------------------------- @@ -429,11 +429,11 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16BE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; + virtual size_t GetMaxCharLen() const override { return 4; } + virtual wxMBConv *Clone() const override { return new wxMBConvUTF16BE; } }; // ---------------------------------------------------------------------------- @@ -445,7 +445,7 @@ class WXDLLIMPEXP_BASE wxMBConvUTF32Base : public wxMBConv public: enum { BYTES_PER_CHAR = 4 }; - virtual size_t GetMBNulLen() const wxOVERRIDE { return BYTES_PER_CHAR; } + virtual size_t GetMBNulLen() const override { return BYTES_PER_CHAR; } protected: // this is similar to wxMBConvUTF16Base method with the same name except @@ -462,11 +462,11 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32LE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; + virtual size_t GetMaxCharLen() const override { return 4; } + virtual wxMBConv *Clone() const override { return new wxMBConvUTF32LE; } }; // ---------------------------------------------------------------------------- @@ -477,11 +477,11 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32BE; } + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; + virtual size_t GetMaxCharLen() const override { return 4; } + virtual wxMBConv *Clone() const override { return new wxMBConvUTF32BE; } }; // ---------------------------------------------------------------------------- @@ -504,14 +504,14 @@ 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 wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMBNulLen() const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; + virtual size_t GetMBNulLen() const override; - virtual bool IsUTF8() const wxOVERRIDE; + virtual bool IsUTF8() const override; - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxCSConv(*this); } + virtual wxMBConv *Clone() const override { return new wxCSConv(*this); } void Clear(); @@ -572,7 +572,7 @@ public: // something on output). virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; // Try to encode the string using the current locale encoding (wxConvLibc) // and fall back to UTF-8 (which never fails) if it doesn't work. Note that @@ -580,13 +580,13 @@ public: // even for the strings containing only code points representable in 8869-1. virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; // Use the value for UTF-8 here to make sure we try to decode up to 4 bytes // as UTF-8 before giving up. - virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; } + virtual size_t GetMaxCharLen() const override { return 4; } - virtual wxMBConv *Clone() const wxOVERRIDE + virtual wxMBConv *Clone() const override { return new wxWhateverWorksConv(); } diff --git a/include/wx/stream.h b/include/wx/stream.h index 4de1d5b01b..8889c7faac 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 wxOVERRIDE; + virtual wxFileOffset GetLength() const override; bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE { return true; } + virtual bool IsOk() const override { return true; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; size_t m_currentPos, m_lastPos; @@ -308,9 +308,9 @@ public: wxFilterInputStream(wxInputStream *stream); virtual ~wxFilterInputStream(); - virtual char Peek() wxOVERRIDE { return m_parent_i_stream->Peek(); } + virtual char Peek() override { return m_parent_i_stream->Peek(); } - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_i_stream->GetLength(); } + virtual wxFileOffset GetLength() const override { 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 wxOVERRIDE { return m_parent_o_stream->GetLength(); } + virtual wxFileOffset GetLength() const override { return m_parent_o_stream->GetLength(); } wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; } - bool Close() wxOVERRIDE; + bool Close() override; protected: wxOutputStream *m_parent_o_stream; @@ -566,22 +566,22 @@ public: virtual ~wxBufferedInputStream(); - virtual char Peek() wxOVERRIDE; - virtual wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE; + virtual char Peek() override; + virtual wxInputStream& Read(void *buffer, size_t size) override; // Position functions - 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(); } + virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) override; + virtual wxFileOffset TellI() const override; + virtual bool IsSeekable() const override { 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) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t bufsize) override; + virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; wxStreamBuffer *m_i_streambuf; @@ -609,26 +609,26 @@ public: virtual ~wxBufferedOutputStream(); - virtual wxOutputStream& Write(const void *buffer, size_t size) wxOVERRIDE; + virtual wxOutputStream& Write(const void *buffer, size_t size) override; // Position functions - 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(); } + virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) override; + virtual wxFileOffset TellO() const override; + virtual bool IsSeekable() const override { return m_parent_o_stream->IsSeekable(); } - void Sync() wxOVERRIDE; - bool Close() wxOVERRIDE; + void Sync() override; + bool Close() override; - virtual wxFileOffset GetLength() const wxOVERRIDE; + virtual wxFileOffset GetLength() const override; // 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) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysWrite(const void *buffer, size_t bufsize) override; + virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; wxStreamBuffer *m_o_streambuf; @@ -652,13 +652,13 @@ public: wxWrapperInputStream(wxInputStream* stream); // Override the base class methods to forward to the wrapped stream. - virtual wxFileOffset GetLength() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE; + virtual wxFileOffset GetLength() const override; + virtual bool IsSeekable() const override; protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; // 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 37a1ab3a99..063ca14d7a 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 wxOVERRIDE; - wxString GetInternalName() const wxOVERRIDE { return m_Name; } - wxPathFormat GetInternalFormat() const wxOVERRIDE { return wxPATH_UNIX; } + wxString GetName(wxPathFormat format = wxPATH_NATIVE) const override; + wxString GetInternalName() const override { return m_Name; } + wxPathFormat GetInternalFormat() const override { return wxPATH_UNIX; } int GetMode() const; int GetUserId() const { return m_UserId; } int GetGroupId() const { return m_GroupId; } - wxFileOffset GetSize() const wxOVERRIDE { return m_Size; } - wxFileOffset GetOffset() const wxOVERRIDE { return m_Offset; } - wxDateTime GetDateTime() const wxOVERRIDE { return m_ModifyTime; } + wxFileOffset GetSize() const override { return m_Size; } + wxFileOffset GetOffset() const override { return m_Offset; } + wxDateTime GetDateTime() const override { 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 wxOVERRIDE; - bool IsReadOnly() const wxOVERRIDE { return !(m_Mode & 0222); } + bool IsDir() const override; + bool IsReadOnly() const override { return !(m_Mode & 0222); } // set accessors - void SetName(const wxString& name, wxPathFormat format = wxPATH_NATIVE) wxOVERRIDE; + void SetName(const wxString& name, wxPathFormat format = wxPATH_NATIVE) override; void SetUserId(int id) { m_UserId = id; } void SetGroupId(int id) { m_GroupId = id; } void SetMode(int mode); - void SetSize(wxFileOffset size) wxOVERRIDE { m_Size = size; } - void SetDateTime(const wxDateTime& dt) wxOVERRIDE { m_ModifyTime = dt; } + void SetSize(wxFileOffset size) override { m_Size = size; } + void SetDateTime(const wxDateTime& dt) override { 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) wxOVERRIDE; - void SetIsReadOnly(bool isReadOnly = true) wxOVERRIDE; + void SetIsDir(bool isDir = true) override; + void SetIsReadOnly(bool isReadOnly = true) override; 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) wxOVERRIDE { m_Offset = offset; } + void SetOffset(wxFileOffset offset) override { m_Offset = offset; } - virtual wxArchiveEntry* DoClone() const wxOVERRIDE { return Clone(); } + virtual wxArchiveEntry* DoClone() const override { return Clone(); } wxString m_Name; int m_Mode; @@ -161,23 +161,23 @@ public: virtual ~wxTarInputStream(); bool OpenEntry(wxTarEntry& entry); - bool CloseEntry() wxOVERRIDE; + bool CloseEntry() override; wxTarEntry *GetNextEntry(); - wxFileOffset GetLength() const wxOVERRIDE { return m_size; } - bool IsSeekable() const wxOVERRIDE { return m_parent_i_stream->IsSeekable(); } + wxFileOffset GetLength() const override { return m_size; } + bool IsSeekable() const override { return m_parent_i_stream->IsSeekable(); } protected: - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; + size_t OnSysRead(void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { return m_pos; } + wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) override; private: void Init(); - wxArchiveEntry *DoGetNextEntry() wxOVERRIDE { return GetNextEntry(); } - bool OpenEntry(wxArchiveEntry& entry) wxOVERRIDE; + wxArchiveEntry *DoGetNextEntry() override { return GetNextEntry(); } + bool OpenEntry(wxArchiveEntry& entry) override; 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) wxOVERRIDE; + wxFileOffset size = wxInvalidOffset) override; bool PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()) wxOVERRIDE; + const wxDateTime& dt = wxDateTime::Now()) override; bool CopyEntry(wxTarEntry *entry, wxTarInputStream& inputStream); bool CopyArchiveMetaData(wxTarInputStream& WXUNUSED(s)) { return true; } - void Sync() wxOVERRIDE; - bool CloseEntry() wxOVERRIDE; - bool Close() wxOVERRIDE; + void Sync() override; + bool CloseEntry() override; + bool Close() override; - bool IsSeekable() const wxOVERRIDE { return m_parent_o_stream->IsSeekable(); } + bool IsSeekable() const override { 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) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; + size_t OnSysWrite(const void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { return m_pos; } + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; private: void Init(wxTarFormat format); - bool PutNextEntry(wxArchiveEntry *entry) wxOVERRIDE; - bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) wxOVERRIDE; - bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) wxOVERRIDE { return true; } + bool PutNextEntry(wxArchiveEntry *entry) override; + bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) override; + bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) override { 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 wxOVERRIDE + wxPathFormat format = wxPATH_NATIVE) const override { return wxTarEntry::GetInternalName(name, format); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; + = wxSTREAM_PROTOCOL) const override; protected: - wxArchiveEntry *DoNewEntry() const wxOVERRIDE + wxArchiveEntry *DoNewEntry() const override { return NewEntry(); } - wxArchiveInputStream *DoNewStream(wxInputStream& stream) const wxOVERRIDE + wxArchiveInputStream *DoNewStream(wxInputStream& stream) const override { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const wxOVERRIDE + wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const override { return NewStream(stream); } - wxArchiveInputStream *DoNewStream(wxInputStream *stream) const wxOVERRIDE + wxArchiveInputStream *DoNewStream(wxInputStream *stream) const override { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const wxOVERRIDE + wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const override { return NewStream(stream); } private: diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index dad5cfd907..0c7d46bc7e 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -108,7 +108,7 @@ public: SetEventObject(tbIcon); } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTaskBarIconEvent(*this); } + virtual wxEvent *Clone() const override { return new wxTaskBarIconEvent(*this); } private: wxDECLARE_NO_ASSIGN_DEF_COPY(wxTaskBarIconEvent); diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 8e294afde5..9576ff0a4d 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -547,10 +547,10 @@ public: // ------------------------------- // Do the toolbar button updates (check for EVT_UPDATE_UI handlers) - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE ; + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) override ; // don't want toolbars to accept the focus - virtual bool AcceptsFocus() const wxOVERRIDE { return false; } + virtual bool AcceptsFocus() const override { return false; } #if wxUSE_MENUS // Set dropdown menu @@ -559,7 +559,7 @@ public: protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // to implement in derived classes // ------------------------------- diff --git a/include/wx/testing.h b/include/wx/testing.h index 7cbcb8bbda..06daf09359 100644 --- a/include/wx/testing.h +++ b/include/wx/testing.h @@ -167,7 +167,7 @@ public: } protected: - virtual int Invoke(wxDialog *dlg) const wxOVERRIDE + virtual int Invoke(wxDialog *dlg) const override { DialogType *t = dynamic_cast(dlg); if ( t ) @@ -177,7 +177,7 @@ protected: } /// Returns description of the expected dialog (by default, its class). - virtual wxString GetDefaultDescription() const wxOVERRIDE + virtual wxString GetDefaultDescription() const override { return wxGetDialogClassDescription(wxCLASSINFO(T), typeid(T)); } @@ -224,7 +224,7 @@ public: } protected: - virtual int OnInvoked(T *WXUNUSED(dlg)) const wxOVERRIDE + virtual int OnInvoked(T *WXUNUSED(dlg)) const override { return m_id; } @@ -243,7 +243,7 @@ public: } protected: - virtual wxString GetDefaultDescription() const wxOVERRIDE + virtual wxString GetDefaultDescription() const override { // It can be useful to show which buttons the expected message box was // supposed to have, in case there could have been several of them. @@ -293,7 +293,7 @@ public: } protected: - virtual int OnInvoked(wxFileDialog *dlg) const wxOVERRIDE + virtual int OnInvoked(wxFileDialog *dlg) const override { dlg->SetPath(m_path); return m_id; @@ -355,7 +355,7 @@ public: } protected: - virtual int Enter(wxDialog *dlg) wxOVERRIDE + virtual int Enter(wxDialog *dlg) override { while ( !m_expectations.empty() ) { diff --git a/include/wx/textcompleter.h b/include/wx/textcompleter.h index 44f677f719..ce9e5c2005 100644 --- a/include/wx/textcompleter.h +++ b/include/wx/textcompleter.h @@ -47,8 +47,8 @@ public: // Must be implemented to return all the completions for the given prefix. virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0; - virtual bool Start(const wxString& prefix) wxOVERRIDE; - virtual wxString GetNext() wxOVERRIDE; + virtual bool Start(const wxString& prefix) override; + virtual wxString GetNext() override; private: wxArrayString m_completions; @@ -75,7 +75,7 @@ public: } virtual void GetCompletions(const wxString& WXUNUSED(prefix), - wxArrayString& res) wxOVERRIDE + wxArrayString& res) override { res = m_strings; } diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index d5f8754b3e..f3498c4890 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -717,17 +717,17 @@ public: wxTextCtrlIface() { } // wxTextAreaBase overrides - virtual wxString GetValue() const wxOVERRIDE + virtual wxString GetValue() const override { return wxTextEntryBase::GetValue(); } - virtual void SetValue(const wxString& value) wxOVERRIDE + virtual void SetValue(const wxString& value) override { wxTextEntryBase::SetValue(value); } protected: - virtual bool IsValidPosition(long pos) const wxOVERRIDE + virtual bool IsValidPosition(long pos) const override { return pos >= 0 && pos <= GetLastPosition(); } @@ -775,42 +775,42 @@ public: // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE; + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override; - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { 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 wxOVERRIDE + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override { return wxTextAreaBase::HitTest(pt, pos); } virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE + wxTextCoord *row) const override { 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) wxOVERRIDE; - virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE; - virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE; + virtual bool SetStyle(long start, long end, const wxTextAttr& style) override; + virtual bool GetStyle(long position, wxTextAttr& style) override; + virtual bool SetDefaultStyle(const wxTextAttr& style) override; // wxTextAreaBase overrides - virtual wxString GetValue() const wxOVERRIDE + virtual wxString GetValue() const override { return wxTextEntry::GetValue(); } - virtual void SetValue(const wxString& value) wxOVERRIDE + virtual void SetValue(const wxString& value) override { wxTextEntry::SetValue(value); } // wxWindow overrides - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -821,7 +821,7 @@ public: return GetCompositeControlsDefaultAttributes(variant); } - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } #if wxUSE_SPELLCHECK // Use native spelling and grammar checking functions. @@ -840,21 +840,21 @@ protected: // Override wxEvtHandler method to check for a common problem of binding // wxEVT_TEXT_ENTER to a control without wxTE_PROCESS_ENTER style, which is // never going to work. - virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE; + virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override; // override streambuf method #if wxHAS_TEXT_WINDOW_STREAM - int overflow(int i) wxOVERRIDE; + int overflow(int i) override; #endif // wxHAS_TEXT_WINDOW_STREAM // Another wxTextAreaBase override. - virtual bool IsValidPosition(long pos) const wxOVERRIDE + virtual bool IsValidPosition(long pos) const override { return pos >= 0 && pos <= GetLastPosition(); } // implement the wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual wxWindow *GetEditableWindow() override { return this; } wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase); wxDECLARE_ABSTRACT_CLASS(wxTextCtrlBase); @@ -916,7 +916,7 @@ public: // get the end of the URL long GetURLEnd() const { return m_end; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTextUrlEvent(*this); } + virtual wxEvent *Clone() const override { return new wxTextUrlEvent(*this); } protected: // the corresponding mouse event diff --git a/include/wx/textfile.h b/include/wx/textfile.h index 64fefebc96..11ba4c6ee3 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 wxOVERRIDE; + virtual bool OnExists() const override; virtual bool OnOpen(const wxString &strBufferName, - wxTextBufferOpenMode openMode) wxOVERRIDE; - virtual bool OnClose() wxOVERRIDE; - virtual bool OnRead(const wxMBConv& conv) wxOVERRIDE; - virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) wxOVERRIDE; + wxTextBufferOpenMode openMode) override; + virtual bool OnClose() override; + virtual bool OnRead(const wxMBConv& conv) override; + virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) override; private: diff --git a/include/wx/textwrapper.h b/include/wx/textwrapper.h index 02e37bd23e..da3a7c2d3b 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) wxOVERRIDE + virtual void OnOutputLine(const wxString& line) override { if ( !line.empty() ) { diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index bb11446696..20745971c4 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -37,12 +37,12 @@ public: virtual bool GetValue() const = 0; // The current "normal" state for the toggle button depends upon its value. - virtual State GetNormalState() const wxOVERRIDE + virtual State GetNormalState() const override { return GetValue() ? State_Pressed : State_Normal; } - void UpdateWindowUI(long flags) wxOVERRIDE + void UpdateWindowUI(long flags) override { wxControl::UpdateWindowUI(flags); diff --git a/include/wx/thread.h b/include/wx/thread.h index d1a147bb65..a11e192f0b 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -655,7 +655,7 @@ public: protected: // entry point for the thread -- calls Entry() in owner. - virtual void *Entry() wxOVERRIDE; + virtual void *Entry() override; private: // the owner of the thread diff --git a/include/wx/timer.h b/include/wx/timer.h index 1b60e6a84c..627d8ee8cf 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -171,8 +171,8 @@ public: wxTimer& GetTimer() const { return *m_timer; } // implement the base class pure virtual - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTimerEvent(*this); } - virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_TIMER; } + virtual wxEvent *Clone() const override { return new wxTimerEvent(*this); } + virtual wxEventCategory GetEventCategory() const override { return wxEVT_CATEGORY_TIMER; } // default ctor creates an unusable event object and should not be used (in // fact, no code outside wxWidgets is supposed to create event objects) diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h index 1fc0da51cb..d20d6e52f5 100644 --- a/include/wx/tipwin.h +++ b/include/wx/tipwin.h @@ -62,7 +62,7 @@ protected: // event handlers void OnMouseClick(wxMouseEvent& event); - virtual void OnDismiss() wxOVERRIDE; + virtual void OnDismiss() override; private: wxTipWindowView *m_view; diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index ae602ee4cf..eb8c5209e5 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -65,20 +65,20 @@ public: // implement base class virtuals - 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 SetPageText(size_t n, const wxString& strText) override; + virtual wxString GetPageText(size_t n) const override; + virtual int GetPageImage(size_t n) const override; + virtual bool SetPageImage(size_t n, int imageId) override; virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, bool bSelect = false, - 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); } + int imageId = NO_IMAGE) override; + virtual int SetSelection(size_t n) override { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) override { return DoSetSelection(n); } - virtual bool DeleteAllPages() wxOVERRIDE; - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual bool DeleteAllPages() override; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; // methods which are not part of base wxBookctrl API @@ -95,17 +95,17 @@ public: void Realize(); protected: - virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE; + virtual wxWindow *DoRemovePage(size_t page) override; // event handlers void OnToolSelected(wxCommandEvent& event); void OnSize(wxSizeEvent& event); void OnIdle(wxIdleEvent& event); - void UpdateSelectedPage(size_t newsel) wxOVERRIDE; + void UpdateSelectedPage(size_t newsel) override; - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; + wxBookCtrlEvent* CreatePageChangingEvent() const override; + void MakeChangedEvent(wxBookCtrlEvent &event) override; // whether the toolbar needs to be realized bool m_needsRealizing; diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index de6cdc0b5a..1bb8552474 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -277,14 +277,14 @@ public: // ------------------------------- // override some base class virtuals - virtual bool Destroy() wxOVERRIDE; - virtual bool IsTopLevel() const wxOVERRIDE { return true; } - virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE; + virtual bool Destroy() override; + virtual bool IsTopLevel() const override { return true; } + virtual bool IsTopNavigationDomain(NavigationKind kind) const override; virtual bool IsVisible() const { return IsShown(); } // override to do TLW-specific layout: we resize our unique child to fill // the entire client area - virtual bool Layout() wxOVERRIDE; + virtual bool Layout() override; // event handlers void OnCloseWindow(wxCloseEvent& event); @@ -298,11 +298,11 @@ public: void OnActivate(wxActivateEvent &WXUNUSED(event)) { } // do the window-specific processing after processing the update event - virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE ; + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override ; // a different API for SetSizeHints - virtual void SetMinSize(const wxSize& minSize) wxOVERRIDE; - virtual void SetMaxSize(const wxSize& maxSize) wxOVERRIDE; + virtual void SetMinSize(const wxSize& minSize) override; + virtual void SetMaxSize(const wxSize& maxSize) override; virtual void OSXSetModified(bool modified) { m_modified = modified; } virtual bool OSXIsModified() const { return m_modified; } @@ -312,15 +312,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 wxOVERRIDE; - virtual void DoScreenToClient(int *x, int *y) const wxOVERRIDE; + virtual void DoClientToScreen(int *x, int *y) const override; + virtual void DoScreenToClient(int *x, int *y) const override; // add support for wxCENTRE_ON_SCREEN - virtual void DoCentre(int dir) wxOVERRIDE; + virtual void DoCentre(int dir) override; // 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 wxOVERRIDE + virtual void DoGetScreenPosition(int *x, int *y) const override { DoGetPosition(x, y); } diff --git a/include/wx/translation.h b/include/wx/translation.h index 044b461f5a..a54a46958e 100644 --- a/include/wx/translation.h +++ b/include/wx/translation.h @@ -239,9 +239,9 @@ public: static void AddCatalogLookupPathPrefix(const wxString& prefix); virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang) wxOVERRIDE; + const wxString& lang) override; - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const wxOVERRIDE; + virtual wxArrayString GetAvailableTranslations(const wxString& domain) const override; }; @@ -252,9 +252,9 @@ class WXDLLIMPEXP_BASE wxResourceTranslationsLoader { public: virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang) wxOVERRIDE; + const wxString& lang) override; - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const wxOVERRIDE; + virtual wxArrayString GetAvailableTranslations(const wxString& domain) const override; protected: // returns resource type to use for translations diff --git a/include/wx/treebase.h b/include/wx/treebase.h index 20055d5bd5..3b853070e5 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -194,7 +194,7 @@ public: const wxTreeItemId &item = wxTreeItemId()); wxTreeEvent(const wxTreeEvent& event); - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTreeEvent(*this); } + virtual wxEvent *Clone() const override { 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 11b44cfc65..eb8f88bccf 100644 --- a/include/wx/treebook.h +++ b/include/wx/treebook.h @@ -73,7 +73,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; + int imageId = NO_IMAGE) override; // Inserts a new sub-page to the end of children of the page at given pos. virtual bool InsertSubPage(size_t pos, @@ -86,7 +86,7 @@ public: virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; + int imageId = NO_IMAGE) override; // Adds a new child-page to the last top-level page inserted. // Useful when constructing 1 level tree structure. @@ -98,7 +98,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) wxOVERRIDE; + virtual bool DeletePage(size_t pos) override; // Tree operations @@ -125,24 +125,24 @@ public: // Standard operations inherited from wxBookCtrlBase // ------------------------------------------------- - 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 bool DeleteAllPages() wxOVERRIDE; + virtual bool SetPageText(size_t n, const wxString& strText) override; + virtual wxString GetPageText(size_t n) const override; + virtual int GetPageImage(size_t n) const override; + virtual bool SetPageImage(size_t n, int imageId) override; + virtual int SetSelection(size_t n) override { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) override { return DoSetSelection(n); } + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; + virtual bool DeleteAllPages() override; protected: // Implementation of a page removal. See DeletPage for comments. - wxTreebookPage *DoRemovePage(size_t pos) wxOVERRIDE; + wxTreebookPage *DoRemovePage(size_t pos) override; - virtual void OnImagesChanged() wxOVERRIDE; + virtual void OnImagesChanged() override; // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages) - virtual bool AllowNullPage() const wxOVERRIDE { return true; } - virtual wxWindow *TryGetNonNullPage(size_t page) wxOVERRIDE; + virtual bool AllowNullPage() const override { return true; } + virtual wxWindow *TryGetNonNullPage(size_t page) override; // event handlers void OnTreeSelectionChange(wxTreeEvent& event); @@ -175,9 +175,9 @@ private: // Overridden methods used by the base class DoSetSelection() // implementation. - void UpdateSelectedPage(size_t newsel) wxOVERRIDE; - wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE; - void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE; + void UpdateSelectedPage(size_t newsel) override; + wxBookCtrlEvent* CreatePageChangingEvent() const override; + void MakeChangedEvent(wxBookCtrlEvent &event) override; // Does the selection update. Called from page insertion functions // to update selection if the selected page was pushed by the newly inserted diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index 9f5a90c734..1a91916cf7 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -385,14 +385,14 @@ public: // implementation // -------------- - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { 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 wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // 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 ce9dba4599..bece6cce60 100644 --- a/include/wx/treelist.h +++ b/include/wx/treelist.h @@ -396,7 +396,7 @@ private: void Init(); // Pure virtual method inherited from wxCompositeWindow. - virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE; + virtual wxWindowList GetCompositeWindowParts() const override; // Implementation of AppendColumn(). int DoInsertColumn(const wxString& title, @@ -471,7 +471,7 @@ public: // COLUMN_SORTED event. unsigned GetColumn() const { return m_column; } - virtual wxEvent* Clone() const wxOVERRIDE { return new wxTreeListEvent(*this); } + virtual wxEvent* Clone() const override { return new wxTreeListEvent(*this); } private: // Common part of all ctors. diff --git a/include/wx/typeinfo.h b/include/wx/typeinfo.h index 015da80a7a..f3b81d4d43 100644 --- a/include/wx/typeinfo.h +++ b/include/wx/typeinfo.h @@ -106,7 +106,7 @@ typedef void (*wxTypeIdentifier)(); // WX_DECLARE_TYPEINFO() or WX_DECLARE_TYPEINFO_INLINE() however. #define _WX_DECLARE_TYPEINFO_CUSTOM(CLS, IDENTFUNC) \ public: \ - virtual wxTypeIdentifier GetWxTypeId() const wxOVERRIDE \ + virtual wxTypeIdentifier GetWxTypeId() const override \ { \ return reinterpret_cast \ (&IDENTFUNC); \ diff --git a/include/wx/univ/anybutton.h b/include/wx/univ/anybutton.h index 58259dd00a..d168e2d3b0 100644 --- a/include/wx/univ/anybutton.h +++ b/include/wx/univ/anybutton.h @@ -29,22 +29,22 @@ public: virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } protected: // choose the default border for this window - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_STATIC; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_STATIC; } - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; - virtual bool DoDrawBackground(wxDC& dc) wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual bool DoDrawBackground(wxDC& dc) override; + virtual void DoDraw(wxControlRenderer *renderer) override; // current state bool m_isPressed, m_isDefault; @@ -70,14 +70,14 @@ public: virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, - bool pressed) wxOVERRIDE; + bool pressed) override; virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event) wxOVERRIDE; + const wxMouseEvent& event) override; virtual bool HandleMouseMove(wxInputConsumer *consumer, - const wxMouseEvent& event) wxOVERRIDE; + const wxMouseEvent& event) override; virtual bool HandleFocus(wxInputConsumer *consumer, - const wxFocusEvent& event) wxOVERRIDE; - virtual bool HandleActivation(wxInputConsumer *consumer, bool activated) wxOVERRIDE; + const wxFocusEvent& event) override; + virtual bool HandleActivation(wxInputConsumer *consumer, bool activated) override; private: // the window (button) which has capture or NULL and the flag telling if diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 052a6d4680..fb4bfc3133 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -42,26 +42,26 @@ public: const wxString& name = wxString()); - virtual void SetMargins(int x, int y) wxOVERRIDE + virtual void SetMargins(int x, int y) override { SetBitmapMargins(x, y); wxBitmapButtonBase::SetMargins(x, y); } - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; - virtual bool SetCurrent(bool doit = true) wxOVERRIDE; + virtual bool SetCurrent(bool doit = true) override; - virtual void Press() wxOVERRIDE; - virtual void Release() wxOVERRIDE; + virtual void Press() override; + virtual void Release() override; protected: void OnSetFocus(wxFocusEvent& event); void OnKillFocus(wxFocusEvent& event); // called when one of the bitmap is changed by user - virtual void OnSetBitmap() wxOVERRIDE; + virtual void OnSetBitmap() override; // 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 89b40da933..ceaf3b330f 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -82,22 +82,22 @@ public: virtual ~wxButton(); - virtual wxWindow *SetDefault() wxOVERRIDE; + virtual wxWindow *SetDefault() override; - virtual bool IsPressed() const wxOVERRIDE { return m_isPressed; } - virtual bool IsDefault() const wxOVERRIDE { return m_isDefault; } + virtual bool IsPressed() const override { return m_isPressed; } + virtual bool IsDefault() const override { return m_isDefault; } // wxButton actions - virtual void Click() wxOVERRIDE; + virtual void Click() override; - virtual bool CanBeHighlighted() const wxOVERRIDE { return true; } + virtual bool CanBeHighlighted() const override { return true; } protected: - virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) wxOVERRIDE; - virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE; + virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) override; + virtual wxBitmap DoGetBitmap(State which) const override; + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) override; // common part of all ctors void Init(); diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index f1b4c79bb2..5b563c730e 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -75,8 +75,8 @@ public: const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); // implement the checkbox interface - virtual void SetValue(bool value) wxOVERRIDE; - virtual bool GetValue() const wxOVERRIDE; + virtual void SetValue(bool value) override; + virtual bool GetValue() const override; // 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 wxOVERRIDE { return m_isPressed; } + virtual bool IsPressed() const override { return m_isPressed; } virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; - virtual bool CanBeHighlighted() const wxOVERRIDE { return true; } + virtual bool CanBeHighlighted() const override { return true; } virtual wxInputHandler *CreateStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return CreateStdInputHandler(handlerDef); } protected: - virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) wxOVERRIDE; - virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; + virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) override; + virtual wxCheckBoxState DoGet3StateValue() const override; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; + virtual wxSize DoGetBestClientSize() const override; // 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 f93be1eaa7..e79d6b9dfc 100644 --- a/include/wx/univ/checklst.h +++ b/include/wx/univ/checklst.h @@ -69,16 +69,16 @@ public: const wxString& name = wxASCII_STR(wxListBoxNameStr)); // implement check list box methods - virtual bool IsChecked(unsigned int item) const wxOVERRIDE; - virtual void Check(unsigned int item, bool check = true) wxOVERRIDE; + virtual bool IsChecked(unsigned int item) const override; + virtual void Check(unsigned int item, bool check = true) override; // and input handling virtual bool PerformAction(const wxControlAction& action, long numArg = -1l, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { 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) wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; - virtual void DoClear() wxOVERRIDE; + virtual void OnItemInserted(unsigned int pos) override; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual void DoClear() override; // draw the check items instead of the usual ones virtual void DoDrawRange(wxControlRenderer *renderer, - int itemFirst, int itemLast) wxOVERRIDE; + int itemFirst, int itemLast) override; // take them also into account for size calculation - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // common part of all ctors void Init(); diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 22a7f1665f..d32ebfe8a9 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 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 wxString GetValue() const override { return DoGetValue(); } + virtual void SetValue(const wxString& value) override; + virtual void WriteText(const wxString& value) override; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; + virtual void SetInsertionPoint(long pos) override; + virtual void SetInsertionPointEnd() override; + virtual long GetInsertionPoint() const override; + virtual wxTextPos GetLastPosition() const override; + virtual void Replace(long from, long to, const wxString& value) override; + virtual void Remove(long from, long to) override; + virtual void SetSelection(long from, long to) override; + virtual void GetSelection(long *from, long *to) const override; + virtual void SetEditable(bool editable) override; + virtual bool IsEditable() const override; - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; - virtual void SelectAll() wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void SelectAll() override; - 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; + virtual bool CanCopy() const override; + virtual bool CanCut() const override; + virtual bool CanPaste() const override; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; // override these methods to disambiguate between two base classes versions - virtual void Clear() wxOVERRIDE + virtual void Clear() override { wxItemContainer::Clear(); } @@ -132,15 +132,15 @@ public: bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } // wxControlWithItems methods - 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; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; + virtual unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; + virtual void SetSelection(int n) override; + virtual int GetSelection() const override; + virtual wxString GetStringSelection() const override; // we have our own input handler and our own actions // (but wxComboCtrl already handled Popup/Dismiss) @@ -151,25 +151,25 @@ public: */ static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { 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 wxOVERRIDE; - virtual void SetClientDataType(wxClientDataType clientDataItemsType) wxOVERRIDE; + virtual wxClientDataType GetClientDataType() const override; + virtual void SetClientDataType(wxClientDataType clientDataItemsType) override; - virtual const wxTextEntry* WXGetTextEntry() const wxOVERRIDE { return this; } + virtual const wxTextEntry* WXGetTextEntry() const override { return this; } protected: virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, - void **clientData, wxClientDataType type) wxOVERRIDE; + void **clientData, wxClientDataType type) override; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; // common part of all ctors @@ -180,7 +180,7 @@ protected: private: // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } + virtual wxWindow *GetEditableWindow() override { return this; } // the popup listbox wxListBox *m_lbox; diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h index f6b4f66645..b6b0a71b2c 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) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; // return the current label - virtual wxString GetLabel() const wxOVERRIDE { return wxControlBase::GetLabel(); } + virtual wxString GetLabel() const override { return wxControlBase::GetLabel(); } // wxUniversal-specific methods @@ -79,7 +79,7 @@ public: return m_indexAccel == -1 ? wxT('\0') : (wxChar)m_label[m_indexAccel]; } - virtual wxWindow *GetInputWindow() const wxOVERRIDE + virtual wxWindow *GetInputWindow() const override { return const_cast(this); } diff --git a/include/wx/univ/custombgwin.h b/include/wx/univ/custombgwin.h index 64ebf0c071..010060a972 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) wxOVERRIDE + virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) override { // 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 fa79b88ff4..ed4c797e7a 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 wxOVERRIDE; + virtual bool IsModal() const override; // For now, same as Show(true) but returns return code - virtual int ShowModal() wxOVERRIDE; + virtual int ShowModal() override; // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode) wxOVERRIDE; + virtual void EndModal(int retCode) override; // returns true if we're in a modal loop bool IsModalShowing() const; - virtual bool Show(bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) override; // implementation only from now on // ------------------------------- diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 823e2d967d..bfd473c92f 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 = wxASCII_STR(wxFrameNameStr)); - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; + virtual bool Enable(bool enable = true) override; #if wxUSE_STATUSBAR virtual wxStatusBar* CreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, - const wxString& name = wxASCII_STR(wxStatusLineNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxStatusLineNameStr)) override; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = wxID_ANY, - const wxString& name = wxASCII_STR(wxToolBarNameStr)) wxOVERRIDE; + const wxString& name = wxASCII_STR(wxToolBarNameStr)) override; #endif // wxUSE_TOOLBAR - virtual wxSize GetMinSize() const wxOVERRIDE; + virtual wxSize GetMinSize() const override; protected: void OnSize(wxSizeEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual void DoSetClientSize(int width, int height) override; #if wxUSE_MENUS // override to update menu bar position when the frame size changes - virtual void PositionMenuBar() wxOVERRIDE; - virtual void DetachMenuBar() wxOVERRIDE; - virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE; + virtual void PositionMenuBar() override; + virtual void DetachMenuBar() override; + virtual void AttachMenuBar(wxMenuBar *menubar) override; #endif // wxUSE_MENUS #if wxUSE_STATUSBAR // override to update statusbar position when the frame size changes - virtual void PositionStatusBar() wxOVERRIDE; + virtual void PositionStatusBar() override; #endif // wxUSE_MENUS protected: #if wxUSE_TOOLBAR - virtual void PositionToolBar() wxOVERRIDE; + virtual void PositionToolBar() override; #endif // wxUSE_TOOLBAR wxDECLARE_EVENT_TABLE(); diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h index a92ca332e4..0080b65b76 100644 --- a/include/wx/univ/gauge.h +++ b/include/wx/univ/gauge.h @@ -44,8 +44,8 @@ public: const wxString& name = wxASCII_STR(wxGaugeNameStr)); // implement base class virtuals - virtual void SetRange(int range) wxOVERRIDE; - virtual void SetValue(int pos) wxOVERRIDE; + virtual void SetRange(int range) override; + virtual void SetValue(int pos) override; // wxUniv-specific methods @@ -60,13 +60,13 @@ protected: void Init(); // return the def border for a progress bar - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual wxBorder GetDefaultBorder() const override; // return the default size - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // draw the control - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; wxDECLARE_DYNAMIC_CLASS(wxGauge); }; diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h index 1affc52476..12927ea622 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) wxOVERRIDE + bool pressed) override { return m_handler ? m_handler->HandleKey(consumer, event, pressed) : false; } virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event) wxOVERRIDE + const wxMouseEvent& event) override { return m_handler ? m_handler->HandleMouse(consumer, event) : false; } - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) wxOVERRIDE + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) override { return m_handler ? m_handler->HandleMouseMove(consumer, event) : false; } - virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) wxOVERRIDE + virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) override { return m_handler ? m_handler->HandleFocus(consumer, event) : false; } diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 3e4ccd26ca..c36fc1e2fa 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -95,40 +95,40 @@ public: const wxString& name = wxASCII_STR(wxListBoxNameStr)); // implement the listbox interface defined by wxListBoxBase - virtual void DoClear() wxOVERRIDE; - virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE; + virtual void DoClear() override; + virtual void DoDeleteOneItem(unsigned int n) override; - 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 unsigned int GetCount() const override; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& s) override; + virtual int FindString(const wxString& s, bool bCase = false) const override; - virtual bool IsSelected(int n) const wxOVERRIDE + virtual bool IsSelected(int n) const override { return m_selections.Index(n) != wxNOT_FOUND; } - virtual int GetSelection() const wxOVERRIDE; - virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; + virtual int GetSelection() const override; + virtual int GetSelections(wxArrayInt& aSelections) const override; protected: - virtual void DoSetSelection(int n, bool select) wxOVERRIDE; + virtual void DoSetSelection(int n, bool select) override; virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, - wxClientDataType type) wxOVERRIDE; + wxClientDataType type) override; - virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE; + virtual int DoListHitTest(const wxPoint& point) const override; // universal wxComboBox implementation internally uses wxListBox friend class WXDLLIMPEXP_FWD_CORE wxComboBox; - virtual void DoSetFirstItem(int n) wxOVERRIDE; + virtual void DoSetFirstItem(int n) override; - virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE; - virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE; + virtual void DoSetItemClientData(unsigned int n, void* clientData) override; + virtual void* DoGetItemClientData(unsigned int n) const override; public: // override some more base class methods - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetFont(const wxFont& font) override; // the wxUniversal-specific methods // -------------------------------- @@ -155,7 +155,7 @@ public: void SelectAndNotify(int item); // ensure that the given item is visible by scrolling it into view - virtual void EnsureVisible(int n) wxOVERRIDE; + virtual void EnsureVisible(int n) override; // 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 @@ -180,26 +180,26 @@ public: // override the wxControl virtual methods virtual bool PerformAction(const wxControlAction& action, long numArg = 0l, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } // idle processing - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; protected: // geometry - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual wxBorder GetDefaultBorder() const wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; + virtual wxBorder GetDefaultBorder() const override; // 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 72becf3b06..bbf3924bed 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) wxOVERRIDE; - virtual void Detach() wxOVERRIDE; + virtual void Attach(wxMenuBarBase *menubar) override; + virtual void Detach() override; // implementation only from here @@ -74,9 +74,9 @@ public: protected: // implement base class virtuals - virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE; - virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE; + virtual wxMenuItem* DoAppend(wxMenuItem *item) override; + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) override; + virtual wxMenuItem* DoRemove(wxMenuItem *item) override; // 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 ) 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 bool Append( wxMenu *menu, const wxString &title ) override; + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) override; + virtual wxMenu *Remove(size_t pos) override; - virtual void EnableTop(size_t pos, bool enable) wxOVERRIDE; - virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE; + virtual void EnableTop(size_t pos, bool enable) override; + virtual bool IsEnabledTop(size_t pos) const override; - virtual void SetMenuLabel(size_t pos, const wxString& label) wxOVERRIDE; - virtual wxString GetMenuLabel(size_t pos) const wxOVERRIDE; + virtual void SetMenuLabel(size_t pos, const wxString& label) override; + virtual wxString GetMenuLabel(size_t pos) const override; - virtual void Attach(wxFrame *frame) wxOVERRIDE; - virtual void Detach() wxOVERRIDE; + virtual void Attach(wxFrame *frame) override; + virtual void Detach() override; // get the next item for the givan accel letter (used by wxFrame), return // -1 if none @@ -204,10 +204,10 @@ protected: void OnDismiss(); // draw the menubar - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; // menubar geometry - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // 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 75627490ee..13a71fa1c6 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -28,21 +28,21 @@ public: virtual ~wxMenuItem(); // override base class virtuals to update the item appearance on screen - virtual void SetItemLabel(const wxString& text) wxOVERRIDE; - virtual void SetCheckable(bool checkable) wxOVERRIDE; + virtual void SetItemLabel(const wxString& text) override; + virtual void SetCheckable(bool checkable) override; - virtual void Enable(bool enable = true) wxOVERRIDE; - virtual void Check(bool check = true) wxOVERRIDE; + virtual void Enable(bool enable = true) override; + virtual void Check(bool check = true) override; // we add some extra functions which are also available under MSW from // wxOwnerDrawn class - they will be moved to wxMenuItemBase later // hopefully void SetBitmaps(const wxBitmapBundle& bmpChecked, const wxBitmapBundle& bmpUnchecked = wxBitmapBundle()); - virtual void SetBitmap(const wxBitmapBundle& bmp) wxOVERRIDE { SetBitmaps(bmp); } + virtual void SetBitmap(const wxBitmapBundle& bmp) override { SetBitmaps(bmp); } wxBitmap GetBitmap(bool checked) const { return GetBitmapFromBundle(checked ? m_bitmap : m_bmpUnchecked); } - virtual wxBitmap GetBitmap() const wxOVERRIDE + virtual wxBitmap GetBitmap() const override { return GetBitmap(true); } void SetDisabledBitmap( const wxBitmapBundle& bmpDisabled ) diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index f487118206..c285e09434 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) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); } + virtual int SetSelection(size_t nPage) override { return DoSetSelection(nPage, SetSelection_SendEvent); } // changes selected page without sending events - int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); } + int ChangeSelection(size_t nPage) override { return DoSetSelection(nPage); } - virtual bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE; - virtual wxString GetPageText(size_t nPage) const wxOVERRIDE; + virtual bool SetPageText(size_t nPage, const wxString& strText) override; + virtual wxString GetPageText(size_t nPage) const override; - virtual int GetPageImage(size_t nPage) const wxOVERRIDE; - virtual bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE; + virtual int GetPageImage(size_t nPage) const override; + virtual bool SetPageImage(size_t nPage, int nImage) override; - virtual void SetPageSize(const wxSize& size) wxOVERRIDE; - virtual void SetPadding(const wxSize& padding) wxOVERRIDE; - virtual void SetTabSize(const wxSize& sz) wxOVERRIDE; + virtual void SetPageSize(const wxSize& size) override; + virtual void SetPadding(const wxSize& padding) override; + virtual void SetTabSize(const wxSize& sz) override; - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE; + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const override; - virtual bool DeleteAllPages() wxOVERRIDE; + virtual bool DeleteAllPages() override; virtual bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = NO_IMAGE) wxOVERRIDE; + int imageId = NO_IMAGE) override; // style tests // ----------- @@ -103,17 +103,17 @@ public: // hit testing // ----------- - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE; + virtual int HitTest(const wxPoint& pt, long *flags = NULL) const override; // input handling // -------------- virtual bool PerformAction(const wxControlAction& action, long numArg = 0l, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } @@ -122,19 +122,19 @@ public: void RefreshCurrent(); protected: - virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE; + virtual wxNotebookPage *DoRemovePage(size_t nPage) override; // drawing - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n); // resizing - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; - int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE; + int DoSetSelection(size_t nPage, int flags = 0) override; // 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 wxOVERRIDE; + wxRect GetPageRect() const override; // 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 db67828f00..d02c88a0c8 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) wxOVERRIDE; - virtual int GetSelection() const wxOVERRIDE; + virtual void SetSelection(int n) override; + virtual int GetSelection() const override; - virtual unsigned int GetCount() const wxOVERRIDE + virtual unsigned int GetCount() const override { return (unsigned int)m_buttons.GetCount(); } - virtual wxString GetString(unsigned int n) const wxOVERRIDE; - virtual void SetString(unsigned int n, const wxString& label) wxOVERRIDE; + virtual wxString GetString(unsigned int n) const override; + virtual void SetString(unsigned int n, const wxString& label) override; - virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; - virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; + virtual bool Enable(unsigned int n, bool enable = true) override; + virtual bool Show(unsigned int n, bool show = true) override; - virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; - virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; + virtual bool IsItemEnabled(unsigned int n) const override; + virtual bool IsItemShown(unsigned int n) const override; // we also override the wxControl methods to avoid virtual function hiding - 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; + virtual bool Enable(bool enable = true) override; + virtual bool Show(bool show = true) override; + virtual wxString GetLabel() const override; + virtual void SetLabel(const wxString& label) override; // we inherit a version always returning false from wxStaticBox, override // it to behave normally - virtual bool AcceptsFocus() const wxOVERRIDE { return wxControl::AcceptsFocus(); } + virtual bool AcceptsFocus() const override { 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 wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { 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) wxOVERRIDE; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual void DoMoveWindow(int x, int y, int width, int height) override; + virtual wxSize DoGetBestClientSize() const override; // 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 711e0a676c..9fb68b4967 100644 --- a/include/wx/univ/radiobut.h +++ b/include/wx/univ/radiobut.h @@ -45,20 +45,20 @@ public: const wxString& name = wxASCII_STR(wxRadioButtonNameStr)); // (re)implement pure virtuals from wxRadioButtonBase - virtual void SetValue(bool value) wxOVERRIDE { return wxCheckBox::SetValue(value); } - virtual bool GetValue() const wxOVERRIDE { return wxCheckBox::GetValue(); } + virtual void SetValue(bool value) override { return wxCheckBox::SetValue(value); } + virtual bool GetValue() const override { return wxCheckBox::GetValue(); } // override some base class methods - virtual void ChangeValue(bool value) wxOVERRIDE; + virtual void ChangeValue(bool value) override; protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // implement our own drawing - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; // we use the radio button bitmaps for size calculation - virtual wxSize GetBitmapSize() const wxOVERRIDE; + virtual wxSize GetBitmapSize() const override; // the radio button can only be cleared using this method, not // ChangeValue() above - and it is protected as it can only be called by @@ -67,10 +67,10 @@ protected: // called when the radio button becomes checked: we clear all the buttons // in the same group with us here - virtual void OnCheck() wxOVERRIDE; + virtual void OnCheck() override; // send event about radio button selection - virtual void SendEvent() wxOVERRIDE; + virtual void SendEvent() override; private: wxDECLARE_DYNAMIC_CLASS(wxRadioButton); diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 986535c2be..e5bbb452a7 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 ) wxOVERRIDE + wxWindow *window = NULL ) override { m_renderer->DrawBackground(dc, col, rect, flags, window ); } virtual void DrawButtonSurface(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags) wxOVERRIDE + int flags) override { m_renderer->DrawButtonSurface(dc, col, rect, flags); } - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) override { 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) wxOVERRIDE + wxRect *rectBounds = NULL) override { 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) wxOVERRIDE + wxRect *rectBounds = NULL) override { 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) wxOVERRIDE + wxRect *rectIn = NULL) override { m_renderer->DrawBorder(dc, border, rect, flags, rectIn); } virtual void DrawTextBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) wxOVERRIDE + wxRect *rectIn = NULL) override { m_renderer->DrawTextBorder(dc, border, rect, flags, rectIn); } virtual void DrawButtonBorder(wxDC& dc, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) wxOVERRIDE + wxRect *rectIn = NULL) override { 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) wxOVERRIDE + int indexAccel = -1) override { m_renderer->DrawFrame(dc, label, rect, flags, align, indexAccel); } virtual void DrawHorizontalLine(wxDC& dc, - wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE + wxCoord y, wxCoord x1, wxCoord x2) override { m_renderer->DrawHorizontalLine(dc, y, x1, x2); } virtual void DrawVerticalLine(wxDC& dc, - wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE + wxCoord x, wxCoord y1, wxCoord y2) override { m_renderer->DrawVerticalLine(dc, x, y1, y2); } virtual void DrawArrow(wxDC& dc, wxDirection dir, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawArrow(dc, dir, rect, flags); } virtual void DrawScrollbarArrow(wxDC& dc, wxDirection dir, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawScrollbarArrow(dc, dir, rect, flags); } virtual void DrawScrollbarThumb(wxDC& dc, wxOrientation orient, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawScrollbarThumb(dc, orient, rect, flags); } virtual void DrawScrollbarShaft(wxDC& dc, wxOrientation orient, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawScrollbarShaft(dc, orient, rect, flags); } virtual void DrawScrollCorner(wxDC& dc, - const wxRect& rect) wxOVERRIDE + const wxRect& rect) override { m_renderer->DrawScrollCorner(dc, rect); } virtual void DrawItem(wxDC& dc, const wxString& label, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawItem(dc, label, rect, flags); } virtual void DrawCheckItem(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { 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) wxOVERRIDE + int indexAccel = -1) override { 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) wxOVERRIDE + int indexAccel = -1) override { 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) wxOVERRIDE + int tbarStyle = 0) override { 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) wxOVERRIDE + int flags = 0) override { m_renderer->DrawTextLine(dc, text, rect, selStart, selEnd, flags); } - virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE + virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) override { 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) wxOVERRIDE + int accel = -1) override { 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) wxOVERRIDE + wxRect *rectShaft = NULL) override { 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) wxOVERRIDE + long style = 0) override { 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) wxOVERRIDE + long style = 0) override { 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) wxOVERRIDE + int indexAccel = -1) override { 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) wxOVERRIDE + int indexAccel = -1) override { m_renderer->DrawMenuItem(dc, y, gi, label, accel, bitmap, flags, indexAccel); } virtual void DrawMenuSeparator(wxDC& dc, wxCoord y, - const wxMenuGeometryInfo& geomInfo) wxOVERRIDE + const wxMenuGeometryInfo& geomInfo) override { 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) wxOVERRIDE + int flags = 0, int style = 0) override { 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) wxOVERRIDE + int specialButtonFlag = 0) override { m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags, specialButton, specialButtonFlag); } virtual void DrawFrameBorder(wxDC& dc, const wxRect& rect, - int flags) wxOVERRIDE + int flags) override { m_renderer->DrawFrameBorder(dc, rect, flags); } virtual void DrawFrameBackground(wxDC& dc, const wxRect& rect, - int flags) wxOVERRIDE + int flags) override { m_renderer->DrawFrameBackground(dc, rect, flags); } virtual void DrawFrameTitle(wxDC& dc, const wxRect& rect, const wxString& title, - int flags) wxOVERRIDE + int flags) override { m_renderer->DrawFrameTitle(dc, rect, title, flags); } virtual void DrawFrameIcon(wxDC& dc, const wxRect& rect, const wxIcon& icon, - int flags) wxOVERRIDE + int flags) override { m_renderer->DrawFrameIcon(dc, rect, icon, flags); } virtual void DrawFrameButton(wxDC& dc, wxCoord x, wxCoord y, int button, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawFrameButton(dc, x, y, button, flags); } #if wxUSE_COMBOBOX virtual void GetComboBitmaps(wxBitmap *bmpNormal, wxBitmap *bmpFocus, wxBitmap *bmpPressed, - wxBitmap *bmpDisabled) wxOVERRIDE + wxBitmap *bmpDisabled) override { m_renderer->GetComboBitmaps(bmpNormal, bmpFocus, bmpPressed, bmpDisabled); } #endif // wxUSE_COMBOBOX - virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE + virtual void AdjustSize(wxSize *size, const wxWindow *window) override { m_renderer->AdjustSize(size, window); } - virtual wxRect GetBorderDimensions(wxBorder border) const wxOVERRIDE + virtual wxRect GetBorderDimensions(wxBorder border) const override { return m_renderer->GetBorderDimensions(border); } - virtual bool AreScrollbarsInsideBorder() const wxOVERRIDE + virtual bool AreScrollbarsInsideBorder() const override { return m_renderer->AreScrollbarsInsideBorder(); } #if wxUSE_SCROLLBAR - virtual wxSize GetScrollbarArrowSize() const wxOVERRIDE + virtual wxSize GetScrollbarArrowSize() const override { return m_renderer->GetScrollbarArrowSize(); } #endif // wxUSE_SCROLLBAR - virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE + virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) override { return m_renderer->GetListboxItemHeight(fontHeight); } - virtual wxSize GetCheckBitmapSize() const wxOVERRIDE + virtual wxSize GetCheckBitmapSize() const override { return m_renderer->GetCheckBitmapSize(); } - virtual wxSize GetRadioBitmapSize() const wxOVERRIDE + virtual wxSize GetRadioBitmapSize() const override { return m_renderer->GetRadioBitmapSize(); } - virtual wxCoord GetCheckItemMargin() const wxOVERRIDE + virtual wxCoord GetCheckItemMargin() const override { return m_renderer->GetCheckItemMargin(); } #if wxUSE_TOOLBAR - virtual wxSize GetToolBarButtonSize(wxCoord *separator) const wxOVERRIDE + virtual wxSize GetToolBarButtonSize(wxCoord *separator) const override { return m_renderer->GetToolBarButtonSize(separator); } - virtual wxSize GetToolBarMargin() const wxOVERRIDE + virtual wxSize GetToolBarMargin() const override { return m_renderer->GetToolBarMargin(); } #endif // wxUSE_TOOLBAR #if wxUSE_TEXTCTRL virtual wxRect GetTextTotalArea(const wxTextCtrl *text, - const wxRect& rect) const wxOVERRIDE + const wxRect& rect) const override { return m_renderer->GetTextTotalArea(text, rect); } virtual wxRect GetTextClientArea(const wxTextCtrl *text, const wxRect& rect, - wxCoord *extraSpaceBeyond) const wxOVERRIDE + wxCoord *extraSpaceBeyond) const override { return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); } #endif // wxUSE_TEXTCTRL #if wxUSE_NOTEBOOK - virtual wxSize GetTabIndent() const wxOVERRIDE { return m_renderer->GetTabIndent(); } - virtual wxSize GetTabPadding() const wxOVERRIDE { return m_renderer->GetTabPadding(); } + virtual wxSize GetTabIndent() const override { return m_renderer->GetTabIndent(); } + virtual wxSize GetTabPadding() const override { return m_renderer->GetTabPadding(); } #endif // wxUSE_NOTEBOOK #if wxUSE_SLIDER - virtual wxCoord GetSliderDim() const wxOVERRIDE + virtual wxCoord GetSliderDim() const override { return m_renderer->GetSliderDim(); } - virtual wxCoord GetSliderTickLen() const wxOVERRIDE + virtual wxCoord GetSliderTickLen() const override { return m_renderer->GetSliderTickLen(); } virtual wxRect GetSliderShaftRect(const wxRect& rect, int lenThumb, wxOrientation orient, - long style = 0) const wxOVERRIDE + long style = 0) const override { return m_renderer->GetSliderShaftRect(rect, lenThumb, orient, style); } virtual wxSize GetSliderThumbSize(const wxRect& rect, int lenThumb, - wxOrientation orient) const wxOVERRIDE + wxOrientation orient) const override { return m_renderer->GetSliderThumbSize(rect, lenThumb, orient); } #endif // wxUSE_SLIDER - virtual wxSize GetProgressBarStep() const wxOVERRIDE + virtual wxSize GetProgressBarStep() const override { return m_renderer->GetProgressBarStep(); } #if wxUSE_MENUS - virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const wxOVERRIDE + virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const override { return m_renderer->GetMenuBarItemSize(sizeText); } virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win, - const wxMenu& menu) const wxOVERRIDE + const wxMenu& menu) const override { return m_renderer->GetMenuGeometry(win, menu); } #endif // wxUSE_MENUS #if wxUSE_STATUSBAR - virtual wxSize GetStatusBarBorders() const wxOVERRIDE + virtual wxSize GetStatusBarBorders() const override { return m_renderer->GetStatusBarBorders(); } - virtual wxCoord GetStatusBarBorderBetweenFields() const wxOVERRIDE + virtual wxCoord GetStatusBarBorderBetweenFields() const override { return m_renderer->GetStatusBarBorderBetweenFields(); } - virtual wxSize GetStatusBarFieldMargins() const wxOVERRIDE + virtual wxSize GetStatusBarFieldMargins() const override { return m_renderer->GetStatusBarFieldMargins(); } #endif // wxUSE_STATUSBAR - virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const wxOVERRIDE + virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const override { return m_renderer->GetFrameClientArea(rect, flags); } - virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const wxOVERRIDE + virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const override { return m_renderer->GetFrameTotalSize(clientSize, flags); } - virtual wxSize GetFrameMinSize(int flags) const wxOVERRIDE + virtual wxSize GetFrameMinSize(int flags) const override { return m_renderer->GetFrameMinSize(flags); } - virtual wxSize GetFrameIconSize() const wxOVERRIDE + virtual wxSize GetFrameIconSize() const override { return m_renderer->GetFrameIconSize(); } virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, - int flags) const wxOVERRIDE + int flags) const override { 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) wxOVERRIDE + wxHeaderButtonParams* params = NULL) override { return m_renderer->DrawHeaderButton(win, dc, rect, flags, sortIcon, params); } virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { m_renderer->DrawTreeItemButton(win, dc, rect, flags); } protected: diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h index acc1d3a1cb..6f1b6ad877 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 wxOVERRIDE; - virtual int GetThumbSize() const wxOVERRIDE; - virtual int GetPageSize() const wxOVERRIDE; - virtual int GetRange() const wxOVERRIDE; + virtual int GetThumbPosition() const override; + virtual int GetThumbSize() const override; + virtual int GetPageSize() const override; + virtual int GetRange() const override; - virtual void SetThumbPosition(int thumbPos) wxOVERRIDE; + virtual void SetThumbPosition(int thumbPos) override; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true) wxOVERRIDE; + bool refresh = true) override; // wxScrollBar actions void ScrollToStart(); void ScrollToEnd(); - bool ScrollLines(int nLines) wxOVERRIDE; - bool ScrollPages(int nPages) wxOVERRIDE; + bool ScrollLines(int nLines) override; + bool ScrollPages(int nPages) override; virtual bool PerformAction(const wxControlAction& action, long numArg = 0, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } // scrollbars around a normal window should not receive the focus - virtual bool AcceptsFocus() const wxOVERRIDE; + virtual bool AcceptsFocus() const override; // 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 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; + virtual wxRenderer *GetRenderer() const override { return m_renderer; } + virtual wxWindow *GetWindow() override { return this; } + virtual bool IsVertical() const override { return wxScrollBarBase::IsVertical(); } + virtual int GetArrowState(wxScrollArrows::Arrow arrow) const override; + virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set) override; + virtual bool OnArrow(wxScrollArrows::Arrow arrow) override; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const override; // 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() wxOVERRIDE; + virtual void OnInternalIdle() override; protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestClientSize() const override; + virtual void DoDraw(wxControlRenderer *renderer) override; + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // forces update of thumb's visual appearance (does nothing if m_dirty=false) void UpdateThumb(); @@ -212,10 +212,10 @@ public: virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, - bool pressed) wxOVERRIDE; + bool pressed) override; virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event) wxOVERRIDE; - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) wxOVERRIDE; + const wxMouseEvent& event) override; + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) override; virtual ~wxStdScrollBarInputHandler(); diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h index f7c079f45e..5f93adfd3a 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() wxOVERRIDE; + virtual void Notify() override; 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 1bc6c181bd..ec3cf3b48b 100644 --- a/include/wx/univ/slider.h +++ b/include/wx/univ/slider.h @@ -61,22 +61,22 @@ public: const wxString& name = wxASCII_STR(wxSliderNameStr)); // implement base class pure virtuals - virtual int GetValue() const wxOVERRIDE; - virtual void SetValue(int value) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int value) override; - virtual void SetRange(int minValue, int maxValue) wxOVERRIDE; - virtual int GetMin() const wxOVERRIDE; - virtual int GetMax() const wxOVERRIDE; + virtual void SetRange(int minValue, int maxValue) override; + virtual int GetMin() const override; + virtual int GetMax() const override; - virtual void SetLineSize(int lineSize) wxOVERRIDE; - virtual void SetPageSize(int pageSize) wxOVERRIDE; - virtual int GetLineSize() const wxOVERRIDE; - virtual int GetPageSize() const wxOVERRIDE; + virtual void SetLineSize(int lineSize) override; + virtual void SetPageSize(int pageSize) override; + virtual int GetLineSize() const override; + virtual int GetPageSize() const override; - virtual void SetThumbLength(int lenPixels) wxOVERRIDE; - virtual int GetThumbLength() const wxOVERRIDE; + virtual void SetThumbLength(int lenPixels) override; + virtual int GetThumbLength() const override; - virtual int GetTickFreq() const wxOVERRIDE { return m_tickFreq; } + virtual int GetTickFreq() const override { 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() wxOVERRIDE { return this; } - virtual bool IsVertical() const wxOVERRIDE { return IsVert(); } + virtual wxWindow *GetWindow() override { return this; } + virtual bool IsVertical() const override { return IsVert(); } - virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const wxOVERRIDE; - virtual wxCoord ThumbPosToPixel() const wxOVERRIDE; - virtual int PixelToThumbPos(wxCoord x) const wxOVERRIDE; + virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const override; + virtual wxCoord ThumbPosToPixel() const override; + virtual int PixelToThumbPos(wxCoord x) const override; virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart, int flag, - bool set = true) wxOVERRIDE; + bool set = true) override; - 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; + virtual void OnThumbDragStart(int pos) override; + virtual void OnThumbDrag(int pos) override; + virtual void OnThumbDragEnd(int pos) override; + virtual void OnPageScrollStart() override; + virtual bool OnPageScroll(int pageInc) override; // for wxStdSliderInputHandler wxScrollThumb& GetThumb() { return m_thumb; } virtual bool PerformAction(const wxControlAction& action, long numArg = 0, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } @@ -136,12 +136,12 @@ protected: }; // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq) wxOVERRIDE; + virtual void DoSetTickFreq(int freq) override; // overridden base class virtuals - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestClientSize() const override; + virtual void DoDraw(wxControlRenderer *renderer) override; + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // event handlers void OnSize(wxSizeEvent& event); diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 8dbe81e94c..d6210400a3 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 wxOVERRIDE; - virtual void SetValue(int val) wxOVERRIDE; - virtual void SetRange(int minVal, int maxVal) wxOVERRIDE; + virtual int GetValue() const override; + virtual void SetValue(int val) override; + virtual void SetRange(int minVal, int maxVal) override; // implement wxControlWithArrows methods - 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; + virtual wxRenderer *GetRenderer() const override { return m_renderer; } + virtual wxWindow *GetWindow() override { return this; } + virtual bool IsVertical() const override { return wxSpinButtonBase::IsVertical(); } + virtual int GetArrowState(wxScrollArrows::Arrow arrow) const override; + virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set) override; + virtual bool OnArrow(wxScrollArrows::Arrow arrow) override; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const override; // for wxStdSpinButtonInputHandler const wxScrollArrows& GetArrows() { return m_arrows; } virtual bool PerformAction(const wxControlAction& action, long numArg = 0, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxSize DoGetBestClientSize() const override; + virtual void DoDraw(wxControlRenderer *renderer) override; + virtual wxBorder GetDefaultBorder() const override { 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) wxOVERRIDE; + bool pressed) override; virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event) wxOVERRIDE; + const wxMouseEvent& event) override; virtual bool HandleMouseMove(wxInputConsumer *consumer, - const wxMouseEvent& event) wxOVERRIDE; + const wxMouseEvent& event) override; }; #endif // _WX_UNIV_SPINBUTT_H_ diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h index 0f9a4876fe..6f124cbdaf 100644 --- a/include/wx/univ/statbmp.h +++ b/include/wx/univ/statbmp.h @@ -52,12 +52,12 @@ public: long style = 0, const wxString& name = wxASCII_STR(wxStaticBitmapNameStr)); - virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual void SetBitmap(const wxBitmapBundle& bitmap) override; - virtual bool HasTransparentBackground() wxOVERRIDE { return true; } + virtual bool HasTransparentBackground() override { return true; } protected: - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; private: wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap); diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h index 6e54afb793..c2452866d6 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 wxOVERRIDE { return true; } + virtual bool IsStaticBox() const override { return true; } protected: // draw the control - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; // get the size of the border wxRect GetBorderGeometry() const; diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h index e67e43bbce..455fe8792e 100644 --- a/include/wx/univ/statline.h +++ b/include/wx/univ/statline.h @@ -45,7 +45,7 @@ public: const wxString &name = wxASCII_STR(wxStaticLineNameStr) ); protected: - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; private: wxDECLARE_DYNAMIC_CLASS(wxStaticLine); diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 72e038b9e9..d524e65082 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) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; - virtual bool IsFocused() const wxOVERRIDE { return false; } + virtual bool IsFocused() const override { return false; } protected: // draw the control - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; - virtual void WXSetVisibleLabel(const wxString& str) wxOVERRIDE; - virtual wxString WXGetVisibleLabel() const wxOVERRIDE; + virtual void WXSetVisibleLabel(const wxString& str) override; + virtual wxString WXGetVisibleLabel() const override; wxDECLARE_DYNAMIC_CLASS(wxStaticText); }; diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index a5f05bab25..58d1a5be6b 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -39,35 +39,35 @@ public: const wxString& name = wxASCII_STR(wxPanelNameStr)); // implement base class methods - virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE; - virtual void SetStatusWidths(int n, const int widths[]) wxOVERRIDE; + virtual void SetFieldsCount(int number = 1, const int *widths = NULL) override; + virtual void SetStatusWidths(int n, const int widths[]) override; - virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE; - virtual void SetMinHeight(int height) wxOVERRIDE; + virtual bool GetFieldRect(int i, wxRect& rect) const override; + virtual void SetMinHeight(int height) override; - virtual int GetBorderX() const wxOVERRIDE; - virtual int GetBorderY() const wxOVERRIDE; + virtual int GetBorderX() const override; + virtual int GetBorderY() const override; // wxInputConsumer pure virtual - virtual wxWindow *GetInputWindow() const wxOVERRIDE + virtual wxWindow *GetInputWindow() const override { return const_cast(this); } protected: - virtual void DoUpdateStatusText(int i) wxOVERRIDE; + virtual void DoUpdateStatusText(int i) override; // recalculate the field widths void OnSize(wxSizeEvent& event); // draw the statusbar - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDraw(wxControlRenderer *renderer) override; // tell them about our preferred height - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; // 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) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; // get the (fixed) status bar height wxCoord GetHeight() const; diff --git a/include/wx/univ/stdrend.h b/include/wx/univ/stdrend.h index 06077e57f5..7bcd29cb1d 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) wxOVERRIDE; + wxWindow *window = NULL) override; virtual void DrawButtonSurface(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags) wxOVERRIDE; + int flags) override; - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) override; 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) wxOVERRIDE; + wxRect *rectBounds = NULL) override; 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) wxOVERRIDE; + wxRect *rectBounds = NULL) override; virtual void DrawBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) wxOVERRIDE; + wxRect *rectIn = NULL) override; virtual void DrawTextBorder(wxDC& dc, wxBorder border, const wxRect& rect, int flags = 0, - wxRect *rectIn = NULL) wxOVERRIDE; + wxRect *rectIn = NULL) override; virtual void DrawHorizontalLine(wxDC& dc, - wxCoord y, wxCoord x1, wxCoord x2) wxOVERRIDE; + wxCoord y, wxCoord x1, wxCoord x2) override; virtual void DrawVerticalLine(wxDC& dc, - wxCoord x, wxCoord y1, wxCoord y2) wxOVERRIDE; + wxCoord x, wxCoord y1, wxCoord y2) override; virtual void DrawFrame(wxDC& dc, const wxString& label, const wxRect& rect, int flags = 0, int alignment = wxALIGN_LEFT, - int indexAccel = -1) wxOVERRIDE; + int indexAccel = -1) override; virtual void DrawItem(wxDC& dc, const wxString& label, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCheckItem(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; 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) wxOVERRIDE; + int indexAccel = -1) override; virtual void DrawRadioButton(wxDC& dc, const wxString& label, const wxBitmap& bitmap, const wxRect& rect, int flags = 0, wxAlignment align = wxALIGN_LEFT, - int indexAccel = -1) wxOVERRIDE; + int indexAccel = -1) override; virtual void DrawScrollbarArrow(wxDC& dc, wxDirection dir, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawScrollCorner(wxDC& dc, - const wxRect& rect) wxOVERRIDE; + const wxRect& rect) override; #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) wxOVERRIDE; + int flags = 0) override; - virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) wxOVERRIDE; + virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) override; virtual wxRect GetTextTotalArea(const wxTextCtrl *text, - const wxRect& rect) const wxOVERRIDE; + const wxRect& rect) const override; virtual wxRect GetTextClientArea(const wxTextCtrl *text, const wxRect& rect, - wxCoord *extraSpaceBeyond) const wxOVERRIDE; + wxCoord *extraSpaceBeyond) const override; #endif // wxUSE_TEXTCTRL - virtual wxRect GetBorderDimensions(wxBorder border) const wxOVERRIDE; + virtual wxRect GetBorderDimensions(wxBorder border) const override; - virtual bool AreScrollbarsInsideBorder() const wxOVERRIDE; + virtual bool AreScrollbarsInsideBorder() const override; - virtual void AdjustSize(wxSize *size, const wxWindow *window) wxOVERRIDE; + virtual void AdjustSize(wxSize *size, const wxWindow *window) override; - virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) wxOVERRIDE; + virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) override; #if wxUSE_STATUSBAR virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0, int style = 0) wxOVERRIDE; + int flags = 0, int style = 0) override; - virtual wxSize GetStatusBarBorders() const wxOVERRIDE; + virtual wxSize GetStatusBarBorders() const override; - virtual wxCoord GetStatusBarBorderBetweenFields() const wxOVERRIDE; + virtual wxCoord GetStatusBarBorderBetweenFields() const override; - virtual wxSize GetStatusBarFieldMargins() const wxOVERRIDE; + virtual wxSize GetStatusBarFieldMargins() const override; #endif // wxUSE_STATUSBAR - virtual wxCoord GetCheckItemMargin() const wxOVERRIDE { return 0; } + virtual wxCoord GetCheckItemMargin() const override { return 0; } virtual void DrawFrameTitleBar(wxDC& dc, @@ -158,37 +158,37 @@ public: const wxIcon& icon, int flags, int specialButton = 0, - int specialButtonFlag = 0) wxOVERRIDE; + int specialButtonFlag = 0) override; virtual void DrawFrameBorder(wxDC& dc, const wxRect& rect, - int flags) wxOVERRIDE; + int flags) override; virtual void DrawFrameBackground(wxDC& dc, const wxRect& rect, - int flags) wxOVERRIDE; + int flags) override; virtual void DrawFrameTitle(wxDC& dc, const wxRect& rect, const wxString& title, - int flags) wxOVERRIDE; + int flags) override; virtual void DrawFrameIcon(wxDC& dc, const wxRect& rect, const wxIcon& icon, - int flags) wxOVERRIDE; + int flags) override; virtual void DrawFrameButton(wxDC& dc, wxCoord x, wxCoord y, int button, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const wxOVERRIDE; + virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const override; - virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const wxOVERRIDE; + virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const override; - virtual wxSize GetFrameMinSize(int flags) const wxOVERRIDE; + virtual wxSize GetFrameMinSize(int flags) const override; - virtual wxSize GetFrameIconSize() const wxOVERRIDE; + virtual wxSize GetFrameIconSize() const override; virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, - int flags = 0) const wxOVERRIDE; + int flags = 0) const override; protected: // various constants enum ArrowDirection diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 7b59237332..b1c9025465 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -104,40 +104,40 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual int GetLineLength(wxTextCoord lineNo) const wxOVERRIDE; - virtual wxString GetLineText(wxTextCoord lineNo) const wxOVERRIDE; - virtual int GetNumberOfLines() const wxOVERRIDE; + virtual int GetLineLength(wxTextCoord lineNo) const override; + virtual wxString GetLineText(wxTextCoord lineNo) const override; + virtual int GetNumberOfLines() const override; - virtual bool IsModified() const wxOVERRIDE; - virtual bool IsEditable() const wxOVERRIDE; + virtual bool IsModified() const override; + virtual bool IsEditable() const override; - virtual void SetMaxLength(unsigned long len) wxOVERRIDE; + virtual void SetMaxLength(unsigned long len) override; // If the return values from and to are the same, there is no selection. - virtual void GetSelection(wxTextPos* from, wxTextPos* to) const wxOVERRIDE; + virtual void GetSelection(wxTextPos* from, wxTextPos* to) const override; // operations // ---------- // editing - virtual void Clear() wxOVERRIDE; - virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value) wxOVERRIDE; - virtual void Remove(wxTextPos from, wxTextPos to) wxOVERRIDE; + virtual void Clear() override; + virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value) override; + virtual void Remove(wxTextPos from, wxTextPos to) override; // sets/clears the dirty flag - virtual void MarkDirty() wxOVERRIDE; - virtual void DiscardEdits() wxOVERRIDE; + virtual void MarkDirty() override; + virtual void DiscardEdits() override; // writing text inserts it at the current position, appending always // inserts it at the end - virtual void WriteText(const wxString& text) wxOVERRIDE; - virtual void AppendText(const wxString& text) wxOVERRIDE; + virtual void WriteText(const wxString& text) override; + virtual void AppendText(const wxString& text) override; // 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 wxOVERRIDE; + virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const override; virtual bool PositionToXY(wxTextPos pos, - wxTextCoord *x, wxTextCoord *y) const wxOVERRIDE; + wxTextCoord *x, wxTextCoord *y) const override; // wxUniv-specific: find a screen position (in client coordinates) of the // given text position or of the caret @@ -145,28 +145,28 @@ public: bool PositionToDeviceXY(wxTextPos pos, wxCoord *x, wxCoord *y) const; wxPoint GetCaretPosition() const; - virtual void ShowPosition(wxTextPos pos) wxOVERRIDE; + virtual void ShowPosition(wxTextPos pos) override; // Clipboard operations - virtual void Copy() wxOVERRIDE; - virtual void Cut() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; + virtual void Copy() override; + virtual void Cut() override; + virtual void Paste() override; // Undo/redo - virtual void Undo() wxOVERRIDE; - virtual void Redo() wxOVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual bool CanUndo() const wxOVERRIDE; - virtual bool CanRedo() const wxOVERRIDE; + virtual bool CanUndo() const override; + virtual bool CanRedo() const override; // Insertion point - virtual void SetInsertionPoint(wxTextPos pos) wxOVERRIDE; - virtual void SetInsertionPointEnd() wxOVERRIDE; - virtual wxTextPos GetInsertionPoint() const wxOVERRIDE; - virtual wxTextPos GetLastPosition() const wxOVERRIDE; + virtual void SetInsertionPoint(wxTextPos pos) override; + virtual void SetInsertionPointEnd() override; + virtual wxTextPos GetInsertionPoint() const override; + virtual wxTextPos GetLastPosition() const override; - virtual void SetSelection(wxTextPos from, wxTextPos to) wxOVERRIDE; - virtual void SetEditable(bool editable) wxOVERRIDE; + virtual void SetSelection(wxTextPos from, wxTextPos to) override; + virtual void SetEditable(bool editable) override; // wxUniv-specific methods // ----------------------- @@ -187,10 +187,10 @@ public: void RemoveSelection(); wxString GetSelectionText() const; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const override; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, - wxTextCoord *row) const wxOVERRIDE; + wxTextCoord *row) const override; // find the character at this position in the given line, return value as // for HitTest() @@ -208,7 +208,7 @@ public: void ScrollText(wxTextCoord col); // adjust the DC for horz text control scrolling too - virtual void DoPrepareDC(wxDC& dc) wxOVERRIDE; + virtual void DoPrepareDC(wxDC& dc) override; // implementation only from now on // ------------------------------- @@ -220,17 +220,17 @@ public: // perform an action virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } // override these methods to handle the caret - virtual bool SetFont(const wxFont &font) wxOVERRIDE; - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool SetFont(const wxFont &font) override; + virtual bool Enable(bool enable = true) override; // more readable flag testing methods bool IsPassword() const { return HasFlag(wxTE_PASSWORD); } @@ -241,25 +241,25 @@ public: // override wxScrollHelper method to prevent (auto)scrolling beyond the end // of line - virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const wxOVERRIDE; + virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const override; // idle processing - virtual void OnInternalIdle() wxOVERRIDE; + virtual void OnInternalIdle() override; protected: // ensure we have correct default border - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_SUNKEN; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_SUNKEN; } // override base class methods - virtual void DoDrawBorder(wxDC& dc, const wxRect& rect) wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual void DoDrawBorder(wxDC& dc, const wxRect& rect) override; + virtual void DoDraw(wxControlRenderer *renderer) override; // calc the size from the text extent - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; // implements Set/ChangeValue() - virtual void DoSetValue(const wxString& value, int flags = 0) wxOVERRIDE; - virtual wxString DoGetValue() const wxOVERRIDE; + virtual void DoSetValue(const wxString& value, int flags = 0) override; + virtual wxString DoGetValue() const override; // common part of all ctors void Init(); diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h index a49adefea7..bfe85482d1 100644 --- a/include/wx/univ/tglbtn.h +++ b/include/wx/univ/tglbtn.h @@ -39,18 +39,18 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxASCII_STR(wxCheckBoxNameStr)); - virtual bool IsPressed() const wxOVERRIDE { return m_isPressed || m_value; } + virtual bool IsPressed() const override { return m_isPressed || m_value; } // wxToggleButton actions - virtual void Toggle() wxOVERRIDE; - virtual void Click() wxOVERRIDE; + virtual void Toggle() override; + virtual void Click() override; // Get/set the value void SetValue(bool state); bool GetValue() const { return m_value; } protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } // the current value bool m_value; diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 3d8bcd7238..f0efb03799 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -56,23 +56,23 @@ public: virtual ~wxToolBar(); - virtual bool Realize() wxOVERRIDE; + virtual bool Realize() override; - virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; + virtual void SetWindowStyleFlag( long style ) override; - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE; + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const override; - virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE; + virtual void SetToolShortHelp(int id, const wxString& helpString) override; - virtual void SetMargins(int x, int y) wxOVERRIDE; + virtual void SetMargins(int x, int y) override; 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) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { return GetStdInputHandler(handlerDef); } @@ -82,12 +82,12 @@ protected: void Init(); // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE; + virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) override; + virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) override; - 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 void DoEnableTool(wxToolBarToolBase *tool, bool enable) override; + virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) override; + virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) override; virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, @@ -96,12 +96,12 @@ protected: wxItemKind kind, wxObject *clientData, const wxString& shortHelp, - const wxString& longHelp) wxOVERRIDE; + const wxString& longHelp) override; virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label) wxOVERRIDE; + const wxString& label) override; - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; + virtual void DoDraw(wxControlRenderer *renderer) override; // 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 e2e8efc43e..f91fc123d5 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) wxOVERRIDE; - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; - virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE; + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) override; + virtual wxPoint GetClientAreaOrigin() const override; + virtual void SetIcons(const wxIconBundle& icons) override; // implementation from now on // -------------------------- @@ -139,10 +139,10 @@ public: virtual bool PerformAction(const wxControlAction& action, long numArg = -1, - const wxString& strArg = wxEmptyString) wxOVERRIDE; + const wxString& strArg = wxEmptyString) override; static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); - virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) override { 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 wxOVERRIDE; + virtual wxSize GetMinSize() const override; - virtual wxWindow *GetInputWindow() const wxOVERRIDE { return const_cast(this); } + virtual wxWindow *GetInputWindow() const override { return const_cast(this); } protected: - virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE; - virtual void DoSetClientSize(int width, int height) wxOVERRIDE; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual void DoSetClientSize(int width, int height) override; // 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 5909cbcba6..b69eb80346 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 ) 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; + bool refresh = true ) override; + virtual void SetScrollPos(int orient, int pos, bool refresh = true) override; + virtual int GetScrollPos(int orient) const override; + virtual int GetScrollThumb(int orient) const override; + virtual int GetScrollRange(int orient) const override; virtual void ScrollWindow(int dx, int dy, - const wxRect* rect = NULL) wxOVERRIDE; + const wxRect* rect = NULL) override; // take into account the borders here - virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE; + virtual wxPoint GetClientAreaOrigin() const override; // 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) wxOVERRIDE; + const wxRect *rect = (const wxRect *) NULL) override; // we refresh the window when it is dis/enabled - virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) override; // should we use the standard control colours or not? - virtual bool ShouldInheritColours() const wxOVERRIDE { return false; } + virtual bool ShouldInheritColours() const override { return false; } - virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE + virtual bool IsClientAreaChild(const wxWindow *child) const override { #if wxUSE_SCROLLBAR if ( child == (wxWindow*)m_scrollbarHorz || @@ -197,20 +197,20 @@ public: return wxWindowNative::IsClientAreaChild(child); } - virtual wxSize GetWindowBorderSize() const wxOVERRIDE; + virtual wxSize GetWindowBorderSize() const override; protected: // common part of all ctors void Init(); #if wxUSE_MENUS - virtual bool DoPopupMenu(wxMenu *menu, int x, int y) wxOVERRIDE; + virtual bool DoPopupMenu(wxMenu *menu, int x, int y) override; #endif // wxUSE_MENUS // we deal with the scrollbars in these functions - 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; + virtual void DoSetClientSize(int width, int height) override; + virtual void DoGetClientSize(int *width, int *height) const override; + virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const override; // event handlers void OnSize(wxSizeEvent& event); diff --git a/include/wx/unix/app.h b/include/wx/unix/app.h index 8b173548a8..0d27e4a205 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) wxOVERRIDE; + virtual bool Initialize(int& argc, wxChar** argv) override; // Unix-specific: Unix signal handling diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 65136534e9..b05e2f1ba0 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() wxOVERRIDE; + virtual wxEventLoopBase *CreateEventLoop() override; #endif // wxUSE_CONSOLE_EVENTLOOP #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) override; #endif }; @@ -48,42 +48,42 @@ public: class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: - virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE; - virtual int WaitForChild(wxExecuteData& execData) wxOVERRIDE; + virtual wxEventLoopBase *CreateEventLoop() override; + virtual int WaitForChild(wxExecuteData& execData) override; #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) override; #endif #if wxUSE_THREADS && defined(__WXGTK20__) - virtual void MutexGuiEnter() wxOVERRIDE; - virtual void MutexGuiLeave() wxOVERRIDE; + virtual void MutexGuiEnter() override; + virtual void MutexGuiLeave() override; #endif wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL, - int *microVer = NULL) const wxOVERRIDE; + int *microVer = NULL) const override; #ifdef __WXGTK20__ - virtual wxString GetDesktopEnvironment() const wxOVERRIDE; + virtual wxString GetDesktopEnvironment() const override; #endif // __WXGTK20____ #if defined(__WXGTK20__) - virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE; + virtual bool ShowAssertDialog(const wxString& msg) override; #endif #if wxUSE_SOCKETS #ifdef wxHAS_GUI_SOCKET_MANAGER - virtual wxSocketManager *GetSocketManager() wxOVERRIDE; + virtual wxSocketManager *GetSocketManager() override; #endif #ifdef wxHAS_GUI_FDIOMANAGER - virtual wxFDIOManager *GetFDIOManager() wxOVERRIDE; + virtual wxFDIOManager *GetFDIOManager() override; #endif #endif // wxUSE_SOCKETS #if wxUSE_EVENTLOOP_SOURCE - virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() wxOVERRIDE; + virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() override; #endif }; diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index 5c2d074620..690a55f439 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 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; } + virtual bool Pending() const override; + virtual bool Dispatch() override; + virtual int DispatchTimeout(unsigned long timeout) override; + virtual void WakeUp() override; + virtual bool IsOk() const override { return m_dispatcher != NULL; } protected: - virtual void OnNextIteration() wxOVERRIDE; - virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE; + virtual void OnNextIteration() override; + virtual void DoYieldFor(long eventsToProcess) override; private: // pipe used for wake up messages: when a child thread wants to wake up diff --git a/include/wx/unix/glegl.h b/include/wx/unix/glegl.h index 1a6b84bed1..f9e4d230a1 100644 --- a/include/wx/unix/glegl.h +++ b/include/wx/unix/glegl.h @@ -40,7 +40,7 @@ public: const wxGLContextAttrs *ctxAttrs = NULL); virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; + virtual bool SetCurrent(const wxGLCanvas& win) const override; private: EGLContext m_glContext; @@ -73,7 +73,7 @@ public: // implement wxGLCanvasBase methods // -------------------------------- - virtual bool SwapBuffers() wxOVERRIDE; + virtual bool SwapBuffers() override; // X11-specific methods @@ -88,7 +88,7 @@ public: // return true only if the window is realized: OpenGL context can't be // created until we are - virtual bool IsShownOnScreen() const wxOVERRIDE; + virtual bool IsShownOnScreen() const override; // implementation only from now on @@ -153,7 +153,7 @@ public: wxGLApp() : wxGLAppBase() { } // implement wxGLAppBase method - virtual bool InitGLVisual(const int *attribList) wxOVERRIDE + virtual bool InitGLVisual(const int *attribList) override { return wxGLCanvasEGL::InitDefaultConfig(attribList); } @@ -161,13 +161,13 @@ public: // This method is not currently used by the library itself, but remains for // backwards compatibility and also because wxGTK has it we could start // using it for the same purpose in wxX11 too some day. - virtual void* GetXVisualInfo() wxOVERRIDE + virtual void* GetXVisualInfo() override { return wxGLCanvasEGL::GetDefaultConfig(); } // and override this wxApp method to clean up - virtual int OnExit() wxOVERRIDE + virtual int OnExit() override { wxGLCanvasEGL::FreeDefaultConfig(); diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h index e7b49bbe10..6201009937 100644 --- a/include/wx/unix/glx11.h +++ b/include/wx/unix/glx11.h @@ -27,7 +27,7 @@ public: const wxGLContextAttrs *ctxAttrs = NULL); virtual ~wxGLContext(); - virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE; + virtual bool SetCurrent(const wxGLCanvas& win) const override; private: GLXContext m_glContext; @@ -58,7 +58,7 @@ public: // implement wxGLCanvasBase methods // -------------------------------- - virtual bool SwapBuffers() wxOVERRIDE; + virtual bool SwapBuffers() override; // X11-specific methods @@ -82,7 +82,7 @@ public: // return true only if the window is realized: OpenGL context can't be // created until we are - virtual bool IsShownOnScreen() const wxOVERRIDE; + virtual bool IsShownOnScreen() const override; // implementation only from now on @@ -111,15 +111,15 @@ private: class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase { public: - virtual bool InitGLVisual(const int *attribList) wxOVERRIDE; + virtual bool InitGLVisual(const int *attribList) override; // This method is not currently used by the library itself, but remains for // backwards compatibility and also because wxGTK has it we could start // using it for the same purpose in wxX11 too some day. - virtual void* GetXVisualInfo() wxOVERRIDE; + virtual void* GetXVisualInfo() override; // and override this wxApp method to clean up - virtual int OnExit() wxOVERRIDE; + virtual int OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxGLApp); diff --git a/include/wx/unix/private/epolldispatcher.h b/include/wx/unix/private/epolldispatcher.h index 7bdfb0ffc7..4dbd78fc6b 100644 --- a/include/wx/unix/private/epolldispatcher.h +++ b/include/wx/unix/private/epolldispatcher.h @@ -30,11 +30,11 @@ public: virtual ~wxEpollDispatcher(); // implement base class pure virtual methods - 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; + virtual bool RegisterFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL) override; + virtual bool ModifyFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL) override; + virtual bool UnregisterFD(int fd) override; + virtual bool HasPending() const override; + virtual int Dispatch(int timeout = TIMEOUT_INFINITE) override; private: // ctor is private, use Create() diff --git a/include/wx/unix/private/executeiohandler.h b/include/wx/unix/private/executeiohandler.h index c21350d6de..eeff9069c8 100644 --- a/include/wx/unix/private/executeiohandler.h +++ b/include/wx/unix/private/executeiohandler.h @@ -31,7 +31,7 @@ public: } // Called when the associated descriptor is available for reading. - virtual void OnReadWaiting() wxOVERRIDE + virtual void OnReadWaiting() override { // Sync process, process all data coming at us from the pipe so that // the pipe does not get full and cause a deadlock situation. @@ -44,8 +44,8 @@ public: // These methods are never called as we only monitor the associated FD for // reading, but we still must implement them as they're pure virtual in the // base class. - virtual void OnWriteWaiting() wxOVERRIDE { } - virtual void OnExceptionWaiting() wxOVERRIDE { } + virtual void OnWriteWaiting() override { } + virtual void OnExceptionWaiting() override { } // Disable any future calls to our OnReadWaiting(), can be called when // we're sure that no more input is forthcoming. @@ -93,7 +93,7 @@ public: } private: - virtual void DoDisable() wxOVERRIDE + virtual void DoDisable() override { m_dispatcher.UnregisterFD(m_fd); } @@ -122,7 +122,7 @@ public: } private: - virtual void DoDisable() wxOVERRIDE + virtual void DoDisable() override { delete m_source; m_source = NULL; diff --git a/include/wx/unix/private/fdiounix.h b/include/wx/unix/private/fdiounix.h index 09d79bb598..e621bdf751 100644 --- a/include/wx/unix/private/fdiounix.h +++ b/include/wx/unix/private/fdiounix.h @@ -19,8 +19,8 @@ class wxFDIOManagerUnix : public wxFDIOManager { public: - virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE; - virtual void RemoveInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE; + virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) override; + virtual void RemoveInput(wxFDIOHandler *handler, int fd, Direction d) override; }; #endif // _UNIX_PRIVATE_FDIOUNIX_H_ diff --git a/include/wx/unix/private/fswatcher_inotify.h b/include/wx/unix/private/fswatcher_inotify.h index e525920845..61efa0ed3f 100644 --- a/include/wx/unix/private/fswatcher_inotify.h +++ b/include/wx/unix/private/fswatcher_inotify.h @@ -60,9 +60,9 @@ public: m_service(service) { } - virtual void OnReadWaiting() wxOVERRIDE; - virtual void OnWriteWaiting() wxOVERRIDE; - virtual void OnExceptionWaiting() wxOVERRIDE; + virtual void OnReadWaiting() override; + virtual void OnWriteWaiting() override; + virtual void OnExceptionWaiting() override; protected: wxFSWatcherImplUnix* m_service; diff --git a/include/wx/unix/private/pipestream.h b/include/wx/unix/private/pipestream.h index dc842f6f67..57e9d70081 100644 --- a/include/wx/unix/private/pipestream.h +++ b/include/wx/unix/private/pipestream.h @@ -21,7 +21,7 @@ public: bool IsOpened() const { return !Eof(); } // return true if we have anything to read, don't block - virtual bool CanRead() const wxOVERRIDE; + virtual bool CanRead() const override; }; class wxPipeOutputStream : public wxFileOutputStream @@ -31,7 +31,7 @@ public: // Override the base class version to ignore "pipe full" errors: this is // not an error for this class. - size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + size_t OnSysWrite(const void *buffer, size_t size) override; }; #endif // _WX_UNIX_PRIVATE_PIPESTREAM_H_ diff --git a/include/wx/unix/private/sockunix.h b/include/wx/unix/private/sockunix.h index 97f4e6f585..ccc168d0e8 100644 --- a/include/wx/unix/private/sockunix.h +++ b/include/wx/unix/private/sockunix.h @@ -36,9 +36,9 @@ public: m_fds[1] = -1; } - virtual wxSocketError GetLastError() const wxOVERRIDE; + virtual wxSocketError GetLastError() const override; - virtual void ReenableEvents(wxSocketEventFlags flags) wxOVERRIDE + virtual void ReenableEvents(wxSocketEventFlags flags) override { // Events are only ever used for non-blocking sockets. if ( GetSocketFlags() & wxSOCKET_BLOCK ) @@ -59,7 +59,7 @@ public: EnableEvents(flags); } - virtual void UpdateBlockingState() wxOVERRIDE + virtual void UpdateBlockingState() override { // Make this int and not bool to allow passing it to ioctl(). int isNonBlocking = (GetSocketFlags() & wxSOCKET_BLOCK) == 0; @@ -69,13 +69,13 @@ public: } // wxFDIOHandler methods - virtual void OnReadWaiting() wxOVERRIDE; - virtual void OnWriteWaiting() wxOVERRIDE; - virtual void OnExceptionWaiting() wxOVERRIDE; - virtual bool IsOk() const wxOVERRIDE { return m_fd != INVALID_SOCKET; } + virtual void OnReadWaiting() override; + virtual void OnWriteWaiting() override; + virtual void OnExceptionWaiting() override; + virtual bool IsOk() const override { return m_fd != INVALID_SOCKET; } private: - virtual void DoClose() wxOVERRIDE + virtual void DoClose() override { DisableEvents(); @@ -121,16 +121,16 @@ public: m_fdioManager = NULL; } - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE { } + virtual bool OnInit() override; + virtual void OnExit() override { } - virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) wxOVERRIDE + virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) override { return new wxSocketImplUnix(wxsocket); } - virtual void Install_Callback(wxSocketImpl *socket_, wxSocketNotify event) wxOVERRIDE; - virtual void Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event) wxOVERRIDE; + virtual void Install_Callback(wxSocketImpl *socket_, wxSocketNotify event) override; + virtual void Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event) override; protected: // get the FD index corresponding to the given wxSocketNotify diff --git a/include/wx/unix/private/timer.h b/include/wx/unix/private/timer.h index 0c531b1b3f..2873a3573d 100644 --- a/include/wx/unix/private/timer.h +++ b/include/wx/unix/private/timer.h @@ -30,9 +30,9 @@ public: wxUnixTimerImpl(wxTimer *timer); virtual ~wxUnixTimerImpl(); - virtual bool IsRunning() const wxOVERRIDE; - virtual bool Start(int milliseconds = -1, bool oneShot = false) wxOVERRIDE; - virtual void Stop() wxOVERRIDE; + virtual bool IsRunning() const override; + virtual bool Start(int milliseconds = -1, bool oneShot = false) override; + virtual void Stop() override; // for wxTimerScheduler only: resets the internal flag indicating that the // timer is running diff --git a/include/wx/unix/private/wakeuppipe.h b/include/wx/unix/private/wakeuppipe.h index 982d4382ef..c01b5649a7 100644 --- a/include/wx/unix/private/wakeuppipe.h +++ b/include/wx/unix/private/wakeuppipe.h @@ -44,9 +44,9 @@ public: // Implement wxEventLoopSourceHandler pure virtual methods - virtual void OnReadWaiting() wxOVERRIDE; - virtual void OnWriteWaiting() wxOVERRIDE { } - virtual void OnExceptionWaiting() wxOVERRIDE { } + virtual void OnReadWaiting() override; + virtual void OnWriteWaiting() override { } + virtual void OnExceptionWaiting() override { } private: wxPipe m_pipe; @@ -80,7 +80,7 @@ public: WakeUpNoLock(); } - virtual void OnReadWaiting() wxOVERRIDE + virtual void OnReadWaiting() override { wxCriticalSectionLocker lock(m_pipeLock); diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h index b72b62b76e..8acabb0c08 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 wxOVERRIDE; + bool DoPlay(unsigned flags) const override; static void EnsureBackend(); void Free(); diff --git a/include/wx/unix/stackwalk.h b/include/wx/unix/stackwalk.h index 00c2e085de..879ec4fe86 100644 --- a/include/wx/unix/stackwalk.h +++ b/include/wx/unix/stackwalk.h @@ -32,7 +32,7 @@ public: } protected: - virtual void OnGetName() wxOVERRIDE; + virtual void OnGetName() override; // 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) wxOVERRIDE; + virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) override; #if wxUSE_ON_FATAL_EXCEPTION - virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE { Walk(2, maxDepth); } + virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) override { 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 45401cff38..98bc63e844 100644 --- a/include/wx/unix/stdpaths.h +++ b/include/wx/unix/stdpaths.h @@ -37,21 +37,21 @@ public: // implement base class pure virtuals - 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 GetExecutablePath() const override; + virtual wxString GetConfigDir() const override; + virtual wxString GetUserConfigDir() const override; + virtual wxString GetDataDir() const override; + virtual wxString GetLocalDataDir() const override; + virtual wxString GetUserDataDir() const override; + virtual wxString GetPluginsDir() const override; virtual wxString GetLocalizedResourcesDir(const wxString& lang, - ResourceCat category) const wxOVERRIDE; + ResourceCat category) const override; #ifndef __VMS - virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; + virtual wxString GetUserDir(Dir userDir) const override; #endif virtual wxString MakeConfigFileName(const wxString& basename, ConfigFileConv conv = ConfigFileConv_Ext - ) const wxOVERRIDE; + ) const override; protected: // Ctor is protected, use wxStandardPaths::Get() instead of instantiating diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h index 1aac326706..132cd95d56 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 wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE; - bool RemoveIcon() wxOVERRIDE; - bool PopupMenu(wxMenu *menu) wxOVERRIDE; + bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) override; + bool RemoveIcon() override; + bool PopupMenu(wxMenu *menu) override; protected: wxTaskBarIconArea *m_iconWnd; diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 995db4f86a..d839eec788 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 wxOVERRIDE { return new wxGenericValidator(*this); } + virtual wxObject *Clone() const override { 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)) wxOVERRIDE { return true; } + virtual bool Validate(wxWindow * WXUNUSED(parent)) override { return true; } // Called to transfer data to the window - virtual bool TransferToWindow() wxOVERRIDE; + virtual bool TransferToWindow() override; // Called to transfer data to the window - virtual bool TransferFromWindow() wxOVERRIDE; + virtual bool TransferFromWindow() override; protected: void Initialize(); diff --git a/include/wx/valnum.h b/include/wx/valnum.h index 75041a1ce4..b14f352ffd 100644 --- a/include/wx/valnum.h +++ b/include/wx/valnum.h @@ -48,11 +48,11 @@ public: // Override base class method to not do anything but always return success: // we don't need this as we do our validation on the fly here. - virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; } + virtual bool Validate(wxWindow * WXUNUSED(parent)) override { return true; } // Override base class method to check that the window is a text control or // combobox. - virtual void SetWindow(wxWindow *win) wxOVERRIDE; + virtual void SetWindow(wxWindow *win) override; protected: wxNumValidatorBase(int style) @@ -189,7 +189,7 @@ public: max = GetMax(); } - virtual bool TransferToWindow() wxOVERRIDE + virtual bool TransferToWindow() override { if ( m_value ) { @@ -203,7 +203,7 @@ public: return true; } - virtual bool TransferFromWindow() wxOVERRIDE + virtual bool TransferFromWindow() override { if ( m_value ) { @@ -236,14 +236,14 @@ protected: // Implement wxNumValidatorBase virtual method which is the same for // both integer and floating point numbers. - virtual wxString NormalizeString(const wxString& s) const wxOVERRIDE + virtual wxString NormalizeString(const wxString& s) const override { LongestValueType value; return BaseValidator::FromString(s, &value) ? NormalizeValue(value) : wxString(); } - virtual bool CanBeNegative() const wxOVERRIDE { return m_min < 0; } + virtual bool CanBeNegative() const override { return m_min < 0; } // This member is protected because it can be useful to the derived classes @@ -315,7 +315,7 @@ protected: virtual bool IsInRange(LongestValueType value) const = 0; // Implement wxNumValidatorBase pure virtual method. - virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const wxOVERRIDE; + virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const override; private: wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidatorBase); @@ -360,9 +360,9 @@ public: this->SetMax(max); } - virtual wxObject *Clone() const wxOVERRIDE { return new wxIntegerValidator(*this); } + virtual wxObject *Clone() const override { return new wxIntegerValidator(*this); } - virtual bool IsInRange(LongestValueType value) const wxOVERRIDE + virtual bool IsInRange(LongestValueType value) const override { // LongestValueType is used as a container for the values of any type // which can be used in type-independent wxIntegerValidatorBase code, @@ -433,7 +433,7 @@ protected: virtual bool IsInRange(LongestValueType value) const = 0; // Implement wxNumValidatorBase pure virtual method. - virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const wxOVERRIDE; + virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const override; private: // Maximum number of decimals digits after the decimal separator. @@ -478,12 +478,12 @@ public: this->SetPrecision(precision); } - virtual wxObject *Clone() const wxOVERRIDE + virtual wxObject *Clone() const override { return new wxFloatingPointValidator(*this); } - virtual bool IsInRange(LongestValueType value) const wxOVERRIDE + virtual bool IsInRange(LongestValueType value) const override { const ValueType valueT = static_cast(value); diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 61c339a22b..f895ceba54 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.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 wxOVERRIDE { return new wxTextValidator(*this); } + virtual wxObject *Clone() const override { 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) wxOVERRIDE; + virtual bool Validate(wxWindow *parent) override; // Called to transfer data to the window - virtual bool TransferToWindow() wxOVERRIDE; + virtual bool TransferToWindow() override; // Called to transfer data from the window - virtual bool TransferFromWindow() wxOVERRIDE; + virtual bool TransferFromWindow() override; // Filter keystrokes void OnChar(wxKeyEvent& event); diff --git a/include/wx/variant.h b/include/wx/variant.h index 432843da1f..a77f889345 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -387,8 +387,8 @@ public: // Attributes protected: - virtual wxObjectRefData *CreateRefData() const wxOVERRIDE; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE; + virtual wxObjectRefData *CreateRefData() const override; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override; wxString m_name; @@ -434,7 +434,7 @@ public: { } - virtual wxAnyValueType* GetAssociatedType() wxOVERRIDE + virtual wxAnyValueType* GetAssociatedType() override { return wxAnyValueTypeImpl::GetInstance(); } @@ -442,7 +442,7 @@ private: }; #define DECLARE_WXANY_CONVERSION() \ -virtual bool GetAsAny(wxAny* any) const wxOVERRIDE; \ +virtual bool GetAsAny(wxAny* any) const override; \ static wxVariantData* VariantDataFactory(const wxAny& any); #define _REGISTER_WXANY_CONVERSION(T, CLASSNAME, FUNC) \ @@ -493,12 +493,12 @@ public:\ \ classname &GetValue() { return m_value; } \ \ - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; \ + virtual bool Eq(wxVariantData& data) const override; \ \ - virtual wxString GetType() const wxOVERRIDE; \ - virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE; \ + virtual wxString GetType() const override; \ + virtual wxClassInfo* GetValueClassInfo() override; \ \ - virtual wxVariantData* Clone() const wxOVERRIDE { return new classname##VariantData(m_value); } \ + virtual wxVariantData* Clone() const override { return new classname##VariantData(m_value); } \ \ DECLARE_WXANY_CONVERSION() \ protected:\ diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h index b7b149ead6..48d4bc4d39 100644 --- a/include/wx/vlbox.h +++ b/include/wx/vlbox.h @@ -194,7 +194,7 @@ public: void RefreshSelected(); - virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE + virtual wxVisualAttributes GetDefaultAttributes() const override { return GetClassDefaultAttributes(GetWindowVariant()); } @@ -203,7 +203,7 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_THEME; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_THEME; } // the derived class must implement this function to actually draw the item // with the given index on the provided DC @@ -233,7 +233,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 wxOVERRIDE; + virtual wxCoord OnGetRowHeight(size_t line) const override; // event handlers diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index 8ceaf6d20e..a55fcb56da 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) wxOVERRIDE; + virtual void DoPrepareDC(wxDC& dc) override; // 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 wxOVERRIDE + virtual int GetOrientationTargetSize() const override { return GetTargetWindow()->GetClientSize().y; } - virtual int GetNonOrientationTargetSize() const wxOVERRIDE + virtual int GetNonOrientationTargetSize() const override { return GetTargetWindow()->GetClientSize().x; } - virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxVERTICAL; } + virtual wxOrientation GetOrientation() const override { 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 wxOVERRIDE { return OnGetRowHeight(n); } + wxCoord OnGetUnitSize(size_t n) const override { 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 wxOVERRIDE + virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const override { 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 wxOVERRIDE { return EstimateTotalHeight(); } + virtual wxCoord EstimateTotalSize() const override { 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 wxOVERRIDE + virtual int GetOrientationTargetSize() const override { return GetTargetWindow()->GetClientSize().x; } - virtual int GetNonOrientationTargetSize() const wxOVERRIDE + virtual int GetNonOrientationTargetSize() const override { return GetTargetWindow()->GetClientSize().y; } - virtual wxOrientation GetOrientation() const wxOVERRIDE { return wxHORIZONTAL; } + virtual wxOrientation GetOrientation() const override { 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 wxOVERRIDE { return OnGetColumnWidth(n); } + wxCoord OnGetUnitSize(size_t n) const override { 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 wxOVERRIDE + virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const override { 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 wxOVERRIDE { return EstimateTotalWidth(); } + virtual wxCoord EstimateTotalSize() const override { 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) wxOVERRIDE; + virtual void DoPrepareDC(wxDC& dc) override; // replacement implementation of wxWindow::Layout virtual method. To // properly forward calls to wxWindow::Layout use @@ -543,8 +543,8 @@ public: // classes #define WX_FORWARD_TO_VAR_SCROLL_HELPER() \ public: \ - virtual void PrepareDC(wxDC& dc) wxOVERRIDE { DoPrepareDC(dc); } \ - virtual bool Layout() wxOVERRIDE { return ScrollLayout(); } + virtual void PrepareDC(wxDC& dc) override { DoPrepareDC(dc); } \ + virtual bool Layout() override { return ScrollLayout(); } @@ -606,7 +606,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } + virtual void UpdateMacScrollWindow() override { Update(); } #endif // __WXMAC__ private: @@ -673,7 +673,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } + virtual void UpdateMacScrollWindow() override { Update(); } #endif // __WXMAC__ private: @@ -738,7 +738,7 @@ public: #ifdef __WXMAC__ protected: - virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); } + virtual void UpdateMacScrollWindow() override { Update(); } #endif // __WXMAC__ private: diff --git a/include/wx/weakref.h b/include/wx/weakref.h index 25e2306f87..5ad02e8a79 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -83,7 +83,7 @@ public: } } - virtual void OnObjectDestroy() wxOVERRIDE + virtual void OnObjectDestroy() override { // Tracked object itself removes us from list of trackers wxASSERT(m_pobj != NULL); @@ -175,7 +175,7 @@ public: } } - virtual void OnObjectDestroy() wxOVERRIDE + virtual void OnObjectDestroy() override { wxASSERT_MSG(m_pobj, "tracked object should have removed us itself"); diff --git a/include/wx/webrequest.h b/include/wx/webrequest.h index c8112872c3..762c690d23 100644 --- a/include/wx/webrequest.h +++ b/include/wx/webrequest.h @@ -285,7 +285,7 @@ public: void SetDataBuffer(const wxMemoryBuffer& dataBuf) { m_dataBuf = dataBuf; } - wxEvent* Clone() const wxOVERRIDE { return new wxWebRequestEvent(*this); } + wxEvent* Clone() const override { return new wxWebRequestEvent(*this); } private: wxWebRequest::State m_state; diff --git a/include/wx/webview.h b/include/wx/webview.h index a3be733d0c..9e0db1661e 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -341,7 +341,7 @@ public: wxWebViewNavigationActionFlags GetNavigationAction() const { return m_actionFlags; } const wxString& GetMessageHandler() const { return m_messageHandler; } - virtual wxEvent* Clone() const wxOVERRIDE { return new wxWebViewEvent(*this); } + virtual wxEvent* Clone() const override { return new wxWebViewEvent(*this); } private: wxString m_url; wxString m_target; diff --git a/include/wx/webviewarchivehandler.h b/include/wx/webviewarchivehandler.h index 6157b6b107..44db569cf4 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) wxOVERRIDE; + virtual wxFSFile* GetFile(const wxString &uri) override; private: wxFileSystem* m_fileSystem; }; diff --git a/include/wx/webviewfshandler.h b/include/wx/webviewfshandler.h index 275410ab3f..39670fd029 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) wxOVERRIDE; + virtual wxFSFile* GetFile(const wxString &uri) override; private: wxFileSystem* m_fileSystem; }; diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 7fea3d714f..fcd82084de 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 wxOVERRIDE; + virtual wxFileOffset GetLength() const override; bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const override; + virtual bool IsSeekable() const override { return m_file->GetKind() == wxFILE_KIND_DISK; } wxFile* GetFile() const { return m_file; } protected: wxFileInputStream(); - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; protected: wxFile *m_file; @@ -65,22 +65,22 @@ public: wxFileOutputStream(int fd); virtual ~wxFileOutputStream(); - void Sync() wxOVERRIDE; - bool Close() wxOVERRIDE { return m_file_destroy ? m_file->Close() : true; } - virtual wxFileOffset GetLength() const wxOVERRIDE; + void Sync() override; + bool Close() override { return m_file_destroy ? m_file->Close() : true; } + virtual wxFileOffset GetLength() const override; bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const override; + virtual bool IsSeekable() const override { 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) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; protected: wxFile *m_file; @@ -95,18 +95,18 @@ public: wxTempFileOutputStream(const wxString& fileName); virtual ~wxTempFileOutputStream(); - bool Close() wxOVERRIDE { return Commit(); } + bool Close() override { 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 wxOVERRIDE { return m_file->Length(); } - virtual bool IsSeekable() const wxOVERRIDE { return true; } + virtual wxFileOffset GetLength() const override { return m_file->Length(); } + virtual bool IsSeekable() const override { return true; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE + virtual size_t OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override { return m_file->Seek(pos, mode); } - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_file->Tell(); } + virtual wxFileOffset OnSysTell() const override { return m_file->Tell(); } private: wxTempFile *m_file; @@ -120,18 +120,18 @@ public: wxTempFFileOutputStream(const wxString& fileName); virtual ~wxTempFFileOutputStream(); - bool Close() wxOVERRIDE { return Commit(); } + bool Close() override { 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 wxOVERRIDE { return m_file->Length(); } - virtual bool IsSeekable() const wxOVERRIDE { return true; } + virtual wxFileOffset GetLength() const override { return m_file->Length(); } + virtual bool IsSeekable() const override { return true; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE + virtual size_t OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override { return m_file->Seek(pos, mode); } - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_file->Tell(); } + virtual wxFileOffset OnSysTell() const override { return m_file->Tell(); } private: wxTempFFile *m_file; @@ -144,29 +144,29 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream, { public: wxFileStream(const wxString& fileName); - virtual bool IsOk() const wxOVERRIDE; + virtual bool IsOk() const override; // 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 wxOVERRIDE + virtual bool IsSeekable() const override { return wxFileInputStream::IsSeekable(); } - virtual wxFileOffset GetLength() const wxOVERRIDE + virtual wxFileOffset GetLength() const override { return wxFileInputStream::GetLength(); } protected: - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override { return wxFileInputStream::OnSysSeek(pos, mode); } - virtual wxFileOffset OnSysTell() const wxOVERRIDE + virtual wxFileOffset OnSysTell() const override { return wxFileInputStream::OnSysTell(); } @@ -191,20 +191,20 @@ public: wxFFileInputStream(FILE *file); virtual ~wxFFileInputStream(); - virtual wxFileOffset GetLength() const wxOVERRIDE; + virtual wxFileOffset GetLength() const override; bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const override; + virtual bool IsSeekable() const override { return m_file->GetKind() == wxFILE_KIND_DISK; } wxFFile* GetFile() const { return m_file; } protected: wxFFileInputStream(); - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; protected: wxFFile *m_file; @@ -221,22 +221,22 @@ public: wxFFileOutputStream(FILE *file); virtual ~wxFFileOutputStream(); - void Sync() wxOVERRIDE; - bool Close() wxOVERRIDE { return m_file_destroy ? m_file->Close() : true; } - virtual wxFileOffset GetLength() const wxOVERRIDE; + void Sync() override; + bool Close() override { return m_file_destroy ? m_file->Close() : true; } + virtual wxFileOffset GetLength() const override; bool Ok() const { return IsOk(); } - virtual bool IsOk() const wxOVERRIDE; - virtual bool IsSeekable() const wxOVERRIDE { return m_file->GetKind() == wxFILE_KIND_DISK; } + virtual bool IsOk() const override; + virtual bool IsSeekable() const override { 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) wxOVERRIDE; - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE; + virtual size_t OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + virtual wxFileOffset OnSysTell() const override; protected: wxFFile *m_file; @@ -254,25 +254,25 @@ public: // override some virtual functions to resolve ambiguities, just as in // wxFileStream - virtual bool IsOk() const wxOVERRIDE; + virtual bool IsOk() const override; - virtual bool IsSeekable() const wxOVERRIDE + virtual bool IsSeekable() const override { return wxFFileInputStream::IsSeekable(); } - virtual wxFileOffset GetLength() const wxOVERRIDE + virtual wxFileOffset GetLength() const override { return wxFFileInputStream::GetLength(); } protected: - virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override { return wxFFileInputStream::OnSysSeek(pos, mode); } - virtual wxFileOffset OnSysTell() const wxOVERRIDE + virtual wxFileOffset OnSysTell() const override { return wxFFileInputStream::OnSysTell(); } diff --git a/include/wx/window.h b/include/wx/window.h index 80983c632a..819cbe7985 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -874,8 +874,8 @@ public: bool HandleWindowEvent(wxEvent& event) const; // disable wxEvtHandler double-linked list mechanism: - virtual void SetNextHandler(wxEvtHandler *handler) wxOVERRIDE; - virtual void SetPreviousHandler(wxEvtHandler *handler) wxOVERRIDE; + virtual void SetNextHandler(wxEvtHandler *handler) override; + virtual void SetPreviousHandler(wxEvtHandler *handler) override; protected: @@ -1685,8 +1685,8 @@ protected: const wxString& name); // event handling specific to wxWindow - virtual bool TryBefore(wxEvent& event) wxOVERRIDE; - virtual bool TryAfter(wxEvent& event) wxOVERRIDE; + virtual bool TryBefore(wxEvent& event) override; + virtual bool TryAfter(wxEvent& event) override; enum WindowOrder { @@ -2101,35 +2101,35 @@ public: // Can return either a child object, or an integer // representing the child element, starting from 1. - virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) wxOVERRIDE; + virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) override; // Returns the rectangle for this object (id = 0) or a child element (id > 0). - virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE; + virtual wxAccStatus GetLocation(wxRect& rect, int elementId) override; // Navigates from fromId to toId/toObject. virtual wxAccStatus Navigate(wxNavDir navDir, int fromId, - int* toId, wxAccessible** toObject) wxOVERRIDE; + int* toId, wxAccessible** toObject) override; // Gets the name of the specified object. - virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE; + virtual wxAccStatus GetName(int childId, wxString* name) override; // Gets the number of children. - virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE; + virtual wxAccStatus GetChildCount(int* childCount) override; // Gets the specified child (starting from 1). // If *child is NULL and return value is wxACC_OK, // this means that the child is a simple element and // not an accessible object. - virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE; + virtual wxAccStatus GetChild(int childId, wxAccessible** child) override; // Gets the parent, or NULL. - virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE; + virtual wxAccStatus GetParent(wxAccessible** parent) override; // Performs the default action. childId is 0 (the action for this object) // or > 0 (the action for a child). // Return wxACC_NOT_SUPPORTED if there is no default action for this // window (e.g. an edit control). - virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE; + virtual wxAccStatus DoDefaultAction(int childId) override; // Gets the default action for this object (0) or > 0 (the action for a child). // Return wxACC_OK even if there is no action. actionName is the action, or the empty @@ -2137,36 +2137,36 @@ public: // The retrieved string describes the action that is performed on an object, // not what the object does as a result. For example, a toolbar button that prints // a document has a default action of "Press" rather than "Prints the current document." - virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE; + virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) override; // Returns the description for this object or a child. - virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE; + virtual wxAccStatus GetDescription(int childId, wxString* description) override; // Returns help text for this object or a child, similar to tooltip text. - virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE; + virtual wxAccStatus GetHelpText(int childId, wxString* helpText) override; // Returns the keyboard shortcut for this object or child. // Return e.g. ALT+K - virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE; + virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) override; // Returns a role constant. - virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE; + virtual wxAccStatus GetRole(int childId, wxAccRole* role) override; // Returns a state constant. - virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE; + virtual wxAccStatus GetState(int childId, long* state) override; // Returns a localized string representing the value for the object // or child. - virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE; + virtual wxAccStatus GetValue(int childId, wxString* strValue) override; // Selects the object or child. - virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE; + virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) override; // Gets the window with the keyboard focus. // If childId is 0 and child is NULL, no object in // this subhierarchy has the focus. // If this object has the focus, child should be 'this'. - virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE; + virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) override; #if wxUSE_VARIANT // Gets a variant representing the selected children @@ -2177,7 +2177,7 @@ public: // - an integer representing the selected child element, // or 0 if this object is selected (GetType() == wxT("long") // - a "void*" pointer to a wxAccessible child object - virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE; + virtual wxAccStatus GetSelections(wxVariant* selections) override; #endif // wxUSE_VARIANT }; diff --git a/include/wx/wizard.h b/include/wx/wizard.h index 87415ff0e9..52bac54e34 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() wxOVERRIDE + virtual bool TransferDataToWindow() override { return GetValidator() ? GetValidator()->TransferToWindow() : wxPanel::TransferDataToWindow(); } - virtual bool TransferDataFromWindow() wxOVERRIDE + virtual bool TransferDataFromWindow() override { return GetValidator() ? GetValidator()->TransferFromWindow() : wxPanel::TransferDataFromWindow(); } - virtual bool Validate() wxOVERRIDE + virtual bool Validate() override { return GetValidator() ? GetValidator()->Validate(this) : wxPanel::Validate(); @@ -165,8 +165,8 @@ public: } // base class pure virtuals - virtual wxWizardPage *GetPrev() const wxOVERRIDE; - virtual wxWizardPage *GetNext() const wxOVERRIDE; + virtual wxWizardPage *GetPrev() const override; + virtual wxWizardPage *GetNext() const override; 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() wxOVERRIDE { return true; } - bool TransferDataFromWindow() wxOVERRIDE { return true; } - bool Validate() wxOVERRIDE { return true; } + bool TransferDataToWindow() override { return true; } + bool TransferDataFromWindow() override { return true; } + bool Validate() override { return true; } private: wxDECLARE_NO_COPY_CLASS(wxWizardBase); @@ -279,7 +279,7 @@ public: wxWizardPage* GetPage() const { return m_page; } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxWizardEvent(*this); } + virtual wxEvent *Clone() const override { return new wxWizardEvent(*this); } private: bool m_direction; diff --git a/include/wx/wrapsizer.h b/include/wx/wrapsizer.h index d0494a14a4..9291eee3c2 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() wxOVERRIDE; - virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE; + virtual wxSize CalcMin() override; + virtual void RepositionChildren(const wxSize& minSize) override; virtual bool InformFirstDirection(int direction, int size, - int availableOtherDir) wxOVERRIDE; + int availableOtherDir) override; protected: // This method is called to decide if an item represents empty space or diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index f274086ebb..d4febe9d69 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -108,7 +108,7 @@ public: virtual void ComputeScaleAndOrigin(); #if wxUSE_CAIRO - virtual void* GetCairoContext() const wxOVERRIDE; + virtual void* GetCairoContext() const override; #endif protected: diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index 59de47523e..c6c39da585 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -85,7 +85,7 @@ public: virtual wxFontStyle GetStyle() const; virtual int GetNumericWeight() const; virtual bool GetUnderlined() const; - virtual bool GetStrikethrough() const wxOVERRIDE; + virtual bool GetStrikethrough() const override; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; virtual const wxNativeFontInfo *GetNativeFontInfo() const; @@ -98,7 +98,7 @@ public: virtual void SetNumericWeight(int weight); virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); - virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE; + virtual void SetStrikethrough(bool strikethrough) override; virtual void SetEncoding(wxFontEncoding encoding); wxDECLARE_COMMON_FONT_METHODS(); diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index 9c1ca7f553..bc7840103b 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -65,7 +65,7 @@ public: bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp); unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n); void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable); - virtual int GetColoursCount() const wxOVERRIDE; + virtual int GetColoursCount() const override; protected: virtual wxGDIRefData *CreateGDIRefData() const; diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 8c46554fb0..ae8f03edde 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -49,8 +49,8 @@ public: virtual void Lower(); // SetLabel(), which does nothing in wxWindow - virtual void SetLabel(const wxString& label) wxOVERRIDE { m_Label = label; } - virtual wxString GetLabel() const wxOVERRIDE { return m_Label; } + virtual void SetLabel(const wxString& label) override { m_Label = label; } + virtual wxString GetLabel() const override { return m_Label; } virtual bool Show( bool show = true ); virtual bool Enable( bool enable = true ); diff --git a/include/wx/xrc/xh_activityindicator.h b/include/wx/xrc/xh_activityindicator.h index b6a0e8c360..708c083d39 100644 --- a/include/wx/xrc/xh_activityindicator.h +++ b/include/wx/xrc/xh_activityindicator.h @@ -19,8 +19,8 @@ class WXDLLIMPEXP_XRC wxActivityIndicatorXmlHandler : public wxXmlResourceHandle public: wxActivityIndicatorXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxDECLARE_DYNAMIC_CLASS(wxActivityIndicatorXmlHandler); diff --git a/include/wx/xrc/xh_animatctrl.h b/include/wx/xrc/xh_animatctrl.h index 5af50baa98..1f5beecaea 100644 --- a/include/wx/xrc/xh_animatctrl.h +++ b/include/wx/xrc/xh_animatctrl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxAnimationCtrlXmlHandler : public wxXmlResourceHandler public: wxAnimationCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_ANIMATIONCTRL diff --git a/include/wx/xrc/xh_aui.h b/include/wx/xrc/xh_aui.h index ada8e345f4..bf3391936b 100644 --- a/include/wx/xrc/xh_aui.h +++ b/include/wx/xrc/xh_aui.h @@ -23,8 +23,8 @@ class WXDLLIMPEXP_AUI wxAuiXmlHandler : public wxXmlResourceHandler { public: wxAuiXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; // Returns the wxAuiManager for the specified window wxAuiManager *GetAuiManager(wxWindow *managed) const; diff --git a/include/wx/xrc/xh_auitoolb.h b/include/wx/xrc/xh_auitoolb.h index 66c722ecac..c2f3352832 100644 --- a/include/wx/xrc/xh_auitoolb.h +++ b/include/wx/xrc/xh_auitoolb.h @@ -23,8 +23,8 @@ class WXDLLIMPEXP_AUI wxAuiToolBarXmlHandler : public wxXmlResourceHandler { public: wxAuiToolBarXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_isInside; diff --git a/include/wx/xrc/xh_bannerwindow.h b/include/wx/xrc/xh_bannerwindow.h index 7631bb20bd..87e78fb850 100644 --- a/include/wx/xrc/xh_bannerwindow.h +++ b/include/wx/xrc/xh_bannerwindow.h @@ -19,8 +19,8 @@ class WXDLLIMPEXP_XRC wxBannerWindowXmlHandler : public wxXmlResourceHandler public: wxBannerWindowXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxBannerWindowXmlHandler); }; diff --git a/include/wx/xrc/xh_bmp.h b/include/wx/xrc/xh_bmp.h index 9d27430745..3c0f2e9964 100644 --- a/include/wx/xrc/xh_bmp.h +++ b/include/wx/xrc/xh_bmp.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler public: wxBitmapXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler @@ -30,8 +30,8 @@ class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler public: wxIconXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h index f3e10b5b2d..3db8bff71f 100644 --- a/include/wx/xrc/xh_bmpbt.h +++ b/include/wx/xrc/xh_bmpbt.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler public: wxBitmapButtonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: typedef void (wxBitmapButton::*BitmapSetter)(const wxBitmapBundle&); diff --git a/include/wx/xrc/xh_bmpcbox.h b/include/wx/xrc/xh_bmpcbox.h index 7a536ba7c7..846a73a48c 100644 --- a/include/wx/xrc/xh_bmpcbox.h +++ b/include/wx/xrc/xh_bmpcbox.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler public: wxBitmapComboBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxBitmapComboBox* m_combobox; diff --git a/include/wx/xrc/xh_bttn.h b/include/wx/xrc/xh_bttn.h index 5c608aed8b..6a5118a1b8 100644 --- a/include/wx/xrc/xh_bttn.h +++ b/include/wx/xrc/xh_bttn.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler public: wxButtonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_BUTTON diff --git a/include/wx/xrc/xh_cald.h b/include/wx/xrc/xh_cald.h index 7bb2b619a5..e530616cf4 100644 --- a/include/wx/xrc/xh_cald.h +++ b/include/wx/xrc/xh_cald.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler public: wxCalendarCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_CALENDARCTRL diff --git a/include/wx/xrc/xh_chckb.h b/include/wx/xrc/xh_chckb.h index e07daf5351..bc8088f022 100644 --- a/include/wx/xrc/xh_chckb.h +++ b/include/wx/xrc/xh_chckb.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler public: wxCheckBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_CHECKBOX diff --git a/include/wx/xrc/xh_chckl.h b/include/wx/xrc/xh_chckl.h index 67613617b8..ad500dd115 100644 --- a/include/wx/xrc/xh_chckl.h +++ b/include/wx/xrc/xh_chckl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler public: wxCheckListBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_choic.h b/include/wx/xrc/xh_choic.h index 827558664e..7e0b9d7864 100644 --- a/include/wx/xrc/xh_choic.h +++ b/include/wx/xrc/xh_choic.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler public: wxChoiceXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_choicbk.h b/include/wx/xrc/xh_choicbk.h index 4cfe757b68..9696e38fc7 100644 --- a/include/wx/xrc/xh_choicbk.h +++ b/include/wx/xrc/xh_choicbk.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxBookCtrlXmlHandlerBase public: wxChoicebookXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxChoicebook *m_choicebook; diff --git a/include/wx/xrc/xh_clrpicker.h b/include/wx/xrc/xh_clrpicker.h index 479881142e..8d3ad83236 100644 --- a/include/wx/xrc/xh_clrpicker.h +++ b/include/wx/xrc/xh_clrpicker.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxColourPickerCtrlXmlHandler : public wxXmlResourceHandler public: wxColourPickerCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_COLOURPICKERCTRL diff --git a/include/wx/xrc/xh_cmdlinkbn.h b/include/wx/xrc/xh_cmdlinkbn.h index 91482a8076..4a69739ae5 100644 --- a/include/wx/xrc/xh_cmdlinkbn.h +++ b/include/wx/xrc/xh_cmdlinkbn.h @@ -19,8 +19,8 @@ class WXDLLIMPEXP_XRC wxCommandLinkButtonXmlHandler : public wxXmlResourceHandle public: wxCommandLinkButtonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxDECLARE_DYNAMIC_CLASS(wxCommandLinkButtonXmlHandler); diff --git a/include/wx/xrc/xh_collpane.h b/include/wx/xrc/xh_collpane.h index 14b92b8004..f6b0ecc3a4 100644 --- a/include/wx/xrc/xh_collpane.h +++ b/include/wx/xrc/xh_collpane.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler { public: wxCollapsiblePaneXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_isInside; diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h index 9fa1c514ed..29592b31cb 100644 --- a/include/wx/xrc/xh_combo.h +++ b/include/wx/xrc/xh_combo.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler public: wxComboBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_comboctrl.h b/include/wx/xrc/xh_comboctrl.h index e3c4467e0d..28075e7e5b 100644 --- a/include/wx/xrc/xh_comboctrl.h +++ b/include/wx/xrc/xh_comboctrl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler public: wxComboCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: }; diff --git a/include/wx/xrc/xh_dataview.h b/include/wx/xrc/xh_dataview.h index c022d4a96e..0b6c5ce943 100644 --- a/include/wx/xrc/xh_dataview.h +++ b/include/wx/xrc/xh_dataview.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDataViewXmlHandler : public wxXmlResourceHandler public: wxDataViewXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxObject* HandleCtrl(); diff --git a/include/wx/xrc/xh_datectrl.h b/include/wx/xrc/xh_datectrl.h index 2626f938f0..760fd1b183 100644 --- a/include/wx/xrc/xh_datectrl.h +++ b/include/wx/xrc/xh_datectrl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler public: wxDateCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_DATEPICKCTRL diff --git a/include/wx/xrc/xh_dirpicker.h b/include/wx/xrc/xh_dirpicker.h index 120f136a5e..a552278b49 100644 --- a/include/wx/xrc/xh_dirpicker.h +++ b/include/wx/xrc/xh_dirpicker.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDirPickerCtrlXmlHandler : public wxXmlResourceHandler public: wxDirPickerCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_DIRPICKERCTRL diff --git a/include/wx/xrc/xh_dlg.h b/include/wx/xrc/xh_dlg.h index ca3f1b6ff1..f931344d09 100644 --- a/include/wx/xrc/xh_dlg.h +++ b/include/wx/xrc/xh_dlg.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler public: wxDialogXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC diff --git a/include/wx/xrc/xh_editlbox.h b/include/wx/xrc/xh_editlbox.h index 0d0cb180b0..14cd899fec 100644 --- a/include/wx/xrc/xh_editlbox.h +++ b/include/wx/xrc/xh_editlbox.h @@ -23,8 +23,8 @@ class WXDLLIMPEXP_XRC wxEditableListBoxXmlHandler : public wxXmlResourceHandler public: wxEditableListBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_filectrl.h b/include/wx/xrc/xh_filectrl.h index c32bebb769..5e9f769e11 100644 --- a/include/wx/xrc/xh_filectrl.h +++ b/include/wx/xrc/xh_filectrl.h @@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxFileCtrlXmlHandler : public wxXmlResourceHandler { public: wxFileCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxDECLARE_DYNAMIC_CLASS(wxFileCtrlXmlHandler); diff --git a/include/wx/xrc/xh_filepicker.h b/include/wx/xrc/xh_filepicker.h index 206f6c1284..7d234fb41a 100644 --- a/include/wx/xrc/xh_filepicker.h +++ b/include/wx/xrc/xh_filepicker.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxFilePickerCtrlXmlHandler : public wxXmlResourceHandler public: wxFilePickerCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_FILEPICKERCTRL diff --git a/include/wx/xrc/xh_fontpicker.h b/include/wx/xrc/xh_fontpicker.h index 822c0d9145..a8e2bf367a 100644 --- a/include/wx/xrc/xh_fontpicker.h +++ b/include/wx/xrc/xh_fontpicker.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler public: wxFontPickerCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_FONTPICKERCTRL diff --git a/include/wx/xrc/xh_frame.h b/include/wx/xrc/xh_frame.h index 83708923bf..ccb865ae30 100644 --- a/include/wx/xrc/xh_frame.h +++ b/include/wx/xrc/xh_frame.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler public: wxFrameXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC diff --git a/include/wx/xrc/xh_gauge.h b/include/wx/xrc/xh_gauge.h index af147d67af..e2ea427da3 100644 --- a/include/wx/xrc/xh_gauge.h +++ b/include/wx/xrc/xh_gauge.h @@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler { public: wxGaugeXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler); }; diff --git a/include/wx/xrc/xh_gdctl.h b/include/wx/xrc/xh_gdctl.h index 398881dbcf..1dce44effe 100644 --- a/include/wx/xrc/xh_gdctl.h +++ b/include/wx/xrc/xh_gdctl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler public: wxGenericDirCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_DIRDLG diff --git a/include/wx/xrc/xh_grid.h b/include/wx/xrc/xh_grid.h index 553d5fdc28..2c67c8dd57 100644 --- a/include/wx/xrc/xh_grid.h +++ b/include/wx/xrc/xh_grid.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler public: wxGridXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_GRID diff --git a/include/wx/xrc/xh_html.h b/include/wx/xrc/xh_html.h index 1266182b16..c55d10697a 100644 --- a/include/wx/xrc/xh_html.h +++ b/include/wx/xrc/xh_html.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler public: wxHtmlWindowXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_HTML diff --git a/include/wx/xrc/xh_htmllbox.h b/include/wx/xrc/xh_htmllbox.h index 7c8adc0ffa..cebce82e49 100644 --- a/include/wx/xrc/xh_htmllbox.h +++ b/include/wx/xrc/xh_htmllbox.h @@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxSimpleHtmlListBoxXmlHandler : public wxXmlResourceHandle { public: wxSimpleHtmlListBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h index adb11d8fe4..324f55bb17 100644 --- a/include/wx/xrc/xh_hyperlink.h +++ b/include/wx/xrc/xh_hyperlink.h @@ -25,10 +25,10 @@ public: wxHyperlinkCtrlXmlHandler(); // Creates the control and returns a pointer to it. - virtual wxObject *DoCreateResource() wxOVERRIDE; + virtual wxObject *DoCreateResource() override; // Returns true if we know how to create a control for the given node. - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL diff --git a/include/wx/xrc/xh_infobar.h b/include/wx/xrc/xh_infobar.h index 7c60437991..99ea497171 100644 --- a/include/wx/xrc/xh_infobar.h +++ b/include/wx/xrc/xh_infobar.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxInfoBarXmlHandler : public wxXmlResourceHandler public: wxInfoBarXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxShowEffect GetShowEffect(wxString const& param); diff --git a/include/wx/xrc/xh_listb.h b/include/wx/xrc/xh_listb.h index 2dbc3d4944..60da66a24e 100644 --- a/include/wx/xrc/xh_listb.h +++ b/include/wx/xrc/xh_listb.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler public: wxListBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_listbk.h b/include/wx/xrc/xh_listbk.h index e5852fbe5a..38bd804e69 100644 --- a/include/wx/xrc/xh_listbk.h +++ b/include/wx/xrc/xh_listbk.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxBookCtrlXmlHandlerBase public: wxListbookXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxListbook *m_listbook; diff --git a/include/wx/xrc/xh_listc.h b/include/wx/xrc/xh_listc.h index bfe6e5cd93..6ac8dc28a1 100644 --- a/include/wx/xrc/xh_listc.h +++ b/include/wx/xrc/xh_listc.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler { public: wxListCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: // handlers for wxListCtrl itself and its listcol and listitem children diff --git a/include/wx/xrc/xh_mdi.h b/include/wx/xrc/xh_mdi.h index bf2fd58024..55db84637d 100644 --- a/include/wx/xrc/xh_mdi.h +++ b/include/wx/xrc/xh_mdi.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler public: wxMdiXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxWindow *CreateFrame(); diff --git a/include/wx/xrc/xh_menu.h b/include/wx/xrc/xh_menu.h index 4f89509f0c..5f4647e894 100644 --- a/include/wx/xrc/xh_menu.h +++ b/include/wx/xrc/xh_menu.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler public: wxMenuXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideMenu; @@ -33,8 +33,8 @@ class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler public: wxMenuBarXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_MENUS diff --git a/include/wx/xrc/xh_notbk.h b/include/wx/xrc/xh_notbk.h index d39e44d960..200f73b6c4 100644 --- a/include/wx/xrc/xh_notbk.h +++ b/include/wx/xrc/xh_notbk.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxBookCtrlXmlHandlerBase public: wxNotebookXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxNotebook *m_notebook; diff --git a/include/wx/xrc/xh_odcombo.h b/include/wx/xrc/xh_odcombo.h index a5c9d43893..d47cf27b5d 100644 --- a/include/wx/xrc/xh_odcombo.h +++ b/include/wx/xrc/xh_odcombo.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandl public: wxOwnerDrawnComboBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_panel.h b/include/wx/xrc/xh_panel.h index 0f0b4b06b0..004ec0e917 100644 --- a/include/wx/xrc/xh_panel.h +++ b/include/wx/xrc/xh_panel.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler public: wxPanelXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC diff --git a/include/wx/xrc/xh_propdlg.h b/include/wx/xrc/xh_propdlg.h index ad746ce15d..bfab606535 100644 --- a/include/wx/xrc/xh_propdlg.h +++ b/include/wx/xrc/xh_propdlg.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxPropertySheetDialogXmlHandler : public wxBookCtrlXmlHand public: wxPropertySheetDialogXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxPropertySheetDialog *m_dialog; diff --git a/include/wx/xrc/xh_radbt.h b/include/wx/xrc/xh_radbt.h index fafda37522..7a69f6437e 100644 --- a/include/wx/xrc/xh_radbt.h +++ b/include/wx/xrc/xh_radbt.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler public: wxRadioButtonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_RADIOBOX diff --git a/include/wx/xrc/xh_radbx.h b/include/wx/xrc/xh_radbx.h index aa9702f028..d185a1bb84 100644 --- a/include/wx/xrc/xh_radbx.h +++ b/include/wx/xrc/xh_radbx.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler public: wxRadioBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_insideBox; diff --git a/include/wx/xrc/xh_ribbon.h b/include/wx/xrc/xh_ribbon.h index 14f67192dc..b47ba22052 100644 --- a/include/wx/xrc/xh_ribbon.h +++ b/include/wx/xrc/xh_ribbon.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_RIBBON wxRibbonXmlHandler : public wxXmlResourceHandler { public: wxRibbonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: const wxClassInfo *m_isInside; diff --git a/include/wx/xrc/xh_richtext.h b/include/wx/xrc/xh_richtext.h index 979d73d7e9..7b4059c883 100644 --- a/include/wx/xrc/xh_richtext.h +++ b/include/wx/xrc/xh_richtext.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextCtrlXmlHandler : public wxXmlResourceHandle public: wxRichTextCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_RICHTEXT diff --git a/include/wx/xrc/xh_scrol.h b/include/wx/xrc/xh_scrol.h index ffd366c4e8..f1cddd8e7e 100644 --- a/include/wx/xrc/xh_scrol.h +++ b/include/wx/xrc/xh_scrol.h @@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler { public: wxScrollBarXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler); }; diff --git a/include/wx/xrc/xh_scwin.h b/include/wx/xrc/xh_scwin.h index 6d5d5fc0e6..37b2f9bb0d 100644 --- a/include/wx/xrc/xh_scwin.h +++ b/include/wx/xrc/xh_scwin.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler public: wxScrolledWindowXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC diff --git a/include/wx/xrc/xh_simplebook.h b/include/wx/xrc/xh_simplebook.h index 818bafed50..599171081f 100644 --- a/include/wx/xrc/xh_simplebook.h +++ b/include/wx/xrc/xh_simplebook.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxSimplebookXmlHandler : public wxXmlResourceHandler public: wxSimplebookXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_isInside; diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h index 594106ac87..cf00ec3e08 100644 --- a/include/wx/xrc/xh_sizer.h +++ b/include/wx/xrc/xh_sizer.h @@ -23,8 +23,8 @@ class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler public: wxSizerXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; protected: virtual wxSizer* DoCreateSizer(const wxString& name); @@ -69,8 +69,8 @@ class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler public: wxStdDialogButtonSizerXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_isInside; diff --git a/include/wx/xrc/xh_slidr.h b/include/wx/xrc/xh_slidr.h index 267cb335a2..52a9ee22b5 100644 --- a/include/wx/xrc/xh_slidr.h +++ b/include/wx/xrc/xh_slidr.h @@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler { public: wxSliderXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxSliderXmlHandler); }; diff --git a/include/wx/xrc/xh_spin.h b/include/wx/xrc/xh_spin.h index bf522e936f..a40e32d055 100644 --- a/include/wx/xrc/xh_spin.h +++ b/include/wx/xrc/xh_spin.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler { public: wxSpinButtonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler); }; @@ -34,8 +34,8 @@ class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler { public: wxSpinCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler); }; @@ -44,8 +44,8 @@ class WXDLLIMPEXP_XRC wxSpinCtrlDoubleXmlHandler : public wxXmlResourceHandler { public: wxSpinCtrlDoubleXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDoubleXmlHandler); }; diff --git a/include/wx/xrc/xh_split.h b/include/wx/xrc/xh_split.h index e18208118a..75be560aa5 100644 --- a/include/wx/xrc/xh_split.h +++ b/include/wx/xrc/xh_split.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler public: wxSplitterWindowXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_SPLITTER diff --git a/include/wx/xrc/xh_srchctrl.h b/include/wx/xrc/xh_srchctrl.h index 47c122f9f7..7479800ece 100644 --- a/include/wx/xrc/xh_srchctrl.h +++ b/include/wx/xrc/xh_srchctrl.h @@ -19,8 +19,8 @@ class WXDLLIMPEXP_XRC wxSearchCtrlXmlHandler : public wxXmlResourceHandler public: wxSearchCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; wxDECLARE_DYNAMIC_CLASS(wxSearchCtrlXmlHandler); }; diff --git a/include/wx/xrc/xh_statbar.h b/include/wx/xrc/xh_statbar.h index d73bbdf0d0..5391bb8757 100644 --- a/include/wx/xrc/xh_statbar.h +++ b/include/wx/xrc/xh_statbar.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxStatusBarXmlHandler : public wxXmlResourceHandler public: wxStatusBarXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_STATUSBAR diff --git a/include/wx/xrc/xh_stbmp.h b/include/wx/xrc/xh_stbmp.h index 65c75591b9..d48823a5b1 100644 --- a/include/wx/xrc/xh_stbmp.h +++ b/include/wx/xrc/xh_stbmp.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler public: wxStaticBitmapXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_STATBMP diff --git a/include/wx/xrc/xh_stbox.h b/include/wx/xrc/xh_stbox.h index 4a5704cafd..7631733726 100644 --- a/include/wx/xrc/xh_stbox.h +++ b/include/wx/xrc/xh_stbox.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler public: wxStaticBoxXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_STATBOX diff --git a/include/wx/xrc/xh_stlin.h b/include/wx/xrc/xh_stlin.h index 808f9bbdd3..a239d3af85 100644 --- a/include/wx/xrc/xh_stlin.h +++ b/include/wx/xrc/xh_stlin.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler public: wxStaticLineXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_STATLINE diff --git a/include/wx/xrc/xh_sttxt.h b/include/wx/xrc/xh_sttxt.h index 6f99e3a304..6dc58b5a33 100644 --- a/include/wx/xrc/xh_sttxt.h +++ b/include/wx/xrc/xh_sttxt.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler public: wxStaticTextXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_STATTEXT diff --git a/include/wx/xrc/xh_styledtextctrl.h b/include/wx/xrc/xh_styledtextctrl.h index fb78a357fa..22dcb71b92 100644 --- a/include/wx/xrc/xh_styledtextctrl.h +++ b/include/wx/xrc/xh_styledtextctrl.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_STC wxStyledTextCtrlXmlHandler : public wxXmlResourceHandler public: wxStyledTextCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_STC diff --git a/include/wx/xrc/xh_text.h b/include/wx/xrc/xh_text.h index a2e8488249..366b27a5bf 100644 --- a/include/wx/xrc/xh_text.h +++ b/include/wx/xrc/xh_text.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler public: wxTextCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_TEXTCTRL diff --git a/include/wx/xrc/xh_tglbtn.h b/include/wx/xrc/xh_tglbtn.h index 24ca1e8c4f..6de5ab26bd 100644 --- a/include/wx/xrc/xh_tglbtn.h +++ b/include/wx/xrc/xh_tglbtn.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxToggleButtonXmlHandler : public wxXmlResourceHandler public: wxToggleButtonXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; protected: virtual void DoCreateToggleButton(wxObject *control); diff --git a/include/wx/xrc/xh_timectrl.h b/include/wx/xrc/xh_timectrl.h index 9124670a49..aba4766757 100644 --- a/include/wx/xrc/xh_timectrl.h +++ b/include/wx/xrc/xh_timectrl.h @@ -18,8 +18,8 @@ class WXDLLIMPEXP_XRC wxTimeCtrlXmlHandler : public wxXmlResourceHandler { public: wxTimeCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxDECLARE_DYNAMIC_CLASS(wxTimeCtrlXmlHandler); diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h index e3f3f1416d..212b5d4788 100644 --- a/include/wx/xrc/xh_toolb.h +++ b/include/wx/xrc/xh_toolb.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler public: wxToolBarXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: bool m_isInside; diff --git a/include/wx/xrc/xh_toolbk.h b/include/wx/xrc/xh_toolbk.h index 29e7181c73..817adcbb39 100644 --- a/include/wx/xrc/xh_toolbk.h +++ b/include/wx/xrc/xh_toolbk.h @@ -21,8 +21,8 @@ class WXDLLIMPEXP_XRC wxToolbookXmlHandler : public wxBookCtrlXmlHandlerBase public: wxToolbookXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxToolbook *m_toolbook; diff --git a/include/wx/xrc/xh_tree.h b/include/wx/xrc/xh_tree.h index 01dd24f6a9..18d779fd52 100644 --- a/include/wx/xrc/xh_tree.h +++ b/include/wx/xrc/xh_tree.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler public: wxTreeCtrlXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC && wxUSE_TREECTRL diff --git a/include/wx/xrc/xh_treebk.h b/include/wx/xrc/xh_treebk.h index fc5b28ac8d..f22459b629 100644 --- a/include/wx/xrc/xh_treebk.h +++ b/include/wx/xrc/xh_treebk.h @@ -34,12 +34,12 @@ class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxBookCtrlXmlHandlerBase public: wxTreebookXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: virtual void - DoAddPage(wxBookCtrlBase* book, size_t n, const PageWithAttrs& page) wxOVERRIDE; + DoAddPage(wxBookCtrlBase* book, size_t n, const PageWithAttrs& page) override; wxTreebook *m_tbk; diff --git a/include/wx/xrc/xh_unkwn.h b/include/wx/xrc/xh_unkwn.h index b675767409..2f109b52e1 100644 --- a/include/wx/xrc/xh_unkwn.h +++ b/include/wx/xrc/xh_unkwn.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler public: wxUnknownWidgetXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; }; #endif // wxUSE_XRC diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h index 235272d36d..cada52b099 100644 --- a/include/wx/xrc/xh_wizrd.h +++ b/include/wx/xrc/xh_wizrd.h @@ -23,8 +23,8 @@ class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler public: wxWizardXmlHandler(); - virtual wxObject *DoCreateResource() wxOVERRIDE; - virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE; + virtual wxObject *DoCreateResource() override; + virtual bool CanHandle(wxXmlNode *node) override; private: wxWizard *m_wizard; diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index ab7004e67e..35f5a6194b 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -492,42 +492,42 @@ public: // If instance is non-NULL it should not create a new instance via 'new' but // should rather use this one, and call its Create method. wxObject *CreateResource(wxXmlNode *node, wxObject *parent, - wxObject *instance) wxOVERRIDE; + wxObject *instance) override; // --- Handy methods: // Returns true if the node has a property class equal to classname, // e.g. . - bool IsOfClass(wxXmlNode *node, const wxString& classname) const wxOVERRIDE; + bool IsOfClass(wxXmlNode *node, const wxString& classname) const override; - bool IsObjectNode(const wxXmlNode *node) const wxOVERRIDE; + bool IsObjectNode(const wxXmlNode *node) const override; // Gets node content from wxXML_ENTITY_NODE // The problem is, content is represented as // wxXML_ENTITY_NODE name="tag", content="" // |-- wxXML_TEXT_NODE or // wxXML_CDATA_SECTION_NODE name="" content="content" - wxString GetNodeContent(const wxXmlNode *node) wxOVERRIDE; + wxString GetNodeContent(const wxXmlNode *node) override; - wxXmlNode *GetNodeParent(const wxXmlNode *node) const wxOVERRIDE; - wxXmlNode *GetNodeNext(const wxXmlNode *node) const wxOVERRIDE; - wxXmlNode *GetNodeChildren(const wxXmlNode *node) const wxOVERRIDE; + wxXmlNode *GetNodeParent(const wxXmlNode *node) const override; + wxXmlNode *GetNodeNext(const wxXmlNode *node) const override; + wxXmlNode *GetNodeChildren(const wxXmlNode *node) const override; // Check to see if a parameter exists. - bool HasParam(const wxString& param) wxOVERRIDE; + bool HasParam(const wxString& param) override; // Finds the node or returns NULL. - wxXmlNode *GetParamNode(const wxString& param) wxOVERRIDE; + wxXmlNode *GetParamNode(const wxString& param) override; // Finds the parameter value or returns the empty string. - wxString GetParamValue(const wxString& param) wxOVERRIDE; + wxString GetParamValue(const wxString& param) override; // Returns the parameter value from given node. - wxString GetParamValue(const wxXmlNode* node) wxOVERRIDE; + wxString GetParamValue(const wxXmlNode* node) override; // Gets style flags from text in form "flag | flag2| flag3 |..." // Only understands flags added with AddStyle - int GetStyle(const wxString& param = wxT("style"), int defaults = 0) wxOVERRIDE; + int GetStyle(const wxString& param = wxT("style"), int defaults = 0) override; // Gets text from param and does some conversions: // - replaces \n, \r, \t by respective chars (according to C syntax) @@ -536,124 +536,124 @@ public: // // The first two conversions can be disabled by using wxXRC_TEXT_NO_ESCAPE // in flags and the last one -- by using wxXRC_TEXT_NO_TRANSLATE. - wxString GetNodeText(const wxXmlNode *node, int flags = 0) wxOVERRIDE; + wxString GetNodeText(const wxXmlNode *node, int flags = 0) override; // Returns the XRCID. - int GetID() wxOVERRIDE; + int GetID() override; // Returns the resource name. - wxString GetName() wxOVERRIDE; + wxString GetName() override; // Gets a bool flag (1, t, yes, on, true are true, everything else is false). - bool GetBool(const wxString& param, bool defaultv = false) wxOVERRIDE; + bool GetBool(const wxString& param, bool defaultv = false) override; // Gets an integer value from the parameter. - long GetLong(const wxString& param, long defaultv = 0) wxOVERRIDE; + long GetLong(const wxString& param, long defaultv = 0) override; // Gets a float value from the parameter. - float GetFloat(const wxString& param, float defaultv = 0) wxOVERRIDE; + float GetFloat(const wxString& param, float defaultv = 0) override; // Gets colour in HTML syntax (#RRGGBB). - wxColour GetColour(const wxString& param, const wxColour& defaultv = wxNullColour) wxOVERRIDE; + wxColour GetColour(const wxString& param, const wxColour& defaultv = wxNullColour) override; // Gets the size (may be in dialog units). wxSize GetSize(const wxString& param = wxT("size"), - wxWindow *windowToUse = NULL) wxOVERRIDE; + wxWindow *windowToUse = NULL) override; // Gets the position (may be in dialog units). - wxPoint GetPosition(const wxString& param = wxT("pos")) wxOVERRIDE; + wxPoint GetPosition(const wxString& param = wxT("pos")) override; // Gets a dimension (may be in dialog units). wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0, - wxWindow *windowToUse = NULL) wxOVERRIDE; + wxWindow *windowToUse = NULL) override; // Gets a size which is not expressed in pixels, so not in dialog units. - wxSize GetPairInts(const wxString& param) wxOVERRIDE; + wxSize GetPairInts(const wxString& param) override; // Gets a direction, complains if the value is invalid. - wxDirection GetDirection(const wxString& param, wxDirection dirDefault = wxLEFT) wxOVERRIDE; + wxDirection GetDirection(const wxString& param, wxDirection dirDefault = wxLEFT) override; // Gets a bitmap. wxBitmap GetBitmap(const wxString& param = wxT("bitmap"), const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER), - wxSize size = wxDefaultSize) wxOVERRIDE; + wxSize size = wxDefaultSize) override; // Gets a bitmap from an XmlNode. wxBitmap GetBitmap(const wxXmlNode* node, const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER), - wxSize size = wxDefaultSize) wxOVERRIDE; + wxSize size = wxDefaultSize) override; // Gets a bitmap bundle. wxBitmapBundle GetBitmapBundle(const wxString& param = wxT("bitmap"), const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER), - wxSize size = wxDefaultSize) wxOVERRIDE; + wxSize size = wxDefaultSize) override; // Gets a bitmap bundle from the provided node. wxBitmapBundle GetBitmapBundle(const wxXmlNode* node, const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER), - wxSize size = wxDefaultSize) wxOVERRIDE; + wxSize size = wxDefaultSize) override; // Gets an icon. wxIcon GetIcon(const wxString& param = wxT("icon"), const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER), - wxSize size = wxDefaultSize) wxOVERRIDE; + wxSize size = wxDefaultSize) override; // Gets an icon from an XmlNode. wxIcon GetIcon(const wxXmlNode* node, const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER), - wxSize size = wxDefaultSize) wxOVERRIDE; + wxSize size = wxDefaultSize) override; // Gets an icon bundle. wxIconBundle GetIconBundle(const wxString& param, - const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER)) wxOVERRIDE; + const wxArtClient& defaultArtClient = wxASCII_STR(wxART_OTHER)) override; // Gets an image list. - wxImageList *GetImageList(const wxString& param = wxT("imagelist")) wxOVERRIDE; + wxImageList *GetImageList(const wxString& param = wxT("imagelist")) override; #if wxUSE_ANIMATIONCTRL // Gets an animation creating it using the provided control (so that it // will be compatible with it) if any. wxAnimation* GetAnimation(const wxString& param = wxT("animation"), - wxAnimationCtrlBase* ctrl = NULL) wxOVERRIDE; + wxAnimationCtrlBase* ctrl = NULL) override; #endif // Gets a font. - wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) wxOVERRIDE; + wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) override; // Gets the value of a boolean attribute (only "0" and "1" are valid values) - bool GetBoolAttr(const wxString& attr, bool defaultv) wxOVERRIDE; + bool GetBoolAttr(const wxString& attr, bool defaultv) override; // Gets a file path from the given node, expanding environment variables in // it if wxXRC_USE_ENVVARS is in use. - wxString GetFilePath(const wxXmlNode* node) wxOVERRIDE; + wxString GetFilePath(const wxXmlNode* node) override; // Returns the window associated with the handler (may be NULL). wxWindow* GetParentAsWindow() const { return m_handler->GetParentAsWindow(); } // Sets common window options. - void SetupWindow(wxWindow *wnd) wxOVERRIDE; + void SetupWindow(wxWindow *wnd) override; // Creates children. - void CreateChildren(wxObject *parent, bool this_hnd_only = false) wxOVERRIDE; + void CreateChildren(wxObject *parent, bool this_hnd_only = false) override; // Helper function. - void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL) wxOVERRIDE; + void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL) override; // Creates a resource from a node. wxObject *CreateResFromNode(wxXmlNode *node, - wxObject *parent, wxObject *instance = NULL) wxOVERRIDE; + wxObject *parent, wxObject *instance = NULL) override; // helper #if wxUSE_FILESYSTEM - wxFileSystem& GetCurFileSystem() wxOVERRIDE; + wxFileSystem& GetCurFileSystem() override; #endif // reports input error at position 'context' - void ReportError(wxXmlNode *context, const wxString& message) wxOVERRIDE; + void ReportError(wxXmlNode *context, const wxString& message) override; // reports input error at m_node - void ReportError(const wxString& message) wxOVERRIDE; + void ReportError(const wxString& message) override; // reports input error when parsing parameter with given name - void ReportParamError(const wxString& param, const wxString& message) wxOVERRIDE; + void ReportParamError(const wxString& param, const wxString& message) override; }; diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h index 2a6231303a..57e49167dd 100644 --- a/include/wx/zipstrm.h +++ b/include/wx/zipstrm.h @@ -153,10 +153,10 @@ public: wxZipEntry& operator=(const wxZipEntry& entry); // Get accessors - 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; } + wxDateTime GetDateTime() const override { return m_DateTime; } + wxFileOffset GetSize() const override { return m_Size; } + wxFileOffset GetOffset() const override { return m_Offset; } + wxString GetInternalName() const override { return m_Name; } int GetMethod() const { return m_Method; } int GetFlags() const { return m_Flags; } wxUint32 GetCrc() const { return m_Crc; } @@ -164,23 +164,23 @@ public: int GetSystemMadeBy() const { return m_SystemMadeBy; } wxString GetComment() const { return m_Comment; } wxUint32 GetExternalAttributes() const { return m_ExternalAttributes; } - wxPathFormat GetInternalFormat() const wxOVERRIDE { return wxPATH_UNIX; } + wxPathFormat GetInternalFormat() const override { 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 wxOVERRIDE; + wxString GetName(wxPathFormat format = wxPATH_NATIVE) const override; // is accessors - inline bool IsDir() const wxOVERRIDE; + inline bool IsDir() const override; inline bool IsText() const; - inline bool IsReadOnly() const wxOVERRIDE; + inline bool IsReadOnly() const override; inline bool IsMadeByUnix() const; // set accessors - void SetDateTime(const wxDateTime& dt) wxOVERRIDE { m_DateTime = dt; } - void SetSize(wxFileOffset size) wxOVERRIDE { m_Size = size; } + void SetDateTime(const wxDateTime& dt) override { m_DateTime = dt; } + void SetSize(wxFileOffset size) override { 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; } @@ -190,21 +190,21 @@ public: void SetLocalExtra(const char *extra, size_t len); inline void SetName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) wxOVERRIDE; + wxPathFormat format = wxPATH_NATIVE) override; static wxString GetInternalName(const wxString& name, wxPathFormat format = wxPATH_NATIVE, bool *pIsDir = NULL); // set is accessors - void SetIsDir(bool isDir = true) wxOVERRIDE; - inline void SetIsReadOnly(bool isReadOnly = true) wxOVERRIDE; + void SetIsDir(bool isDir = true) override; + inline void SetIsReadOnly(bool isReadOnly = true) override; inline void SetIsText(bool isText = true); wxZipEntry *Clone() const { return ZipClone(); } void SetNotifier(wxZipNotifier& notifier); - void UnsetNotifier() wxOVERRIDE; + void UnsetNotifier() override; protected: // Internal attributes @@ -218,7 +218,7 @@ protected: int GetInternalAttributes() const { return m_InternalAttributes; } void SetVersionNeeded(int version) { m_VersionNeeded = (wxUint16)version; } - void SetOffset(wxFileOffset offset) wxOVERRIDE { m_Offset = offset; } + void SetOffset(wxFileOffset offset) override { 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; } @@ -232,7 +232,7 @@ protected: void Notify(); private: - wxArchiveEntry* DoClone() const wxOVERRIDE { return ZipClone(); } + wxArchiveEntry* DoClone() const override { return ZipClone(); } size_t ReadLocal(wxInputStream& stream, wxMBConv& conv); size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv, wxZipArchiveFormat zipFormat); @@ -304,17 +304,17 @@ public: bool WXZIPFIX PutNextEntry(const wxString& name, const wxDateTime& dt = wxDateTime::Now(), - wxFileOffset size = wxInvalidOffset) wxOVERRIDE; + wxFileOffset size = wxInvalidOffset) override; bool WXZIPFIX PutNextDirEntry(const wxString& name, - const wxDateTime& dt = wxDateTime::Now()) wxOVERRIDE; + const wxDateTime& dt = wxDateTime::Now()) override; bool WXZIPFIX CopyEntry(wxZipEntry *entry, wxZipInputStream& inputStream); bool WXZIPFIX CopyArchiveMetaData(wxZipInputStream& inputStream); - void WXZIPFIX Sync() wxOVERRIDE; - bool WXZIPFIX CloseEntry() wxOVERRIDE; - bool WXZIPFIX Close() wxOVERRIDE; + void WXZIPFIX Sync() override; + bool WXZIPFIX CloseEntry() override; + bool WXZIPFIX Close() override; void SetComment(const wxString& comment) { m_Comment = comment; } @@ -325,8 +325,8 @@ public: wxZipArchiveFormat GetFormat() const { return m_format; } protected: - virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_entrySize; } + virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysTell() const override { return m_entrySize; } // this protected interface isn't yet finalised struct Buffer { const char *m_data; size_t m_size; }; @@ -341,9 +341,9 @@ protected: private: void Init(int level); - bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry) wxOVERRIDE; - bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) wxOVERRIDE; - bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream) wxOVERRIDE; + bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry) override; + bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream) override; + bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream) override; bool IsOpened() const { return m_comp || m_pending; } @@ -388,18 +388,18 @@ public: virtual WXZIPFIX ~wxZipInputStream(); bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); } - bool WXZIPFIX CloseEntry() wxOVERRIDE; + bool WXZIPFIX CloseEntry() override; wxZipEntry *GetNextEntry(); wxString WXZIPFIX GetComment(); int WXZIPFIX GetTotalEntries(); - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_entry.GetSize(); } + virtual wxFileOffset GetLength() const override { return m_entry.GetSize(); } protected: - size_t WXZIPFIX OnSysRead(void *buffer, size_t size) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_decomp ? m_decomp->TellI() : 0; } + size_t WXZIPFIX OnSysRead(void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { return m_decomp ? m_decomp->TellI() : 0; } // this protected interface isn't yet finalised virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream); @@ -409,9 +409,9 @@ private: void Init(); void Init(const wxString& file); - wxArchiveEntry *DoGetNextEntry() wxOVERRIDE { return GetNextEntry(); } + wxArchiveEntry *DoGetNextEntry() override { return GetNextEntry(); } - bool WXZIPFIX OpenEntry(wxArchiveEntry& entry) wxOVERRIDE; + bool WXZIPFIX OpenEntry(wxArchiveEntry& entry) override; wxStreamError ReadLocal(bool readEndRec = false); wxStreamError ReadCentral(); @@ -494,22 +494,22 @@ public: { return new wxZipOutputStream(stream, -1, GetConv()); } wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const wxOVERRIDE + wxPathFormat format = wxPATH_NATIVE) const override { return wxZipEntry::GetInternalName(name, format); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; + = wxSTREAM_PROTOCOL) const override; protected: - wxArchiveEntry *DoNewEntry() const wxOVERRIDE + wxArchiveEntry *DoNewEntry() const override { return NewEntry(); } - wxArchiveInputStream *DoNewStream(wxInputStream& stream) const wxOVERRIDE + wxArchiveInputStream *DoNewStream(wxInputStream& stream) const override { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const wxOVERRIDE + wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const override { return NewStream(stream); } - wxArchiveInputStream *DoNewStream(wxInputStream *stream) const wxOVERRIDE + wxArchiveInputStream *DoNewStream(wxInputStream *stream) const override { return NewStream(stream); } - wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const wxOVERRIDE + wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const override { return NewStream(stream); } private: diff --git a/include/wx/zstream.h b/include/wx/zstream.h index d7391440a7..a66ca214c5 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() wxOVERRIDE { return wxInputStream::Peek(); } - wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); } + char Peek() override { return wxInputStream::Peek(); } + wxFileOffset GetLength() const override { 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) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + size_t OnSysRead(void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { 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() wxOVERRIDE { DoFlush(false); } - bool Close() wxOVERRIDE; - wxFileOffset GetLength() const wxOVERRIDE { return m_pos; } + void Sync() override { DoFlush(false); } + bool Close() override; + wxFileOffset GetLength() const override { 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) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + size_t OnSysWrite(const void *buffer, size_t size) override; + wxFileOffset OnSysTell() const override { 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 wxOVERRIDE + wxFilterInputStream *NewStream(wxInputStream& stream) const override { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE + wxFilterOutputStream *NewStream(wxOutputStream& stream) const override { return new wxZlibOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE + wxFilterInputStream *NewStream(wxInputStream *stream) const override { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE + wxFilterOutputStream *NewStream(wxOutputStream *stream) const override { return new wxZlibOutputStream(stream, -1); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; + = wxSTREAM_PROTOCOL) const override; private: wxDECLARE_DYNAMIC_CLASS(wxZlibClassFactory); @@ -122,17 +122,17 @@ class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory public: wxGzipClassFactory(); - wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE + wxFilterInputStream *NewStream(wxInputStream& stream) const override { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE + wxFilterOutputStream *NewStream(wxOutputStream& stream) const override { return new wxZlibOutputStream(stream, -1); } - wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE + wxFilterInputStream *NewStream(wxInputStream *stream) const override { return new wxZlibInputStream(stream); } - wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE + wxFilterOutputStream *NewStream(wxOutputStream *stream) const override { return new wxZlibOutputStream(stream, -1); } const wxChar * const *GetProtocols(wxStreamProtocolType type - = wxSTREAM_PROTOCOL) const wxOVERRIDE; + = wxSTREAM_PROTOCOL) const override; private: wxDECLARE_DYNAMIC_CLASS(wxGzipClassFactory); diff --git a/interface/wx/bmpbndl.h b/interface/wx/bmpbndl.h index cfa004ee3c..2a6a606c0b 100644 --- a/interface/wx/bmpbndl.h +++ b/interface/wx/bmpbndl.h @@ -448,12 +448,12 @@ public: { } - wxSize GetDefaultSize() const wxOVERRIDE + wxSize GetDefaultSize() const override { ... determine the minimum/default size for bitmap to use ... } - wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE + wxSize GetPreferredBitmapSizeAtScale(double scale) const override { // If it's ok to scale the bitmap, just use the standard size // at the given scale: @@ -464,7 +464,7 @@ public: possibly by letting DoGetPreferredSize() choose it ... } - wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE + wxBitmap GetBitmap(const wxSize& size) override { ... get the bitmap of the requested size from somewhere and cache it if necessary, i.e. if getting it is expensive ... @@ -535,12 +535,12 @@ protected: return wxSize(32, 32); } - wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE + wxSize GetPreferredBitmapSizeAtScale(double scale) const override { return DoGetPreferredSize(scale); } - wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE + wxBitmap GetBitmap(const wxSize& size) override { // For consistency with GetNextAvailableScale(), we must have // bitmap variants for 32, 48 and 64px sizes. @@ -560,7 +560,7 @@ protected: } protected: - double GetNextAvailableScale(size_t& i) const wxOVERRIDE + double GetNextAvailableScale(size_t& i) const override { const double availableScales[] = { 1, 1.5, 2, 0 }; diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h index b71a55c4da..250c02c9f9 100644 --- a/interface/wx/propgrid/property.h +++ b/interface/wx/propgrid/property.h @@ -585,7 +585,7 @@ wxPG_PROP_CLASS_SPECIFIC_3 = 0x00400000 wxLongStringProperty and override DisplayEditorDialog, like this: @code - bool DisplayEditorDialog( wxPropertyGrid* propGrid, wxVariant& value ) wxOVERRIDE + bool DisplayEditorDialog( wxPropertyGrid* propGrid, wxVariant& value ) override { wxSize dialogSize(...size of your dialog...); diff --git a/interface/wx/systhemectrl.h b/interface/wx/systhemectrl.h index 8d9a871e15..99e9948c71 100644 --- a/interface/wx/systhemectrl.h +++ b/interface/wx/systhemectrl.h @@ -38,7 +38,7 @@ EnableSystemTheme(); } - void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxOVERRIDE + void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const override { wxRendererNative::GetDefault().DrawItemText(this, dc, "Item #x", rect); } diff --git a/interface/wx/webview.h b/interface/wx/webview.h index c036e05264..d2475c5462 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -489,7 +489,7 @@ public: The following pseudo code demonstrates a typical implementation: @code void StartRequest(const wxWebViewHandlerRequest& request, - wxSharedPtr response) wxOVERRIDE + wxSharedPtr response) override { // Set common headers allowing access from XMLHTTPRequests() response->SetHeader("Access-Control-Allow-Origin", "*"); diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp index b381cee3e9..fb1900fd6d 100644 --- a/samples/access/accesstest.cpp +++ b/samples/access/accesstest.cpp @@ -73,7 +73,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() wxOVERRIDE; + virtual bool OnInit() override; }; @@ -196,7 +196,7 @@ public: FrameAccessible(wxWindow* win): wxWindowAccessible(win) {} // Gets the name of the specified object. - virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE + virtual wxAccStatus GetName(int childId, wxString* name) override { if (childId == wxACC_SELF) { @@ -214,7 +214,7 @@ public: ScrolledWindowAccessible(wxWindow* win): wxWindowAccessible(win) {} // Gets the name of the specified object. - virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE + virtual wxAccStatus GetName(int childId, wxString* name) override { if (childId == wxACC_SELF) { @@ -232,36 +232,36 @@ public: SplitterWindowAccessible(wxWindow* win): wxWindowAccessible(win) {} // Gets the name of the specified object. - virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE; + virtual wxAccStatus GetName(int childId, wxString* name) override; // Can return either a child object, or an integer // representing the child element, starting from 1. - virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) wxOVERRIDE; + virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) override; // Returns the rectangle for this object (id = 0) or a child element (id > 0). - virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE; + virtual wxAccStatus GetLocation(wxRect& rect, int elementId) override; // Navigates from fromId to toId/toObject. virtual wxAccStatus Navigate(wxNavDir navDir, int fromId, - int* toId, wxAccessible** toObject) wxOVERRIDE; + int* toId, wxAccessible** toObject) override; // Gets the number of children. - virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE; + virtual wxAccStatus GetChildCount(int* childCount) override; // Gets the specified child (starting from 1). // If *child is NULL and return value is wxACC_OK, // this means that the child is a simple element and // not an accessible object. - virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE; + virtual wxAccStatus GetChild(int childId, wxAccessible** child) override; // Gets the parent, or NULL. - virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE; + virtual wxAccStatus GetParent(wxAccessible** parent) override; // Performs the default action. childId is 0 (the action for this object) // or > 0 (the action for a child). // Return wxACC_NOT_SUPPORTED if there is no default action for this // window (e.g. an edit control). - virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE; + virtual wxAccStatus DoDefaultAction(int childId) override; // Gets the default action for this object (0) or > 0 (the action for a child). // Return wxACC_OK even if there is no action. actionName is the action, or the empty @@ -269,36 +269,36 @@ public: // The retrieved string describes the action that is performed on an object, // not what the object does as a result. For example, a toolbar button that prints // a document has a default action of "Press" rather than "Prints the current document." - virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE; + virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) override; // Returns the description for this object or a child. - virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE; + virtual wxAccStatus GetDescription(int childId, wxString* description) override; // Returns help text for this object or a child, similar to tooltip text. - virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE; + virtual wxAccStatus GetHelpText(int childId, wxString* helpText) override; // Returns the keyboard shortcut for this object or child. // Return e.g. ALT+K - virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE; + virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) override; // Returns a role constant. - virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE; + virtual wxAccStatus GetRole(int childId, wxAccRole* role) override; // Returns a state constant. - virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE; + virtual wxAccStatus GetState(int childId, long* state) override; // Returns a localized string representing the value for the object // or child. - virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE; + virtual wxAccStatus GetValue(int childId, wxString* strValue) override; // Selects the object or child. - virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE; + virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) override; // Gets the window with the keyboard focus. // If childId is 0 and child is NULL, no object in // this subhierarchy has the focus. // If this object has the focus, child should be 'this'. - virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE; + virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) override; // Gets a variant representing the selected children // of this object. @@ -308,7 +308,7 @@ public: // - an integer representing the selected child element, // or 0 if this object is selected (GetType() == "long") // - a "void*" pointer to a wxAccessible child object - virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE; + virtual wxAccStatus GetSelections(wxVariant* selections) override; }; diff --git a/samples/animate/anitest.h b/samples/animate/anitest.h index 505dfdb305..e6dc2a1747 100644 --- a/samples/animate/anitest.h +++ b/samples/animate/anitest.h @@ -14,7 +14,7 @@ class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // Define a new frame diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp index afc26b1c39..2469569e0e 100644 --- a/samples/archive/archive.cpp +++ b/samples/archive/archive.cpp @@ -33,11 +33,11 @@ public: m_filterClassFactory = NULL; } - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; - virtual int OnRun() wxOVERRIDE; + virtual int OnRun() override; private: enum ArchiveCommandType diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index 3a6fe830e2..fb6e6f3728 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -30,7 +30,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; class MyFrame : public wxFrame @@ -110,7 +110,7 @@ class MyArtProvider : public wxArtProvider { protected: virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; + const wxSize& size) override; }; #include "info.xpm" diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 1e415b311b..5b22b852c9 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -39,7 +39,7 @@ class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; wxDECLARE_APP(MyApp); diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index a0904d4886..c9092f74fc 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -75,7 +75,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() wxOVERRIDE; + virtual bool OnInit() override; private: wxLocale m_locale; diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index ea882a7880..98a3b03db0 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -45,7 +45,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() wxOVERRIDE; + virtual bool OnInit() override; }; // MyCanvas is a canvas on which you can type diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp index dfbdf2b24d..656dcc2fb0 100644 --- a/samples/clipboard/clipboard.cpp +++ b/samples/clipboard/clipboard.cpp @@ -28,7 +28,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp index 81b12357b7..155d3931bd 100644 --- a/samples/collpane/collpane.cpp +++ b/samples/collpane/collpane.cpp @@ -73,7 +73,7 @@ class MyApp: public wxApp public: MyApp() { } - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; wxDECLARE_NO_COPY_CLASS(MyApp); }; diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp index 59399d839b..b07c7b0f29 100644 --- a/samples/combo/combo.cpp +++ b/samples/combo/combo.cpp @@ -59,7 +59,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() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new frame type: this is going to be our main frame @@ -176,7 +176,7 @@ public: virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, - int flags ) const wxOVERRIDE + int flags ) const override { if ( item == wxNOT_FOUND ) return; @@ -230,7 +230,7 @@ public: } virtual void OnDrawBackground( wxDC& dc, const wxRect& rect, - int item, int flags ) const wxOVERRIDE + int item, int flags ) const override { // If item is selected or even, or we are painting the @@ -249,13 +249,13 @@ public: dc.DrawRectangle(rect); } - virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE + virtual wxCoord OnMeasureItem( size_t item ) const override { // Simply demonstrate the ability to have variable-height items return FromDIP( item & 1 ? 36 : 24 ); } - virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const wxOVERRIDE + virtual wxCoord OnMeasureItemWidth( size_t WXUNUSED(item) ) const override { return -1; // default - will be measured from text width } @@ -273,13 +273,13 @@ class ListViewComboPopup : public wxListView, public wxComboPopup { public: - virtual void Init() wxOVERRIDE + virtual void Init() override { m_value = -1; m_itemHere = -1; // hot item in list } - virtual bool Create( wxWindow* parent ) wxOVERRIDE + virtual bool Create( wxWindow* parent ) override { return wxListView::Create(parent,1, wxPoint(0,0),wxDefaultSize, @@ -287,16 +287,16 @@ public: wxLC_SORT_ASCENDING|wxSIMPLE_BORDER); } - virtual wxWindow *GetControl() wxOVERRIDE { return this; } + virtual wxWindow *GetControl() override { return this; } - virtual void SetStringValue( const wxString& s ) wxOVERRIDE + virtual void SetStringValue( const wxString& s ) override { int n = wxListView::FindItem(-1,s); if ( n >= 0 && n < GetItemCount() ) wxListView::Select(n); } - virtual wxString GetStringValue() const wxOVERRIDE + virtual wxString GetStringValue() const override { if ( m_value >= 0 ) return wxListView::GetItemText(m_value); @@ -367,7 +367,7 @@ class TreeCtrlComboPopup : public wxTreeCtrl, public wxComboPopup { public: - virtual void Init() wxOVERRIDE + virtual void Init() override { } virtual ~TreeCtrlComboPopup() @@ -379,7 +379,7 @@ public: SendDestroyEvent(); } - virtual bool Create( wxWindow* parent ) wxOVERRIDE + virtual bool Create( wxWindow* parent ) override { return wxTreeCtrl::Create(parent,1, wxPoint(0,0),wxDefaultSize, @@ -395,12 +395,12 @@ public: virtual wxSize GetAdjustedSize( int minWidth, int WXUNUSED(prefHeight), - int maxHeight ) wxOVERRIDE + int maxHeight ) override { return wxSize(wxMax(300,minWidth),wxMin(250,maxHeight)); } - virtual wxWindow *GetControl() wxOVERRIDE { return this; } + virtual wxWindow *GetControl() override { return this; } // Needed by SetStringValue wxTreeItemId FindItemByText( wxTreeItemId parent, const wxString& text ) @@ -424,7 +424,7 @@ public: return wxTreeItemId(); } - virtual void SetStringValue( const wxString& s ) wxOVERRIDE + virtual void SetStringValue( const wxString& s ) override { wxTreeItemId root = GetRootItem(); if ( !root.IsOk() ) @@ -438,7 +438,7 @@ public: } } - virtual wxString GetStringValue() const wxOVERRIDE + virtual wxString GetStringValue() const override { if ( m_value.IsOk() ) return wxTreeCtrl::GetItemText(m_value); @@ -501,7 +501,7 @@ wxEND_EVENT_TABLE() class wxComboCtrlWithCustomPopupAnim : public wxComboCtrl { protected: - virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) wxOVERRIDE + virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) ) override { wxWindow* win = GetPopupWindow(); win->SetSize(rect); @@ -543,7 +543,7 @@ public: #endif } - virtual void OnButtonClick() wxOVERRIDE + virtual void OnButtonClick() override { // Show standard wxFileDialog on button click @@ -561,7 +561,7 @@ public: } // Implement empty DoSetPopupControl to prevent assertion failure. - virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) wxOVERRIDE + virtual void DoSetPopupControl(wxComboPopup* WXUNUSED(popup)) override { } diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp index 96e2d5f95d..6fa11af1e0 100644 --- a/samples/config/conftest.cpp +++ b/samples/config/conftest.cpp @@ -37,8 +37,8 @@ class MyApp: public wxApp { public: // implement base class virtuals - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; }; class MyFrame: public wxFrame diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 1b99513d6f..491a0262c0 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -54,7 +54,7 @@ class MyApp: public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // ---------------------------------------------------------------------------- @@ -237,7 +237,7 @@ public: : wxDataViewCustomRenderer("string", mode, wxALIGN_CENTER) { } - virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE + virtual bool Render( wxRect rect, wxDC *dc, int state ) override { dc->SetBrush( *wxLIGHT_GREY_BRUSH ); dc->SetPen( *wxTRANSPARENT_PEN ); @@ -257,7 +257,7 @@ public: wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col), - const wxMouseEvent *mouseEvent) wxOVERRIDE + const wxMouseEvent *mouseEvent) override { wxString position; if ( mouseEvent ) @@ -268,32 +268,32 @@ public: return false; } - virtual wxSize GetSize() const wxOVERRIDE + virtual wxSize GetSize() const override { return GetView()->FromDIP(wxSize(60, 20)); } - virtual bool SetValue( const wxVariant &value ) wxOVERRIDE + virtual bool SetValue( const wxVariant &value ) override { m_value = value.GetString(); return true; } - virtual bool GetValue( wxVariant &WXUNUSED(value) ) const wxOVERRIDE { return true; } + virtual bool GetValue( wxVariant &WXUNUSED(value) ) const override { return true; } #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE + virtual wxString GetAccessibleDescription() const override { return m_value; } #endif // wxUSE_ACCESSIBILITY - virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } + virtual bool HasEditorCtrl() const override { return true; } virtual wxWindow* CreateEditorCtrl(wxWindow* parent, wxRect labelRect, - const wxVariant& value) wxOVERRIDE + const wxVariant& value) override { wxTextCtrl* text = new wxTextCtrl(parent, wxID_ANY, value, labelRect.GetPosition(), @@ -305,7 +305,7 @@ public: } virtual bool - GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) wxOVERRIDE + GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) override { wxTextCtrl* text = wxDynamicCast(ctrl, wxTextCtrl); if ( !text ) @@ -333,13 +333,13 @@ public: : wxDataViewCustomRenderer("string", wxDATAVIEW_CELL_INERT, 0) { } - virtual bool Render(wxRect rect, wxDC *dc, int state) wxOVERRIDE + virtual bool Render(wxRect rect, wxDC *dc, int state) override { RenderText(m_value, 0, rect, dc, state); return true; } - virtual wxSize GetSize() const wxOVERRIDE + virtual wxSize GetSize() const override { wxSize txtSize = GetTextExtent(m_value); int lines = m_value.Freq('\n') + 1; @@ -347,17 +347,17 @@ public: return txtSize; } - virtual bool SetValue(const wxVariant &value) wxOVERRIDE + virtual bool SetValue(const wxVariant &value) override { m_value = value.GetString(); m_value.Replace(" ", "\n"); return true; } - virtual bool GetValue(wxVariant &WXUNUSED(value)) const wxOVERRIDE { return true; } + virtual bool GetValue(wxVariant &WXUNUSED(value)) const override { return true; } #if wxUSE_ACCESSIBILITY - virtual wxString GetAccessibleDescription() const wxOVERRIDE + virtual wxString GetAccessibleDescription() const override { return m_value; } diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h index 187db079e7..7a52e0f03f 100644 --- a/samples/dataview/mymodels.h +++ b/samples/dataview/mymodels.h @@ -146,22 +146,22 @@ public: // override sorting to always sort branches ascendingly int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) const wxOVERRIDE; + unsigned int column, bool ascending ) const override; // implementation of base class virtuals to define model virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE; + const wxDataViewItem &item, unsigned int col ) const override; virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) wxOVERRIDE; + const wxDataViewItem &item, unsigned int col ) override; virtual bool IsEnabled( const wxDataViewItem &item, - unsigned int col ) const wxOVERRIDE; + unsigned int col ) const override; - virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE; - virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE; + virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const override; + virtual bool IsContainer( const wxDataViewItem &item ) const override; virtual unsigned int GetChildren( const wxDataViewItem &parent, - wxDataViewItemArray &array ) const wxOVERRIDE; + wxDataViewItemArray &array ) const override; private: MyMusicTreeModelNode* m_root; @@ -216,11 +216,11 @@ public: // implementation of base class virtuals to define model virtual void GetValueByRow( wxVariant &variant, - unsigned int row, unsigned int col ) const wxOVERRIDE; + unsigned int row, unsigned int col ) const override; virtual bool GetAttrByRow( unsigned int row, unsigned int col, - wxDataViewItemAttr &attr ) const wxOVERRIDE; + wxDataViewItemAttr &attr ) const override; virtual bool SetValueByRow( const wxVariant &variant, - unsigned int row, unsigned int col ) wxOVERRIDE; + unsigned int row, unsigned int col ) override; private: wxVector m_toggleColValues; @@ -237,7 +237,7 @@ private: class MyListStoreDerivedModel : public wxDataViewListStore { public: - virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const wxOVERRIDE; + virtual bool IsEnabledByRow(unsigned int row, unsigned int col) const override; }; // ---------------------------------------------------------------------------- @@ -247,7 +247,7 @@ public: class MyListStoreHasValueModel : public MyListStoreDerivedModel { public: - virtual bool HasValue(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE; + virtual bool HasValue(const wxDataViewItem &item, unsigned int col) const override; }; // ---------------------------------------------------------------------------- @@ -267,12 +267,12 @@ public: } // Implement base class pure virtual methods. - unsigned GetCount() const wxOVERRIDE { return m_strings.size(); } - void GetValueByRow(wxVariant& val, unsigned row, unsigned) const wxOVERRIDE + unsigned GetCount() const override { return m_strings.size(); } + void GetValueByRow(wxVariant& val, unsigned row, unsigned) const override { val = m_strings[row]; } - bool SetValueByRow(const wxVariant&, unsigned, unsigned) wxOVERRIDE + bool SetValueByRow(const wxVariant&, unsigned, unsigned) override { return false; } diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp index 1a945bcc33..b41e4596da 100644 --- a/samples/debugrpt/debugrpt.cpp +++ b/samples/debugrpt/debugrpt.cpp @@ -64,7 +64,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) wxOVERRIDE + virtual bool OnServerReply(const wxArrayString& reply) override { if ( reply.IsEmpty() ) { @@ -177,7 +177,7 @@ private: public: BadTimer() { } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { foo(8); } @@ -205,10 +205,10 @@ public: MyApp(); // create our main window here - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; // called when a crash occurs in this application - virtual void OnFatalException() wxOVERRIDE; + virtual void OnFatalException() override; // 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 a49d9c89d1..7b15d4ba47 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -1516,24 +1516,24 @@ void MyFrame::AddRemove(wxCommandEvent& WXUNUSED(event)) { } - wxWindow* GetItemsCtrl() const wxOVERRIDE + wxWindow* GetItemsCtrl() const override { return m_lbox; } - bool CanAdd() const wxOVERRIDE + bool CanAdd() const override { // Restrict the maximal number of items to 10 just for testing. return m_lbox->GetCount() <= 10; } - bool CanRemove() const wxOVERRIDE + bool CanRemove() const override { // We must have a selected item in order to be able to delete it. return m_lbox->GetSelection() != wxNOT_FOUND; } - void OnAdd() wxOVERRIDE + void OnAdd() override { // A real program would use a wxDataViewCtrl or wxListCtrl and // allow editing the newly edited item in place, here we just use a @@ -1542,7 +1542,7 @@ void MyFrame::AddRemove(wxCommandEvent& WXUNUSED(event)) m_lbox->Append(wxString::Format("new item #%d", ++s_item)); } - void OnRemove() wxOVERRIDE + void OnRemove() override { // Notice that we don't need to check if we have a valid selection, // we can be only called if CanRemove(), which already checks for @@ -1733,7 +1733,7 @@ public: } // Override pure virtual base class method to add our custom controls. - virtual void AddCustomControls(wxFileDialogCustomize& customizer) wxOVERRIDE + virtual void AddCustomControls(wxFileDialogCustomize& customizer) override { // Note: all the pointers created here cease to be valid once // ShowModal() returns, TransferDataFromCustomControls() is the latest @@ -1751,7 +1751,7 @@ public: } // Override another method called whenever something changes in the dialog. - virtual void UpdateCustomControls() wxOVERRIDE + virtual void UpdateCustomControls() override { // Enable the button if and only if the checkbox is checked. m_btn->Enable(m_cb->GetValue()); @@ -1768,7 +1768,7 @@ public: } // And another one called when the dialog is accepted. - virtual void TransferDataFromCustomControls() wxOVERRIDE + virtual void TransferDataFromCustomControls() override { m_info.Printf("paper=%s (%s), enabled=%d, text=\"%s\"", GetFileDialogPaperSize(m_choiceSize->GetSelection()), @@ -2030,12 +2030,12 @@ void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) ) { } - void AddCustomControls(wxFileDialogCustomize& customizer) wxOVERRIDE + void AddCustomControls(wxFileDialogCustomize& customizer) override { m_checkbox = customizer.AddCheckBox("Encrypt"); } - void TransferDataFromCustomControls() wxOVERRIDE + void TransferDataFromCustomControls() override { m_encrypt = m_checkbox->GetValue(); } @@ -3195,14 +3195,14 @@ void MyFrame::OnModalHook(wxCommandEvent& event) class TestModalHook : public wxModalDialogHook { protected: - virtual int Enter(wxDialog* dialog) wxOVERRIDE + virtual int Enter(wxDialog* dialog) override { wxLogStatus("Showing %s modal dialog", dialog->GetClassInfo()->GetClassName()); return wxID_NONE; } - virtual void Exit(wxDialog* dialog) wxOVERRIDE + virtual void Exit(wxDialog* dialog) override { wxLogStatus("Leaving %s modal dialog", dialog->GetClassInfo()->GetClassName()); @@ -3506,7 +3506,7 @@ public: } // add some custom controls - virtual void DoAddCustomControls() wxOVERRIDE + virtual void DoAddCustomControls() override { AddControl(new wxStaticLine(this), wxSizerFlags().Expand()); AddText("Some custom text"); @@ -4563,7 +4563,7 @@ class MyLogGui : public wxLogGui private: virtual void DoShowSingleLogMessage(const wxString& message, const wxString& title, - int style) wxOVERRIDE + int style) override { wxMessageDialog dlg(NULL, message, title, wxOK | wxCANCEL | wxCANCEL_DEFAULT | style); diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 2c8cd705d5..b97d814f37 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -92,7 +92,7 @@ of MSW, MAC and OS2 class MyAppTraits : public wxGUIAppTraits { public: - virtual wxLog *CreateLogTarget() wxOVERRIDE; + virtual wxLog *CreateLogTarget() override; }; #endif // wxUSE_LOG @@ -103,16 +103,16 @@ class MyApp: public wxApp public: MyApp() { m_startupProgressStyle = -1; } - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; #if wxUSE_CMDLINE_PARSER - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; #endif // wxUSE_CMDLINE_PARSER protected: #if wxUSE_LOG - virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyAppTraits; } + virtual wxAppTraits *CreateTraits() override { return new MyAppTraits; } #endif // wxUSE_LOG private: @@ -267,8 +267,8 @@ public: protected: // overrides method in base class - virtual void AddAdditionalTextOptions(wxSizer *sizer) wxOVERRIDE; - virtual void AddAdditionalFlags(wxSizer *sizer) wxOVERRIDE; + virtual void AddAdditionalTextOptions(wxSizer *sizer) override; + virtual void AddAdditionalFlags(wxSizer *sizer) override; void OnApply(wxCommandEvent& event); diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp index 506af64644..f8bd276256 100644 --- a/samples/dialup/nettest.cpp +++ b/samples/dialup/nettest.cpp @@ -50,10 +50,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() wxOVERRIDE; + virtual bool OnInit() override; // called before the application termination - virtual int OnExit() wxOVERRIDE; + virtual int OnExit() override; // event handlers void OnConnected(wxDialUpEvent& event); diff --git a/samples/display/display.cpp b/samples/display/display.cpp index 58f18deea9..54fcd50d69 100644 --- a/samples/display/display.cpp +++ b/samples/display/display.cpp @@ -52,7 +52,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() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/dll/wx_exe.cpp b/samples/dll/wx_exe.cpp index 89bce5d7c9..f4843bd1f6 100644 --- a/samples/dll/wx_exe.cpp +++ b/samples/dll/wx_exe.cpp @@ -55,8 +55,8 @@ public: class MainApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; }; diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index 72424a9fa4..5a2428092e 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -44,7 +44,7 @@ class DnDText : public wxTextDropTarget public: DnDText(wxListBox *pOwner) { m_pOwner = pOwner; } - virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) wxOVERRIDE; + virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) override; private: wxListBox *m_pOwner; @@ -56,7 +56,7 @@ public: DnDFile(wxListBox *pOwner = NULL) { m_pOwner = pOwner; } virtual bool OnDropFiles(wxCoord x, wxCoord y, - const wxArrayString& filenames) wxOVERRIDE; + const wxArrayString& filenames) override; private: wxListBox *m_pOwner; @@ -80,14 +80,14 @@ public: // URLs can't be moved, only copied virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxDragResult WXUNUSED(def)) wxOVERRIDE + wxDragResult WXUNUSED(def)) override { 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) wxOVERRIDE + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override { if ( !GetData() ) return wxDragNone; @@ -107,7 +107,7 @@ public: class DnDApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; wxIMPLEMENT_APP(DnDApp); @@ -375,8 +375,8 @@ public: wxLogMessage("DnDTriangularShape is being deleted"); } - virtual Kind GetKind() const wxOVERRIDE { return Triangle; } - virtual void Draw(wxDC& dc) wxOVERRIDE + virtual Kind GetKind() const override { return Triangle; } + virtual void Draw(wxDC& dc) override { DnDShape::Draw(dc); @@ -412,8 +412,8 @@ public: wxLogMessage("DnDRectangularShape is being deleted"); } - virtual Kind GetKind() const wxOVERRIDE { return Rectangle; } - virtual void Draw(wxDC& dc) wxOVERRIDE + virtual Kind GetKind() const override { return Rectangle; } + virtual void Draw(wxDC& dc) override { DnDShape::Draw(dc); @@ -448,8 +448,8 @@ public: wxLogMessage("DnDEllipticShape is being deleted"); } - virtual Kind GetKind() const wxOVERRIDE { return Ellipse; } - virtual void Draw(wxDC& dc) wxOVERRIDE + virtual Kind GetKind() const override { return Ellipse; } + virtual void Draw(wxDC& dc) override { DnDShape::Draw(dc); @@ -529,12 +529,12 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const wxOVERRIDE + virtual wxDataFormat GetPreferredFormat(Direction WXUNUSED(dir)) const override { return m_formatShape; } - virtual size_t GetFormatCount(Direction dir) const wxOVERRIDE + virtual size_t GetFormatCount(Direction dir) const override { // 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 wxOVERRIDE + virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const override { formats[0] = m_formatShape; if ( dir == Get ) @@ -568,7 +568,7 @@ public: } } - virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat& format) const override { if ( format == m_formatShape ) { @@ -595,7 +595,7 @@ public: } } - virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const override { if ( format == m_formatShape ) { @@ -625,7 +625,7 @@ public: } virtual bool SetData(const wxDataFormat& format, - size_t WXUNUSED(len), const void *buf) wxOVERRIDE + size_t WXUNUSED(len), const void *buf) override { wxCHECK_MSG( format == m_formatShape, false, "unsupported format"); @@ -674,8 +674,8 @@ public: DnDShape *GetShape() const; - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; void OnColour(wxCommandEvent& event); @@ -752,20 +752,20 @@ public: } // override base class (pure) virtuals - virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE + virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) override { #if wxUSE_STATUSBAR m_frame->SetStatusText("Mouse entered the frame"); #endif // wxUSE_STATUSBAR return OnDragOver(x, y, def); } - virtual void OnLeave() wxOVERRIDE + virtual void OnLeave() override { #if wxUSE_STATUSBAR m_frame->SetStatusText("Mouse left the frame"); #endif // wxUSE_STATUSBAR } - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE + virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override { if ( !GetData() ) { diff --git a/samples/docview/doc.h b/samples/docview/doc.h index ea4d7cd900..18b15b5f36 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) wxOVERRIDE; - DocumentIstream& LoadObject(DocumentIstream& stream) wxOVERRIDE; + DocumentOstream& SaveObject(DocumentOstream& stream) override; + DocumentIstream& LoadObject(DocumentIstream& stream) override; // add a new segment to the document void AddDoodleSegment(const DoodleSegment& segment); @@ -138,8 +138,8 @@ public: { } - virtual bool Do() wxOVERRIDE { return DoAdd(); } - virtual bool Undo() wxOVERRIDE { return DoRemove(); } + virtual bool Do() override { return DoAdd(); } + virtual bool Undo() override { return DoRemove(); } }; // The command for removing the last segment @@ -151,8 +151,8 @@ public: { } - virtual bool Do() wxOVERRIDE { return DoRemove(); } - virtual bool Undo() wxOVERRIDE { return DoAdd(); } + virtual bool Do() override { return DoRemove(); } + virtual bool Undo() override { return DoAdd(); } }; @@ -165,16 +165,16 @@ class wxTextDocument : public wxDocument public: wxTextDocument() : wxDocument() { } - virtual bool OnCreate(const wxString& path, long flags) wxOVERRIDE; + virtual bool OnCreate(const wxString& path, long flags) override; virtual wxTextCtrl* GetTextCtrl() const = 0; - virtual bool IsModified() const wxOVERRIDE; - virtual void Modify(bool mod) wxOVERRIDE; + virtual bool IsModified() const override; + virtual void Modify(bool mod) override; protected: - virtual bool DoSaveDocument(const wxString& filename) wxOVERRIDE; - virtual bool DoOpenDocument(const wxString& filename) wxOVERRIDE; + virtual bool DoSaveDocument(const wxString& filename) override; + virtual bool DoOpenDocument(const wxString& filename) override; void OnTextChange(wxCommandEvent& event); @@ -190,7 +190,7 @@ class TextEditDocument : public wxTextDocument { public: TextEditDocument() : wxTextDocument() { } - virtual wxTextCtrl* GetTextCtrl() const wxOVERRIDE; + virtual wxTextCtrl* GetTextCtrl() const override; wxDECLARE_NO_COPY_CLASS(TextEditDocument); wxDECLARE_DYNAMIC_CLASS(TextEditDocument); @@ -208,12 +208,12 @@ class ImageDocument : public wxDocument public: ImageDocument() : wxDocument() { } - virtual bool OnOpenDocument(const wxString& file) wxOVERRIDE; + virtual bool OnOpenDocument(const wxString& file) override; wxImage GetImage() const { return m_image; } protected: - virtual bool DoOpenDocument(const wxString& file) wxOVERRIDE; + virtual bool DoOpenDocument(const wxString& file) override; private: wxImage m_image; diff --git a/samples/docview/docview.h b/samples/docview/docview.h index 008ec7fe76..bea75423e9 100644 --- a/samples/docview/docview.h +++ b/samples/docview/docview.h @@ -37,14 +37,14 @@ public: MyApp(); // override some wxApp virtual methods - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; #ifdef __WXMAC__ - virtual void MacNewFile() wxOVERRIDE; + virtual void MacNewFile() override; #endif // __WXMAC__ // our specific methods diff --git a/samples/docview/view.h b/samples/docview/view.h index 7065b2c5f8..6e905b5c5a 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) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; // 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) wxOVERRIDE; - virtual void OnDraw(wxDC *dc) wxOVERRIDE; - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) wxOVERRIDE; - virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE; + virtual bool OnCreate(wxDocument *doc, long flags) override; + virtual void OnDraw(wxDC *dc) override; + virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) override; + virtual bool OnClose(bool deleteWindow = true) override; DrawingDocument* GetDocument(); @@ -94,9 +94,9 @@ class TextEditView : public wxView public: TextEditView() : wxView(), m_text(NULL) {} - virtual bool OnCreate(wxDocument *doc, long flags) wxOVERRIDE; - virtual void OnDraw(wxDC *dc) wxOVERRIDE; - virtual bool OnClose(bool deleteWindow = true) wxOVERRIDE; + virtual bool OnCreate(wxDocument *doc, long flags) override; + virtual void OnDraw(wxDC *dc) override; + virtual bool OnClose(bool deleteWindow = true) override; wxTextCtrl *GetText() const { return m_text; } @@ -120,7 +120,7 @@ class ImageCanvas : public wxScrolledWindow public: ImageCanvas(wxView*); - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; private: wxView *m_view; }; @@ -134,10 +134,10 @@ class ImageView : public wxView public: ImageView() : wxView() {} - 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; + virtual bool OnCreate(wxDocument*, long flags) override; + virtual void OnDraw(wxDC*) override; + virtual bool OnClose(bool deleteWindow = true) override; + virtual void OnUpdate(wxView *sender, wxObject *hint = NULL) override; ImageDocument* GetDocument(); @@ -156,8 +156,8 @@ class ImageDetailsView : public wxView public: ImageDetailsView(ImageDetailsDocument *doc); - virtual void OnDraw(wxDC *dc) wxOVERRIDE; - virtual bool OnClose(bool deleteWindow) wxOVERRIDE; + virtual void OnDraw(wxDC *dc) override; + virtual bool OnClose(bool deleteWindow) override; private: wxFrame *m_frame; diff --git a/samples/dragimag/dragimag.h b/samples/dragimag/dragimag.h index 4cea6af06b..f1ad74bfdb 100644 --- a/samples/dragimag/dragimag.h +++ b/samples/dragimag/dragimag.h @@ -44,8 +44,8 @@ class MyApp: public wxApp { public: MyApp(); - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; //// Operations @@ -181,7 +181,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 wxOVERRIDE; + const wxRect& destRect) const override; #endif protected: diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index a39080d16b..503a1bced0 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -85,9 +85,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() wxOVERRIDE; + virtual bool OnInit() override; - virtual int OnExit() wxOVERRIDE { DeleteBitmaps(); return 0; } + virtual int OnExit() override { DeleteBitmaps(); return 0; } protected: void DeleteBitmaps(); @@ -248,7 +248,7 @@ public: #if wxUSE_COLOURDLG wxColour SelectColour(); #endif // wxUSE_COLOURDLG - void PrepareDC(wxDC& dc) wxOVERRIDE; + void PrepareDC(wxDC& dc) override; int m_backgroundMode; int m_textureBackground; @@ -2176,7 +2176,7 @@ public: SetSizerAndFit(sizer); } - virtual bool TransferDataFromWindow() wxOVERRIDE + virtual bool TransferDataFromWindow() override { if ( !wxDialog::TransferDataFromWindow() ) return false; diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp index 656a72b9ae..e65da926d5 100644 --- a/samples/erase/erase.cpp +++ b/samples/erase/erase.cpp @@ -46,7 +46,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/samples/event/chessboard.cpp b/samples/event/chessboard.cpp index d90a5ac675..49d4a67dd6 100644 --- a/samples/event/chessboard.cpp +++ b/samples/event/chessboard.cpp @@ -42,7 +42,7 @@ private: void OnMouseLeftDown(wxMouseEvent& event); void OnMouseLeftUp(wxMouseEvent& event); - virtual wxSize DoGetBestClientSize() const wxOVERRIDE; + virtual wxSize DoGetBestClientSize() const override; }; ChessBoard::ChessBoard(wxWindow* parent) diff --git a/samples/event/chessboard.h b/samples/event/chessboard.h index b9d3fcad7b..7e240a13ef 100644 --- a/samples/event/chessboard.h +++ b/samples/event/chessboard.h @@ -45,7 +45,7 @@ public: void SetFileTo(char file) { m_fileTo = file; } void SetRankTo(wxUint8 rank) { m_rankTo = rank; } - virtual wxEvent* Clone() const wxOVERRIDE { return new ChessBoardEvent(*this); } + virtual wxEvent* Clone() const override { return new ChessBoardEvent(*this); } private: char m_file; wxUint8 m_rank; diff --git a/samples/event/event.cpp b/samples/event/event.cpp index d3543d7c45..36979d4c01 100644 --- a/samples/event/event.cpp +++ b/samples/event/event.cpp @@ -65,7 +65,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() wxOVERRIDE; + virtual bool OnInit() override; // these are regular event handlers used to highlight the events handling // order @@ -74,7 +74,7 @@ public: // we override wxAppConsole::FilterEvent used to highlight the events // handling order - virtual int FilterEvent(wxEvent& event) wxOVERRIDE; + virtual int FilterEvent(wxEvent& event) override; private: wxDECLARE_EVENT_TABLE(); diff --git a/samples/except/except.cpp b/samples/except/except.cpp index daae3908bc..866c15459c 100644 --- a/samples/except/except.cpp +++ b/samples/except/except.cpp @@ -82,11 +82,11 @@ public: // ---------------------------- // program startup - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; // 2nd-level exception handling: we get all the exceptions occurring in any // event handler here - virtual bool OnExceptionInMainLoop() wxOVERRIDE; + virtual bool OnExceptionInMainLoop() override; // 2nd-level exception handling helpers: if we can't deal with the // exception immediately, we may also store it and rethrow it later, when @@ -95,16 +95,16 @@ public: // Notice that overriding these methods is not necessary when using C++11 // as they have a perfectly serviceable implementation inside the library // itself in this case. - virtual bool StoreCurrentException() wxOVERRIDE; - virtual void RethrowStoredException() wxOVERRIDE; + virtual bool StoreCurrentException() override; + virtual void RethrowStoredException() override; // 3rd, and final, level exception handling: whenever an unhandled // exception is caught, this function is called - virtual void OnUnhandledException() wxOVERRIDE; + virtual void OnUnhandledException() override; // 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() wxOVERRIDE; + virtual void OnFatalException() override; // you can override this function to do something different (e.g. log the // assert to file) whenever an assertion fails @@ -112,7 +112,7 @@ public: int line, const wxChar *func, const wxChar *cond, - const wxChar *msg) wxOVERRIDE; + const wxChar *msg) override; private: // This stores the number of times StoreCurrentException() was called, @@ -148,7 +148,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) wxOVERRIDE; + virtual bool ProcessEvent(wxEvent& event) override; // provoke assert in main or worker thread // @@ -580,7 +580,7 @@ void MyFrame::OnShowAssertInThread(wxCommandEvent& WXUNUSED(event)) } protected: - virtual void *Entry() wxOVERRIDE + virtual void *Entry() override { wxFAIL_MSG("Test assert in another thread."); diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index e6639abe70..ca8e3f691b 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.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() wxOVERRIDE; + virtual bool OnInit() override; }; // Define an array of process pointers used by MyFrame @@ -261,7 +261,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) wxOVERRIDE; + virtual void OnTerminate(int pid, int status) override; protected: MyFrame *m_parent; @@ -278,7 +278,7 @@ public: Redirect(); } - virtual void OnTerminate(int pid, int status) wxOVERRIDE; + virtual void OnTerminate(int pid, int status) override; virtual bool HasInput(); }; @@ -293,7 +293,7 @@ public: { } - virtual bool HasInput() wxOVERRIDE; + virtual bool HasInput() override; private: wxString m_input; diff --git a/samples/font/font.cpp b/samples/font/font.cpp index f7f7b6d509..c3dacbaf7a 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.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() wxOVERRIDE; + virtual bool OnInit() override; }; // FontPanel contains controls allowing to specify the font properties @@ -152,7 +152,7 @@ public: void OnPaint( wxPaintEvent &event ); protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE + virtual wxSize DoGetBestClientSize() const override { return wxSize(80*GetCharWidth(), 15*GetCharHeight()); } @@ -575,7 +575,7 @@ public: protected: virtual bool OnFontEncoding(const wxString& facename, - const wxString& encoding) wxOVERRIDE + const wxString& encoding) override { wxString text; text.Printf("Encoding %u: %s (available in facename '%s')\n", @@ -611,7 +611,7 @@ public: { return m_facenames; } protected: - virtual bool OnFacename(const wxString& facename) wxOVERRIDE + virtual bool OnFacename(const wxString& facename) override { m_facenames.Add(facename); return true; diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp index bd4e3dd65f..5b941f736b 100644 --- a/samples/fswatcher/fswatcher.cpp +++ b/samples/fswatcher/fswatcher.cpp @@ -70,7 +70,7 @@ class MyApp : public wxApp { public: // 'Main program' equivalent: the program execution "starts" here - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { if ( !wxApp::OnInit() ) return false; @@ -86,7 +86,7 @@ public: } // create the file system watcher here, because it needs an active loop - virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) wxOVERRIDE + virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) override { if ( m_frame->CreateWatcherIfNecessary() ) { @@ -95,7 +95,7 @@ public: } } - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE + virtual void OnInitCmdLine(wxCmdLineParser& parser) override { wxApp::OnInitCmdLine(parser); parser.AddParam("directory to watch", @@ -103,7 +103,7 @@ public: wxCMD_LINE_PARAM_OPTIONAL); } - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override { if ( !wxApp::OnCmdLineParsed(parser) ) return false; diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index dd6309dbe9..1943089938 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -56,7 +56,7 @@ public: const wxRect& rect, int horizAlign, int vertAlign, - int WXUNUSED(textOrientation)) const wxOVERRIDE + int WXUNUSED(textOrientation)) const override { dc.SetTextForeground(m_colFg); dc.SetFont(wxITALIC_FONT->Bold()); @@ -65,7 +65,7 @@ public: virtual void DrawBorder(const wxGrid& WXUNUSED(grid), wxDC& dc, - wxRect& rect) const wxOVERRIDE + wxRect& rect) const override { dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxBrush(m_colBg)); @@ -96,7 +96,7 @@ public: void UseCustomColHeaders(bool use = true) { m_useCustom = use; } protected: - virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) wxOVERRIDE + virtual const wxGridColumnHeaderRenderer& GetColumnHeaderRenderer(int col) override { // if enabled, use custom renderers if ( m_useCustom ) @@ -158,7 +158,7 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE + bool isSelected) override { wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected); @@ -172,13 +172,13 @@ public: wxGridCellAttr& attr, wxDC& dc, int WXUNUSED(row), - int WXUNUSED(col)) wxOVERRIDE + int WXUNUSED(col)) override { dc.SetFont(attr.GetFont()); return dc.GetTextExtent(GetStarString(MAX_STARS)); } - virtual wxGridCellRenderer *Clone() const wxOVERRIDE + virtual wxGridCellRenderer *Clone() const override { return new MyGridStarRenderer(); } @@ -190,7 +190,7 @@ class MyGridStarEditor : public wxGridCellActivatableEditor public: virtual wxGridActivationResult TryActivate(int row, int col, wxGrid* grid, - const wxGridActivationSource& actSource) wxOVERRIDE + const wxGridActivationSource& actSource) override { int numStars = -1; @@ -235,12 +235,12 @@ public: return wxGridActivationResult::DoChange(m_value); } - virtual void DoActivate(int row, int col, wxGrid* grid) wxOVERRIDE + virtual void DoActivate(int row, int col, wxGrid* grid) override { grid->SetCellValue(row, col, m_value); } - virtual wxGridCellEditor *Clone() const wxOVERRIDE + virtual wxGridCellEditor *Clone() const override { return new MyGridStarEditor(); } @@ -2305,10 +2305,10 @@ public: TabularGridTable() { m_sortOrder = NULL; } - virtual int GetNumberRows() wxOVERRIDE { return ROW_MAX; } - virtual int GetNumberCols() wxOVERRIDE { return COL_MAX; } + virtual int GetNumberRows() override { return ROW_MAX; } + virtual int GetNumberCols() override { return COL_MAX; } - virtual wxString GetValue(int row, int col) wxOVERRIDE + virtual wxString GetValue(int row, int col) override { if ( m_sortOrder ) row = m_sortOrder[row]; @@ -2333,12 +2333,12 @@ public: return wxString(); } - virtual void SetValue(int, int, const wxString&) wxOVERRIDE + virtual void SetValue(int, int, const wxString&) override { wxFAIL_MSG( "shouldn't be called" ); } - virtual wxString GetColLabelValue(int col) wxOVERRIDE + virtual wxString GetColLabelValue(int col) override { // notice that column parameter here always refers to the internal // column index, independently of its position on the screen @@ -2348,7 +2348,7 @@ public: return labels[col]; } - virtual void SetColLabelValue(int, const wxString&) wxOVERRIDE + virtual void SetColLabelValue(int, const wxString&) override { wxFAIL_MSG( "shouldn't be called" ); } @@ -2425,7 +2425,7 @@ public: } protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE + virtual wxSize DoGetBestSize() const override { wxSize size = wxTextCtrl::DoGetBestSize(); size.x = 3*GetCharWidth(); diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h index 9acc11b1b5..94f3b74472 100644 --- a/samples/grid/griddemo.h +++ b/samples/grid/griddemo.h @@ -16,7 +16,7 @@ class wxGrid; class GridApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; @@ -261,7 +261,7 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) wxOVERRIDE; + bool isSelected) override; }; // ---------------------------------------------------------------------------- @@ -274,15 +274,15 @@ class BigGridTable : public wxGridTableBase public: BigGridTable(long sizeGrid) { m_sizeGrid = sizeGrid; } - int GetNumberRows() wxOVERRIDE { return m_sizeGrid; } - int GetNumberCols() wxOVERRIDE { return m_sizeGrid; } - wxString GetValue( int row, int col ) wxOVERRIDE + int GetNumberRows() override { return m_sizeGrid; } + int GetNumberCols() override { return m_sizeGrid; } + wxString GetValue( int row, int col ) override { return wxString::Format("(%d, %d)", row, col); } - void SetValue( int , int , const wxString& ) wxOVERRIDE { /* ignore */ } - bool IsEmptyCell( int , int ) wxOVERRIDE { return false; } + void SetValue( int , int , const wxString& ) override { /* ignore */ } + bool IsEmptyCell( int , int ) override { return false; } private: long m_sizeGrid; @@ -308,7 +308,7 @@ public: MyGridCellAttrProvider(); virtual wxGridCellAttr *GetAttr(int row, int col, - wxGridCellAttr::wxAttrKind kind) const wxOVERRIDE; + wxGridCellAttr::wxAttrKind kind) const override; private: wxGridCellAttrPtr m_attrForOddRows; @@ -323,23 +323,23 @@ class BugsGridTable : public wxGridTableBase public: BugsGridTable() { } - 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 int GetNumberRows() override; + virtual int GetNumberCols() override; + virtual bool IsEmptyCell( int row, int col ) override; + virtual wxString GetValue( int row, int col ) override; + virtual void SetValue( int row, int col, const wxString& value ) override; - virtual wxString GetColLabelValue( int col ) wxOVERRIDE; + virtual wxString GetColLabelValue( int col ) override; - 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 wxString GetTypeName( int row, int col ) override; + virtual bool CanGetValueAs( int row, int col, const wxString& typeName ) override; + virtual bool CanSetValueAs( int row, int col, const wxString& typeName ) override; - virtual long GetValueAsLong( int row, int col ) wxOVERRIDE; - virtual bool GetValueAsBool( int row, int col ) wxOVERRIDE; + virtual long GetValueAsLong( int row, int col ) override; + virtual bool GetValueAsBool( int row, int col ) override; - virtual void SetValueAsLong( int row, int col, long value ) wxOVERRIDE; - virtual void SetValueAsBool( int row, int col, bool value ) wxOVERRIDE; + virtual void SetValueAsLong( int row, int col, long value ) override; + virtual void SetValueAsBool( int row, int col, bool value ) override; }; class BugsGridFrame : public wxFrame diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index 97c9f94de3..84fd591986 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -92,10 +92,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() wxOVERRIDE; + virtual bool OnInit() override; // do some clean up here - virtual int OnExit() wxOVERRIDE; + virtual int OnExit() override; }; // 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 a1dd6b201a..bb37cbf6ad 100644 --- a/samples/htlbox/htlbox.cpp +++ b/samples/htlbox/htlbox.cpp @@ -68,11 +68,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 wxOVERRIDE; + virtual wxString OnGetItem(size_t n) const override; // change the appearance by overriding these functions (this is optional) - virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const wxOVERRIDE; - virtual wxColour GetSelectedTextColour(const wxColour& colFg) const wxOVERRIDE; + virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const override; + virtual wxColour GetSelectedTextColour(const wxColour& colFg) const override; // flag telling us whether we should use fg colour even for the selected // item @@ -149,7 +149,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE { (new MyFrame())->Show(); return true; } + virtual bool OnInit() override { (new MyFrame())->Show(); return true; } }; // ---------------------------------------------------------------------------- diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp index 7952c5b575..4ec4266988 100644 --- a/samples/html/about/about.cpp +++ b/samples/html/about/about.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() wxOVERRIDE; + virtual bool OnInit() override; }; // 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 9855a067d5..53c52f0a3b 100644 --- a/samples/html/help/help.cpp +++ b/samples/html/help/help.cpp @@ -44,7 +44,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() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp index 7ed01d97b2..e9b266ec53 100644 --- a/samples/html/helpview/helpview.cpp +++ b/samples/html/helpview/helpview.cpp @@ -43,8 +43,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() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; private: wxHtmlHelpController *help; diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index c2e232fb4b..75e9646470 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -41,7 +41,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() wxOVERRIDE; + virtual bool OnInit() override; }; // 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 678579ddda..af3eff8cb1 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -38,7 +38,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new html window type: this is a wrapper for handling wxHtmlWindow events @@ -53,7 +53,7 @@ public: virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType WXUNUSED(type), const wxString& WXUNUSED(url), - wxString *WXUNUSED(redirect)) const wxOVERRIDE; + wxString *WXUNUSED(redirect)) const override; // toggle drawing of custom background void DrawCustomBg(bool draw) @@ -107,7 +107,7 @@ private: class BoldProcessor : public wxHtmlProcessor { public: - virtual wxString Process(const wxString& s) const wxOVERRIDE + virtual wxString Process(const wxString& s) const override { wxString r(s); r.Replace("", wxEmptyString); diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp index c274714d4f..438622c4a2 100644 --- a/samples/html/virtual/virtual.cpp +++ b/samples/html/virtual/virtual.cpp @@ -39,8 +39,8 @@ class MyVFS : public wxFileSystemHandler public: MyVFS() : wxFileSystemHandler() {} - wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; - bool CanOpen(const wxString& location) wxOVERRIDE; + wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; + bool CanOpen(const wxString& location) override; }; bool MyVFS::CanOpen(const wxString& location) @@ -91,7 +91,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() wxOVERRIDE; + virtual bool OnInit() override; }; // 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 297d694b32..03cd428011 100644 --- a/samples/html/widget/widget.cpp +++ b/samples/html/widget/widget.cpp @@ -84,7 +84,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() wxOVERRIDE; + virtual bool OnInit() override; }; // 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 ef7599d16a..0b8c6aa90d 100644 --- a/samples/html/zip/zip.cpp +++ b/samples/html/zip/zip.cpp @@ -40,7 +40,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() wxOVERRIDE; + virtual bool OnInit() override; }; // 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 eb65cd2ffc..fed8268100 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -63,7 +63,7 @@ class MyApp: public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // ---------------------------------------------------------------------------- diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index 53ca7ebbb1..363774b1ec 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -61,9 +61,9 @@ class MyApp: public wxApp public: MyApp() { m_setLocale = Locale_Ask; } - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; - virtual bool OnInit() wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; + virtual bool OnInit() override; protected: // Specifies whether we should use the current locale or not. By default we diff --git a/samples/ipc/baseclient.cpp b/samples/ipc/baseclient.cpp index 6bf11eace3..c5fb2670aa 100644 --- a/samples/ipc/baseclient.cpp +++ b/samples/ipc/baseclient.cpp @@ -46,8 +46,8 @@ class MyApp : public wxApp public: MyApp() { Bind(wxEVT_IDLE, &MyApp::OnIdle, this); } - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; private: void OnIdle(wxIdleEvent& event); @@ -58,11 +58,11 @@ private: class MyConnection : public MyConnectionBase { public: - 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; + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override; + virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) override; + virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) override; + virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override; + virtual bool OnDisconnect() override; }; class MyClient : public wxClient, @@ -74,10 +74,10 @@ public: bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic); void Disconnect(); - wxConnectionBase *OnMakeConnection() wxOVERRIDE; + wxConnectionBase *OnMakeConnection() override; bool IsConnected() { return m_connection != NULL; } - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; void StartNextTestIfNecessary(); diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp index b0ab1b9a93..d4069cf897 100644 --- a/samples/ipc/baseserver.cpp +++ b/samples/ipc/baseserver.cpp @@ -42,28 +42,28 @@ class MyConnection : public MyConnectionBase, public wxTimer { public: - virtual bool Disconnect() wxOVERRIDE { return wxConnection::Disconnect(); } + virtual bool Disconnect() override { return wxConnection::Disconnect(); } virtual bool OnExecute(const wxString& topic, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; + wxIPCFormat format) override; virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, - wxIPCFormat format) wxOVERRIDE; + wxIPCFormat format) override; 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; + wxIPCFormat format) override; + virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override; + virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override; virtual bool DoAdvise(const wxString& item, const void *data, size_t size, - wxIPCFormat format) wxOVERRIDE; - virtual bool OnDisconnect() wxOVERRIDE; - virtual void Notify() wxOVERRIDE; + wxIPCFormat format) override; + virtual bool OnDisconnect() override; + virtual void Notify() override; private: wxString m_sAdvise; @@ -83,9 +83,9 @@ public: 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; + wxIPCFormat format) override; + virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override; + virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override; private: // return true if this is the supported topic+item combination, log an @@ -112,7 +112,7 @@ public: void Disconnect(); bool IsConnected() { return m_connection != NULL; } - virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE; + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override; private: wxConnection *m_connection; @@ -122,7 +122,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; protected: MyServer m_server; diff --git a/samples/ipc/client.h b/samples/ipc/client.h index 7c1d58b207..923d2cc68c 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() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; 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) 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; + virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override; + virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) override; + virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) override; + virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override; + virtual bool OnDisconnect() override; }; 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() wxOVERRIDE; + wxConnectionBase *OnMakeConnection() override; bool IsConnected() { return m_connection != NULL; } MyConnection *GetConnection() { return m_connection; } diff --git a/samples/ipc/server.h b/samples/ipc/server.h index 7a88243e54..7baefdc509 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() wxOVERRIDE; + virtual bool OnInit() override; 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) 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; + virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) override; + virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) override; + virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override; + virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override; + virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override; + virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) override; + virtual bool OnDisconnect() override; // 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) wxOVERRIDE; + virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override; protected: MyConnection *m_connection; diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h index 76876e2e4d..4c33a977a8 100644 --- a/samples/joytest/joytest.h +++ b/samples/joytest/joytest.h @@ -12,7 +12,7 @@ class MyApp: public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; // Joystick max values int m_minX; diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp index eab85efb7e..0728a796a8 100644 --- a/samples/keyboard/keyboard.cpp +++ b/samples/keyboard/keyboard.cpp @@ -145,7 +145,7 @@ class MyApp : public wxApp { public: // 'Main program' equivalent: the program execution "starts" here - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { // create the main application window new MyFrame("Keyboard wxWidgets App"); diff --git a/samples/layout/layout.h b/samples/layout/layout.h index 3a7a78ce5a..b5738b2c4b 100644 --- a/samples/layout/layout.h +++ b/samples/layout/layout.h @@ -13,7 +13,7 @@ class MyApp: public wxApp { public: MyApp(){} - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // the main frame class diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h index 9db71c27c9..c32dac6235 100644 --- a/samples/listctrl/listtest.h +++ b/samples/listctrl/listtest.h @@ -22,7 +22,7 @@ class MyApp: public wxApp public: MyApp() { } - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; private: wxDECLARE_NO_COPY_CLASS(MyApp); @@ -74,8 +74,8 @@ public: void OnRightClick(wxMouseEvent& event); - virtual void CheckItem(long item, bool check) wxOVERRIDE; - virtual bool IsItemChecked(long item) const wxOVERRIDE; + virtual void CheckItem(long item, bool check) override; + virtual bool IsItemChecked(long item) const override; private: void ShowContextMenu(const wxPoint& pos, long item); @@ -84,10 +84,10 @@ private: void LogEvent(const wxListEvent& event, const wxString& eventName); void LogColEvent(const wxListEvent& event, const wxString& eventName); - virtual wxString OnGetItemText(long item, long column) const wxOVERRIDE; - virtual bool OnGetItemIsChecked(long item) const wxOVERRIDE; - virtual int OnGetItemColumnImage(long item, long column) const wxOVERRIDE; - virtual wxItemAttr *OnGetItemAttr(long item) const wxOVERRIDE; + virtual wxString OnGetItemText(long item, long column) const override; + virtual bool OnGetItemIsChecked(long item) const override; + virtual int OnGetItemColumnImage(long item, long column) const override; + virtual wxItemAttr *OnGetItemAttr(long item) const override; long m_updated; diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h index e9887164e8..2d2dd2c5fe 100644 --- a/samples/mdi/mdi.h +++ b/samples/mdi/mdi.h @@ -14,7 +14,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // Helper class logging menu open/close events. @@ -62,7 +62,7 @@ class MyCanvas : public wxScrolledWindow, { public: MyCanvas(wxFrame *parent, const wxPoint& pos, const wxSize& size); - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; bool IsDirty() const { return m_dirty; } diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp index aa9c8c13cf..858813710d 100644 --- a/samples/mediaplayer/mediaplayer.cpp +++ b/samples/mediaplayer/mediaplayer.cpp @@ -138,18 +138,18 @@ class wxMediaPlayerApp : public wxApp { public: #ifdef __WXMAC__ - virtual void MacOpenFiles(const wxArrayString & fileNames ) wxOVERRIDE; + virtual void MacOpenFiles(const wxArrayString & fileNames ) override; #endif #if wxUSE_CMDLINE_PARSER - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; // Files specified on the command line, if any. wxVector m_params; #endif // wxUSE_CMDLINE_PARSER - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; protected: class wxMediaPlayerFrame* m_frame; @@ -282,7 +282,7 @@ public: wxMediaPlayerTimer(wxMediaPlayerFrame* frame) {m_frame = frame;} // Called each time the timer's timeout expires - void Notify() wxOVERRIDE; + void Notify() override; wxMediaPlayerFrame* m_frame; // The wxMediaPlayerFrame }; @@ -348,7 +348,7 @@ public: wxPlayListDropTarget(wxMediaPlayerListCtrl& list) : m_list(list) {} ~wxPlayListDropTarget(){} virtual bool OnDropFiles(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - const wxArrayString& files) wxOVERRIDE + const wxArrayString& files) override { for (size_t i = 0; i < files.GetCount(); ++i) { diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp index 40c9defbab..1e818dee18 100644 --- a/samples/memcheck/memcheck.cpp +++ b/samples/memcheck/memcheck.cpp @@ -35,7 +35,7 @@ // Define a new application type class MyApp: public wxApp { public: - bool OnInit(void) wxOVERRIDE; + bool OnInit(void) override; }; // Define a new frame type diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 07886e3a8d..392ba82b61 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -69,7 +69,7 @@ class MyApp: public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // Define a new frame diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp index 15562ddb35..ff526e93b3 100644 --- a/samples/mfc/mfctest.cpp +++ b/samples/mfc/mfctest.cpp @@ -89,7 +89,7 @@ SampleMFCWinApp theApp; class MyApp: public wxAppWithMFC { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; wxFrame *CreateFrame(); }; diff --git a/samples/mfc/mfctest.h b/samples/mfc/mfctest.h index b12036d913..8de6ba80b8 100644 --- a/samples/mfc/mfctest.h +++ b/samples/mfc/mfctest.h @@ -36,7 +36,7 @@ private: class SampleMFCWinApp : public wxMFCWinApp { protected: - BOOL InitMainWnd() wxOVERRIDE + BOOL InitMainWnd() override { // Demonstrate creation of an initial MFC main window. m_pMainWnd = new CMainWindow(); diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 470e765423..501caf9096 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -50,7 +50,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() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/nativdlg/nativdlg.h b/samples/nativdlg/nativdlg.h index bedc78786f..6e444a3b66 100644 --- a/samples/nativdlg/nativdlg.h +++ b/samples/nativdlg/nativdlg.h @@ -13,7 +13,7 @@ class MyApp : public wxApp { public: MyApp(void) {} - bool OnInit(void) wxOVERRIDE; + bool OnInit(void) override; }; class MyFrame : public wxFrame diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h index acba301099..9ee628c5ba 100644 --- a/samples/notebook/notebook.h +++ b/samples/notebook/notebook.h @@ -26,7 +26,7 @@ class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; wxDECLARE_APP(MyApp); diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp index 94bae6eecd..24674c244f 100644 --- a/samples/oleauto/oleauto.cpp +++ b/samples/oleauto/oleauto.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() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new frame type: this is going to be our main frame diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h index 648545c673..c38ce330bc 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() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; 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 db13b21674..8c90eb57f0 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() wxOVERRIDE; + virtual bool OnInit() override; - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override; }; diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h index 08681b57be..f9340b1191 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() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/samples/opengl/pyramid/pyramid.h b/samples/opengl/pyramid/pyramid.h index fdffd31455..5319cc0200 100644 --- a/samples/opengl/pyramid/pyramid.h +++ b/samples/opengl/pyramid/pyramid.h @@ -15,7 +15,7 @@ class MyApp: public wxApp { public: MyApp(){} - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp index d7f153b506..d1d07e1c0b 100644 --- a/samples/ownerdrw/ownerdrw.cpp +++ b/samples/ownerdrw/ownerdrw.cpp @@ -28,7 +28,7 @@ class OwnerDrawnApp: public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // Define a new frame type diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp index e542c12d9e..b46696cc24 100644 --- a/samples/popup/popup.cpp +++ b/samples/popup/popup.cpp @@ -66,10 +66,10 @@ public: virtual ~SimpleTransientPopup(); // wxPopupTransientWindow virtual methods are all overridden to log them - virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE; - virtual void OnDismiss() wxOVERRIDE; - virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE; - virtual bool Show( bool show = true ) wxOVERRIDE; + virtual void Popup(wxWindow *focus = NULL) override; + virtual void OnDismiss() override; + virtual bool ProcessLeftDown(wxMouseEvent& event) override; + virtual bool Show( bool show = true ) override; private: wxScrolledWindow *m_panel; @@ -293,7 +293,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; MyFrame *m_frame; }; diff --git a/samples/power/power.cpp b/samples/power/power.cpp index 1fbacbc65a..e976c7796f 100644 --- a/samples/power/power.cpp +++ b/samples/power/power.cpp @@ -263,7 +263,7 @@ wxEND_EVENT_TABLE() class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { new MyFrame; diff --git a/samples/preferences/preferences.cpp b/samples/preferences/preferences.cpp index 2ade5aaba4..72e5545e39 100644 --- a/samples/preferences/preferences.cpp +++ b/samples/preferences/preferences.cpp @@ -47,7 +47,7 @@ struct MySettings class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; void ShowPreferencesEditor(wxWindow* parent); void DismissPreferencesEditor(); @@ -153,7 +153,7 @@ public: this); } - virtual bool TransferDataToWindow() wxOVERRIDE + virtual bool TransferDataToWindow() override { m_settingsCurrent = wxGetApp().GetSettings(); m_useMarkdown->SetValue(m_settingsCurrent.m_useMarkdown); @@ -161,7 +161,7 @@ public: return true; } - virtual bool TransferDataFromWindow() wxOVERRIDE + virtual bool TransferDataFromWindow() override { // Called on platforms with modal preferences dialog to save and apply // the changes. @@ -208,7 +208,7 @@ class PrefsPageGeneral : public wxStockPreferencesPage { public: PrefsPageGeneral() : wxStockPreferencesPage(Kind_General) {} - virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE + virtual wxWindow *CreateWindow(wxWindow *parent) override { return new PrefsPageGeneralPanel(parent); } }; @@ -236,7 +236,7 @@ public: } } - virtual bool TransferDataToWindow() wxOVERRIDE + virtual bool TransferDataToWindow() override { // This is the place where you can initialize values, e.g. from wxConfig. // For demonstration purposes, we just set hardcoded values. @@ -245,7 +245,7 @@ public: return true; } - virtual bool TransferDataFromWindow() wxOVERRIDE + virtual bool TransferDataFromWindow() override { // Called on platforms with modal preferences dialog to save and apply // the changes. @@ -267,10 +267,10 @@ private: class PrefsPageTopics : public wxPreferencesPage { public: - virtual wxString GetName() const wxOVERRIDE { return "Topics"; } - virtual wxBitmapBundle GetIcon() const wxOVERRIDE + virtual wxString GetName() const override { return "Topics"; } + virtual wxBitmapBundle GetIcon() const override { return wxArtProvider::GetBitmapBundle(wxART_HELP, wxART_TOOLBAR); } - virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE + virtual wxWindow *CreateWindow(wxWindow *parent) override { return new PrefsPageTopicsPanel(parent); } }; diff --git a/samples/printing/printing.h b/samples/printing/printing.h index 46747cc2bc..fb60bca57b 100644 --- a/samples/printing/printing.h +++ b/samples/printing/printing.h @@ -14,8 +14,8 @@ class MyApp: public wxApp public: MyApp() {} - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; void Draw(wxDC& dc); @@ -76,7 +76,7 @@ public: MyCanvas(wxFrame *frame, long style); //void OnPaint(wxPaintEvent& evt); - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; private: wxDECLARE_EVENT_TABLE(); @@ -89,10 +89,10 @@ public: MyPrintout(MyFrame* frame, const wxString &title = "My printout") : wxPrintout(title) { m_frame=frame; } - 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; + virtual bool OnPrintPage(int page) override; + virtual bool HasPage(int page) override; + virtual bool OnBeginDocument(int startPage, int endPage) override; + virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override; void DrawPageOne(); void DrawPageTwo(); diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index afb9c3a72d..5793752e76 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -86,11 +86,11 @@ public: virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& sz ) const wxOVERRIDE; + const wxSize& sz ) const override; virtual bool OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property, wxWindow* ctrl, - wxEvent& event ) const wxOVERRIDE; + wxEvent& event ) const override; }; wxIMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor); @@ -170,12 +170,12 @@ public: { } - virtual wxObject* Clone() const wxOVERRIDE + virtual wxObject* Clone() const override { return new wxInvalidWordValidator(m_invalidWord); } - virtual bool Validate(wxWindow* WXUNUSED(parent)) wxOVERRIDE + virtual bool Validate(wxWindow* WXUNUSED(parent)) override { wxTextCtrl* tc = wxDynamicCast(GetWindow(), wxTextCtrl); wxCHECK_MSG(tc, true, "validator window must be wxTextCtrl"); @@ -314,7 +314,7 @@ public: } virtual bool DoShowDialog( wxPropertyGrid* WXUNUSED(propGrid), - wxPGProperty* WXUNUSED(property) ) wxOVERRIDE + wxPGProperty* WXUNUSED(property) ) override { wxString s = ::wxGetSingleChoice("Message", "Caption", @@ -350,13 +350,13 @@ public: } // Set editor to have button - virtual const wxPGEditor* DoGetEditorClass() const wxOVERRIDE + virtual const wxPGEditor* DoGetEditorClass() const override { return wxPGEditor_TextCtrlAndButton; } // Set what happens on button click - virtual wxPGEditorDialogAdapter* GetEditorDialog() const wxOVERRIDE + virtual wxPGEditorDialogAdapter* GetEditorDialog() const override { return new wxSingleChoiceDialogAdapter(m_choices); } @@ -1760,13 +1760,13 @@ public: // Return false here to indicate unhandled events should be // propagated to manager's parent, as normal. - virtual bool IsHandlingAllEvents() const wxOVERRIDE { return false; } + virtual bool IsHandlingAllEvents() const override { return false; } protected: virtual wxPGProperty* DoInsert( wxPGProperty* parent, int index, - wxPGProperty* property ) wxOVERRIDE + wxPGProperty* property ) override { return wxPropertyGridPage::DoInsert(parent,index,property); } @@ -3329,7 +3329,7 @@ struct PropertyGridPopup : wxPopupWindow Fit(); } - void Fit() wxOVERRIDE + void Fit() override { ::SetMinSize(m_grid); m_sizer->Fit(m_panel); diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h index c4ccd584dd..0af72a6d77 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() wxOVERRIDE; // Override to allow image loading. + virtual void OnSetValue() override; // Override to allow image loading. - 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 bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const override; + virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ) override; + virtual wxSize OnMeasureImage( int item ) const override; virtual void OnCustomPaint( wxDC& dc, - const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE; + const wxRect& rect, wxPGPaintData& paintdata ) override; void LoadThumbnails( size_t n ); @@ -77,8 +77,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; protected: }; @@ -110,8 +110,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; protected: }; @@ -275,7 +275,7 @@ class cxApplication : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; wxDECLARE_APP(cxApplication); diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp index b03250fb2d..fdce011c43 100644 --- a/samples/propgrid/sampleprops.cpp +++ b/samples/propgrid/sampleprops.cpp @@ -349,12 +349,12 @@ protected: int m_precision; // Mandatory overridden methods - 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; + virtual wxString ArrayGet( size_t index ) override; + virtual size_t ArrayGetCount() override; + virtual bool ArrayInsert( const wxString& str, int index ) override; + virtual bool ArraySet( size_t index, const wxString& str ) override; + virtual void ArrayRemoveAt( int index ) override; + virtual void ArraySwap( size_t first, size_t second ) override; private: wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog); diff --git a/samples/propgrid/sampleprops.h b/samples/propgrid/sampleprops.h index c73e4ccf04..f72c88e9ee 100644 --- a/samples/propgrid/sampleprops.h +++ b/samples/propgrid/sampleprops.h @@ -26,21 +26,21 @@ public: const wxFontData& value = wxFontData() ); virtual ~wxFontDataProperty (); - void OnSetValue() wxOVERRIDE; + void OnSetValue() override; // 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 wxOVERRIDE; + virtual wxVariant DoGetValue() const override; virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; // Value must be stored as variant - otherwise it will be // decreffed to oblivion on GetValue(). @@ -60,8 +60,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; protected: @@ -85,8 +85,8 @@ public: virtual wxVariant ChildChanged( wxVariant& thisValue, int childIndex, - wxVariant& childValue ) const wxOVERRIDE; - virtual void RefreshChildren() wxOVERRIDE; + wxVariant& childValue ) const override; + virtual void RefreshChildren() override; protected: @@ -116,22 +116,22 @@ public: virtual ~wxArrayDoubleProperty (); - virtual void OnSetValue() wxOVERRIDE; - virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const wxOVERRIDE; + virtual void OnSetValue() override; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override; virtual bool StringToValue( wxVariant& variant, const wxString& text, - int argFlags = 0 ) const wxOVERRIDE; - virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE; + int argFlags = 0 ) const override; + virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) override; // Generates cache for displayed text virtual void GenerateValueAsString ( wxString& target, int prec, bool removeZeroes ) const; - wxValidator* DoGetValidator() const wxOVERRIDE; + wxValidator* DoGetValidator() const override; bool ValidateValue(wxVariant& value, - wxPGValidationInfo& validationInfo) const wxOVERRIDE; + wxPGValidationInfo& validationInfo) const override; protected: - virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) wxOVERRIDE; + virtual bool DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value) override; wxString m_display; // Stores cache for displayed text int m_precision; // Used when formatting displayed string. diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index da9995e8f6..21231c4d41 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -60,7 +60,7 @@ public: { } - virtual wxColour GetColour( int index ) const wxOVERRIDE + virtual wxColour GetColour( int index ) const override { switch (index) { @@ -86,7 +86,7 @@ public: virtual wxString ColourToString( const wxColour& col, int index, - int argFlags = 0 ) const wxOVERRIDE + int argFlags = 0 ) const override { if ( index == (int)(m_choices.GetCount()-1) ) return wxEmptyString; @@ -94,7 +94,7 @@ public: return wxColourProperty::ColourToString(col, index, argFlags); } - virtual int GetCustomColourIndex() const wxOVERRIDE + virtual int GetCustomColourIndex() const override { return m_choices.GetCount()-2; } diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp index 2beb3dab5c..4ecc8104c4 100644 --- a/samples/regtest/regtest.cpp +++ b/samples/regtest/regtest.cpp @@ -38,7 +38,7 @@ class RegApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // ---------------------------------------------------------------------------- diff --git a/samples/render/renddll.cpp b/samples/render/renddll.cpp index 8cb24a1c46..1449315d9c 100644 --- a/samples/render/renddll.cpp +++ b/samples/render/renddll.cpp @@ -28,7 +28,7 @@ public: const wxRect& rect, int WXUNUSED(flags) = 0, wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* WXUNUSED(params) = NULL) wxOVERRIDE + wxHeaderButtonParams* WXUNUSED(params) = NULL) override { dc.SetBrush(*wxCYAN_BRUSH); dc.SetTextForeground(*wxRED); @@ -38,7 +38,7 @@ public: return dc.GetTextExtent("MyDllRenderer").x; } - virtual wxRendererVersion GetVersion() const wxOVERRIDE + virtual wxRendererVersion GetVersion() const override { return wxRendererVersion(wxRendererVersion::Current_Version, wxRendererVersion::Current_Age); diff --git a/samples/render/render.cpp b/samples/render/render.cpp index 0e62d7244f..3fc111ff6d 100644 --- a/samples/render/render.cpp +++ b/samples/render/render.cpp @@ -64,7 +64,7 @@ public: int WXUNUSED(flags) = 0, wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE + wxHeaderButtonParams* params = NULL) override { wxDCBrushChanger setBrush(dc, *wxBLUE_BRUSH); wxDCTextColourChanger setFgCol(dc, *wxWHITE); @@ -85,7 +85,7 @@ public: // cases, but we show this here just for completeness) class MyTraits : public wxGUIAppTraits { - virtual wxRendererNative *CreateRenderer() wxOVERRIDE + virtual wxRendererNative *CreateRenderer() override { // it will be deleted on program shutdown by wxWidgets itself return new MyRenderer; @@ -96,10 +96,10 @@ class MyTraits : public wxGUIAppTraits class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; // if we want MyTraits to be used we must override CreateTraits() - virtual wxAppTraits *CreateTraits() wxOVERRIDE { return new MyTraits; } + virtual wxAppTraits *CreateTraits() override { 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 d422cdae9f..c0a5fc1833 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -33,7 +33,7 @@ class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; wxDECLARE_APP(MyApp); diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp index b3649d9bfa..30fcfdf1e8 100644 --- a/samples/richtext/richtext.cpp +++ b/samples/richtext/richtext.cpp @@ -91,15 +91,15 @@ public: { } - virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE { return true; } - virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) wxOVERRIDE + virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const override { return true; } + virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) override { wxString label = GetLabel(); wxMessageBox(wxString::Format("Editing %s", label)); return true; } - virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const wxOVERRIDE + virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const override { return GetLabel(); } @@ -114,7 +114,7 @@ public: { } - virtual bool UpdateField(wxRichTextBuffer* buffer, wxRichTextField* obj) wxOVERRIDE + virtual bool UpdateField(wxRichTextBuffer* buffer, wxRichTextField* obj) override { if (buffer) { @@ -166,19 +166,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) wxOVERRIDE; + virtual void PrepareContent(wxRichTextParagraphLayoutBox& container) override; /** Can we delete this range? Sends an event to the control. */ - virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const wxOVERRIDE; + virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const override; /** Can we insert content at this position? Sends an event to the control. */ - virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const wxOVERRIDE; + virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const override; /** Finds a table, either selected or near the cursor @@ -204,8 +204,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() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; void CreateStyles(); @@ -315,7 +315,7 @@ public: protected: // Forward command events to the current rich text control, if any - bool ProcessEvent(wxEvent& event) wxOVERRIDE; + bool ProcessEvent(wxEvent& event) override; // Write text void WriteInitialText(); @@ -2224,37 +2224,37 @@ public: /** Returns @true if this object has virtual attributes that we can provide. */ - virtual bool HasVirtualAttributes(wxRichTextObject* obj) const wxOVERRIDE; + virtual bool HasVirtualAttributes(wxRichTextObject* obj) const override; /** Provides virtual attributes that we can provide. */ - virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const wxOVERRIDE; + virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const override; /** 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 wxOVERRIDE { return 0; } + virtual int GetVirtualSubobjectAttributesCount(wxRichTextObject* WXUNUSED(obj)) const override { 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 wxOVERRIDE { return 0; } + virtual int GetVirtualSubobjectAttributes(wxRichTextObject* WXUNUSED(obj), wxArrayInt& WXUNUSED(positions), wxRichTextAttrArray& WXUNUSED(attributes)) const override { 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 wxOVERRIDE { return false; } + virtual bool HasVirtualText(const wxRichTextPlainText* WXUNUSED(obj)) const override { return false; } /** Gets the virtual text for this object. */ - virtual bool GetVirtualText(const wxRichTextPlainText* WXUNUSED(obj), wxString& WXUNUSED(text)) const wxOVERRIDE { return false; } + virtual bool GetVirtualText(const wxRichTextPlainText* WXUNUSED(obj), wxString& WXUNUSED(text)) const override { return false; } wxColour m_lockBackgroundColour; }; diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h index af940c2a56..78a00efeb0 100644 --- a/samples/sashtest/sashtest.h +++ b/samples/sashtest/sashtest.h @@ -14,14 +14,14 @@ class MyApp: public wxApp { public: - bool OnInit(void) wxOVERRIDE; + bool OnInit(void) override; }; class MyCanvas: public wxScrolledWindow { public: MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size); - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; void OnEvent(wxMouseEvent& event); wxDECLARE_EVENT_TABLE(); diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp index 8639a920ea..64382015d3 100644 --- a/samples/scroll/scroll.cpp +++ b/samples/scroll/scroll.cpp @@ -289,7 +289,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) wxOVERRIDE + virtual void ScrollWindow(int dx, int dy, const wxRect *rect) override { wxPanel::ScrollWindow( dx, dy, rect ); m_colLabels->ScrollWindow( dx, 0, rect ); @@ -397,7 +397,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) wxOVERRIDE + virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) override { // decrease the total size by the size of the non-scrollable parts // above/to the left of the canvas @@ -468,7 +468,7 @@ public: DoSyncIfNecessary(); } - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) wxOVERRIDE + virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) override { wxScrolled::ScrollWindow(dx, dy, rect); @@ -518,7 +518,7 @@ public: SetScrollbars(0, m_hLine, 0, m_nLines + 1, 0, 0, true /* no refresh */); } - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; }; // this class does "smart" redrawing - only redraws the lines which must be @@ -537,7 +537,7 @@ public: SetVirtualSize( wxDefaultCoord, ( m_nLines + 1 ) * m_hLine ); } - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; }; // ---------------------------------------------------------------------------- @@ -562,7 +562,7 @@ public: private: // event handlers - void OnDraw(wxDC& dc) wxOVERRIDE; + void OnDraw(wxDC& dc) override; void OnMouseLeftDown(wxMouseEvent& event); void OnMouseLeftUp(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); @@ -634,7 +634,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp index f5aadf1dab..f6c789b881 100644 --- a/samples/shaped/shaped.cpp +++ b/samples/shaped/shaped.cpp @@ -78,7 +78,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() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp index f1e48019da..44bdda835f 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 wxOVERRIDE + virtual wxEvent* Clone() const override { return new WorkerEvent(*this); } @@ -94,11 +94,11 @@ private: wxString m_host; long m_stressWorkers; - virtual bool OnInit() wxOVERRIDE; - virtual int OnRun() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; - void OnInitCmdLine(wxCmdLineParser& pParser) wxOVERRIDE; - bool OnCmdLineParsed(wxCmdLineParser& pParser) wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnRun() override; + virtual int OnExit() override; + void OnInitCmdLine(wxCmdLineParser& pParser) override; + bool OnCmdLineParsed(wxCmdLineParser& pParser) override; 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() wxOVERRIDE; + virtual ExitCode Entry() override; private: wxString m_host; wxSocketClient* m_clientSocket; diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp index 8b763a5b83..05d535e68a 100644 --- a/samples/sockets/baseserver.cpp +++ b/samples/sockets/baseserver.cpp @@ -78,7 +78,7 @@ public: m_workerFailed = false; } - virtual wxEvent* Clone() const wxOVERRIDE + virtual wxEvent* Clone() const override { return new WorkerEvent(*this); } @@ -112,11 +112,11 @@ private: EVENTS }; - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; - void OnInitCmdLine(wxCmdLineParser& pParser) wxOVERRIDE; - bool OnCmdLineParsed(wxCmdLineParser& pParser) wxOVERRIDE; + void OnInitCmdLine(wxCmdLineParser& pParser) override; + bool OnCmdLineParsed(wxCmdLineParser& pParser) override; 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() wxOVERRIDE; + virtual ExitCode Entry() override; private: wxSocketBase* m_socket; diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index 21eaefaf0b..30bbcbf5d5 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -47,7 +47,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new frame type: this is going to be our main frame @@ -641,7 +641,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) Run(); } - virtual void* Entry() wxOVERRIDE + virtual void* Entry() override { DoDownload(m_url); diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp index f86dde6d2d..90f060e2fc 100644 --- a/samples/sockets/server.cpp +++ b/samples/sockets/server.cpp @@ -52,7 +52,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // 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 836f9fb6e7..12040cbdf4 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -45,7 +45,7 @@ class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp index b3e9ae6fa9..8625b5bce1 100644 --- a/samples/splash/splash.cpp +++ b/samples/splash/splash.cpp @@ -58,7 +58,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() wxOVERRIDE; + virtual bool OnInit() override; void DecorateSplashScreen(wxBitmap& bmp); }; diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp index 0a48610d52..d97c211b74 100644 --- a/samples/splitter/splitter.cpp +++ b/samples/splitter/splitter.cpp @@ -73,7 +73,7 @@ class MyApp: public wxApp public: MyApp() { } - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; wxDECLARE_NO_COPY_CLASS(MyApp); }; @@ -164,7 +164,7 @@ public: MyCanvas(wxWindow* parent, bool mirror); virtual ~MyCanvas(){} - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; private: bool m_mirror; diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index b75966d739..01dcbb50cb 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -78,7 +78,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() wxOVERRIDE; + virtual bool OnInit() override; }; // A custom status bar which contains controls, icons &c diff --git a/samples/stc/edit.h b/samples/stc/edit.h index 4b3adc90b3..c02d8e489e 100644 --- a/samples/stc/edit.h +++ b/samples/stc/edit.h @@ -176,12 +176,12 @@ public: EditPrint (Edit *edit, const wxString& title = ""); //! event handlers - bool OnPrintPage (int page) wxOVERRIDE; - bool OnBeginDocument (int startPage, int endPage) wxOVERRIDE; + bool OnPrintPage (int page) override; + bool OnBeginDocument (int startPage, int endPage) override; //! print functions - bool HasPage (int page) wxOVERRIDE; - void GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE; + bool HasPage (int page) override; + void GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override; private: Edit *m_edit; diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index f9547dd412..bd8a273474 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -86,10 +86,10 @@ class App: public wxApp { public: //! the main function called during application start - virtual bool OnInit () wxOVERRIDE; + virtual bool OnInit () override; //! application exit function - virtual int OnExit () wxOVERRIDE; + virtual int OnExit () override; private: //! frame window @@ -781,7 +781,7 @@ public: SetWrapMode(wxSTC_WRAP_WORD); SetWrapVisualFlags(wxSTC_WRAPVISUALFLAG_END); } - virtual bool SetFont(const wxFont& font) wxOVERRIDE + virtual bool SetFont(const wxFont& font) override { StyleSetFont(wxSTC_STYLE_DEFAULT, font); return wxStyledTextCtrl::SetFont(font); diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp index 7d11ad661c..35048413c4 100644 --- a/samples/svg/svgtest.cpp +++ b/samples/svg/svgtest.cpp @@ -39,7 +39,7 @@ class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // Existing pages: @@ -91,7 +91,7 @@ class MyPage : public wxScrolledWindow { public: MyPage(wxNotebook *parent, int index); - virtual void OnDraw(wxDC& dc) wxOVERRIDE; + virtual void OnDraw(wxDC& dc) override; bool OnSave(wxString); private: int m_index; diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp index ee1d7479ea..ad8cecb4c0 100644 --- a/samples/taborder/taborder.cpp +++ b/samples/taborder/taborder.cpp @@ -75,7 +75,7 @@ enum class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // and the main sample window diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index f908e4b702..3756f50361 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() wxOVERRIDE; + virtual wxMenu *CreatePopupMenu() override; wxDECLARE_EVENT_TABLE(); }; @@ -36,7 +36,7 @@ public: class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; class MyDialog: public wxDialog diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp index 9ab28ef831..2bd58186ae 100644 --- a/samples/taskbarbutton/taskbarbutton.cpp +++ b/samples/taskbarbutton/taskbarbutton.cpp @@ -95,7 +95,7 @@ wxIcon CreateRandomIcon() class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; class MyFrame : public wxFrame diff --git a/samples/text/text.cpp b/samples/text/text.cpp index 754128d865..3a319c86cc 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -52,7 +52,7 @@ class MyApp: public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // a text ctrl which allows to call different wxTextCtrl functions diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp index 6484097b95..2988c6ace9 100644 --- a/samples/thread/thread.cpp +++ b/samples/thread/thread.cpp @@ -65,7 +65,7 @@ public: MyApp(); virtual ~MyApp(){} - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; // critical section protects access to all of the fields below wxCriticalSection m_critsect; @@ -99,7 +99,7 @@ public: protected: virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE; + const wxLogRecordInfo& info) override; private: // event handlers @@ -210,7 +210,7 @@ public: virtual ~MyThread(); // thread execution starts here - virtual void *Entry() wxOVERRIDE; + virtual void *Entry() override; public: unsigned m_count; @@ -226,11 +226,11 @@ public: MyWorkerThread(MyFrame *frame); // thread execution starts here - virtual void *Entry() wxOVERRIDE; + virtual void *Entry() override; // called when the thread exits - whether it terminates normally or is // stopped with Delete() (but not when it is Kill()ed!) - virtual void OnExit() wxOVERRIDE; + virtual void OnExit() override; public: MyFrame *m_frame; @@ -253,7 +253,7 @@ public: m_dlg = dlg; } - virtual ExitCode Entry() wxOVERRIDE; + virtual ExitCode Entry() override; private: MyImageDialog *m_dlg; diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index bcccae2a30..c1df35ff22 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -101,7 +101,7 @@ enum Positions class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // Define a new frame @@ -529,19 +529,19 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar) { } - wxSize GetDefaultSize() const wxOVERRIDE + wxSize GetDefaultSize() const override { return m_sizeDef; } - wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE + wxSize GetPreferredBitmapSizeAtScale(double scale) const override { // We just scale the bitmap to fit the requested size, so // we don't really have any preferences. return m_sizeDef*scale; } - wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE + wxBitmap GetBitmap(const wxSize& size) override { // In this simple implementation we don't bother caching // anything. diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 283909a898..363c890c8b 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -1010,17 +1010,17 @@ void MyTreeCtrl::CreateImages(int size) { } - wxSize GetDefaultSize() const wxOVERRIDE + wxSize GetDefaultSize() const override { return m_sizeDef; } - wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE + wxSize GetPreferredBitmapSizeAtScale(double scale) const override { return m_sizeDef*scale; } - wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE + wxBitmap GetBitmap(const wxSize& size) override { wxBitmap bmp(m_icon); if ( size != bmp.GetSize() ) diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h index 68ae3d4d54..8989c808fa 100644 --- a/samples/treectrl/treetest.h +++ b/samples/treectrl/treetest.h @@ -33,7 +33,7 @@ class MyApp : public wxApp public: MyApp() { m_showImages = true; m_showStates = true; m_showButtons = false; } - bool OnInit() wxOVERRIDE; + bool OnInit() override; void SetShowImages(bool show) { m_showImages = show; } bool ShowImages() const { return m_showImages; } @@ -142,7 +142,7 @@ public: } protected: - virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2) wxOVERRIDE; + virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2) override; // 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 b7e1a03e04..0c488c1775 100644 --- a/samples/treelist/treelist.cpp +++ b/samples/treelist/treelist.cpp @@ -94,7 +94,7 @@ public: Compare(wxTreeListCtrl* treelist, unsigned column, wxTreeListItem item1, - wxTreeListItem item2) wxOVERRIDE + wxTreeListItem item2) override { wxString text1 = treelist->GetItemText(item1, column), text2 = treelist->GetItemText(item2, column); @@ -161,7 +161,7 @@ private: class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // ---------------------------------------------------------------------------- diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h index ac6827d975..005ffeaadd 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() wxOVERRIDE; - int OnExit() wxOVERRIDE { delete m_mimeDatabase; return wxApp::OnExit(); } + bool OnInit() override; + int OnExit() override { 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 7fd01cf468..bd525cc365 100644 --- a/samples/uiaction/uiaction.cpp +++ b/samples/uiaction/uiaction.cpp @@ -62,7 +62,7 @@ enum class MyApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; #if wxUSE_UIACTIONSIMULATOR diff --git a/samples/validate/validate.h b/samples/validate/validate.h index b482568b63..ac17bfde54 100644 --- a/samples/validate/validate.h +++ b/samples/validate/validate.h @@ -20,7 +20,7 @@ class MyApp : public wxApp { public: - bool OnInit() wxOVERRIDE; + bool OnInit() override; }; // Define a new frame type @@ -78,14 +78,14 @@ private: public: StyleValidator(long* style) { m_style = style; } - virtual bool Validate(wxWindow *WXUNUSED(parent)) wxOVERRIDE { return true; } - virtual wxObject* Clone() const wxOVERRIDE { return new StyleValidator(*this); } + virtual bool Validate(wxWindow *WXUNUSED(parent)) override { return true; } + virtual wxObject* Clone() const override { return new StyleValidator(*this); } // Called to transfer data to the window - virtual bool TransferToWindow() wxOVERRIDE; + virtual bool TransferToWindow() override; // Called to transfer data from the window - virtual bool TransferFromWindow() wxOVERRIDE; + virtual bool TransferFromWindow() override; private: long* m_style; @@ -165,14 +165,14 @@ class MyComboBoxValidator : public wxValidator public: MyComboBoxValidator(wxString* var) { m_var=var; } - virtual bool Validate(wxWindow* parent) wxOVERRIDE; - virtual wxObject* Clone() const wxOVERRIDE { return new MyComboBoxValidator(*this); } + virtual bool Validate(wxWindow* parent) override; + virtual wxObject* Clone() const override { return new MyComboBoxValidator(*this); } // Called to transfer data to the window - virtual bool TransferToWindow() wxOVERRIDE; + virtual bool TransferToWindow() override; // Called to transfer data from the window - virtual bool TransferFromWindow() wxOVERRIDE; + virtual bool TransferFromWindow() override; protected: wxString* m_var; diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp index 21179af82d..72f4e1bfd7 100644 --- a/samples/vscroll/vstest.cpp +++ b/samples/vscroll/vstest.cpp @@ -55,7 +55,7 @@ class VarScrollApp : public wxApp { public: // create our main window - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; // Define a new frame type: this is going to be our main frame @@ -167,7 +167,7 @@ public: event.Skip(); } - virtual wxCoord OnGetRowHeight(size_t n) const wxOVERRIDE + virtual wxCoord OnGetRowHeight(size_t n) const override { wxASSERT( n < GetRowCount() ); @@ -264,7 +264,7 @@ public: event.Skip(); } - virtual wxCoord OnGetColumnWidth(size_t n) const wxOVERRIDE + virtual wxCoord OnGetColumnWidth(size_t n) const override { wxASSERT( n < GetColumnCount() ); @@ -384,14 +384,14 @@ public: event.Skip(); } - virtual wxCoord OnGetRowHeight(size_t n) const wxOVERRIDE + virtual wxCoord OnGetRowHeight(size_t n) const override { wxASSERT( n < GetRowCount() ); return m_heights[n]; } - virtual wxCoord OnGetColumnWidth(size_t n) const wxOVERRIDE + virtual wxCoord OnGetColumnWidth(size_t n) const override { wxASSERT( n < GetColumnCount() ); diff --git a/samples/webrequest/webrequest.cpp b/samples/webrequest/webrequest.cpp index 95ce7a4261..31abbfe3ca 100644 --- a/samples/webrequest/webrequest.cpp +++ b/samples/webrequest/webrequest.cpp @@ -486,7 +486,7 @@ private: class WebRequestApp : public wxApp { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { if ( !wxApp::OnInit() ) return false; diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index cf424feb28..c891aadcf3 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -67,10 +67,10 @@ public: { } - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; #if wxUSE_CMDLINE_PARSER - virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE + virtual void OnInitCmdLine(wxCmdLineParser& parser) override { wxApp::OnInitCmdLine(parser); @@ -79,7 +79,7 @@ public: wxCMD_LINE_PARAM_OPTIONAL); } - virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override { if ( !wxApp::OnCmdLineParsed(parser) ) return false; @@ -269,7 +269,7 @@ public: { } virtual void StartRequest(const wxWebViewHandlerRequest& request, - wxSharedPtr response) wxOVERRIDE + wxSharedPtr response) override { response->SetHeader("Access-Control-Allow-Origin", "*"); response->SetHeader("Access-Control-Allow-Headers", "*"); diff --git a/samples/widgets/activityindicator.cpp b/samples/widgets/activityindicator.cpp index c8d17e3d77..af467ff4ea 100644 --- a/samples/widgets/activityindicator.cpp +++ b/samples/widgets/activityindicator.cpp @@ -61,11 +61,11 @@ public: m_sizerIndicator = NULL; } - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_indicator; } - virtual void RecreateWidget() wxOVERRIDE; + virtual wxWindow *GetWidget() const override { return m_indicator; } + virtual void RecreateWidget() override; // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: void OnButtonStart(wxCommandEvent&) { m_indicator->Start(); } diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index 0280d283ff..f33fb21f44 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -100,12 +100,12 @@ class BitmapComboBoxWidgetsPage : public ItemContainerWidgetsPage public: BitmapComboBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_combobox; } - virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; } - virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); } + virtual wxWindow *GetWidget() const override { return m_combobox; } + virtual wxItemContainer* GetContainer() const override { return m_combobox; } + virtual void RecreateWidget() override { CreateCombo(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index a1e6036237..8837938299 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -89,11 +89,11 @@ class ButtonWidgetsPage : public WidgetsPage public: ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_button; } - virtual void RecreateWidget() wxOVERRIDE { CreateButton(); } + virtual wxWindow *GetWidget() const override { return m_button; } + virtual void RecreateWidget() override { CreateButton(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp index 64ee65856c..38079c791b 100644 --- a/samples/widgets/checkbox.cpp +++ b/samples/widgets/checkbox.cpp @@ -71,11 +71,11 @@ class CheckBoxWidgetsPage : public WidgetsPage public: CheckBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_checkbox; } - virtual void RecreateWidget() wxOVERRIDE { CreateCheckbox(); } + virtual wxWindow *GetWidget() const override { return m_checkbox; } + virtual void RecreateWidget() override { CreateCheckbox(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/choice.cpp b/samples/widgets/choice.cpp index f14e0ffe13..305aedbc17 100644 --- a/samples/widgets/choice.cpp +++ b/samples/widgets/choice.cpp @@ -74,12 +74,12 @@ class ChoiceWidgetsPage : public ItemContainerWidgetsPage public: ChoiceWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_choice; } - virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_choice; } - virtual void RecreateWidget() wxOVERRIDE { CreateChoice(); } + virtual wxWindow *GetWidget() const override { return m_choice; } + virtual wxItemContainer* GetContainer() const override { return m_choice; } + virtual void RecreateWidget() override { CreateChoice(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp index cd61055209..ef13ae0926 100644 --- a/samples/widgets/clrpicker.cpp +++ b/samples/widgets/clrpicker.cpp @@ -61,11 +61,11 @@ class ColourPickerWidgetsPage : public WidgetsPage public: ColourPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_clrPicker; } - virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } + virtual wxWindow *GetWidget() const override { return m_clrPicker; } + virtual void RecreateWidget() override { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp index c9a57cd5ca..29515c5f7d 100644 --- a/samples/widgets/combobox.cpp +++ b/samples/widgets/combobox.cpp @@ -92,13 +92,13 @@ class ComboboxWidgetsPage : public ItemContainerWidgetsPage public: ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *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(); } + virtual wxWindow *GetWidget() const override { return m_combobox; } + virtual wxTextEntryBase *GetTextEntry() const override { return m_combobox; } + virtual wxItemContainer* GetContainer() const override { return m_combobox; } + virtual void RecreateWidget() override { CreateCombo(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp index f0374900da..ca14890578 100644 --- a/samples/widgets/datepick.cpp +++ b/samples/widgets/datepick.cpp @@ -67,11 +67,11 @@ class DatePickerWidgetsPage : public WidgetsPage public: DatePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_datePicker; } - virtual void RecreateWidget() wxOVERRIDE { CreateDatePicker(); } + virtual wxWindow *GetWidget() const override { return m_datePicker; } + virtual void RecreateWidget() override { CreateDatePicker(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/dirctrl.cpp b/samples/widgets/dirctrl.cpp index 6cd3a3649c..7ea3c0cee9 100644 --- a/samples/widgets/dirctrl.cpp +++ b/samples/widgets/dirctrl.cpp @@ -95,11 +95,11 @@ public: DirCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~DirCtrlWidgetsPage() {} - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_dirCtrl; } - virtual void RecreateWidget() wxOVERRIDE { CreateDirCtrl(); } + virtual wxWindow *GetWidget() const override { return m_dirCtrl; } + virtual void RecreateWidget() override { CreateDirCtrl(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp index 3e74ce3339..1f405e7589 100644 --- a/samples/widgets/dirpicker.cpp +++ b/samples/widgets/dirpicker.cpp @@ -63,11 +63,11 @@ class DirPickerWidgetsPage : public WidgetsPage public: DirPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_dirPicker; } - virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } + virtual wxWindow *GetWidget() const override { return m_dirPicker; } + virtual void RecreateWidget() override { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: diff --git a/samples/widgets/editlbox.cpp b/samples/widgets/editlbox.cpp index 9229fa042a..763b1bb1aa 100644 --- a/samples/widgets/editlbox.cpp +++ b/samples/widgets/editlbox.cpp @@ -66,11 +66,11 @@ class EditableListboxWidgetsPage : public WidgetsPage public: EditableListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_lbox->GetListCtrl(); } - virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); } + virtual wxWindow *GetWidget() const override { return m_lbox->GetListCtrl(); } + virtual void RecreateWidget() override { CreateLbox(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/filectrl.cpp b/samples/widgets/filectrl.cpp index 58589ce051..93ea693e94 100644 --- a/samples/widgets/filectrl.cpp +++ b/samples/widgets/filectrl.cpp @@ -67,11 +67,11 @@ public: FileCtrlWidgetsPage( WidgetsBookCtrl *book, wxImageList *imaglist ); virtual ~FileCtrlWidgetsPage() {} - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_fileCtrl; } - virtual void RecreateWidget() wxOVERRIDE { CreateFileCtrl(); } + virtual wxWindow *GetWidget() const override { return m_fileCtrl; } + virtual void RecreateWidget() override { CreateFileCtrl(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp index 8706743858..e4fc034d76 100644 --- a/samples/widgets/filepicker.cpp +++ b/samples/widgets/filepicker.cpp @@ -70,11 +70,11 @@ class FilePickerWidgetsPage : public WidgetsPage public: FilePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_filePicker; } - virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } + virtual wxWindow *GetWidget() const override { return m_filePicker; } + virtual void RecreateWidget() override { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp index 59e9bd89eb..c6cd829c48 100644 --- a/samples/widgets/fontpicker.cpp +++ b/samples/widgets/fontpicker.cpp @@ -61,11 +61,11 @@ class FontPickerWidgetsPage : public WidgetsPage public: FontPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_fontPicker; } - virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); } + virtual wxWindow *GetWidget() const override { return m_fontPicker; } + virtual void RecreateWidget() override { RecreatePicker(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp index ae7ad77f8d..5812d538cc 100644 --- a/samples/widgets/gauge.cpp +++ b/samples/widgets/gauge.cpp @@ -72,11 +72,11 @@ public: GaugeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~GaugeWidgetsPage(); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_gauge; } - virtual void RecreateWidget() wxOVERRIDE { CreateGauge(); } + virtual wxWindow *GetWidget() const override { return m_gauge; } + virtual void RecreateWidget() override { CreateGauge(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/headerctrl.cpp b/samples/widgets/headerctrl.cpp index dee66b16c9..e0146a546e 100644 --- a/samples/widgets/headerctrl.cpp +++ b/samples/widgets/headerctrl.cpp @@ -57,11 +57,11 @@ public: m_sizerHeader = NULL; } - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_header; } - virtual void RecreateWidget() wxOVERRIDE; + virtual wxWindow *GetWidget() const override { return m_header; } + virtual void RecreateWidget() override; // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/hyperlnk.cpp b/samples/widgets/hyperlnk.cpp index bd20c93ae5..889dda57a2 100644 --- a/samples/widgets/hyperlnk.cpp +++ b/samples/widgets/hyperlnk.cpp @@ -76,11 +76,11 @@ public: HyperlinkWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual ~HyperlinkWidgetsPage() {} - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_hyperlink; } - virtual void RecreateWidget() wxOVERRIDE { CreateHyperlink(); } + virtual wxWindow *GetWidget() const override { return m_hyperlink; } + virtual void RecreateWidget() override { CreateHyperlink(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp index c8865b22a2..5beebd72e2 100644 --- a/samples/widgets/listbox.cpp +++ b/samples/widgets/listbox.cpp @@ -83,12 +83,12 @@ class ListboxWidgetsPage : public ItemContainerWidgetsPage public: ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_lbox; } - virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_lbox; } - virtual void RecreateWidget() wxOVERRIDE { CreateLbox(); } + virtual wxWindow *GetWidget() const override { return m_lbox; } + virtual wxItemContainer* GetContainer() const override { return m_lbox; } + virtual void RecreateWidget() override { CreateLbox(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/native.cpp b/samples/widgets/native.cpp index 9702922fa5..37b54c908d 100644 --- a/samples/widgets/native.cpp +++ b/samples/widgets/native.cpp @@ -122,7 +122,7 @@ protected: // shows how to handle a native event in MSW (for the specific case of // WM_NOTIFY, more generally MSWHandleMessage() could be overridden). virtual bool - MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE + MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override { const NMHDR* hdr = reinterpret_cast(lParam); if ( hdr->code != BCN_DROPDOWN ) @@ -250,11 +250,11 @@ class NativeWidgetsPage : public WidgetsPage public: NativeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_nativeWindow; } - virtual void RecreateWidget() wxOVERRIDE; + virtual wxWindow *GetWidget() const override { return m_nativeWindow; } + virtual void RecreateWidget() override; // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; private: void OnCheckExpand(wxCommandEvent& event); diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index bafbb3251a..d99cc70195 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -85,11 +85,11 @@ public: BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]); virtual ~BookWidgetsPage(); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_book; } - virtual void RecreateWidget() wxOVERRIDE { RecreateBook(); } + virtual wxWindow *GetWidget() const override { return m_book; } + virtual void RecreateWidget() override { RecreateBook(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers @@ -541,7 +541,7 @@ protected: void OnPageChanged(wxNotebookEvent& event); // (re)create book - virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE + virtual wxBookCtrlBase *CreateBook(long flags) override { return new wxNotebook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, @@ -622,7 +622,7 @@ protected: void OnPageChanged(wxListbookEvent& event); // (re)create book - virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE + virtual wxBookCtrlBase *CreateBook(long flags) override { return new wxListbook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, @@ -695,7 +695,7 @@ protected: void OnPageChanged(wxChoicebookEvent& event); // (re)create book - virtual wxBookCtrlBase *CreateBook(long flags) wxOVERRIDE + virtual wxBookCtrlBase *CreateBook(long flags) override { return new wxChoicebook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp index 691ce1d07b..3acaed1295 100644 --- a/samples/widgets/odcombobox.cpp +++ b/samples/widgets/odcombobox.cpp @@ -87,14 +87,14 @@ class ODComboboxWidgetsPage : public ItemContainerWidgetsPage public: ODComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_combobox; } - virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE + virtual wxWindow *GetWidget() const override { return m_combobox; } + virtual wxTextEntryBase *GetTextEntry() const override { return m_combobox ? m_combobox->GetTextCtrl() : NULL; } - virtual wxItemContainer* GetContainer() const wxOVERRIDE { return m_combobox; } - virtual void RecreateWidget() wxOVERRIDE { CreateCombo(); } + virtual wxItemContainer* GetContainer() const override { return m_combobox; } + virtual void RecreateWidget() override { CreateCombo(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers @@ -239,7 +239,7 @@ public: virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, - int WXUNUSED(flags)) const wxOVERRIDE + int WXUNUSED(flags)) const override { if ( item == wxNOT_FOUND ) return; @@ -265,7 +265,7 @@ public: } virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, - int item, int flags ) const wxOVERRIDE + int item, int flags ) const override { // If item is selected or even, or we are painting the @@ -284,12 +284,12 @@ public: dc.DrawRectangle(rect); } - virtual wxCoord OnMeasureItem(size_t WXUNUSED(item)) const wxOVERRIDE + virtual wxCoord OnMeasureItem(size_t WXUNUSED(item)) const override { return 48; } - virtual wxCoord OnMeasureItemWidth(size_t WXUNUSED(item)) const wxOVERRIDE + virtual wxCoord OnMeasureItemWidth(size_t WXUNUSED(item)) const override { return -1; // default - will be measured from text width } diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp index 5b769222af..42e3d88d10 100644 --- a/samples/widgets/radiobox.cpp +++ b/samples/widgets/radiobox.cpp @@ -73,11 +73,11 @@ class RadioWidgetsPage : public WidgetsPage public: RadioWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_radio; } - virtual void RecreateWidget() wxOVERRIDE { CreateRadio(); } + virtual wxWindow *GetWidget() const override { return m_radio; } + virtual void RecreateWidget() override { CreateRadio(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp index 1e8d3683d3..24cb75644b 100644 --- a/samples/widgets/searchctrl.cpp +++ b/samples/widgets/searchctrl.cpp @@ -67,12 +67,12 @@ class SearchCtrlWidgetsPage : public WidgetsPage public: SearchCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_srchCtrl; } - virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_srchCtrl; } - virtual void RecreateWidget() wxOVERRIDE; + virtual wxWindow *GetWidget() const override { return m_srchCtrl; } + virtual wxTextEntryBase *GetTextEntry() const override { return m_srchCtrl; } + virtual void RecreateWidget() override; // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index bd30df106a..bd8572c45e 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -96,11 +96,11 @@ class SliderWidgetsPage : public WidgetsPage public: SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_slider; } - virtual void RecreateWidget() wxOVERRIDE { CreateSlider(); } + virtual wxWindow *GetWidget() const override { return m_slider; } + virtual void RecreateWidget() override { CreateSlider(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp index 65780f4b73..e75415fa26 100644 --- a/samples/widgets/spinbtn.cpp +++ b/samples/widgets/spinbtn.cpp @@ -84,8 +84,8 @@ class SpinBtnWidgetsPage : public WidgetsPage public: SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_spinbtn; } - virtual Widgets GetWidgets() const wxOVERRIDE + virtual wxWindow *GetWidget() const override { return m_spinbtn; } + virtual Widgets GetWidgets() const override { Widgets widgets(WidgetsPage::GetWidgets()); widgets.push_back(m_spinctrl); @@ -93,10 +93,10 @@ public: return widgets; } - virtual void RecreateWidget() wxOVERRIDE { CreateSpin(); } + virtual void RecreateWidget() override { CreateSpin(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp index 10c5b85b47..efd6802435 100644 --- a/samples/widgets/statbmp.cpp +++ b/samples/widgets/statbmp.cpp @@ -49,9 +49,9 @@ public: StatBmpWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) : WidgetsPage(book, imaglist, statbmp_xpm) {} - virtual void CreateContent() wxOVERRIDE; - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_statbmp; } - virtual void RecreateWidget() wxOVERRIDE; + virtual void CreateContent() override; + virtual wxWindow *GetWidget() const override { return m_statbmp; } + virtual void RecreateWidget() override; private: void OnFileChange(wxFileDirPickerEvent &WXUNUSED(ev)) { RecreateWidget(); } diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp index 9f491a1f03..34d7d0d978 100644 --- a/samples/widgets/static.cpp +++ b/samples/widgets/static.cpp @@ -80,8 +80,8 @@ class StaticWidgetsPage : public WidgetsPage public: StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_statText; } - virtual Widgets GetWidgets() const wxOVERRIDE + virtual wxWindow *GetWidget() const override { return m_statText; } + virtual Widgets GetWidgets() const override { Widgets widgets; widgets.push_back(m_sizerStatBox->GetStaticBox()); @@ -95,10 +95,10 @@ public: return widgets; } - virtual void RecreateWidget() wxOVERRIDE { CreateStatic(); } + virtual void RecreateWidget() override { CreateStatic(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp index 20049fae30..a660a10e77 100644 --- a/samples/widgets/textctrl.cpp +++ b/samples/widgets/textctrl.cpp @@ -149,12 +149,12 @@ public: // ctor(s) and dtor TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_text; } - virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_text; } - virtual void RecreateWidget() wxOVERRIDE { CreateText(); } + virtual wxWindow *GetWidget() const override { return m_text; } + virtual wxTextEntryBase *GetTextEntry() const override { return m_text; } + virtual void RecreateWidget() override { CreateText(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // create an info text contorl diff --git a/samples/widgets/timepick.cpp b/samples/widgets/timepick.cpp index 2f1cd469d8..4cd937f704 100644 --- a/samples/widgets/timepick.cpp +++ b/samples/widgets/timepick.cpp @@ -62,11 +62,11 @@ class TimePickerWidgetsPage : public WidgetsPage public: TimePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_timePicker; } - virtual void RecreateWidget() wxOVERRIDE { CreateTimePicker(); } + virtual wxWindow *GetWidget() const override { return m_timePicker; } + virtual void RecreateWidget() override { CreateTimePicker(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp index bc3726bea8..b2a7816ed4 100644 --- a/samples/widgets/toggle.cpp +++ b/samples/widgets/toggle.cpp @@ -86,11 +86,11 @@ class ToggleWidgetsPage : public WidgetsPage public: ToggleWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); - virtual wxWindow *GetWidget() const wxOVERRIDE { return m_toggle; } - virtual void RecreateWidget() wxOVERRIDE { CreateToggle(); } + virtual wxWindow *GetWidget() const override { return m_toggle; } + virtual void RecreateWidget() override { CreateToggle(); } // lazy creation of the content - virtual void CreateContent() wxOVERRIDE; + virtual void CreateContent() override; protected: // event handlers diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 88b5a4f109..8adeddb673 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -149,7 +149,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() wxOVERRIDE; + virtual bool OnInit() override; // real implementation of WidgetsPage method with the same name bool IsUsingLogWindow() const; @@ -268,7 +268,7 @@ public: private: // implement sink functions - virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE + virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) override { if ( level == wxLOG_Trace ) { @@ -1098,7 +1098,7 @@ void WidgetsFrame::DoUseCustomAutoComplete(size_t minLength) { } - virtual void GetCompletions(const wxString& prefix, wxArrayString& res) wxOVERRIDE + virtual void GetCompletions(const wxString& prefix, wxArrayString& res) override { // 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 9541094a35..8cb6174405 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -66,7 +66,7 @@ class MyApp : public wxApp { public: // override base class virtuals - virtual bool OnInit() wxOVERRIDE; + virtual bool OnInit() override; }; class MyFrame : public wxFrame @@ -142,7 +142,7 @@ public: SetSizerAndFit(mainSizer); } - virtual bool TransferDataFromWindow() wxOVERRIDE + virtual bool TransferDataFromWindow() override { if ( !m_checkbox->GetValue() ) { @@ -309,8 +309,8 @@ public: } // implement wxWizardPage functions - virtual wxWizardPage *GetPrev() const wxOVERRIDE { return m_prev; } - virtual wxWizardPage *GetNext() const wxOVERRIDE + virtual wxWizardPage *GetPrev() const override { return m_prev; } + virtual wxWizardPage *GetNext() const override { return m_checkbox->GetValue() ? m_next->GetNext() : m_next; } diff --git a/samples/wrapsizer/wrapsizer.cpp b/samples/wrapsizer/wrapsizer.cpp index df172e3c90..c2b483472b 100644 --- a/samples/wrapsizer/wrapsizer.cpp +++ b/samples/wrapsizer/wrapsizer.cpp @@ -70,7 +70,7 @@ class WrapSizerApp : public wxApp public: WrapSizerApp() {} - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { new WrapSizerFrame; return true; diff --git a/samples/xrc/xrcdemo.h b/samples/xrc/xrcdemo.h index 5b6ce2f808..30ccf45383 100644 --- a/samples/xrc/xrcdemo.h +++ b/samples/xrc/xrcdemo.h @@ -34,7 +34,7 @@ public: // 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() wxOVERRIDE; + virtual bool OnInit() override; }; diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index db48eb9d92..74a297d565 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -94,7 +94,7 @@ public: ToolbarCommandCapture() { m_lastId = 0; } int GetCommandId() const { return m_lastId; } - bool ProcessEvent(wxEvent& evt) wxOVERRIDE + bool ProcessEvent(wxEvent& evt) override { if (evt.GetEventType() == wxEVT_MENU) { diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index fb39238409..e1394d73a1 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -1538,20 +1538,20 @@ public: protected: void DoSetSize(int x, int y, int width, int height, - int WXUNUSED(sizeFlags = wxSIZE_AUTO)) wxOVERRIDE + int WXUNUSED(sizeFlags = wxSIZE_AUTO)) override { m_rect = wxRect(x, y, width, height); DoSizing(); } - void DoGetClientSize(int* x, int* y) const wxOVERRIDE + void DoGetClientSize(int* x, int* y) const override { *x = m_rect.width; *y = m_rect.height; } public: - bool Show( bool WXUNUSED(show = true) ) wxOVERRIDE { return false; } + bool Show( bool WXUNUSED(show = true) ) override { return false; } void DoSizing() { @@ -1619,7 +1619,7 @@ public: } protected: - void DoGetSize(int* x, int* y) const wxOVERRIDE + void DoGetSize(int* x, int* y) const override { if (x) *x = m_rect.GetWidth(); @@ -1628,7 +1628,7 @@ protected: } public: - void Update() wxOVERRIDE + void Update() override { // does nothing } diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index d35b1e4228..bb7a45dcaf 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -109,7 +109,7 @@ public: SetTransparent(0); } - virtual bool SetTransparent(wxByte alpha) wxOVERRIDE + virtual bool SetTransparent(wxByte alpha) override { if (m_canSetShape) { @@ -264,7 +264,7 @@ public: GTKApplyWidgetStyle(); } - bool SetTransparent(wxByte WXUNUSED(alpha)) wxOVERRIDE + bool SetTransparent(wxByte WXUNUSED(alpha)) override { return true; } @@ -272,7 +272,7 @@ public: protected: virtual void DoSetSizeHints( int minW, int minH, int maxW, int maxH, - int incW, int incH) wxOVERRIDE + int incW, int incH) override { // 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/aui/tabart.cpp b/src/aui/tabart.cpp index 7a40be506a..99424d241f 100644 --- a/src/aui/tabart.cpp +++ b/src/aui/tabart.cpp @@ -45,7 +45,7 @@ public: wxAuiCommandCapture() { m_lastId = 0; } int GetCommandId() const { return m_lastId; } - bool ProcessEvent(wxEvent& evt) wxOVERRIDE + bool ProcessEvent(wxEvent& evt) override { if (evt.GetEventType() == wxEVT_MENU) { diff --git a/src/common/animatecmn.cpp b/src/common/animatecmn.cpp index 39c0fd4ae5..59885e6868 100644 --- a/src/common/animatecmn.cpp +++ b/src/common/animatecmn.cpp @@ -281,8 +281,8 @@ class wxAnimationModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxAnimationModule); public: wxAnimationModule() {} - bool OnInit() wxOVERRIDE { wxAnimation::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxAnimation::CleanUpHandlers(); } + bool OnInit() override { wxAnimation::InitStandardHandlers(); return true; } + void OnExit() override { wxAnimation::CleanUpHandlers(); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule); diff --git a/src/common/any.cpp b/src/common/any.cpp index 54640f8521..815045faa4 100644 --- a/src/common/any.cpp +++ b/src/common/any.cpp @@ -225,11 +225,11 @@ public: wxAnyValueTypeGlobalsManager() : wxModule() { } virtual ~wxAnyValueTypeGlobalsManager() { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { GetAnyValueTypeGlobals().reset(); } @@ -498,13 +498,13 @@ class wxAnyValueTypeImpl : public wxAnyValueType WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl) public: // Dummy implementations - virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE + virtual void DeleteValue(wxAnyValueBuffer& buf) const override { wxUnusedVar(buf); } virtual void CopyBuffer(const wxAnyValueBuffer& src, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { wxUnusedVar(src); wxUnusedVar(dst); @@ -512,7 +512,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { wxUnusedVar(src); wxUnusedVar(dstType); diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 34c8e6b7b3..d0f90d1374 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -987,7 +987,7 @@ wxString wxAppTraitsBase::GetAssertStackTrace() const wxString& GetStackTrace() const { return m_stackTrace; } protected: - virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE + virtual void OnStackFrame(const wxStackFrame& frame) override { // don't show more than maxLines or we could get a dialog too tall // to be shown on screen: 20 should be ok everywhere as even with diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 3e1ee5b7e7..591fb4ede9 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -165,24 +165,24 @@ public: { } - virtual wxSize GetDefaultSize() const wxOVERRIDE + virtual wxSize GetDefaultSize() const override { return m_sizeDefault; } - virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE + virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const override { // Use the standard logic for integer-factor upscaling. return DoGetPreferredSize(scale); } - virtual wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE + virtual wxBitmap GetBitmap(const wxSize& size) override { return wxArtProvider::GetBitmap(m_artId, m_artClient, size); } protected: - virtual double GetNextAvailableScale(size_t& i) const wxOVERRIDE + virtual double GetNextAvailableScale(size_t& i) const override { // Unfortunately we don't know what bitmap sizes are available here as // there is simply nothing in wxArtProvider API that returns this (and @@ -641,7 +641,7 @@ bool wxArtProvider::HasNativeProvider() class wxArtProviderModule: public wxModule { public: - bool OnInit() wxOVERRIDE + bool OnInit() override { // The order here is such that the native provider will be used first // and the standard one last as all these default providers add @@ -655,7 +655,7 @@ public: #endif // wxUSE_ARTPROVIDER_STD return true; } - void OnExit() wxOVERRIDE + void OnExit() override { wxArtProvider::CleanUpProviders(); } diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index cad8af4659..08543f1773 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -32,10 +32,10 @@ class wxDefaultArtProvider : public wxArtProvider { protected: virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; + const wxSize& size) override; virtual wxBitmapBundle CreateBitmapBundle(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; + const wxSize& size) override; }; // ---------------------------------------------------------------------------- diff --git a/src/common/arttango.cpp b/src/common/arttango.cpp index d5e4d9cfde..a1ec8f7707 100644 --- a/src/common/arttango.cpp +++ b/src/common/arttango.cpp @@ -91,7 +91,7 @@ public: protected: virtual wxBitmapBundle CreateBitmapBundle(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; + const wxSize& size) override; private: diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index 558417c5aa..41356e227e 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -193,8 +193,8 @@ class wxBitmapBaseModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxBitmapBaseModule); public: wxBitmapBaseModule() {} - bool OnInit() wxOVERRIDE { wxBitmap::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxBitmap::CleanUpHandlers(); } + bool OnInit() override { wxBitmap::InitStandardHandlers(); return true; } + void OnExit() override { wxBitmap::CleanUpHandlers(); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule); diff --git a/src/common/bmpbndl.cpp b/src/common/bmpbndl.cpp index 360eac9821..244f711c9d 100644 --- a/src/common/bmpbndl.cpp +++ b/src/common/bmpbndl.cpp @@ -52,24 +52,24 @@ public: { } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE + virtual bool Eq(wxVariantData& data) const override { // We're only called with the objects of the same type, so the cast is // safe. return static_cast(data).m_value.IsSameAs(m_value); } - virtual wxString GetType() const wxOVERRIDE + virtual wxString GetType() const override { return wxASCII_STR("wxBitmapBundle"); } - virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE + virtual wxClassInfo* GetValueClassInfo() override { return NULL; } - virtual wxVariantData* Clone() const wxOVERRIDE + virtual wxVariantData* Clone() const override { return new wxBitmapBundleVariantData(m_value); } @@ -129,12 +129,12 @@ public: { } - virtual wxSize GetDefaultSize() const wxOVERRIDE; - virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE; - virtual wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE; + virtual wxSize GetDefaultSize() const override; + virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const override; + virtual wxBitmap GetBitmap(const wxSize& size) override; protected: - virtual double GetNextAvailableScale(size_t& i) const wxOVERRIDE; + virtual double GetNextAvailableScale(size_t& i) const override; private: // Struct containing bitmap itself as well as a flag indicating whether we diff --git a/src/common/bmpbtncmn.cpp b/src/common/bmpbtncmn.cpp index 039df31495..2a78adf0b2 100644 --- a/src/common/bmpbtncmn.cpp +++ b/src/common/bmpbtncmn.cpp @@ -106,18 +106,18 @@ public: { } - virtual wxSize GetDefaultSize() const wxOVERRIDE + virtual wxSize GetDefaultSize() const override { return m_sizeDef; } - virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE + virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const override { // We can render the bitmap at any scale. return m_sizeDef*scale; } - virtual wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE + virtual wxBitmap GetBitmap(const wxSize& size) override { wxBitmap bmp; bmp.Create(size.x, size.y, wxBITMAP_SCREEN_DEPTH); diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp index 8a00ebc21f..64c7e73e45 100644 --- a/src/common/cairo.cpp +++ b/src/common/cairo.cpp @@ -440,8 +440,8 @@ class wxCairoModule : public wxModule { public: wxCairoModule() { } - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxCairoModule); diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp index 6818627b93..4a89dadfc7 100644 --- a/src/common/clipcmn.cpp +++ b/src/common/clipcmn.cpp @@ -96,8 +96,8 @@ bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink ) class wxClipboardModule : public wxModule { public: - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxDELETE(gs_clipboard); } + bool OnInit() override { return true; } + void OnExit() override { wxDELETE(gs_clipboard); } private: wxDECLARE_DYNAMIC_CLASS(wxClipboardModule); diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index 7f3dc506c2..50699b97f0 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -96,29 +96,29 @@ public: wxCmdLineParamType type; // from wxCmdLineArg - virtual wxCmdLineEntryType GetKind() const wxOVERRIDE { return kind; } - virtual wxString GetShortName() const wxOVERRIDE { + virtual wxCmdLineEntryType GetKind() const override { return kind; } + virtual wxString GetShortName() const override { wxASSERT_MSG( kind == wxCMD_LINE_OPTION || kind == wxCMD_LINE_SWITCH, wxT("kind mismatch in wxCmdLineArg") ); return shortName; } - virtual wxString GetLongName() const wxOVERRIDE { + virtual wxString GetLongName() const override { wxASSERT_MSG( kind == wxCMD_LINE_OPTION || kind == wxCMD_LINE_SWITCH, wxT("kind mismatch in wxCmdLineArg") ); return longName; } - virtual wxCmdLineParamType GetType() const wxOVERRIDE { + virtual wxCmdLineParamType GetType() const override { wxASSERT_MSG( kind == wxCMD_LINE_OPTION, wxT("kind mismatch in wxCmdLineArg") ); return type; } - double GetDoubleVal() const wxOVERRIDE; - long GetLongVal() const wxOVERRIDE; - const wxString& GetStrVal() const wxOVERRIDE; + double GetDoubleVal() const override; + long GetLongVal() const override; + const wxString& GetStrVal() const override; #if wxUSE_DATETIME - const wxDateTime& GetDateVal() const wxOVERRIDE; + const wxDateTime& GetDateVal() const override; #endif // wxUSE_DATETIME - bool IsNegated() const wxOVERRIDE { + bool IsNegated() const override { wxASSERT_MSG( kind == wxCMD_LINE_SWITCH, wxT("kind mismatch in wxCmdLineArg") ); return m_isNegated; diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index f813b76abd..fd65b468c3 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -345,10 +345,10 @@ public: } #if wxUSE_POPUPWIN - virtual bool Show( bool show ) wxOVERRIDE; - virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE; + virtual bool Show( bool show ) override; + virtual bool ProcessLeftDown(wxMouseEvent& event) override; protected: - virtual void OnDismiss() wxOVERRIDE; + virtual void OnDismiss() override; #endif private: @@ -721,7 +721,7 @@ public: wxComboCtrlTextCtrl() : wxTextCtrl() { } virtual ~wxComboCtrlTextCtrl() { } - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE + virtual wxWindow *GetMainWindowOfCompositeControl() override { wxComboCtrl* combo = (wxComboCtrl*) GetParent(); diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index 62114eb3a9..6fffd99cfc 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -49,7 +49,7 @@ public: m_contextHelp = contextHelp; } - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; + virtual bool ProcessEvent(wxEvent& event) override; //// Data wxContextHelp* m_contextHelp; @@ -469,8 +469,8 @@ wxString wxContextId(int id) class wxHelpProviderModule : public wxModule { public: - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; + bool OnInit() override; + void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxHelpProviderModule); diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 64168b5db9..b0d26bd402 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -118,14 +118,14 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter , wxFromStringCon class wxDateTimeHolidaysModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays); return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxDateTimeHolidayAuthority::ClearAllAuthorities(); wxDateTimeHolidayAuthority::ms_authorities.clear(); diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 5ad9ed7615..27768e2449 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -111,8 +111,8 @@ wxDCFactory *wxDCFactory::Get() class wxDCFactoryCleanupModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDCFactory::Set(NULL); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDCFactory::Set(NULL); } private: wxDECLARE_DYNAMIC_CLASS(wxDCFactoryCleanupModule); diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp index 9b1c1f3159..26e565efb2 100644 --- a/src/common/dcbufcmn.cpp +++ b/src/common/dcbufcmn.cpp @@ -42,8 +42,8 @@ class wxSharedDCBufferManager : public wxModule public: wxSharedDCBufferManager() { } - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(ms_buffer); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDELETE(ms_buffer); } static wxBitmap* GetBuffer(wxDC* dc, int w, int h) { diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp index 71774d6a56..88d3f73c4c 100644 --- a/src/common/debugrpt.cpp +++ b/src/common/debugrpt.cpp @@ -74,7 +74,7 @@ public: bool IsOk() const { return m_isOk; } protected: - virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE; + virtual void OnStackFrame(const wxStackFrame& frame) override; wxXmlNode *m_nodeStack; bool m_isOk; diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index 00f7b15bbe..f40f377b33 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -219,13 +219,13 @@ class wxDirTraverserSimple : public wxDirTraverser public: wxDirTraverserSimple(wxArrayString& files) : m_files(files) { } - virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE + virtual wxDirTraverseResult OnFile(const wxString& filename) override { m_files.push_back(filename); return wxDIR_CONTINUE; } - virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE + virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) override { return wxDIR_CONTINUE; } @@ -266,13 +266,13 @@ class wxDirTraverserFindFirst : public wxDirTraverser public: wxDirTraverserFindFirst() { } - virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE + virtual wxDirTraverseResult OnFile(const wxString& filename) override { m_file = filename; return wxDIR_STOP; } - virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE + virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) override { return wxDIR_CONTINUE; } @@ -317,7 +317,7 @@ class wxDirTraverserSumSize : public wxDirTraverser public: wxDirTraverserSumSize() { } - virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE + virtual wxDirTraverseResult OnFile(const wxString& filename) override { // wxFileName::GetSize won't use this class again as // we're passing it a file and not a directory; @@ -339,7 +339,7 @@ public: return wxDIR_CONTINUE; } - virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE + virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) override { return wxDIR_CONTINUE; } diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index b00317f382..2e78f738b2 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -980,8 +980,8 @@ class wxDialogLayoutAdapterModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxDialogLayoutAdapterModule); public: wxDialogLayoutAdapterModule() {} - virtual void OnExit() wxOVERRIDE { delete wxDialogBase::SetLayoutAdapter(NULL); } - virtual bool OnInit() wxOVERRIDE { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; } + virtual void OnExit() override { delete wxDialogBase::SetLayoutAdapter(NULL); } + virtual bool OnInit() override { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; } }; wxIMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule); diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp index c01c612fba..9b4977e961 100644 --- a/src/common/dpycmn.cpp +++ b/src/common/dpycmn.cpp @@ -55,8 +55,8 @@ static wxDisplayFactory *gs_factory = NULL; class wxDisplayModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDELETE(gs_factory); } diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index 245aa1ccce..c54dfff298 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -48,14 +48,14 @@ public: wxPluginLibraryModule() { } // TODO: create ms_classes on demand, why always preallocate it? - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { wxPluginLibrary::ms_classes = new wxDLImports; wxPluginManager::CreateManifest(); return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxDELETE(wxPluginLibrary::ms_classes); wxPluginManager::ClearManifest(); diff --git a/src/common/event.cpp b/src/common/event.cpp index 9a083170a2..f3fa866fb9 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -142,8 +142,8 @@ class wxEventTableEntryModule: public wxModule { public: wxEventTableEntryModule() { } - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxEventHashTable::ClearAll(); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxEventHashTable::ClearAll(); } wxDECLARE_DYNAMIC_CLASS(wxEventTableEntryModule); }; diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp index 68f5a83b74..d74e36f370 100644 --- a/src/common/fdiodispatcher.cpp +++ b/src/common/fdiodispatcher.cpp @@ -133,8 +133,8 @@ bool wxMappedFDIODispatcher::UnregisterFD(int fd) class wxFDIODispatcherModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(gs_dispatcher); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDELETE(gs_dispatcher); } private: wxDECLARE_DYNAMIC_CLASS(wxFDIODispatcherModule); diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index f0661dbc21..2f2309d5c9 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -668,13 +668,13 @@ class wxFileSystemModule : public wxModule { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { m_handler = new wxLocalFSHandler; wxFileSystem::AddHandler(m_handler); return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { delete wxFileSystem::RemoveHandler(m_handler); diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp index 8969b54942..2d44a7ec7e 100644 --- a/src/common/fldlgcmn.cpp +++ b/src/common/fldlgcmn.cpp @@ -322,12 +322,12 @@ public: { } - virtual void Show(bool show) wxOVERRIDE + virtual void Show(bool show) override { m_win->Show(show); } - virtual void Enable(bool enable) wxOVERRIDE + virtual void Enable(bool enable) override { m_win->Enable(enable); } @@ -362,7 +362,7 @@ public: m_handler = NULL; } - virtual bool DoBind(wxEvtHandler* handler) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* handler) override { if ( !m_handler ) { @@ -404,17 +404,17 @@ public: m_handler = NULL; } - virtual bool GetValue() wxOVERRIDE + virtual bool GetValue() override { return GetCheckBox()->GetValue(); } - virtual void SetValue(bool value) wxOVERRIDE + virtual void SetValue(bool value) override { GetCheckBox()->SetValue(value); } - virtual bool DoBind(wxEvtHandler* handler) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* handler) override { if ( !m_handler ) { @@ -456,17 +456,17 @@ public: m_handler = NULL; } - virtual bool GetValue() wxOVERRIDE + virtual bool GetValue() override { return GetRadioButton()->GetValue(); } - virtual void SetValue(bool value) wxOVERRIDE + virtual void SetValue(bool value) override { GetRadioButton()->SetValue(value); } - virtual bool DoBind(wxEvtHandler* handler) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* handler) override { if ( !m_handler ) { @@ -510,17 +510,17 @@ public: m_handler = NULL; } - virtual int GetSelection() wxOVERRIDE + virtual int GetSelection() override { return GetChoice()->GetSelection(); } - virtual void SetSelection(int selection) wxOVERRIDE + virtual void SetSelection(int selection) override { GetChoice()->SetSelection(selection); } - virtual bool DoBind(wxEvtHandler* handler) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* handler) override { if ( !m_handler ) { @@ -563,12 +563,12 @@ public: { } - virtual wxString GetValue() wxOVERRIDE + virtual wxString GetValue() override { return GetText()->GetValue(); } - virtual void SetValue(const wxString& value) wxOVERRIDE + virtual void SetValue(const wxString& value) override { // Don't use SetValue(), we don't need any extra events here. return GetText()->ChangeValue(value); @@ -592,7 +592,7 @@ public: { } - virtual void SetLabelText(const wxString& text) wxOVERRIDE + virtual void SetLabelText(const wxString& text) override { GetStaticText()->SetLabelText(text); @@ -636,21 +636,21 @@ public: // Implement wxFileDialogCustomizeImpl pure virtual methods. - wxFileDialogButtonImpl* AddButton(const wxString& label) wxOVERRIDE + wxFileDialogButtonImpl* AddButton(const wxString& label) override { m_lastWasRadio = false; return AddToLayoutAndReturn(label); } - wxFileDialogCheckBoxImpl* AddCheckBox(const wxString& label) wxOVERRIDE + wxFileDialogCheckBoxImpl* AddCheckBox(const wxString& label) override { m_lastWasRadio = false; return AddToLayoutAndReturn(label); } - wxFileDialogRadioButtonImpl* AddRadioButton(const wxString& label) wxOVERRIDE + wxFileDialogRadioButtonImpl* AddRadioButton(const wxString& label) override { RadioButtonImpl* const impl = AddToLayoutAndReturn(label); if ( !m_lastWasRadio ) @@ -664,7 +664,7 @@ public: return impl; } - wxFileDialogChoiceImpl* AddChoice(size_t n, const wxString* strings) wxOVERRIDE + wxFileDialogChoiceImpl* AddChoice(size_t n, const wxString* strings) override { m_lastWasRadio = false; @@ -678,7 +678,7 @@ public: } - wxFileDialogTextCtrlImpl* AddTextCtrl(const wxString& label) wxOVERRIDE + wxFileDialogTextCtrlImpl* AddTextCtrl(const wxString& label) override { m_lastWasRadio = false; @@ -690,7 +690,7 @@ public: return AddToLayoutAndReturn(); } - wxFileDialogStaticTextImpl* AddStaticText(const wxString& label) wxOVERRIDE + wxFileDialogStaticTextImpl* AddStaticText(const wxString& label) override { m_lastWasRadio = false; diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 21704ea4d4..58cd06395d 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -359,7 +359,7 @@ class wxFontMapperModule : public wxModule public: wxFontMapperModule() : wxModule() { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { // a dummy wxFontMapperBase object could have been created during the // program startup before wxApp was created, we have to delete it to @@ -373,7 +373,7 @@ public: return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxFontMapperBase::Reset(); } diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp index ddb8674371..cb4e482af6 100644 --- a/src/common/fontenumcmn.cpp +++ b/src/common/fontenumcmn.cpp @@ -38,8 +38,8 @@ class wxFontEnumCacheCleanupModule : public wxModule public: wxFontEnumCacheCleanupModule() { } - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { gs_allFacenames.clear(); } + bool OnInit() override { return true; } + void OnExit() override { gs_allFacenames.clear(); } private: wxDECLARE_DYNAMIC_CLASS(wxFontEnumCacheCleanupModule); @@ -61,7 +61,7 @@ public: wxSimpleFontEnumerator() { } // called by EnumerateFacenames - virtual bool OnFacename(const wxString& facename) wxOVERRIDE + virtual bool OnFacename(const wxString& facename) override { m_arrFacenames.Add(facename); return true; @@ -69,7 +69,7 @@ public: // called by EnumerateEncodings virtual bool OnFontEncoding(const wxString& WXUNUSED(facename), - const wxString& encoding) wxOVERRIDE + const wxString& encoding) override { m_arrEncodings.Add(encoding); return true; diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index cbbc417794..3b7685cdee 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -147,14 +147,14 @@ class wxFileSystemInternetModule : public wxModule { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { m_handler = new wxInternetFSHandler; wxFileSystem::AddHandler(m_handler); return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { delete wxFileSystem::RemoveHandler(m_handler); } diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp index 25a5edcb72..4728d9fb6f 100644 --- a/src/common/fswatchercmn.cpp +++ b/src/common/fswatchercmn.cpp @@ -187,14 +187,14 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events, { } - virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE + virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) override { // There is no need to watch individual files as we watch the // parent directory which will notify us about any changes in them. return wxDIR_CONTINUE; } - virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE + virtual wxDirTraverseResult OnDir(const wxString& dirname) override { if ( m_watcher->AddAny(wxFileName::DirName(dirname), m_events, wxFSWPath_Tree, m_filespec) ) @@ -243,14 +243,14 @@ bool wxFileSystemWatcherBase::RemoveTree(const wxFileName& path) { } - virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE + virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) override { // We never watch the individual files when watching the tree, so // nothing to do here. return wxDIR_CONTINUE; } - virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE + virtual wxDirTraverseResult OnDir(const wxString& dirname) override { m_watcher->Remove(wxFileName::DirName(dirname)); return wxDIR_CONTINUE; diff --git a/src/common/http.cpp b/src/common/http.cpp index 7ff7bb75dd..06221dc4a0 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -450,11 +450,11 @@ public: m_read_bytes = 0; } - size_t GetSize() const wxOVERRIDE { return m_httpsize; } + size_t GetSize() const override { return m_httpsize; } virtual ~wxHTTPStream() { m_http->Abort(); } protected: - size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; + size_t OnSysRead(void *buffer, size_t bufsize) override; wxDECLARE_NO_COPY_CLASS(wxHTTPStream); }; diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 0cc99f5104..6094d5b8f0 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -59,7 +59,7 @@ public: // default assignment operator and dtor are ok - virtual bool IsOk() const wxOVERRIDE { return !m_icons.empty(); } + virtual bool IsOk() const override { return !m_icons.empty(); } wxIconArray m_icons; }; diff --git a/src/common/image.cpp b/src/common/image.cpp index 19fe34ec91..287aa03e02 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -3918,8 +3918,8 @@ class wxImageModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxImageModule); public: wxImageModule() {} - bool OnInit() wxOVERRIDE { wxImage::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxImage::CleanUpHandlers(); } + bool OnInit() override { wxImage::InitStandardHandlers(); return true; } + void OnExit() override { wxImage::CleanUpHandlers(); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule); diff --git a/src/common/init.cpp b/src/common/init.cpp index e6d33d088d..1ad8389806 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -65,7 +65,7 @@ class wxDummyConsoleApp : public wxAppConsole public: wxDummyConsoleApp() { } - virtual int OnRun() wxOVERRIDE { wxFAIL_MSG( wxT("unreachable code") ); return 0; } + virtual int OnRun() override { wxFAIL_MSG( wxT("unreachable code") ); return 0; } virtual bool DoYield(bool, long) { return true; } wxDECLARE_NO_COPY_CLASS(wxDummyConsoleApp); diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 3b33e97ca2..af196a43e7 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -1578,12 +1578,12 @@ class wxLocaleModule: public wxModule public: wxLocaleModule() {} - bool OnInit() wxOVERRIDE + bool OnInit() override { return true; } - void OnExit() wxOVERRIDE + void OnExit() override { wxLocale::DestroyLanguagesDB(); } diff --git a/src/common/log.cpp b/src/common/log.cpp index 764c0bcf09..e716690f00 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -161,7 +161,7 @@ public: wxLogOutputBest() { } protected: - virtual void DoLogText(const wxString& msg) wxOVERRIDE + virtual void DoLogText(const wxString& msg) override { wxMessageOutputBest().Output(msg); } diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp index 4c5f6042d8..451856c710 100644 --- a/src/common/markupparser.cpp +++ b/src/common/markupparser.cpp @@ -434,31 +434,31 @@ wxString wxMarkupParser::Strip(const wxString& text) const wxString& GetText() const { return m_text; } - virtual void OnText(const wxString& string) wxOVERRIDE { m_text += string; } + virtual void OnText(const wxString& string) override { m_text += string; } - virtual void OnBoldStart() wxOVERRIDE { } - virtual void OnBoldEnd() wxOVERRIDE { } + virtual void OnBoldStart() override { } + virtual void OnBoldEnd() override { } - virtual void OnItalicStart() wxOVERRIDE { } - virtual void OnItalicEnd() wxOVERRIDE { } + virtual void OnItalicStart() override { } + virtual void OnItalicEnd() override { } - virtual void OnUnderlinedStart() wxOVERRIDE { } - virtual void OnUnderlinedEnd() wxOVERRIDE { } + virtual void OnUnderlinedStart() override { } + virtual void OnUnderlinedEnd() override { } - virtual void OnStrikethroughStart() wxOVERRIDE { } - virtual void OnStrikethroughEnd() wxOVERRIDE { } + virtual void OnStrikethroughStart() override { } + virtual void OnStrikethroughEnd() override { } - virtual void OnBigStart() wxOVERRIDE { } - virtual void OnBigEnd() wxOVERRIDE { } + virtual void OnBigStart() override { } + virtual void OnBigEnd() override { } - virtual void OnSmallStart() wxOVERRIDE { } - virtual void OnSmallEnd() wxOVERRIDE { } + virtual void OnSmallStart() override { } + virtual void OnSmallEnd() override { } - virtual void OnTeletypeStart() wxOVERRIDE { } - virtual void OnTeletypeEnd() wxOVERRIDE { } + virtual void OnTeletypeStart() override { } + virtual void OnTeletypeEnd() override { } - virtual void OnSpanStart(const wxMarkupSpanAttributes& WXUNUSED(a)) wxOVERRIDE { } - virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(a)) wxOVERRIDE { } + virtual void OnSpanStart(const wxMarkupSpanAttributes& WXUNUSED(a)) override { } + virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(a)) override { } private: wxString m_text; diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index e9e71cdb64..109e7e7dbc 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -737,8 +737,8 @@ class wxMimeTypeCmnModule: public wxModule public: wxMimeTypeCmnModule() : wxModule() { } - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxMimeTypesManagerFactory::Set(NULL); diff --git a/src/common/overlaycmn.cpp b/src/common/overlaycmn.cpp index 25702c1e52..bc991ce61a 100644 --- a/src/common/overlaycmn.cpp +++ b/src/common/overlaycmn.cpp @@ -147,13 +147,13 @@ class wxOverlayImpl: public wxOverlay::Impl public: wxOverlayImpl(); ~wxOverlayImpl(); - virtual bool IsNative() const wxOVERRIDE; - virtual bool IsOk() wxOVERRIDE; - virtual void Init(wxDC* dc, int x, int y, int width, int height) wxOVERRIDE; - virtual void BeginDrawing(wxDC* dc) wxOVERRIDE; - virtual void EndDrawing(wxDC* dc) wxOVERRIDE; - virtual void Clear(wxDC* dc) wxOVERRIDE; - virtual void Reset() wxOVERRIDE; + virtual bool IsNative() const override; + virtual bool IsOk() override; + virtual void Init(wxDC* dc, int x, int y, int width, int height) override; + virtual void BeginDrawing(wxDC* dc) override; + virtual void EndDrawing(wxDC* dc) override; + virtual void Clear(wxDC* dc) override; + virtual void Reset() override; wxBitmap m_bmpSaved; int m_x; diff --git a/src/common/paper.cpp b/src/common/paper.cpp index bfbc0d76f5..16fe8d57bd 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -349,8 +349,8 @@ class WXDLLEXPORT wxPrintPaperModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxPrintPaperModule); public: wxPrintPaperModule() {} - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; + bool OnInit() override; + void OnExit() override; }; wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule); diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index bc95f456fa..befb3a0dae 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -301,8 +301,8 @@ class wxPrintFactoryModule: public wxModule { public: wxPrintFactoryModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxPrintFactory::SetPrintFactory( NULL ); } + bool OnInit() override { return true; } + void OnExit() override { wxPrintFactory::SetPrintFactory( NULL ); } private: wxDECLARE_DYNAMIC_CLASS(wxPrintFactoryModule); diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index 6e3b13aacc..6cb7761bfc 100644 --- a/src/common/sckipc.cpp +++ b/src/common/sckipc.cpp @@ -152,8 +152,8 @@ public: } // as ms_handler is initialized on demand, don't do anything in OnInit() - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(ms_handler); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDELETE(ms_handler); } private: static wxTCPEventHandler *ms_handler; diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 97ecb60424..c245cb17a4 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -2158,14 +2158,14 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr, class wxSocketModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { // wxSocketBase will call Initialize() itself only if sockets are // really used, don't do it from here return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { if ( wxSocketBase::IsInitialized() ) wxSocketBase::Shutdown(); diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp index 74aa8aa9c2..9ee5373368 100644 --- a/src/common/stattextcmn.cpp +++ b/src/common/stattextcmn.cpp @@ -175,12 +175,12 @@ public: } protected: - virtual void OnOutputLine(const wxString& line) wxOVERRIDE + virtual void OnOutputLine(const wxString& line) override { m_text += line; } - virtual void OnNewLine() wxOVERRIDE + virtual void OnNewLine() override { m_text += wxT('\n'); } diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index ac0681b7c1..04205b3a32 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -2072,14 +2072,14 @@ public: // implement base class virtual methods virtual size_t ToWChar(wchar_t *dst, size_t dstLen, - const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; + const char *src, size_t srcLen = wxNO_LEN) const override; virtual size_t FromWChar(char *dst, size_t dstLen, - const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE; - virtual size_t GetMBNulLen() const wxOVERRIDE; + const wchar_t *src, size_t srcLen = wxNO_LEN) const override; + virtual size_t GetMBNulLen() const override; - virtual bool IsUTF8() const wxOVERRIDE; + virtual bool IsUTF8() const override; - virtual wxMBConv *Clone() const wxOVERRIDE + virtual wxMBConv *Clone() const override { wxMBConv_iconv *p = new wxMBConv_iconv(m_name); p->m_minMBCharWidth = m_minMBCharWidth; @@ -2514,7 +2514,7 @@ public: m_minMBCharWidth = 0; } - virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const wxOVERRIDE + virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const override { // note that we have to use MB_ERR_INVALID_CHARS flag as it without it // the behaviour is not compatible with the Unix version (using iconv) @@ -2553,7 +2553,7 @@ public: return len - 1; } - virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const wxOVERRIDE + virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const override { /* We need to WC_NO_BEST_FIT_CHARS to prevent WideCharToMultiByte() @@ -2638,7 +2638,7 @@ public: return len - 1; } - virtual size_t GetMBNulLen() const wxOVERRIDE + virtual size_t GetMBNulLen() const override { if ( m_minMBCharWidth == 0 ) { @@ -2677,7 +2677,7 @@ public: return m_minMBCharWidth; } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_win32(*this); } + virtual wxMBConv *Clone() const override { return new wxMBConv_win32(*this); } bool IsOk() const { return m_CodePage != -1; } @@ -2731,7 +2731,7 @@ public: Init(); } - size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const wxOVERRIDE + size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const override { size_t inbuf = strlen(psz); if (buf) @@ -2742,7 +2742,7 @@ public: return inbuf; } - size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const wxOVERRIDE + size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const override { const size_t inbuf = wxWcslen(psz); if (buf) @@ -2754,7 +2754,7 @@ public: return inbuf; } - virtual size_t GetMBNulLen() const wxOVERRIDE + virtual size_t GetMBNulLen() const override { switch ( m_enc ) { @@ -2771,7 +2771,7 @@ public: } } - virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_wxwin(m_enc); } + virtual wxMBConv *Clone() const override { return new wxMBConv_wxwin(m_enc); } bool IsOk() const { return m_ok; } diff --git a/src/common/strvararg.cpp b/src/common/strvararg.cpp index bd72b6eff0..3b2d5a2ddd 100644 --- a/src/common/strvararg.cpp +++ b/src/common/strvararg.cpp @@ -452,7 +452,7 @@ class wxPrintfFormatConverterWchar : public wxFormatConverterBase { virtual void HandleString(CharType WXUNUSED(conv), SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE + CharType& outConv, SizeModifier& outSize) override { outConv = 's'; outSize = Size_Long; @@ -460,7 +460,7 @@ class wxPrintfFormatConverterWchar : public wxFormatConverterBase virtual void HandleChar(CharType WXUNUSED(conv), SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE + CharType& outConv, SizeModifier& outSize) override { outConv = 'c'; outSize = Size_Long; @@ -475,7 +475,7 @@ class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase { virtual void HandleString(CharType WXUNUSED(conv), SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE + CharType& outConv, SizeModifier& outSize) override { outConv = 's'; outSize = Size_Default; @@ -483,7 +483,7 @@ class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase virtual void HandleChar(CharType WXUNUSED(conv), SizeModifier WXUNUSED(size), - CharType& outConv, SizeModifier& outSize) wxOVERRIDE + CharType& outConv, SizeModifier& outSize) override { // chars are represented using wchar_t in both builds, so this is // the same as above @@ -533,14 +533,14 @@ class wxPrintfFormatConverterANSI : public wxFormatConverterBase class wxScanfFormatConverterWchar : public wxFormatConverterBase { virtual void HandleString(CharType conv, SizeModifier size, - CharType& outConv, SizeModifier& outSize) wxOVERRIDE + CharType& outConv, SizeModifier& outSize) override { outConv = 's'; outSize = GetOutSize(conv == 'S', size); } virtual void HandleChar(CharType conv, SizeModifier size, - CharType& outConv, SizeModifier& outSize) wxOVERRIDE + CharType& outConv, SizeModifier& outSize) override { outConv = 'c'; outSize = GetOutSize(conv == 'C', size); diff --git a/src/common/translation.cpp b/src/common/translation.cpp index da7f7bbd08..f62b1a7008 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -1982,12 +1982,12 @@ class wxTranslationsModule: public wxModule public: wxTranslationsModule() {} - bool OnInit() wxOVERRIDE + bool OnInit() override { return true; } - void OnExit() wxOVERRIDE + void OnExit() override { if ( gs_translationsOwned ) delete gs_translations; diff --git a/src/common/url.cpp b/src/common/url.cpp index f988ee51f2..4d4ccff22d 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -447,8 +447,8 @@ class wxURLModule : public wxModule public: wxURLModule(); - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxURLModule); diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 9fd4840c6d..cb4f034396 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -236,22 +236,22 @@ public: inline long GetValue() const { return m_value; } inline void SetValue(long value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Read(wxString& str) override; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; + virtual bool Write(wxSTD ostream& str) const override; #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataLong(m_value); } + wxVariantData* Clone() const override { return new wxVariantDataLong(m_value); } - virtual wxString GetType() const wxOVERRIDE { return wxT("long"); } + virtual wxString GetType() const override { return wxT("long"); } #if wxUSE_ANY // Since wxAny does not have separate type for integers shorter than @@ -260,7 +260,7 @@ public: #ifndef wxLongLong_t DECLARE_WXANY_CONVERSION() #else - bool GetAsAny(wxAny* any) const wxOVERRIDE + bool GetAsAny(wxAny* any) const override { *any = m_value; return true; @@ -405,22 +405,22 @@ public: inline double GetValue() const { return m_value; } inline void SetValue(double value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; - virtual bool Read(wxString& str) wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; + virtual bool Read(wxString& str) override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("double"); } + virtual wxString GetType() const override { return wxT("double"); } - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDoubleData(m_value); } + wxVariantData* Clone() const override { return new wxVariantDoubleData(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -545,22 +545,22 @@ public: inline bool GetValue() const { return m_value; } inline void SetValue(bool value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; - virtual bool Read(wxString& str) wxOVERRIDE; + virtual bool Write(wxString& str) const override; + virtual bool Read(wxString& str) override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("bool"); } + virtual wxString GetType() const override { return wxT("bool"); } - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataBool(m_value); } + wxVariantData* Clone() const override { return new wxVariantDataBool(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -688,19 +688,19 @@ public: inline wxUniChar GetValue() const { return m_value; } inline void SetValue(const wxUniChar& value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Read(wxString& str) override; + virtual bool Write(wxString& str) const override; #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("char"); } - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataChar(m_value); } + virtual wxString GetType() const override { return wxT("char"); } + wxVariantData* Clone() const override { return new wxVariantDataChar(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -841,21 +841,21 @@ public: inline wxString GetValue() const { return m_value; } inline void SetValue(const wxString& value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Read(wxString& str) override; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& WXUNUSED(str)) wxOVERRIDE { return false; } + virtual bool Read(wxSTD istream& WXUNUSED(str)) override { return false; } #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const wxOVERRIDE { return wxT("string"); } - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataString(m_value); } + virtual wxString GetType() const override { return wxT("string"); } + wxVariantData* Clone() const override { return new wxVariantDataString(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -1036,19 +1036,19 @@ public: inline wxObject* GetValue() const { return m_value; } inline void SetValue(wxObject* value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE ; - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataWxObjectPtr(m_value); } + virtual bool Read(wxString& str) override; + virtual wxString GetType() const override ; + virtual wxVariantData* Clone() const override { return new wxVariantDataWxObjectPtr(m_value); } - virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE; + virtual wxClassInfo* GetValueClassInfo() override; DECLARE_WXANY_CONVERSION() protected: @@ -1160,17 +1160,17 @@ public: inline void* GetValue() const { return m_value; } inline void SetValue(void* value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("void*"); } - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataVoidPtr(m_value); } + virtual bool Read(wxString& str) override; + virtual wxString GetType() const override { return wxT("void*"); } + virtual wxVariantData* Clone() const override { return new wxVariantDataVoidPtr(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -1275,17 +1275,17 @@ public: inline wxDateTime GetValue() const { return m_value; } inline void SetValue(const wxDateTime& value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("datetime"); } - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataDateTime(m_value); } + virtual bool Read(wxString& str) override; + virtual wxString GetType() const override { return wxT("datetime"); } + virtual wxVariantData* Clone() const override { return new wxVariantDataDateTime(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -1408,17 +1408,17 @@ public: wxArrayString GetValue() const { return m_value; } void SetValue(const wxArrayString& value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("arrstring"); } - virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataArrayString(m_value); } + virtual bool Read(wxString& str) override; + virtual wxString GetType() const override { return wxT("arrstring"); } + virtual wxVariantData* Clone() const override { return new wxVariantDataArrayString(m_value); } DECLARE_WXANY_CONVERSION() protected: @@ -1536,25 +1536,25 @@ public: wxLongLong GetValue() const { return m_value; } void SetValue(wxLongLong value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Read(wxString& str) override; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; + virtual bool Write(wxSTD ostream& str) const override; #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - wxVariantData* Clone() const wxOVERRIDE + wxVariantData* Clone() const override { return new wxVariantDataLongLong(m_value); } - virtual wxString GetType() const wxOVERRIDE { return wxS("longlong"); } + virtual wxString GetType() const override { return wxS("longlong"); } DECLARE_WXANY_CONVERSION() protected: @@ -1735,25 +1735,25 @@ public: wxULongLong GetValue() const { return m_value; } void SetValue(wxULongLong value) { m_value = value; } - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; - virtual bool Read(wxString& str) wxOVERRIDE; - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Read(wxString& str) override; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; + virtual bool Write(wxSTD ostream& str) const override; #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - wxVariantData* Clone() const wxOVERRIDE + wxVariantData* Clone() const override { return new wxVariantDataULongLong(m_value); } - virtual wxString GetType() const wxOVERRIDE { return wxS("ulonglong"); } + virtual wxString GetType() const override { return wxS("ulonglong"); } DECLARE_WXANY_CONVERSION() protected: @@ -1934,20 +1934,20 @@ public: wxVariantList& GetValue() { return m_value; } void SetValue(const wxVariantList& value) ; - virtual bool Eq(wxVariantData& data) const wxOVERRIDE; + virtual bool Eq(wxVariantData& data) const override; #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const wxOVERRIDE; + virtual bool Write(wxSTD ostream& str) const override; #endif - virtual bool Write(wxString& str) const wxOVERRIDE; + virtual bool Write(wxString& str) const override; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) wxOVERRIDE; + virtual bool Read(wxSTD istream& str) override; #endif - virtual bool Read(wxString& str) wxOVERRIDE; - virtual wxString GetType() const wxOVERRIDE { return wxT("list"); } + virtual bool Read(wxString& str) override; + virtual wxString GetType() const override { return wxT("list"); } void Clear(); - wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataList(m_value); } + wxVariantData* Clone() const override { return new wxVariantDataList(m_value); } DECLARE_WXANY_CONVERSION() protected: diff --git a/src/common/webrequest.cpp b/src/common/webrequest.cpp index 8b9ed8ebc2..6f9c21fe62 100644 --- a/src/common/webrequest.cpp +++ b/src/common/webrequest.cpp @@ -1082,12 +1082,12 @@ public: { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { for ( wxStringWebSessionFactoryMap::iterator it = gs_factoryMap.begin(); it != gs_factoryMap.end(); diff --git a/src/common/webrequest_curl.cpp b/src/common/webrequest_curl.cpp index 91a8aec4ac..7845afac76 100644 --- a/src/common/webrequest_curl.cpp +++ b/src/common/webrequest_curl.cpp @@ -500,9 +500,9 @@ class WinSock1SocketPoller: public SocketPollerImpl public: WinSock1SocketPoller(wxEvtHandler*); virtual ~WinSock1SocketPoller(); - virtual bool StartPolling(wxSOCKET_T, int) wxOVERRIDE; - virtual void StopPolling(wxSOCKET_T) wxOVERRIDE; - virtual void ResumePolling(wxSOCKET_T) wxOVERRIDE; + virtual bool StartPolling(wxSOCKET_T, int) override; + virtual void StopPolling(wxSOCKET_T) override; + virtual void ResumePolling(wxSOCKET_T) override; private: static LRESULT CALLBACK MsgProc(HWND hwnd, WXUINT uMsg, WXWPARAM wParam, @@ -690,9 +690,9 @@ class SocketPollerSourceHandler: public wxEventLoopSourceHandler public: SocketPollerSourceHandler(wxSOCKET_T, wxEvtHandler*); - void OnReadWaiting() wxOVERRIDE; - void OnWriteWaiting() wxOVERRIDE; - void OnExceptionWaiting() wxOVERRIDE; + void OnReadWaiting() override; + void OnWriteWaiting() override; + void OnExceptionWaiting() override; ~SocketPollerSourceHandler(){} private: void SendEvent(int); @@ -737,9 +737,9 @@ class SourceSocketPoller: public SocketPollerImpl public: SourceSocketPoller(wxEvtHandler*); ~SourceSocketPoller(); - bool StartPolling(wxSOCKET_T, int) wxOVERRIDE; - void StopPolling(wxSOCKET_T) wxOVERRIDE; - void ResumePolling(wxSOCKET_T) wxOVERRIDE; + bool StartPolling(wxSOCKET_T, int) override; + void StopPolling(wxSOCKET_T) override; + void ResumePolling(wxSOCKET_T) override; private: WX_DECLARE_HASH_MAP(wxSOCKET_T, wxEventLoopSource*, wxIntegerHash,\ diff --git a/src/common/webview.cpp b/src/common/webview.cpp index 62ba75dbe6..7b995a7abc 100644 --- a/src/common/webview.cpp +++ b/src/common/webview.cpp @@ -79,7 +79,7 @@ public: ~wxWebViewHandlerResponseDataString() { delete m_stream; } - virtual wxInputStream* GetStream() wxOVERRIDE + virtual wxInputStream* GetStream() override { return m_stream; } @@ -104,7 +104,7 @@ public: ~wxWebViewHandlerResponseDataFile() { delete m_file; } - virtual wxInputStream* GetStream() wxOVERRIDE + virtual wxInputStream* GetStream() override { return m_file->GetStream(); } wxFSFile* m_file; diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 8b5c105398..f29898b032 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -2077,12 +2077,12 @@ bool wxWindowBase::Validate() { } - virtual bool OnDo(wxValidator* validator) wxOVERRIDE + virtual bool OnDo(wxValidator* validator) override { return validator->Validate(m_win); } - virtual bool OnRecurse(wxWindow* child) wxOVERRIDE + virtual bool OnRecurse(wxWindow* child) override { return child->Validate(); } @@ -2105,7 +2105,7 @@ bool wxWindowBase::TransferDataToWindow() { } - virtual bool OnDo(wxValidator* validator) wxOVERRIDE + virtual bool OnDo(wxValidator* validator) override { if ( !validator->TransferToWindow() ) { @@ -2120,7 +2120,7 @@ bool wxWindowBase::TransferDataToWindow() return true; } - virtual bool OnRecurse(wxWindow* child) wxOVERRIDE + virtual bool OnRecurse(wxWindow* child) override { return child->TransferDataToWindow(); } @@ -2143,12 +2143,12 @@ bool wxWindowBase::TransferDataFromWindow() { } - virtual bool OnDo(wxValidator* validator) wxOVERRIDE + virtual bool OnDo(wxValidator* validator) override { return validator->TransferFromWindow(); } - virtual bool OnRecurse(wxWindow* child) wxOVERRIDE + virtual bool OnRecurse(wxWindow* child) override { return child->TransferDataFromWindow(); } @@ -3624,7 +3624,7 @@ public: DragAcceptFilesTarget(wxWindowBase *win) : m_win(win) {} virtual bool OnDropFiles(wxCoord x, wxCoord y, - const wxArrayString& filenames) wxOVERRIDE + const wxArrayString& filenames) override { wxDropFilesEvent event(wxEVT_DROP_FILES, filenames.size(), diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp index 81c1a56cbd..3d9a51828b 100644 --- a/src/common/xlocale.cpp +++ b/src/common/xlocale.cpp @@ -52,8 +52,8 @@ wxXLocale wxNullXLocale; class wxXLocaleModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(gs_cLocale); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDELETE(gs_cLocale); } wxDECLARE_DYNAMIC_CLASS(wxXLocaleModule); }; diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index bd80b142b8..853a0f365f 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -284,12 +284,12 @@ public: void Open(wxFileOffset len) { Close(); m_len = len; } void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; } - virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); } - virtual wxFileOffset GetLength() const wxOVERRIDE { return m_len; } + virtual char Peek() override { return wxInputStream::Peek(); } + virtual wxFileOffset GetLength() const override { return m_len; } protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + virtual size_t OnSysRead(void *buffer, size_t size) override; + virtual wxFileOffset OnSysTell() const override { return m_pos; } private: wxFileOffset m_pos; @@ -329,15 +329,15 @@ public: wxStoredOutputStream(wxOutputStream& stream) : wxFilterOutputStream(stream), m_pos(0) { } - bool Close() wxOVERRIDE { + bool Close() override { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; return true; } protected: - virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + virtual size_t OnSysWrite(const void *buffer, size_t size) override; + virtual wxFileOffset OnSysTell() const override { return m_pos; } private: wxFileOffset m_pos; @@ -391,11 +391,11 @@ public: void Open(); bool Final(); - wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE; + wxInputStream& Read(void *buffer, size_t size) override; protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + virtual size_t OnSysRead(void *buffer, size_t size) override; + virtual wxFileOffset OnSysTell() const override { return m_pos; } private: wxFileOffset m_pos; @@ -489,8 +489,8 @@ public: wxInputStream& GetTee() const { return *m_tee; } protected: - virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + virtual size_t OnSysRead(void *buffer, size_t size) override; + virtual wxFileOffset OnSysTell() const override { return m_pos; } private: wxFileOffset m_pos; @@ -555,7 +555,7 @@ public: wxZlibOutputStream(stream, level, wxZLIB_NO_HEADER) { } bool Open(wxOutputStream& stream); - bool Close() wxOVERRIDE { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); } + bool Close() override { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); } }; bool wxZlibOutputStream2::Open(wxOutputStream& stream) diff --git a/src/dfb/utils.cpp b/src/dfb/utils.cpp index d6add101c0..7305ade076 100644 --- a/src/dfb/utils.cpp +++ b/src/dfb/utils.cpp @@ -59,19 +59,19 @@ wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) class wxDisplayImplSingleDFB : public wxDisplayImplSingle { public: - virtual wxRect GetGeometry() const wxOVERRIDE + virtual wxRect GetGeometry() const override { const wxVideoMode mode(wxTheApp->GetDisplayMode()); return wxRect(0, 0, mode.w, mode.h); } - virtual int GetDepth() const wxOVERRIDE + virtual int GetDepth() const override { return wxTheApp->GetDisplayMode().bpp; } - virtual wxSize GetPPI() const wxOVERRIDE + virtual wxSize GetPPI() const override { // FIXME: there's no way to get physical resolution using the DirectDB // API, we hardcode a commonly used value of 72dpi diff --git a/src/generic/activityindicator.cpp b/src/generic/activityindicator.cpp index cac9ff8054..324b29248b 100644 --- a/src/generic/activityindicator.cpp +++ b/src/generic/activityindicator.cpp @@ -105,7 +105,7 @@ private: { } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { m_owner->Advance(); } diff --git a/src/generic/bmpsvg.cpp b/src/generic/bmpsvg.cpp index 1741d0c9ee..7d19b08985 100644 --- a/src/generic/bmpsvg.cpp +++ b/src/generic/bmpsvg.cpp @@ -109,9 +109,9 @@ public: nsvgDelete(m_svgImage); } - virtual wxSize GetDefaultSize() const wxOVERRIDE; - virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE; - virtual wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE; + virtual wxSize GetDefaultSize() const override; + virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const override; + virtual wxBitmap GetBitmap(const wxSize& size) override; private: wxBitmap DoRasterize(const wxSize& size); diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index ce902605eb..4c6757d765 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -326,7 +326,7 @@ public: } #if wxUSE_ACCESSIBILITY - virtual wxAccessible* CreateAccessible() wxOVERRIDE + virtual wxAccessible* CreateAccessible() override { // Under MSW wxHeadrCtrl is a native control // so we just need to pass all requests @@ -338,12 +338,12 @@ public: protected: // implement/override wxHeaderCtrl functions by forwarding them to the main // control - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const override { return *(GetOwner()->GetColumn(idx)); } - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) override { wxDataViewCtrl * const owner = GetOwner(); @@ -466,7 +466,7 @@ private: public: wxDataViewRenameTimer( wxDataViewMainWindow *owner ); - void Notify() wxOVERRIDE; + void Notify() override; }; //----------------------------------------------------------------------------- @@ -802,11 +802,11 @@ public: void UpdateDisplay(); void RecalculateDisplay(); - void OnInternalIdle() wxOVERRIDE; + void OnInternalIdle() override; void OnRenameTimer(); - void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ) wxOVERRIDE; + void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ) override; void ScrollTo( int rows, int column ); unsigned GetCurrentRow() const { return m_currentRow; } @@ -1076,17 +1076,17 @@ public: wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow ) { m_mainWindow = mainWindow; } - virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) wxOVERRIDE + virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) override { return m_mainWindow->ItemAdded( parent , item ); } - virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) override { return m_mainWindow->ItemDeleted( parent, item ); } - virtual bool ItemChanged( const wxDataViewItem & item ) wxOVERRIDE + virtual bool ItemChanged( const wxDataViewItem & item ) override { return m_mainWindow->ItemChanged(item); } - virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) wxOVERRIDE + virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) override { return m_mainWindow->ValueChanged( item, col ); } - virtual bool Cleared() wxOVERRIDE + virtual bool Cleared() override { return m_mainWindow->Cleared(); } - virtual void Resort() wxOVERRIDE + virtual void Resort() override { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; @@ -1686,7 +1686,7 @@ public: delete m_hint; } - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) wxOVERRIDE + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) override { wxPoint pos = wxGetMousePosition(); @@ -1740,7 +1740,7 @@ public: wxDataObjectComposite* GetCompositeDataObject() const { return m_obj; } - virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) wxOVERRIDE + virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) override { wxDataFormat format = GetMatchingPair(); if (format == wxDF_INVALID) @@ -1748,7 +1748,7 @@ public: return m_win->OnDragOver( format, x, y, def); } - virtual bool OnDrop( wxCoord x, wxCoord y ) wxOVERRIDE + virtual bool OnDrop( wxCoord x, wxCoord y ) override { wxDataFormat format = GetMatchingPair(); if (format == wxDF_INVALID) @@ -1756,7 +1756,7 @@ public: return m_win->OnDrop( format, x, y ); } - virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) wxOVERRIDE + virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) override { wxDataFormat format = GetMatchingPair(); if (format == wxDF_INVALID) @@ -1766,7 +1766,7 @@ public: return m_win->OnData( format, x, y, def ); } - virtual void OnLeave() wxOVERRIDE + virtual void OnLeave() override { m_win->OnLeave(); } private: @@ -3868,7 +3868,7 @@ public: { } - virtual int operator() ( wxDataViewTreeNode * node ) wxOVERRIDE + virtual int operator() ( wxDataViewTreeNode * node ) override { if( m_current == m_row) { @@ -4330,7 +4330,7 @@ public: } // Maybe binary search will help to speed up this process - virtual int operator() ( wxDataViewTreeNode * node) wxOVERRIDE + virtual int operator() ( wxDataViewTreeNode * node) override { if( node->GetItem() == m_item ) { @@ -6070,7 +6070,7 @@ public: GetExpanderColumnOrFirstOne(const_cast(dvc)) == column ); } - virtual void UpdateWithRow(int row) wxOVERRIDE + virtual void UpdateWithRow(int row) override { int width = 0; wxDataViewItem item; diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index ee74b8deb3..0a3bf42207 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -61,14 +61,14 @@ public: { } - virtual void Init() wxOVERRIDE + virtual void Init() override { } // NB: Don't create lazily since it didn't work that way before // wxComboCtrl was used, and changing behaviour would almost // certainly introduce new bugs. - virtual bool Create(wxWindow* parent) wxOVERRIDE + virtual bool Create(wxWindow* parent) override { if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime, wxPoint(0, 0), wxDefaultSize, @@ -91,12 +91,12 @@ public: virtual wxSize GetAdjustedSize(int WXUNUSED(minWidth), int WXUNUSED(prefHeight), - int WXUNUSED(maxHeight)) wxOVERRIDE + int WXUNUSED(maxHeight)) override { return m_useSize; } - virtual wxWindow *GetControl() wxOVERRIDE { return this; } + virtual wxWindow *GetControl() override { return this; } void SetDateValue(const wxDateTime& date) { @@ -284,7 +284,7 @@ private: return true; } - virtual void SetStringValue(const wxString& s) wxOVERRIDE + virtual void SetStringValue(const wxString& s) override { wxDateTime dt; if ( ParseDateTime(s, &dt) ) @@ -292,7 +292,7 @@ private: //else: keep the old value } - virtual wxString GetStringValue() const wxOVERRIDE + virtual wxString GetStringValue() const override { return GetStringValueFor(GetDate()); } diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp index 1bf8df6db0..47daf79edf 100644 --- a/src/generic/dbgrptg.cpp +++ b/src/generic/dbgrptg.cpp @@ -249,8 +249,8 @@ class wxDebugReportDialog : public wxDialog public: wxDebugReportDialog(wxDebugReport& dbgrpt); - virtual bool TransferDataToWindow() wxOVERRIDE; - virtual bool TransferDataFromWindow() wxOVERRIDE; + virtual bool TransferDataToWindow() override; + virtual bool TransferDataFromWindow() override; private: void OnView(wxCommandEvent& ); diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 364b0fc36c..e2a5313d75 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1392,8 +1392,8 @@ class wxFileIconsTableModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxFileIconsTableModule); public: wxFileIconsTableModule() {} - bool OnInit() wxOVERRIDE { wxTheFileIconsTable = new wxFileIconsTable; return true; } - void OnExit() wxOVERRIDE + bool OnInit() override { wxTheFileIconsTable = new wxFileIconsTable; return true; } + void OnExit() override { wxDELETE(wxTheFileIconsTable); } diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index e01a2a262a..2ed885a19d 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -127,33 +127,33 @@ public : wxCairoPathData(wxGraphicsRenderer* renderer, cairo_t* path = NULL); ~wxCairoPathData(); - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE; + virtual wxGraphicsObjectRefData *Clone() const override; // // These are the path primitives from which everything else can be constructed // // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void MoveToPoint( wxDouble x, wxDouble y ) override; // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddLineToPoint( wxDouble x, wxDouble y ) override; // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) override; // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) wxOVERRIDE ; + virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) override ; // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const wxOVERRIDE; + virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const override; // adds another path - virtual void AddPath( const wxGraphicsPathData* path ) wxOVERRIDE; + virtual void AddPath( const wxGraphicsPathData* path ) override; // closes the current sub-path - virtual void CloseSubpath() wxOVERRIDE; + virtual void CloseSubpath() override; // // These are convenience functions which - if not available natively will be assembled @@ -161,13 +161,13 @@ public : // // appends a rectangle as a new closed subpath - virtual void AddRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void AddRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; // appends a circle as a new closed subpath - virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) wxOVERRIDE; + virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) override; // appends an ellipse as a new closed subpath fitting the passed rectangle - virtual void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; /* // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) @@ -175,18 +175,18 @@ public : */ // returns the native path - virtual void * GetNativePath() const wxOVERRIDE ; + virtual void * GetNativePath() const override ; // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void *p) const wxOVERRIDE; + virtual void UnGetNativePath(void *p) const override; // transforms each point of this path by the matrix - virtual void Transform( const wxGraphicsMatrixData* matrix ) wxOVERRIDE ; + virtual void Transform( const wxGraphicsMatrixData* matrix ) override ; // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE; + virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const override; - virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxWINDING_RULE) const wxOVERRIDE; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxWINDING_RULE) const override; private : cairo_t* m_pathContext; @@ -198,53 +198,53 @@ public : wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ; virtual ~wxCairoMatrixData() ; - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE ; + virtual wxGraphicsObjectRefData *Clone() const override ; // concatenates the matrix - virtual void Concat( const wxGraphicsMatrixData *t ) wxOVERRIDE; + virtual void Concat( const wxGraphicsMatrixData *t ) override; // sets the matrix to the respective values virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; + wxDouble tx=0.0, wxDouble ty=0.0) override; // gets the component valuess of the matrix virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, - wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const wxOVERRIDE; + wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const override; // makes this the inverse matrix - virtual void Invert() wxOVERRIDE; + virtual void Invert() override; // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrixData* t) const wxOVERRIDE ; + virtual bool IsEqual( const wxGraphicsMatrixData* t) const override ; // return true if this is the identity matrix - virtual bool IsIdentity() const wxOVERRIDE; + virtual bool IsIdentity() const override; // // transformation // // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; + virtual void Translate( wxDouble dx , wxDouble dy ) override; // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; + virtual void Scale( wxDouble xScale , wxDouble yScale ) override; // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) wxOVERRIDE; + virtual void Rotate( wxDouble angle ) override; // // apply the transforms // // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) const wxOVERRIDE; + virtual void TransformPoint( wxDouble *x, wxDouble *y ) const override; // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const wxOVERRIDE; + virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const override; // returns the native representation - virtual void * GetNativeMatrix() const wxOVERRIDE; + virtual void * GetNativeMatrix() const override; private: cairo_matrix_t m_matrix ; } ; @@ -305,7 +305,7 @@ public: void Init(); - virtual void Apply( wxGraphicsContext* context ) wxOVERRIDE; + virtual void Apply( wxGraphicsContext* context ) override; wxDouble GetWidth() { return m_width; } private : @@ -393,7 +393,7 @@ public: cairo_surface_t* GetCairoSurface() { return m_surface; } cairo_pattern_t* GetCairoPattern() { return m_pattern; } - void* GetNativeBitmap() const wxOVERRIDE { return m_surface; } + void* GetNativeBitmap() const override { return m_surface; } wxSize GetSize() { return wxSize(m_width, m_height); } #if wxUSE_IMAGE @@ -444,7 +444,7 @@ public: virtual ~wxCairoContext(); - virtual bool ShouldOffset() const wxOVERRIDE + virtual bool ShouldOffset() const override { if (!m_enableOffset || m_pen.IsNull()) return false; @@ -465,67 +465,67 @@ public: return wxIsSameDouble(fmod(width, 2.0), 1.0); } - virtual void Clip( const wxRegion ®ion ) wxOVERRIDE; + virtual void Clip( const wxRegion ®ion ) override; // clips drawings to the rect - virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; // resets the clipping to original extent - virtual void ResetClip() wxOVERRIDE; + virtual void ResetClip() override; // returns bounding box of the clipping region - virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) wxOVERRIDE; + virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) override; - virtual void * GetNativeContext() wxOVERRIDE; + virtual void * GetNativeContext() override; - virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE; + virtual bool SetAntialiasMode(wxAntialiasMode antialias) override; - virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE; + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) override; - virtual bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE; + virtual bool SetCompositionMode(wxCompositionMode op) override; - virtual void BeginLayer(wxDouble opacity) wxOVERRIDE; + virtual void BeginLayer(wxDouble opacity) override; - virtual void EndLayer() wxOVERRIDE; + virtual void EndLayer() override; - virtual void StrokePath( const wxGraphicsPath& p ) wxOVERRIDE; - virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE ) wxOVERRIDE; - virtual void ClearRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void StrokePath( const wxGraphicsPath& p ) override; + virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE ) override; + virtual void ClearRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; - virtual void Rotate( wxDouble angle ) wxOVERRIDE; + virtual void Translate( wxDouble dx , wxDouble dy ) override; + virtual void Scale( wxDouble xScale , wxDouble yScale ) override; + virtual void Rotate( wxDouble angle ) override; // concatenates this transform with the current transform of this context - virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; + virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) override; // sets the transform of this context - virtual void SetTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; + virtual void SetTransform( const wxGraphicsMatrix& matrix ) override; // gets the matrix of this context - virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE; + virtual wxGraphicsMatrix GetTransform() const override; - virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void PushState() wxOVERRIDE; - virtual void PopState() wxOVERRIDE; - virtual void Flush() wxOVERRIDE; + virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void PushState() override; + virtual void PopState() override; + virtual void Flush() override; - void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const wxOVERRIDE; + void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const override; virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const wxOVERRIDE; - virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE; + wxDouble *descent, wxDouble *externalLeading ) const override; + virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const override; #ifdef __WXMSW__ - virtual WXHDC GetNativeHDC() wxOVERRIDE; - virtual void ReleaseNativeHDC(WXHDC WXUNUSED(hdc)) wxOVERRIDE; + virtual WXHDC GetNativeHDC() override; + virtual void ReleaseNativeHDC(WXHDC WXUNUSED(hdc)) override; #endif protected: - virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ) override; void Init(cairo_t *context); @@ -614,7 +614,7 @@ public: Flush(); } - virtual void Flush() wxOVERRIDE + virtual void Flush() override { m_image = m_data.ConvertToImage(); } @@ -3148,27 +3148,27 @@ public : // Context - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) wxOVERRIDE; - virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) override; + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) override; #if wxUSE_PRINTING_ARCHITECTURE - virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) override; #endif - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) override; - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) override; #ifdef __WXMSW__ - virtual wxGraphicsContext * CreateContextFromNativeHDC(WXHDC dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeHDC(WXHDC dc) override; #endif #if wxUSE_IMAGE - virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) override; #endif // wxUSE_IMAGE - virtual wxGraphicsContext * CreateContext( wxWindow* window ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( wxWindow* window ) override; - virtual wxGraphicsContext * CreateMeasuringContext() wxOVERRIDE; + virtual wxGraphicsContext * CreateMeasuringContext() override; #ifdef __WXMSW__ #if wxUSE_ENH_METAFILE virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc); @@ -3176,56 +3176,56 @@ public : #endif // Path - virtual wxGraphicsPath CreatePath() wxOVERRIDE; + virtual wxGraphicsPath CreatePath() override; // Matrix virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; + wxDouble tx=0.0, wxDouble ty=0.0) override; - virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) wxOVERRIDE ; + virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) override ; - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) wxOVERRIDE ; + virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) override ; virtual wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble startX, wxDouble startY, wxDouble endX, wxDouble endY, wxDouble radius, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; // sets the font - virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) wxOVERRIDE ; + virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) override ; virtual wxGraphicsFont CreateFont(double sizeInPixels, const wxString& facename, int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) wxOVERRIDE; + const wxColour& col = *wxBLACK) override; virtual wxGraphicsFont CreateFontAtDPI(const wxFont& font, const wxRealPoint& dpi, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) override; #if wxUSE_IMAGE - virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE; - virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) override; + virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) override; #endif // wxUSE_IMAGE // create a graphics bitmap from a native bitmap - virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) override; // create a subimage from a native image representation - virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; - virtual wxString GetName() const wxOVERRIDE; - virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE; + virtual wxString GetName() const override; + virtual void GetVersion(int *major, int *minor, int *micro) const override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer); } ; diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp index b00cfe1a28..53ac233874 100644 --- a/src/generic/htmllbox.cpp +++ b/src/generic/htmllbox.cpp @@ -160,7 +160,7 @@ public: : wxDefaultHtmlRenderingStyle(&hlbox), m_hlbox(hlbox) { } - virtual wxColour GetSelectedTextColour(const wxColour& colFg) wxOVERRIDE + virtual wxColour GetSelectedTextColour(const wxColour& colFg) override { // by default wxHtmlListBox doesn't implement GetSelectedTextColour() // and returns wxNullColour from it, so use the default HTML colour for @@ -174,7 +174,7 @@ public: return col; } - virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) wxOVERRIDE + virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) override { wxColour col = m_hlbox.GetSelectedTextBgColour(colBg); if ( !col.IsOk() ) diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 1db9b9b7b7..80e1ea392e 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -3445,7 +3445,7 @@ public: { } - virtual void UpdateWithRow(int row) wxOVERRIDE + virtual void UpdateWithRow(int row) override { wxListLineData *line = m_listmain->GetLine( row ); wxListItemDataList::compatibility_iterator n = line->m_items.Item( GetColumn() ); diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 3e7102cc97..c380b1801e 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -439,7 +439,7 @@ public: virtual ~wxLogFrame(); // Don't prevent the application from exiting if just this frame remains. - virtual bool ShouldPreventAppExit() const wxOVERRIDE { return false; } + virtual bool ShouldPreventAppExit() const override { return false; } // menu callbacks void OnClose(wxCommandEvent& event); diff --git a/src/generic/markuptext.cpp b/src/generic/markuptext.cpp index 63d072d856..646ded6ce3 100644 --- a/src/generic/markuptext.cpp +++ b/src/generic/markuptext.cpp @@ -63,7 +63,7 @@ public: const wxSize& GetSize() const { return m_size; } - virtual void OnText(const wxString& text) wxOVERRIDE + virtual void OnText(const wxString& text) override { // TODO-MULTILINE-MARKUP: Must use GetMultiLineTextExtent(). const wxSize size = m_dc.GetTextExtent(text); @@ -81,12 +81,12 @@ public: } } - virtual void OnAttrStart(const Attr& attr) wxOVERRIDE + virtual void OnAttrStart(const Attr& attr) override { m_dc.SetFont(attr.font); } - virtual void OnAttrEnd(const Attr& WXUNUSED(attr)) wxOVERRIDE + virtual void OnAttrEnd(const Attr& WXUNUSED(attr)) override { m_dc.SetFont(GetFont()); } @@ -134,7 +134,7 @@ public: { } - virtual void OnAttrStart(const Attr& attr) wxOVERRIDE + virtual void OnAttrStart(const Attr& attr) override { m_dc.SetFont(attr.font); if ( attr.foreground.IsOk() ) @@ -149,7 +149,7 @@ public: } } - virtual void OnAttrEnd(const Attr& attr) wxOVERRIDE + virtual void OnAttrEnd(const Attr& attr) override { // We always restore the font because we always change it... m_dc.SetFont(GetFont()); @@ -201,7 +201,7 @@ public: { } - virtual void OnText(const wxString& text_) wxOVERRIDE + virtual void OnText(const wxString& text_) override { wxString text; int indexAccel = wxControl::FindAccelIndex(text_, &text); @@ -248,7 +248,7 @@ public: m_ellipsizeMode = ellipsizeMode == wxELLIPSIZE_NONE ? wxELLIPSIZE_NONE : wxELLIPSIZE_END; } - virtual void OnText(const wxString& text) wxOVERRIDE + virtual void OnText(const wxString& text) override { wxRect rect(m_rect); rect.x = m_pos; diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 0f283b7b19..3bda158786 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -53,7 +53,7 @@ public: } protected: - virtual wxWindow *OnCreateLine(const wxString& s) wxOVERRIDE + virtual wxWindow *OnCreateLine(const wxString& s) override { wxWindow * const win = wxTextSizerWrapper::OnCreateLine(s); diff --git a/src/generic/preferencesg.cpp b/src/generic/preferencesg.cpp index ddfd964d07..32cdd6ae11 100644 --- a/src/generic/preferencesg.cpp +++ b/src/generic/preferencesg.cpp @@ -78,7 +78,7 @@ public: m_notebook->ChangeSelection(page); } - bool ShouldPreventAppExit() const wxOVERRIDE + bool ShouldPreventAppExit() const override { return false; } @@ -96,7 +96,7 @@ public: m_title = title; } - virtual void AddPage(wxPreferencesPage* page) wxOVERRIDE + virtual void AddPage(wxPreferencesPage* page) override { m_pages.push_back(wxSharedPtr(page)); } @@ -155,7 +155,7 @@ public: m_win->Destroy(); } - virtual void Show(wxWindow* parent) wxOVERRIDE + virtual void Show(wxWindow* parent) override { if ( !m_win ) { @@ -173,7 +173,7 @@ public: } } - virtual void Dismiss() wxOVERRIDE + virtual void Dismiss() override { if ( m_win ) { @@ -203,7 +203,7 @@ public: m_currentPage = -1; } - virtual void Show(wxWindow* parent) wxOVERRIDE + virtual void Show(wxWindow* parent) override { wxScopedPtr dlg(CreateDialog(parent)); @@ -221,7 +221,7 @@ public: m_currentPage = dlg->GetSelectedPage(); } - virtual void Dismiss() wxOVERRIDE + virtual void Dismiss() override { if ( m_dlg ) { diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 77539dd1a3..d561e9d9f5 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -58,98 +58,98 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE; + wxHeaderButtonParams* params = NULL) override; virtual int DrawHeaderButtonContents(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE; + wxHeaderButtonParams* params = NULL) override; - virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonHeight(wxWindow *win) override; - virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonMargin(wxWindow *win) override; virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawDropArrow(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCheckMark(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) wxOVERRIDE; + virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) override; - virtual wxSize GetCheckMarkSize(wxWindow *win) wxOVERRIDE; + virtual wxSize GetCheckMarkSize(wxWindow *win) override; - virtual wxSize GetExpanderSize(wxWindow *win) wxOVERRIDE; + virtual wxSize GetExpanderSize(wxWindow *win) override; virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCollapseButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE; + virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) override; virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) override; - virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; - virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; - virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; - virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP virtual void DrawTitleBarBitmap(wxWindow *win, wxDC& dc, const wxRect& rect, wxTitleBarButton button, - int flags = 0) wxOVERRIDE; + int flags = 0) override; #endif // wxHAS_DRAW_TITLE_BAR_BITMAP - virtual void DrawGauge(wxWindow* win, wxDC& dc, const wxRect& rect, int value, int max, int flags = 0) wxOVERRIDE; + virtual void DrawGauge(wxWindow* win, wxDC& dc, const wxRect& rect, int value, int max, int flags = 0) override; virtual void DrawItemText(wxWindow* win, wxDC& dc, @@ -157,11 +157,11 @@ public: const wxRect& rect, int align = wxALIGN_LEFT | wxALIGN_TOP, int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE; + wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) override; - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) override; - virtual wxRendererVersion GetVersion() const wxOVERRIDE + virtual wxRendererVersion GetVersion() const override { return wxRendererVersion(wxRendererVersion::Current_Version, wxRendererVersion::Current_Age); @@ -1019,8 +1019,8 @@ class wxGenericRendererModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxGenericRendererModule); public: wxGenericRendererModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxRendererGeneric::Cleanup(); } + bool OnInit() override { return true; } + void OnExit() override { wxRendererGeneric::Cleanup(); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule); diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp index e44855802e..fe3cf03a86 100644 --- a/src/generic/richtooltipg.cpp +++ b/src/generic/richtooltipg.cpp @@ -267,7 +267,7 @@ public: } protected: - virtual void OnDismiss() wxOVERRIDE + virtual void OnDismiss() override { Destroy(); } diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 93456bcd1a..2275428b11 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -71,7 +71,7 @@ public: m_scrollHelper = scrollHelper; } - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; + virtual bool ProcessEvent(wxEvent& event) override; private: wxScrollHelperBase *m_scrollHelper; @@ -93,7 +93,7 @@ public: wxEventType eventTypeToSend, int pos, int orient); - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; private: wxWindow *m_win; diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 0dc60a9102..8a3636caa6 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -115,7 +115,7 @@ public: event.Skip(); } - virtual wxSize DoGetBestSize() const wxOVERRIDE + virtual wxSize DoGetBestSize() const override { wxString minVal = m_spin->DoValueToText(m_spin->m_min); wxString maxVal = m_spin->DoValueToText(m_spin->m_max); diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index 0f6d3a14d9..37b1f23abf 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -59,24 +59,24 @@ public: InvalidateBestSize(); } - virtual wxWindow* GetMainWindowOfCompositeControl() wxOVERRIDE + virtual wxWindow* GetMainWindowOfCompositeControl() override { return m_search; } // provide access to the base class protected methods to wxSearchCtrl which // needs to forward to them - void DoSetValue(const wxString& value, int flags) wxOVERRIDE + void DoSetValue(const wxString& value, int flags) override { wxTextCtrl::DoSetValue(value, flags); } - bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE + bool DoLoadFile(const wxString& file, int fileType) override { return wxTextCtrl::DoLoadFile(file, fileType); } - bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE + bool DoSaveFile(const wxString& file, int fileType) override { return wxTextCtrl::DoSaveFile(file, fileType); } @@ -116,7 +116,7 @@ protected: // to do this easily and as there is much in that code I don't understand // (notably what is the logic for buttons sizing?) I prefer to not touch it // at all. - virtual wxSize DoGetBestSize() const wxOVERRIDE + virtual wxSize DoGetBestSize() const override { const long flags = GetWindowStyleFlag(); wxSearchTextCtrl* const self = const_cast(this); @@ -178,15 +178,15 @@ public: // control and not give it to the button inside the same control. Besides, // the search button can be already activated by pressing "Enter" so there // is really no reason for it to be able to get focus from keyboard. - virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return false; } + virtual bool AcceptsFocusFromKeyboard() const override { return false; } - virtual wxWindow* GetMainWindowOfCompositeControl() wxOVERRIDE + virtual wxWindow* GetMainWindowOfCompositeControl() override { return m_search; } protected: - wxSize DoGetBestSize() const wxOVERRIDE + wxSize DoGetBestSize() const override { return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()); } diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 896b28fd3c..772b7574b6 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -59,7 +59,7 @@ class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider public: wxFileTipProvider(const wxString& filename, size_t currentTip); - virtual wxString GetTip() wxOVERRIDE; + virtual wxString GetTip() override; private: wxTextFile m_textfile; @@ -75,7 +75,7 @@ class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider public: wxRegTipProvider(const wxString& keyname); - virtual wxString GetTip() wxOVERRIDE; + virtual wxString GetTip() override; }; // Empty implementation for now to keep the linker happy diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index b5c8db1f66..2afdcf1096 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -78,7 +78,7 @@ public: wxTreeRenameTimer( wxGenericTreeCtrl *owner ); - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; private: wxGenericTreeCtrl *m_owner; @@ -124,7 +124,7 @@ public: wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; } - virtual void Notify() wxOVERRIDE { m_owner->ResetFindState(); } + virtual void Notify() override { m_owner->ResetFindState(); } private: wxGenericTreeCtrl *m_owner; diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp index 25385504b6..e167ee7b8e 100644 --- a/src/generic/treelist.cpp +++ b/src/generic/treelist.cpp @@ -366,24 +366,24 @@ public: // Implement the base class pure virtual methods. virtual void GetValue(wxVariant& variant, const wxDataViewItem& item, - unsigned col) const wxOVERRIDE; + unsigned col) const override; virtual bool SetValue(const wxVariant& variant, const wxDataViewItem& item, - unsigned col) wxOVERRIDE; - virtual wxDataViewItem GetParent(const wxDataViewItem& item) const wxOVERRIDE; - virtual bool IsContainer(const wxDataViewItem& item) const wxOVERRIDE; - virtual bool HasContainerColumns(const wxDataViewItem& item) const wxOVERRIDE; + unsigned col) override; + virtual wxDataViewItem GetParent(const wxDataViewItem& item) const override; + virtual bool IsContainer(const wxDataViewItem& item) const override; + virtual bool HasContainerColumns(const wxDataViewItem& item) const override; virtual unsigned GetChildren(const wxDataViewItem& item, - wxDataViewItemArray& children) const wxOVERRIDE; - virtual bool IsListModel() const wxOVERRIDE { return m_isFlat; } + wxDataViewItemArray& children) const override; + virtual bool IsListModel() const override { return m_isFlat; } virtual int Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned col, - bool ascending) const wxOVERRIDE; + bool ascending) const override; protected: virtual int DoCompareValues(const wxVariant& value1, - const wxVariant& value2) const wxOVERRIDE; + const wxVariant& value2) const override; private: // The control we're associated with. diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 0a2b0ae9a5..6c17ec34b0 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -45,7 +45,7 @@ public: m_scrollHelper = scrollHelper; } - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; + virtual bool ProcessEvent(wxEvent& event) override; private: wxVarScrollHelperBase *m_scrollHelper; diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 69dbca06f4..bf87101979 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -50,10 +50,10 @@ class wxWizardSizer : public wxSizer public: wxWizardSizer(wxWizard *owner); - virtual wxSizerItem *Insert(size_t index, wxSizerItem *item) wxOVERRIDE; + virtual wxSizerItem *Insert(size_t index, wxSizerItem *item) override; - virtual void RecalcSizes() wxOVERRIDE; - virtual wxSize CalcMin() wxOVERRIDE; + virtual void RecalcSizes() override; + virtual wxSize CalcMin() override; // get the max size of all wizard pages wxSize GetMaxChildSize(); diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index 02fe8087ce..33fd4591b1 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -32,9 +32,9 @@ class wxGTK2ArtProvider : public wxArtProvider { protected: virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; + const wxSize& size) override; virtual wxIconBundle CreateIconBundle(const wxArtID& id, - const wxArtClient& client) wxOVERRIDE; + const wxArtClient& client) override; }; /*static*/ void wxArtProvider::InitNativeProvider() diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index db22d2e66e..e1969f73db 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 wxOVERRIDE; + virtual bool IsOk() const override; #ifdef __WXGTK3__ GdkPixbuf* m_pixbufNoMask; diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index c49d457da0..6c1544c806 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -34,7 +34,7 @@ public: wxCursorRefData(); virtual ~wxCursorRefData(); - virtual bool IsOk() const wxOVERRIDE { return m_cursor != NULL; } + virtual bool IsOk() const override { return m_cursor != NULL; } GdkCursor *m_cursor; diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index afdea3f3ee..bc5e3031b9 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -440,7 +440,7 @@ public: void SetURL(const wxString& url) { m_url = url; } - virtual size_t GetDataSize() const wxOVERRIDE + virtual size_t GetDataSize() const override { // 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 @@ -448,7 +448,7 @@ public: return strlen(m_url.utf8_str()) + 1; } - virtual bool GetDataHere(void *buf) const wxOVERRIDE + virtual bool GetDataHere(void *buf) const override { char* const dst = static_cast(buf); @@ -457,7 +457,7 @@ public: return true; } - virtual bool SetData(size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(size_t len, const void *buf) override { const char* const src = static_cast(buf); @@ -477,15 +477,15 @@ public: } // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE + virtual size_t GetDataSize(const wxDataFormat&) const override { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE + virtual bool GetDataHere(const wxDataFormat&, void *buf) const override { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override { return SetData(len, buf); } diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 8247831774..e73bff0fa7 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -1766,14 +1766,14 @@ public: wxGtkDataViewModelNotifier( wxDataViewModel *wx_model, wxDataViewCtrlInternal *internal ); ~wxGtkDataViewModelNotifier(); - 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; + virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) override; + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) override; + virtual bool ItemChanged( const wxDataViewItem &item ) override; + virtual bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ) override; + virtual bool Cleared() override; + virtual void Resort() override; + virtual bool BeforeReset() override; + virtual bool AfterReset() override; void UpdateLastCount(); diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index bb65558b45..8adfd0aeae 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -2175,8 +2175,8 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *win ) class wxDCModule : public wxModule { public: - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE; + bool OnInit() override; + void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxDCModule); diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp index 9b230b2ee0..595ddbb598 100644 --- a/src/gtk/display.cpp +++ b/src/gtk/display.cpp @@ -47,16 +47,16 @@ class wxDisplayImplGTK : public wxDisplayImpl typedef wxDisplayImpl base_type; public: wxDisplayImplGTK(unsigned i); - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - virtual double GetScaleFactor() const wxOVERRIDE; + virtual wxRect GetGeometry() const override; + virtual wxRect GetClientArea() const override; + virtual int GetDepth() const override; + virtual double GetScaleFactor() const override; #if wxUSE_DISPLAY - virtual bool IsPrimary() const wxOVERRIDE; - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual bool IsPrimary() const override; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const override; + virtual wxVideoMode GetCurrentMode() const override; + virtual bool ChangeMode(const wxVideoMode& mode) override; #endif // wxUSE_DISPLAY GdkMonitor* const m_monitor; @@ -67,10 +67,10 @@ public: class wxDisplayFactoryGTK: public wxDisplayFactory { public: - virtual wxDisplayImpl* CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; - virtual int GetFromWindow(const wxWindow* win) wxOVERRIDE; + virtual wxDisplayImpl* CreateDisplay(unsigned n) override; + virtual unsigned GetCount() override; + virtual int GetFromPoint(const wxPoint& pt) override; + virtual int GetFromWindow(const wxWindow* win) override; }; wxDisplayImpl* wxDisplayFactoryGTK::CreateDisplay(unsigned n) @@ -240,18 +240,18 @@ class wxDisplayImplGTK : public wxDisplayImpl typedef wxDisplayImpl base_type; public: wxDisplayImplGTK(unsigned i); - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; + virtual wxRect GetGeometry() const override; + virtual wxRect GetClientArea() const override; + virtual int GetDepth() const override; #if GTK_CHECK_VERSION(3,10,0) - virtual double GetScaleFactor() const wxOVERRIDE; + virtual double GetScaleFactor() const override; #endif // GTK+ 3.10 #if wxUSE_DISPLAY - virtual bool IsPrimary() const wxOVERRIDE; - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual bool IsPrimary() const override; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const override; + virtual wxVideoMode GetCurrentMode() const override; + virtual bool ChangeMode(const wxVideoMode& mode) override; #endif // wxUSE_DISPLAY GdkScreen* const m_screen; @@ -261,10 +261,10 @@ public: class wxDisplayFactoryGTK: public wxDisplayFactory { public: - virtual wxDisplayImpl* CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; - virtual int GetFromWindow(const wxWindow* win) wxOVERRIDE; + virtual wxDisplayImpl* CreateDisplay(unsigned n) override; + virtual unsigned GetCount() override; + virtual int GetFromPoint(const wxPoint& pt) override; + virtual int GetFromWindow(const wxWindow* win) override; }; wxGCC_WARNING_SUPPRESS(deprecated-declarations) diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index eb9751c85a..5648099dfe 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -152,7 +152,7 @@ class wxGUIEventLoopSourcesManager : public wxEventLoopSourcesManagerBase { public: virtual wxEventLoopSource* - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) wxOVERRIDE + AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) override { wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" ); diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index bb35ac8909..e4fa528860 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -524,8 +524,8 @@ class wxFcConfigDestroyModule : public wxModule public: wxFcConfigDestroyModule() { } - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE + bool OnInit() override { return true; } + void OnExit() override { if ( gs_fcConfig ) { diff --git a/src/gtk/image_gtk.cpp b/src/gtk/image_gtk.cpp index d046c16632..02215e3d55 100644 --- a/src/gtk/image_gtk.cpp +++ b/src/gtk/image_gtk.cpp @@ -25,8 +25,8 @@ struct BitmapProviderDefault: wxGtkImage::BitmapProvider { BitmapProviderDefault(wxWindow* win) : m_win(win) { } - virtual wxBitmap Get(int scale) const wxOVERRIDE; - virtual void Set(const wxBitmapBundle& bitmap) wxOVERRIDE; + virtual wxBitmap Get(int scale) const override; + virtual void Set(const wxBitmapBundle& bitmap) override; wxWindow* const m_win; @@ -54,7 +54,7 @@ void BitmapProviderDefault::Set(const wxBitmapBundle& bitmapBundle) struct BitmapProviderDefault: wxGtkImage::BitmapProvider { BitmapProviderDefault(wxWindow*) { } - virtual wxBitmap Get(int /*scale*/) const wxOVERRIDE { return wxBitmap(); } + virtual wxBitmap Get(int /*scale*/) const override { return wxBitmap(); } }; #endif // __WXGTK3__/!__WXGTK3__ diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp index 7d095a7cde..47862b83d7 100644 --- a/src/gtk/nonownedwnd.cpp +++ b/src/gtk/nonownedwnd.cpp @@ -86,10 +86,10 @@ public: { } - virtual bool CanBeDeleted() const wxOVERRIDE { return true; } + virtual bool CanBeDeleted() const override { return true; } private: - virtual bool DoSetShape(GdkWindow* window) wxOVERRIDE + virtual bool DoSetShape(GdkWindow* window) override { gdk_window_shape_combine_region(window, NULL, 0, 0); @@ -107,10 +107,10 @@ public: { } - virtual bool CanBeDeleted() const wxOVERRIDE { return true; } + virtual bool CanBeDeleted() const override { return true; } private: - virtual bool DoSetShape(GdkWindow* window) wxOVERRIDE + virtual bool DoSetShape(GdkWindow* window) override { gdk_window_shape_combine_region(window, m_region.GetRegion(), 0, 0); @@ -142,7 +142,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 wxOVERRIDE { return false; } + virtual bool CanBeDeleted() const override { return false; } private: wxBitmap CreateShapeBitmap(const wxGraphicsPath& path) @@ -170,7 +170,7 @@ private: return bmp; } - virtual bool DoSetShape(GdkWindow *window) wxOVERRIDE + virtual bool DoSetShape(GdkWindow *window) override { if (!m_mask) return false; diff --git a/src/gtk/notifmsg.cpp b/src/gtk/notifmsg.cpp index 074b32f812..c8782524ea 100644 --- a/src/gtk/notifmsg.cpp +++ b/src/gtk/notifmsg.cpp @@ -48,13 +48,13 @@ class wxLibnotifyModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { // We're initialized on demand. return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { if ( notify_is_initted() ) notify_uninit(); @@ -196,7 +196,7 @@ public: return true; } - virtual bool Show(int timeout) wxOVERRIDE + virtual bool Show(int timeout) override { if ( !CreateOrUpdateNotification() ) return false; @@ -244,7 +244,7 @@ public: return true; } - virtual bool Close() wxOVERRIDE + virtual bool Close() override { wxCHECK_MSG( m_notification, false, wxS("Can't close not shown notification.") ); @@ -260,32 +260,32 @@ public: return true; } - virtual void SetTitle(const wxString& title) wxOVERRIDE + virtual void SetTitle(const wxString& title) override { m_title = title; } - virtual void SetMessage(const wxString& message) wxOVERRIDE + virtual void SetMessage(const wxString& message) override { m_message = message; } - virtual void SetParent(wxWindow *WXUNUSED(parent)) wxOVERRIDE + virtual void SetParent(wxWindow *WXUNUSED(parent)) override { } - virtual void SetFlags(int flags) wxOVERRIDE + virtual void SetFlags(int flags) override { m_flags = flags; } - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE + virtual void SetIcon(const wxIcon& icon) override { m_icon = icon; CreateOrUpdateNotification(); } - virtual bool AddAction(wxWindowID actionid, const wxString &label) wxOVERRIDE + virtual bool AddAction(wxWindowID actionid, const wxString &label) override { if ( !CreateOrUpdateNotification() ) return false; diff --git a/src/gtk/overlay.cpp b/src/gtk/overlay.cpp index e4446077b2..5679b410e8 100644 --- a/src/gtk/overlay.cpp +++ b/src/gtk/overlay.cpp @@ -21,12 +21,12 @@ class wxOverlayImpl: public wxOverlay::Impl public: wxOverlayImpl(); ~wxOverlayImpl(); - virtual bool IsOk() wxOVERRIDE; - virtual void Init(wxDC* dc, int x, int y, int width, int height) wxOVERRIDE; - virtual void BeginDrawing(wxDC* dc) wxOVERRIDE; - virtual void EndDrawing(wxDC* dc) wxOVERRIDE; - virtual void Clear(wxDC* dc) wxOVERRIDE; - virtual void Reset() wxOVERRIDE; + virtual bool IsOk() override; + virtual void Init(wxDC* dc, int x, int y, int width, int height) override; + virtual void BeginDrawing(wxDC* dc) override; + virtual void EndDrawing(wxDC* dc) override; + virtual void Clear(wxDC* dc) override; + virtual void Reset() override; void PositionOverlay(GtkWidget* tlw); GtkWidget* m_overlay; diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index 614c5a2600..707cabcde0 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -228,8 +228,8 @@ public: wxGtkPrintModule() { } - bool OnInit() wxOVERRIDE; - void OnExit() wxOVERRIDE {} + bool OnInit() override; + void OnExit() override {} private: wxDECLARE_DYNAMIC_CLASS(wxGtkPrintModule); diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp index 2da06f8ab7..de4ab0460c 100644 --- a/src/gtk/private.cpp +++ b/src/gtk/private.cpp @@ -261,12 +261,12 @@ GtkWidget *GetTreeWidget() class WidgetsCleanupModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { if ( gs_container ) { diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index aca0f00f17..eeb9527d53 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -60,80 +60,80 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE; + wxHeaderButtonParams* params = NULL) override; - virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonHeight(wxWindow *win) override; - virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonMargin(wxWindow *win) override; // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawDropArrow(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0) wxOVERRIDE; + int flags=0) override; virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0) wxOVERRIDE; + int flags=0) override; virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0) wxOVERRIDE; + int flags=0) override; virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags=0) wxOVERRIDE; + int flags=0) override; - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) override; - virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) wxOVERRIDE; + virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) override; - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) override; }; // ============================================================================ diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 3047247737..58c0cd4939 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -1124,8 +1124,8 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) class wxSystemSettingsModule: public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override { return true; } + virtual void OnExit() override; wxDECLARE_DYNAMIC_CLASS(wxSystemSettingsModule); }; wxIMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule); diff --git a/src/gtk/sockgtk.cpp b/src/gtk/sockgtk.cpp index 834c85d383..0104380549 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) wxOVERRIDE + virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) override { 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)) wxOVERRIDE + RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d)) override { g_source_remove(fd); } diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp index 6abe626e73..2edf206294 100644 --- a/src/gtk/textentry.cpp +++ b/src/gtk/textentry.cpp @@ -440,7 +440,7 @@ public: return new wxTextAutoCompleteFixed(entry); } - virtual bool ChangeStrings(const wxArrayString& strings) wxOVERRIDE + virtual bool ChangeStrings(const wxArrayString& strings) override { wxGtkObject store(gtk_list_store_new (1, G_TYPE_STRING)); @@ -456,7 +456,7 @@ public: return true; } - virtual bool ChangeCompleter(wxTextCompleter*) wxOVERRIDE + virtual bool ChangeCompleter(wxTextCompleter*) override { return false; } @@ -494,13 +494,13 @@ public: m_win->Unbind(wxEVT_TEXT, &wxTextAutoCompleteDynamic::OnEntryChanged, this); } - virtual bool ChangeStrings(const wxArrayString&) wxOVERRIDE + virtual bool ChangeStrings(const wxArrayString&) override { return false; } // Takes ownership of the pointer which must be non-NULL. - virtual bool ChangeCompleter(wxTextCompleter *completer) wxOVERRIDE + virtual bool ChangeCompleter(wxTextCompleter *completer) override { delete m_completer; m_completer = completer; diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp index e185978635..4600b48cd9 100644 --- a/src/gtk/toolbar.cpp +++ b/src/gtk/toolbar.cpp @@ -56,7 +56,7 @@ public: void SetImage(); void CreateDropDown(); void ShowDropdown(GtkToggleButton* button); - virtual void SetLabel(const wxString& label) wxOVERRIDE; + virtual void SetLabel(const wxString& label) override; GtkToolItem* m_item; }; @@ -177,7 +177,7 @@ struct BitmapProvider: wxGtkImage::BitmapProvider { BitmapProvider(wxToolBarTool* tool) : m_tool(tool) { } - virtual wxBitmap Get(int scale) const wxOVERRIDE; + virtual wxBitmap Get(int scale) const override; wxToolBarTool* const m_tool; }; diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 464721a783..15cc2808ed 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -304,7 +304,7 @@ public: } protected: - virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE + virtual void OnStackFrame(const wxStackFrame& frame) override { const wxString name = frame.GetName(); if ( name.StartsWith("wxOnAssert") ) diff --git a/src/html/chm.cpp b/src/html/chm.cpp index 7927d282d6..dfe4835173 100644 --- a/src/html/chm.cpp +++ b/src/html/chm.cpp @@ -363,19 +363,19 @@ public: virtual ~wxChmInputStream(); /// Return the size of the accessed file in archive - virtual size_t GetSize() const wxOVERRIDE { return m_size; } + virtual size_t GetSize() const override { return m_size; } /// End of Stream? - virtual bool Eof() const wxOVERRIDE; + virtual bool Eof() const override; /// Set simulation-mode of HHP-File (if non is found) void SimulateHHP(bool sim) { m_simulateHHP = sim; } protected: /// See wxInputStream - virtual size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE; + virtual size_t OnSysRead(void *buffer, size_t bufsize) override; /// See wxInputStream - virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE; + virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) override; /// See wxInputStream - virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; } + virtual wxFileOffset OnSysTell() const override { return m_pos; } private: size_t m_size; @@ -754,16 +754,16 @@ class wxChmFSHandler : public wxFileSystemHandler public: /// Constructor and Destructor wxChmFSHandler(); - virtual ~wxChmFSHandler() wxOVERRIDE; + virtual ~wxChmFSHandler() override; /// Is able to open location? - virtual bool CanOpen(const wxString& location) wxOVERRIDE; + virtual bool CanOpen(const wxString& location) override; /// Open a file - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE; + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override; /// Find first occurrence of spec - virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE; + virtual wxString FindFirst(const wxString& spec, int flags = 0) override; /// Find next occurrence of spec - virtual wxString FindNext() wxOVERRIDE; + virtual wxString FindNext() override; private: int m_lasterror; @@ -901,12 +901,12 @@ class wxChmSupportModule : public wxModule wxDECLARE_DYNAMIC_CLASS(wxChmSupportModule); public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { wxFileSystem::AddHandler(new wxChmFSHandler); return true; } - virtual void OnExit() wxOVERRIDE {} + virtual void OnExit() override {} } ; diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index 10d4fd61ac..0fe07c378f 100644 --- a/src/html/helpdata.cpp +++ b/src/html/helpdata.cpp @@ -118,10 +118,10 @@ public: GetEntitiesParser()->SetEncoding(wxFONTENCODING_ISO8859_1); } - wxObject* GetProduct() wxOVERRIDE { return NULL; } + wxObject* GetProduct() override { return NULL; } protected: - virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE {} + virtual void AddText(const wxString& WXUNUSED(txt)) override {} wxDECLARE_NO_COPY_CLASS(HP_Parser); }; @@ -153,8 +153,8 @@ class HP_TagHandler : public wxHtmlTagHandler m_count = 0; m_parentItem = NULL; } - wxString GetSupportedTags() wxOVERRIDE { return wxT("UL,OBJECT,PARAM"); } - bool HandleTag(const wxHtmlTag& tag) wxOVERRIDE; + wxString GetSupportedTags() override { return wxT("UL,OBJECT,PARAM"); } + bool HandleTag(const wxHtmlTag& tag) override; void Reset(wxHtmlHelpDataItems& data) { diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index f302f38023..da5ca226e4 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -112,7 +112,7 @@ public: SetStandardFonts(); } - virtual bool LoadPage(const wxString& location) wxOVERRIDE + virtual bool LoadPage(const wxString& location) override { if ( !wxHtmlWindow::LoadPage(location) ) return false; diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 5d29c5bf7a..c73f32c29b 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -81,8 +81,8 @@ class wxHtmlFilterImage : public wxHtmlFilter wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterImage); public: - virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE; - virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE; + virtual bool CanRead(const wxFSFile& file) const override; + virtual wxString ReadFile(const wxFSFile& file) const override; }; wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter); @@ -188,13 +188,13 @@ class wxHtmlFilterModule : public wxModule wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterModule); public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { wxHtmlWindow::AddFilter(new wxHtmlFilterHTML); wxHtmlWindow::AddFilter(new wxHtmlFilterImage); return true; } - virtual void OnExit() wxOVERRIDE {} + virtual void OnExit() override {} }; wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule); diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index c60e15c824..721eb1edef 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -877,10 +877,10 @@ class wxMetaTagParser : public wxHtmlParser public: wxMetaTagParser() { } - wxObject* GetProduct() wxOVERRIDE { return NULL; } + wxObject* GetProduct() override { return NULL; } protected: - virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE {} + virtual void AddText(const wxString& WXUNUSED(txt)) override {} wxDECLARE_NO_COPY_CLASS(wxMetaTagParser); }; @@ -889,8 +889,8 @@ class wxMetaTagHandler : public wxHtmlTagHandler { public: wxMetaTagHandler(wxString *retval) : wxHtmlTagHandler(), m_retval(retval) {} - wxString GetSupportedTags() wxOVERRIDE { return wxT("META,BODY"); } - bool HandleTag(const wxHtmlTag& tag) wxOVERRIDE; + wxString GetSupportedTags() override { return wxT("META,BODY"); } + bool HandleTag(const wxHtmlTag& tag) override; private: wxString *m_retval; diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 4e37e60cd2..2b47ac829e 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -63,7 +63,7 @@ public: m_orient = orient; } - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; private: wxScrolledWindow *m_win; @@ -1918,8 +1918,8 @@ class wxHtmlWinModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxHtmlWinModule); public: wxHtmlWinModule() : wxModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxHtmlWindow::CleanUpStatics(); } + bool OnInit() override { return true; } + void OnExit() override { wxHtmlWindow::CleanUpStatics(); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule); diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 85d8c213d1..a982f628da 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -841,8 +841,8 @@ class wxHtmlPrintingModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule); public: wxHtmlPrintingModule() : wxModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxHtmlPrintout::CleanUpStatics(); } + bool OnInit() override { return true; } + void OnExit() override { wxHtmlPrintout::CleanUpStatics(); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule); diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 5ca48b237b..e426cd9f87 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -34,8 +34,8 @@ class wxHtmlLineCell : public wxHtmlCell public: wxHtmlLineCell(int size, bool shading) : wxHtmlCell() {m_Height = size; m_HasShading = shading;} void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info) wxOVERRIDE; - void Layout(int w) wxOVERRIDE + wxHtmlRenderingInfo& info) override; + void Layout(int w) override { m_Width = w; wxHtmlCell::Layout(w); } private: diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 221389d1c3..c4f7f77a08 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -60,11 +60,11 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell int radius; public: wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0); - virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const wxOVERRIDE; + virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const override; void Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {} + wxHtmlRenderingInfo& WXUNUSED(info)) override {} wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell); @@ -238,12 +238,12 @@ class wxHtmlImageMapCell : public wxHtmlCell protected: wxString m_Name; public: - virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const wxOVERRIDE; - virtual const wxHtmlCell *Find( int cond, const void *param ) const wxOVERRIDE; + virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const override; + virtual const wxHtmlCell *Find( int cond, const void *param ) const override; void Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {} + wxHtmlRenderingInfo& WXUNUSED(info)) override {} wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell); }; @@ -292,22 +292,22 @@ public: const wxString& mapname = wxEmptyString); virtual ~wxHtmlImageCell(); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info) wxOVERRIDE; - virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const wxOVERRIDE; + wxHtmlRenderingInfo& info) override; + virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const override; void SetImage(const wxImage& img, double scaleHDPI = 1.0); // If "alt" text is set, it will be used when converting this cell to text. void SetAlt(const wxString& alt); - virtual wxString ConvertToText(wxHtmlSelection *sel) const wxOVERRIDE; + virtual wxString ConvertToText(wxHtmlSelection *sel) const override; #if wxUSE_GIF && wxUSE_TIMER void AdvanceAnimation(wxTimer *timer); #endif - virtual void Layout(int w) wxOVERRIDE; + virtual void Layout(int w) override; - virtual wxString GetDescription() const wxOVERRIDE + virtual wxString GetDescription() const override { return wxString::Format("wxHtmlImageCell with bitmap of size %d*%d", m_bmpW, m_bmpH); @@ -340,7 +340,7 @@ class wxGIFTimer : public wxTimer { public: wxGIFTimer(wxHtmlImageCell *cell) : m_cell(cell) {} - virtual void Notify() wxOVERRIDE + virtual void Notify() override { m_cell->AdvanceAnimation(this); } diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index 1e17f78867..e66621cd26 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -62,12 +62,12 @@ class wxHtmlPageBreakCell : public wxHtmlCell public: wxHtmlPageBreakCell() {} - bool AdjustPagebreak(int* pagebreak, int pageHeight) const wxOVERRIDE; + bool AdjustPagebreak(int* pagebreak, int pageHeight) const override; void Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {} + wxHtmlRenderingInfo& WXUNUSED(info)) override {} private: wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell); diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp index 3473702d9e..f9e197f31e 100644 --- a/src/html/m_links.cpp +++ b/src/html/m_links.cpp @@ -33,9 +33,9 @@ public: void Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {} + wxHtmlRenderingInfo& WXUNUSED(info)) override {} - virtual const wxHtmlCell* Find(int condition, const void* param) const wxOVERRIDE + virtual const wxHtmlCell* Find(int condition, const void* param) const override { if ((condition == wxHTML_COND_ISANCHOR) && (m_AnchorName == (*((const wxString*)param)))) diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp index 288ecba1f6..7fecfc8722 100644 --- a/src/html/m_list.cpp +++ b/src/html/m_list.cpp @@ -35,7 +35,7 @@ class wxHtmlListmarkCell : public wxHtmlCell public: wxHtmlListmarkCell(wxDC *dc, const wxColour& clr); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info) wxOVERRIDE; + wxHtmlRenderingInfo& info) override; wxDECLARE_NO_COPY_CLASS(wxHtmlListmarkCell); }; @@ -87,7 +87,7 @@ class wxHtmlListCell : public wxHtmlContainerCell wxHtmlListCell(wxHtmlContainerCell *parent); virtual ~wxHtmlListCell(); void AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont); - virtual void Layout(int w) wxOVERRIDE; + virtual void Layout(int w) override; wxDECLARE_NO_COPY_CLASS(wxHtmlListCell); }; @@ -202,7 +202,7 @@ class wxHtmlListcontentCell : public wxHtmlContainerCell { public: wxHtmlListcontentCell(wxHtmlContainerCell *p) : wxHtmlContainerCell(p) {} - virtual void Layout(int w) wxOVERRIDE { + virtual void Layout(int w) override { // Reset top indentation, fixes

  • SetIndent(0, wxHTML_INDENT_TOP); wxHtmlContainerCell::Layout(w); diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 6430d5e2f8..e7a1eafeec 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -96,9 +96,9 @@ public: wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); virtual ~wxHtmlTableCell(); - virtual void RemoveExtraSpacing(bool top, bool bottom) wxOVERRIDE; + virtual void RemoveExtraSpacing(bool top, bool bottom) override; - virtual void Layout(int w) wxOVERRIDE; + virtual void Layout(int w) override; void AddRow(const wxHtmlTag& tag); void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag); diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp index f415e161f5..d2bc403780 100644 --- a/src/msw/anybutton.cpp +++ b/src/msw/anybutton.cpp @@ -206,32 +206,32 @@ public: } } - virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE + virtual wxBitmap GetBitmap(wxAnyButton::State which) const override { return m_bitmaps[which]; } - virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) wxOVERRIDE + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) override { m_bitmaps[which] = bitmap; } - virtual wxSize GetBitmapMargins() const wxOVERRIDE + virtual wxSize GetBitmapMargins() const override { return m_margin; } - virtual void SetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE + virtual void SetBitmapMargins(wxCoord x, wxCoord y) override { m_margin = wxSize(x, y); } - virtual wxDirection GetBitmapPosition() const wxOVERRIDE + virtual wxDirection GetBitmapPosition() const override { return m_dir; } - virtual void SetBitmapPosition(wxDirection dir) wxOVERRIDE + virtual void SetBitmapPosition(wxDirection dir) override { m_dir = dir; } @@ -258,7 +258,7 @@ private: } } - void OnDPIChanged(wxDPIChangedEvent& event) wxOVERRIDE + void OnDPIChanged(wxDPIChangedEvent& event) override { wxButtonImageData::OnDPIChanged(event); @@ -302,12 +302,12 @@ public: UpdateImageInfo(); } - virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE + virtual wxBitmap GetBitmap(wxAnyButton::State which) const override { return m_iml.GetBitmap(which); } - virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) wxOVERRIDE + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) override { m_iml.Replace(which, bitmap); @@ -319,19 +319,19 @@ public: UpdateImageInfo(); } - virtual wxSize GetBitmapMargins() const wxOVERRIDE + virtual wxSize GetBitmapMargins() const override { return wxSize(m_data.margin.left, m_data.margin.top); } - virtual void SetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE + virtual void SetBitmapMargins(wxCoord x, wxCoord y) override { ::SetRect(&m_data.margin, x, y, x, y); UpdateImageInfo(); } - virtual wxDirection GetBitmapPosition() const wxOVERRIDE + virtual wxDirection GetBitmapPosition() const override { switch ( m_data.uAlign ) { @@ -353,7 +353,7 @@ public: } } - virtual void SetBitmapPosition(wxDirection dir) wxOVERRIDE + virtual void SetBitmapPosition(wxDirection dir) override { UINT alignNew; switch ( dir ) @@ -441,7 +441,7 @@ private: } } - void OnDPIChanged(wxDPIChangedEvent& event) wxOVERRIDE + void OnDPIChanged(wxDPIChangedEvent& event) override { wxButtonImageData::OnDPIChanged(event); diff --git a/src/msw/app.cpp b/src/msw/app.cpp index d8b19f0295..26630d7052 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -153,12 +153,12 @@ public: { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return wxOleInitialize(); } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxOleUninitialize(); } diff --git a/src/msw/artmsw.cpp b/src/msw/artmsw.cpp index 9b930e4851..4ff76f5429 100644 --- a/src/msw/artmsw.cpp +++ b/src/msw/artmsw.cpp @@ -200,7 +200,7 @@ class wxWindowsArtProvider : public wxArtProvider { protected: virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE; + const wxSize& size) override; }; wxBitmap wxWindowsArtProvider::CreateBitmap(const wxArtID& id, diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index ab6de0841f..9a5c7a7d8b 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -67,7 +67,7 @@ public: wxBitmapRefData(const wxBitmapRefData& data); virtual ~wxBitmapRefData() { Free(); } - virtual void Free() wxOVERRIDE; + virtual void Free() override; #if wxUSE_WXDIB // Creates a new bitmap (DDB or DIB) from the contents of the given DIB. diff --git a/src/msw/bmpbndl.cpp b/src/msw/bmpbndl.cpp index 11bea81577..5466fd1780 100644 --- a/src/msw/bmpbndl.cpp +++ b/src/msw/bmpbndl.cpp @@ -140,12 +140,12 @@ public: wxBitmapBundleImplRC(const ResourceInfos& resourceInfos, const wxBitmap& bitmap); - virtual wxSize GetDefaultSize() const wxOVERRIDE; - virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE; - virtual wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE; + virtual wxSize GetDefaultSize() const override; + virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const override; + virtual wxBitmap GetBitmap(const wxSize& size) override; protected: - virtual double GetNextAvailableScale(size_t& i) const wxOVERRIDE; + virtual double GetNextAvailableScale(size_t& i) const override; private: // Load the bitmap from the given resource and add it m_bitmaps, after diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 8f16bdb5f3..da32d9870c 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -78,7 +78,7 @@ public: wxCheckListBoxItem(wxCheckListBox *parent); // drawing functions - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) wxOVERRIDE; + virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) override; // simple accessors and operations wxCheckListBox *GetParent() const @@ -87,7 +87,7 @@ public: int GetIndex() const { return m_parent->GetItemIndex(const_cast(this)); } - wxString GetName() const wxOVERRIDE + wxString GetName() const override { return m_parent->GetString(GetIndex()); } @@ -101,7 +101,7 @@ public: { Check(!IsChecked()); } protected: - virtual int MSWGetTextType() const wxOVERRIDE + virtual int MSWGetTextType() const override { // Don't handle mnemonics in the label specially, they don't make sense // for the listbox items that can't be activated from keyboard using diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 6b7b9c5019..bd2ab60110 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -52,7 +52,7 @@ public: virtual ~wxCursorRefData() { Free(); } - virtual void Free() wxOVERRIDE; + virtual void Free() override; // return the size of the standard cursor: notice that the system only @@ -85,14 +85,14 @@ static wxCursor *gs_globalCursor = NULL; class wxCursorModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { gs_globalCursor = new wxCursor; return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxDELETE(gs_globalCursor); } diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 8646f9b822..585ce0b988 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -212,8 +212,8 @@ static bool gs_triedToLoadSetLayout = false; class wxGDIDLLsCleanupModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxMSIMG32DLL.Unload(); wxGDI32DLL.Unload(); @@ -2876,8 +2876,8 @@ void wxMSWDCImpl::ClearCache() class wxDCModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxMSWDCImpl::ClearCache(); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxMSWDCImpl::ClearCache(); } private: wxDECLARE_DYNAMIC_CLASS(wxDCModule); diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index f5383d4879..6521df5669 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -117,8 +117,8 @@ class wxDDEModule : public wxModule { public: wxDDEModule() {} - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxDDECleanUp(); } + bool OnInit() override { return true; } + void OnExit() override { wxDDECleanUp(); } private: wxDECLARE_DYNAMIC_CLASS(wxDDEModule); diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 77e9b8d582..74b02a6eae 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -152,23 +152,23 @@ public: virtual ~wxDialUpManagerMSW(); // implement base class pure virtuals - virtual bool IsOk() const wxOVERRIDE; - virtual size_t GetISPNames(wxArrayString& names) const wxOVERRIDE; + virtual bool IsOk() const override; + virtual size_t GetISPNames(wxArrayString& names) const override; virtual bool Dial(const wxString& nameOfISP, const wxString& username, const wxString& password, - bool async) wxOVERRIDE; - virtual bool IsDialing() const wxOVERRIDE; - virtual bool CancelDialing() wxOVERRIDE; - virtual bool HangUp() wxOVERRIDE; - virtual bool IsAlwaysOnline() const wxOVERRIDE; - virtual bool IsOnline() const wxOVERRIDE; - virtual void SetOnlineStatus(bool isOnline = true) wxOVERRIDE; - virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds) wxOVERRIDE; - virtual void DisableAutoCheckOnlineStatus() wxOVERRIDE; - virtual void SetWellKnownHost(const wxString& hostname, int port) wxOVERRIDE; + bool async) override; + virtual bool IsDialing() const override; + virtual bool CancelDialing() override; + virtual bool HangUp() override; + virtual bool IsAlwaysOnline() const override; + virtual bool IsOnline() const override; + virtual void SetOnlineStatus(bool isOnline = true) override; + virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds) override; + virtual void DisableAutoCheckOnlineStatus() override; + virtual void SetWellKnownHost(const wxString& hostname, int port) override; virtual void SetConnectCommand(const wxString& commandDial, - const wxString& commandHangup) wxOVERRIDE; + const wxString& commandHangup) override; // for RasTimer void CheckRasStatus(); @@ -206,7 +206,7 @@ private: RasTimer(wxDialUpManagerMSW *dialUpManager) { m_dialUpManager = dialUpManager; } - virtual void Notify() wxOVERRIDE { m_dialUpManager->CheckRasStatus(); } + virtual void Notify() override { m_dialUpManager->CheckRasStatus(); } private: wxDialUpManagerMSW *m_dialUpManager; @@ -267,8 +267,8 @@ private: class wxDialUpManagerModule : public wxModule { public: - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE + bool OnInit() override { return true; } + void OnExit() override { HWND hwnd = wxDialUpManagerMSW::GetRasWindow(); if ( hwnd ) diff --git a/src/msw/display.cpp b/src/msw/display.cpp index f220fc8ac5..5869c99937 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -41,7 +41,7 @@ int wxGetHDCDepth(HDC hdc) class wxDisplayImplSingleMSW : public wxDisplayImplSingle { public: - virtual wxRect GetGeometry() const wxOVERRIDE + virtual wxRect GetGeometry() const override { ScreenHDC dc; @@ -50,7 +50,7 @@ public: ::GetDeviceCaps(dc, VERTRES)); } - virtual wxRect GetClientArea() const wxOVERRIDE + virtual wxRect GetClientArea() const override { RECT rc; SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0); @@ -60,7 +60,7 @@ public: return rectClient; } - virtual int GetDepth() const wxOVERRIDE + virtual int GetDepth() const override { return wxGetHDCDepth(ScreenHDC()); } @@ -69,7 +69,7 @@ public: class wxDisplayFactorySingleMSW : public wxDisplayFactorySingle { protected: - virtual wxDisplayImpl *CreateSingleDisplay() wxOVERRIDE + virtual wxDisplayImpl *CreateSingleDisplay() override { return new wxDisplayImplSingleMSW; } @@ -127,18 +127,18 @@ public: { } - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - virtual wxSize GetPPI() const wxOVERRIDE; - virtual double GetScaleFactor() const wxOVERRIDE; + virtual wxRect GetGeometry() const override; + virtual wxRect GetClientArea() const override; + virtual int GetDepth() const override; + virtual wxSize GetPPI() const override; + virtual double GetScaleFactor() const override; - virtual wxString GetName() const wxOVERRIDE; - virtual bool IsPrimary() const wxOVERRIDE; + virtual wxString GetName() const override; + virtual bool IsPrimary() const override; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual wxVideoMode GetCurrentMode() const override; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const override; + virtual bool ChangeMode(const wxVideoMode& mode) override; protected: // convert a DEVMODE to our wxVideoMode @@ -177,12 +177,12 @@ public: bool IsOk() const { return !m_displays.empty(); } - virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE { return unsigned(m_displays.size()); } - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; - virtual int GetFromWindow(const wxWindow *window) wxOVERRIDE; + virtual wxDisplayImpl *CreateDisplay(unsigned n) override; + virtual unsigned GetCount() override { return unsigned(m_displays.size()); } + virtual int GetFromPoint(const wxPoint& pt) override; + virtual int GetFromWindow(const wxWindow *window) override; - void InvalidateCache() wxOVERRIDE + void InvalidateCache() override { wxDisplayFactory::InvalidateCache(); DoRefreshMonitors(); diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp index c1f2e2f7ef..7d9a9fc1a6 100644 --- a/src/msw/enhmeta.cpp +++ b/src/msw/enhmeta.cpp @@ -224,17 +224,17 @@ public: const wxString& description ); virtual ~wxEnhMetaFileDCImpl(); - wxSize FromDIP(const wxSize& sz) const wxOVERRIDE + wxSize FromDIP(const wxSize& sz) const override { return sz; } - virtual wxSize ToDIP(const wxSize& sz) const wxOVERRIDE + virtual wxSize ToDIP(const wxSize& sz) const override { return sz; } - void SetFont(const wxFont& font) wxOVERRIDE + void SetFont(const wxFont& font) override { wxFont scaledFont = font; if (scaledFont.IsOk()) @@ -246,7 +246,7 @@ public: wxEnhMetaFile *Close(); protected: - virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; + virtual void DoGetSize(int *width, int *height) const override; private: void Create(HDC hdcRef, diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index a298bdaaab..37e58666a7 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -261,12 +261,12 @@ public: { } - virtual void Show(bool show) wxOVERRIDE + virtual void Show(bool show) override { DoUpdateState(CDCS_VISIBLE, show); } - virtual void Enable(bool enable) wxOVERRIDE + virtual void Enable(bool enable) override { DoUpdateState(CDCS_ENABLED, enable); } @@ -294,7 +294,7 @@ public: { } - virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) override { // We don't need to do anything special to get the events here. return true; @@ -310,7 +310,7 @@ public: { } - virtual bool GetValue() wxOVERRIDE + virtual bool GetValue() override { BOOL checked = FALSE; HRESULT hr = m_fdc->GetCheckButtonState(m_id, &checked); @@ -320,14 +320,14 @@ public: return checked != FALSE; } - virtual void SetValue(bool value) wxOVERRIDE + virtual void SetValue(bool value) override { HRESULT hr = m_fdc->SetCheckButtonState(m_id, value ? TRUE : FALSE); if ( FAILED(hr) ) wxLogApiError(wxS("IFileDialogCustomize::SetCheckButtonState"), hr); } - virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) override { // We don't need to do anything special to get the events here. return true; @@ -344,7 +344,7 @@ public: { } - virtual bool GetValue() wxOVERRIDE + virtual bool GetValue() override { DWORD selected = 0; HRESULT hr = m_fdc->GetSelectedControlItem(m_id, &selected); @@ -354,7 +354,7 @@ public: return selected == m_item; } - virtual void SetValue(bool value) wxOVERRIDE + virtual void SetValue(bool value) override { // We can't implement it using the available API and this shouldn't be // ever needed anyhow. @@ -365,7 +365,7 @@ public: wxLogApiError(wxS("IFileDialogCustomize::SetSelectedControlItem"), hr); } - virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) override { // We don't need to do anything special to get the events here. return true; @@ -385,7 +385,7 @@ public: { } - virtual int GetSelection() wxOVERRIDE + virtual int GetSelection() override { DWORD selected = 0; HRESULT hr = m_fdc->GetSelectedControlItem(m_id, &selected); @@ -402,7 +402,7 @@ public: return m_firstItem - selected; } - virtual void SetSelection(int n) wxOVERRIDE + virtual void SetSelection(int n) override { // As above, see m_firstItem comment. HRESULT hr = m_fdc->SetSelectedControlItem(m_id, m_firstItem - n); @@ -410,7 +410,7 @@ public: wxLogApiError(wxS("IFileDialogCustomize::SetSelectedControlItem"), hr); } - virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) wxOVERRIDE + virtual bool DoBind(wxEvtHandler* WXUNUSED(handler)) override { // We don't need to do anything special to get the events here. return true; @@ -432,7 +432,7 @@ public: { } - virtual wxString GetValue() wxOVERRIDE + virtual wxString GetValue() override { wxCoTaskMemPtr value; HRESULT hr = m_fdc->GetEditBoxText(m_id, &value); @@ -442,7 +442,7 @@ public: return wxString(value); } - virtual void SetValue(const wxString& value) wxOVERRIDE + virtual void SetValue(const wxString& value) override { HRESULT hr = m_fdc->SetEditBoxText(m_id, value.wc_str()); if ( FAILED(hr) ) @@ -459,7 +459,7 @@ public: { } - virtual void SetLabelText(const wxString& text) wxOVERRIDE + virtual void SetLabelText(const wxString& text) override { // Prevent ampersands from being misinterpreted as mnemonics. const wxString& label = wxControl::EscapeMnemonics(text); @@ -514,7 +514,7 @@ public: // Implement wxFileDialogCustomizeImpl pure virtual methods. - wxFileDialogButtonImpl* AddButton(const wxString& label) wxOVERRIDE + wxFileDialogButtonImpl* AddButton(const wxString& label) override { m_radioListId = 0; @@ -528,7 +528,7 @@ public: return new wxFileDialogButtonImplFDC(m_fdc, m_lastId); } - wxFileDialogCheckBoxImpl* AddCheckBox(const wxString& label) wxOVERRIDE + wxFileDialogCheckBoxImpl* AddCheckBox(const wxString& label) override { m_radioListId = 0; @@ -542,7 +542,7 @@ public: return new wxFileDialogCheckBoxImplFDC(m_fdc, m_lastId); } - wxFileDialogRadioButtonImpl* AddRadioButton(const wxString& label) wxOVERRIDE + wxFileDialogRadioButtonImpl* AddRadioButton(const wxString& label) override { HRESULT hr; @@ -577,7 +577,7 @@ public: return impl; } - wxFileDialogChoiceImpl* AddChoice(size_t n, const wxString* strings) wxOVERRIDE + wxFileDialogChoiceImpl* AddChoice(size_t n, const wxString* strings) override { HRESULT hr = m_fdc->AddComboBox(++m_lastId); if ( FAILED(hr) ) @@ -604,7 +604,7 @@ public: return impl.release(); } - wxFileDialogTextCtrlImpl* AddTextCtrl(const wxString& label) wxOVERRIDE + wxFileDialogTextCtrlImpl* AddTextCtrl(const wxString& label) override { m_radioListId = 0; @@ -634,7 +634,7 @@ public: return new wxFileDialogTextCtrlImplFDC(m_fdc, m_lastId); } - wxFileDialogStaticTextImpl* AddStaticText(const wxString& label) wxOVERRIDE + wxFileDialogStaticTextImpl* AddStaticText(const wxString& label) override { m_radioListId = 0; @@ -764,7 +764,7 @@ public: // IFileDialogEvents - wxSTDMETHODIMP OnFileOk(IFileDialog*) wxOVERRIDE + wxSTDMETHODIMP OnFileOk(IFileDialog*) override { // Note that we need to call this hook function from here as the // controls are destroyed later and getting their values wouldn't work @@ -774,10 +774,10 @@ public: return S_OK; } - wxSTDMETHODIMP OnFolderChanging(IFileDialog*, IShellItem*) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP OnFolderChange(IFileDialog*) wxOVERRIDE { return E_NOTIMPL; } + wxSTDMETHODIMP OnFolderChanging(IFileDialog*, IShellItem*) override { return E_NOTIMPL; } + wxSTDMETHODIMP OnFolderChange(IFileDialog*) override { return E_NOTIMPL; } - wxSTDMETHODIMP OnSelectionChange(IFileDialog* pfd) wxOVERRIDE + wxSTDMETHODIMP OnSelectionChange(IFileDialog* pfd) override { wxCOMPtr item; HRESULT hr = pfd->GetCurrentSelection(&item); @@ -794,9 +794,9 @@ public: return S_OK; } - wxSTDMETHODIMP OnShareViolation(IFileDialog*, IShellItem*, FDE_SHAREVIOLATION_RESPONSE*) wxOVERRIDE { return E_NOTIMPL; } + wxSTDMETHODIMP OnShareViolation(IFileDialog*, IShellItem*, FDE_SHAREVIOLATION_RESPONSE*) override { return E_NOTIMPL; } - wxSTDMETHODIMP OnTypeChange(IFileDialog* pfd) wxOVERRIDE + wxSTDMETHODIMP OnTypeChange(IFileDialog* pfd) override { // There is no special notification for the dialog initialization, but // this function is always called when it's shown, so use it for @@ -821,7 +821,7 @@ public: return S_OK; } - wxSTDMETHODIMP OnOverwrite(IFileDialog*, IShellItem*, FDE_OVERWRITE_RESPONSE*) wxOVERRIDE { return E_NOTIMPL; } + wxSTDMETHODIMP OnOverwrite(IFileDialog*, IShellItem*, FDE_OVERWRITE_RESPONSE*) override { return E_NOTIMPL; } // IFileDialogControlEvents @@ -829,7 +829,7 @@ public: wxSTDMETHODIMP OnItemSelected(IFileDialogCustomize*, DWORD WXUNUSED(dwIDCtl), - DWORD dwIDItem) wxOVERRIDE + DWORD dwIDItem) override { // Note that we don't use dwIDCtl here because we use unique item IDs // for all controls. @@ -847,7 +847,7 @@ public: } wxSTDMETHODIMP - OnButtonClicked(IFileDialogCustomize*, DWORD dwIDCtl) wxOVERRIDE + OnButtonClicked(IFileDialogCustomize*, DWORD dwIDCtl) override { if ( wxFileDialogCustomControl* const control = m_customize.FindControl(dwIDCtl) ) @@ -864,7 +864,7 @@ public: wxSTDMETHODIMP OnCheckButtonToggled(IFileDialogCustomize*, DWORD dwIDCtl, - BOOL bChecked) wxOVERRIDE + BOOL bChecked) override { if ( wxFileDialogCustomControl* const control = m_customize.FindControl(dwIDCtl) ) @@ -881,7 +881,7 @@ public: wxSTDMETHODIMP OnControlActivating(IFileDialogCustomize*, - DWORD WXUNUSED(dwIDCtl)) wxOVERRIDE + DWORD WXUNUSED(dwIDCtl)) override { return S_OK; } diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 434876939c..df4bd8256e 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -1110,8 +1110,8 @@ class wxPrivateFontsListModule : public wxModule public: wxPrivateFontsListModule() { } - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { gs_privateFontFileNames.clear(); } + bool OnInit() override { return true; } + void OnExit() override { gs_privateFontFileNames.clear(); } private: wxDECLARE_DYNAMIC_CLASS(wxPrivateFontsListModule); diff --git a/src/msw/fswatcher.cpp b/src/msw/fswatcher.cpp index bd4fc64c0b..8a35eff451 100644 --- a/src/msw/fswatcher.cpp +++ b/src/msw/fswatcher.cpp @@ -36,12 +36,12 @@ public: void SendEvent(wxFileSystemWatcherEvent& evt); protected: - bool Init() wxOVERRIDE; + bool Init() override; // adds watch to be monitored for file system changes - virtual bool DoAdd(wxSharedPtr watch) wxOVERRIDE; + virtual bool DoAdd(wxSharedPtr watch) override; - virtual bool DoRemove(wxSharedPtr watch) wxOVERRIDE; + virtual bool DoRemove(wxSharedPtr watch) override; private: bool DoSetUpWatch(wxFSWatchEntryMSW& watch); diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 112d219cc6..d5275f549a 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -69,10 +69,10 @@ public: virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, wxBitmapType flags, - int desiredWidth, int desiredHeight) wxOVERRIDE; + int desiredWidth, int desiredHeight) override; virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, wxBitmapType type, - const wxPalette *palette = NULL) const wxOVERRIDE; + const wxPalette *palette = NULL) const override; private: wxDECLARE_DYNAMIC_CLASS(wxBMPFileHandler); @@ -89,7 +89,7 @@ public: virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, wxBitmapType flags, - int desiredWidth, int desiredHeight) wxOVERRIDE; + int desiredWidth, int desiredHeight) override; private: wxDECLARE_DYNAMIC_CLASS(wxBMPResourceHandler); @@ -109,14 +109,14 @@ public: wxBitmapType WXUNUSED(flags), int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(depth) = 1) wxOVERRIDE + int WXUNUSED(depth) = 1) override { return false; } virtual bool Save(const wxGDIImage *WXUNUSED(image), const wxString& WXUNUSED(name), - wxBitmapType WXUNUSED(type)) const wxOVERRIDE + wxBitmapType WXUNUSED(type)) const override { return false; } @@ -124,7 +124,7 @@ public: virtual bool Load(wxGDIImage *image, const wxString& name, wxBitmapType flags, - int desiredWidth, int desiredHeight) wxOVERRIDE + int desiredWidth, int desiredHeight) override { wxIcon *icon = wxDynamicCast(image, wxIcon); wxCHECK_MSG( icon, false, wxT("wxIconHandler only works with icons") ); @@ -150,7 +150,7 @@ public: protected: virtual bool LoadIcon(wxIcon *icon, const wxString& name, wxBitmapType flags, - int desiredWidth = -1, int desiredHeight = -1) wxOVERRIDE; + int desiredWidth = -1, int desiredHeight = -1) override; private: wxDECLARE_DYNAMIC_CLASS(wxICOFileHandler); @@ -168,7 +168,7 @@ public: protected: virtual bool LoadIcon(wxIcon *icon, const wxString& name, wxBitmapType flags, - int desiredWidth = -1, int desiredHeight = -1) wxOVERRIDE; + int desiredWidth = -1, int desiredHeight = -1) override; private: wxDECLARE_DYNAMIC_CLASS(wxICOResourceHandler); @@ -187,7 +187,7 @@ public: virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, wxBitmapType flags, - int desiredWidth, int desiredHeight) wxOVERRIDE; + int desiredWidth, int desiredHeight) override; private: wxDECLARE_DYNAMIC_CLASS(wxPNGResourceHandler); diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp index 4112015f05..675d389123 100644 --- a/src/msw/gdiplus.cpp +++ b/src/msw/gdiplus.cpp @@ -858,8 +858,8 @@ bool wxGdiPlus::DoInit() class wxGdiPlusModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxGdiPlus::Terminate(); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxGdiPlus::Terminate(); } wxDECLARE_DYNAMIC_CLASS(wxGdiPlusModule); }; diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index 0d963eb02e..a9e9231084 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -138,33 +138,33 @@ public : wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL); ~wxGDIPlusPathData(); - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE; + virtual wxGraphicsObjectRefData *Clone() const override; // // These are the path primitives from which everything else can be constructed // // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void MoveToPoint( wxDouble x, wxDouble y ) override; // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddLineToPoint( wxDouble x, wxDouble y ) override; // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) override; // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) wxOVERRIDE; + virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) override; // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const wxOVERRIDE; + virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const override; // adds another path - virtual void AddPath( const wxGraphicsPathData* path ) wxOVERRIDE; + virtual void AddPath( const wxGraphicsPathData* path ) override; // closes the current sub-path - virtual void CloseSubpath() wxOVERRIDE; + virtual void CloseSubpath() override; // // These are convenience functions which - if not available natively will be assembled @@ -172,13 +172,13 @@ public : // // appends a rectangle as a new closed subpath - virtual void AddRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void AddRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; // appends a circle as a new closed subpath - virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) wxOVERRIDE; + virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) override; // appends an ellipse as a new closed subpath fitting the passed rectangle - virtual void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; /* // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) @@ -186,18 +186,18 @@ public : */ // returns the native path - virtual void * GetNativePath() const wxOVERRIDE { return m_path; } + virtual void * GetNativePath() const override { return m_path; } // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void * WXUNUSED(path)) const wxOVERRIDE {} + virtual void UnGetNativePath(void * WXUNUSED(path)) const override {} // transforms each point of this path by the matrix - virtual void Transform( const wxGraphicsMatrixData* matrix ) wxOVERRIDE; + virtual void Transform( const wxGraphicsMatrixData* matrix ) override; // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE; + virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const override; - virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const wxOVERRIDE; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const override; private : GraphicsPath* m_path; @@ -213,53 +213,53 @@ public : wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ; virtual ~wxGDIPlusMatrixData() ; - virtual wxGraphicsObjectRefData* Clone() const wxOVERRIDE; + virtual wxGraphicsObjectRefData* Clone() const override; // concatenates the matrix - virtual void Concat( const wxGraphicsMatrixData *t ) wxOVERRIDE; + virtual void Concat( const wxGraphicsMatrixData *t ) override; // sets the matrix to the respective values virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; + wxDouble tx=0.0, wxDouble ty=0.0) override; // gets the component valuess of the matrix virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, - wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const wxOVERRIDE; + wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const override; // makes this the inverse matrix - virtual void Invert() wxOVERRIDE; + virtual void Invert() override; // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrixData* t) const wxOVERRIDE; + virtual bool IsEqual( const wxGraphicsMatrixData* t) const override; // return true if this is the identity matrix - virtual bool IsIdentity() const wxOVERRIDE; + virtual bool IsIdentity() const override; // // transformation // // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; + virtual void Translate( wxDouble dx , wxDouble dy ) override; // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; + virtual void Scale( wxDouble xScale , wxDouble yScale ) override; // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) wxOVERRIDE; + virtual void Rotate( wxDouble angle ) override; // // apply the transforms // // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) const wxOVERRIDE; + virtual void TransformPoint( wxDouble *x, wxDouble *y ) const override; // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const wxOVERRIDE; + virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const override; // returns the native representation - virtual void * GetNativeMatrix() const wxOVERRIDE; + virtual void * GetNativeMatrix() const override; private: Matrix* m_matrix ; } ; @@ -305,7 +305,7 @@ public: wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxGraphicsPenInfo &info ); ~wxGDIPlusPenData(); - virtual void Init() wxOVERRIDE; + virtual void Init() override; virtual wxDouble GetWidth() { return m_width; } virtual Pen* GetGDIPlusPen() { return m_pen; } @@ -336,7 +336,7 @@ public: ~wxGDIPlusBitmapData (); virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; } - virtual void* GetNativeBitmap() const wxOVERRIDE { return m_bitmap; } + virtual void* GetNativeBitmap() const override { return m_bitmap; } #if wxUSE_IMAGE wxImage ConvertToImage() const; @@ -415,76 +415,76 @@ public: virtual ~wxGDIPlusContext(); - virtual void Clip( const wxRegion ®ion ) wxOVERRIDE; + virtual void Clip( const wxRegion ®ion ) override; // clips drawings to the rect - virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; // resets the clipping to original extent - virtual void ResetClip() wxOVERRIDE; + virtual void ResetClip() override; // returns bounding box of the clipping region - virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) wxOVERRIDE; + virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) override; - virtual void * GetNativeContext() wxOVERRIDE; + virtual void * GetNativeContext() override; - virtual void StrokePath( const wxGraphicsPath& p ) wxOVERRIDE; - virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE; + virtual void StrokePath( const wxGraphicsPath& p ) override; + virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) override; - virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; // stroke lines connecting each of the points - virtual void StrokeLines( size_t n, const wxPoint2DDouble *points) wxOVERRIDE; + virtual void StrokeLines( size_t n, const wxPoint2DDouble *points) override; // We don't have any specific implementation for this one in wxMSW but // override it just to avoid warnings about hiding the base class virtual. - virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints) wxOVERRIDE + virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints) override { wxGraphicsContext::StrokeLines(n, beginPoints, endPoints); } // draws a polygon - virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE; + virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) override; - virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE; + virtual bool SetAntialiasMode(wxAntialiasMode antialias) override; - virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE; + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) override; - virtual bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE; + virtual bool SetCompositionMode(wxCompositionMode op) override; - virtual void BeginLayer(wxDouble opacity) wxOVERRIDE; + virtual void BeginLayer(wxDouble opacity) override; - virtual void EndLayer() wxOVERRIDE; + virtual void EndLayer() override; - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; - virtual void Rotate( wxDouble angle ) wxOVERRIDE; + virtual void Translate( wxDouble dx , wxDouble dy ) override; + virtual void Scale( wxDouble xScale , wxDouble yScale ) override; + virtual void Rotate( wxDouble angle ) override; // concatenates this transform with the current transform of this context - virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; + virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) override; // sets the transform of this context - virtual void SetTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; + virtual void SetTransform( const wxGraphicsMatrix& matrix ) override; // gets the matrix of this context - virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE; + virtual wxGraphicsMatrix GetTransform() const override; - virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; - virtual void PushState() wxOVERRIDE; - virtual void PopState() wxOVERRIDE; + virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; + virtual void PushState() override; + virtual void PopState() override; virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const wxOVERRIDE; - virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE; - virtual bool ShouldOffset() const wxOVERRIDE; + wxDouble *descent, wxDouble *externalLeading ) const override; + virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const override; + virtual bool ShouldOffset() const override; virtual void GetSize( wxDouble* width, wxDouble *height ); - virtual void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const wxOVERRIDE; + virtual void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const override; Graphics* GetGraphics() const { return m_context; } - virtual WXHDC GetNativeHDC() wxOVERRIDE; - virtual void ReleaseNativeHDC(WXHDC hdc) wxOVERRIDE; + virtual WXHDC GetNativeHDC() override; + virtual void ReleaseNativeHDC(WXHDC hdc) override; protected: // Used from ctors (including those in the derived classes) and takes @@ -492,7 +492,7 @@ protected: void Init(Graphics* graphics, int width, int height); private: - virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y) wxOVERRIDE; + virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y) override; Graphics* m_context; wxStack m_stateStack; @@ -525,7 +525,7 @@ public: Flush(); } - virtual void Flush() wxOVERRIDE + virtual void Flush() override { m_image = m_bitmap.ConvertToImage(); } @@ -560,7 +560,7 @@ class wxGDIPlusPrintingContext : public wxGDIPlusContext public: wxGDIPlusPrintingContext( wxGraphicsRenderer* renderer, const wxDC& dc ); - void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const wxOVERRIDE; + void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const override; }; //----------------------------------------------------------------------------- @@ -586,86 +586,86 @@ public : // Context - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) override; - virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) override; #if wxUSE_PRINTING_ARCHITECTURE - virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) override; #endif #if wxUSE_ENH_METAFILE - virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) override; #endif - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) override; - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) override; - virtual wxGraphicsContext * CreateContextFromNativeHDC(WXHDC dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeHDC(WXHDC dc) override; - virtual wxGraphicsContext * CreateContext( wxWindow* window ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( wxWindow* window ) override; #if wxUSE_IMAGE - virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) override; #endif // wxUSE_IMAGE - virtual wxGraphicsContext * CreateMeasuringContext() wxOVERRIDE; + virtual wxGraphicsContext * CreateMeasuringContext() override; // Path - virtual wxGraphicsPath CreatePath() wxOVERRIDE; + virtual wxGraphicsPath CreatePath() override; // Matrix virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; + wxDouble tx=0.0, wxDouble ty=0.0) override; - virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& pen) wxOVERRIDE; + virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& pen) override; - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) wxOVERRIDE; + virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) override; virtual wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble startX, wxDouble startY, wxDouble endX, wxDouble endY, wxDouble radius, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) override; #if wxUSE_IMAGE - virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE; - virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) override; + virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) override; #endif // wxUSE_IMAGE virtual wxGraphicsFont CreateFont( const wxFont& font, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; virtual wxGraphicsFont CreateFont(double sizeInPixels, const wxString& facename, int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) wxOVERRIDE; + const wxColour& col = *wxBLACK) override; virtual wxGraphicsFont CreateFontAtDPI(const wxFont& font, const wxRealPoint& dpi, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; // create a graphics bitmap from a native bitmap - virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) override; // create a subimage from a native image representation - virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; - virtual wxString GetName() const wxOVERRIDE; - virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE; + virtual wxString GetName() const override; + virtual void GetVersion(int *major, int *minor, int *micro) const override; protected : bool EnsureIsLoaded(); @@ -3035,8 +3035,8 @@ public: AddDependency("wxGdiPlusModule"); } - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxDELETE(gs_drawTextStringFormat); diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp index c4a07d2bda..129b48e612 100644 --- a/src/msw/graphicsd2d.cpp +++ b/src/msw/graphicsd2d.cpp @@ -392,7 +392,7 @@ public: } // IDWriteFontFileEnumerator methods - virtual wxSTDMETHODIMP MoveNext(BOOL* pHasCurrentFile) wxOVERRIDE + virtual wxSTDMETHODIMP MoveNext(BOOL* pHasCurrentFile) override { HRESULT hr = S_OK; @@ -412,7 +412,7 @@ public: return hr; } - virtual wxSTDMETHODIMP GetCurrentFontFile(IDWriteFontFile** ppFontFile) wxOVERRIDE + virtual wxSTDMETHODIMP GetCurrentFontFile(IDWriteFontFile** ppFontFile) override { if ( m_currentFile ) { @@ -457,7 +457,7 @@ public: // IDWriteFontCollectionLoader methods virtual wxSTDMETHODIMP CreateEnumeratorFromKey(IDWriteFactory* pFactory, void const* pCollectionKey, UINT32 collectionKeySize, - IDWriteFontFileEnumerator** pFontFileEnumerator) wxOVERRIDE + IDWriteFontFileEnumerator** pFontFileEnumerator) override { if ( !pFontFileEnumerator ) return E_INVALIDARG; @@ -734,12 +734,12 @@ public: ReleaseResource(); } - bool IsResourceAcquired() wxOVERRIDE + bool IsResourceAcquired() override { return m_nativeResource != NULL; } - void* GetResource() wxOVERRIDE + void* GetResource() override { return GetD2DResource(); } @@ -754,7 +754,7 @@ public: return m_nativeResource; } - void AcquireResource() wxOVERRIDE + void AcquireResource() override { wxCHECK_RESOURCE_HOLDER_PRE(); @@ -763,7 +763,7 @@ public: wxCHECK_RESOURCE_HOLDER_POST(); } - void ReleaseResource() wxOVERRIDE + void ReleaseResource() override { m_nativeResource.reset(); } @@ -773,7 +773,7 @@ public: return m_resourceManager->GetContext(); } - void Bind(wxD2DResourceManager* manager) wxOVERRIDE + void Bind(wxD2DResourceManager* manager) override { if (IsBound()) return; @@ -782,7 +782,7 @@ public: m_resourceManager->RegisterResourceHolder(this); } - void UnBind() wxOVERRIDE + void UnBind() override { if (!IsBound()) return; @@ -791,12 +791,12 @@ public: m_resourceManager = NULL; } - bool IsBound() wxOVERRIDE + bool IsBound() override { return m_resourceManager != NULL; } - wxD2DResourceManager* GetManager() wxOVERRIDE + wxD2DResourceManager* GetManager() override { return m_resourceManager; } @@ -816,22 +816,22 @@ protected: class wxD2DManagedGraphicsData : public wxD2DManagedObject { public: - void Bind(wxD2DResourceManager* manager) wxOVERRIDE + void Bind(wxD2DResourceManager* manager) override { GetManagedObject()->Bind(manager); } - void UnBind() wxOVERRIDE + void UnBind() override { GetManagedObject()->UnBind(); } - bool IsBound() wxOVERRIDE + bool IsBound() override { return GetManagedObject()->IsBound(); } - wxD2DResourceManager* GetManager() wxOVERRIDE + wxD2DResourceManager* GetManager() override { return GetManagedObject()->GetManager(); } @@ -1152,33 +1152,33 @@ public: wxD2DMatrixData(wxGraphicsRenderer* renderer); wxD2DMatrixData(wxGraphicsRenderer* renderer, const D2D1::Matrix3x2F& matrix); - virtual wxGraphicsObjectRefData* Clone() const wxOVERRIDE; + virtual wxGraphicsObjectRefData* Clone() const override; - void Concat(const wxGraphicsMatrixData* t) wxOVERRIDE; + void Concat(const wxGraphicsMatrixData* t) override; void Set(wxDouble a = 1.0, wxDouble b = 0.0, wxDouble c = 0.0, wxDouble d = 1.0, - wxDouble tx = 0.0, wxDouble ty = 0.0) wxOVERRIDE; + wxDouble tx = 0.0, wxDouble ty = 0.0) override; void Get(wxDouble* a = NULL, wxDouble* b = NULL, wxDouble* c = NULL, - wxDouble* d = NULL, wxDouble* tx = NULL, wxDouble* ty = NULL) const wxOVERRIDE; + wxDouble* d = NULL, wxDouble* tx = NULL, wxDouble* ty = NULL) const override; - void Invert() wxOVERRIDE; + void Invert() override; - bool IsEqual(const wxGraphicsMatrixData* t) const wxOVERRIDE; + bool IsEqual(const wxGraphicsMatrixData* t) const override; - bool IsIdentity() const wxOVERRIDE; + bool IsIdentity() const override; - void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE; + void Translate(wxDouble dx, wxDouble dy) override; - void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE; + void Scale(wxDouble xScale, wxDouble yScale) override; - void Rotate(wxDouble angle) wxOVERRIDE; + void Rotate(wxDouble angle) override; - void TransformPoint(wxDouble* x, wxDouble* y) const wxOVERRIDE; + void TransformPoint(wxDouble* x, wxDouble* y) const override; - void TransformDistance(wxDouble* dx, wxDouble* dy) const wxOVERRIDE; + void TransformDistance(wxDouble* dx, wxDouble* dy) const override; - void* GetNativeMatrix() const wxOVERRIDE; + void* GetNativeMatrix() const override; D2D1::Matrix3x2F GetMatrix3x2F() const; @@ -1335,48 +1335,48 @@ public : // involving a path. void Flush(); - wxGraphicsObjectRefData* Clone() const wxOVERRIDE; + wxGraphicsObjectRefData* Clone() const override; // begins a new subpath at (x,y) - void MoveToPoint(wxDouble x, wxDouble y) wxOVERRIDE; + void MoveToPoint(wxDouble x, wxDouble y) override; // adds a straight line from the current point to (x,y) - void AddLineToPoint(wxDouble x, wxDouble y) wxOVERRIDE; + void AddLineToPoint(wxDouble x, wxDouble y) override; // adds a cubic Bezier curve from the current point, using two control points and an end point - void AddCurveToPoint(wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y) wxOVERRIDE; + void AddCurveToPoint(wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y) override; // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - void AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise) wxOVERRIDE; + void AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise) override; // gets the last point of the current path, (0,0) if not yet set - void GetCurrentPoint(wxDouble* x, wxDouble* y) const wxOVERRIDE; + void GetCurrentPoint(wxDouble* x, wxDouble* y) const override; // adds another path - void AddPath(const wxGraphicsPathData* path) wxOVERRIDE; + void AddPath(const wxGraphicsPathData* path) override; // closes the current sub-path - void CloseSubpath() wxOVERRIDE; + void CloseSubpath() override; // returns the native path - void* GetNativePath() const wxOVERRIDE; + void* GetNativePath() const override; // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - void UnGetNativePath(void* WXUNUSED(p)) const wxOVERRIDE {} + void UnGetNativePath(void* WXUNUSED(p)) const override {} // transforms each point of this path by the matrix - void Transform(const wxGraphicsMatrixData* matrix) wxOVERRIDE; + void Transform(const wxGraphicsMatrixData* matrix) override; // gets the bounding box enclosing all points (possibly including control points) - void GetBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble *h) const wxOVERRIDE; + void GetBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble *h) const override; - bool Contains(wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const wxOVERRIDE; + bool Contains(wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const override; // appends an ellipsis as a new closed subpath fitting the passed rectangle - void AddCircle(wxDouble x, wxDouble y, wxDouble r) wxOVERRIDE; + void AddCircle(wxDouble x, wxDouble y, wxDouble r) override; // appends an ellipse - void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; private: void EnsureGeometryOpen(); @@ -2356,27 +2356,27 @@ public: virtual ~wxHatchBitmapSource() {} - HRESULT STDMETHODCALLTYPE GetSize(__RPC__out UINT *width, __RPC__out UINT *height) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetSize(__RPC__out UINT *width, __RPC__out UINT *height) override { if (width != NULL) *width = 8; if (height != NULL) *height = 8; return S_OK; } - HRESULT STDMETHODCALLTYPE GetPixelFormat(__RPC__out WICPixelFormatGUID *pixelFormat) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetPixelFormat(__RPC__out WICPixelFormatGUID *pixelFormat) override { if (pixelFormat != NULL) *pixelFormat = GUID_WICPixelFormat32bppPBGRA; return S_OK; } - HRESULT STDMETHODCALLTYPE GetResolution(__RPC__out double *dpiX, __RPC__out double *dpiY) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetResolution(__RPC__out double *dpiX, __RPC__out double *dpiY) override { if (dpiX != NULL) *dpiX = 96.0; if (dpiY != NULL) *dpiY = 96.0; return S_OK; } - HRESULT STDMETHODCALLTYPE CopyPalette(__RPC__in_opt IWICPalette* WXUNUSED(palette)) wxOVERRIDE + HRESULT STDMETHODCALLTYPE CopyPalette(__RPC__in_opt IWICPalette* WXUNUSED(palette)) override { return WINCODEC_ERR_PALETTEUNAVAILABLE; } @@ -2385,7 +2385,7 @@ public: const WICRect* WXUNUSED(prc), UINT WXUNUSED(stride), UINT WXUNUSED(bufferSize), - BYTE *buffer) wxOVERRIDE + BYTE *buffer) override { // patterns are encoded in a bit map of size 8 x 8 static const unsigned char BDIAGONAL_PATTERN[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; @@ -2425,7 +2425,7 @@ public: // Implementations adapted from: "Implementing IUnknown in C++" // http://msdn.microsoft.com/en-us/library/office/cc839627%28v=office.15%29.aspx - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID referenceId, void** object) wxOVERRIDE + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID referenceId, void** object) override { if (!object) { @@ -2444,13 +2444,13 @@ public: return E_NOINTERFACE; } - ULONG STDMETHODCALLTYPE AddRef(void) wxOVERRIDE + ULONG STDMETHODCALLTYPE AddRef(void) override { InterlockedIncrement(&m_refCount); return m_refCount; } - ULONG STDMETHODCALLTYPE Release(void) wxOVERRIDE + ULONG STDMETHODCALLTYPE Release(void) override { wxCHECK_MSG(m_refCount > 0, 0, "Unbalanced number of calls to Release"); @@ -2624,7 +2624,7 @@ public: } protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { HRESULT hr = GetContext()->CreateBitmapFromWicBitmap(m_srcBitmap, 0, &m_nativeResource); wxCHECK_HRESULT_RET(hr); @@ -2661,11 +2661,11 @@ public: ~wxD2DBitmapData(); // returns the native representation - void* GetNativeBitmap() const wxOVERRIDE; + void* GetNativeBitmap() const override; wxCOMPtr GetD2DBitmap(); - wxD2DManagedObject* GetManagedObject() wxOVERRIDE + wxD2DManagedObject* GetManagedObject() override { return m_bitmapHolder; } @@ -2716,7 +2716,7 @@ public: } protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxCHECK_RET(!m_gradientStops.empty(), "No gradient stops provided"); @@ -2745,7 +2745,7 @@ public: wxD2DSolidBrushResourceHolder(const wxBrush& brush) : wxD2DBrushResourceHolder(brush) {} protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxColour colour = m_sourceBrush.GetColour(); HRESULT hr = GetContext()->CreateSolidColorBrush(wxD2DConvertColour(colour), &m_nativeResource); @@ -2759,7 +2759,7 @@ public: wxD2DBitmapBrushResourceHolder(const wxBrush& brush) : wxD2DBrushResourceHolder(brush) {} protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { // TODO: cache this bitmap wxD2DBitmapResourceHolder bitmap(*(m_sourceBrush.GetStipple())); @@ -2783,7 +2783,7 @@ public: wxD2DHatchBrushResourceHolder(const wxBrush& brush) : wxD2DBrushResourceHolder(brush) {} protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxCOMPtr hatchBitmapSource(new wxHatchBitmapSource(m_sourceBrush.GetStyle(), m_sourceBrush.GetColour())); @@ -2827,7 +2827,7 @@ public: : m_linearGradientInfo(x1, y1, x2, y2, stops, matrix) {} protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxD2DGradientStopsHelper helper(m_linearGradientInfo.stops); helper.Bind(GetManager()); @@ -2879,7 +2879,7 @@ public: : m_radialGradientInfo(x1, y1, x2, y2, r, stops, matrix) {} protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxD2DGradientStopsHelper helper(m_radialGradientInfo.stops); helper.Bind(GetManager()); @@ -2935,7 +2935,7 @@ public: return (ID2D1Brush*)(m_brushResourceHolder->GetResource()); } - wxD2DManagedObject* GetManagedObject() wxOVERRIDE + wxD2DManagedObject* GetManagedObject() override { return m_brushResourceHolder.get(); } @@ -3045,7 +3045,7 @@ public: ID2D1StrokeStyle* GetStrokeStyle(); - wxD2DManagedObject* GetManagedObject() wxOVERRIDE + wxD2DManagedObject* GetManagedObject() override { return m_stippleBrush->GetManagedObject(); } @@ -3459,7 +3459,7 @@ public: { } - HRESULT Flush() wxOVERRIDE + HRESULT Flush() override { HRESULT hr = m_nativeResource->Flush(); FlushRenderTargetToImage(); @@ -3472,7 +3472,7 @@ public: } protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { CreateWICBitmapFromImage(*m_resultImage, true, &m_wicBitmap); @@ -3510,7 +3510,7 @@ public: { } - void Resize() wxOVERRIDE + void Resize() override { RECT clientRect = wxGetClientRect(m_hwnd); @@ -3527,7 +3527,7 @@ public: } protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxCOMPtr renderTarget; @@ -3581,7 +3581,7 @@ public: void DrawBitmap(ID2D1Bitmap* bitmap, const D2D1_RECT_F& srcRect, const D2D1_RECT_F& destRect, wxInterpolationQuality interpolationQuality, - wxCompositionMode compositionMode) wxOVERRIDE + wxCompositionMode compositionMode) override { D2D1_POINT_2F offset = D2D1::Point2(destRect.left, destRect.top); m_context->DrawImage(bitmap, @@ -3591,7 +3591,7 @@ public: wxD2DConvertCompositionMode(compositionMode)); } - HRESULT Flush() wxOVERRIDE + HRESULT Flush() override { HRESULT hr = m_nativeResource->Flush(); DXGI_PRESENT_PARAMETERS params = { 0 }; @@ -3602,7 +3602,7 @@ public: protected: // Adapted from http://msdn.microsoft.com/en-us/library/windows/desktop/hh780339%28v=vs.85%29.aspx - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { HRESULT hr; @@ -3765,7 +3765,7 @@ public: } protected: - void DoAcquireResource() wxOVERRIDE + void DoAcquireResource() override { wxCOMPtr renderTarget; D2D1_RENDER_TARGET_PROPERTIES renderTargetProperties = D2D1::RenderTargetProperties( @@ -3810,37 +3810,37 @@ class wxNullContext : public wxGraphicsContext { public: wxNullContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer) {} - void GetTextExtent(const wxString&, wxDouble*, wxDouble*, wxDouble*, wxDouble*) const wxOVERRIDE {} - void GetPartialTextExtents(const wxString&, wxArrayDouble&) const wxOVERRIDE {} - void Clip(const wxRegion&) wxOVERRIDE {} - void Clip(wxDouble, wxDouble, wxDouble, wxDouble) wxOVERRIDE {} - void ResetClip() wxOVERRIDE {} - void GetClipBox(wxDouble*, wxDouble*, wxDouble*, wxDouble*) wxOVERRIDE {} - void* GetNativeContext() wxOVERRIDE { return NULL; } - bool SetAntialiasMode(wxAntialiasMode) wxOVERRIDE { return false; } - bool SetInterpolationQuality(wxInterpolationQuality) wxOVERRIDE { return false; } - bool SetCompositionMode(wxCompositionMode) wxOVERRIDE { return false; } - void BeginLayer(wxDouble) wxOVERRIDE {} - void EndLayer() wxOVERRIDE {} - void Translate(wxDouble, wxDouble) wxOVERRIDE {} - void Scale(wxDouble, wxDouble) wxOVERRIDE {} - void Rotate(wxDouble) wxOVERRIDE {} - void ConcatTransform(const wxGraphicsMatrix&) wxOVERRIDE {} - void SetTransform(const wxGraphicsMatrix&) wxOVERRIDE {} - wxGraphicsMatrix GetTransform() const wxOVERRIDE { return wxNullGraphicsMatrix; } - void StrokePath(const wxGraphicsPath&) wxOVERRIDE {} - void FillPath(const wxGraphicsPath&, wxPolygonFillMode) wxOVERRIDE {} - void DrawBitmap(const wxGraphicsBitmap&, wxDouble, wxDouble, wxDouble, wxDouble) wxOVERRIDE {} - void DrawBitmap(const wxBitmap&, wxDouble, wxDouble, wxDouble, wxDouble) wxOVERRIDE {} - void DrawIcon(const wxIcon&, wxDouble, wxDouble, wxDouble, wxDouble) wxOVERRIDE {} - void PushState() wxOVERRIDE {} - void PopState() wxOVERRIDE {} - void Flush() wxOVERRIDE {} - WXHDC GetNativeHDC() wxOVERRIDE { return NULL; }; - void ReleaseNativeHDC(WXHDC WXUNUSED(hdc)) wxOVERRIDE {}; + void GetTextExtent(const wxString&, wxDouble*, wxDouble*, wxDouble*, wxDouble*) const override {} + void GetPartialTextExtents(const wxString&, wxArrayDouble&) const override {} + void Clip(const wxRegion&) override {} + void Clip(wxDouble, wxDouble, wxDouble, wxDouble) override {} + void ResetClip() override {} + void GetClipBox(wxDouble*, wxDouble*, wxDouble*, wxDouble*) override {} + void* GetNativeContext() override { return NULL; } + bool SetAntialiasMode(wxAntialiasMode) override { return false; } + bool SetInterpolationQuality(wxInterpolationQuality) override { return false; } + bool SetCompositionMode(wxCompositionMode) override { return false; } + void BeginLayer(wxDouble) override {} + void EndLayer() override {} + void Translate(wxDouble, wxDouble) override {} + void Scale(wxDouble, wxDouble) override {} + void Rotate(wxDouble) override {} + void ConcatTransform(const wxGraphicsMatrix&) override {} + void SetTransform(const wxGraphicsMatrix&) override {} + wxGraphicsMatrix GetTransform() const override { return wxNullGraphicsMatrix; } + void StrokePath(const wxGraphicsPath&) override {} + void FillPath(const wxGraphicsPath&, wxPolygonFillMode) override {} + void DrawBitmap(const wxGraphicsBitmap&, wxDouble, wxDouble, wxDouble, wxDouble) override {} + void DrawBitmap(const wxBitmap&, wxDouble, wxDouble, wxDouble, wxDouble) override {} + void DrawIcon(const wxIcon&, wxDouble, wxDouble, wxDouble, wxDouble) override {} + void PushState() override {} + void PopState() override {} + void Flush() override {} + WXHDC GetNativeHDC() override { return NULL; }; + void ReleaseNativeHDC(WXHDC WXUNUSED(hdc)) override {}; protected: - void DoDrawText(const wxString&, wxDouble, wxDouble) wxOVERRIDE {} + void DoDrawText(const wxString&, wxDouble, wxDouble) override {} }; class wxD2DMeasuringContext : public wxNullContext @@ -3848,12 +3848,12 @@ class wxD2DMeasuringContext : public wxNullContext public: wxD2DMeasuringContext(wxGraphicsRenderer* renderer) : wxNullContext(renderer) {} - void GetTextExtent(const wxString& str, wxDouble* width, wxDouble* height, wxDouble* descent, wxDouble* externalLeading) const wxOVERRIDE + void GetTextExtent(const wxString& str, wxDouble* width, wxDouble* height, wxDouble* descent, wxDouble* externalLeading) const override { GetTextExtent(wxGetD2DFontData(m_font), str, width, height, descent, externalLeading); } - void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE + void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const override { GetPartialTextExtents(wxGetD2DFontData(m_font), text, widths); } @@ -3919,88 +3919,88 @@ public: ~wxD2DContext(); - void Clip(const wxRegion& region) wxOVERRIDE; + void Clip(const wxRegion& region) override; - void Clip(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void Clip(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - void ResetClip() wxOVERRIDE; + void ResetClip() override; - void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) wxOVERRIDE; + void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) override; // The native context used by wxD2DContext is a Direct2D render target. - void* GetNativeContext() wxOVERRIDE; + void* GetNativeContext() override; - bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE; + bool SetAntialiasMode(wxAntialiasMode antialias) override; - bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE; + bool SetInterpolationQuality(wxInterpolationQuality interpolation) override; - bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE; + bool SetCompositionMode(wxCompositionMode op) override; - void BeginLayer(wxDouble opacity) wxOVERRIDE; + void BeginLayer(wxDouble opacity) override; - void EndLayer() wxOVERRIDE; + void EndLayer() override; - void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE; + void Translate(wxDouble dx, wxDouble dy) override; - void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE; + void Scale(wxDouble xScale, wxDouble yScale) override; - void Rotate(wxDouble angle) wxOVERRIDE; + void Rotate(wxDouble angle) override; - void ConcatTransform(const wxGraphicsMatrix& matrix) wxOVERRIDE; + void ConcatTransform(const wxGraphicsMatrix& matrix) override; - void SetTransform(const wxGraphicsMatrix& matrix) wxOVERRIDE; + void SetTransform(const wxGraphicsMatrix& matrix) override; - wxGraphicsMatrix GetTransform() const wxOVERRIDE; + wxGraphicsMatrix GetTransform() const override; - void StrokePath(const wxGraphicsPath& p) wxOVERRIDE; + void StrokePath(const wxGraphicsPath& p) override; - void FillPath(const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE; + void FillPath(const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE) override; - void DrawRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void DrawRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - void DrawRoundedRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius) wxOVERRIDE; + void DrawRoundedRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius) override; - void DrawEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void DrawEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - void DrawBitmap(const wxGraphicsBitmap& bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void DrawBitmap(const wxGraphicsBitmap& bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - void DrawBitmap(const wxBitmap& bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void DrawBitmap(const wxBitmap& bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - void DrawIcon(const wxIcon& icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + void DrawIcon(const wxIcon& icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - void PushState() wxOVERRIDE; + void PushState() override; - void PopState() wxOVERRIDE; + void PopState() override; void GetTextExtent( const wxString& str, wxDouble* width, wxDouble* height, wxDouble* descent, - wxDouble* externalLeading) const wxOVERRIDE; + wxDouble* externalLeading) const override; - void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE; + void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const override; - bool ShouldOffset() const wxOVERRIDE; + bool ShouldOffset() const override; - void SetPen(const wxGraphicsPen& pen) wxOVERRIDE; + void SetPen(const wxGraphicsPen& pen) override; - void Flush() wxOVERRIDE; + void Flush() override; - void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const wxOVERRIDE; + void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const override; - wxD2DContextSupplier::ContextType GetContext() wxOVERRIDE + wxD2DContextSupplier::ContextType GetContext() override { return GetRenderTarget(); } - WXHDC GetNativeHDC() wxOVERRIDE; - void ReleaseNativeHDC(WXHDC hdc) wxOVERRIDE; + WXHDC GetNativeHDC() override; + void ReleaseNativeHDC(WXHDC hdc) override; private: void Init(); - void DoDrawText(const wxString& str, wxDouble x, wxDouble y) wxOVERRIDE; + void DoDrawText(const wxString& str, wxDouble x, wxDouble y) override; void EnsureInitialized(); @@ -5000,82 +5000,82 @@ public : virtual ~wxD2DRenderer(); - wxGraphicsContext* CreateContext(const wxWindowDC& dc) wxOVERRIDE; + wxGraphicsContext* CreateContext(const wxWindowDC& dc) override; - wxGraphicsContext* CreateContext(const wxMemoryDC& dc) wxOVERRIDE; + wxGraphicsContext* CreateContext(const wxMemoryDC& dc) override; #if wxUSE_PRINTING_ARCHITECTURE - wxGraphicsContext* CreateContext(const wxPrinterDC& dc) wxOVERRIDE; + wxGraphicsContext* CreateContext(const wxPrinterDC& dc) override; #endif #if wxUSE_ENH_METAFILE - wxGraphicsContext* CreateContext(const wxEnhMetaFileDC& dc) wxOVERRIDE; + wxGraphicsContext* CreateContext(const wxEnhMetaFileDC& dc) override; #endif - wxGraphicsContext* CreateContextFromNativeContext(void* context) wxOVERRIDE; + wxGraphicsContext* CreateContextFromNativeContext(void* context) override; - wxGraphicsContext* CreateContextFromNativeWindow(void* window) wxOVERRIDE; + wxGraphicsContext* CreateContextFromNativeWindow(void* window) override; - wxGraphicsContext * CreateContextFromNativeHDC(WXHDC dc) wxOVERRIDE; + wxGraphicsContext * CreateContextFromNativeHDC(WXHDC dc) override; - wxGraphicsContext* CreateContext(wxWindow* window) wxOVERRIDE; + wxGraphicsContext* CreateContext(wxWindow* window) override; #if wxUSE_IMAGE - wxGraphicsContext* CreateContextFromImage(wxImage& image) wxOVERRIDE; + wxGraphicsContext* CreateContextFromImage(wxImage& image) override; #endif // wxUSE_IMAGE - wxGraphicsContext* CreateMeasuringContext() wxOVERRIDE; + wxGraphicsContext* CreateMeasuringContext() override; - wxGraphicsPath CreatePath() wxOVERRIDE; + wxGraphicsPath CreatePath() override; wxGraphicsMatrix CreateMatrix( wxDouble a = 1.0, wxDouble b = 0.0, wxDouble c = 0.0, wxDouble d = 1.0, - wxDouble tx = 0.0, wxDouble ty = 0.0) wxOVERRIDE; + wxDouble tx = 0.0, wxDouble ty = 0.0) override; - wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) wxOVERRIDE; + wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) override; - wxGraphicsBrush CreateBrush(const wxBrush& brush) wxOVERRIDE; + wxGraphicsBrush CreateBrush(const wxBrush& brush) override; wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; wxGraphicsBrush CreateRadialGradientBrush( wxDouble startX, wxDouble startY, wxDouble endX, wxDouble endY, wxDouble radius, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; // create a native bitmap representation - wxGraphicsBitmap CreateBitmap(const wxBitmap& bitmap) wxOVERRIDE; + wxGraphicsBitmap CreateBitmap(const wxBitmap& bitmap) override; #if wxUSE_IMAGE - wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE; - wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE; + wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) override; + wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) override; #endif - wxGraphicsFont CreateFont(const wxFont& font, const wxColour& col) wxOVERRIDE; + wxGraphicsFont CreateFont(const wxFont& font, const wxColour& col) override; wxGraphicsFont CreateFont( double sizeInPixels, const wxString& facename, int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) wxOVERRIDE; + const wxColour& col = *wxBLACK) override; virtual wxGraphicsFont CreateFontAtDPI(const wxFont& font, const wxRealPoint& dpi, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; // create a graphics bitmap from a native bitmap - wxGraphicsBitmap CreateBitmapFromNativeBitmap(void* bitmap) wxOVERRIDE; + wxGraphicsBitmap CreateBitmapFromNativeBitmap(void* bitmap) override; // create a sub-image from a native image representation - wxGraphicsBitmap CreateSubBitmap(const wxGraphicsBitmap& bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + wxGraphicsBitmap CreateSubBitmap(const wxGraphicsBitmap& bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - wxString GetName() const wxOVERRIDE; - void GetVersion(int* major, int* minor, int* micro) const wxOVERRIDE; + wxString GetName() const override; + void GetVersion(int* major, int* minor, int* micro) const override; ID2D1Factory* GetD2DFactory(); @@ -5415,12 +5415,12 @@ public: AddDependency("wxOleInitModule"); } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { if ( gs_WICImagingFactory ) { diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp index 9fb091d907..1fa8e03212 100644 --- a/src/msw/headerctrl.cpp +++ b/src/msw/headerctrl.cpp @@ -65,14 +65,14 @@ public: wxItemAttr m_attr; private: - virtual bool HasCustomDrawnItems() const wxOVERRIDE + virtual bool HasCustomDrawnItems() const override { // We only exist if the header does need to be custom drawn. return true; } virtual const wxItemAttr* - GetItemAttr(DWORD_PTR WXUNUSED(dwItemSpec)) const wxOVERRIDE + GetItemAttr(DWORD_PTR WXUNUSED(dwItemSpec)) const override { // We use the same attribute for all items for now. return &m_attr; @@ -101,9 +101,9 @@ public: virtual ~wxMSWHeaderCtrl(); // Override to implement colours support via custom drawing. - virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE; - virtual bool SetFont(const wxFont& font) wxOVERRIDE; + virtual bool SetBackgroundColour(const wxColour& colour) override; + virtual bool SetForegroundColour(const wxColour& colour) override; + virtual bool SetFont(const wxFont& font) override; // The implementation of wxHeaderCtrlBase virtual functions void SetCount(unsigned int count); @@ -117,19 +117,19 @@ public: protected: // override wxWindow methods which must be implemented by a new control - virtual wxSize DoGetBestSize() const wxOVERRIDE; + virtual wxSize DoGetBestSize() const override; virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; - virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; + virtual void MSWUpdateFontOnDPIChange(const wxSize& newDPI) override; // This function can be used as event handle for wxEVT_DPI_CHANGED event. void WXHandleDPIChanged(wxDPIChangedEvent& event); private: // override MSW-specific methods needed for new control - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE; - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const override; + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) override; // common part of all ctors void Init(); diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp index e4919770b8..3e3cae3e26 100644 --- a/src/msw/joystick.cpp +++ b/src/msw/joystick.cpp @@ -54,7 +54,7 @@ class wxJoystickThread : public wxThread { public: explicit wxJoystickThread(int joystick); - void* Entry() wxOVERRIDE; + void* Entry() override; void SetPolling(wxWindow* win, int pollingFreq) { m_catchwin = win; diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 8b50dd2acf..ac2112528e 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -61,7 +61,7 @@ public: int GetIndex() const { return m_parent->GetItemIndex(const_cast(this)); } - wxString GetName() const wxOVERRIDE + wxString GetName() const override { return m_parent->GetString(GetIndex()); } private: diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index e7a7b47094..1fbf0a11a2 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -244,14 +244,14 @@ public: wxItemAttr m_attr; private: - virtual bool HasCustomDrawnItems() const wxOVERRIDE + virtual bool HasCustomDrawnItems() const override { // We only exist if the header does need to be custom drawn. return true; } virtual const wxItemAttr* - GetItemAttr(DWORD_PTR WXUNUSED(dwItemSpec)) const wxOVERRIDE + GetItemAttr(DWORD_PTR WXUNUSED(dwItemSpec)) const override { // We use the same attribute for all items for now. return &m_attr; diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 18416a4898..e665403f1b 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -821,44 +821,44 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name) wxOVERRIDE; + const wxString& name) override; - virtual bool Play() wxOVERRIDE; - virtual bool Pause() wxOVERRIDE; - virtual bool Stop() wxOVERRIDE; + virtual bool Play() override; + virtual bool Pause() override; + virtual bool Stop() override; - virtual bool Load(const wxString& fileName) wxOVERRIDE; - virtual bool Load(const wxURI& location) wxOVERRIDE; - virtual bool Load(const wxURI& location, const wxURI& proxy) wxOVERRIDE; + virtual bool Load(const wxString& fileName) override; + virtual bool Load(const wxURI& location) override; + virtual bool Load(const wxURI& location, const wxURI& proxy) override; bool DoLoad(const wxString& location); void FinishLoad(); - virtual wxMediaState GetState() wxOVERRIDE; + virtual wxMediaState GetState() override; - virtual bool SetPosition(wxLongLong where) wxOVERRIDE; - virtual wxLongLong GetPosition() wxOVERRIDE; - virtual wxLongLong GetDuration() wxOVERRIDE; + virtual bool SetPosition(wxLongLong where) override; + virtual wxLongLong GetPosition() override; + virtual wxLongLong GetDuration() override; - virtual void Move(int x, int y, int w, int h) wxOVERRIDE; - wxSize GetVideoSize() const wxOVERRIDE; + virtual void Move(int x, int y, int w, int h) override; + wxSize GetVideoSize() const override; - virtual double GetPlaybackRate() wxOVERRIDE; - virtual bool SetPlaybackRate(double) wxOVERRIDE; + virtual double GetPlaybackRate() override; + virtual bool SetPlaybackRate(double) override; - virtual double GetVolume() wxOVERRIDE; - virtual bool SetVolume(double) wxOVERRIDE; + virtual double GetVolume() override; + virtual bool SetVolume(double) override; - virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE; + virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) override; void DoGetDownloadProgress(wxLongLong*, wxLongLong*); - virtual wxLongLong GetDownloadProgress() wxOVERRIDE + virtual wxLongLong GetDownloadProgress() override { wxLongLong progress, total; DoGetDownloadProgress(&progress, &total); return progress; } - virtual wxLongLong GetDownloadTotal() wxOVERRIDE + virtual wxLongLong GetDownloadTotal() override { wxLongLong progress, total; DoGetDownloadProgress(&progress, &total); diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 495b4e65a0..d69dfe957c 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -353,33 +353,33 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name) wxOVERRIDE; + const wxString& name) override; - virtual bool Play() wxOVERRIDE; - virtual bool Pause() wxOVERRIDE; - virtual bool Stop() wxOVERRIDE; + virtual bool Play() override; + virtual bool Pause() override; + virtual bool Stop() override; virtual bool Load(const wxURI& location, - const wxURI& proxy) wxOVERRIDE + const wxURI& proxy) override { return wxMediaBackend::Load(location, proxy); } - virtual bool Load(const wxString& fileName) wxOVERRIDE; - virtual bool Load(const wxURI& location) wxOVERRIDE; + virtual bool Load(const wxString& fileName) override; + virtual bool Load(const wxURI& location) override; - virtual wxMediaState GetState() wxOVERRIDE; + virtual wxMediaState GetState() override; - virtual bool SetPosition(wxLongLong where) wxOVERRIDE; - virtual wxLongLong GetPosition() wxOVERRIDE; - virtual wxLongLong GetDuration() wxOVERRIDE; + virtual bool SetPosition(wxLongLong where) override; + virtual wxLongLong GetPosition() override; + virtual wxLongLong GetDuration() override; - virtual void Move(int x, int y, int w, int h) wxOVERRIDE; - wxSize GetVideoSize() const wxOVERRIDE; + virtual void Move(int x, int y, int w, int h) override; + wxSize GetVideoSize() const override; - virtual double GetPlaybackRate() wxOVERRIDE; - virtual bool SetPlaybackRate(double dRate) wxOVERRIDE; + virtual double GetPlaybackRate() override; + virtual bool SetPlaybackRate(double dRate) override; - virtual double GetVolume() wxOVERRIDE; - virtual bool SetVolume(double) wxOVERRIDE; + virtual double GetVolume() override; + virtual bool SetVolume(double) override; void Cleanup(); void FinishLoad(); @@ -392,7 +392,7 @@ public: static LRESULT CALLBACK QTWndProc(HWND, UINT, WPARAM, LPARAM); - virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE; + virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) override; wxSize m_bestSize; // Original movie size Movie m_movie; // QT Movie handle/instance @@ -466,7 +466,7 @@ public: wxQTLoadTimer(Movie movie, wxQTMediaBackend* parent, wxQuickTimeLibrary* pLib) : m_movie(movie), m_parent(parent), m_pLib(pLib) {} - void Notify() wxOVERRIDE + void Notify() override { m_pLib->MoviesTask(m_movie, 0); // kMovieLoadStatePlayable @@ -499,7 +499,7 @@ public: wxQuickTimeLibrary* pLib) : m_movie(movie), m_parent(parent), m_pLib(pLib) {} - void Notify() wxOVERRIDE + void Notify() override { // // OK, a little explaining - basically originally diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index 41dafa65fd..a5947d3977 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -628,38 +628,38 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name) wxOVERRIDE; + const wxString& name) override; - virtual bool Play() wxOVERRIDE; - virtual bool Pause() wxOVERRIDE; - virtual bool Stop() wxOVERRIDE; + virtual bool Play() override; + virtual bool Pause() override; + virtual bool Stop() override; - virtual bool Load(const wxString& fileName) wxOVERRIDE; - virtual bool Load(const wxURI& location) wxOVERRIDE; - virtual bool Load(const wxURI& location, const wxURI& proxy) wxOVERRIDE; + virtual bool Load(const wxString& fileName) override; + virtual bool Load(const wxURI& location) override; + virtual bool Load(const wxURI& location, const wxURI& proxy) override; bool DoLoad(const wxString& location); void FinishLoad(); - virtual wxMediaState GetState() wxOVERRIDE; + virtual wxMediaState GetState() override; - virtual bool SetPosition(wxLongLong where) wxOVERRIDE; - virtual wxLongLong GetPosition() wxOVERRIDE; - virtual wxLongLong GetDuration() wxOVERRIDE; + virtual bool SetPosition(wxLongLong where) override; + virtual wxLongLong GetPosition() override; + virtual wxLongLong GetDuration() override; - virtual void Move(int x, int y, int w, int h) wxOVERRIDE; - wxSize GetVideoSize() const wxOVERRIDE; + virtual void Move(int x, int y, int w, int h) override; + wxSize GetVideoSize() const override; - virtual double GetPlaybackRate() wxOVERRIDE; - virtual bool SetPlaybackRate(double) wxOVERRIDE; + virtual double GetPlaybackRate() override; + virtual bool SetPlaybackRate(double) override; - virtual double GetVolume() wxOVERRIDE; - virtual bool SetVolume(double) wxOVERRIDE; + virtual double GetVolume() override; + virtual bool SetVolume(double) override; - virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE; + virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) override; - virtual wxLongLong GetDownloadProgress() wxOVERRIDE; - virtual wxLongLong GetDownloadTotal() wxOVERRIDE; + virtual wxLongLong GetDownloadProgress() override; + virtual wxLongLong GetDownloadTotal() override; #ifdef WXTEST_ATL diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp index d8a602883b..2e79ae0f37 100644 --- a/src/msw/notifmsg.cpp +++ b/src/msw/notifmsg.cpp @@ -60,36 +60,36 @@ public: virtual ~wxBalloonNotifMsgImpl(); - virtual bool Show(int timeout) wxOVERRIDE; + virtual bool Show(int timeout) override; - virtual bool Close() wxOVERRIDE; + virtual bool Close() override; - virtual void SetTitle(const wxString& title) wxOVERRIDE + virtual void SetTitle(const wxString& title) override { m_title = title; } - virtual void SetMessage(const wxString& message) wxOVERRIDE + virtual void SetMessage(const wxString& message) override { m_message = message; } - virtual void SetParent(wxWindow *parent) wxOVERRIDE + virtual void SetParent(wxWindow *parent) override { m_parent = parent; } - virtual void SetFlags(int flags) wxOVERRIDE + virtual void SetFlags(int flags) override { m_flags = flags; } - virtual void SetIcon(const wxIcon& icon) wxOVERRIDE + virtual void SetIcon(const wxIcon& icon) override { m_icon = icon; } - virtual bool AddAction(wxWindowID WXUNUSED(actionid), const wxString &WXUNUSED(label)) wxOVERRIDE + virtual bool AddAction(wxWindowID WXUNUSED(actionid), const wxString &WXUNUSED(label)) override { // Actions are not supported in balloon notifications return false; diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp index 79e05cad1d..81c6d6d3d0 100644 --- a/src/msw/ole/access.cpp +++ b/src/msw/ole/access.cpp @@ -66,10 +66,10 @@ public: DECLARE_IUNKNOWN_METHODS; // IEnumVARIANT - STDMETHODIMP Next(ULONG celt, VARIANT *rgelt, ULONG *pceltFetched) wxOVERRIDE; - STDMETHODIMP Skip(ULONG celt) wxOVERRIDE; - STDMETHODIMP Reset() wxOVERRIDE; - STDMETHODIMP Clone(IEnumVARIANT **ppenum) wxOVERRIDE; + STDMETHODIMP Next(ULONG celt, VARIANT *rgelt, ULONG *pceltFetched) override; + STDMETHODIMP Skip(ULONG celt) override; + STDMETHODIMP Reset() override; + STDMETHODIMP Clone(IEnumVARIANT **ppenum) override; private: wxVariant m_variant; // List of further variants @@ -188,86 +188,86 @@ public: // Retrieves the child element or child object at a given point on the screen. // All visual objects support this method; sound objects do not support it. - STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID) wxOVERRIDE; + STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID) override; // Retrieves the specified object's current screen location. All visual objects must // support this method; sound objects do not support it. - STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID) wxOVERRIDE; + STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID) override; // Traverses to another user interface element within a container and retrieves the object. // All visual objects must support this method. - STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd) wxOVERRIDE; + STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd) override; // Retrieves the address of an IDispatch interface for the specified child. // All objects must support this property. - STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild) wxOVERRIDE; + STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild) override; // Retrieves the number of children that belong to this object. // All objects must support this property. - STDMETHODIMP get_accChildCount ( LONG* pCountChildren) wxOVERRIDE; + STDMETHODIMP get_accChildCount ( LONG* pCountChildren) override; // Retrieves the IDispatch interface of the object's parent. // All objects support this property. - STDMETHODIMP get_accParent ( IDispatch** ppDispParent) wxOVERRIDE; + STDMETHODIMP get_accParent ( IDispatch** ppDispParent) override; // Descriptive Properties and Methods // Performs the object's default action. Not all objects have a default // action. - STDMETHODIMP accDoDefaultAction(VARIANT varID) wxOVERRIDE; + STDMETHODIMP accDoDefaultAction(VARIANT varID) override; // Retrieves a string that describes the object's default action. // Not all objects have a default action. - STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction) wxOVERRIDE; + STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction) override; // Retrieves a string that describes the visual appearance of the specified object. // Not all objects have a description. - STDMETHODIMP get_accDescription ( VARIANT varID, BSTR* pszDescription) wxOVERRIDE; + STDMETHODIMP get_accDescription ( VARIANT varID, BSTR* pszDescription) override; // Retrieves an object's Help property string. // Not all objects support this property. - STDMETHODIMP get_accHelp ( VARIANT varID, BSTR* pszHelp) wxOVERRIDE; + STDMETHODIMP get_accHelp ( VARIANT varID, BSTR* pszHelp) override; // Retrieves the full path of the WinHelp file associated with the specified // object and the identifier of the appropriate topic within that file. // Not all objects support this property. - STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic) wxOVERRIDE; + STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic) override; // Retrieves the specified object's shortcut key or access key, also known as // the mnemonic. All objects that have a shortcut key or access key support // this property. - STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut) wxOVERRIDE; + STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut) override; // Retrieves the name of the specified object. // All objects support this property. - STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName) wxOVERRIDE; + STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName) override; // Retrieves information that describes the role of the specified object. // All objects support this property. - STDMETHODIMP get_accRole ( VARIANT varID, VARIANT* pVarRole) wxOVERRIDE; + STDMETHODIMP get_accRole ( VARIANT varID, VARIANT* pVarRole) override; // Retrieves the current state of the specified object. // All objects support this property. - STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState) wxOVERRIDE; + STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState) override; // Retrieves the value of the specified object. // Not all objects have a value. - STDMETHODIMP get_accValue ( VARIANT varID, BSTR* pszValue) wxOVERRIDE; + STDMETHODIMP get_accValue ( VARIANT varID, BSTR* pszValue) override; // Selection and Focus @@ -275,44 +275,44 @@ public: // specified object. All objects that select or receive the // keyboard focus must support this method. - STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID ) wxOVERRIDE; + STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID ) override; // Retrieves the object that has the keyboard focus. All objects // that receive the keyboard focus must support this property. - STDMETHODIMP get_accFocus ( VARIANT* pVarID) wxOVERRIDE; + STDMETHODIMP get_accFocus ( VARIANT* pVarID) override; // Retrieves the selected children of this object. All objects // selected must support this property. - STDMETHODIMP get_accSelection ( VARIANT * pVarChildren) wxOVERRIDE; + STDMETHODIMP get_accSelection ( VARIANT * pVarChildren) override; // Obsolete - STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) wxOVERRIDE { return E_FAIL; } - STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) wxOVERRIDE { return E_FAIL; } + STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) override { return E_FAIL; } + STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) override { return E_FAIL; } // IDispatch // Get type info - STDMETHODIMP GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo) wxOVERRIDE; + STDMETHODIMP GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo) override; // Get type info count - STDMETHODIMP GetTypeInfoCount(unsigned int* typeInfoCount) wxOVERRIDE; + STDMETHODIMP GetTypeInfoCount(unsigned int* typeInfoCount) override; // Get ids of names STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** names, unsigned int cNames, - LCID lcid, DISPID* dispId) wxOVERRIDE; + LCID lcid, DISPID* dispId) override; // Invoke STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, - unsigned int *puArgErr ) wxOVERRIDE; + unsigned int *puArgErr ) override; // Helpers diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 122ec04dc8..3a54273e1a 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -56,9 +56,9 @@ wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent ); static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\ public:\ LONG GetRefCount();\ - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject) wxOVERRIDE;\ - ULONG STDMETHODCALLTYPE AddRef() wxOVERRIDE;\ - ULONG STDMETHODCALLTYPE Release() wxOVERRIDE;\ + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject) override;\ + ULONG STDMETHODCALLTYPE AddRef() override;\ + ULONG STDMETHODCALLTYPE Release() override;\ ULONG STDMETHODCALLTYPE AddLock();\ ULONG STDMETHODCALLTYPE ReleaseLock() @@ -212,16 +212,16 @@ public: //***************************IDispatch***************************** HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID, OLECHAR ** , unsigned int , LCID , - DISPID * ) wxOVERRIDE + DISPID * ) override { return E_NOTIMPL; } - STDMETHOD(GetTypeInfo)(unsigned int, LCID, ITypeInfo **) wxOVERRIDE + STDMETHOD(GetTypeInfo)(unsigned int, LCID, ITypeInfo **) override { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE GetTypeInfoCount(unsigned int *) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetTypeInfoCount(unsigned int *) override { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID, LCID, WORD wFlags, DISPPARAMS *, VARIANT * pVarResult, EXCEPINFO *, - unsigned int *) wxOVERRIDE + unsigned int *) override { if (!(wFlags & DISPATCH_PROPERTYGET)) return S_OK; @@ -293,32 +293,32 @@ public: } //**************************IOleWindow*************************** - HRESULT STDMETHODCALLTYPE GetWindow(HWND * phwnd) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetWindow(HWND * phwnd) override { if (phwnd == NULL) return E_INVALIDARG; (*phwnd) = m_hWndParent; return S_OK; } - HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) wxOVERRIDE + HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) override {return S_OK;} //**************************IOleInPlaceUIWindow***************** - HRESULT STDMETHODCALLTYPE GetBorder(LPRECT lprectBorder) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetBorder(LPRECT lprectBorder) override { if (lprectBorder == NULL) return E_INVALIDARG; return INPLACE_E_NOTOOLSPACE; } - HRESULT STDMETHODCALLTYPE RequestBorderSpace(LPCBORDERWIDTHS pborderwidths) wxOVERRIDE + HRESULT STDMETHODCALLTYPE RequestBorderSpace(LPCBORDERWIDTHS pborderwidths) override { if (pborderwidths == NULL) return E_INVALIDARG; return INPLACE_E_NOTOOLSPACE; } - HRESULT STDMETHODCALLTYPE SetBorderSpace(LPCBORDERWIDTHS) wxOVERRIDE + HRESULT STDMETHODCALLTYPE SetBorderSpace(LPCBORDERWIDTHS) override {return S_OK;} HRESULT STDMETHODCALLTYPE SetActiveObject( - IOleInPlaceActiveObject *pActiveObject, LPCOLESTR) wxOVERRIDE + IOleInPlaceActiveObject *pActiveObject, LPCOLESTR) override { if (pActiveObject) pActiveObject->AddRef(); @@ -329,12 +329,12 @@ public: //********************IOleInPlaceFrame************************ - STDMETHOD(InsertMenus)(HMENU, LPOLEMENUGROUPWIDTHS) wxOVERRIDE {return S_OK;} - STDMETHOD(SetMenu)(HMENU, HOLEMENU, HWND) wxOVERRIDE {return S_OK;} - STDMETHOD(RemoveMenus)(HMENU) wxOVERRIDE {return S_OK;} - STDMETHOD(SetStatusText)(LPCOLESTR) wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE EnableModeless(BOOL) wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) wxOVERRIDE + STDMETHOD(InsertMenus)(HMENU, LPOLEMENUGROUPWIDTHS) override {return S_OK;} + STDMETHOD(SetMenu)(HMENU, HOLEMENU, HWND) override {return S_OK;} + STDMETHOD(RemoveMenus)(HMENU) override {return S_OK;} + STDMETHOD(SetStatusText)(LPCOLESTR) override {return S_OK;} + HRESULT STDMETHODCALLTYPE EnableModeless(BOOL) override {return S_OK;} + HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) override { // TODO: send an event with this id if (m_window->m_oleInPlaceActiveObject.IsOk()) @@ -343,16 +343,16 @@ public: } //*******************IOleInPlaceSite************************** - HRESULT STDMETHODCALLTYPE CanInPlaceActivate() wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE OnInPlaceActivate() wxOVERRIDE + HRESULT STDMETHODCALLTYPE CanInPlaceActivate() override {return S_OK;} + HRESULT STDMETHODCALLTYPE OnInPlaceActivate() override { m_bInPlaceActive = true; return S_OK; } - HRESULT STDMETHODCALLTYPE OnUIActivate() wxOVERRIDE + HRESULT STDMETHODCALLTYPE OnUIActivate() override { m_bUIActive = true; return S_OK; } HRESULT STDMETHODCALLTYPE GetWindowContext(IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, - LPOLEINPLACEFRAMEINFO lpFrameInfo) wxOVERRIDE + LPOLEINPLACEFRAMEINFO lpFrameInfo) override { if (ppFrame == NULL || ppDoc == NULL || lprcPosRect == NULL || lprcClipRect == NULL || lpFrameInfo == NULL) @@ -399,14 +399,14 @@ public: return S_OK; } - HRESULT STDMETHODCALLTYPE Scroll(SIZE) wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE OnUIDeactivate(BOOL) wxOVERRIDE + HRESULT STDMETHODCALLTYPE Scroll(SIZE) override {return S_OK;} + HRESULT STDMETHODCALLTYPE OnUIDeactivate(BOOL) override { m_bUIActive = false; return S_OK; } - HRESULT STDMETHODCALLTYPE OnInPlaceDeactivate() wxOVERRIDE + HRESULT STDMETHODCALLTYPE OnInPlaceDeactivate() override { m_bInPlaceActive = false; return S_OK; } - HRESULT STDMETHODCALLTYPE DiscardUndoState() wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE DeactivateAndUndo() wxOVERRIDE {return S_OK; } - HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) wxOVERRIDE + HRESULT STDMETHODCALLTYPE DiscardUndoState() override {return S_OK;} + HRESULT STDMETHODCALLTYPE DeactivateAndUndo() override {return S_OK; } + HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) override { if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect) { @@ -426,7 +426,7 @@ public: return S_OK; } //*************************IOleInPlaceSiteEx*********************** - HRESULT STDMETHODCALLTYPE OnInPlaceActivateEx(BOOL * pfNoRedraw, DWORD) wxOVERRIDE + HRESULT STDMETHODCALLTYPE OnInPlaceActivateEx(BOOL * pfNoRedraw, DWORD) override { OleLockRunning(m_window->m_ActiveX, TRUE, FALSE); if (pfNoRedraw) @@ -434,14 +434,14 @@ public: return S_OK; } - HRESULT STDMETHODCALLTYPE OnInPlaceDeactivateEx(BOOL) wxOVERRIDE + HRESULT STDMETHODCALLTYPE OnInPlaceDeactivateEx(BOOL) override { OleLockRunning(m_window->m_ActiveX, FALSE, FALSE); return S_OK; } - STDMETHOD(RequestUIActivate)() wxOVERRIDE { return S_OK;} + STDMETHOD(RequestUIActivate)() override { return S_OK;} //*************************IOleClientSite************************** - HRESULT STDMETHODCALLTYPE SaveObject() wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE SaveObject() override {return S_OK;} const char *OleGetMonikerToStr(DWORD dwAssign) { switch (dwAssign) @@ -464,8 +464,8 @@ public: default : return "Bad Enum"; } } - STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **) wxOVERRIDE {return E_FAIL;} - HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer) wxOVERRIDE + STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **) override {return E_FAIL;} + HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer) override { if (ppContainer == NULL) return E_INVALIDARG; @@ -474,20 +474,20 @@ public: wxASSERT(SUCCEEDED(hr)); return hr; } - HRESULT STDMETHODCALLTYPE ShowObject() wxOVERRIDE + HRESULT STDMETHODCALLTYPE ShowObject() override { if (m_window->m_oleObjectHWND) ::ShowWindow(m_window->m_oleObjectHWND, SW_SHOW); return S_OK; } - STDMETHOD(OnShowWindow)(BOOL) wxOVERRIDE {return S_OK;} - STDMETHOD(RequestNewObjectLayout)() wxOVERRIDE {return E_NOTIMPL;} + STDMETHOD(OnShowWindow)(BOOL) override {return S_OK;} + STDMETHOD(RequestNewObjectLayout)() override {return E_NOTIMPL;} //********************IParseDisplayName*************************** HRESULT STDMETHODCALLTYPE ParseDisplayName( - IBindCtx *, LPOLESTR, ULONG *, IMoniker **) wxOVERRIDE {return E_NOTIMPL;} + IBindCtx *, LPOLESTR, ULONG *, IMoniker **) override {return E_NOTIMPL;} //********************IOleContainer******************************* - STDMETHOD(EnumObjects)(DWORD, IEnumUnknown **) wxOVERRIDE {return E_NOTIMPL;} - HRESULT STDMETHODCALLTYPE LockContainer(BOOL) wxOVERRIDE {return S_OK;} + STDMETHOD(EnumObjects)(DWORD, IEnumUnknown **) override {return E_NOTIMPL;} + HRESULT STDMETHODCALLTYPE LockContainer(BOOL) override {return S_OK;} //********************IOleItemContainer*************************** HRESULT STDMETHODCALLTYPE #if defined(_UNICODE) @@ -495,7 +495,7 @@ public: #else GetObjectA #endif - (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject) wxOVERRIDE + (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject) override { if (pszItem == NULL || ppvObject == NULL) return E_INVALIDARG; @@ -503,43 +503,43 @@ public: return MK_E_NOOBJECT; } HRESULT STDMETHODCALLTYPE GetObjectStorage( - LPOLESTR pszItem, IBindCtx * , REFIID, void ** ppvStorage) wxOVERRIDE + LPOLESTR pszItem, IBindCtx * , REFIID, void ** ppvStorage) override { if (pszItem == NULL || ppvStorage == NULL) return E_INVALIDARG; *ppvStorage = NULL; return MK_E_NOOBJECT; } - HRESULT STDMETHODCALLTYPE IsRunning(LPOLESTR pszItem) wxOVERRIDE + HRESULT STDMETHODCALLTYPE IsRunning(LPOLESTR pszItem) override { if (pszItem == NULL) return E_INVALIDARG; return MK_E_NOOBJECT; } //***********************IOleControlSite***************************** - HRESULT STDMETHODCALLTYPE OnControlInfoChanged() wxOVERRIDE + HRESULT STDMETHODCALLTYPE OnControlInfoChanged() override {return S_OK;} - HRESULT STDMETHODCALLTYPE LockInPlaceActive(BOOL fLock) wxOVERRIDE + HRESULT STDMETHODCALLTYPE LockInPlaceActive(BOOL fLock) override { m_bInPlaceLocked = (fLock) ? true : false; return S_OK; } - HRESULT STDMETHODCALLTYPE GetExtendedControl(IDispatch **) wxOVERRIDE + HRESULT STDMETHODCALLTYPE GetExtendedControl(IDispatch **) override {return E_NOTIMPL;} HRESULT STDMETHODCALLTYPE TransformCoords( - POINTL * pPtlHimetric, POINTF * pPtfContainer, DWORD) wxOVERRIDE + POINTL * pPtlHimetric, POINTF * pPtfContainer, DWORD) override { if (pPtlHimetric == NULL || pPtfContainer == NULL) return E_INVALIDARG; return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG, DWORD) wxOVERRIDE + HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG, DWORD) override {return E_NOTIMPL;} - HRESULT STDMETHODCALLTYPE OnFocus(BOOL) wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE ShowPropertyFrame() wxOVERRIDE {return E_NOTIMPL;} + HRESULT STDMETHODCALLTYPE OnFocus(BOOL) override {return S_OK;} + HRESULT STDMETHODCALLTYPE ShowPropertyFrame() override {return E_NOTIMPL;} //**************************IOleCommandTarget*********************** HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *, ULONG cCmds, - OLECMD prgCmds[], OLECMDTEXT *) wxOVERRIDE + OLECMD prgCmds[], OLECMDTEXT *) override { if (prgCmds == NULL) return E_INVALIDARG; for (ULONG nCmd = 0; nCmd < cCmds; nCmd++) @@ -551,19 +551,19 @@ public: } HRESULT STDMETHODCALLTYPE Exec(const GUID *, DWORD, - DWORD, VARIANTARG *, VARIANTARG *) wxOVERRIDE + DWORD, VARIANTARG *, VARIANTARG *) override {return OLECMDERR_E_NOTSUPPORTED;} //**********************IAdviseSink************************************ - void STDMETHODCALLTYPE OnDataChange(FORMATETC *, STGMEDIUM *) wxOVERRIDE {} - void STDMETHODCALLTYPE OnViewChange(DWORD, LONG) wxOVERRIDE {} - void STDMETHODCALLTYPE OnRename(IMoniker *) wxOVERRIDE {} - void STDMETHODCALLTYPE OnSave() wxOVERRIDE {} - void STDMETHODCALLTYPE OnClose() wxOVERRIDE {} + void STDMETHODCALLTYPE OnDataChange(FORMATETC *, STGMEDIUM *) override {} + void STDMETHODCALLTYPE OnViewChange(DWORD, LONG) override {} + void STDMETHODCALLTYPE OnRename(IMoniker *) override {} + void STDMETHODCALLTYPE OnSave() override {} + void STDMETHODCALLTYPE OnClose() override {} //**********************IOleDocumentSite*************************** HRESULT STDMETHODCALLTYPE ActivateMe( - IOleDocumentView __RPC_FAR *pViewToActivate) wxOVERRIDE + IOleDocumentView __RPC_FAR *pViewToActivate) override { wxAutoIOleInPlaceSite inPlaceSite( IID_IOleInPlaceSite, (IDispatch *) this); @@ -674,17 +674,17 @@ public: } // IDispatch - STDMETHODIMP GetIDsOfNames(REFIID, OLECHAR**, unsigned int, LCID, DISPID*) wxOVERRIDE + STDMETHODIMP GetIDsOfNames(REFIID, OLECHAR**, unsigned int, LCID, DISPID*) override { return E_NOTIMPL; } - STDMETHODIMP GetTypeInfo(unsigned int, LCID, ITypeInfo**) wxOVERRIDE + STDMETHODIMP GetTypeInfo(unsigned int, LCID, ITypeInfo**) override { return E_NOTIMPL; } - STDMETHODIMP GetTypeInfoCount(unsigned int*) wxOVERRIDE + STDMETHODIMP GetTypeInfoCount(unsigned int*) override { return E_NOTIMPL; } @@ -694,7 +694,7 @@ public: LCID lcid, WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult, EXCEPINFO * pExcepInfo, - unsigned int * puArgErr) wxOVERRIDE + unsigned int * puArgErr) override { if (wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF)) return E_NOTIMPL; diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index f323893bd4..721a9a4f5b 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -173,10 +173,10 @@ public: virtual ~wxIEnumFORMATETC() { delete [] m_formats; } // IEnumFORMATETC - STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) wxOVERRIDE; - STDMETHODIMP Skip(ULONG celt) wxOVERRIDE; - STDMETHODIMP Reset() wxOVERRIDE; - STDMETHODIMP Clone(IEnumFORMATETC **ppenum) wxOVERRIDE; + STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) override; + STDMETHODIMP Skip(ULONG celt) override; + STDMETHODIMP Reset() override; + STDMETHODIMP Clone(IEnumFORMATETC **ppenum) override; DECLARE_IUNKNOWN_METHODS; @@ -204,15 +204,15 @@ public: void SetDeleteFlag() { m_mustDelete = true; } // IDataObject - STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) wxOVERRIDE; - STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium) wxOVERRIDE; - STDMETHODIMP QueryGetData(FORMATETC *pformatetc) wxOVERRIDE; - STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *In, FORMATETC *pOut) wxOVERRIDE; - STDMETHODIMP SetData(FORMATETC *pfetc, STGMEDIUM *pmedium, BOOL fRelease) wxOVERRIDE; - STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumFEtc) wxOVERRIDE; - STDMETHODIMP DAdvise(FORMATETC *pfetc, DWORD ad, IAdviseSink *p, DWORD *pdw) wxOVERRIDE; - STDMETHODIMP DUnadvise(DWORD dwConnection) wxOVERRIDE; - STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise) wxOVERRIDE; + STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) override; + STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium) override; + STDMETHODIMP QueryGetData(FORMATETC *pformatetc) override; + STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *In, FORMATETC *pOut) override; + STDMETHODIMP SetData(FORMATETC *pfetc, STGMEDIUM *pmedium, BOOL fRelease) override; + STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumFEtc) override; + STDMETHODIMP DAdvise(FORMATETC *pfetc, DWORD ad, IAdviseSink *p, DWORD *pdw) override; + STDMETHODIMP DUnadvise(DWORD dwConnection) override; + STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise) override; DECLARE_IUNKNOWN_METHODS; @@ -1385,13 +1385,13 @@ class CFSTR_SHELLURLDataObject : public wxCustomDataObject public: CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {} - virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE + virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) override { return 0; } virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, - const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE + const wxDataFormat& WXUNUSED(format) ) override { // CFSTR_SHELLURL is _always_ ANSI text *size = strlen( (const char*)buffer ); @@ -1400,7 +1400,7 @@ public: } virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size), - const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE + const wxDataFormat& WXUNUSED(format) ) override { return buffer; } diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index 3f91252242..dba949d774 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -46,8 +46,8 @@ public: virtual ~wxIDropSource() { } // IDropSource - STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) wxOVERRIDE; - STDMETHODIMP GiveFeedback(DWORD dwEffect) wxOVERRIDE; + STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) override; + STDMETHODIMP GiveFeedback(DWORD dwEffect) override; DECLARE_IUNKNOWN_METHODS; diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index 4b77b64d95..e4dd24aae4 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -80,10 +80,10 @@ public: void SetHwnd(HWND hwnd) { m_hwnd = hwnd; } // IDropTarget methods - STDMETHODIMP DragEnter(LPDATAOBJECT, DWORD, POINTL, LPDWORD) wxOVERRIDE; - STDMETHODIMP DragOver(DWORD, POINTL, LPDWORD) wxOVERRIDE; - STDMETHODIMP DragLeave() wxOVERRIDE; - STDMETHODIMP Drop(LPDATAOBJECT, DWORD, POINTL, LPDWORD) wxOVERRIDE; + STDMETHODIMP DragEnter(LPDATAOBJECT, DWORD, POINTL, LPDWORD) override; + STDMETHODIMP DragOver(DWORD, POINTL, LPDWORD) override; + STDMETHODIMP DragLeave() override; + STDMETHODIMP Drop(LPDATAOBJECT, DWORD, POINTL, LPDWORD) override; DECLARE_IUNKNOWN_METHODS; diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp index e4584a5bb5..a105ea4755 100644 --- a/src/msw/palette.cpp +++ b/src/msw/palette.cpp @@ -75,7 +75,7 @@ public: ::DeleteObject(m_hPalette); } - virtual bool IsOk() const wxOVERRIDE { return m_hPalette != 0; } + virtual bool IsOk() const override { return m_hPalette != 0; } UINT GetEntries() const { diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp index 21978db3e5..97c8ce840c 100644 --- a/src/msw/progdlg.cpp +++ b/src/msw/progdlg.cpp @@ -161,7 +161,7 @@ public: private: wxProgressDialogSharedData m_sharedData; - virtual void* Entry() wxOVERRIDE; + virtual void* Entry() override; static HRESULT CALLBACK TaskDialogCallbackProc(HWND hwnd, UINT uNotification, @@ -184,7 +184,7 @@ public: } protected: - virtual void OnNextIteration() wxOVERRIDE + virtual void OnNextIteration() override { wxCriticalSectionLocker locker(m_data.m_cs); diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 9ff4ab725c..ea70a36947 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -76,27 +76,27 @@ public: void DrawFocusRect(wxWindow * win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE = 0; + int flags = 0) override = 0; protected: // Helper function returning the MSW RECT corresponding to the wxRect @@ -131,12 +131,12 @@ public: virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { DoDrawButton(DFCS_BUTTONCHECK, win, dc, rect, flags); } @@ -144,7 +144,7 @@ public: virtual void DrawCheckMark(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { DoDrawFrameControl(DFC_MENU, DFCS_MENUCHECK, win, dc, rect, flags); } @@ -152,12 +152,12 @@ public: virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags); } @@ -166,13 +166,13 @@ public: wxDC& dc, const wxRect& rect, wxTitleBarButton button, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) wxOVERRIDE; + virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) override; - virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonHeight(wxWindow *win) override; - virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonMargin(wxWindow *win) override; private: // wrapper of DrawFrameControl() @@ -215,30 +215,30 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) wxOVERRIDE; + wxHeaderButtonParams* params = NULL) override; virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { if ( !DoDrawXPButton(BP_CHECKBOX, win, dc, rect, flags) ) m_rendererNative.DrawCheckBox(win, dc, rect, flags); @@ -247,7 +247,7 @@ public: virtual void DrawCheckMark(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { if ( !DoDrawCheckMark(MENU_POPUPCHECK, win, dc, rect, flags) ) m_rendererNative.DrawCheckMark(win, dc, rect, flags); @@ -256,7 +256,7 @@ public: virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { if ( !DoDrawXPButton(BP_PUSHBUTTON, win, dc, rect, flags) ) m_rendererNative.DrawPushButton(win, dc, rect, flags); @@ -265,24 +265,24 @@ public: virtual void DrawCollapseButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE; + virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) override; virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawRadioBitmap(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE + int flags = 0) override { if ( !DoDrawXPButton(BP_RADIOBUTTON, win, dc, rect, flags) ) m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); @@ -292,20 +292,20 @@ public: wxDC& dc, const wxRect& rect, wxTitleBarButton button, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) wxOVERRIDE; + virtual wxSize GetCheckBoxSize(wxWindow *win, int flags = 0) override; - virtual wxSize GetCheckMarkSize(wxWindow* win) wxOVERRIDE; + virtual wxSize GetCheckMarkSize(wxWindow* win) override; - virtual wxSize GetExpanderSize(wxWindow *win) wxOVERRIDE; + virtual wxSize GetExpanderSize(wxWindow *win) override; virtual void DrawGauge(wxWindow* win, wxDC& dc, const wxRect& rect, int value, int max, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawItemText(wxWindow* win, wxDC& dc, @@ -313,9 +313,9 @@ public: const wxRect& rect, int align = wxALIGN_LEFT | wxALIGN_TOP, int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE; + wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) override; - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) override; private: // wrapper around DrawThemeBackground() translating flags to NORMAL/HOT/ diff --git a/src/msw/richtooltip.cpp b/src/msw/richtooltip.cpp index 73ecae9159..d6fc2f5355 100644 --- a/src/msw/richtooltip.cpp +++ b/src/msw/richtooltip.cpp @@ -73,7 +73,7 @@ public: } virtual void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd) wxOVERRIDE + const wxColour& colEnd) override { // Setting background colour is not supported either. m_canUseNative = false; @@ -81,7 +81,7 @@ public: wxRichToolTipGenericImpl::SetBackgroundColour(col, colEnd); } - virtual void SetCustomIcon(const wxBitmapBundle& icon) wxOVERRIDE + virtual void SetCustomIcon(const wxBitmapBundle& icon) override { // Custom icons are not supported by EM_SHOWBALLOONTIP. m_canUseNative = false; @@ -89,7 +89,7 @@ public: wxRichToolTipGenericImpl::SetCustomIcon(icon); } - virtual void SetStandardIcon(int icon) wxOVERRIDE + virtual void SetStandardIcon(int icon) override { wxRichToolTipGenericImpl::SetStandardIcon(icon); if ( !m_canUseNative ) @@ -120,7 +120,7 @@ public: } virtual void SetTimeout(unsigned millisecondsTimeout, - unsigned millisecondsDelay) wxOVERRIDE + unsigned millisecondsDelay) override { // We don't support changing the timeout or the delay // (maybe TTM_SETDELAYTIME could be used for this?). @@ -130,7 +130,7 @@ public: millisecondsDelay); } - virtual void SetTipKind(wxTipKind tipKind) wxOVERRIDE + virtual void SetTipKind(wxTipKind tipKind) override { // Setting non-default tip is not supported. if ( tipKind != wxTipKind_Auto ) @@ -139,7 +139,7 @@ public: wxRichToolTipGenericImpl::SetTipKind(tipKind); } - virtual void SetTitleFont(const wxFont& font) wxOVERRIDE + virtual void SetTitleFont(const wxFont& font) override { // Setting non-default font is not supported. m_canUseNative = false; @@ -147,7 +147,7 @@ public: wxRichToolTipGenericImpl::SetTitleFont(font); } - virtual void ShowFor(wxWindow* win, const wxRect* rect) wxOVERRIDE + virtual void ShowFor(wxWindow* win, const wxRect* rect) override { // TODO: We could use native tooltip control to show native balloon // tooltips for any window but right now we use the simple diff --git a/src/msw/rt/notifmsgrt.cpp b/src/msw/rt/notifmsgrt.cpp index b03504c04b..16ee6c9ff2 100644 --- a/src/msw/rt/notifmsgrt.cpp +++ b/src/msw/rt/notifmsgrt.cpp @@ -101,7 +101,7 @@ public: m_toastEventHandler->Detach(); } - virtual bool Show(int WXUNUSED(timeout)) wxOVERRIDE + virtual bool Show(int WXUNUSED(timeout)) override { wxCOMPtr toastXml; HRESULT hr = CreateToastXML(&toastXml); @@ -113,7 +113,7 @@ public: return SUCCEEDED(hr); } - virtual bool Close() wxOVERRIDE + virtual bool Close() override { if ( m_notifier.get() && m_toast.get() ) { @@ -125,33 +125,33 @@ public: return false; } - virtual void SetTitle(const wxString& title) wxOVERRIDE + virtual void SetTitle(const wxString& title) override { m_title = title; } - virtual void SetMessage(const wxString& message) wxOVERRIDE + virtual void SetMessage(const wxString& message) override { m_message = message; } - virtual void SetParent(wxWindow *WXUNUSED(parent)) wxOVERRIDE + virtual void SetParent(wxWindow *WXUNUSED(parent)) override { } - virtual void SetFlags(int WXUNUSED(flags)) wxOVERRIDE + virtual void SetFlags(int WXUNUSED(flags)) override { } - virtual void SetIcon(const wxIcon& WXUNUSED(icon)) wxOVERRIDE + virtual void SetIcon(const wxIcon& WXUNUSED(icon)) override { // Icon would have to be saved to disk (temporarily?) // to be used as a file:// url in the notifications XML } - virtual bool AddAction(wxWindowID WXUNUSED(actionid), const wxString &WXUNUSED(label)) wxOVERRIDE + virtual bool AddAction(wxWindowID WXUNUSED(actionid), const wxString &WXUNUSED(label)) override { return false; } @@ -464,12 +464,12 @@ public: AddDependency("wxOleInitModule"); } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxToastNotifMsgImpl::Uninitalize(); } diff --git a/src/msw/rt/utilsrt.cpp b/src/msw/rt/utilsrt.cpp index c4df93e165..a0aa6cb81f 100644 --- a/src/msw/rt/utilsrt.cpp +++ b/src/msw/rt/utilsrt.cpp @@ -235,12 +235,12 @@ public: { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { RTCore::Uninitalize(); } diff --git a/src/msw/secretstore.cpp b/src/msw/secretstore.cpp index 8a997ce47e..ea7f04bc36 100644 --- a/src/msw/secretstore.cpp +++ b/src/msw/secretstore.cpp @@ -59,7 +59,7 @@ public: virtual bool Save(const wxString& service, const wxString& user, const wxSecretValueImpl& secret, - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { CREDENTIAL cred; wxZeroMemory(cred); @@ -89,7 +89,7 @@ public: virtual bool Load(const wxString& service, wxString* user, wxSecretValueImpl** secret, - wxString& errmsg) const wxOVERRIDE + wxString& errmsg) const override { CREDENTIAL* pcred = NULL; if ( !::CredRead(service.t_str(), CRED_TYPE_GENERIC, 0, &pcred) || !pcred ) @@ -112,7 +112,7 @@ public: } virtual bool Delete(const wxString& service, - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { if ( !::CredDelete(service.t_str(), CRED_TYPE_GENERIC, 0) ) { diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 5ffc629c00..a9764fea2c 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -46,8 +46,8 @@ class wxSystemSettingsModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxSystemSettingsModule); diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp index 1b31ece74a..4cc4bd6b1b 100644 --- a/src/msw/sockmsw.cpp +++ b/src/msw/sockmsw.cpp @@ -65,17 +65,17 @@ static int firstAvailable; class wxSocketMSWManager : public wxSocketManager { public: - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; - virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) wxOVERRIDE + virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) override { return new wxSocketImplMSW(wxsocket); } virtual void Install_Callback(wxSocketImpl *socket, - wxSocketNotify event = wxSOCKET_LOST) wxOVERRIDE; + wxSocketNotify event = wxSOCKET_LOST) override; virtual void Uninstall_Callback(wxSocketImpl *socket, - wxSocketNotify event = wxSOCKET_LOST) wxOVERRIDE; + wxSocketNotify event = wxSOCKET_LOST) override; }; bool wxSocketMSWManager::OnInit() diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp index 0949297b05..56141ead19 100644 --- a/src/msw/sound.cpp +++ b/src/msw/sound.cpp @@ -58,9 +58,9 @@ public: void *GetPtr() const { return m_waveDataPtr; } - virtual bool IsOk() const wxOVERRIDE { return GetPtr() != NULL; } - virtual DWORD GetSoundFlag() const wxOVERRIDE { return SND_MEMORY; } - virtual LPCTSTR GetSoundData() const wxOVERRIDE { return (LPCTSTR)GetPtr(); } + virtual bool IsOk() const override { return GetPtr() != NULL; } + virtual DWORD GetSoundFlag() const override { return SND_MEMORY; } + virtual LPCTSTR GetSoundData() const override { return (LPCTSTR)GetPtr(); } private: GlobalPtr m_waveData; @@ -75,12 +75,12 @@ class wxSoundDataFile : public wxSoundData public: wxSoundDataFile(const wxString& filename, bool isResource); - virtual bool IsOk() const wxOVERRIDE { return !m_name.empty(); } - virtual DWORD GetSoundFlag() const wxOVERRIDE + virtual bool IsOk() const override { return !m_name.empty(); } + virtual DWORD GetSoundFlag() const override { return m_isResource ? SND_RESOURCE : SND_FILENAME; } - virtual LPCTSTR GetSoundData() const wxOVERRIDE { return m_name.c_str(); } + virtual LPCTSTR GetSoundData() const override { return m_name.c_str(); } private: const wxString m_name; diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 4cdd7aa179..48b2b6cc97 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -72,7 +72,7 @@ public: } WXLRESULT MSWWindowProc(WXUINT msg, - WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE + WXWPARAM wParam, WXLPARAM lParam) override { if (msg == gs_msgRestartTaskbar || msg == gs_msgTaskbar) { diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index bf4bd99cf9..38b63951cd 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -191,8 +191,8 @@ public: Version_Max }; - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; // load the richedit DLL for the specified version of rich edit static bool Load(Version version); @@ -233,17 +233,17 @@ public: wxTextCtrlOleCallback(wxTextCtrl *text) : m_textCtrl(text), m_menu(NULL) {} virtual ~wxTextCtrlOleCallback() { DeleteContextMenuObject(); } - wxSTDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) wxOVERRIDE { return E_NOTIMPL; } - wxSTDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) wxOVERRIDE { return E_NOTIMPL; } + wxSTDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) override { return E_NOTIMPL; } + wxSTDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) override { return E_NOTIMPL; } + wxSTDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) override { return E_NOTIMPL; } + wxSTDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) override { return E_NOTIMPL; } + wxSTDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) override { return E_NOTIMPL; } + wxSTDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) override { return E_NOTIMPL; } + wxSTDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) override { return E_NOTIMPL; } + wxSTDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) override { return E_NOTIMPL; } + wxSTDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) override { return E_NOTIMPL; } - wxSTDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) wxOVERRIDE + wxSTDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) override { // 'menu' will be shown and destroyed by the caller. We need to keep // its wx counterpart, the wxMenu instance, around until it is diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp index 5b14e32b30..ab29243953 100644 --- a/src/msw/textentry.cpp +++ b/src/msw/textentry.cpp @@ -177,7 +177,7 @@ public: virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPOLESTR *rgelt, - ULONG *pceltFetched) wxOVERRIDE + ULONG *pceltFetched) override { if ( !rgelt || (!pceltFetched && celt > 1) ) return E_POINTER; @@ -219,7 +219,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt) override { if ( !celt ) return E_INVALIDARG; @@ -241,7 +241,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Reset() wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Reset() override { CSLock lock(m_csRestart); @@ -250,7 +250,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE Clone(IEnumString **ppEnum) wxOVERRIDE + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumString **ppEnum) override { if ( !ppEnum ) return E_POINTER; diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index e684208820..e817232aee 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -1311,8 +1311,8 @@ bool wxThread::TestDestroy() class wxThreadModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxThreadModule); diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 09bc5889f7..1e70b006eb 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -83,8 +83,8 @@ class wxTimerHiddenWindowModule : public wxModule { public: // module init/finalize - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; // get the hidden window (creates on demand) static HWND GetHWND(); diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index 416c7cbdcd..3a402204c9 100644 --- a/src/msw/toolbar.cpp +++ b/src/msw/toolbar.cpp @@ -184,7 +184,7 @@ public: delete m_staticText; } - virtual void SetLabel(const wxString& label) wxOVERRIDE + virtual void SetLabel(const wxString& label) override { wxASSERT_MSG( IsControl() || IsButton(), wxS("Label can be set for control or button tool only") ); diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp index 4ca25dc907..0c137aedca 100644 --- a/src/msw/tooltip.cpp +++ b/src/msw/tooltip.cpp @@ -140,12 +140,12 @@ public: { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxToolTip::DeleteToolTipCtrl(); } diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 6dbe5bd6f7..5a4a6b885f 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -60,8 +60,8 @@ class wxTLWHiddenParentModule : public wxModule { public: // module init/finalize - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; // get the hidden window (creates on demand) static HWND GetHWND(); diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 0ae778a71c..d83e139ee0 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -581,7 +581,7 @@ public: DoTraverse(tree->GetRootItem()); } - virtual bool OnVisit(const wxTreeItemId& item) wxOVERRIDE + virtual bool OnVisit(const wxTreeItemId& item) override { const wxTreeCtrl * const tree = GetTree(); @@ -621,7 +621,7 @@ public: DoTraverse(root, recursively); } - virtual bool OnVisit(const wxTreeItemId& WXUNUSED(item)) wxOVERRIDE + virtual bool OnVisit(const wxTreeItemId& WXUNUSED(item)) override { m_count++; diff --git a/src/msw/uiaction.cpp b/src/msw/uiaction.cpp index 9860d76b33..18604e00ea 100644 --- a/src/msw/uiaction.cpp +++ b/src/msw/uiaction.cpp @@ -42,11 +42,11 @@ public: return &s_impl; } - virtual bool MouseMove(long x, long y) wxOVERRIDE; - virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; - virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; + virtual bool MouseMove(long x, long y) override; + virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) override; + virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) override; - virtual bool DoKey(int keycode, int modifiers, bool isDown) wxOVERRIDE; + virtual bool DoKey(int keycode, int modifiers, bool isDown) override; private: // This class has no public ctors, use Get() instead. diff --git a/src/msw/uilocale.cpp b/src/msw/uilocale.cpp index 15ee328e47..8024a23d16 100644 --- a/src/msw/uilocale.cpp +++ b/src/msw/uilocale.cpp @@ -168,30 +168,30 @@ public: } - ~wxUILocaleImplStdC() wxOVERRIDE + ~wxUILocaleImplStdC() override { } - void Use() wxOVERRIDE + void Use() override { } - wxString GetName() const wxOVERRIDE + wxString GetName() const override { return wxString("C"); } - wxLocaleIdent GetLocaleId() const wxOVERRIDE + wxLocaleIdent GetLocaleId() const override { return wxLocaleIdent().Language("C"); } - wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const wxOVERRIDE + wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const override { return wxGetStdCLocaleInfo(index, cat); } - wxString GetLocalizedName(wxLocaleName name, wxLocaleForm WXUNUSED(form)) const wxOVERRIDE + wxString GetLocalizedName(wxLocaleName name, wxLocaleForm WXUNUSED(form)) const override { wxString str; switch (name) @@ -210,13 +210,13 @@ public: return str; } - wxLayoutDirection GetLayoutDirection() const wxOVERRIDE + wxLayoutDirection GetLayoutDirection() const override { return wxLayout_Default; } int CompareStrings(const wxString& lhs, const wxString& rhs, - int flags) const wxOVERRIDE + int flags) const override { const int rc = flags & wxCompare_CaseInsensitive ? lhs.CmpNoCase(rhs) : lhs.Cmp(rhs); @@ -249,12 +249,12 @@ public: { } - void Use() wxOVERRIDE + void Use() override { wxUseLCID(m_lcid); } - wxString GetName() const wxOVERRIDE + wxString GetName() const override { wxString str; @@ -274,17 +274,17 @@ public: return str; } - wxLocaleIdent GetLocaleId() const wxOVERRIDE + wxLocaleIdent GetLocaleId() const override { return wxLocaleIdent::FromTag(GetName()); } - wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const wxOVERRIDE + wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const override { return wxGetInfoFromLCID(m_lcid, index, cat); } - wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const wxOVERRIDE + wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const override { wxString str; switch (name) @@ -341,13 +341,13 @@ public: return str; } - wxLayoutDirection GetLayoutDirection() const wxOVERRIDE + wxLayoutDirection GetLayoutDirection() const override { return wxLayout_Default; } int CompareStrings(const wxString& lhs, const wxString& rhs, - int flags) const wxOVERRIDE + int flags) const override { // Can't be really implemented on the OS versions where this class is // used. @@ -545,12 +545,12 @@ public: } - ~wxUILocaleImplName() wxOVERRIDE + ~wxUILocaleImplName() override { free(const_cast(m_name)); } - void Use() wxOVERRIDE + void Use() override { // Construct a double NUL-terminated buffer. wchar_t buf[256]; @@ -566,17 +566,17 @@ public: wxLogLastError(wxT("SetThreadPreferredUILanguages")); } - wxString GetName() const wxOVERRIDE + wxString GetName() const override { return DoGetInfo(LOCALE_SNAME); } - wxLocaleIdent GetLocaleId() const wxOVERRIDE + wxLocaleIdent GetLocaleId() const override { return wxLocaleIdent::FromTag(GetName()); } - wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const wxOVERRIDE + wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const override { // TODO-XP: This duplicates code from in wxGetInfoFromLCID(), but // it's only temporary because we will drop all code using LCID soon. @@ -620,7 +620,7 @@ public: return str; } - wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const wxOVERRIDE + wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const override { // TODO-XP: This duplicates code from in wxGetInfoFromLCID(), but // it's only temporary because we will drop all code using LCID soon. @@ -691,7 +691,7 @@ public: return str; } - wxLayoutDirection GetLayoutDirection() const wxOVERRIDE + wxLayoutDirection GetLayoutDirection() const override { if (wxGetWinVersion() >= wxWinVersion_7) { @@ -708,7 +708,7 @@ public: } int CompareStrings(const wxString& lhs, const wxString& rhs, - int flags) const wxOVERRIDE + int flags) const override { DWORD dwFlags = 0; diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 36b82c0d9f..0bdf0a0f58 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -132,8 +132,8 @@ public: class wxExecuteModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE + virtual bool OnInit() override { return true; } + virtual void OnExit() override { if ( gs_heventShutdown.IsOk() ) { diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp index 932a8b22ad..ee6f170b2d 100644 --- a/src/msw/webview_edge.cpp +++ b/src/msw/webview_edge.cpp @@ -84,7 +84,7 @@ public: void SetHandler(wxWebViewHandler* handler) { m_handler = handler; } - virtual wxString GetRawURI() const wxOVERRIDE + virtual wxString GetRawURI() const override { wxCoTaskMemPtr uri; if (SUCCEEDED(m_request->get_Uri(&uri))) @@ -93,7 +93,7 @@ public: return wxString(); } - virtual wxString GetURI() const wxOVERRIDE + virtual wxString GetURI() const override { wxURI rawURI(GetRawURI()); wxString path = rawURI.GetPath(); @@ -103,7 +103,7 @@ public: return uri; } - virtual wxInputStream* GetData() const wxOVERRIDE + virtual wxInputStream* GetData() const override { if (!m_dataStream) { @@ -129,7 +129,7 @@ public: return m_dataStream; } - virtual wxString GetMethod() const wxOVERRIDE + virtual wxString GetMethod() const override { wxCoTaskMemPtr method; if (SUCCEEDED(m_request->get_Method(&method))) @@ -138,7 +138,7 @@ public: return wxString(); } - virtual wxString GetHeader(const wxString& name) const wxOVERRIDE + virtual wxString GetHeader(const wxString& name) const override { wxCOMPtr headers; if (SUCCEEDED(m_request->get_Headers(&headers))) @@ -186,13 +186,13 @@ public: void SetReason(const wxString& reason) { m_response->put_ReasonPhrase(reason.wc_str()); } - virtual void SetStatus(int status) wxOVERRIDE + virtual void SetStatus(int status) override { m_response->put_StatusCode(status); } - virtual void SetContentType(const wxString& contentType) wxOVERRIDE + virtual void SetContentType(const wxString& contentType) override { SetHeader("Content-Type", contentType); } - virtual void SetHeader(const wxString& name, const wxString& value) wxOVERRIDE + virtual void SetHeader(const wxString& name, const wxString& value) override { wxCOMPtr headers; if (SUCCEEDED(m_response->get_Headers(&headers))) @@ -219,7 +219,7 @@ public: return true; } - virtual void Finish(wxSharedPtr data) wxOVERRIDE + virtual void Finish(wxSharedPtr data) override { SetReason("OK"); // put content @@ -233,7 +233,7 @@ public: SendResponse(); } - virtual void FinishWithError() wxOVERRIDE + virtual void FinishWithError() override { SetStatus(500); SetReason("Error"); @@ -1266,12 +1266,12 @@ public: { } - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { wxWebViewEdgeImpl::Uninitialize(); } diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 44530f7f99..59beb2cb9c 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -7899,7 +7899,7 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam) class wxIdleWakeUpModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { ms_hMsgHookProc = ::SetWindowsHookEx ( @@ -7919,7 +7919,7 @@ public: return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { ::UnhookWindowsHookEx(wxIdleWakeUpModule::ms_hMsgHookProc); } diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp index fdf6933dad..b50430e95a 100644 --- a/src/osx/artmac.cpp +++ b/src/osx/artmac.cpp @@ -32,12 +32,12 @@ class wxMacArtProvider : public wxArtProvider protected: #if wxOSX_USE_COCOA_OR_CARBON virtual wxIconBundle CreateIconBundle(const wxArtID& id, - const wxArtClient& client) wxOVERRIDE; + const wxArtClient& client) override; #endif #if wxOSX_USE_COCOA_OR_IPHONE virtual wxBitmapBundle CreateBitmapBundle(const wxArtID& id, const wxArtClient& client, - const wxSize& size) wxOVERRIDE + const wxSize& size) override { return wxOSXCreateSystemBitmapBundle(id, client, size); } diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index 7e44649bcf..870a2c643b 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -33,7 +33,7 @@ public: wxCursorRefData(const wxCursorRefData& cursor); virtual ~wxCursorRefData(); - virtual bool IsOk() const wxOVERRIDE + virtual bool IsOk() const override { #if wxOSX_USE_COCOA_OR_CARBON if ( m_hCursor != NULL ) diff --git a/src/osx/carbon/dcprint.cpp b/src/osx/carbon/dcprint.cpp index 3039e2fe0d..7ab3f259ce 100644 --- a/src/osx/carbon/dcprint.cpp +++ b/src/osx/carbon/dcprint.cpp @@ -52,13 +52,13 @@ class wxMacCarbonPrinterDC : public wxNativePrinterDC public : wxMacCarbonPrinterDC( wxPrintData* data ) ; virtual ~wxMacCarbonPrinterDC() ; - virtual bool StartDoc( wxPrinterDC* dc , const wxString& message ) wxOVERRIDE ; - virtual void EndDoc( wxPrinterDC* dc ) wxOVERRIDE ; - virtual void StartPage( wxPrinterDC* dc ) wxOVERRIDE ; - virtual void EndPage( wxPrinterDC* dc ) wxOVERRIDE ; - virtual wxUint32 GetStatus() const wxOVERRIDE { return m_err ; } - virtual void GetSize( int *w , int *h) const wxOVERRIDE ; - virtual wxSize GetPPI() const wxOVERRIDE ; + virtual bool StartDoc( wxPrinterDC* dc , const wxString& message ) override ; + virtual void EndDoc( wxPrinterDC* dc ) override ; + virtual void StartPage( wxPrinterDC* dc ) override ; + virtual void EndPage( wxPrinterDC* dc ) override ; + virtual wxUint32 GetStatus() const override { return m_err ; } + virtual void GetSize( int *w , int *h) const override ; + virtual wxSize GetPPI() const override ; private : wxCoord m_maxX ; wxCoord m_maxY ; diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 9b9d52ea48..45e4ca2de6 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -453,7 +453,7 @@ class wxOSXSystemFontsCacheModule : public wxModule public: wxOSXSystemFontsCacheModule() { } - bool OnInit() wxOVERRIDE + bool OnInit() override { for ( auto& p: ms_systemFontsCache ) p = nullptr; @@ -461,7 +461,7 @@ public: return true; } - void OnExit() wxOVERRIDE + void OnExit() override { for ( auto& p: ms_systemFontsCache ) { diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp index 956a96bb46..dab4b49829 100644 --- a/src/osx/carbon/gdiobj.cpp +++ b/src/osx/carbon/gdiobj.cpp @@ -27,10 +27,10 @@ wxFORCE_LINK_THIS_MODULE(gdiobj) class wxStockGDIMac: public wxStockGDI, public wxModule { public: - virtual const wxFont* GetFont(Item item) wxOVERRIDE; + virtual const wxFont* GetFont(Item item) override; - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; private: typedef wxStockGDI super; diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 20bde7fe87..3c9c5283ef 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -169,7 +169,7 @@ public : Init( image , transform ); } - virtual void Render( CGContextRef ctxRef ) wxOVERRIDE + virtual void Render( CGContextRef ctxRef ) override { if (m_image != NULL) wxMacDrawCGImage( ctxRef, &m_imageBounds, m_image ); @@ -217,7 +217,7 @@ public : CGContextStrokeLineSegments( ctxRef , pts , count ); } - virtual void Render( CGContextRef ctxRef ) wxOVERRIDE + virtual void Render( CGContextRef ctxRef ) override { switch ( m_hatch ) { @@ -305,53 +305,53 @@ public : virtual ~wxMacCoreGraphicsMatrixData() ; - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE ; + virtual wxGraphicsObjectRefData *Clone() const override ; // concatenates the matrix - virtual void Concat( const wxGraphicsMatrixData *t ) wxOVERRIDE; + virtual void Concat( const wxGraphicsMatrixData *t ) override; // sets the matrix to the respective values virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; + wxDouble tx=0.0, wxDouble ty=0.0) override; // gets the component valuess of the matrix virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, - wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const wxOVERRIDE; + wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const override; // makes this the inverse matrix - virtual void Invert() wxOVERRIDE; + virtual void Invert() override; // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrixData* t) const wxOVERRIDE ; + virtual bool IsEqual( const wxGraphicsMatrixData* t) const override ; // return true if this is the identity matrix - virtual bool IsIdentity() const wxOVERRIDE; + virtual bool IsIdentity() const override; // // transformation // // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; + virtual void Translate( wxDouble dx , wxDouble dy ) override; // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; + virtual void Scale( wxDouble xScale , wxDouble yScale ) override; // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) wxOVERRIDE; + virtual void Rotate( wxDouble angle ) override; // // apply the transforms // // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) const wxOVERRIDE; + virtual void TransformPoint( wxDouble *x, wxDouble *y ) const override; // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const wxOVERRIDE; + virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const override; // returns the native representation - virtual void * GetNativeMatrix() const wxOVERRIDE; + virtual void * GetNativeMatrix() const override; private : CGAffineTransform m_matrix; @@ -1117,7 +1117,7 @@ public: ~wxMacCoreGraphicsBitmapData(); virtual CGImageRef GetBitmap() { return m_bitmap; } - virtual void* GetNativeBitmap() const wxOVERRIDE { return m_bitmap; } + virtual void* GetNativeBitmap() const override { return m_bitmap; } bool IsMonochrome() { return m_monochrome; } #if wxUSE_IMAGE @@ -1153,25 +1153,25 @@ public : ~wxMacCoreGraphicsPathData(); - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE; + virtual wxGraphicsObjectRefData *Clone() const override; // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void MoveToPoint( wxDouble x, wxDouble y ) override; // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddLineToPoint( wxDouble x, wxDouble y ) override; // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) override; // closes the current sub-path - virtual void CloseSubpath() wxOVERRIDE; + virtual void CloseSubpath() override; // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const wxOVERRIDE; + virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const override; // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) wxOVERRIDE; + virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) override; // // These are convenience functions which - if not available natively will be assembled @@ -1179,36 +1179,36 @@ public : // // adds a quadratic Bezier curve from the current point, using a control point and an end point - virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ) wxOVERRIDE; + virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ) override; // appends a rectangle as a new closed subpath - virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; // appends a circle as a new closed subpath - virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ) wxOVERRIDE; + virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ) override; // appends an ellipsis as a new closed subpath fitting the passed rectangle - virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) - virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) wxOVERRIDE; + virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) override; // adds another path - virtual void AddPath( const wxGraphicsPathData* path ) wxOVERRIDE; + virtual void AddPath( const wxGraphicsPathData* path ) override; // returns the native path - virtual void * GetNativePath() const wxOVERRIDE { return m_path; } + virtual void * GetNativePath() const override { return m_path; } // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void *WXUNUSED(p)) const wxOVERRIDE {} + virtual void UnGetNativePath(void *WXUNUSED(p)) const override {} // transforms each point of this path by the matrix - virtual void Transform( const wxGraphicsMatrixData* matrix ) wxOVERRIDE; + virtual void Transform( const wxGraphicsMatrixData* matrix ) override; // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE; + virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const override; - virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const wxOVERRIDE; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const override; private : CGMutablePathRef m_path; }; @@ -1396,82 +1396,82 @@ public: void Init(); - virtual void StartPage( wxDouble width, wxDouble height ) wxOVERRIDE; + virtual void StartPage( wxDouble width, wxDouble height ) override; - virtual void EndPage() wxOVERRIDE; + virtual void EndPage() override; - virtual void Flush() wxOVERRIDE; + virtual void Flush() override; - void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const wxOVERRIDE; + void GetDPI(wxDouble* dpiX, wxDouble* dpiY) const override; // push the current state of the context, ie the transformation matrix on a stack - virtual void PushState() wxOVERRIDE; + virtual void PushState() override; // pops a stored state from the stack - virtual void PopState() wxOVERRIDE; + virtual void PopState() override; // clips drawings to the region - virtual void Clip( const wxRegion ®ion ) wxOVERRIDE; + virtual void Clip( const wxRegion ®ion ) override; // clips drawings to the rect - virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; // resets the clipping to original extent - virtual void ResetClip() wxOVERRIDE; + virtual void ResetClip() override; // returns bounding box of the clipping region - virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) wxOVERRIDE; + virtual void GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) override; - virtual void * GetNativeContext() wxOVERRIDE; + virtual void * GetNativeContext() override; - virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE; + virtual bool SetAntialiasMode(wxAntialiasMode antialias) override; - virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE; + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) override; - virtual bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE; + virtual bool SetCompositionMode(wxCompositionMode op) override; - virtual void BeginLayer(wxDouble opacity) wxOVERRIDE; + virtual void BeginLayer(wxDouble opacity) override; - virtual void EndLayer() wxOVERRIDE; + virtual void EndLayer() override; // // transformation // // translate - virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE; + virtual void Translate( wxDouble dx , wxDouble dy ) override; // scale - virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE; + virtual void Scale( wxDouble xScale , wxDouble yScale ) override; // rotate (radians) - virtual void Rotate( wxDouble angle ) wxOVERRIDE; + virtual void Rotate( wxDouble angle ) override; // concatenates this transform with the current transform of this context - virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; + virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) override; // sets the transform of this context - virtual void SetTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE; + virtual void SetTransform( const wxGraphicsMatrix& matrix ) override; // gets the matrix of this context - virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE; + virtual wxGraphicsMatrix GetTransform() const override; // // setting the paint // // strokes along a path with the current pen - virtual void StrokePath( const wxGraphicsPath &path ) wxOVERRIDE; + virtual void StrokePath( const wxGraphicsPath &path ) override; // fills a path with the current brush - virtual void FillPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE; + virtual void FillPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) override; // draws a path by first filling and then stroking - virtual void DrawPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE; + virtual void DrawPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) override; // paints a transparent rectangle (only useful for bitmaps or windows) - virtual void ClearRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE; + virtual void ClearRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override; - virtual bool ShouldOffset() const wxOVERRIDE + virtual bool ShouldOffset() const override { if (!m_enableOffset || m_pen.IsNull()) return false; @@ -1497,24 +1497,24 @@ public: // virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const wxOVERRIDE; + wxDouble *descent, wxDouble *externalLeading ) const override; - virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE; + virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const override; // // image support // - virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; - virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; - virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; // fast convenience methods - virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE; + virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override; void SetNativeContext( CGContextRef cg ); @@ -1527,8 +1527,8 @@ private: bool DoSetInterpolationQuality(wxInterpolationQuality interpolation); bool DoSetCompositionMode(wxCompositionMode op); - virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ) wxOVERRIDE; - virtual void DoDrawRotatedText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) wxOVERRIDE; + virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ) override; + virtual void DoDrawRotatedText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) override; CGContextRef m_cgContext; WXWidget m_view; @@ -2825,7 +2825,7 @@ public: m_image = m_bitmap.ConvertToImage(); } - virtual void Flush() wxOVERRIDE + virtual void Flush() override { wxMacCoreGraphicsContext::Flush(); m_image = m_bitmap.ConvertToImage(); @@ -2856,77 +2856,77 @@ public : // Context - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) wxOVERRIDE; - virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) override; + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) override; #if wxUSE_PRINTING_ARCHITECTURE - virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) override; #endif - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) override; - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) override; - virtual wxGraphicsContext * CreateContext( wxWindow* window ) wxOVERRIDE; + virtual wxGraphicsContext * CreateContext( wxWindow* window ) override; #if wxUSE_IMAGE - virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) wxOVERRIDE; + virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) override; #endif // wxUSE_IMAGE - virtual wxGraphicsContext * CreateMeasuringContext() wxOVERRIDE; + virtual wxGraphicsContext * CreateMeasuringContext() override; // Path - virtual wxGraphicsPath CreatePath() wxOVERRIDE; + virtual wxGraphicsPath CreatePath() override; // Matrix virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE; + wxDouble tx=0.0, wxDouble ty=0.0) override; - virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) wxOVERRIDE ; + virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) override ; - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) wxOVERRIDE ; + virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) override ; virtual wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix) override; virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble startX, wxDouble startY, wxDouble endX, wxDouble endY, wxDouble radius, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix) override; // sets the font - virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) wxOVERRIDE ; + virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) override ; virtual wxGraphicsFont CreateFont(double sizeInPixels, const wxString& facename, int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) wxOVERRIDE; + const wxColour& col = *wxBLACK) override; virtual wxGraphicsFont CreateFontAtDPI(const wxFont& font, const wxRealPoint& dpi, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) wxOVERRIDE ; + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) override ; #if wxUSE_IMAGE - virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE; - virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) override; + virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) override; #endif // wxUSE_IMAGE // create a graphics bitmap from a native bitmap - virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) override; // create a native bitmap representation - virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE ; + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) override ; - virtual wxString GetName() const wxOVERRIDE; - virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE; + virtual wxString GetName() const override; + virtual void GetVersion(int *major, int *minor, int *micro) const override; private : wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer); diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp index 89b34f0b9c..e40c7e2a3c 100644 --- a/src/osx/carbon/metafile.cpp +++ b/src/osx/carbon/metafile.cpp @@ -53,7 +53,7 @@ public: virtual ~wxMetafileRefData(); - virtual bool IsOk() const wxOVERRIDE { return m_data != NULL; } + virtual bool IsOk() const override { return m_data != NULL; } void Init(); diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index 4bffa8402e..d5e0c1169f 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -62,17 +62,17 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL ) wxOVERRIDE; + wxHeaderButtonParams* params = NULL ) override; - virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonHeight(wxWindow *win) override; - virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE; + virtual int GetHeaderButtonMargin(wxWindow *win) override; // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton( wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0 ) wxOVERRIDE; + int flags = 0 ) override; // draw a (vertical) sash virtual void DrawSplitterSash( wxWindow *win, @@ -80,53 +80,53 @@ public: const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0 ) wxOVERRIDE; + int flags = 0 ) override; virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCheckBoxSize(wxWindow* win, int flags = 0) wxOVERRIDE; + virtual wxSize GetCheckBoxSize(wxWindow* win, int flags = 0) override; virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; virtual void DrawCollapseButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE; + virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) override; virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE; + virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) override; - virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; - virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; - virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; - virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE; + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) override; #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP virtual void DrawTitleBarBitmap(wxWindow *win, wxDC& dc, const wxRect& rect, wxTitleBarButton button, - int flags = 0) wxOVERRIDE; + int flags = 0) override; #endif // wxHAS_DRAW_TITLE_BAR_BITMAP virtual void DrawGauge(wxWindow* win, @@ -134,9 +134,9 @@ public: const wxRect& rect, int value, int max, - int flags = 0) wxOVERRIDE; + int flags = 0) override; - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) override; private: void DrawMacThemeButton(wxWindow *win, diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index a8443648a2..567205ce6c 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -65,7 +65,7 @@ public: virtual ~wxBitmapRefData(); - bool IsOk() const wxOVERRIDE; + bool IsOk() const override; void Free(); @@ -1754,7 +1754,7 @@ public: const wxString& name, wxBitmapType type, int desiredWidth, - int desiredHeight) wxOVERRIDE; + int desiredHeight) override; }; wxIMPLEMENT_ABSTRACT_CLASS(wxBundleResourceHandler, wxBitmapHandler); @@ -1807,7 +1807,7 @@ public: const wxString& name, wxBitmapType type, int desiredWidth, - int desiredHeight) wxOVERRIDE + int desiredHeight) override { wxCFRef iconURL; wxCFStringRef filePath(name); @@ -1845,7 +1845,7 @@ public: const wxString& name, wxBitmapType type, int desiredWidth, - int desiredHeight) wxOVERRIDE; + int desiredHeight) override; }; diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index 20a7044ef4..df20207bc7 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -32,16 +32,16 @@ public: wxCGColorRefData(const wxCGColorRefData& other); - virtual bool IsOk() const wxOVERRIDE{ return m_cgColour != NULL; } + virtual bool IsOk() const override{ return m_cgColour != NULL; } - virtual CGFloat Red() const wxOVERRIDE { return m_red; } - virtual CGFloat Green() const wxOVERRIDE { return m_green; } - virtual CGFloat Blue() const wxOVERRIDE { return m_blue; } - virtual CGFloat Alpha() const wxOVERRIDE { return m_alpha; } + virtual CGFloat Red() const override { return m_red; } + virtual CGFloat Green() const override { return m_green; } + virtual CGFloat Blue() const override { return m_blue; } + virtual CGFloat Alpha() const override { return m_alpha; } - CGColorRef GetCGColor() const wxOVERRIDE { return m_cgColour; } + CGColorRef GetCGColor() const override { return m_cgColour; } - virtual wxColourRefData* Clone() const wxOVERRIDE { return new wxCGColorRefData(*this); } + virtual wxColourRefData* Clone() const override { return new wxCGColorRefData(*this); } private: void Init(CGFloat components[4]); diff --git a/src/osx/core/display.cpp b/src/osx/core/display.cpp index 6b8004da4c..ea6fb0b4f5 100644 --- a/src/osx/core/display.cpp +++ b/src/osx/core/display.cpp @@ -101,16 +101,16 @@ public: { } - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; - virtual double GetScaleFactor() const wxOVERRIDE; + virtual wxRect GetGeometry() const override; + virtual wxRect GetClientArea() const override; + virtual int GetDepth() const override; + virtual double GetScaleFactor() const override; - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const override; + virtual wxVideoMode GetCurrentMode() const override; + virtual bool ChangeMode(const wxVideoMode& mode) override; - virtual bool IsPrimary() const wxOVERRIDE; + virtual bool IsPrimary() const override; private: CGDirectDisplayID m_id; @@ -123,10 +123,10 @@ class wxDisplayFactoryMacOSX : public wxDisplayFactory public: wxDisplayFactoryMacOSX() {} - virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; - virtual int GetFromWindow(const wxWindow *window) wxOVERRIDE; + virtual wxDisplayImpl *CreateDisplay(unsigned n) override; + virtual unsigned GetCount() override; + virtual int GetFromPoint(const wxPoint& pt) override; + virtual int GetFromWindow(const wxWindow *window) override; protected: wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryMacOSX); @@ -411,17 +411,17 @@ bool wxDisplayImplMacOSX::ChangeMode( const wxVideoMode& mode ) class wxDisplayImplSingleMacOSX : public wxDisplayImplSingle { public: - virtual wxRect GetGeometry() const wxOVERRIDE + virtual wxRect GetGeometry() const override { return wxGetDisplayGeometry(CGMainDisplayID()); } - virtual wxRect GetClientArea() const wxOVERRIDE + virtual wxRect GetClientArea() const override { return wxOSXGetMainDisplayClientArea(); } - virtual int GetDepth() const wxOVERRIDE + virtual int GetDepth() const override { return wxGetDisplayDepth(CGMainDisplayID()); } @@ -430,7 +430,7 @@ public: class wxDisplayFactorySingleMacOSX : public wxDisplayFactorySingle { protected: - virtual wxDisplayImpl *CreateSingleDisplay() wxOVERRIDE + virtual wxDisplayImpl *CreateSingleDisplay() override { return new wxDisplayImplSingleMacOSX; } diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp index 0b9f0cbf45..4cb408dc51 100644 --- a/src/osx/core/hid.cpp +++ b/src/osx/core/hid.cpp @@ -642,11 +642,11 @@ class wxHIDModule : public wxModule public: static wxArrayPtrVoid sm_keyboards; - virtual bool OnInit() wxOVERRIDE + virtual bool OnInit() override { return true; } - virtual void OnExit() wxOVERRIDE + virtual void OnExit() override { for(size_t i = 0; i < sm_keyboards.GetCount(); ++i) delete (wxHIDKeyboard*) sm_keyboards[i]; diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp index fb0a3ca7c3..bdf39f01cc 100644 --- a/src/osx/core/hidjoystick.cpp +++ b/src/osx/core/hidjoystick.cpp @@ -77,7 +77,7 @@ public: virtual ~wxHIDJoystick(); bool Create(int nWhich); - virtual void BuildCookies(CFArrayRef Array) wxOVERRIDE; + virtual void BuildCookies(CFArrayRef Array) override; void MakeCookies(CFArrayRef Array); IOHIDElementCookie* GetCookies(); IOHIDQueueInterface** GetQueue(); @@ -95,7 +95,7 @@ class wxJoystickThread : public wxThread { public: wxJoystickThread(wxHIDJoystick* hid, int joystick); - void* Entry() wxOVERRIDE; + void* Entry() override; static void HIDCallback(void* target, IOReturn res, void* context, void* sender); private: diff --git a/src/osx/core/secretstore.cpp b/src/osx/core/secretstore.cpp index 3dc5410695..db512b04f1 100644 --- a/src/osx/core/secretstore.cpp +++ b/src/osx/core/secretstore.cpp @@ -80,7 +80,7 @@ public: virtual bool Save(const wxString& service, const wxString& user, const wxSecretValueImpl& secret, - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { const wxScopedCharBuffer serviceUTF8 = service.utf8_str(); const wxScopedCharBuffer userUTF8 = user.utf8_str(); @@ -123,7 +123,7 @@ public: virtual bool Load(const wxString& service, wxString* user, wxSecretValueImpl** secret, - wxString& errmsg) const wxOVERRIDE + wxString& errmsg) const override { const wxScopedCharBuffer serviceUTF8 = service.utf8_str(); @@ -190,7 +190,7 @@ public: } virtual bool Delete(const wxString& service, - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { const wxScopedCharBuffer serviceUTF8 = service.utf8_str(); diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp index 3f0c842179..29f9ca93a3 100644 --- a/src/osx/core/sockosx.cpp +++ b/src/osx/core/sockosx.cpp @@ -61,7 +61,7 @@ public: } private: - virtual void DoClose() wxOVERRIDE + virtual void DoClose() override { // No need to do anything if we had never created the underlying // socket: this avoids creating it from Uninstall_Callback() completely @@ -189,16 +189,16 @@ private: class wxSocketManagerMac : public wxSocketManager { public: - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; - virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) wxOVERRIDE + virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) override { return new wxSocketImplMac(wxsocket); } - virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event) wxOVERRIDE; - virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event) wxOVERRIDE; + virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event) override; + virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event) override; private: // return CFSocket callback mask corresponding to the given event (the diff --git a/src/osx/core/sound.cpp b/src/osx/core/sound.cpp index 89ffe70a6e..4f21b88128 100644 --- a/src/osx/core/sound.cpp +++ b/src/osx/core/sound.cpp @@ -38,9 +38,9 @@ public: virtual ~wxOSXAudioToolboxSoundData(); - virtual bool Play(unsigned flags) wxOVERRIDE; + virtual bool Play(unsigned flags) override; - virtual void DoStop() wxOVERRIDE; + virtual void DoStop() override; protected: static void CompletionCallback(SystemSoundID mySSID, void * soundRef); void SoundCompleted(); diff --git a/src/osx/core/utilsexc_cf.cpp b/src/osx/core/utilsexc_cf.cpp index 2614cb4fc4..011dc39c9f 100644 --- a/src/osx/core/utilsexc_cf.cpp +++ b/src/osx/core/utilsexc_cf.cpp @@ -72,7 +72,7 @@ class wxCFEventLoopSourcesManager : public wxEventLoopSourcesManagerBase { public: wxEventLoopSource * - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) wxOVERRIDE + AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) override { wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" ); diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp index 997f6242fb..c303b43545 100644 --- a/src/osx/dataview_osx.cpp +++ b/src/osx/dataview_osx.cpp @@ -102,15 +102,15 @@ public: // // inherited methods from wxDataViewModelNotifier // - virtual bool ItemAdded (wxDataViewItem const &parent, wxDataViewItem const &item) wxOVERRIDE; - virtual bool ItemsAdded (wxDataViewItem const& parent, wxDataViewItemArray const& items) wxOVERRIDE; - virtual bool ItemChanged (wxDataViewItem const& item) wxOVERRIDE; - virtual bool ItemsChanged(wxDataViewItemArray const& items) wxOVERRIDE; - virtual bool ItemDeleted (wxDataViewItem const& parent, wxDataViewItem const& item) wxOVERRIDE; - virtual bool ItemsDeleted(wxDataViewItem const& parent, wxDataViewItemArray const& items) wxOVERRIDE; - virtual bool ValueChanged(wxDataViewItem const& item, unsigned int col) wxOVERRIDE; - virtual bool Cleared() wxOVERRIDE; - virtual void Resort() wxOVERRIDE; + virtual bool ItemAdded (wxDataViewItem const &parent, wxDataViewItem const &item) override; + virtual bool ItemsAdded (wxDataViewItem const& parent, wxDataViewItemArray const& items) override; + virtual bool ItemChanged (wxDataViewItem const& item) override; + virtual bool ItemsChanged(wxDataViewItemArray const& items) override; + virtual bool ItemDeleted (wxDataViewItem const& parent, wxDataViewItem const& item) override; + virtual bool ItemsDeleted(wxDataViewItem const& parent, wxDataViewItemArray const& items) override; + virtual bool ValueChanged(wxDataViewItem const& item, unsigned int col) override; + virtual bool Cleared() override; + virtual void Resort() override; // adjust wxCOL_WIDTH_AUTOSIZE columns to fit the data, does nothing if the // control is frozen but remember it for later diff --git a/src/osx/palette.cpp b/src/osx/palette.cpp index 0d388946a3..cb78603864 100644 --- a/src/osx/palette.cpp +++ b/src/osx/palette.cpp @@ -28,7 +28,7 @@ public: wxPaletteRefData(const wxPaletteRefData& data); virtual ~wxPaletteRefData(); - virtual bool IsOk() const wxOVERRIDE { return m_count > 0; } + virtual bool IsOk() const override { return m_count > 0; } protected: wxColour* m_palette; diff --git a/src/osx/uiaction_osx.cpp b/src/osx/uiaction_osx.cpp index 5f5929ee2d..152d715929 100644 --- a/src/osx/uiaction_osx.cpp +++ b/src/osx/uiaction_osx.cpp @@ -121,15 +121,15 @@ public: return &s_impl; } - virtual bool MouseMove(long x, long y) wxOVERRIDE; - virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; - virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; + virtual bool MouseMove(long x, long y) override; + virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) override; + virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) override; - virtual bool MouseDblClick(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; + virtual bool MouseDblClick(int button = wxMOUSE_BTN_LEFT) override; virtual bool MouseDragDrop(long x1, long y1, long x2, long y2, - int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; + int button = wxMOUSE_BTN_LEFT) override; - virtual bool DoKey(int keycode, int modifiers, bool isDown) wxOVERRIDE; + virtual bool DoKey(int keycode, int modifiers, bool isDown) override; private: // This class has no public ctors, use Get() instead. diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 4b411537cb..e4357aadd2 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -157,7 +157,7 @@ public: virtual ~wxBlindPlateWindow(); - virtual bool AcceptsFocus() const wxOVERRIDE + virtual bool AcceptsFocus() const override { return false; } diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 1e141c42c8..3a703785ae 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -358,16 +358,16 @@ class wxPGDatePickerCtrlEditor : public wxPGEditor public: virtual ~wxPGDatePickerCtrlEditor(); - wxString GetName() const wxOVERRIDE; + wxString GetName() const override; virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid, wxPGProperty* property, const wxPoint& pos, - const wxSize& size) const wxOVERRIDE; - virtual void UpdateControl( wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE; + const wxSize& size) const override; + virtual void UpdateControl( wxPGProperty* property, wxWindow* wnd ) const override; virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, - wxWindow* wnd, wxEvent& event ) const wxOVERRIDE; - virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* wnd ) const wxOVERRIDE; - virtual void SetValueToUnspecified( wxPGProperty* WXUNUSED(property), wxWindow* wnd ) const wxOVERRIDE; + wxWindow* wnd, wxEvent& event ) const override; + virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* wnd ) const override; + virtual void SetValueToUnspecified( wxPGProperty* WXUNUSED(property), wxWindow* wnd ) const override; }; diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index eebef1afa8..845bc42eef 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -626,7 +626,7 @@ public: virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, - int flags ) const wxOVERRIDE + int flags ) const override { wxPropertyGrid* pg = GetGrid(); @@ -643,7 +643,7 @@ public: } } - virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE + virtual wxCoord OnMeasureItem( size_t item ) const override { wxPropertyGrid* pg = GetGrid(); wxRect rect; @@ -661,7 +661,7 @@ public: return pg; } - virtual wxCoord OnMeasureItemWidth( size_t item ) const wxOVERRIDE + virtual wxCoord OnMeasureItemWidth( size_t item ) const override { wxPropertyGrid* pg = GetGrid(); wxRect rect; @@ -686,7 +686,7 @@ public: #endif virtual void PositionTextCtrl( int textCtrlXAdjust, - int WXUNUSED(textCtrlYAdjust) ) wxOVERRIDE + int WXUNUSED(textCtrlYAdjust) ) override { #ifdef wxPG_TEXTCTRLXADJUST textCtrlXAdjust = wxPG_TEXTCTRLXADJUST - diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index fb62bf3dbe..75d8a17766 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -419,7 +419,7 @@ public: } } - virtual void OnColumnCountChanging(unsigned int count) wxOVERRIDE + virtual void OnColumnCountChanging(unsigned int count) override { EnsureColumnCount(count); } @@ -438,7 +438,7 @@ public: UpdateAllColumns(); } - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const override { return *m_columns[idx]; } @@ -2372,7 +2372,7 @@ public: m_it.Init(manager->GetPage(0), flags); } virtual ~wxPGVIteratorBase_Manager() { } - virtual void Next() wxOVERRIDE + virtual void Next() override { m_it.Next(); diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index bec49a8d02..613afb9953 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -145,8 +145,8 @@ class wxPGGlobalVarsClassManager : public wxModule wxDECLARE_DYNAMIC_CLASS(wxPGGlobalVarsClassManager); public: wxPGGlobalVarsClassManager() {} - virtual bool OnInit() wxOVERRIDE { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; } - virtual void OnExit() wxOVERRIDE { wxDELETE(wxPGGlobalVars); } + virtual bool OnInit() override { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; } + virtual void OnExit() override { wxDELETE(wxPGGlobalVars); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxPGGlobalVarsClassManager, wxModule); @@ -3879,7 +3879,7 @@ public: } private: - bool ProcessEvent( wxEvent& event ) wxOVERRIDE + bool ProcessEvent( wxEvent& event ) override { // Always skip event.Skip(); diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp index 128ab3ac0b..06e7e4e2b8 100644 --- a/src/propgrid/propgridiface.cpp +++ b/src/propgrid/propgridiface.cpp @@ -889,7 +889,7 @@ public: m_it.Init( state, flags ); } virtual ~wxPGVIteratorBase_State() { } - virtual void Next() wxOVERRIDE { m_it.Next(); } + virtual void Next() override { m_it.Next(); } }; wxPGVIterator wxPropertyGridInterface::GetVIterator( int flags ) const diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index c12cbea594..526fa35c88 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -1935,7 +1935,7 @@ public: { } - virtual bool DoShowDialog(wxPropertyGrid* pg, wxPGProperty* prop) wxOVERRIDE + virtual bool DoShowDialog(wxPropertyGrid* pg, wxPGProperty* prop) override { wxEditorDialogProperty* dlgProp = wxDynamicCast(prop, wxEditorDialogProperty); wxCHECK_MSG(dlgProp, false, "Function called for incompatible property"); diff --git a/src/qt/anybutton.cpp b/src/qt/anybutton.cpp index 5b21721194..6f928d3822 100644 --- a/src/qt/anybutton.cpp +++ b/src/qt/anybutton.cpp @@ -27,7 +27,7 @@ public: wxQtPushButton( wxWindow *parent, wxAnyButton *handler); private: - virtual bool event(QEvent* e) wxOVERRIDE; + virtual bool event(QEvent* e) override; void action(); // press, release void clicked(bool); }; diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp index 9399820bf6..1787fabfc5 100644 --- a/src/qt/choice.cpp +++ b/src/qt/choice.cpp @@ -22,7 +22,7 @@ class LexicalSortProxyModel : public QSortFilterProxyModel public: explicit LexicalSortProxyModel(QObject* owner) : QSortFilterProxyModel(owner) {} - bool lessThan( const QModelIndex &left, const QModelIndex &right ) const wxOVERRIDE + bool lessThan( const QModelIndex &left, const QModelIndex &right ) const override { const QVariant leftData = sourceModel()->data( left ); const QVariant rightData = sourceModel()->data( right ); diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp index c9d6abe430..87d44d1db0 100644 --- a/src/qt/combobox.cpp +++ b/src/qt/combobox.cpp @@ -23,8 +23,8 @@ class wxQtComboBox : public wxQtEventSignalHandler< QComboBox, wxComboBox > { public: wxQtComboBox( wxWindow *parent, wxComboBox *handler ); - virtual void showPopup() wxOVERRIDE; - virtual void hidePopup() wxOVERRIDE; + virtual void showPopup() override; + virtual void hidePopup() override; class IgnoreTextChange { diff --git a/src/qt/display.cpp b/src/qt/display.cpp index 6d3de3ac2e..37c1d8493f 100644 --- a/src/qt/display.cpp +++ b/src/qt/display.cpp @@ -19,14 +19,14 @@ class wxDisplayImplQt : public wxDisplayImpl public: wxDisplayImplQt( unsigned n ); - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual int GetDepth() const wxOVERRIDE; + virtual wxRect GetGeometry() const override; + virtual wxRect GetClientArea() const override; + virtual int GetDepth() const override; #if wxUSE_DISPLAY - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const override; + virtual wxVideoMode GetCurrentMode() const override; + virtual bool ChangeMode(const wxVideoMode& mode) override; #endif // wxUSE_DISPLAY }; @@ -79,9 +79,9 @@ bool wxDisplayImplQt::ChangeMode(const wxVideoMode& WXUNUSED(mode)) class wxDisplayFactoryQt : public wxDisplayFactory { public: - virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; + virtual wxDisplayImpl *CreateDisplay(unsigned n) override; + virtual unsigned GetCount() override; + virtual int GetFromPoint(const wxPoint& pt) override; }; wxDisplayImpl *wxDisplayFactoryQt::CreateDisplay(unsigned n) @@ -111,7 +111,7 @@ int wxDisplayFactoryQt::GetFromPoint(const wxPoint& pt) class wxDisplayFactorySingleQt : public wxDisplayFactorySingleQt { protected: - virtual wxDisplayImpl *CreateSingleDisplay() wxOVERRIDE + virtual wxDisplayImpl *CreateSingleDisplay() override { return new wxDisplayImplQt(0); } diff --git a/src/qt/dnd.cpp b/src/qt/dnd.cpp index b7655f56d5..37fddbb597 100644 --- a/src/qt/dnd.cpp +++ b/src/qt/dnd.cpp @@ -161,7 +161,7 @@ public: } } - virtual bool eventFilter(QObject* watched, QEvent* event) wxOVERRIDE + virtual bool eventFilter(QObject* watched, QEvent* event) override { if ( m_dropTarget != NULL ) { diff --git a/src/qt/evtloop.cpp b/src/qt/evtloop.cpp index 3523099ae3..818ed70b95 100644 --- a/src/qt/evtloop.cpp +++ b/src/qt/evtloop.cpp @@ -27,7 +27,7 @@ class wxQtIdleTimer : public QTimer, public wxRefCounter public: wxQtIdleTimer(); ~wxQtIdleTimer(); - virtual bool eventFilter( QObject * watched, QEvent * event ) wxOVERRIDE; + virtual bool eventFilter( QObject * watched, QEvent * event ) override; private: void idle(); @@ -239,7 +239,7 @@ class wxQtEventLoopSourcesManager : public wxEventLoopSourcesManagerBase { public: wxEventLoopSource* - AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags) wxOVERRIDE + AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags) override { return new wxQtEventLoopSource(fd, handler, flags); } diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp index 5654054d42..24682709ff 100644 --- a/src/qt/frame.cpp +++ b/src/qt/frame.cpp @@ -29,7 +29,7 @@ public: wxQtMainWindow( wxWindow *parent, wxFrame *handler ); private: - virtual bool focusNextPrevChild(bool) wxOVERRIDE { return false; } + virtual bool focusNextPrevChild(bool) override { return false; } }; // Central widget helper (container to show scroll bars and receive events): diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp index f1f5acbd83..0e4000c7e8 100644 --- a/src/qt/glcanvas.cpp +++ b/src/qt/glcanvas.cpp @@ -34,13 +34,13 @@ public: } protected: - virtual void showEvent ( QShowEvent * event ) wxOVERRIDE; - virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE; - virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE; - virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE; + virtual void showEvent ( QShowEvent * event ) override; + virtual void hideEvent ( QHideEvent * event ) override; + virtual void resizeEvent ( QResizeEvent * event ) override; + virtual void paintEvent ( QPaintEvent * event ) override; - virtual void resizeGL(int w, int h) wxOVERRIDE; - virtual void paintGL() wxOVERRIDE; + virtual void resizeGL(int w, int h) override; + virtual void paintGL() override; }; void wxQtGLWidget::showEvent ( QShowEvent * event ) diff --git a/src/qt/graphics.cpp b/src/qt/graphics.cpp index 639444e2e3..d440ce72a2 100644 --- a/src/qt/graphics.cpp +++ b/src/qt/graphics.cpp @@ -185,7 +185,7 @@ public: return m_pixmap; } - virtual void* GetNativeBitmap() const wxOVERRIDE + virtual void* GetNativeBitmap() const override { return m_pixmap; } @@ -233,7 +233,7 @@ public: delete m_transform; } - virtual wxGraphicsObjectRefData* Clone() const wxOVERRIDE + virtual wxGraphicsObjectRefData* Clone() const override { wxQtMatrixData* newMatrix = new wxQtMatrixData(m_renderer); *newMatrix->m_transform = *m_transform; @@ -241,7 +241,7 @@ public: } // concatenates the matrix - virtual void Concat(const wxGraphicsMatrixData *t) wxOVERRIDE + virtual void Concat(const wxGraphicsMatrixData *t) override { const wxQtMatrixData* rhs = static_cast(t); *m_transform = *rhs->m_transform* (*m_transform); @@ -250,7 +250,7 @@ public: // sets the matrix to the respective values virtual void Set(wxDouble a = 1.0, wxDouble b = 0.0, wxDouble c = 0.0, wxDouble d = 1.0, - wxDouble tx = 0.0, wxDouble ty = 0.0) wxOVERRIDE + wxDouble tx = 0.0, wxDouble ty = 0.0) override { m_transform->setMatrix(a, b, 0.0, c, d, 0.0, @@ -260,7 +260,7 @@ public: // gets the component values of the matrix virtual void Get(wxDouble* a, wxDouble* b, wxDouble* c, wxDouble* d, - wxDouble* tx, wxDouble* ty) const wxOVERRIDE + wxDouble* tx, wxDouble* ty) const override { if ( a ) *a = m_transform->m11(); @@ -277,7 +277,7 @@ public: } // makes this the inverse matrix - virtual void Invert() wxOVERRIDE + virtual void Invert() override { bool invertible = false; const QTransform invTransform = m_transform->inverted(&invertible); @@ -288,14 +288,14 @@ public: } // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual(const wxGraphicsMatrixData* t) const wxOVERRIDE + virtual bool IsEqual(const wxGraphicsMatrixData* t) const override { const wxQtMatrixData* rhs = static_cast(t); return *m_transform == *rhs->m_transform; } // return true if this is the identity matrix - virtual bool IsIdentity() const wxOVERRIDE + virtual bool IsIdentity() const override { return m_transform->isIdentity(); } @@ -305,19 +305,19 @@ public: // // add the translation to this matrix - virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE + virtual void Translate(wxDouble dx, wxDouble dy) override { m_transform->translate(dx, dy); } // add the scale to this matrix - virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE + virtual void Scale(wxDouble xScale, wxDouble yScale) override { m_transform->scale(xScale, yScale); } // add the rotation to this matrix (radians) - virtual void Rotate(wxDouble angle) wxOVERRIDE + virtual void Rotate(wxDouble angle) override { m_transform->rotateRadians(angle); } @@ -327,7 +327,7 @@ public: // // applies that matrix to the point - virtual void TransformPoint(wxDouble *x, wxDouble *y) const wxOVERRIDE + virtual void TransformPoint(wxDouble *x, wxDouble *y) const override { qreal transformed_x, transformed_y; m_transform->map(static_cast(*x), static_cast(*y), @@ -337,7 +337,7 @@ public: } // applies the matrix except for translations - virtual void TransformDistance(wxDouble *dx, wxDouble *dy) const wxOVERRIDE + virtual void TransformDistance(wxDouble *dx, wxDouble *dy) const override { const QTransform untransTransform( m_transform->m11(), @@ -359,7 +359,7 @@ public: } // returns the native representation - virtual void* GetNativeMatrix() const wxOVERRIDE + virtual void* GetNativeMatrix() const override { return static_cast(m_transform); } @@ -449,7 +449,7 @@ public: delete m_path; } - virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE + virtual wxGraphicsObjectRefData *Clone() const override { return new wxQtGraphicsPathData(*this); } @@ -460,7 +460,7 @@ public: // // begins a new subpath at (x,y) - virtual void MoveToPoint(wxDouble x, wxDouble y) wxOVERRIDE + virtual void MoveToPoint(wxDouble x, wxDouble y) override { m_path->moveTo(x, y); m_current_subpath_start = m_path->elementCount() - 1; @@ -468,7 +468,7 @@ public: // adds a straight line from the current point to (x,y) // if there is no current path, it is equivalent to a moveTo. - virtual void AddLineToPoint(wxDouble x, wxDouble y) wxOVERRIDE + virtual void AddLineToPoint(wxDouble x, wxDouble y) override { if ( !HasCurrentSubpath() ) MoveToPoint(x, y); @@ -481,7 +481,7 @@ public: virtual void AddCurveToPoint(wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, - wxDouble x, wxDouble y) wxOVERRIDE + wxDouble x, wxDouble y) override { if ( !HasCurrentSubpath() ) MoveToPoint(cx1, cy1); @@ -493,7 +493,7 @@ public: virtual void AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, - bool clockwise) wxOVERRIDE + bool clockwise) override { const bool fixupFirst = !HasCurrentSubpath(); if ( fixupFirst ) @@ -523,7 +523,7 @@ public: } // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint(wxDouble* x, wxDouble* y) const wxOVERRIDE + virtual void GetCurrentPoint(wxDouble* x, wxDouble* y) const override { QPointF position = m_path->currentPosition(); *x = position.x(); @@ -531,7 +531,7 @@ public: } // adds another path - virtual void AddPath(const wxGraphicsPathData* path) wxOVERRIDE + virtual void AddPath(const wxGraphicsPathData* path) override { const wxQtGraphicsPathData* pathAdded = static_cast(path); @@ -539,7 +539,7 @@ public: } // closes the current sub-path - virtual void CloseSubpath() wxOVERRIDE + virtual void CloseSubpath() override { // Current position must be end of last path after close, not (0,0) as // Qt sets. @@ -559,32 +559,32 @@ public: // // appends a circle as a new closed subpath - virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) wxOVERRIDE + virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) override { m_path->addEllipse(x - r, y - r, r*2, r*2); } // appends an ellipse as a new closed subpath fitting the passed rectangle virtual void - AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE + AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override { m_path->addEllipse(x, y, w, h); } // returns the native path - virtual void* GetNativePath() const wxOVERRIDE + virtual void* GetNativePath() const override { return static_cast(m_path); } // give the native path returned by GetNativePath() back (there might be // some deallocations necessary) - virtual void UnGetNativePath(void *) const wxOVERRIDE + virtual void UnGetNativePath(void *) const override { } // transforms each point of this path by the matrix - virtual void Transform(const wxGraphicsMatrixData* matrix) wxOVERRIDE + virtual void Transform(const wxGraphicsMatrixData* matrix) override { const wxQtMatrixData* qmatrix = static_cast(matrix); @@ -594,7 +594,7 @@ public: // gets the bounding box enclosing all points (possibly including control // points) virtual void - GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE + GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const override { QRectF boundingRect = m_path->controlPointRect(); @@ -609,7 +609,7 @@ public: virtual bool Contains(wxDouble x, wxDouble y, - wxPolygonFillMode /*fillStyle = wxWINDING_RULE*/) const wxOVERRIDE + wxPolygonFillMode /*fillStyle = wxWINDING_RULE*/) const override { return m_path->contains(QPointF(x, y)); } @@ -703,31 +703,31 @@ public: m_height = sz.y; } - virtual bool ShouldOffset() const wxOVERRIDE + virtual bool ShouldOffset() const override { return false; } - virtual void Clip(const wxRegion& region) wxOVERRIDE + virtual void Clip(const wxRegion& region) override { m_qtPainter->setClipRegion(region.GetHandle()); } // clips drawings to the rect - virtual void Clip(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE + virtual void Clip(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override { m_qtPainter->setClipRect(x, y, w, h); } // resets the clipping to original extent - virtual void ResetClip() wxOVERRIDE + virtual void ResetClip() override { m_qtPainter->setClipping(false); } // returns bounding box of the clipping region virtual void - GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) wxOVERRIDE + GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h) override { const QRectF box = m_qtPainter->clipBoundingRect(); if ( x ) @@ -740,12 +740,12 @@ public: *h = box.height(); } - virtual void* GetNativeContext() wxOVERRIDE + virtual void* GetNativeContext() override { return static_cast(m_qtPainter); } - virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE + virtual bool SetAntialiasMode(wxAntialiasMode antialias) override { bool enableAA = false; switch ( antialias ) @@ -768,7 +768,7 @@ public: } virtual bool - SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE + SetInterpolationQuality(wxInterpolationQuality interpolation) override { m_qtPainter->setRenderHint(QPainter::SmoothPixmapTransform, interpolation == wxINTERPOLATION_BEST); @@ -776,7 +776,7 @@ public: return true; } - virtual bool SetCompositionMode(wxCompositionMode composition) wxOVERRIDE + virtual bool SetCompositionMode(wxCompositionMode composition) override { QPainter::CompositionMode q_composition_mode; switch ( composition ) @@ -828,17 +828,17 @@ public: return true; } - virtual void BeginLayer(wxDouble /*opacity*/) wxOVERRIDE + virtual void BeginLayer(wxDouble /*opacity*/) override { wxFAIL_MSG("BeginLayer not implemented"); } - virtual void EndLayer() wxOVERRIDE + virtual void EndLayer() override { wxFAIL_MSG("EndLayer not implemented"); } - virtual void StrokePath(const wxGraphicsPath& p) wxOVERRIDE + virtual void StrokePath(const wxGraphicsPath& p) override { if ( m_pen.IsNull() ) { @@ -854,7 +854,7 @@ public: virtual void FillPath(const wxGraphicsPath& p, - wxPolygonFillMode /*fillStyle = wxWINDING_RULE*/) wxOVERRIDE + wxPolygonFillMode /*fillStyle = wxWINDING_RULE*/) override { if ( m_brush.IsNull() ) { @@ -869,29 +869,29 @@ public: } virtual void - ClearRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE + ClearRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) override { m_qtPainter->fillRect(x, y, w, h, QBrush(QColor(0, 0, 0, 0))); } - virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE + virtual void Translate(wxDouble dx, wxDouble dy) override { m_qtPainter->translate(dx, dy); } - virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE + virtual void Scale(wxDouble xScale, wxDouble yScale) override { m_qtPainter->scale(xScale, yScale); } - virtual void Rotate(wxDouble angle) wxOVERRIDE + virtual void Rotate(wxDouble angle) override { // wx angle is in radians. Qt angle is in degrees. m_qtPainter->rotate(wxRadToDeg(angle)); } // concatenates this transform with the current transform of this context - virtual void ConcatTransform(const wxGraphicsMatrix& matrix) wxOVERRIDE + virtual void ConcatTransform(const wxGraphicsMatrix& matrix) override { wxGraphicsMatrix currentMatrix = GetTransform(); currentMatrix.Concat(matrix); @@ -899,7 +899,7 @@ public: } // sets the transform of this context - virtual void SetTransform(const wxGraphicsMatrix& matrix) wxOVERRIDE + virtual void SetTransform(const wxGraphicsMatrix& matrix) override { const wxQtMatrixData* qmatrix = static_cast(matrix.GetRefData()); @@ -907,7 +907,7 @@ public: } // gets the matrix of this context - virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE + virtual wxGraphicsMatrix GetTransform() const override { const QTransform& transform = m_qtPainter->transform(); wxGraphicsMatrix m; @@ -917,7 +917,7 @@ public: virtual void DrawBitmap(const wxGraphicsBitmap& bmp, - wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE + wxDouble x, wxDouble y, wxDouble w, wxDouble h) override { const QPixmap* pixmap = wxQtBitmapData::GetPixmapFromBitmap(bmp); m_qtPainter->drawPixmap(x, y, w, h, *pixmap); @@ -925,29 +925,29 @@ public: virtual void DrawBitmap(const wxBitmap& bmp, - wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE + wxDouble x, wxDouble y, wxDouble w, wxDouble h) override { DoDrawBitmap(bmp, x, y, w, h, true); } virtual void DrawIcon(const wxIcon& icon, - wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE + wxDouble x, wxDouble y, wxDouble w, wxDouble h) override { DoDrawBitmap(icon, x, y, w, h, true); } - virtual void PushState() wxOVERRIDE + virtual void PushState() override { m_qtPainter->save(); } - virtual void PopState() wxOVERRIDE + virtual void PopState() override { m_qtPainter->restore(); } - virtual void Flush() wxOVERRIDE + virtual void Flush() override { } @@ -955,7 +955,7 @@ public: wxDouble *width, wxDouble *height, wxDouble *descent, - wxDouble *externalLeading) const wxOVERRIDE + wxDouble *externalLeading) const override { wxCHECK_RET( !m_font.IsNull(), "wxQtContext::GetTextExtent - no valid font set" ); @@ -981,7 +981,7 @@ public: virtual void GetPartialTextExtents(const wxString& text, - wxArrayDouble& widths) const wxOVERRIDE + wxArrayDouble& widths) const override { wxCHECK_RET( !m_font.IsNull(), "wxQtContext::GetPartialTextExtents - no valid font set" ); @@ -1010,7 +1010,7 @@ public: protected: virtual void - DoDrawText(const wxString& str, wxDouble x, wxDouble y) wxOVERRIDE + DoDrawText(const wxString& str, wxDouble x, wxDouble y) override { wxCHECK_RET( !m_font.IsNull(), "wxQtContext::DrawText - no valid font set" ); @@ -1100,81 +1100,81 @@ public: // Context - virtual wxGraphicsContext* CreateContext(const wxWindowDC& dc) wxOVERRIDE; - virtual wxGraphicsContext* CreateContext(const wxMemoryDC& dc) wxOVERRIDE; + virtual wxGraphicsContext* CreateContext(const wxWindowDC& dc) override; + virtual wxGraphicsContext* CreateContext(const wxMemoryDC& dc) override; #if wxUSE_PRINTING_ARCHITECTURE - virtual wxGraphicsContext* CreateContext(const wxPrinterDC& dc) wxOVERRIDE; + virtual wxGraphicsContext* CreateContext(const wxPrinterDC& dc) override; #endif - virtual wxGraphicsContext* CreateContextFromNativeContext(void* context) wxOVERRIDE; + virtual wxGraphicsContext* CreateContextFromNativeContext(void* context) override; - virtual wxGraphicsContext* CreateContextFromNativeWindow(void* window) wxOVERRIDE; + virtual wxGraphicsContext* CreateContextFromNativeWindow(void* window) override; #if wxUSE_IMAGE - virtual wxGraphicsContext* CreateContextFromImage(wxImage& image) wxOVERRIDE; + virtual wxGraphicsContext* CreateContextFromImage(wxImage& image) override; #endif // wxUSE_IMAGE - virtual wxGraphicsContext* CreateContext(wxWindow* window) wxOVERRIDE; + virtual wxGraphicsContext* CreateContext(wxWindow* window) override; - virtual wxGraphicsContext* CreateMeasuringContext() wxOVERRIDE; + virtual wxGraphicsContext* CreateMeasuringContext() override; // Path - virtual wxGraphicsPath CreatePath() wxOVERRIDE; + virtual wxGraphicsPath CreatePath() override; // Matrix virtual wxGraphicsMatrix CreateMatrix(wxDouble a = 1.0, wxDouble b = 0.0, wxDouble c = 0.0, wxDouble d = 1.0, - wxDouble tx = 0.0, wxDouble ty = 0.0) wxOVERRIDE; + wxDouble tx = 0.0, wxDouble ty = 0.0) override; - virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) wxOVERRIDE; + virtual wxGraphicsPen CreatePen(const wxGraphicsPenInfo& info) override; - virtual wxGraphicsBrush CreateBrush(const wxBrush& brush) wxOVERRIDE; + virtual wxGraphicsBrush CreateBrush(const wxBrush& brush) override; virtual wxGraphicsBrush CreateLinearGradientBrush(wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble startX, wxDouble startY, wxDouble endX, wxDouble endY, wxDouble radius, const wxGraphicsGradientStops& stops, - const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) wxOVERRIDE; + const wxGraphicsMatrix& matrix = wxNullGraphicsMatrix) override; // sets the font virtual wxGraphicsFont CreateFont(const wxFont& font, - const wxColour& col = *wxBLACK) wxOVERRIDE; + const wxColour& col = *wxBLACK) override; virtual wxGraphicsFont CreateFont(double sizeInPixels, const wxString& facename, int flags = wxFONTFLAG_DEFAULT, - const wxColour& col = *wxBLACK) wxOVERRIDE; + const wxColour& col = *wxBLACK) override; virtual wxGraphicsFont CreateFontAtDPI(const wxFont& font, const wxRealPoint& dpi, - const wxColour& col) wxOVERRIDE; + const wxColour& col) override; // create a native bitmap representation - virtual wxGraphicsBitmap CreateBitmap(const wxBitmap& bitmap) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmap(const wxBitmap& bitmap) override; #if wxUSE_IMAGE - virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE; - virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) override; + virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) override; #endif // wxUSE_IMAGE // create a graphics bitmap from a native bitmap - virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap(void* bitmap) wxOVERRIDE; + virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap(void* bitmap) override; // create a subimage from a native image representation virtual wxGraphicsBitmap CreateSubBitmap(const wxGraphicsBitmap& bitmap, wxDouble x, wxDouble y, - wxDouble w, wxDouble h) wxOVERRIDE; + wxDouble w, wxDouble h) override; - virtual wxString GetName() const wxOVERRIDE; + virtual wxString GetName() const override; virtual void GetVersion(int *major, int *minor, - int *micro) const wxOVERRIDE; + int *micro) const override; wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxQtGraphicsRenderer); }; diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp index 30d4019fae..ce6d98a9df 100644 --- a/src/qt/listctrl.cpp +++ b/src/qt/listctrl.cpp @@ -91,7 +91,7 @@ public: QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &WXUNUSED(option), - const QModelIndex &index) const wxOVERRIDE + const QModelIndex &index) const override { if (m_textCtrl != NULL) destroyEditor(m_textCtrl->GetHandle(), m_currentModelIndex); @@ -103,7 +103,7 @@ public: } void destroyEditor(QWidget *WXUNUSED(editor), - const QModelIndex &WXUNUSED(index)) const wxOVERRIDE + const QModelIndex &WXUNUSED(index)) const override { if (m_textCtrl != NULL) { @@ -115,7 +115,7 @@ public: void setModelData(QWidget *WXUNUSED(editor), QAbstractItemModel *WXUNUSED(model), - const QModelIndex &WXUNUSED(index)) const wxOVERRIDE + const QModelIndex &WXUNUSED(index)) const override { // Don't set model data until wx has had a chance to send out events } @@ -152,16 +152,16 @@ public: { } - int rowCount(const QModelIndex& WXUNUSED(parent)) const wxOVERRIDE + int rowCount(const QModelIndex& WXUNUSED(parent)) const override { return static_cast(m_rows.size()); } - int columnCount(const QModelIndex& WXUNUSED(parent)) const wxOVERRIDE + int columnCount(const QModelIndex& WXUNUSED(parent)) const override { return static_cast(m_headers.size()); } - QVariant data(const QModelIndex &index, int role) const wxOVERRIDE + QVariant data(const QModelIndex &index, int role) const override { const int row = index.row(); const int col = index.column(); @@ -238,7 +238,7 @@ public: const QModelIndex &index, const QVariant &value, int role - ) wxOVERRIDE + ) override { const int row = index.row(); const int col = index.column(); @@ -282,7 +282,7 @@ public: int section, Qt::Orientation orientation, int role - ) const wxOVERRIDE + ) const override { if ( orientation == Qt::Vertical ) return QVariant(); @@ -303,7 +303,7 @@ public: return QVariant(); } - Qt::ItemFlags flags(const QModelIndex &index) const wxOVERRIDE + Qt::ItemFlags flags(const QModelIndex &index) const override { Qt::ItemFlags itemFlags = Qt::ItemIsSelectable | Qt::ItemNeverHasChildren; @@ -317,7 +317,7 @@ public: return itemFlags | QAbstractTableModel::flags(index); } - bool removeRows(int row, int count, const QModelIndex &parent) wxOVERRIDE + bool removeRows(int row, int count, const QModelIndex &parent) override { if ( count == 0 ) return true; @@ -330,7 +330,7 @@ public: bool removeColumns(int column, int count, - const QModelIndex &parent) wxOVERRIDE + const QModelIndex &parent) override { if ( count == 0 ) return true; @@ -845,12 +845,12 @@ public: { } - int rowCount(const QModelIndex& WXUNUSED(parent)) const wxOVERRIDE + int rowCount(const QModelIndex& WXUNUSED(parent)) const override { return m_rowCount; } - QVariant data(const QModelIndex &index, int role) const wxOVERRIDE + QVariant data(const QModelIndex &index, int role) const override { wxListCtrl *listCtrl = GetListCtrl(); @@ -880,7 +880,7 @@ public: return QVariant(); } - bool GetItem(wxListItem& info) wxOVERRIDE + bool GetItem(wxListItem& info) override { const int row = static_cast(info.GetId()); const int col = info.m_col; @@ -893,12 +893,12 @@ public: return true; } - bool IsVirtual() const wxOVERRIDE + bool IsVirtual() const override { return true; } - void SetVirtualItemCount(long count) wxOVERRIDE + void SetVirtualItemCount(long count) override { beginResetModel(); m_rowCount = static_cast(count); @@ -919,7 +919,7 @@ public: void closeEditor( QWidget *editor, QAbstractItemDelegate::EndEditHint hint - ) wxOVERRIDE + ) override { // Close process can re-signal closeEditor so we need to guard against // reentrant calls. @@ -970,7 +970,7 @@ public: return m_itemDelegate.GetEditControl(); } - virtual void paintEvent(QPaintEvent *event) wxOVERRIDE + virtual void paintEvent(QPaintEvent *event) override { QTreeView::paintEvent(event); } diff --git a/src/qt/sockqt.cpp b/src/qt/sockqt.cpp index cbd5faad18..b0c88402f8 100644 --- a/src/qt/sockqt.cpp +++ b/src/qt/sockqt.cpp @@ -54,7 +54,7 @@ public: class QtFDIOManager : public wxFDIOManager { public: - virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE + virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) override { QSocketNotifier::Type type; switch (d) @@ -73,7 +73,7 @@ public: } virtual void - RemoveInput(wxFDIOHandler* handler, int fd, Direction d) wxOVERRIDE + RemoveInput(wxFDIOHandler* handler, int fd, Direction d) override { QSocketNotifier::Type type = d == INPUT ? QSocketNotifier::Read : QSocketNotifier::Write; diff --git a/src/qt/spinbutt.cpp b/src/qt/spinbutt.cpp index ec0de2b212..9e67818451 100644 --- a/src/qt/spinbutt.cpp +++ b/src/qt/spinbutt.cpp @@ -20,7 +20,7 @@ public: private: void valueChanged(int value); - virtual void stepBy(int steps) wxOVERRIDE; // see QAbstractSpinBox::stepBy() + virtual void stepBy(int steps) override; // see QAbstractSpinBox::stepBy() }; wxQtSpinButton::wxQtSpinButton( wxWindow *parent, wxSpinButton *handler ) diff --git a/src/qt/textctrl.cpp b/src/qt/textctrl.cpp index 56c2c2974b..c7b908065a 100644 --- a/src/qt/textctrl.cpp +++ b/src/qt/textctrl.cpp @@ -104,34 +104,34 @@ public: { } - virtual bool IsModified() const wxOVERRIDE + virtual bool IsModified() const override { return m_edit->isWindowModified(); } - virtual wxString DoGetValue() const wxOVERRIDE + virtual wxString DoGetValue() const override { return wxQtConvertString( m_edit->toPlainText() ); } - virtual long GetInsertionPoint() const wxOVERRIDE + virtual long GetInsertionPoint() const override { QTextCursor cursor = m_edit->textCursor(); return cursor.anchor(); } - virtual QWidget *GetHandle() const wxOVERRIDE + virtual QWidget *GetHandle() const override { return m_edit; } - virtual int GetNumberOfLines() const wxOVERRIDE + virtual int GetNumberOfLines() const override { const wxString &value = DoGetValue(); return std::count(value.begin(), value.end(), '\n') + 1; } - virtual int GetLineLength(long lineNo) const wxOVERRIDE + virtual int GetLineLength(long lineNo) const override { wxQtLineInfo start = GetLineInfo(lineNo, DoGetValue()); if ( start.startPos == wxString::npos ) @@ -140,7 +140,7 @@ public: return start.endPos - start.startPos; } - virtual wxString GetLineText(long lineNo) const wxOVERRIDE + virtual wxString GetLineText(long lineNo) const override { const wxString &value = DoGetValue(); @@ -151,7 +151,7 @@ public: return value.Mid(start.startPos, start.endPos - start.startPos); } - virtual long XYToPosition(long x, long y) const wxOVERRIDE + virtual long XYToPosition(long x, long y) const override { if ( x < 0 || y < 0 ) return -1; @@ -166,7 +166,7 @@ public: return start.startPos + x; } - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE + virtual bool PositionToXY(long pos, long *x, long *y) const override { const wxString &value = DoGetValue(); @@ -190,36 +190,36 @@ public: return true; } - virtual void WriteText( const wxString &text ) wxOVERRIDE + virtual void WriteText( const wxString &text ) override { m_edit->insertPlainText(wxQtConvertString( text )); // the cursor is moved to the end, ensure it is shown m_edit->ensureCursorVisible(); } - virtual void MarkDirty() wxOVERRIDE + virtual void MarkDirty() override { return m_edit->setWindowModified( true ); } - virtual void DiscardEdits() wxOVERRIDE + virtual void DiscardEdits() override { return m_edit->setWindowModified( false ); } - virtual void blockSignals(bool block) wxOVERRIDE + virtual void blockSignals(bool block) override { m_edit->blockSignals(block); } - virtual void SetValue( const wxString &value ) wxOVERRIDE + virtual void SetValue( const wxString &value ) override { m_edit->setPlainText(wxQtConvertString( value )); // the cursor is moved to the end, ensure it is shown m_edit->ensureCursorVisible(); } - virtual void SetSelection( long from, long to ) wxOVERRIDE + virtual void SetSelection( long from, long to ) override { QTextCursor cursor = m_edit->textCursor(); cursor.setPosition(from); @@ -228,7 +228,7 @@ public: m_edit->setTextCursor(cursor); } - virtual bool GetSelection( long *from, long *to ) const wxOVERRIDE + virtual bool GetSelection( long *from, long *to ) const override { QTextCursor cursor = m_edit->textCursor(); *from = cursor.selectionStart(); @@ -236,7 +236,7 @@ public: return cursor.hasSelection(); } - virtual void SetInsertionPoint(long pos) wxOVERRIDE + virtual void SetInsertionPoint(long pos) override { QTextCursor::MoveOperation op; @@ -260,12 +260,12 @@ public: m_edit->ensureCursorVisible(); } - QScrollArea *ScrollBarsContainer() const wxOVERRIDE + QScrollArea *ScrollBarsContainer() const override { return (QScrollArea *) m_edit; } - virtual void SetStyleFlags(long flags) wxOVERRIDE + virtual void SetStyleFlags(long flags) override { ApplyCommonStyles(m_edit, flags); @@ -312,22 +312,22 @@ public: { } - virtual bool IsModified() const wxOVERRIDE + virtual bool IsModified() const override { return m_edit->isModified(); } - virtual int GetNumberOfLines() const wxOVERRIDE + virtual int GetNumberOfLines() const override { return 1; } - virtual wxString DoGetValue() const wxOVERRIDE + virtual wxString DoGetValue() const override { return wxQtConvertString( m_edit->text() ); } - virtual long GetInsertionPoint() const wxOVERRIDE + virtual long GetInsertionPoint() const override { long selectionStart = m_edit->selectionStart(); @@ -337,52 +337,52 @@ public: return m_edit->cursorPosition(); } - virtual QWidget *GetHandle() const wxOVERRIDE + virtual QWidget *GetHandle() const override { return m_edit; } - virtual int GetLineLength(long WXUNUSED(lineNo)) const wxOVERRIDE + virtual int GetLineLength(long WXUNUSED(lineNo)) const override { return DoGetValue().length(); } - virtual wxString GetLineText(long lineNo) const wxOVERRIDE + virtual wxString GetLineText(long lineNo) const override { return lineNo == 0 ? DoGetValue() : wxString(); } - virtual void WriteText( const wxString &text ) wxOVERRIDE + virtual void WriteText( const wxString &text ) override { m_edit->insert(wxQtConvertString( text )); } - virtual void MarkDirty() wxOVERRIDE + virtual void MarkDirty() override { return m_edit->setModified( true ); } - virtual void DiscardEdits() wxOVERRIDE + virtual void DiscardEdits() override { return m_edit->setModified( false ); } - virtual void blockSignals(bool block) wxOVERRIDE + virtual void blockSignals(bool block) override { m_edit->blockSignals(block); } - virtual void SetValue( const wxString &value ) wxOVERRIDE + virtual void SetValue( const wxString &value ) override { m_edit->setText(wxQtConvertString( value )); } - virtual void SetSelection( long from, long to ) wxOVERRIDE + virtual void SetSelection( long from, long to ) override { m_edit->setSelection(from, to - from); } - virtual bool GetSelection( long *from, long *to ) const wxOVERRIDE + virtual bool GetSelection( long *from, long *to ) const override { *from = m_edit->selectionStart(); if ( *from < 0 ) @@ -392,7 +392,7 @@ public: return true; } - virtual void SetInsertionPoint(long pos) wxOVERRIDE + virtual void SetInsertionPoint(long pos) override { // check if pos indicates end of text: if ( pos == -1 ) @@ -401,7 +401,7 @@ public: m_edit->setCursorPosition(pos); } - virtual long XYToPosition(long x, long y) const wxOVERRIDE + virtual long XYToPosition(long x, long y) const override { if ( y == 0 && x >= 0 ) { @@ -412,7 +412,7 @@ public: return -1; } - virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE + virtual bool PositionToXY(long pos, long *x, long *y) const override { const wxString &value = DoGetValue(); @@ -424,12 +424,12 @@ public: return true; } - virtual QScrollArea *ScrollBarsContainer() const wxOVERRIDE + virtual QScrollArea *ScrollBarsContainer() const override { return NULL; } - virtual void SetStyleFlags(long flags) wxOVERRIDE + virtual void SetStyleFlags(long flags) override { ApplyCommonStyles(m_edit, flags); diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp index 953713bddf..034b5437a4 100644 --- a/src/qt/toolbar.cpp +++ b/src/qt/toolbar.cpp @@ -43,8 +43,8 @@ public: m_qtToolButton = NULL; } - virtual void SetLabel( const wxString &label ) wxOVERRIDE; - virtual void SetDropdownMenu(wxMenu* menu) wxOVERRIDE; + virtual void SetLabel( const wxString &label ) override; + virtual void SetDropdownMenu(wxMenu* menu) override; void SetIcon(); void ClearToolTip(); @@ -64,9 +64,9 @@ public: } private: - void mouseReleaseEvent( QMouseEvent *event ) wxOVERRIDE; - void mousePressEvent( QMouseEvent *event ) wxOVERRIDE; - void enterEvent( QEvent *event ) wxOVERRIDE; + void mouseReleaseEvent( QMouseEvent *event ) override; + void mousePressEvent( QMouseEvent *event ) override; + void enterEvent( QEvent *event ) override; }; void wxQtToolButton::mouseReleaseEvent( QMouseEvent *event ) diff --git a/src/qt/treectrl.cpp b/src/qt/treectrl.cpp index 84fc26ce2b..1a0ecb05ef 100644 --- a/src/qt/treectrl.cpp +++ b/src/qt/treectrl.cpp @@ -157,7 +157,7 @@ public: QTreeWidget::paintEvent(event); } - virtual void mouseReleaseEvent(QMouseEvent * event) wxOVERRIDE + virtual void mouseReleaseEvent(QMouseEvent * event) override { const QPoint qPos = event->pos(); QTreeWidgetItem *item = itemAt(qPos); @@ -255,7 +255,7 @@ protected: const QStyleOptionViewItem &options, const QModelIndex &index - ) const wxOVERRIDE + ) const override { QTreeWidget::drawRow(painter, options, index); @@ -272,7 +272,7 @@ protected: } } - bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event) wxOVERRIDE + bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event) override { // AllEditTriggers means that editor is about to open, not waiting for double click if (trigger == AllEditTriggers) @@ -289,7 +289,7 @@ protected: return QTreeWidget::edit(index, trigger, event); } - void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint) wxOVERRIDE + void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint) override { // Close process can re-signal closeEditor so we need to guard against // reentrant calls. @@ -485,12 +485,12 @@ private: EmitEvent(tree_event); } - virtual QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &index, const QEvent *event) const wxOVERRIDE + virtual QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &index, const QEvent *event) const override { return state() == DragSelectingState ? QItemSelectionModel::NoUpdate : QTreeWidget::selectionCommand(index, event); } - virtual void dropEvent(QDropEvent* event) wxOVERRIDE + virtual void dropEvent(QDropEvent* event) override { endDrag(event->pos()); @@ -498,7 +498,7 @@ private: event->ignore(); } - virtual void mouseMoveEvent(QMouseEvent *event) wxOVERRIDE + virtual void mouseMoveEvent(QMouseEvent *event) override { const bool wasDragging = state() == DraggingState; wxQtEventSignalHandler::mouseMoveEvent(event); diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp index 5f1ba42e25..11938b3352 100644 --- a/src/qt/uiaction.cpp +++ b/src/qt/uiaction.cpp @@ -48,11 +48,11 @@ public: return &s_impl; } - virtual bool MouseMove(long x, long y) wxOVERRIDE; - virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; - virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; + virtual bool MouseMove(long x, long y) override; + virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) override; + virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) override; - virtual bool DoKey(int keycode, int modifiers, bool isDown) wxOVERRIDE; + virtual bool DoKey(int keycode, int modifiers, bool isDown) override; private: // This class has no public ctors, use Get() instead. diff --git a/src/qt/window.cpp b/src/qt/window.cpp index 44005a477c..cf383c2007 100644 --- a/src/qt/window.cpp +++ b/src/qt/window.cpp @@ -59,7 +59,7 @@ class wxQtScrollArea : public wxQtEventSignalHandler< QScrollArea, wxWindowQt > public: wxQtScrollArea(wxWindowQt *parent, wxWindowQt *handler); - bool event(QEvent *e) wxOVERRIDE; + bool event(QEvent *e) override; }; wxQtScrollArea::wxQtScrollArea( wxWindowQt *parent, wxWindowQt *handler ) diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp index bcce4f6c87..b464eff9f0 100644 --- a/src/ribbon/page.cpp +++ b/src/ribbon/page.cpp @@ -46,7 +46,7 @@ public: virtual ~wxRibbonPageScrollButton(); protected: - virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } + virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt); void OnPaint(wxPaintEvent& evt); diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index f5a276feff..f6895f5112 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -11647,7 +11647,7 @@ class wxRichTextModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxRichTextModule); public: wxRichTextModule() {} - bool OnInit() wxOVERRIDE + bool OnInit() override { wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer); wxRichTextBuffer::InitStandardHandlers(); @@ -11667,7 +11667,7 @@ public: return true; } - void OnExit() wxOVERRIDE + void OnExit() override { wxRichTextBuffer::CleanUpHandlers(); wxRichTextBuffer::CleanUpDrawingHandlers(); diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index 2b6bbbae30..517ed56e32 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -85,7 +85,7 @@ class wxRichTextCaretTimer: public wxTimer { m_caret = caret; } - virtual void Notify() wxOVERRIDE; + virtual void Notify() override; wxRichTextCaret* m_caret; }; @@ -108,8 +108,8 @@ public: // -------------- // called by wxWindow (not using the event tables) - virtual void OnSetFocus() wxOVERRIDE; - virtual void OnKillFocus() wxOVERRIDE; + virtual void OnSetFocus() override; + virtual void OnKillFocus() override; // draw the caret on the given DC void DoDraw(wxDC *dc); @@ -127,10 +127,10 @@ public: void EnableRefresh(bool b) { m_refreshEnabled = b; } protected: - virtual void DoShow() wxOVERRIDE; - virtual void DoHide() wxOVERRIDE; - virtual void DoMove() wxOVERRIDE; - virtual void DoSize() wxOVERRIDE; + virtual void DoShow() override; + virtual void DoHide() override; + virtual void DoMove() override; + virtual void DoSize() override; // refresh the caret void Refresh(); diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index 5bfa8ce78f..032b08933e 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -475,8 +475,8 @@ class wxRichTextFormattingDialogModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule); public: wxRichTextFormattingDialogModule() {} - bool OnInit() wxOVERRIDE { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; } - void OnExit() wxOVERRIDE { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); } + bool OnInit() override { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; } + void OnExit() override { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); } }; wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule); diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 28f3f6c9ae..6c9eb39a42 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -213,47 +213,47 @@ public: SurfaceImpl(); ~SurfaceImpl(); - virtual void Init(WindowID wid) wxOVERRIDE; - virtual void Init(SurfaceID sid, WindowID wid) wxOVERRIDE; - virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid) wxOVERRIDE; + virtual void Init(WindowID wid) override; + virtual void Init(SurfaceID sid, WindowID wid) override; + virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override; - virtual void Release() wxOVERRIDE; - virtual bool Initialised() wxOVERRIDE; - virtual void PenColour(ColourDesired fore) wxOVERRIDE; - virtual int LogPixelsY() wxOVERRIDE; - virtual int DeviceHeightFont(int points) wxOVERRIDE; - virtual void MoveTo(int x_, int y_) wxOVERRIDE; - virtual void LineTo(int x_, int y_) wxOVERRIDE; - virtual void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) wxOVERRIDE; - virtual void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) wxOVERRIDE; - virtual void FillRectangle(PRectangle rc, ColourDesired back) wxOVERRIDE; - virtual void FillRectangle(PRectangle rc, Surface &surfacePattern) wxOVERRIDE; - virtual void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) wxOVERRIDE; + virtual void Release() override; + virtual bool Initialised() override; + virtual void PenColour(ColourDesired fore) override; + virtual int LogPixelsY() override; + virtual int DeviceHeightFont(int points) override; + virtual void MoveTo(int x_, int y_) override; + virtual void LineTo(int x_, int y_) override; + virtual void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) override; + virtual void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) override; + virtual void FillRectangle(PRectangle rc, ColourDesired back) override; + virtual void FillRectangle(PRectangle rc, Surface &surfacePattern) override; + virtual void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) override; virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill, - ColourDesired outline, int alphaOutline, int flags) wxOVERRIDE; + ColourDesired outline, int alphaOutline, int flags) override; virtual void DrawRGBAImage(PRectangle rc, int width, int height, - const unsigned char *pixelsImage) wxOVERRIDE; - virtual void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) wxOVERRIDE; - virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource) wxOVERRIDE; + const unsigned char *pixelsImage) override; + virtual void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override; + virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource) override; - virtual void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) wxOVERRIDE; - virtual void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) wxOVERRIDE; - virtual void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) wxOVERRIDE; - virtual void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) wxOVERRIDE; - virtual XYPOSITION WidthText(Font &font_, const char *s, int len) wxOVERRIDE; - virtual XYPOSITION WidthChar(Font &font_, char ch) wxOVERRIDE; - virtual XYPOSITION Ascent(Font &font_) wxOVERRIDE; - virtual XYPOSITION Descent(Font &font_) wxOVERRIDE; - virtual XYPOSITION InternalLeading(Font &font_) wxOVERRIDE; - virtual XYPOSITION ExternalLeading(Font &font_) wxOVERRIDE; - virtual XYPOSITION Height(Font &font_) wxOVERRIDE; - virtual XYPOSITION AverageCharWidth(Font &font_) wxOVERRIDE; + virtual void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override; + virtual void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override; + virtual void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override; + virtual void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) override; + virtual XYPOSITION WidthText(Font &font_, const char *s, int len) override; + virtual XYPOSITION WidthChar(Font &font_, char ch) override; + virtual XYPOSITION Ascent(Font &font_) override; + virtual XYPOSITION Descent(Font &font_) override; + virtual XYPOSITION InternalLeading(Font &font_) override; + virtual XYPOSITION ExternalLeading(Font &font_) override; + virtual XYPOSITION Height(Font &font_) override; + virtual XYPOSITION AverageCharWidth(Font &font_) override; - virtual void SetClip(PRectangle rc) wxOVERRIDE; - virtual void FlushCachedState() wxOVERRIDE; + virtual void SetClip(PRectangle rc) override; + virtual void FlushCachedState() override; - virtual void SetUnicodeMode(bool unicodeMode_) wxOVERRIDE; - virtual void SetDBCSMode(int codePage) wxOVERRIDE; + virtual void SetUnicodeMode(bool unicodeMode_) override; + virtual void SetDBCSMode(int codePage) override; void BrushColour(ColourDesired back); void SetFont(Font &font_); @@ -935,61 +935,61 @@ public: virtual ~SurfaceD2D(); // base class virtuals - virtual void Init(WindowID wid) wxOVERRIDE; - virtual void Init(SurfaceID sid, WindowID wid) wxOVERRIDE; + virtual void Init(WindowID wid) override; + virtual void Init(SurfaceID sid, WindowID wid) override; virtual void InitPixMap(int width, int height, Surface *surface_, - WindowID wid) wxOVERRIDE; + WindowID wid) override; - virtual void Release() wxOVERRIDE; - virtual bool Initialised() wxOVERRIDE; - virtual void PenColour(ColourDesired fore) wxOVERRIDE; - virtual int LogPixelsY() wxOVERRIDE; - virtual int DeviceHeightFont(int points) wxOVERRIDE; - virtual void MoveTo(int x_, int y_) wxOVERRIDE; - virtual void LineTo(int x_, int y_) wxOVERRIDE; + virtual void Release() override; + virtual bool Initialised() override; + virtual void PenColour(ColourDesired fore) override; + virtual int LogPixelsY() override; + virtual int DeviceHeightFont(int points) override; + virtual void MoveTo(int x_, int y_) override; + virtual void LineTo(int x_, int y_) override; virtual void Polygon(Point *pts, int npts, ColourDesired fore, - ColourDesired back) wxOVERRIDE; + ColourDesired back) override; virtual void RectangleDraw(PRectangle rc, ColourDesired fore, - ColourDesired back) wxOVERRIDE; - virtual void FillRectangle(PRectangle rc, ColourDesired back) wxOVERRIDE; - virtual void FillRectangle(PRectangle rc, Surface &surfacePattern) wxOVERRIDE; + ColourDesired back) override; + virtual void FillRectangle(PRectangle rc, ColourDesired back) override; + virtual void FillRectangle(PRectangle rc, Surface &surfacePattern) override; virtual void RoundedRectangle(PRectangle rc, ColourDesired fore, - ColourDesired back) wxOVERRIDE; + ColourDesired back) override; virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill, ColourDesired outline, int alphaOutline, - int flags) wxOVERRIDE; + int flags) override; virtual void DrawRGBAImage(PRectangle rc, int width, int height, - const unsigned char *pixelsImage) wxOVERRIDE; + const unsigned char *pixelsImage) override; virtual void Ellipse(PRectangle rc, ColourDesired fore, - ColourDesired back) wxOVERRIDE; - virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource) wxOVERRIDE; + ColourDesired back) override; + virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource) override; virtual void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, - ColourDesired back) wxOVERRIDE; + ColourDesired back) override; virtual void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, - ColourDesired back) wxOVERRIDE; + ColourDesired back) override; virtual void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, - ColourDesired fore) wxOVERRIDE; + ColourDesired fore) override; virtual void MeasureWidths(Font &font_, const char *s, int len, - XYPOSITION *positions) wxOVERRIDE; - virtual XYPOSITION WidthText(Font &font_, const char *s, int len) wxOVERRIDE; - virtual XYPOSITION WidthChar(Font &font_, char ch) wxOVERRIDE; - virtual XYPOSITION Ascent(Font &font_) wxOVERRIDE; - virtual XYPOSITION Descent(Font &font_) wxOVERRIDE; - virtual XYPOSITION InternalLeading(Font &font_) wxOVERRIDE; - virtual XYPOSITION ExternalLeading(Font &font_) wxOVERRIDE; - virtual XYPOSITION Height(Font &font_) wxOVERRIDE; - virtual XYPOSITION AverageCharWidth(Font &font_) wxOVERRIDE; + XYPOSITION *positions) override; + virtual XYPOSITION WidthText(Font &font_, const char *s, int len) override; + virtual XYPOSITION WidthChar(Font &font_, char ch) override; + virtual XYPOSITION Ascent(Font &font_) override; + virtual XYPOSITION Descent(Font &font_) override; + virtual XYPOSITION InternalLeading(Font &font_) override; + virtual XYPOSITION ExternalLeading(Font &font_) override; + virtual XYPOSITION Height(Font &font_) override; + virtual XYPOSITION AverageCharWidth(Font &font_) override; - virtual void SetClip(PRectangle rc) wxOVERRIDE; - virtual void FlushCachedState() wxOVERRIDE; + virtual void SetClip(PRectangle rc) override; + virtual void FlushCachedState() override; - virtual void SetUnicodeMode(bool unicodeMode_) wxOVERRIDE; - virtual void SetDBCSMode(int codePage) wxOVERRIDE; + virtual void SetUnicodeMode(bool unicodeMode_) override; + virtual void SetDBCSMode(int codePage) override; // helpers void SetFont(Font &font_); @@ -2641,8 +2641,8 @@ public: wxSTCListBox(wxWindow*, wxSTCListBoxVisualData*, int); // wxWindow overrides - virtual bool AcceptsFocus() const wxOVERRIDE; - virtual void SetFocus() wxOVERRIDE; + virtual bool AcceptsFocus() const override; + virtual void SetFocus() override; // Setters void SetContainerBorderSize(int); @@ -2678,9 +2678,9 @@ protected: void OnMouseLeaveWindow(wxMouseEvent& event); // wxVListBox overrides - virtual wxCoord OnMeasureItem(size_t) const wxOVERRIDE; - virtual void OnDrawItem(wxDC& , const wxRect &, size_t) const wxOVERRIDE; - virtual void OnDrawBackground(wxDC&, const wxRect&,size_t) const wxOVERRIDE; + virtual wxCoord OnMeasureItem(size_t) const override; + virtual void OnDrawItem(wxDC& , const wxRect &, size_t) const override; + virtual void OnDrawBackground(wxDC&, const wxRect&,size_t) const override; wxSTCListBoxVisualData* m_visualData; wxVector m_labels; @@ -3134,7 +3134,7 @@ public: delete m_surfaceFontData; } - void SetListBoxFont(Font& font) wxOVERRIDE + void SetListBoxFont(Font& font) override { // Retrieve the SurfaceFontDataD2D from font and store a copy of it. wxFontWithAscent* fwa = wxFontWithAscent::FromFID(font.GetID()); @@ -3154,7 +3154,7 @@ public: } void OnDrawItemText(wxDC& dc, const wxRect& rect, const wxString& label, - const wxColour& textCol) const wxOVERRIDE + const wxColour& textCol) const override { // Create a font and a surface object. wxFontWithAscent* fontCopy = new wxFontWithAscent(wxFont()); @@ -3431,7 +3431,7 @@ public: } // Use GetSymbol to get a pointer to the relevant function. - virtual Function FindFunction(const char *name) wxOVERRIDE { + virtual Function FindFunction(const char *name) override { if (m_dynlib.IsLoaded()) { bool status; void* fn_address = m_dynlib.GetSymbol(wxString::FromUTF8(name), @@ -3445,7 +3445,7 @@ public: return NULL; } - virtual bool IsValid() wxOVERRIDE { + virtual bool IsValid() override { return m_dynlib.IsLoaded(); } diff --git a/src/stc/PlatWX.h b/src/stc/PlatWX.h index 32fe2537f5..796fcdc659 100644 --- a/src/stc/PlatWX.h +++ b/src/stc/PlatWX.h @@ -28,26 +28,26 @@ public: ~ListBoxImpl(); static ListBox *Allocate(); - virtual void SetFont(Font &font) wxOVERRIDE; - virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_) wxOVERRIDE; - virtual void SetAverageCharWidth(int width) wxOVERRIDE; - virtual void SetVisibleRows(int rows) wxOVERRIDE; - virtual int GetVisibleRows() const wxOVERRIDE; - virtual PRectangle GetDesiredRect() wxOVERRIDE; - virtual int CaretFromEdge() wxOVERRIDE; - virtual void Clear() wxOVERRIDE; - virtual void Append(char *s, int type = -1) wxOVERRIDE; - virtual int Length() wxOVERRIDE; - virtual void Select(int n) wxOVERRIDE; - virtual int GetSelection() wxOVERRIDE; - virtual int Find(const char *prefix) wxOVERRIDE; - virtual void GetValue(int n, char *value, int len) wxOVERRIDE; - virtual void RegisterImage(int type, const char *xpm_data) wxOVERRIDE; + virtual void SetFont(Font &font) override; + virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_) override; + virtual void SetAverageCharWidth(int width) override; + virtual void SetVisibleRows(int rows) override; + virtual int GetVisibleRows() const override; + virtual PRectangle GetDesiredRect() override; + virtual int CaretFromEdge() override; + virtual void Clear() override; + virtual void Append(char *s, int type = -1) override; + virtual int Length() override; + virtual void Select(int n) override; + virtual int GetSelection() override; + virtual int Find(const char *prefix) override; + virtual void GetValue(int n, char *value, int len) override; + virtual void RegisterImage(int type, const char *xpm_data) override; void RegisterImageHelper(int type, const wxBitmap& bmp); - virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) wxOVERRIDE; - virtual void ClearRegisteredImages() wxOVERRIDE; - virtual void SetDoubleClickAction(CallBackAction, void *) wxOVERRIDE; - virtual void SetList(const char* list, char separator, char typesep) wxOVERRIDE; + virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) override; + virtual void ClearRegisteredImages() override; + virtual void SetDoubleClickAction(CallBackAction, void *) override; + virtual void SetList(const char* list, char separator, char typesep) override; void SetListInfo(int*, int*, int*); }; @@ -72,10 +72,10 @@ public: public: wxSTCPopupBase(wxWindow*); virtual ~wxSTCPopupBase(); - virtual bool Show(bool show=true) wxOVERRIDE; + virtual bool Show(bool show=true) override; protected: - virtual void DoSetSize(int, int, int, int, int) wxOVERRIDE; + virtual void DoSetSize(int, int, int, int, int) override; void SetSTCCursor(int); void RestoreSTCCursor(); void OnMouseEnter(wxMouseEvent&); @@ -101,10 +101,10 @@ public: #ifdef __WXGTK__ virtual ~wxSTCPopupBase(); #elif defined(__WXMSW__) - virtual bool Show(bool show=true) wxOVERRIDE; + virtual bool Show(bool show=true) override; virtual bool MSWHandleMessage(WXLRESULT *result, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) - wxOVERRIDE; + override; #endif }; @@ -118,12 +118,12 @@ public: public: wxSTCPopupBase(wxWindow*); #ifdef __WXMSW__ - virtual bool Show(bool show=true) wxOVERRIDE; + virtual bool Show(bool show=true) override; virtual bool MSWHandleMessage(WXLRESULT *result, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) - wxOVERRIDE; + override; #elif !wxSTC_POPUP_IS_CUSTOM - virtual bool Show(bool show=true) wxOVERRIDE; + virtual bool Show(bool show=true) override; void ActivateParent(); #endif }; @@ -135,12 +135,12 @@ class wxSTCPopupWindow:public wxSTCPopupBase public: wxSTCPopupWindow(wxWindow*); virtual ~wxSTCPopupWindow(); - virtual bool Destroy() wxOVERRIDE; - virtual bool AcceptsFocus() const wxOVERRIDE; + virtual bool Destroy() override; + virtual bool AcceptsFocus() const override; protected: virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) wxOVERRIDE; + int sizeFlags = wxSIZE_AUTO) override; void OnParentMove(wxMoveEvent& event); #if defined(__WXOSX_COCOA__) || (defined(__WXGTK__)&&!wxSTC_POPUP_IS_FRAME) void OnIconize(wxIconizeEvent& event); diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 98f0c13778..0dad89f882 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -65,7 +65,7 @@ public: m_reason = reason; } - void Notify() wxOVERRIDE { + void Notify() override { m_swx->TickFor(m_reason); } @@ -125,7 +125,7 @@ public: delete surfaceWindow; } - virtual void Refresh(bool eraseBg=true, const wxRect *rect=NULL) wxOVERRIDE + virtual void Refresh(bool eraseBg=true, const wxRect *rect=NULL) override { if ( rect == NULL ) DrawBack(GetSize()); @@ -1436,7 +1436,7 @@ sptr_t ScintillaWX::DirectFunction( namespace { -POINT POINTFromPoint(Point pt) wxNOEXCEPT { +POINT POINTFromPoint(Point pt) noexcept { POINT ret; ret.x = static_cast(pt.x); ret.y = static_cast(pt.y); @@ -1447,7 +1447,7 @@ class IMContext { HWND hwnd; public: HIMC hIMC; - IMContext(HWND hwnd_) wxNOEXCEPT : + IMContext(HWND hwnd_) noexcept : hwnd(hwnd_), hIMC(::ImmGetContext(hwnd_)) { } ~IMContext() { @@ -1455,7 +1455,7 @@ public: ::ImmReleaseContext(hwnd, hIMC); } - unsigned int GetImeCaretPos() const wxNOEXCEPT { + unsigned int GetImeCaretPos() const noexcept { return ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, wxNullPtr, 0); } @@ -1480,7 +1480,7 @@ private: } -HWND ScintillaWX::MainHWND() const wxNOEXCEPT { +HWND ScintillaWX::MainHWND() const noexcept { return static_cast(wMain.GetID()); } diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h index cee2409998..b6bed3c8b9 100644 --- a/src/stc/ScintillaWX.h +++ b/src/stc/ScintillaWX.h @@ -99,10 +99,10 @@ public: m_swx = swx; } - bool OnDropText(wxCoord x, wxCoord y, const wxString& data) wxOVERRIDE; - wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE; - void OnLeave() wxOVERRIDE; + bool OnDropText(wxCoord x, wxCoord y, const wxString& data) override; + wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) override; + wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) override; + void OnLeave() override; private: ScintillaWX* m_swx; @@ -118,41 +118,41 @@ public: ~ScintillaWX(); // base class virtuals - virtual void Initialise() wxOVERRIDE; - virtual void Finalise() wxOVERRIDE; - virtual void StartDrag() wxOVERRIDE; - virtual bool SetIdle(bool on) wxOVERRIDE; - virtual void SetMouseCapture(bool on) wxOVERRIDE; - virtual bool HaveMouseCapture() wxOVERRIDE; - virtual void ScrollText(int linesToMove) wxOVERRIDE; - virtual void SetVerticalScrollPos() wxOVERRIDE; - virtual void SetHorizontalScrollPos() wxOVERRIDE; - virtual bool ModifyScrollBars(int nMax, int nPage) wxOVERRIDE; - virtual void Copy() wxOVERRIDE; - virtual void Paste() wxOVERRIDE; - virtual void CopyToClipboard(const SelectionText &selectedText) wxOVERRIDE; + virtual void Initialise() override; + virtual void Finalise() override; + virtual void StartDrag() override; + virtual bool SetIdle(bool on) override; + virtual void SetMouseCapture(bool on) override; + virtual bool HaveMouseCapture() override; + virtual void ScrollText(int linesToMove) override; + virtual void SetVerticalScrollPos() override; + virtual void SetHorizontalScrollPos() override; + virtual bool ModifyScrollBars(int nMax, int nPage) override; + virtual void Copy() override; + virtual void Paste() override; + virtual void CopyToClipboard(const SelectionText &selectedText) override; - virtual void CreateCallTipWindow(PRectangle rc) wxOVERRIDE; - virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) wxOVERRIDE; - virtual void ClaimSelection() wxOVERRIDE; + virtual void CreateCallTipWindow(PRectangle rc) override; + virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override; + virtual void ClaimSelection() override; virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, - sptr_t lParam) wxOVERRIDE; + sptr_t lParam) override; virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, - sptr_t lParam) wxOVERRIDE; + sptr_t lParam) override; - virtual void NotifyChange() wxOVERRIDE; - virtual void NotifyParent(SCNotification scn) wxOVERRIDE; + virtual void NotifyChange() override; + virtual void NotifyParent(SCNotification scn) override; - virtual void CancelModes() wxOVERRIDE; + virtual void CancelModes() override; - virtual void UpdateSystemCaret() wxOVERRIDE; - virtual bool FineTickerAvailable() wxOVERRIDE; - virtual bool FineTickerRunning(TickReason reason) wxOVERRIDE; - virtual void FineTickerStart(TickReason reason, int millis, int tolerance) wxOVERRIDE; - virtual void FineTickerCancel(TickReason reason) wxOVERRIDE; + virtual void UpdateSystemCaret() override; + virtual bool FineTickerAvailable() override; + virtual bool FineTickerRunning(TickReason reason) override; + virtual void FineTickerStart(TickReason reason, int millis, int tolerance) override; + virtual void FineTickerCancel(TickReason reason) override; // Event delegates void DoPaint(wxDC* dc, wxRect rect); @@ -190,7 +190,7 @@ public: // helpers void FullPaint(); void FullPaintDC(wxDC* dc); - bool CanPaste() wxOVERRIDE; + bool CanPaste() override; bool GetHideSelection() { return view.hideSelection; } void DoScrollToLine(int line); void DoScrollToColumn(int column); @@ -240,7 +240,7 @@ private: #ifdef __WXMSW__ // ScintillaWin - HWND MainHWND() const wxNOEXCEPT; + HWND MainHWND() const noexcept; // DBCS void ImeStartComposition(); diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp index b3d3097e32..c13c2f15cc 100644 --- a/src/unix/appunix.cpp +++ b/src/unix/appunix.cpp @@ -50,7 +50,7 @@ public: ); } - virtual void OnReadWaiting() wxOVERRIDE + virtual void OnReadWaiting() override { // The base class wxWakeUpPipe::OnReadWaiting() needs to be called in order // to read the data out of the wake up pipe and clear it for next time. diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index bd276176cf..36a1f0ad91 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 wxOVERRIDE + virtual bool IsOk() const override { 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) wxOVERRIDE; + bool async) override; // Hang up the currently active dial up connection. - virtual bool HangUp() wxOVERRIDE; + virtual bool HangUp() override; // 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 wxOVERRIDE + virtual bool IsOnline() const override { CheckStatus(); return m_IsOnline == Net_Connected; } // do we have a constant net connection? - virtual bool IsAlwaysOnline() const wxOVERRIDE; + virtual bool IsAlwaysOnline() const override; // returns true if (async) dialing is in progress - virtual bool IsDialing() const wxOVERRIDE + virtual bool IsDialing() const override { 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() wxOVERRIDE; + virtual bool CancelDialing() override; - size_t GetISPNames(class wxArrayString &) const wxOVERRIDE + size_t GetISPNames(class wxArrayString &) const override { 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) wxOVERRIDE + virtual void SetOnlineStatus(bool isOnline = true) override { 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) wxOVERRIDE; + virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds) override; // disable automatic check for connection status change - notice that the // wxEVT_DIALUP_XXX events won't be sent any more either. - virtual void DisableAutoCheckOnlineStatus() wxOVERRIDE; + virtual void DisableAutoCheckOnlineStatus() override; // 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) wxOVERRIDE; + int portno = 80) override; /** 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) wxOVERRIDE + virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd) override { 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() wxOVERRIDE + virtual void Notify() override { 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)) wxOVERRIDE + virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) override { if(m_DupMan) { diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 1c7c8ca60b..65948751fd 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -55,7 +55,7 @@ inline wxSize wxGetMainScreenSizeMM() class wxDisplayImplSingleX11 : public wxDisplayImplSingle { public: - virtual wxRect GetGeometry() const wxOVERRIDE + virtual wxRect GetGeometry() const override { Display* const dpy = wxGetX11Display(); @@ -64,12 +64,12 @@ public: DisplayHeight(dpy, DefaultScreen (dpy))); } - virtual wxRect GetClientArea() const wxOVERRIDE + virtual wxRect GetClientArea() const override { return wxGetMainScreenWorkArea(); } - virtual int GetDepth() const wxOVERRIDE + virtual int GetDepth() const override { return wxGetMainScreenDepth(); } @@ -135,15 +135,15 @@ public: { } - virtual wxRect GetGeometry() const wxOVERRIDE { return m_rect; } - virtual wxRect GetClientArea() const wxOVERRIDE + virtual wxRect GetGeometry() const override { return m_rect; } + virtual wxRect GetClientArea() const override { // 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 // we don't currently react to its changes return IsPrimary() ? wxGetMainScreenWorkArea() : m_rect; } - virtual int GetDepth() const wxOVERRIDE + virtual int GetDepth() const override { const wxVideoMode& mode = GetCurrentMode(); if ( mode.bpp ) @@ -152,9 +152,9 @@ public: return wxGetMainScreenDepth(); } - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const override; + virtual wxVideoMode GetCurrentMode() const override; + virtual bool ChangeMode(const wxVideoMode& mode) override; private: wxRect m_rect; @@ -167,9 +167,9 @@ class wxDisplayFactoryX11 : public wxDisplayFactory public: wxDisplayFactoryX11() { } - virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; + virtual wxDisplayImpl *CreateDisplay(unsigned n) override; + virtual unsigned GetCount() override; + virtual int GetFromPoint(const wxPoint& pt) override; protected: wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11); diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp index 689b1b136a..f1414bb15e 100644 --- a/src/unix/evtloopunix.cpp +++ b/src/unix/evtloopunix.cpp @@ -109,7 +109,7 @@ class wxConsoleEventLoopSourcesManager : public wxEventLoopSourcesManagerBase public: wxEventLoopSource* AddSourceForFD( int fd, wxEventLoopSourceHandler *handler, - int flags) wxOVERRIDE + int flags) override { wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" ); diff --git a/src/unix/fswatcher_inotify.cpp b/src/unix/fswatcher_inotify.cpp index 04760ebd9d..2902d10bd7 100644 --- a/src/unix/fswatcher_inotify.cpp +++ b/src/unix/fswatcher_inotify.cpp @@ -58,7 +58,7 @@ public: delete m_handler; } - bool Init() wxOVERRIDE + bool Init() override { wxCHECK_MSG( !IsOk(), false, "Inotify already initialized" ); @@ -95,7 +95,7 @@ public: } } - virtual bool DoAdd(wxSharedPtr watch) wxOVERRIDE + virtual bool DoAdd(wxSharedPtr watch) override { wxCHECK_MSG( IsOk(), false, "Inotify not initialized or invalid inotify descriptor" ); @@ -118,7 +118,7 @@ public: return true; } - virtual bool DoRemove(wxSharedPtr watch) wxOVERRIDE + virtual bool DoRemove(wxSharedPtr watch) override { wxCHECK_MSG( IsOk(), false, "Inotify not initialized or invalid inotify descriptor" ); @@ -154,7 +154,7 @@ public: return true; } - virtual bool RemoveAll() wxOVERRIDE + virtual bool RemoveAll() override { wxFSWatchEntries::iterator it = m_watches.begin(); for ( ; it != m_watches.end(); ++it ) diff --git a/src/unix/fswatcher_kqueue.cpp b/src/unix/fswatcher_kqueue.cpp index ef1d8a94b6..28da973957 100644 --- a/src/unix/fswatcher_kqueue.cpp +++ b/src/unix/fswatcher_kqueue.cpp @@ -62,9 +62,9 @@ public: m_service(service) { } - virtual void OnReadWaiting() wxOVERRIDE; - virtual void OnWriteWaiting() wxOVERRIDE; - virtual void OnExceptionWaiting() wxOVERRIDE; + virtual void OnReadWaiting() override; + virtual void OnWriteWaiting() override; + virtual void OnExceptionWaiting() override; protected: wxFSWatcherImplKqueue* m_service; @@ -99,7 +99,7 @@ public: delete m_handler; } - bool Init() wxOVERRIDE + bool Init() override { wxCHECK_MSG( !IsOk(), false, "Kqueue appears to be already initialized" ); @@ -134,7 +134,7 @@ public: wxDELETE(m_source); } - virtual bool DoAdd(wxSharedPtr watch) wxOVERRIDE + virtual bool DoAdd(wxSharedPtr watch) override { wxCHECK_MSG( IsOk(), false, "Kqueue not initialized or invalid kqueue descriptor" ); @@ -157,7 +157,7 @@ public: return true; } - virtual bool DoRemove(wxSharedPtr watch) wxOVERRIDE + virtual bool DoRemove(wxSharedPtr watch) override { wxCHECK_MSG( IsOk(), false, "Kqueue not initialized or invalid kqueue descriptor" ); @@ -174,7 +174,7 @@ public: return true; } - virtual bool RemoveAll() wxOVERRIDE + virtual bool RemoveAll() override { wxFSWatchEntries::iterator it = m_watches.begin(); for ( ; it != m_watches.end(); ++it ) diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp index c537b11efd..29efb0dab4 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() wxOVERRIDE; + void* Entry() override; private: void SendEvent(wxEventType type, long ts, int change = 0); diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index e70b0708f4..b1e15f7ab7 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -117,36 +117,36 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name) wxOVERRIDE; + const wxString& name) override; - virtual bool Play() wxOVERRIDE; - virtual bool Pause() wxOVERRIDE; - virtual bool Stop() wxOVERRIDE; + virtual bool Play() override; + virtual bool Pause() override; + virtual bool Stop() override; - virtual bool Load(const wxString& fileName) wxOVERRIDE; - virtual bool Load(const wxURI& location) wxOVERRIDE; + virtual bool Load(const wxString& fileName) override; + virtual bool Load(const wxURI& location) override; virtual bool Load(const wxURI& location, - const wxURI& proxy) wxOVERRIDE + const wxURI& proxy) override { return wxMediaBackendCommonBase::Load(location, proxy); } - virtual wxMediaState GetState() wxOVERRIDE; + virtual wxMediaState GetState() override; - virtual bool SetPosition(wxLongLong where) wxOVERRIDE; - virtual wxLongLong GetPosition() wxOVERRIDE; - virtual wxLongLong GetDuration() wxOVERRIDE; + virtual bool SetPosition(wxLongLong where) override; + virtual wxLongLong GetPosition() override; + virtual wxLongLong GetDuration() override; - virtual void Move(int x, int y, int w, int h) wxOVERRIDE; - wxSize GetVideoSize() const wxOVERRIDE; + virtual void Move(int x, int y, int w, int h) override; + wxSize GetVideoSize() const override; - virtual double GetPlaybackRate() wxOVERRIDE; - virtual bool SetPlaybackRate(double dRate) wxOVERRIDE; + virtual double GetPlaybackRate() override; + virtual bool SetPlaybackRate(double dRate) override; - virtual wxLongLong GetDownloadProgress() wxOVERRIDE; - virtual wxLongLong GetDownloadTotal() wxOVERRIDE; + virtual wxLongLong GetDownloadProgress() override; + virtual wxLongLong GetDownloadTotal() override; - virtual bool SetVolume(double dVolume) wxOVERRIDE; - virtual double GetVolume() wxOVERRIDE; + virtual bool SetVolume(double dVolume) override; + virtual double GetVolume() override; //------------implementation from now on----------------------------------- bool CheckForErrors(); diff --git a/src/unix/mediactrl_gstplayer.cpp b/src/unix/mediactrl_gstplayer.cpp index 82d53c4384..ab731c850a 100644 --- a/src/unix/mediactrl_gstplayer.cpp +++ b/src/unix/mediactrl_gstplayer.cpp @@ -61,36 +61,36 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name) wxOVERRIDE; + const wxString& name) override; - virtual bool Play() wxOVERRIDE; - virtual bool Pause() wxOVERRIDE; - virtual bool Stop() wxOVERRIDE; + virtual bool Play() override; + virtual bool Pause() override; + virtual bool Stop() override; - virtual bool Load(const wxString& fileName) wxOVERRIDE; - virtual bool Load(const wxURI& location) wxOVERRIDE; + virtual bool Load(const wxString& fileName) override; + virtual bool Load(const wxURI& location) override; virtual bool Load(const wxURI& location, - const wxURI& proxy) wxOVERRIDE + const wxURI& proxy) override { return wxMediaBackendCommonBase::Load(location, proxy); } - virtual bool SetPosition(wxLongLong where) wxOVERRIDE; - virtual wxLongLong GetPosition() wxOVERRIDE; - virtual wxLongLong GetDuration() wxOVERRIDE; + virtual bool SetPosition(wxLongLong where) override; + virtual wxLongLong GetPosition() override; + virtual wxLongLong GetDuration() override; - virtual void Move(int x, int y, int w, int h) wxOVERRIDE; - wxSize GetVideoSize() const wxOVERRIDE; + virtual void Move(int x, int y, int w, int h) override; + wxSize GetVideoSize() const override; - virtual double GetPlaybackRate() wxOVERRIDE; - virtual bool SetPlaybackRate(double dRate) wxOVERRIDE; + virtual double GetPlaybackRate() override; + virtual bool SetPlaybackRate(double dRate) override; - virtual wxMediaState GetState() wxOVERRIDE; + virtual wxMediaState GetState() override; - virtual bool SetVolume(double dVolume) wxOVERRIDE; - virtual double GetVolume() wxOVERRIDE; + virtual bool SetVolume(double dVolume) override; + virtual double GetVolume() override; - virtual wxLongLong GetDownloadProgress() wxOVERRIDE; - virtual wxLongLong GetDownloadTotal() wxOVERRIDE; + virtual wxLongLong GetDownloadProgress() override; + virtual wxLongLong GetDownloadTotal() override; bool DoLoad(const wxString& locstring); wxMediaCtrl* GetControl() { return m_ctrl; } // for C Callbacks diff --git a/src/unix/net.cpp b/src/unix/net.cpp index f0031a38c3..1b6531c96b 100644 --- a/src/unix/net.cpp +++ b/src/unix/net.cpp @@ -185,10 +185,10 @@ public: virtual bool Start( int millisecs = -1 ) { m_started = true; return wxTimer::Start(millisecs, false); } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); } - virtual void Stop() wxOVERRIDE + virtual void Stop() override { if ( m_started ) wxTimer::Stop(); } public: bool m_started; diff --git a/src/unix/secretstore.cpp b/src/unix/secretstore.cpp index 74320d4fc6..7c69233ed6 100644 --- a/src/unix/secretstore.cpp +++ b/src/unix/secretstore.cpp @@ -95,14 +95,14 @@ public: secret_value_unref(m_value); } - virtual size_t GetSize() const wxOVERRIDE + virtual size_t GetSize() const override { gsize length = 0; (void)secret_value_get(m_value, &length); return length; } - virtual const void *GetData() const wxOVERRIDE + virtual const void *GetData() const override { return secret_value_get(m_value, NULL); } @@ -125,7 +125,7 @@ public: { } - virtual bool IsOk(wxString* errmsg) const wxOVERRIDE + virtual bool IsOk(wxString* errmsg) const override { if ( errmsg ) *errmsg = m_error; @@ -136,7 +136,7 @@ public: virtual bool Save(const wxString& WXUNUSED(service), const wxString& WXUNUSED(user), const wxSecretValueImpl& WXUNUSED(secret), - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { errmsg = m_error; return false; @@ -145,14 +145,14 @@ public: virtual bool Load(const wxString& WXUNUSED(service), wxString* WXUNUSED(user), wxSecretValueImpl** WXUNUSED(secret), - wxString& errmsg) const wxOVERRIDE + wxString& errmsg) const override { errmsg = m_error; return false; } virtual bool Delete(const wxString& WXUNUSED(service), - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { errmsg = m_error; return false; @@ -192,7 +192,7 @@ public: virtual bool Save(const wxString& service, const wxString& user, const wxSecretValueImpl& secret, - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { // We don't have any argument for the user-visible secret description // supported by libsecret, so we just reuse the service string. It @@ -224,7 +224,7 @@ public: virtual bool Load(const wxString& service, wxString* user, wxSecretValueImpl** secret, - wxString& errmsg) const wxOVERRIDE + wxString& errmsg) const override { wxGtkError error; GList* const found = secret_service_search_sync @@ -268,7 +268,7 @@ public: } virtual bool Delete(const wxString& service, - wxString& errmsg) wxOVERRIDE + wxString& errmsg) override { wxGtkError error; if ( !secret_service_clear_sync diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp index 7c8dbe16b1..9edfd29fa7 100644 --- a/src/unix/sound.cpp +++ b/src/unix/sound.cpp @@ -75,15 +75,15 @@ wxSoundData::~wxSoundData() class wxSoundBackendNull : public wxSoundBackend { public: - 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; } + wxString GetName() const override { return _("No sound"); } + int GetPriority() const override { return 0; } + bool IsAvailable() const override { return true; } + bool HasNativeAsyncPlayback() const override { return true; } bool Play(wxSoundData *WXUNUSED(data), unsigned WXUNUSED(flags), - volatile wxSoundPlaybackStatus *WXUNUSED(status)) wxOVERRIDE + volatile wxSoundPlaybackStatus *WXUNUSED(status)) override { return true; } - void Stop() wxOVERRIDE {} - bool IsPlaying() const wxOVERRIDE { return false; } + void Stop() override {} + bool IsPlaying() const override { return false; } }; @@ -100,14 +100,14 @@ public: class wxSoundBackendOSS : public wxSoundBackend { public: - 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; } + wxString GetName() const override { return wxT("Open Sound System"); } + int GetPriority() const override { return 10; } + bool IsAvailable() const override; + bool HasNativeAsyncPlayback() const override { return false; } bool Play(wxSoundData *data, unsigned flags, - volatile wxSoundPlaybackStatus *status) wxOVERRIDE; - void Stop() wxOVERRIDE {} - bool IsPlaying() const wxOVERRIDE { return false; } + volatile wxSoundPlaybackStatus *status) override; + void Stop() override {} + bool IsPlaying() const override { return false; } private: int OpenDSP(const wxSoundData *data); @@ -274,7 +274,7 @@ public: wxSoundAsyncPlaybackThread(wxSoundSyncOnlyAdaptor *adaptor, wxSoundData *data, unsigned flags) : wxThread(), m_adapt(adaptor), m_data(data), m_flags(flags) {} - virtual ExitCode Entry() wxOVERRIDE; + virtual ExitCode Entry() override; protected: wxSoundSyncOnlyAdaptor *m_adapt; @@ -295,26 +295,26 @@ public: { delete m_backend; } - wxString GetName() const wxOVERRIDE + wxString GetName() const override { return m_backend->GetName(); } - int GetPriority() const wxOVERRIDE + int GetPriority() const override { return m_backend->GetPriority(); } - bool IsAvailable() const wxOVERRIDE + bool IsAvailable() const override { return m_backend->IsAvailable(); } - bool HasNativeAsyncPlayback() const wxOVERRIDE + bool HasNativeAsyncPlayback() const override { return true; } bool Play(wxSoundData *data, unsigned flags, - volatile wxSoundPlaybackStatus *status) wxOVERRIDE; - void Stop() wxOVERRIDE; - bool IsPlaying() const wxOVERRIDE; + volatile wxSoundPlaybackStatus *status) override; + void Stop() override; + bool IsPlaying() const override; private: friend class wxSoundAsyncPlaybackThread; @@ -730,8 +730,8 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData) class wxSoundCleanupModule: public wxModule { public: - bool OnInit() wxOVERRIDE { return true; } - void OnExit() wxOVERRIDE { wxSound::UnloadBackend(); } + bool OnInit() override { return true; } + void OnExit() override { wxSound::UnloadBackend(); } wxDECLARE_DYNAMIC_CLASS(wxSoundCleanupModule); }; diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp index 7df8b5b9ed..a12eaf29ac 100644 --- a/src/unix/sound_sdl.cpp +++ b/src/unix/sound_sdl.cpp @@ -36,7 +36,7 @@ class wxSoundBackendSDLNotification : public wxEvent public: wxDECLARE_DYNAMIC_CLASS(wxSoundBackendSDLNotification); wxSoundBackendSDLNotification(); - wxEvent *Clone() const wxOVERRIDE { return new wxSoundBackendSDLNotification(*this); } + wxEvent *Clone() const override { return new wxSoundBackendSDLNotification(*this); } }; typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction) @@ -69,18 +69,18 @@ public: m_data(NULL), m_evtHandler(NULL) {} virtual ~wxSoundBackendSDL(); - wxString GetName() const wxOVERRIDE { return wxT("Simple DirectMedia Layer"); } - int GetPriority() const wxOVERRIDE { return 9; } - bool IsAvailable() const wxOVERRIDE; - bool HasNativeAsyncPlayback() const wxOVERRIDE { return true; } + wxString GetName() const override { return wxT("Simple DirectMedia Layer"); } + int GetPriority() const override { return 9; } + bool IsAvailable() const override; + bool HasNativeAsyncPlayback() const override { return true; } bool Play(wxSoundData *data, unsigned flags, - volatile wxSoundPlaybackStatus *status) wxOVERRIDE; + volatile wxSoundPlaybackStatus *status) override; void FillAudioBuffer(Uint8 *stream, int len); void FinishedPlayback(); - void Stop() wxOVERRIDE; - bool IsPlaying() const wxOVERRIDE { return m_playing; } + void Stop() override; + bool IsPlaying() const override { return m_playing; } private: bool OpenAudio(); diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index cf828d65b8..ab0e28cbb2 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -1864,8 +1864,8 @@ void wxOSXThreadModuleOnExit(); class wxThreadModule : public wxModule { public: - virtual bool OnInit() wxOVERRIDE; - virtual void OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual void OnExit() override; private: wxDECLARE_DYNAMIC_CLASS(wxThreadModule); diff --git a/src/unix/timerunx.cpp b/src/unix/timerunx.cpp index 9817804722..73b1b7f969 100644 --- a/src/unix/timerunx.cpp +++ b/src/unix/timerunx.cpp @@ -238,8 +238,8 @@ class wxTimerUnixModule : public wxModule { public: wxTimerUnixModule() {} - virtual bool OnInit() wxOVERRIDE { return true; } - virtual void OnExit() wxOVERRIDE { wxTimerScheduler::Shutdown(); } + virtual bool OnInit() override { return true; } + virtual void OnExit() override { wxTimerScheduler::Shutdown(); } wxDECLARE_DYNAMIC_CLASS(wxTimerUnixModule); }; diff --git a/src/unix/uiactionx11.cpp b/src/unix/uiactionx11.cpp index 7f43af9ae8..b62ecefd38 100644 --- a/src/unix/uiactionx11.cpp +++ b/src/unix/uiactionx11.cpp @@ -130,11 +130,11 @@ public: // The returned pointer is owned by the caller. static wxUIActionSimulatorImpl* New(); - virtual bool MouseMove(long x, long y) wxOVERRIDE; - virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; - virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) wxOVERRIDE; + virtual bool MouseMove(long x, long y) override; + virtual bool MouseDown(int button = wxMOUSE_BTN_LEFT) override; + virtual bool MouseUp(int button = wxMOUSE_BTN_LEFT) override; - virtual bool DoKey(int keycode, int modifiers, bool isDown) wxOVERRIDE; + virtual bool DoKey(int keycode, int modifiers, bool isDown) override; protected: // This ctor takes ownership of the display. @@ -241,9 +241,9 @@ public: } private: - virtual bool DoX11Button(int xbutton, bool isDown) wxOVERRIDE; - virtual bool DoX11MouseMove(long x, long y) wxOVERRIDE; - virtual bool DoX11Key(KeyCode xkeycode, int modifiers, bool isDown) wxOVERRIDE; + virtual bool DoX11Button(int xbutton, bool isDown) override; + virtual bool DoX11MouseMove(long x, long y) override; + virtual bool DoX11Key(KeyCode xkeycode, int modifiers, bool isDown) override; wxDECLARE_NO_COPY_CLASS(wxUIActionSimulatorPlainX11Impl); }; @@ -355,9 +355,9 @@ public: } private: - virtual bool DoX11Button(int xbutton, bool isDown) wxOVERRIDE; - virtual bool DoX11MouseMove(long x, long y) wxOVERRIDE; - virtual bool DoX11Key(KeyCode xkeycode, int modifiers, bool isDown) wxOVERRIDE; + virtual bool DoX11Button(int xbutton, bool isDown) override; + virtual bool DoX11MouseMove(long x, long y) override; + virtual bool DoX11Key(KeyCode xkeycode, int modifiers, bool isDown) override; wxDECLARE_NO_COPY_CLASS(wxUIActionSimulatorXTestImpl); }; diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp index 57773e17f5..8e27bd2d0f 100644 --- a/src/unix/uilocale.cpp +++ b/src/unix/uilocale.cpp @@ -173,18 +173,18 @@ public: , locale_t loc = NULL #endif // HAVE_LOCALE_T ); - ~wxUILocaleImplUnix() wxOVERRIDE; + ~wxUILocaleImplUnix() override; - void Use() wxOVERRIDE; + void Use() override; - wxString GetName() const wxOVERRIDE; - wxLocaleIdent GetLocaleId() const wxOVERRIDE; - wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const wxOVERRIDE; - wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const wxOVERRIDE; - wxLayoutDirection GetLayoutDirection() const wxOVERRIDE; + wxString GetName() const override; + wxLocaleIdent GetLocaleId() const override; + wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const override; + wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const override; + wxLayoutDirection GetLayoutDirection() const override; int CompareStrings(const wxString& lhs, const wxString& rhs, - int flags) const wxOVERRIDE; + int flags) const override; private: #ifdef HAVE_LANGINFO_H diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp index 0cca65d7c4..4919ef38f3 100644 --- a/src/xrc/xh_unkwn.cpp +++ b/src/xrc/xh_unkwn.cpp @@ -41,8 +41,8 @@ public: m_bg = UseBgCol() ? GetBackgroundColour() : wxColour(); } - virtual void AddChild(wxWindowBase *child) wxOVERRIDE; - virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE; + virtual void AddChild(wxWindowBase *child) override; + virtual void RemoveChild(wxWindowBase *child) override; // Ensure that setting the min or max size both for this window itself (as @@ -50,7 +50,7 @@ public: // control contained in it works as expected, i.e. the larger/smaller of // the sizes is used to satisfy both windows invariants. - virtual wxSize GetMinSize() const wxOVERRIDE + virtual wxSize GetMinSize() const override { wxSize size = wxPanel::GetMinSize(); if ( m_control ) @@ -59,7 +59,7 @@ public: return size; } - virtual wxSize GetMaxSize() const wxOVERRIDE + virtual wxSize GetMaxSize() const override { wxSize size = wxPanel::GetMaxSize(); if ( m_control ) @@ -69,7 +69,7 @@ public: } protected: - virtual wxSize DoGetBestClientSize() const wxOVERRIDE + virtual wxSize DoGetBestClientSize() const override { // We don't have any natural best size when we're empty, so just return // the minimal valid size in this case. diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 482084c115..71139a2ddf 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -1449,7 +1449,7 @@ class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory public: ~wxXmlSubclassFactoryCXX() {} - wxObject *Create(const wxString& className) wxOVERRIDE + wxObject *Create(const wxString& className) override { wxClassInfo* classInfo = wxClassInfo::FindClass(className); @@ -3211,12 +3211,12 @@ class wxXmlResourceModule: public wxModule wxDECLARE_DYNAMIC_CLASS(wxXmlResourceModule); public: wxXmlResourceModule() {} - bool OnInit() wxOVERRIDE + bool OnInit() override { wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX); return true; } - void OnExit() wxOVERRIDE + void OnExit() override { delete wxXmlResource::Set(NULL); delete wxIdRangeManager::Set(NULL); diff --git a/tests/allheaders.cpp b/tests/allheaders.cpp index 62a8544f50..2bd63dbe40 100644 --- a/tests/allheaders.cpp +++ b/tests/allheaders.cpp @@ -395,7 +395,7 @@ struct DerivedWithoutOverride : Base struct DerivedWithOverride : Base { - virtual void Foo() wxOVERRIDE { } + virtual void Foo() override { } void OnIdle(wxIdleEvent&) { } diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index b5375a1fb7..c7cb0e0543 100644 --- a/tests/any/anytest.cpp +++ b/tests/any/anytest.cpp @@ -483,15 +483,15 @@ public: m_value = value; } - virtual bool Eq(wxVariantData& WXUNUSED(data)) const wxOVERRIDE + virtual bool Eq(wxVariantData& WXUNUSED(data)) const override { return false; } // What type is it? Return a string name. - virtual wxString GetType() const wxOVERRIDE { return "MyClass"; } + virtual wxString GetType() const override { return "MyClass"; } - virtual wxVariantData* Clone() const wxOVERRIDE + virtual wxVariantData* Clone() const override { return new wxMyVariantData(m_value); } @@ -682,7 +682,7 @@ public: virtual bool ConvertValue(const wxAnyValueBuffer& src, wxAnyValueType* dstType, - wxAnyValueBuffer& dst) const wxOVERRIDE + wxAnyValueBuffer& dst) const override { MyClass value = GetValue(src); diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index d788c8febd..7169e7e468 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -1115,7 +1115,7 @@ template class ArchiveNotifier : public NotifierT { public: - void OnEntryUpdated(EntryT& WXUNUSED(entry)) wxOVERRIDE { } + void OnEntryUpdated(EntryT& WXUNUSED(entry)) override { } }; template @@ -1141,7 +1141,7 @@ public: { } // the entry point for the test - void runTest() wxOVERRIDE; + void runTest() override; protected: void CreateArchive(wxOutputStream& out); diff --git a/tests/archive/archivetest.h b/tests/archive/archivetest.h index 25a1db7535..3f2a0dd001 100644 --- a/tests/archive/archivetest.h +++ b/tests/archive/archivetest.h @@ -42,8 +42,8 @@ public: ~TestOutputStream() { delete [] m_data; } int GetOptions() const { return m_options; } - wxFileOffset GetLength() const wxOVERRIDE { return m_size; } - bool IsSeekable() const wxOVERRIDE { return (m_options & PipeOut) == 0; } + wxFileOffset GetLength() const override { return m_size; } + bool IsSeekable() const override { return (m_options & PipeOut) == 0; } // gives away the data, this stream is then empty, and can be reused void GetData(char*& data, size_t& size); @@ -51,9 +51,9 @@ public: private: void Init(); - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; - size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + wxFileOffset OnSysTell() const override; + size_t OnSysWrite(const void *buffer, size_t size) override; int m_options; size_t m_pos; @@ -80,17 +80,17 @@ public: ~TestInputStream() { delete [] m_data; } void Rewind(); - wxFileOffset GetLength() const wxOVERRIDE { return m_size; } - bool IsSeekable() const wxOVERRIDE { return (m_options & PipeIn) == 0; } + wxFileOffset GetLength() const override { return m_size; } + bool IsSeekable() const override { return (m_options & PipeIn) == 0; } void SetData(TestOutputStream& out); void Chop(size_t size) { m_size = size; } char& operator [](size_t pos) { return m_data[pos]; } private: - wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE; - wxFileOffset OnSysTell() const wxOVERRIDE; - size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) override; + wxFileOffset OnSysTell() const override; + size_t OnSysRead(void *buffer, size_t size) override; int m_options; size_t m_pos; @@ -171,7 +171,7 @@ protected: typedef typename ClassFactoryT::pairiter_type PairIterT; // the entry point for the test - void runTest() wxOVERRIDE; + void runTest() override; // create the test data void CreateTestData(); diff --git a/tests/archive/tartest.cpp b/tests/archive/tartest.cpp index f28b17d7e2..5aa00489b8 100644 --- a/tests/archive/tartest.cpp +++ b/tests/archive/tartest.cpp @@ -28,13 +28,13 @@ class tartest : public ArchiveTestSuite public: tartest(); - void runTest() wxOVERRIDE { DoRunTest(); } + void runTest() override { DoRunTest(); } protected: CppUnit::Test *makeTest(string descr, int options, bool genericInterface, const wxString& archiver, - const wxString& unarchiver) wxOVERRIDE; + const wxString& unarchiver) override; }; tartest::tartest() diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp index d3e0317a58..6d33c924a1 100644 --- a/tests/archive/ziptest.cpp +++ b/tests/archive/ziptest.cpp @@ -38,19 +38,19 @@ public: { } protected: - void OnCreateArchive(wxZipOutputStream& zip) wxOVERRIDE; + void OnCreateArchive(wxZipOutputStream& zip) override; - void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal) wxOVERRIDE; + void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal) override; void OnCreateEntry(wxZipOutputStream& zip, TestEntry& testEntry, - wxZipEntry *entry) wxOVERRIDE; + wxZipEntry *entry) override; void OnEntryExtracted(wxZipEntry& entry, const TestEntry& testEntry, - wxZipInputStream *arc) wxOVERRIDE; + wxZipInputStream *arc) override; - void OnSetNotifier(EntryT& entry) wxOVERRIDE; + void OnSetNotifier(EntryT& entry) override; int m_count; wxString m_comment; @@ -132,7 +132,7 @@ void ZipTestCase::OnEntryExtracted(wxZipEntry& entry, class ZipNotifier : public wxZipNotifier { public: - void OnEntryUpdated(wxZipEntry& entry) wxOVERRIDE; + void OnEntryUpdated(wxZipEntry& entry) override; }; void ZipNotifier::OnEntryUpdated(wxZipEntry& entry) @@ -162,7 +162,7 @@ public: { } protected: - void runTest() wxOVERRIDE; + void runTest() override; int m_options; int m_id; }; @@ -209,12 +209,12 @@ class ziptest : public ArchiveTestSuite public: ziptest(); - void runTest() wxOVERRIDE { DoRunTest(); } + void runTest() override { DoRunTest(); } protected: CppUnit::Test *makeTest(string descr, int options, bool genericInterface, const wxString& archiver, - const wxString& unarchiver) wxOVERRIDE; + const wxString& unarchiver) override; }; ziptest::ziptest() diff --git a/tests/cmdline/cmdlinetest.cpp b/tests/cmdline/cmdlinetest.cpp index 3e3d9e70ef..3b976845dc 100644 --- a/tests/cmdline/cmdlinetest.cpp +++ b/tests/cmdline/cmdlinetest.cpp @@ -147,7 +147,7 @@ void CmdLineTestCase::ParseSwitches() class NoMessageOutput : public wxMessageOutput { public: - virtual void Output(const wxString& WXUNUSED(str)) wxOVERRIDE { } + virtual void Output(const wxString& WXUNUSED(str)) override { } } noMessages; wxMessageOutput * const old = wxMessageOutput::Set(&noMessages); diff --git a/tests/controls/bitmapcomboboxtest.cpp b/tests/controls/bitmapcomboboxtest.cpp index cc50ad08d0..ec34982fbd 100644 --- a/tests/controls/bitmapcomboboxtest.cpp +++ b/tests/controls/bitmapcomboboxtest.cpp @@ -28,17 +28,17 @@ class BitmapComboBoxTestCase : public TextEntryTestCase, public: BitmapComboBoxTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; } - virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; } + virtual wxTextEntry *GetTestEntry() const override { return m_combo; } + virtual wxWindow *GetTestWindow() const override { return m_combo; } - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; } + virtual wxItemContainer *GetContainer() const override { return m_combo; } + virtual wxWindow *GetContainerWindow() const override { return m_combo; } - virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE + virtual void CheckStringSelection(const char * WXUNUSED(sel)) override { // do nothing here, as explained in TextEntryTestCase comment, our // GetStringSelection() is the wxChoice, not wxTextEntry, one and there diff --git a/tests/controls/bitmaptogglebuttontest.cpp b/tests/controls/bitmaptogglebuttontest.cpp index 92db735abe..2f91dc29f3 100644 --- a/tests/controls/bitmaptogglebuttontest.cpp +++ b/tests/controls/bitmaptogglebuttontest.cpp @@ -28,8 +28,8 @@ class BitmapToggleButtonTestCase : public CppUnit::TestCase public: BitmapToggleButtonTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( BitmapToggleButtonTestCase ); diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp index e728a5b986..4a1c6a0574 100644 --- a/tests/controls/checkboxtest.cpp +++ b/tests/controls/checkboxtest.cpp @@ -23,8 +23,8 @@ class CheckBoxTestCase : public CppUnit::TestCase public: CheckBoxTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( CheckBoxTestCase ); diff --git a/tests/controls/checklistboxtest.cpp b/tests/controls/checklistboxtest.cpp index 729466aac2..9c83e478c9 100644 --- a/tests/controls/checklistboxtest.cpp +++ b/tests/controls/checklistboxtest.cpp @@ -24,12 +24,12 @@ class CheckListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestC public: CheckListBoxTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_check; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_check; } + virtual wxItemContainer *GetContainer() const override { return m_check; } + virtual wxWindow *GetContainerWindow() const override { return m_check; } CPPUNIT_TEST_SUITE( CheckListBoxTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/choicebooktest.cpp b/tests/controls/choicebooktest.cpp index 854d1ac43c..7bf72a3d62 100644 --- a/tests/controls/choicebooktest.cpp +++ b/tests/controls/choicebooktest.cpp @@ -24,16 +24,16 @@ class ChoicebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: ChoicebookTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_choicebook; } + virtual wxBookCtrlBase *GetBase() const override { return m_choicebook; } - virtual wxEventType GetChangedEvent() const wxOVERRIDE + virtual wxEventType GetChangedEvent() const override { return wxEVT_CHOICEBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const wxOVERRIDE + virtual wxEventType GetChangingEvent() const override { return wxEVT_CHOICEBOOK_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( ChoicebookTestCase ); diff --git a/tests/controls/choicetest.cpp b/tests/controls/choicetest.cpp index 3085b2083e..a213610085 100644 --- a/tests/controls/choicetest.cpp +++ b/tests/controls/choicetest.cpp @@ -23,12 +23,12 @@ class ChoiceTestCase : public ItemContainerTestCase, public CppUnit::TestCase public: ChoiceTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_choice; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_choice; } + virtual wxItemContainer *GetContainer() const override { return m_choice; } + virtual wxWindow *GetContainerWindow() const override { return m_choice; } CPPUNIT_TEST_SUITE( ChoiceTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp index a74c2bd35b..78612ccc68 100644 --- a/tests/controls/comboboxtest.cpp +++ b/tests/controls/comboboxtest.cpp @@ -34,17 +34,17 @@ class ComboBoxTestCase : public TextEntryTestCase, public ItemContainerTestCase, public: ComboBoxTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; } - virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; } + virtual wxTextEntry *GetTestEntry() const override { return m_combo; } + virtual wxWindow *GetTestWindow() const override { return m_combo; } - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; } + virtual wxItemContainer *GetContainer() const override { return m_combo; } + virtual wxWindow *GetContainerWindow() const override { return m_combo; } - virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE + virtual void CheckStringSelection(const char * WXUNUSED(sel)) override { // do nothing here, as explained in TextEntryTestCase comment, our // GetStringSelection() is the wxChoice, not wxTextEntry, one and there @@ -234,7 +234,7 @@ TEST_CASE("wxComboBox::ProcessEnter", "[wxComboBox][enter]") class ComboBoxCreator : public TextLikeControlCreator { public: - virtual wxControl* Create(wxWindow* parent, int style) const wxOVERRIDE + virtual wxControl* Create(wxWindow* parent, int style) const override { const wxString choices[] = { "foo", "bar", "baz" }; diff --git a/tests/controls/dataviewctrltest.cpp b/tests/controls/dataviewctrltest.cpp index b399851e20..731f4e5c8f 100644 --- a/tests/controls/dataviewctrltest.cpp +++ b/tests/controls/dataviewctrltest.cpp @@ -162,7 +162,7 @@ public: // Overridden wxDataViewModel methods. void GetValue(wxVariant &variant, const wxDataViewItem &item, - unsigned int WXUNUSED(col)) const wxOVERRIDE + unsigned int WXUNUSED(col)) const override { switch( GetItemID(item) ) { @@ -197,18 +197,18 @@ public: bool SetValue(const wxVariant &WXUNUSED(variant), const wxDataViewItem &WXUNUSED(item), - unsigned int WXUNUSED(col)) wxOVERRIDE + unsigned int WXUNUSED(col)) override { return false; } - bool HasContainerColumns(const wxDataViewItem &WXUNUSED(item)) const wxOVERRIDE + bool HasContainerColumns(const wxDataViewItem &WXUNUSED(item)) const override { // Always display all the columns, even for the containers. return true; } - wxDataViewItem GetParent(const wxDataViewItem &item) const wxOVERRIDE + wxDataViewItem GetParent(const wxDataViewItem &item) const override { switch( GetItemID(item) ) { @@ -233,7 +233,7 @@ public: return wxDataViewItem(); } - bool IsContainer(const wxDataViewItem &item) const wxOVERRIDE + bool IsContainer(const wxDataViewItem &item) const override { switch( GetItemID(item) ) { @@ -252,7 +252,7 @@ public: } unsigned int GetChildren(const wxDataViewItem &item, - wxDataViewItemArray &children) const wxOVERRIDE + wxDataViewItemArray &children) const override { switch( GetItemID(item) ) { diff --git a/tests/controls/datepickerctrltest.cpp b/tests/controls/datepickerctrltest.cpp index 084f5f3c9f..1de8c6021b 100644 --- a/tests/controls/datepickerctrltest.cpp +++ b/tests/controls/datepickerctrltest.cpp @@ -27,8 +27,8 @@ class DatePickerCtrlTestCase : public CppUnit::TestCase public: DatePickerCtrlTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( DatePickerCtrlTestCase ); diff --git a/tests/controls/dialogtest.cpp b/tests/controls/dialogtest.cpp index cdd04b6489..f5c4db6b01 100644 --- a/tests/controls/dialogtest.cpp +++ b/tests/controls/dialogtest.cpp @@ -116,7 +116,7 @@ public: wxExpectModal(int valueToSet) : m_valueToSet(valueToSet) {} protected: - virtual int OnInvoked(MyDialog *dlg) const wxOVERRIDE + virtual int OnInvoked(MyDialog *dlg) const override { // Simulate the user entering the expected number: dlg->m_value = m_valueToSet; diff --git a/tests/controls/frametest.cpp b/tests/controls/frametest.cpp index 35dbe6a7b1..144fae355d 100644 --- a/tests/controls/frametest.cpp +++ b/tests/controls/frametest.cpp @@ -21,8 +21,8 @@ class FrameTestCase : public CppUnit::TestCase public: FrameTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( FrameTestCase ); diff --git a/tests/controls/gaugetest.cpp b/tests/controls/gaugetest.cpp index 46d3a2434e..590b6a435b 100644 --- a/tests/controls/gaugetest.cpp +++ b/tests/controls/gaugetest.cpp @@ -21,8 +21,8 @@ class GaugeTestCase : public CppUnit::TestCase public: GaugeTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( GaugeTestCase ); diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp index 63004c3119..7579d9a53b 100644 --- a/tests/controls/gridtest.cpp +++ b/tests/controls/gridtest.cpp @@ -160,9 +160,9 @@ class GridAttrMatcher : public Catch::MatcherBase public: GridAttrMatcher(const TestableGrid& grid); - bool match(const TestableGrid& other) const wxOVERRIDE; + bool match(const TestableGrid& other) const override; - std::string describe() const wxOVERRIDE; + std::string describe() const override; private: const TestableGrid* m_grid; @@ -1417,31 +1417,31 @@ TEST_CASE_METHOD(GridTestCase, "Grid::WindowAsEditorControl", "[grid]") void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) wxOVERRIDE + wxEvtHandler* evtHandler) override { SetWindow(new wxWindow(parent, id)); wxGridCellEditor::Create(parent, id, evtHandler); } - void BeginEdit(int, int, wxGrid*) wxOVERRIDE {} + void BeginEdit(int, int, wxGrid*) override {} bool EndEdit(int, int, wxGrid const*, wxString const&, - wxString* newval) wxOVERRIDE + wxString* newval) override { *newval = GetValue(); return true; } - void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE + void ApplyEdit(int row, int col, wxGrid* grid) override { grid->GetTable()->SetValue(row, col, GetValue()); } - void Reset() wxOVERRIDE {} + void Reset() override {} - wxGridCellEditor* Clone() const wxOVERRIDE { return new TestEditor(); } + wxGridCellEditor* Clone() const override { return new TestEditor(); } - wxString GetValue() const wxOVERRIDE { return "value"; } + wxString GetValue() const override { return "value"; } }; wxGridCellAttr* attr = new wxGridCellAttr(); diff --git a/tests/controls/headerctrltest.cpp b/tests/controls/headerctrltest.cpp index 68eea73540..b51b8f60c6 100644 --- a/tests/controls/headerctrltest.cpp +++ b/tests/controls/headerctrltest.cpp @@ -28,8 +28,8 @@ class HeaderCtrlTestCase : public CppUnit::TestCase public: HeaderCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( HeaderCtrlTestCase ); diff --git a/tests/controls/htmllboxtest.cpp b/tests/controls/htmllboxtest.cpp index 04de6a2c73..d3380ebd88 100644 --- a/tests/controls/htmllboxtest.cpp +++ b/tests/controls/htmllboxtest.cpp @@ -24,12 +24,12 @@ class HtmlListBoxTestCase : public ItemContainerTestCase, public: HtmlListBoxTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_htmllbox; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_htmllbox; } + virtual wxItemContainer *GetContainer() const override { return m_htmllbox; } + virtual wxWindow *GetContainerWindow() const override { return m_htmllbox; } CPPUNIT_TEST_SUITE( HtmlListBoxTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/hyperlinkctrltest.cpp b/tests/controls/hyperlinkctrltest.cpp index 37b8d84ec8..237c0befa1 100644 --- a/tests/controls/hyperlinkctrltest.cpp +++ b/tests/controls/hyperlinkctrltest.cpp @@ -25,8 +25,8 @@ class HyperlinkCtrlTestCase : public CppUnit::TestCase public: HyperlinkCtrlTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( HyperlinkCtrlTestCase ); diff --git a/tests/controls/itemcontainertest.cpp b/tests/controls/itemcontainertest.cpp index 7c28b1a0f9..12b99f2fe8 100644 --- a/tests/controls/itemcontainertest.cpp +++ b/tests/controls/itemcontainertest.cpp @@ -311,7 +311,7 @@ void ItemContainerTestCase::SetSelection() class CommandEventHandler : public wxEvtHandler { public: - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE + virtual bool ProcessEvent(wxEvent& event) override { CPPUNIT_ASSERT_MESSAGE ( diff --git a/tests/controls/listbooktest.cpp b/tests/controls/listbooktest.cpp index 48b154f0b1..e8a8ddb1e5 100644 --- a/tests/controls/listbooktest.cpp +++ b/tests/controls/listbooktest.cpp @@ -25,16 +25,16 @@ class ListbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: ListbookTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_listbook; } + virtual wxBookCtrlBase *GetBase() const override { return m_listbook; } - virtual wxEventType GetChangedEvent() const wxOVERRIDE + virtual wxEventType GetChangedEvent() const override { return wxEVT_LISTBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const wxOVERRIDE + virtual wxEventType GetChangingEvent() const override { return wxEVT_LISTBOOK_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( ListbookTestCase ); diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp index 6701dab0e8..2e759dab47 100644 --- a/tests/controls/listboxtest.cpp +++ b/tests/controls/listboxtest.cpp @@ -25,12 +25,12 @@ class ListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestCase public: ListBoxTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_list; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_list; } + virtual wxItemContainer *GetContainer() const override { return m_list; } + virtual wxWindow *GetContainerWindow() const override { return m_list; } CPPUNIT_TEST_SUITE( ListBoxTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp index 0e7892186b..c6b6b7700a 100644 --- a/tests/controls/listctrltest.cpp +++ b/tests/controls/listctrltest.cpp @@ -36,10 +36,10 @@ class ListCtrlTestCase : public ListBaseTestCase, public CppUnit::TestCase public: ListCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; } + virtual wxListCtrl *GetList() const override { return m_list; } private: CPPUNIT_TEST_SUITE( ListCtrlTestCase ); diff --git a/tests/controls/listviewtest.cpp b/tests/controls/listviewtest.cpp index 7be73615f5..60f43c3395 100644 --- a/tests/controls/listviewtest.cpp +++ b/tests/controls/listviewtest.cpp @@ -24,10 +24,10 @@ class ListViewTestCase : public ListBaseTestCase, public CppUnit::TestCase public: ListViewTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; } + virtual wxListCtrl *GetList() const override { return m_list; } private: CPPUNIT_TEST_SUITE( ListViewTestCase ); diff --git a/tests/controls/markuptest.cpp b/tests/controls/markuptest.cpp index 8a552506fd..d859e35235 100644 --- a/tests/controls/markuptest.cpp +++ b/tests/controls/markuptest.cpp @@ -54,30 +54,30 @@ void MarkupTestCase::RoundTrip() const wxString& GetText() const { return m_text; } - virtual void OnText(const wxString& text) wxOVERRIDE { m_text += text; } + virtual void OnText(const wxString& text) override { m_text += text; } - virtual void OnBoldStart() wxOVERRIDE { m_text += ""; } - virtual void OnBoldEnd() wxOVERRIDE { m_text += ""; } + virtual void OnBoldStart() override { m_text += ""; } + virtual void OnBoldEnd() override { m_text += ""; } - virtual void OnItalicStart() wxOVERRIDE { m_text += ""; } - virtual void OnItalicEnd() wxOVERRIDE { m_text += ""; } + virtual void OnItalicStart() override { m_text += ""; } + virtual void OnItalicEnd() override { m_text += ""; } - virtual void OnUnderlinedStart() wxOVERRIDE { m_text += ""; } - virtual void OnUnderlinedEnd() wxOVERRIDE { m_text += ""; } + virtual void OnUnderlinedStart() override { m_text += ""; } + virtual void OnUnderlinedEnd() override { m_text += ""; } - virtual void OnStrikethroughStart() wxOVERRIDE { m_text += ""; } - virtual void OnStrikethroughEnd() wxOVERRIDE { m_text += ""; } + virtual void OnStrikethroughStart() override { m_text += ""; } + virtual void OnStrikethroughEnd() override { m_text += ""; } - virtual void OnBigStart() wxOVERRIDE { m_text += ""; } - virtual void OnBigEnd() wxOVERRIDE { m_text += ""; } + virtual void OnBigStart() override { m_text += ""; } + virtual void OnBigEnd() override { m_text += ""; } - virtual void OnSmallStart() wxOVERRIDE { m_text += ""; } - virtual void OnSmallEnd() wxOVERRIDE { m_text += ""; } + virtual void OnSmallStart() override { m_text += ""; } + virtual void OnSmallEnd() override { m_text += ""; } - virtual void OnTeletypeStart() wxOVERRIDE { m_text += ""; } - virtual void OnTeletypeEnd() wxOVERRIDE { m_text += ""; } + virtual void OnTeletypeStart() override { m_text += ""; } + virtual void OnTeletypeEnd() override { m_text += ""; } - virtual void OnSpanStart(const wxMarkupSpanAttributes& attrs) wxOVERRIDE + virtual void OnSpanStart(const wxMarkupSpanAttributes& attrs) override { m_text << ""; } - virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(attrs)) wxOVERRIDE + virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(attrs)) override { m_text += ""; } diff --git a/tests/controls/notebooktest.cpp b/tests/controls/notebooktest.cpp index 63c5f625fa..2ae4e585ff 100644 --- a/tests/controls/notebooktest.cpp +++ b/tests/controls/notebooktest.cpp @@ -27,16 +27,16 @@ class NotebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: NotebookTestCase() { m_notebook = NULL; m_numPageChanges = 0; } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_notebook; } + virtual wxBookCtrlBase *GetBase() const override { return m_notebook; } - virtual wxEventType GetChangedEvent() const wxOVERRIDE + virtual wxEventType GetChangedEvent() const override { return wxEVT_NOTEBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const wxOVERRIDE + virtual wxEventType GetChangingEvent() const override { return wxEVT_NOTEBOOK_PAGE_CHANGING; } diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp index e81c79924f..c42664eefd 100644 --- a/tests/controls/ownerdrawncomboboxtest.cpp +++ b/tests/controls/ownerdrawncomboboxtest.cpp @@ -36,17 +36,17 @@ class OwnerDrawnComboBoxTestCase : public TextEntryTestCase, public: OwnerDrawnComboBoxTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; } - virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; } + virtual wxTextEntry *GetTestEntry() const override { return m_combo; } + virtual wxWindow *GetTestWindow() const override { return m_combo; } - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; } + virtual wxItemContainer *GetContainer() const override { return m_combo; } + virtual wxWindow *GetContainerWindow() const override { return m_combo; } - virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE + virtual void CheckStringSelection(const char * WXUNUSED(sel)) override { // do nothing here, as explained in TextEntryTestCase comment, our // GetStringSelection() is the wxChoice, not wxTextEntry, one and there diff --git a/tests/controls/pickertest.cpp b/tests/controls/pickertest.cpp index 5eddd5e6e7..f43badd1c7 100644 --- a/tests/controls/pickertest.cpp +++ b/tests/controls/pickertest.cpp @@ -32,11 +32,11 @@ class ColourPickerCtrlTestCase : public PickerBaseTestCase, public: ColourPickerCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_colour; } + virtual wxPickerBase *GetBase() const override { return m_colour; } CPPUNIT_TEST_SUITE( ColourPickerCtrlTestCase ); wxPICKER_BASE_TESTS(); @@ -76,11 +76,11 @@ class DirPickerCtrlTestCase : public PickerBaseTestCase, public: DirPickerCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_dir; } + virtual wxPickerBase *GetBase() const override { return m_dir; } CPPUNIT_TEST_SUITE( DirPickerCtrlTestCase ); wxPICKER_BASE_TESTS(); @@ -121,11 +121,11 @@ class FilePickerCtrlTestCase : public PickerBaseTestCase, public: FilePickerCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_file; } + virtual wxPickerBase *GetBase() const override { return m_file; } CPPUNIT_TEST_SUITE( FilePickerCtrlTestCase ); wxPICKER_BASE_TESTS(); @@ -167,11 +167,11 @@ class FontPickerCtrlTestCase : public PickerBaseTestCase, public: FontPickerCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_font; } + virtual wxPickerBase *GetBase() const override { return m_font; } CPPUNIT_TEST_SUITE( FontPickerCtrlTestCase ); wxPICKER_BASE_TESTS(); diff --git a/tests/controls/rearrangelisttest.cpp b/tests/controls/rearrangelisttest.cpp index 7dc0711ee9..9741e277c5 100644 --- a/tests/controls/rearrangelisttest.cpp +++ b/tests/controls/rearrangelisttest.cpp @@ -24,12 +24,12 @@ class RearrangeListTestCase : public ItemContainerTestCase, public CppUnit::Test public: RearrangeListTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_rearrange; } - virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_rearrange; } + virtual wxItemContainer *GetContainer() const override { return m_rearrange; } + virtual wxWindow *GetContainerWindow() const override { return m_rearrange; } CPPUNIT_TEST_SUITE( RearrangeListTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp index e089942316..a4fbc1529c 100644 --- a/tests/controls/richtextctrltest.cpp +++ b/tests/controls/richtextctrltest.cpp @@ -26,8 +26,8 @@ class RichTextCtrlTestCase : public CppUnit::TestCase public: RichTextCtrlTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( RichTextCtrlTestCase ); diff --git a/tests/controls/simplebooktest.cpp b/tests/controls/simplebooktest.cpp index 5733634620..a3dd25bfd9 100644 --- a/tests/controls/simplebooktest.cpp +++ b/tests/controls/simplebooktest.cpp @@ -24,16 +24,16 @@ class SimplebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: SimplebookTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_simplebook; } + virtual wxBookCtrlBase *GetBase() const override { return m_simplebook; } - virtual wxEventType GetChangedEvent() const wxOVERRIDE + virtual wxEventType GetChangedEvent() const override { return wxEVT_BOOKCTRL_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const wxOVERRIDE + virtual wxEventType GetChangingEvent() const override { return wxEVT_BOOKCTRL_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( SimplebookTestCase ); diff --git a/tests/controls/slidertest.cpp b/tests/controls/slidertest.cpp index 3dfc598fde..f7cfa14055 100644 --- a/tests/controls/slidertest.cpp +++ b/tests/controls/slidertest.cpp @@ -24,8 +24,8 @@ class SliderTestCase : public CppUnit::TestCase public: SliderTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( SliderTestCase ); diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp index 0854feaabc..baef556668 100644 --- a/tests/controls/textctrltest.cpp +++ b/tests/controls/textctrltest.cpp @@ -56,12 +56,12 @@ class TextCtrlTestCase : public TextEntryTestCase, public CppUnit::TestCase public: TextCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_text; } - virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_text; } + virtual wxTextEntry *GetTestEntry() const override { return m_text; } + virtual wxWindow *GetTestWindow() const override { return m_text; } #define SINGLE_AND_MULTI_TESTS() \ WXUISIM_TEST( ReadOnly ); \ @@ -1294,14 +1294,14 @@ TEST_CASE("wxTextCtrl::ProcessEnter", "[wxTextCtrl][enter]") { } - virtual wxControl* Create(wxWindow* parent, int style) const wxOVERRIDE + virtual wxControl* Create(wxWindow* parent, int style) const override { return new wxTextCtrl(parent, wxID_ANY, wxString(), wxDefaultPosition, wxDefaultSize, style | m_styleToAdd); } - virtual TextLikeControlCreator* CloneAsMultiLine() const wxOVERRIDE + virtual TextLikeControlCreator* CloneAsMultiLine() const override { return new TextCtrlCreator(wxTE_MULTILINE); } diff --git a/tests/controls/togglebuttontest.cpp b/tests/controls/togglebuttontest.cpp index c95782a35e..298ba0da20 100644 --- a/tests/controls/togglebuttontest.cpp +++ b/tests/controls/togglebuttontest.cpp @@ -24,8 +24,8 @@ class ToggleButtonTestCase : public CppUnit::TestCase public: ToggleButtonTestCase() { } - void setUp() wxOVERRIDE; - void tearDown() wxOVERRIDE; + void setUp() override; + void tearDown() override; private: CPPUNIT_TEST_SUITE( ToggleButtonTestCase ); diff --git a/tests/controls/toolbooktest.cpp b/tests/controls/toolbooktest.cpp index c4193e8851..fb3d1f8c61 100644 --- a/tests/controls/toolbooktest.cpp +++ b/tests/controls/toolbooktest.cpp @@ -25,19 +25,19 @@ class ToolbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: ToolbookTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_toolbook; } + virtual wxBookCtrlBase *GetBase() const override { return m_toolbook; } - virtual wxEventType GetChangedEvent() const wxOVERRIDE + virtual wxEventType GetChangedEvent() const override { return wxEVT_TOOLBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const wxOVERRIDE + virtual wxEventType GetChangingEvent() const override { return wxEVT_TOOLBOOK_PAGE_CHANGING; } - virtual void Realize() wxOVERRIDE { m_toolbook->GetToolBar()->Realize(); } + virtual void Realize() override { m_toolbook->GetToolBar()->Realize(); } CPPUNIT_TEST_SUITE( ToolbookTestCase ); wxBOOK_CTRL_BASE_TESTS(); diff --git a/tests/controls/treebooktest.cpp b/tests/controls/treebooktest.cpp index 82118d554f..833de0b898 100644 --- a/tests/controls/treebooktest.cpp +++ b/tests/controls/treebooktest.cpp @@ -24,16 +24,16 @@ class TreebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: TreebookTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: - virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_treebook; } + virtual wxBookCtrlBase *GetBase() const override { return m_treebook; } - virtual wxEventType GetChangedEvent() const wxOVERRIDE + virtual wxEventType GetChangedEvent() const override { return wxEVT_TREEBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const wxOVERRIDE + virtual wxEventType GetChangingEvent() const override { return wxEVT_TREEBOOK_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( TreebookTestCase ); diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp index c1d9c29317..63e010ea42 100644 --- a/tests/controls/treectrltest.cpp +++ b/tests/controls/treectrltest.cpp @@ -35,8 +35,8 @@ class TreeCtrlTestCase : public CppUnit::TestCase public: TreeCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( TreeCtrlTestCase ); diff --git a/tests/controls/treelistctrltest.cpp b/tests/controls/treelistctrltest.cpp index 1f8f163bb6..467db044fc 100644 --- a/tests/controls/treelistctrltest.cpp +++ b/tests/controls/treelistctrltest.cpp @@ -28,8 +28,8 @@ class TreeListCtrlTestCase : public CppUnit::TestCase public: TreeListCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( TreeListCtrlTestCase ); diff --git a/tests/controls/virtlistctrltest.cpp b/tests/controls/virtlistctrltest.cpp index db6d431680..ab3b82e4ed 100644 --- a/tests/controls/virtlistctrltest.cpp +++ b/tests/controls/virtlistctrltest.cpp @@ -32,8 +32,8 @@ class VirtListCtrlTestCase : public CppUnit::TestCase public: VirtListCtrlTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( VirtListCtrlTestCase ); @@ -74,7 +74,7 @@ void VirtListCtrlTestCase::setUp() } protected: - virtual wxString OnGetItemText(long item, long column) const wxOVERRIDE + virtual wxString OnGetItemText(long item, long column) const override { return wxString::Format("Row %ld, col %ld", item, column); } diff --git a/tests/drawing/drawing.h b/tests/drawing/drawing.h index 8596a2c3c5..968ab6e48c 100644 --- a/tests/drawing/drawing.h +++ b/tests/drawing/drawing.h @@ -62,14 +62,14 @@ private: { public: virtual ~ImageGraphicsContextLifeCycle() {} - virtual wxString GetIdForFileName () const wxOVERRIDE { return "image"; } - virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "png"; } - virtual bool UseImageComparison() const wxOVERRIDE { return true; } - virtual bool PlatformIndependent() const wxOVERRIDE { return false; } + virtual wxString GetIdForFileName () const override { return "image"; } + virtual wxString GetExtensionForFileName () const override { return "png"; } + virtual bool UseImageComparison() const override { return true; } + virtual bool PlatformIndependent() const override { return false; } virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, - double pointsPerInch, const wxFileName &targetFileName) wxOVERRIDE; - virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE; - virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE; + double pointsPerInch, const wxFileName &targetFileName) override; + virtual void SaveBuiltContext (wxGraphicsContext *&gc) override; + virtual void CleanUp (wxGraphicsContext *gc) override; private: wxImage *m_image; wxString m_targetFileName; @@ -81,14 +81,14 @@ private: class SvgGraphicsContextLifeCycle: public DrawingTestGCFactory { public: - virtual wxString GetIdForFileName () const wxOVERRIDE { return "svg"; } - virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "svg"; } - virtual bool UseImageComparison() const wxOVERRIDE { return false; } - virtual bool PlatformIndependent() const wxOVERRIDE { return true; } + virtual wxString GetIdForFileName () const override { return "svg"; } + virtual wxString GetExtensionForFileName () const override { return "svg"; } + virtual bool UseImageComparison() const override { return false; } + virtual bool PlatformIndependent() const override { return true; } virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, - double pointsPerInch, const wxFileName &targetFileName) wxOVERRIDE; - virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE; - virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE; + double pointsPerInch, const wxFileName &targetFileName) override; + virtual void SaveBuiltContext (wxGraphicsContext *&gc) override; + virtual void CleanUp (wxGraphicsContext *gc) override; private: wxSVGFileDC *m_svgFileDc; diff --git a/tests/drawing/pluginsample.cpp b/tests/drawing/pluginsample.cpp index 874477859d..541961f5ac 100644 --- a/tests/drawing/pluginsample.cpp +++ b/tests/drawing/pluginsample.cpp @@ -29,18 +29,18 @@ public: virtual ~SampleDrawingTestGCFactory() { } - virtual wxString GetIdForFileName () const wxOVERRIDE { return "sample-plg"; } - virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "bmp"; } + virtual wxString GetIdForFileName () const override { return "sample-plg"; } + virtual wxString GetExtensionForFileName () const override { return "bmp"; } // Bitmaps are handled by wx code they should be binarily equal - virtual bool UseImageComparison() const wxOVERRIDE { return false; } + virtual bool UseImageComparison() const override { return false; } // We use wxGraphicsContext, its implementation is not platform independent // and returns may slightly vary - virtual bool PlatformIndependent() const wxOVERRIDE { return false; } + virtual bool PlatformIndependent() const override { return false; } virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, - double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) wxOVERRIDE { + double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) override { m_image = new wxImage (expectedSize); m_image->InitAlpha(); @@ -54,14 +54,14 @@ public: // Let's the opportunity to actually save the context and associated data // If saving requires deleting the wxGraphicsContext object the // implementer is free to do it but @c gc must then be nulled - virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE { + virtual void SaveBuiltContext (wxGraphicsContext *&gc) override { wxDELETE(gc); m_image->SaveFile (m_targetFileName); } // Cleans @c gc and internal data if any - virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE { + virtual void CleanUp (wxGraphicsContext *gc) override { delete gc; m_targetFileName.Empty(); wxDELETE(m_image); diff --git a/tests/events/evthandler.cpp b/tests/events/evthandler.cpp index ffdbe7b1b2..dcf0485ab3 100644 --- a/tests/events/evthandler.cpp +++ b/tests/events/evthandler.cpp @@ -29,7 +29,7 @@ class MyEvent : public wxEvent public: MyEvent() : wxEvent(0, MyEventType) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new MyEvent; } + virtual wxEvent *Clone() const override { return new MyEvent; } }; typedef void (wxEvtHandler::*MyEventFunction)(MyEvent&); diff --git a/tests/events/evtlooptest.cpp b/tests/events/evtlooptest.cpp index 77b696040f..a803cca4ae 100644 --- a/tests/events/evtlooptest.cpp +++ b/tests/events/evtlooptest.cpp @@ -60,7 +60,7 @@ public: { } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { m_loop.ScheduleExit(m_rc); } @@ -84,7 +84,7 @@ public: { } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { wxEventLoop loopInner; ScheduleLoopExitTimer timerInner(loopInner, EXIT_CODE_INNER_LOOP); diff --git a/tests/events/keyboard.cpp b/tests/events/keyboard.cpp index d5edd05689..c88616fa41 100644 --- a/tests/events/keyboard.cpp +++ b/tests/events/keyboard.cpp @@ -198,8 +198,8 @@ class KeyboardEventTestCase : public CppUnit::TestCase public: KeyboardEventTestCase() {} - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( KeyboardEventTestCase ); diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp index a04bed06ce..440cd2c2b9 100644 --- a/tests/events/propagation.cpp +++ b/tests/events/propagation.cpp @@ -64,7 +64,7 @@ public: // override ProcessEvent() to confirm that it is called for all event // handlers in the chain - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE + virtual bool ProcessEvent(wxEvent& event) override { if ( event.GetEventType() == m_evtType ) g_str += 'o'; // "o" == "overridden" @@ -184,7 +184,7 @@ public: Update(); } - virtual void OnDraw(wxDC& WXUNUSED(dc)) wxOVERRIDE + virtual void OnDraw(wxDC& WXUNUSED(dc)) override { g_str += 'D'; // draw } @@ -228,8 +228,8 @@ class EventPropagationTestCase : public CppUnit::TestCase public: EventPropagationTestCase() {} - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( EventPropagationTestCase ); @@ -360,7 +360,7 @@ void EventPropagationTestCase::ForwardEvent() public: ForwardEvtHandler(wxEvtHandler& h) : m_h(&h) { } - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE + virtual bool ProcessEvent(wxEvent& event) override { g_str += 'f'; @@ -524,7 +524,7 @@ class EventTestView : public wxView public: EventTestView() { } - virtual void OnDraw(wxDC*) wxOVERRIDE { } + virtual void OnDraw(wxDC*) override { } wxDECLARE_DYNAMIC_CLASS(EventTestView); }; diff --git a/tests/events/timertest.cpp b/tests/events/timertest.cpp index b3da4208b0..d2a7553811 100644 --- a/tests/events/timertest.cpp +++ b/tests/events/timertest.cpp @@ -91,7 +91,7 @@ void TimerEventTestCase::OneShot() } private: - virtual void Tick() wxOVERRIDE { m_loop.Exit(); } + virtual void Tick() override { m_loop.Exit(); } wxEventLoopBase& m_loop; diff --git a/tests/exec/exec.cpp b/tests/exec/exec.cpp index c016907738..069e4b428f 100644 --- a/tests/exec/exec.cpp +++ b/tests/exec/exec.cpp @@ -138,7 +138,7 @@ private: return wxExecuteReturnCode; } - void Notify() wxOVERRIDE + void Notify() override { // Run wxExecute inside the event loop. wxExecuteReturnCode = wxExecute(command, flags, callback); @@ -326,7 +326,7 @@ public: } // may be overridden to be notified about process termination - virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) wxOVERRIDE + virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) override { wxEventLoop::GetActive()->ScheduleExit(); } @@ -472,7 +472,7 @@ void ExecTestCase::TestOverlappedSyncExecute() StartOnce(10); } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { wxExecute(m_command, m_outputArray); } diff --git a/tests/file/dir.cpp b/tests/file/dir.cpp index d72984d7ec..ae5b81c5d5 100644 --- a/tests/file/dir.cpp +++ b/tests/file/dir.cpp @@ -127,12 +127,12 @@ class TestDirTraverser : public wxDirTraverser public: wxArrayString dirs; - virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE + virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) override { return wxDIR_CONTINUE; } - virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE + virtual wxDirTraverseResult OnDir(const wxString& dirname) override { dirs.push_back(dirname); return wxDIR_CONTINUE; diff --git a/tests/filesys/filesystest.cpp b/tests/filesys/filesystest.cpp index bad6e2c2b3..8e32c7c171 100644 --- a/tests/filesys/filesystest.cpp +++ b/tests/filesys/filesystest.cpp @@ -39,9 +39,9 @@ public: wxString RightLocation(const wxString& p) { return GetRightLocation(p); } wxString Anchor(const wxString& p) { return GetAnchor(p); } - bool CanOpen(const wxString& WXUNUSED(url)) wxOVERRIDE { return false; } + bool CanOpen(const wxString& WXUNUSED(url)) override { return false; } wxFSFile *OpenFile(wxFileSystem& WXUNUSED(fs), - const wxString& WXUNUSED(url)) wxOVERRIDE { return NULL; } + const wxString& WXUNUSED(url)) override { return NULL; } }; diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp index 18720bfbdb..c5b09dc19a 100644 --- a/tests/fswatcher/fswatchertest.cpp +++ b/tests/fswatcher/fswatchertest.cpp @@ -400,12 +400,12 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, class EventTester : public FSWTesterBase { public: - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { CHECK(eg.CreateFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_CREATE); event.SetPath(eg.m_file); @@ -429,12 +429,12 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, class EventTester : public FSWTesterBase { public: - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { CHECK(eg.DeleteFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_DELETE); event.SetPath(eg.m_old); @@ -469,12 +469,12 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, class EventTester : public FSWTesterBase { public: - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { CHECK(eg.RenameFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_RENAME); event.SetPath(eg.m_old); @@ -500,12 +500,12 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, class EventTester : public FSWTesterBase { public: - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { CHECK(eg.ModifyFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_MODIFY); event.SetPath(eg.m_file); @@ -534,12 +534,12 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, class EventTester : public FSWTesterBase { public: - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { CHECK(eg.ReadFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_ACCESS); event.SetPath(eg.m_file); @@ -570,12 +570,12 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, class EventTester : public FSWTesterBase { public: - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { CHECK(eg.TouchFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_ATTRIB); event.SetPath(eg.m_file); @@ -605,7 +605,7 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, // DELETE as the event path fields would be wrong in CheckResult() EventTester() : FSWTesterBase(wxFSW_EVENT_ACCESS) {} - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { // As wxFSW_EVENT_ACCESS is passed to the ctor only ReadFile() will // generate an event. Without it they all will, and the test fails @@ -614,7 +614,7 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, CHECK(eg.ReadFile()); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { wxFileSystemWatcherEvent event(wxFSW_EVENT_ACCESS); event.SetPath(eg.m_file); @@ -815,7 +815,7 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, CHECK( m_watcher->GetWatchedPathsCount() == 0 ); } - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { // We don't use this function for events. Just run the tests @@ -852,14 +852,14 @@ TEST_CASE_METHOD(FileSystemWatcherTestCase, Exit(); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { FAIL("Shouldn't be called"); return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR); } - virtual void CheckResult() wxOVERRIDE + virtual void CheckResult() override { // Do nothing. We override this to prevent receiving events in // ExpectedEvent() @@ -897,25 +897,25 @@ public: Start(1000, true); } - virtual void GenerateEvent() wxOVERRIDE + virtual void GenerateEvent() override { m_watcher->Remove(EventGenerator::GetWatchDir()); CHECK(eg.CreateFile()); } - virtual void CheckResult() wxOVERRIDE + virtual void CheckResult() override { REQUIRE( m_events.empty() ); } - virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE + virtual wxFileSystemWatcherEvent ExpectedEvent() override { FAIL( "Shouldn't be called" ); return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR); } - virtual void Notify() wxOVERRIDE + virtual void Notify() override { SendIdle(); } diff --git a/tests/graphics/affinematrix.cpp b/tests/graphics/affinematrix.cpp index f99b3f48c4..f50cb81302 100644 --- a/tests/graphics/affinematrix.cpp +++ b/tests/graphics/affinematrix.cpp @@ -118,7 +118,7 @@ public: { } - virtual void setUp() wxOVERRIDE + virtual void setUp() override { m_bmpOrig = wxBitmap(m_imgOrig); m_bmpUsingMatrix.Create(m_bmpOrig.GetSize(), m_bmpOrig.GetDepth()); @@ -159,20 +159,20 @@ public: { } - virtual void setUp() wxOVERRIDE + virtual void setUp() override { TransformMatrixTestCaseDCBase::setUp(); m_mdc.SelectObject(m_bmpUsingMatrix); } - virtual void tearDown() wxOVERRIDE + virtual void tearDown() override { m_mdc.SelectObject(wxNullBitmap); TransformMatrixTestCaseDCBase::tearDown(); } protected: - virtual void FlushDC() wxOVERRIDE {} + virtual void FlushDC() override {} private: CPPUNIT_TEST_SUITE( TransformMatrixTestCaseDC ); @@ -207,7 +207,7 @@ public: virtual ~TransformMatrixTestCaseGCDC() {} - virtual void setUp() wxOVERRIDE + virtual void setUp() override { TransformMatrixTestCaseDC::setUp(); @@ -218,14 +218,14 @@ public: ctx->SetAntialiasMode(wxANTIALIAS_NONE); } - virtual void tearDown() wxOVERRIDE + virtual void tearDown() override { delete m_gcdc; TransformMatrixTestCaseDC::tearDown(); } protected: - virtual void FlushDC() wxOVERRIDE + virtual void FlushDC() override { m_gcdc->GetGraphicsContext()->Flush(); } @@ -263,7 +263,7 @@ public: virtual ~TransformMatrixTestCaseGCDCGDIPlus() {} - virtual void setUp() wxOVERRIDE + virtual void setUp() override { TransformMatrixTestCaseGCDC::setUp(); @@ -299,7 +299,7 @@ public: virtual ~TransformMatrixTestCaseGCDCDirect2D() {} - virtual void setUp() wxOVERRIDE + virtual void setUp() override { TransformMatrixTestCaseGCDC::setUp(); @@ -308,7 +308,7 @@ public: m_gcdc->SetGraphicsContext(ctx); } - virtual void FlushDC() wxOVERRIDE + virtual void FlushDC() override { // Apparently, flushing native Direct2D renderer // is not enough to update underlying DC (bitmap) @@ -347,7 +347,7 @@ public: virtual ~TransformMatrixTestCaseGCDCCairo() {} - virtual void setUp() wxOVERRIDE + virtual void setUp() override { TransformMatrixTestCaseGCDC::setUp(); diff --git a/tests/graphics/bitmap.cpp b/tests/graphics/bitmap.cpp index dde38ad8c4..ff9df3f0d2 100644 --- a/tests/graphics/bitmap.cpp +++ b/tests/graphics/bitmap.cpp @@ -1600,7 +1600,7 @@ public: { } - bool match(const wxBitmap& bmp) const wxOVERRIDE + bool match(const wxBitmap& bmp) const override { const wxImage img(bmp.ConvertToImage()); @@ -1617,7 +1617,7 @@ public: return true; } - std::string describe() const wxOVERRIDE + std::string describe() const override { return wxString::Format("doesn't have all %s pixels", m_col.GetAsString()).ToStdString(); diff --git a/tests/graphics/bmpbundle.cpp b/tests/graphics/bmpbundle.cpp index 479931df35..4c20310f0e 100644 --- a/tests/graphics/bmpbundle.cpp +++ b/tests/graphics/bmpbundle.cpp @@ -160,7 +160,7 @@ public: { } - bool match(const BitmapAtScale& bitmapAtScale) const wxOVERRIDE + bool match(const BitmapAtScale& bitmapAtScale) const override { const wxBitmap& bmp = bitmapAtScale.bitmap; @@ -183,7 +183,7 @@ public: return m_diffDesc.empty(); } - std::string describe() const wxOVERRIDE + std::string describe() const override { return m_diffDesc.utf8_string(); } diff --git a/tests/graphics/boundingbox.cpp b/tests/graphics/boundingbox.cpp index 498fbd47a8..5a1dab3937 100644 --- a/tests/graphics/boundingbox.cpp +++ b/tests/graphics/boundingbox.cpp @@ -44,7 +44,7 @@ public: m_bmp = wxNullBitmap; } - virtual void setUp() wxOVERRIDE + virtual void setUp() override { m_gcdc->ResetBoundingBox(); } diff --git a/tests/graphics/colour.cpp b/tests/graphics/colour.cpp index 0e57282ccf..1991ddecbe 100644 --- a/tests/graphics/colour.cpp +++ b/tests/graphics/colour.cpp @@ -32,12 +32,12 @@ public: { } - bool match(const wxColour& c) const wxOVERRIDE + bool match(const wxColour& c) const override { return c.Red() == m_red && c.Green() == m_green && c.Blue() == m_blue; } - std::string describe() const wxOVERRIDE + std::string describe() const override { return wxString::Format("!= RGB(%#02x, %#02x, %#02x)", m_red, m_green, m_blue).ToStdString(); @@ -57,12 +57,12 @@ public: { } - bool match(const wxColour& c) const wxOVERRIDE + bool match(const wxColour& c) const override { return ColourRGBMatcher::match(c) && c.Alpha() == m_alpha; } - std::string describe() const wxOVERRIDE + std::string describe() const override { return wxString::Format("!= RGBA(%#02x, %#02x, %#02x, %#02x)", m_red, m_green, m_blue, m_alpha).ToStdString(); diff --git a/tests/graphics/graphmatrix.cpp b/tests/graphics/graphmatrix.cpp index 4d5d0f2f1a..4161baf470 100644 --- a/tests/graphics/graphmatrix.cpp +++ b/tests/graphics/graphmatrix.cpp @@ -39,13 +39,13 @@ public: m_bmp = wxNullBitmap; } - virtual void setUp() wxOVERRIDE + virtual void setUp() override { wxASSERT( m_rend ); m_ctx = m_rend->CreateContext(m_dc); } - virtual void tearDown() wxOVERRIDE + virtual void tearDown() override { delete m_ctx; m_ctx = NULL; diff --git a/tests/html/htmlparser.cpp b/tests/html/htmlparser.cpp index eb759ca73b..641e658ece 100644 --- a/tests/html/htmlparser.cpp +++ b/tests/html/htmlparser.cpp @@ -28,7 +28,7 @@ TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]") class NullParser : public wxHtmlWinParser { protected: - virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE { } + virtual void AddText(const wxString& WXUNUSED(txt)) override { } }; NullParser p; diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp index be35dd8d38..f8ab1d0431 100644 --- a/tests/html/htmlwindow.cpp +++ b/tests/html/htmlwindow.cpp @@ -32,8 +32,8 @@ class HtmlWindowTestCase : public CppUnit::TestCase public: HtmlWindowTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( HtmlWindowTestCase ); diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp index d0bdb7a958..30645d2146 100644 --- a/tests/interactive/output.cpp +++ b/tests/interactive/output.cpp @@ -318,7 +318,7 @@ public: { } - virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE + virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH) override { wxPuts(wxT("Stack dump:")); @@ -326,7 +326,7 @@ public: } protected: - virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE + virtual void OnStackFrame(const wxStackFrame& frame) override { wxPrintf("[%2zu] ", frame.GetLevel()); diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp index ccc12176cf..94539d062f 100644 --- a/tests/intl/intltest.cpp +++ b/tests/intl/intltest.cpp @@ -33,8 +33,8 @@ class IntlTestCase : public CppUnit::TestCase public: IntlTestCase() { m_locale=NULL; } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( IntlTestCase ); diff --git a/tests/log/logtest.cpp b/tests/log/logtest.cpp index 75a055b4b7..02fad418c5 100644 --- a/tests/log/logtest.cpp +++ b/tests/log/logtest.cpp @@ -77,7 +77,7 @@ public: protected: virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE + const wxLogRecordInfo& info) override { m_logs[level] = msg; m_logsInfo[level] = info; @@ -96,8 +96,8 @@ class LogTestCase : public CppUnit::TestCase public: LogTestCase() { } - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: CPPUNIT_TEST_SUITE( LogTestCase ); diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index 8435422a1e..f129434d80 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -80,8 +80,8 @@ class MenuTestCase : public CppUnit::TestCase public: MenuTestCase() {} - virtual void setUp() wxOVERRIDE { CreateFrame(); } - virtual void tearDown() wxOVERRIDE { m_frame->Destroy(); } + virtual void setUp() override { CreateFrame(); } + virtual void tearDown() override { m_frame->Destroy(); } private: CPPUNIT_TEST_SUITE( MenuTestCase ); diff --git a/tests/misc/module.cpp b/tests/misc/module.cpp index 24ee867e28..e38b8e1f16 100644 --- a/tests/misc/module.cpp +++ b/tests/misc/module.cpp @@ -26,8 +26,8 @@ wxString g_strLoadOrder; class Module : public wxModule { protected: - virtual bool OnInit() wxOVERRIDE { g_strLoadOrder += GetClassInfo()->GetClassName(); return true; } - virtual void OnExit() wxOVERRIDE { } + virtual bool OnInit() override { g_strLoadOrder += GetClassInfo()->GetClassName(); return true; } + virtual void OnExit() override { } }; class ModuleA : public Module diff --git a/tests/net/socket.cpp b/tests/net/socket.cpp index 6d89a57cdb..8857af73e9 100644 --- a/tests/net/socket.cpp +++ b/tests/net/socket.cpp @@ -257,7 +257,7 @@ void SocketTestCase::ReadAnotherThread() { } - virtual void* Entry() wxOVERRIDE + virtual void* Entry() override { wxSocketClientPtr sock(SocketTestCase::GetHTTPSocket(wxSOCKET_BLOCK)); if ( !sock ) diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp index 6b6e4eef69..ab85f39ec2 100644 --- a/tests/net/webrequest.cpp +++ b/tests/net/webrequest.cpp @@ -116,7 +116,7 @@ public: } } - void Notify() wxOVERRIDE + void Notify() override { WARN("Exiting loop on timeout"); loop.Exit(); diff --git a/tests/persistence/testpersistence.h b/tests/persistence/testpersistence.h index 3926b214bf..a4cd744de2 100644 --- a/tests/persistence/testpersistence.h +++ b/tests/persistence/testpersistence.h @@ -46,12 +46,12 @@ private: { } - ~TestPersistenceManager() wxOVERRIDE + ~TestPersistenceManager() override { m_config.DeleteAll(); } - wxConfigBase* GetConfig() const wxOVERRIDE + wxConfigBase* GetConfig() const override { return const_cast(&m_config); } diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp index 983400c175..5fbb1baf02 100644 --- a/tests/streams/ffilestream.cpp +++ b/tests/streams/ffilestream.cpp @@ -62,9 +62,9 @@ protected: private: // Implement base class functions. - virtual wxFFileInputStream *DoCreateInStream() wxOVERRIDE; - virtual wxFFileOutputStream *DoCreateOutStream() wxOVERRIDE; - virtual void DoDeleteOutStream() wxOVERRIDE; + virtual wxFFileInputStream *DoCreateInStream() override; + virtual wxFFileOutputStream *DoCreateOutStream() override; + virtual void DoDeleteOutStream() override; private: wxString GetInFileName() const; diff --git a/tests/streams/fileback.cpp b/tests/streams/fileback.cpp index 8de9a7ecc3..6d7e5438a8 100644 --- a/tests/streams/fileback.cpp +++ b/tests/streams/fileback.cpp @@ -30,7 +30,7 @@ public: TestStream(const void *buf, size_t size) : wxMemoryInputStream(buf, size) { } - wxFileOffset GetLength() const wxOVERRIDE { return wxInvalidOffset; } + wxFileOffset GetLength() const override { return wxInvalidOffset; } }; diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp index 523da27483..c17847bb6e 100644 --- a/tests/streams/filestream.cpp +++ b/tests/streams/filestream.cpp @@ -62,9 +62,9 @@ protected: private: // Implement base class functions. - virtual wxFileInputStream *DoCreateInStream() wxOVERRIDE; - virtual wxFileOutputStream *DoCreateOutStream() wxOVERRIDE; - virtual void DoDeleteOutStream() wxOVERRIDE; + virtual wxFileInputStream *DoCreateInStream() override; + virtual wxFileOutputStream *DoCreateOutStream() override; + virtual void DoDeleteOutStream() override; private: wxString GetInFileName() const; diff --git a/tests/streams/iostreams.cpp b/tests/streams/iostreams.cpp index 45d66ede14..13fbaca886 100644 --- a/tests/streams/iostreams.cpp +++ b/tests/streams/iostreams.cpp @@ -26,7 +26,7 @@ class IOStreamsTestCase : public CppUnit::TestCase public: IOStreamsTestCase() { } - virtual void tearDown() wxOVERRIDE + virtual void tearDown() override { if ( !m_fnTemp.empty() ) { diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp index 3435969da8..31ad203489 100644 --- a/tests/streams/largefile.cpp +++ b/tests/streams/largefile.cpp @@ -67,7 +67,7 @@ public: virtual ~LargeFileTest() { } protected: - void runTest() wxOVERRIDE; + void runTest() override; virtual wxInputStream *MakeInStream(const wxString& name) const = 0; virtual wxOutputStream *MakeOutStream(const wxString& name) const = 0; @@ -207,9 +207,9 @@ public: LargeFileTest_wxFile() : LargeFileTest("wxFile streams") { } protected: - wxInputStream *MakeInStream(const wxString& name) const wxOVERRIDE; - wxOutputStream *MakeOutStream(const wxString& name) const wxOVERRIDE; - bool HasLFS() const wxOVERRIDE { return (wxFileOffset)0xffffffff > 0; } + wxInputStream *MakeInStream(const wxString& name) const override; + wxOutputStream *MakeOutStream(const wxString& name) const override; + bool HasLFS() const override { return (wxFileOffset)0xffffffff > 0; } }; wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const @@ -239,9 +239,9 @@ public: LargeFileTest_wxFFile() : LargeFileTest("wxFFile streams") { } protected: - wxInputStream *MakeInStream(const wxString& name) const wxOVERRIDE; - wxOutputStream *MakeOutStream(const wxString& name) const wxOVERRIDE; - bool HasLFS() const wxOVERRIDE; + wxInputStream *MakeInStream(const wxString& name) const override; + wxOutputStream *MakeOutStream(const wxString& name) const override; + bool HasLFS() const override; }; wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const diff --git a/tests/streams/lzmastream.cpp b/tests/streams/lzmastream.cpp index e4e9b94e32..c6afa6efdb 100644 --- a/tests/streams/lzmastream.cpp +++ b/tests/streams/lzmastream.cpp @@ -43,8 +43,8 @@ public: CPPUNIT_TEST_SUITE_END(); protected: - wxLZMAInputStream *DoCreateInStream() wxOVERRIDE; - wxLZMAOutputStream *DoCreateOutStream() wxOVERRIDE; + wxLZMAInputStream *DoCreateInStream() override; + wxLZMAOutputStream *DoCreateOutStream() override; private: wxDECLARE_NO_COPY_CLASS(LZMAStream); diff --git a/tests/streams/memstream.cpp b/tests/streams/memstream.cpp index 887bf6f33d..52021ad38f 100644 --- a/tests/streams/memstream.cpp +++ b/tests/streams/memstream.cpp @@ -67,8 +67,8 @@ private: private: // Implement base class functions. - virtual wxMemoryInputStream *DoCreateInStream() wxOVERRIDE; - virtual wxMemoryOutputStream *DoCreateOutStream() wxOVERRIDE; + virtual wxMemoryInputStream *DoCreateInStream() override; + virtual wxMemoryOutputStream *DoCreateOutStream() override; private: char m_DataBuffer[DATABUFFER_SIZE]; diff --git a/tests/streams/socketstream.cpp b/tests/streams/socketstream.cpp index f7055ecb5f..cf25ec7ed4 100644 --- a/tests/streams/socketstream.cpp +++ b/tests/streams/socketstream.cpp @@ -63,7 +63,7 @@ public: } protected: - virtual void *Entry() wxOVERRIDE + virtual void *Entry() override { wxSocketServer srv(LocalAddress(m_port), wxSOCKET_REUSEADDR); CPPUNIT_ASSERT( srv.IsOk() ); @@ -100,8 +100,8 @@ public: socketStream(); virtual ~socketStream(); - virtual void setUp() wxOVERRIDE; - virtual void tearDown() wxOVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; // repeat all socket tests several times with different socket flags, so we // define this macro which is used several times in the test suite @@ -134,9 +134,9 @@ public: private: // Implement base class functions. - virtual wxSocketInputStream *DoCreateInStream() wxOVERRIDE; - virtual wxSocketOutputStream *DoCreateOutStream() wxOVERRIDE; - virtual void DoCheckInputStream(wxSocketInputStream& stream_in) wxOVERRIDE; + virtual wxSocketInputStream *DoCreateInStream() override; + virtual wxSocketOutputStream *DoCreateOutStream() override; + virtual void DoCheckInputStream(wxSocketInputStream& stream_in) override; // socket thread functions static void WriteSocket(wxSocketBase& socket) diff --git a/tests/streams/sstream.cpp b/tests/streams/sstream.cpp index a17640c3e8..fb12475f47 100644 --- a/tests/streams/sstream.cpp +++ b/tests/streams/sstream.cpp @@ -60,8 +60,8 @@ protected: private: // Implement base class functions. - virtual wxStringInputStream *DoCreateInStream() wxOVERRIDE; - virtual wxStringOutputStream *DoCreateOutStream() wxOVERRIDE; + virtual wxStringInputStream *DoCreateInStream() override; + virtual wxStringOutputStream *DoCreateOutStream() override; // output the given string to wxStringOutputStream and check that its // contents is exactly the same string diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp index a273b8d95c..c39871ab5c 100644 --- a/tests/streams/zlibstream.cpp +++ b/tests/streams/zlibstream.cpp @@ -116,10 +116,10 @@ private: private: // Implement base class functions. - virtual wxZlibInputStream *DoCreateInStream() wxOVERRIDE; - virtual wxZlibOutputStream *DoCreateOutStream() wxOVERRIDE; - virtual void DoDeleteInStream() wxOVERRIDE; - virtual void DoDeleteOutStream() wxOVERRIDE; + virtual wxZlibInputStream *DoCreateInStream() override; + virtual wxZlibOutputStream *DoCreateOutStream() override; + virtual void DoDeleteInStream() override; + virtual void DoDeleteOutStream() override; // Helper that can be used to create new wx compatibility tests... // Otherwise not used by the tests. diff --git a/tests/test.cpp b/tests/test.cpp index 90be379f97..faa6975761 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -207,7 +207,7 @@ public: protected: virtual void DoLogRecord(wxLogLevel level, const wxString& msg, - const wxLogRecordInfo& info) wxOVERRIDE + const wxLogRecordInfo& info) override { // If logging was explicitly enabled, show everything on the console. // @@ -269,11 +269,11 @@ public: TestApp(); // standard overrides - virtual bool OnInit() wxOVERRIDE; - virtual int OnExit() wxOVERRIDE; + virtual bool OnInit() override; + virtual int OnExit() override; #ifdef __WIN32__ - virtual wxAppTraits *CreateTraits() wxOVERRIDE + virtual wxAppTraits *CreateTraits() override { // Define a new class just to customize CanUseStderr() behaviour. class TestAppTraits : public TestAppTraitsBase @@ -283,11 +283,11 @@ public: // in this case we really don't want to show any message boxes, as // wxMessageOutputBest, used e.g. from the default implementation // of wxApp::OnUnhandledException(), would do by default. - virtual bool CanUseStderr() wxOVERRIDE { return true; } + virtual bool CanUseStderr() override { return true; } // Overriding CanUseStderr() is not enough, we also need to // override this one to avoid returning false from it. - virtual bool WriteToStderr(const wxString& text) wxOVERRIDE + virtual bool WriteToStderr(const wxString& text) override { wxFputs(text, stderr); fflush(stderr); @@ -304,7 +304,7 @@ public: // Also override this method to avoid showing any dialogs from here -- and // show some details about the exception along the way. - virtual bool OnExceptionInMainLoop() wxOVERRIDE + virtual bool OnExceptionInMainLoop() override { wxFprintf(stderr, wxASCII_STR("Unhandled exception in the main loop: %s\n"), wxASCII_STR(Catch::translateActiveException().c_str())); @@ -313,8 +313,8 @@ public: } // used by events propagation test - virtual int FilterEvent(wxEvent& event) wxOVERRIDE; - virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE; + virtual int FilterEvent(wxEvent& event) override; + virtual bool ProcessEvent(wxEvent& event) override; void SetFilterEventFunc(FilterEventFunc f) { m_filterEventFunc = f; } void SetProcessEventFunc(ProcessEventFunc f) { m_processEventFunc = f; } @@ -352,7 +352,7 @@ public: event.Skip(); } - virtual int OnRun() wxOVERRIDE + virtual int OnRun() override { if ( TestAppBase::OnRun() != 0 ) m_exitcode = EXIT_FAILURE; @@ -360,7 +360,7 @@ public: return m_exitcode; } #else // !wxUSE_GUI - virtual int OnRun() wxOVERRIDE + virtual int OnRun() override { return RunTests(); } diff --git a/tests/testimage.h b/tests/testimage.h index 50f676d7de..d98e0886eb 100644 --- a/tests/testimage.h +++ b/tests/testimage.h @@ -37,7 +37,7 @@ public: { } - bool match(const wxImage& other) const wxOVERRIDE + bool match(const wxImage& other) const override { if ( other.GetWidth() != m_image.GetWidth() ) return false; @@ -142,7 +142,7 @@ public: return true; } - std::string describe() const wxOVERRIDE + std::string describe() const override { std::string desc = "doesn't have the same RGB data as " + Catch::toString(m_image); @@ -189,7 +189,7 @@ public: { } - bool match(const wxImage& other) const wxOVERRIDE + bool match(const wxImage& other) const override { if (!other.HasAlpha()) { @@ -209,7 +209,7 @@ public: return true; } - std::string describe() const wxOVERRIDE + std::string describe() const override { std::string desc; diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp index f744ffc327..e469949b7d 100644 --- a/tests/textfile/textfiletest.cpp +++ b/tests/textfile/textfiletest.cpp @@ -37,7 +37,7 @@ public: srand((unsigned)time(NULL)); } - virtual void tearDown() wxOVERRIDE { unlink(GetTestFileName()); } + virtual void tearDown() override { unlink(GetTestFileName()); } private: CPPUNIT_TEST_SUITE( TextFileTestCase ); diff --git a/tests/thread/atomic.cpp b/tests/thread/atomic.cpp index 5ef98d532f..7278a8d14e 100644 --- a/tests/thread/atomic.cpp +++ b/tests/thread/atomic.cpp @@ -50,7 +50,7 @@ namespace m_operateOn(operateOn), m_testType(testType) {} // thread execution starts here - virtual void *Entry() wxOVERRIDE; + virtual void *Entry() override; public: wxAtomicInt &m_operateOn; diff --git a/tests/thread/misc.cpp b/tests/thread/misc.cpp index 58f28a50dd..b445341415 100644 --- a/tests/thread/misc.cpp +++ b/tests/thread/misc.cpp @@ -34,7 +34,7 @@ public: { m_n = n; Create(); } // thread execution starts here - virtual ExitCode Entry() wxOVERRIDE; + virtual ExitCode Entry() override; private: size_t m_n; @@ -67,10 +67,10 @@ public: } // thread execution starts here - virtual ExitCode Entry() wxOVERRIDE; + virtual ExitCode Entry() override; // and stops here - virtual void OnExit() wxOVERRIDE; + virtual void OnExit() override; private: size_t m_n; // number of characters to write @@ -127,7 +127,7 @@ public: Create(); } - virtual ExitCode Entry() wxOVERRIDE + virtual ExitCode Entry() override { //wxPrintf(wxT("Thread %lu has started running.\n"), GetId()); gs_cond.Post(); @@ -162,7 +162,7 @@ public: Create(); } - virtual ExitCode Entry() wxOVERRIDE + virtual ExitCode Entry() override { wxUnusedVar(m_i); diff --git a/tests/thread/queue.cpp b/tests/thread/queue.cpp index 8f37e71047..3f74e5b51e 100644 --- a/tests/thread/queue.cpp +++ b/tests/thread/queue.cpp @@ -52,7 +52,7 @@ private: {} // thread execution starts here - virtual void *Entry() wxOVERRIDE; + virtual void *Entry() override; // Thread message queue Queue& GetQueue() diff --git a/tests/thread/tls.cpp b/tests/thread/tls.cpp index 34bb2933f2..03c0822ee8 100644 --- a/tests/thread/tls.cpp +++ b/tests/thread/tls.cpp @@ -53,7 +53,7 @@ public: // ctor both creates and starts the thread TLSTestThread() : wxThread(wxTHREAD_JOINABLE) { Create(); Run(); } - virtual void *Entry() wxOVERRIDE + virtual void *Entry() override { gs_threadInt = 17; diff --git a/tests/weakref/evtconnection.cpp b/tests/weakref/evtconnection.cpp index ed3ff3bf1d..4eb60e3385 100644 --- a/tests/weakref/evtconnection.cpp +++ b/tests/weakref/evtconnection.cpp @@ -34,7 +34,7 @@ class wxTestEvent : public wxEvent { public: wxTestEvent(wxEventType type = wxEVT_TEST) : wxEvent(0, type) { } - virtual wxEvent *Clone() const wxOVERRIDE { return new wxTestEvent(GetEventType()); } + virtual wxEvent *Clone() const override { return new wxTestEvent(GetEventType()); } }; class wxTestSink : public wxEvtHandler diff --git a/tests/window/setsize.cpp b/tests/window/setsize.cpp index 566f84fd54..aeb995dbae 100644 --- a/tests/window/setsize.cpp +++ b/tests/window/setsize.cpp @@ -41,7 +41,7 @@ public: } protected: - virtual wxSize DoGetBestSize() const wxOVERRIDE { return wxSize(50, 250); } + virtual wxSize DoGetBestSize() const override { return wxSize(50, 250); } }; } // anonymous namespace diff --git a/tests/xml/xrctest.cpp b/tests/xml/xrctest.cpp index fa44344a4a..94d38c983f 100644 --- a/tests/xml/xrctest.cpp +++ b/tests/xml/xrctest.cpp @@ -286,8 +286,8 @@ TEST_CASE("XRC::EnvVarInPath", "[xrc]") wxUnsetEnv("WX_TEST_ENV_IN_PATH"); wxXmlResource::Get()->SetFlags(wxXRC_USE_LOCALE); } - virtual wxObject* DoCreateResource() wxOVERRIDE { return NULL; } - virtual bool CanHandle(wxXmlNode*) wxOVERRIDE { return false; } + virtual wxObject* DoCreateResource() override { return NULL; } + virtual bool CanHandle(wxXmlNode*) override { return false; } bool varIsSet; } handler(xmlDoc.GetRoot()); diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 022e908df6..80e14281e0 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -220,8 +220,8 @@ class XmlResApp : public wxAppConsole { public: // don't use builtin cmd line parsing: - virtual bool OnInit() wxOVERRIDE { return true; } - virtual int OnRun() wxOVERRIDE; + virtual bool OnInit() override { return true; } + virtual int OnRun() override; private: void ParseParams(const wxCmdLineParser& cmdline);