Add wxOVERRIDE and use it in common and wxOSX code.

Make overriding virtual methods more explicit and enable additional checks
provided by C++11 compilers when "override" is used.

Closes #16100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

acinclude.m4

@@ -255,6 +255,39 @@ AC_DEFUN([WX_CPP_EXPLICIT],
   fi
 ])
 
+dnl ---------------------------------------------------------------------------
+dnl WX_CPP_OVERRIDE checks whether the C++ compiler support the override
+dnl keyword and defines HAVE_OVERRIDE if this is the case
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CPP_OVERRIDE],
+[
+  AC_CACHE_CHECK([if C++ compiler supports the override keyword],
+                 wx_cv_override,
+  [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    AC_TRY_COMPILE(
+      [
+        struct Base { virtual void Foo() = 0; };
+        struct Derived : Base { virtual void Foo() override { } };
+      ],
+      [
+        return 0;
+      ],
+      wx_cv_override=yes,
+      wx_cv_override=no
+    )
+
+    AC_LANG_RESTORE
+  ])
+
+  if test "$wx_cv_override" = "yes"; then
+    AC_DEFINE(HAVE_OVERRIDE)
+  fi
+])
+
 dnl ---------------------------------------------------------------------------
 dnl WX_CHECK_FUNCS(FUNCTIONS...,
 dnl                [ACTION-IF-FOUND],

configure

@@ -21173,6 +21173,62 @@ $as_echo "$wx_cv_explicit" >&6; }
   fi
 
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler supports the override keyword" >&5
+$as_echo_n "checking if C++ compiler supports the override keyword... " >&6; }
+if ${wx_cv_override+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+    ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        struct Base { virtual void Foo() = 0; };
+        struct Derived : Base { virtual void Foo() override { } };
+
+int
+main ()
+{
+
+        return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_override=yes
+else
+  wx_cv_override=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_override" >&5
+$as_echo "$wx_cv_override" >&6; }
+
+  if test "$wx_cv_override" = "yes"; then
+    $as_echo "#define HAVE_OVERRIDE 1" >>confdefs.h
+
+  fi
+
+
 if test "x$SUNCXX" = xyes; then
     CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"
 fi

configure.in

@@ -1793,6 +1793,9 @@ WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
 dnl check whether C++ compiler supports explicit keyword
 WX_CPP_EXPLICIT
 
+dnl check whether C++ compiler supports override keyword
+WX_CPP_OVERRIDE
+
 dnl With Sun CC, temporaries have block scope by default. This flag is needed
 dnl to get the expression scope behaviour that conforms to the standard.
 if test "x$SUNCXX" = xyes; then

docs/changes.txt

@@ -25,6 +25,7 @@ All:
 - Add wxDynamicLibrary::GetModuleFromAddress() (Luca Bacci).
 - Implement wxThread::SetPriority() for pthreads (Luca Bacci).
 - Add wxInt64 support to wxText{Input,Output}Stream (Alexander Bezzubikov).
+- Define wxOVERRIDE as override for supporting compilers (Thomas Goyne).
 
 All (GUI):
 

include/wx/defs.h

@@ -269,6 +269,28 @@ typedef short int WXTYPE;
     #define wxEXPLICIT
 #endif /*  HAVE_EXPLICIT/!HAVE_EXPLICIT */
 
+/*  check for override keyword support */
+#ifndef HAVE_OVERRIDE
+    #if defined(__VISUALC__) && (__VISUALC__ >= 1400)
+        /*
+           VC++ 8.0+ support C++/CLI's override, sealed, and abstract in native
+           code as a nonstandard extension, and C++/CLI's override fortunately
+           matches C++11's
+         */
+        #define HAVE_OVERRIDE
+    #elif wxCHECK_GCC_VERSION(4, 7) && __cplusplus >= 201103L
+        #define HAVE_OVERRIDE
+    #elif WX_HAS_CLANG_FEATURE(cxx_override_control)
+        #define HAVE_OVERRIDE
+    #endif
+#endif /*  !HAVE_OVERRIDE */
+
+#ifdef HAVE_OVERRIDE
+    #define wxOVERRIDE override
+#else /*  !HAVE_OVERRIDE */
+    #define wxOVERRIDE
+#endif /*  HAVE_OVERRIDE/!HAVE_EXPLICIT */
+
 /* these macros are obsolete, use the standard C++ casts directly now */
 #define wx_static_cast(t, x) static_cast<t>(x)
 #define wx_const_cast(t, x) const_cast<t>(x)

interface/wx/defs.h

@@ -1686,6 +1686,33 @@ template <typename T> wxDELETEA(T*& array);
 */
 #define wxEXPLICIT
 
+/**
+    @c wxOVERRIDE expands to the C++11 @c override keyword if it's supported by
+    the compiler or nothing otherwise.
+
+    This macro is useful for writing code which may be compiled by both C++11
+    and non-C++11 compilers and still allow the use of @c override for the
+    former.
+
+    Example of using this macro:
+    @code
+        class MyApp : public wxApp {
+        public:
+            virtual bool OnInit() wxOVERRIDE;
+
+            // This would result in an error from a C++11 compiler as the
+            // method doesn't actually override the base class OnExit() due to
+            // a typo in its name.
+            //virtual int OnEzit() wxOVERRIDE;
+        };
+    @endcode
+
+    @header{wx/defs.h}
+
+    @since 3.1.0
+ */
+#define wxOVERRIDE
+
 /**
     GNU C++ compiler gives a warning for any class whose destructor is private
     unless it has a friend. This warning may sometimes be useful but it doesn't

setup.h.in

@@ -698,6 +698,11 @@
  */
 #undef HAVE_EXPLICIT
 
+/*
+ * Define if your compiler supports the override keyword
+ */
+#undef HAVE_OVERRIDE
+
 /*
  * Define if your compiler has C99 va_copy
  */

src/aui/auibar.cpp

@@ -98,7 +98,7 @@ public:
     ToolbarCommandCapture() { m_lastId = 0; }
     int GetCommandId() const { return m_lastId; }
 
-    bool ProcessEvent(wxEvent& evt)
+    bool ProcessEvent(wxEvent& evt) wxOVERRIDE
     {
         if (evt.GetEventType() == wxEVT_MENU)
         {

src/aui/auibook.cpp

@@ -1495,20 +1495,20 @@ public:
 protected:
     void DoSetSize(int x, int y,
                    int width, int height,
-                   int WXUNUSED(sizeFlags = wxSIZE_AUTO))
+                   int WXUNUSED(sizeFlags = wxSIZE_AUTO)) wxOVERRIDE
     {
         m_rect = wxRect(x, y, width, height);
         DoSizing();
     }
 
-    void DoGetClientSize(int* x, int* y) const
+    void DoGetClientSize(int* x, int* y) const wxOVERRIDE
     {
         *x = m_rect.width;
         *y = m_rect.height;
     }
 
 public:
-    bool Show( bool WXUNUSED(show = true) ) { return false; }
+    bool Show( bool WXUNUSED(show = true) ) wxOVERRIDE { return false; }
 
     void DoSizing()
     {
@@ -1584,7 +1584,7 @@ public:
     }
 
 protected:
-    void DoGetSize(int* x, int* y) const
+    void DoGetSize(int* x, int* y) const wxOVERRIDE
     {
         if (x)
             *x = m_rect.GetWidth();
@@ -1593,7 +1593,7 @@ protected:
     }
 
 public:
-    void Update()
+    void Update() wxOVERRIDE
     {
         // does nothing
     }

src/aui/framemanager.cpp

@@ -112,7 +112,7 @@ public:
         SetTransparent(0);
     }
 
-    virtual bool SetTransparent(wxByte alpha)
+    virtual bool SetTransparent(wxByte alpha) wxOVERRIDE
     {
         if (m_canSetShape)
         {

src/aui/tabart.cpp

@@ -47,7 +47,7 @@ public:
     wxAuiCommandCapture() { m_lastId = 0; }
     int GetCommandId() const { return m_lastId; }
 
-    bool ProcessEvent(wxEvent& evt)
+    bool ProcessEvent(wxEvent& evt) wxOVERRIDE
     {
         if (evt.GetEventType() == wxEVT_MENU)
         {

src/common/any.cpp

@@ -216,11 +216,11 @@ public:
     wxAnyValueTypeGlobalsManager() : wxModule() { }
     virtual ~wxAnyValueTypeGlobalsManager() { }
 
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         return true;
     }
-    virtual void OnExit()
+    virtual void OnExit() wxOVERRIDE
     {
         wxDELETE(g_wxAnyValueTypeGlobals);
     }
@@ -495,13 +495,13 @@ class wxAnyValueTypeImpl<wxAnyNullValue> : public wxAnyValueType
     WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxAnyNullValue>)
 public:
     // Dummy implementations
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
     {
         wxUnusedVar(buf);
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
+                            wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxUnusedVar(src);
         wxUnusedVar(dst);
@@ -509,7 +509,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
+                              wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxUnusedVar(src);
         wxUnusedVar(dstType);

src/common/appbase.cpp

@@ -938,7 +938,7 @@ wxString wxAppTraitsBase::GetAssertStackTrace()
         const wxString& GetStackTrace() const { return m_stackTrace; }
 
     protected:
-        virtual void OnStackFrame(const wxStackFrame& frame)
+        virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE
         {
             m_stackTrace << wxString::Format
                             (

src/common/artprov.cpp

@@ -411,7 +411,7 @@ bool wxArtProvider::HasNativeProvider()
 class wxArtProviderModule: public wxModule
 {
 public:
-    bool OnInit()
+    bool OnInit() wxOVERRIDE
     {
         // The order here is such that the native provider will be used first
         // and the standard one last as all these default providers add
@@ -425,7 +425,7 @@ public:
 #endif // wxUSE_ARTPROVIDER_STD
         return true;
     }
-    void OnExit()
+    void OnExit() wxOVERRIDE
     {
         wxArtProvider::CleanUpProviders();
     }

src/common/artstd.cpp

@@ -35,7 +35,7 @@ class wxDefaultArtProvider : public wxArtProvider
 {
 protected:
     virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
-                                  const wxSize& size);
+                                  const wxSize& size) wxOVERRIDE;
 };
 
 // ----------------------------------------------------------------------------

src/common/arttango.cpp

@@ -91,7 +91,7 @@ public:
 protected:
     virtual wxBitmap CreateBitmap(const wxArtID& id,
                                   const wxArtClient& client,
-                                  const wxSize& size);
+                                  const wxSize& size) wxOVERRIDE;
 
 private:
     bool m_imageHandledAdded;

src/common/bmpbase.cpp

@@ -166,8 +166,8 @@ class wxBitmapBaseModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}
-    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; }
-    void OnExit() { wxBitmap::CleanUpHandlers(); }
+    bool OnInit() wxOVERRIDE { wxBitmap::InitStandardHandlers(); return true; }
+    void OnExit() wxOVERRIDE { wxBitmap::CleanUpHandlers(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)

src/common/clipcmn.cpp

@@ -99,8 +99,8 @@ bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink )
 class wxClipboardModule : public wxModule
 {
 public:
-    bool OnInit() { return true; }
-    void OnExit() { wxDELETE(gs_clipboard); }
+    bool OnInit() wxOVERRIDE { return true; }
+    void OnExit() wxOVERRIDE { wxDELETE(gs_clipboard); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)

src/common/cmdline.cpp

@@ -99,29 +99,29 @@ public:
     wxCmdLineParamType type;
 
     // from wxCmdLineArg
-    virtual wxCmdLineEntryType GetKind() const { return kind; }
-    virtual wxString GetShortName() const {
+    virtual wxCmdLineEntryType GetKind() const wxOVERRIDE { return kind; }
+    virtual wxString GetShortName() const wxOVERRIDE {
         wxASSERT_MSG( kind == wxCMD_LINE_OPTION || kind == wxCMD_LINE_SWITCH,
                       wxT("kind mismatch in wxCmdLineArg") );
         return shortName;
     }
-    virtual wxString GetLongName() const {
+    virtual wxString GetLongName() const wxOVERRIDE {
         wxASSERT_MSG( kind == wxCMD_LINE_OPTION || kind == wxCMD_LINE_SWITCH,
                       wxT("kind mismatch in wxCmdLineArg") );
         return longName;
     }
-    virtual wxCmdLineParamType GetType() const {
+    virtual wxCmdLineParamType GetType() const wxOVERRIDE {
         wxASSERT_MSG( kind == wxCMD_LINE_OPTION,
                       wxT("kind mismatch in wxCmdLineArg") );
         return type;
     }
-    double GetDoubleVal() const;
-    long GetLongVal() const;
-    const wxString& GetStrVal() const;
+    double GetDoubleVal() const wxOVERRIDE;
+    long GetLongVal() const wxOVERRIDE;
+    const wxString& GetStrVal() const wxOVERRIDE;
 #if wxUSE_DATETIME
-    const wxDateTime& GetDateVal() const;
+    const wxDateTime& GetDateVal() const wxOVERRIDE;
 #endif // wxUSE_DATETIME
-    bool IsNegated() const {
+    bool IsNegated() const wxOVERRIDE {
         wxASSERT_MSG( kind == wxCMD_LINE_SWITCH,
                       wxT("kind mismatch in wxCmdLineArg") );
         return m_isNegated;

src/common/combocmn.cpp

@@ -473,10 +473,10 @@ public:
     }
 
 #if USES_WXPOPUPTRANSIENTWINDOW
-    virtual bool Show( bool show );
-    virtual bool ProcessLeftDown(wxMouseEvent& event);
+    virtual bool Show( bool show ) wxOVERRIDE;
+    virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE;
 protected:
-    virtual void OnDismiss();
+    virtual void OnDismiss() wxOVERRIDE;
 #endif
 
 private:
@@ -946,7 +946,7 @@ public:
     wxComboCtrlTextCtrl() : wxTextCtrl() { }
     virtual ~wxComboCtrlTextCtrl() { }
 
-    virtual wxWindow *GetMainWindowOfCompositeControl()
+    virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE
     {
         wxComboCtrl* combo = (wxComboCtrl*) GetParent();
 

src/common/cshelp.cpp

@@ -52,7 +52,7 @@ public:
         m_contextHelp = contextHelp;
     }
 
-    virtual bool ProcessEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
 
 //// Data
     wxContextHelp* m_contextHelp;
@@ -480,8 +480,8 @@ wxString wxContextId(int id)
 class wxHelpProviderModule : public wxModule
 {
 public:
-    bool OnInit();
-    void OnExit();
+    bool OnInit() wxOVERRIDE;
+    void OnExit() wxOVERRIDE;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxHelpProviderModule)

src/common/datetime.cpp

@@ -123,14 +123,14 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
 class wxDateTimeHolidaysModule : public wxModule
 {
 public:
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
 
         return true;
     }
 
-    virtual void OnExit()
+    virtual void OnExit() wxOVERRIDE
     {
         wxDateTimeHolidayAuthority::ClearAllAuthorities();
         wxDateTimeHolidayAuthority::ms_authorities.clear();

src/common/dcbase.cpp

@@ -117,8 +117,8 @@ wxDCFactory *wxDCFactory::Get()
 class wxDCFactoryCleanupModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDCFactory::Set(NULL); }
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE { wxDCFactory::Set(NULL); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCFactoryCleanupModule)

src/common/dcbufcmn.cpp

@@ -45,8 +45,8 @@ class wxSharedDCBufferManager : public wxModule
 public:
     wxSharedDCBufferManager() { }
 
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(ms_buffer); }
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE { wxDELETE(ms_buffer); }
 
     static wxBitmap* GetBuffer(int w, int h)
     {

src/common/debugrpt.cpp

@@ -77,7 +77,7 @@ public:
     bool IsOk() const { return m_isOk; }
 
 protected:
-    virtual void OnStackFrame(const wxStackFrame& frame);
+    virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE;
 
     wxXmlNode *m_nodeStack;
     bool m_isOk;

src/common/dircmn.cpp

@@ -222,13 +222,13 @@ class wxDirTraverserSimple : public wxDirTraverser
 public:
     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
 
-    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE
     {
         m_files.push_back(filename);
         return wxDIR_CONTINUE;
     }
 
-    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE
     {
         return wxDIR_CONTINUE;
     }
@@ -269,13 +269,13 @@ class wxDirTraverserFindFirst : public wxDirTraverser
 public:
     wxDirTraverserFindFirst() { }
 
-    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE
     {
         m_file = filename;
         return wxDIR_STOP;
     }
 
-    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE
     {
         return wxDIR_CONTINUE;
     }
@@ -320,7 +320,7 @@ class wxDirTraverserSumSize : public wxDirTraverser
 public:
     wxDirTraverserSumSize() { }
 
-    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    virtual wxDirTraverseResult OnFile(const wxString& filename) wxOVERRIDE
     {
         // wxFileName::GetSize won't use this class again as
         // we're passing it a file and not a directory;
@@ -342,7 +342,7 @@ public:
         return wxDIR_CONTINUE;
     }
 
-    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname)) wxOVERRIDE
     {
         return wxDIR_CONTINUE;
     }

src/common/dlgcmn.cpp

@@ -1001,8 +1001,8 @@ class wxDialogLayoutAdapterModule: public wxModule
     DECLARE_DYNAMIC_CLASS(wxDialogLayoutAdapterModule)
 public:
     wxDialogLayoutAdapterModule() {}
-    virtual void OnExit() { delete wxDialogBase::SetLayoutAdapter(NULL); }
-    virtual bool OnInit() { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; }
+    virtual void OnExit() wxOVERRIDE { delete wxDialogBase::SetLayoutAdapter(NULL); }
+    virtual bool OnInit() wxOVERRIDE { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule)

src/common/dpycmn.cpp

@@ -59,28 +59,28 @@ class WXDLLEXPORT wxDisplayImplSingle : public wxDisplayImpl
 public:
     wxDisplayImplSingle() : wxDisplayImpl(0) { }
 
-    virtual wxRect GetGeometry() const
+    virtual wxRect GetGeometry() const wxOVERRIDE
     {
         wxRect r;
         wxDisplaySize(&r.width, &r.height);
         return r;
     }
 
-    virtual wxRect GetClientArea() const { return wxGetClientDisplayRect(); }
+    virtual wxRect GetClientArea() const wxOVERRIDE { return wxGetClientDisplayRect(); }
 
-    virtual wxString GetName() const { return wxString(); }
+    virtual wxString GetName() const wxOVERRIDE { return wxString(); }
 
 #if wxUSE_DISPLAY
     // no video modes support for us, provide just the stubs
 
-    virtual wxArrayVideoModes GetModes(const wxVideoMode& WXUNUSED(mode)) const
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& WXUNUSED(mode)) const wxOVERRIDE
     {
         return wxArrayVideoModes();
     }
 
-    virtual wxVideoMode GetCurrentMode() const { return wxVideoMode(); }
+    virtual wxVideoMode GetCurrentMode() const wxOVERRIDE { return wxVideoMode(); }
 
-    virtual bool ChangeMode(const wxVideoMode& WXUNUSED(mode)) { return false; }
+    virtual bool ChangeMode(const wxVideoMode& WXUNUSED(mode)) wxOVERRIDE { return false; }
 #endif // wxUSE_DISPLAY
 
 
@@ -94,8 +94,8 @@ public:
 class wxDisplayModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit()
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE
     {
         wxDELETE(gs_factory);
     }

src/common/dynload.cpp

@@ -51,14 +51,14 @@ public:
     wxPluginLibraryModule() { }
 
     // TODO: create ms_classes on demand, why always preallocate it?
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         wxPluginLibrary::ms_classes = new wxDLImports;
         wxPluginManager::CreateManifest();
         return true;
     }
 
-    virtual void OnExit()
+    virtual void OnExit() wxOVERRIDE
     {
         wxDELETE(wxPluginLibrary::ms_classes);
         wxPluginManager::ClearManifest();

src/common/fdiodispatcher.cpp

@@ -135,8 +135,8 @@ bool wxMappedFDIODispatcher::UnregisterFD(int fd)
 class wxFDIODispatcherModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(gs_dispatcher); }
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE { wxDELETE(gs_dispatcher); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFDIODispatcherModule)

src/common/filesys.cpp

@@ -735,13 +735,13 @@ class wxFileSystemModule : public wxModule
         {
         }
 
-        virtual bool OnInit()
+        virtual bool OnInit() wxOVERRIDE
         {
             m_handler = new wxLocalFSHandler;
             wxFileSystem::AddHandler(m_handler);
             return true;
         }
-        virtual void OnExit()
+        virtual void OnExit() wxOVERRIDE
         {
             delete wxFileSystem::RemoveHandler(m_handler);
 

src/common/fmapbase.cpp

@@ -362,7 +362,7 @@ class wxFontMapperModule : public wxModule
 public:
     wxFontMapperModule() : wxModule() { }
 
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         // a dummy wxFontMapperBase object could have been created during the
         // program startup before wxApp was created, we have to delete it to
@@ -376,7 +376,7 @@ public:
         return true;
     }
 
-    virtual void OnExit()
+    virtual void OnExit() wxOVERRIDE
     {
         wxFontMapperBase::Reset();
     }

src/common/fontenumcmn.cpp

@@ -39,7 +39,7 @@ public:
     wxSimpleFontEnumerator() { }
 
     // called by EnumerateFacenames
-    virtual bool OnFacename(const wxString& facename)
+    virtual bool OnFacename(const wxString& facename) wxOVERRIDE
     {
         m_arrFacenames.Add(facename);
         return true;
@@ -47,7 +47,7 @@ public:
 
     // called by EnumerateEncodings
     virtual bool OnFontEncoding(const wxString& WXUNUSED(facename),
-                                const wxString& encoding)
+                                const wxString& encoding) wxOVERRIDE
     {
         m_arrEncodings.Add(encoding);
         return true;

src/common/fs_inet.cpp

@@ -144,14 +144,14 @@ class wxFileSystemInternetModule : public wxModule
         {
         }
 
-        virtual bool OnInit()
+        virtual bool OnInit() wxOVERRIDE
         {
             m_handler = new wxInternetFSHandler;
             wxFileSystem::AddHandler(m_handler);
             return true;
         }
 
-        virtual void OnExit()
+        virtual void OnExit() wxOVERRIDE
         {
             delete wxFileSystem::RemoveHandler(m_handler);
         }

src/common/fswatchercmn.cpp

@@ -192,14 +192,14 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
         {
         }
 
-        virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))
+        virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE
         {
             // 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)
+        virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE
         {
             if ( m_watcher->AddAny(wxFileName::DirName(dirname),
                                    m_events, wxFSWPath_Tree, m_filespec) )
@@ -248,14 +248,14 @@ bool wxFileSystemWatcherBase::RemoveTree(const wxFileName& path)
         {
         }
 
-        virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))
+        virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE
         {
             // We never watch the individual files when watching the tree, so
             // nothing to do here.
             return wxDIR_CONTINUE;
         }
 
-        virtual wxDirTraverseResult OnDir(const wxString& dirname)
+        virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE
         {
             m_watcher->Remove(wxFileName::DirName(dirname));
             return wxDIR_CONTINUE;

src/common/http.cpp

@@ -468,11 +468,11 @@ public:
         m_read_bytes = 0;
     }
 
-    size_t GetSize() const { return m_httpsize; }
+    size_t GetSize() const wxOVERRIDE { return m_httpsize; }
     virtual ~wxHTTPStream(void) { m_http->Abort(); }
 
 protected:
-    size_t OnSysRead(void *buffer, size_t bufsize);
+    size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE;
 
     wxDECLARE_NO_COPY_CLASS(wxHTTPStream);
 };

src/common/iconbndl.cpp

@@ -53,7 +53,7 @@ public:
 
     // default assignment operator and dtor are ok
 
-    virtual bool IsOk() const { return !m_icons.empty(); }
+    virtual bool IsOk() const wxOVERRIDE { return !m_icons.empty(); }
 
     wxIconArray m_icons;
 };

src/common/image.cpp

@@ -3649,8 +3649,8 @@ class wxImageModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return true; }
-    void OnExit() { wxImage::CleanUpHandlers(); }
+    bool OnInit() wxOVERRIDE { wxImage::InitStandardHandlers(); return true; }
+    void OnExit() wxOVERRIDE { wxImage::CleanUpHandlers(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)

src/common/init.cpp

@@ -68,7 +68,7 @@ class wxDummyConsoleApp : public wxAppConsole
 public:
     wxDummyConsoleApp() { }
 
-    virtual int OnRun() { wxFAIL_MSG( wxT("unreachable code") ); return 0; }
+    virtual int OnRun() wxOVERRIDE { wxFAIL_MSG( wxT("unreachable code") ); return 0; }
     virtual bool DoYield(bool, long) { return true; }
 
     wxDECLARE_NO_COPY_CLASS(wxDummyConsoleApp);

src/common/intl.cpp

@@ -1802,12 +1802,12 @@ class wxLocaleModule: public wxModule
     public:
         wxLocaleModule() {}
 
-        bool OnInit()
+        bool OnInit() wxOVERRIDE
         {
             return true;
         }
 
-        void OnExit()
+        void OnExit() wxOVERRIDE
         {
             wxLocale::DestroyLanguagesDB();
         }

src/common/log.cpp

@@ -170,7 +170,7 @@ public:
     wxLogOutputBest() { }
 
 protected:
-    virtual void DoLogText(const wxString& msg)
+    virtual void DoLogText(const wxString& msg) wxOVERRIDE
     {
         wxMessageOutputBest().Output(msg);
     }

src/common/markupparser.cpp

@@ -442,31 +442,31 @@ wxString wxMarkupParser::Strip(const wxString& text)
 
         const wxString& GetText() const { return m_text; }
 
-        virtual void OnText(const wxString& text) { m_text += text; }
+        virtual void OnText(const wxString& text) wxOVERRIDE { m_text += text; }
 
-        virtual void OnBoldStart() { }
-        virtual void OnBoldEnd() { }
+        virtual void OnBoldStart() wxOVERRIDE { }
+        virtual void OnBoldEnd() wxOVERRIDE { }
 
-        virtual void OnItalicStart() { }
-        virtual void OnItalicEnd() { }
+        virtual void OnItalicStart() wxOVERRIDE { }
+        virtual void OnItalicEnd() wxOVERRIDE { }
 
-        virtual void OnUnderlinedStart() { }
-        virtual void OnUnderlinedEnd() { }
+        virtual void OnUnderlinedStart() wxOVERRIDE { }
+        virtual void OnUnderlinedEnd() wxOVERRIDE { }
 
-        virtual void OnStrikethroughStart() { }
-        virtual void OnStrikethroughEnd() { }
+        virtual void OnStrikethroughStart() wxOVERRIDE { }
+        virtual void OnStrikethroughEnd() wxOVERRIDE { }
 
-        virtual void OnBigStart() { }
-        virtual void OnBigEnd() { }
+        virtual void OnBigStart() wxOVERRIDE { }
+        virtual void OnBigEnd() wxOVERRIDE { }
 
-        virtual void OnSmallStart() { }
-        virtual void OnSmallEnd() { }
+        virtual void OnSmallStart() wxOVERRIDE { }
+        virtual void OnSmallEnd() wxOVERRIDE { }
 
-        virtual void OnTeletypeStart() { }
-        virtual void OnTeletypeEnd() { }
+        virtual void OnTeletypeStart() wxOVERRIDE { }
+        virtual void OnTeletypeEnd() wxOVERRIDE { }
 
-        virtual void OnSpanStart(const wxMarkupSpanAttributes& WXUNUSED(a)) { }
-        virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(a)) { }
+        virtual void OnSpanStart(const wxMarkupSpanAttributes& WXUNUSED(a)) wxOVERRIDE { }
+        virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(a)) wxOVERRIDE { }
 
     private:
         wxString m_text;

src/common/mimecmn.cpp

@@ -741,8 +741,8 @@ class wxMimeTypeCmnModule: public wxModule
 public:
     wxMimeTypeCmnModule() : wxModule() { }
 
-    virtual bool OnInit() { return true; }
-    virtual void OnExit()
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE
     {
         wxMimeTypesManagerFactory::Set(NULL);
 

src/common/paper.cpp

@@ -353,8 +353,8 @@ class WXDLLEXPORT wxPrintPaperModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxPrintPaperModule)
 public:
     wxPrintPaperModule() {}
-    bool OnInit();
-    void OnExit();
+    bool OnInit() wxOVERRIDE;
+    void OnExit() wxOVERRIDE;
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule)

src/common/prntbase.cpp

@@ -287,8 +287,8 @@ class wxPrintFactoryModule: public wxModule
 {
 public:
     wxPrintFactoryModule() {}
-    bool OnInit() { return true; }
-    void OnExit() { wxPrintFactory::SetPrintFactory( NULL ); }
+    bool OnInit() wxOVERRIDE { return true; }
+    void OnExit() wxOVERRIDE { wxPrintFactory::SetPrintFactory( NULL ); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule)

src/common/sckipc.cpp

@@ -155,8 +155,8 @@ public:
     }
 
     // as ms_handler is initialized on demand, don't do anything in OnInit()
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(ms_handler); }
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE { wxDELETE(ms_handler); }
 
 private:
     static wxTCPEventHandler *ms_handler;

src/common/socket.cpp

@@ -2130,14 +2130,14 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr,
 class wxSocketModule : public wxModule
 {
 public:
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         // wxSocketBase will call Initialize() itself only if sockets are
         // really used, don't do it from here
         return true;
     }
 
-    virtual void OnExit()
+    virtual void OnExit() wxOVERRIDE
     {
         if ( wxSocketBase::IsInitialized() )
             wxSocketBase::Shutdown();

src/common/stattextcmn.cpp

@@ -169,12 +169,12 @@ public:
     }
 
 protected:
-    virtual void OnOutputLine(const wxString& line)
+    virtual void OnOutputLine(const wxString& line) wxOVERRIDE
     {
         m_text += line;
     }
 
-    virtual void OnNewLine()
+    virtual void OnNewLine() wxOVERRIDE
     {
         m_text += wxT('\n');
     }

src/common/strconv.cpp

@@ -2132,16 +2132,16 @@ 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;
+                           const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
     virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
-    virtual size_t GetMBNulLen() const;
+                             const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
+    virtual size_t GetMBNulLen() const wxOVERRIDE;
 
 #if wxUSE_UNICODE_UTF8
     virtual bool IsUTF8() const;
 #endif
 
-    virtual wxMBConv *Clone() const
+    virtual wxMBConv *Clone() const wxOVERRIDE
     {
         wxMBConv_iconv *p = new wxMBConv_iconv(m_name);
         p->m_minMBCharWidth = m_minMBCharWidth;
@@ -2897,7 +2897,7 @@ public:
         Init();
     }
 
-    size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const wxOVERRIDE
     {
         size_t inbuf = strlen(psz);
         if (buf)
@@ -2908,7 +2908,7 @@ public:
         return inbuf;
     }
 
-    size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const wxOVERRIDE
     {
         const size_t inbuf = wxWcslen(psz);
         if (buf)
@@ -2920,7 +2920,7 @@ public:
         return inbuf;
     }
 
-    virtual size_t GetMBNulLen() const
+    virtual size_t GetMBNulLen() const wxOVERRIDE
     {
         switch ( m_enc )
         {
@@ -2937,7 +2937,7 @@ public:
         }
     }
 
-    virtual wxMBConv *Clone() const { return new wxMBConv_wxwin(m_enc); }
+    virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_wxwin(m_enc); }
 
     bool IsOk() const { return m_ok; }
 

src/common/strvararg.cpp

@@ -418,7 +418,7 @@ class wxPrintfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
 {
     virtual void HandleString(CharType WXUNUSED(conv),
                               SizeModifier WXUNUSED(size),
-                              CharType& outConv, SizeModifier& outSize)
+                              CharType& outConv, SizeModifier& outSize) wxOVERRIDE
     {
         outConv = 's';
         outSize = Size_Long;
@@ -426,7 +426,7 @@ class wxPrintfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
 
     virtual void HandleChar(CharType WXUNUSED(conv),
                             SizeModifier WXUNUSED(size),
-                            CharType& outConv, SizeModifier& outSize)
+                            CharType& outConv, SizeModifier& outSize) wxOVERRIDE
     {
         outConv = 'c';
         outSize = Size_Long;
@@ -499,14 +499,14 @@ class wxPrintfFormatConverterANSI : public wxFormatConverterBase<char>
 class wxScanfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
 {
     virtual void HandleString(CharType conv, SizeModifier size,
-                              CharType& outConv, SizeModifier& outSize)
+                              CharType& outConv, SizeModifier& outSize) wxOVERRIDE
     {
         outConv = 's';
         outSize = GetOutSize(conv == 'S', size);
     }
 
     virtual void HandleChar(CharType conv, SizeModifier size,
-                            CharType& outConv, SizeModifier& outSize)
+                            CharType& outConv, SizeModifier& outSize) wxOVERRIDE
     {
         outConv = 'c';
         outSize = GetOutSize(conv == 'C', size);

src/common/translation.cpp

@@ -2032,12 +2032,12 @@ class wxTranslationsModule: public wxModule
     public:
         wxTranslationsModule() {}
 
-        bool OnInit()
+        bool OnInit() wxOVERRIDE
         {
             return true;
         }
 
-        void OnExit()
+        void OnExit() wxOVERRIDE
         {
             if ( gs_translationsOwned )
                 delete gs_translations;

src/common/url.cpp

@@ -450,8 +450,8 @@ class wxURLModule : public wxModule
 public:
     wxURLModule();
 
-    virtual bool OnInit();
-    virtual void OnExit();
+    virtual bool OnInit() wxOVERRIDE;
+    virtual void OnExit() wxOVERRIDE;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxURLModule)

src/common/variant.cpp

@@ -247,22 +247,22 @@ public:
     inline long GetValue() const { return m_value; }
     inline void SetValue(long value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
-    wxVariantData* Clone() const { return new wxVariantDataLong(m_value); }
+    wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataLong(m_value); }
 
-    virtual wxString GetType() const { return wxT("long"); }
+    virtual wxString GetType() const wxOVERRIDE { return wxT("long"); }
 
 #if wxUSE_ANY
     // Since wxAny does not have separate type for integers shorter than
@@ -271,7 +271,7 @@ public:
   #ifndef wxLongLong_t
     DECLARE_WXANY_CONVERSION()
   #else
-    bool GetAsAny(wxAny* any) const
+    bool GetAsAny(wxAny* any) const wxOVERRIDE
     {
         *any = m_value;
         return true;
@@ -416,22 +416,22 @@ public:
     inline double GetValue() const { return m_value; }
     inline void SetValue(double value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
-    virtual bool Read(wxString& str);
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
+    virtual bool Read(wxString& str) wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("double"); }
+    virtual wxString GetType() const wxOVERRIDE { return wxT("double"); }
 
-    wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); }
+    wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDoubleData(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -556,22 +556,22 @@ public:
     inline bool GetValue() const { return m_value; }
     inline void SetValue(bool value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
-    virtual bool Read(wxString& str);
+    virtual bool Write(wxString& str) const wxOVERRIDE;
+    virtual bool Read(wxString& str) wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("bool"); }
+    virtual wxString GetType() const wxOVERRIDE { return wxT("bool"); }
 
-    wxVariantData* Clone() const { return new wxVariantDataBool(m_value); }
+    wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataBool(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -699,19 +699,19 @@ public:
     inline wxUniChar GetValue() const { return m_value; }
     inline void SetValue(const wxUniChar& value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("char"); }
-    wxVariantData* Clone() const { return new wxVariantDataChar(m_value); }
+    virtual wxString GetType() const wxOVERRIDE { return wxT("char"); }
+    wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataChar(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -852,21 +852,21 @@ public:
     inline wxString GetValue() const { return m_value; }
     inline void SetValue(const wxString& value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
+    virtual bool Read(wxSTD istream& WXUNUSED(str)) wxOVERRIDE { return false; }
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("string"); }
-    wxVariantData* Clone() const { return new wxVariantDataString(m_value); }
+    virtual wxString GetType() const wxOVERRIDE { return wxT("string"); }
+    wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataString(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1047,19 +1047,19 @@ public:
     inline wxObject* GetValue() const { return m_value; }
     inline void SetValue(wxObject* value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const ;
-    virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); }
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual wxString GetType() const wxOVERRIDE ;
+    virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataWxObjectPtr(m_value); }
 
-    virtual wxClassInfo* GetValueClassInfo();
+    virtual wxClassInfo* GetValueClassInfo() wxOVERRIDE;
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1171,17 +1171,17 @@ public:
     inline void* GetValue() const { return m_value; }
     inline void SetValue(void* value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("void*"); }
-    virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual wxString GetType() const wxOVERRIDE { return wxT("void*"); }
+    virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataVoidPtr(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1286,17 +1286,17 @@ public:
     inline wxDateTime GetValue() const { return m_value; }
     inline void SetValue(const wxDateTime& value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("datetime"); }
-    virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual wxString GetType() const wxOVERRIDE { return wxT("datetime"); }
+    virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataDateTime(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1419,17 +1419,17 @@ public:
     wxArrayString GetValue() const { return m_value; }
     void SetValue(const wxArrayString& value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("arrstring"); }
-    virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual wxString GetType() const wxOVERRIDE { return wxT("arrstring"); }
+    virtual wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataArrayString(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1547,25 +1547,25 @@ public:
     wxLongLong GetValue() const { return m_value; }
     void SetValue(wxLongLong value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
-    wxVariantData* Clone() const
+    wxVariantData* Clone() const wxOVERRIDE
     {
         return new wxVariantDataLongLong(m_value);
     }
 
-    virtual wxString GetType() const { return wxS("longlong"); }
+    virtual wxString GetType() const wxOVERRIDE { return wxS("longlong"); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1746,25 +1746,25 @@ public:
     wxULongLong GetValue() const { return m_value; }
     void SetValue(wxULongLong value) { m_value = value; }
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
-    wxVariantData* Clone() const
+    wxVariantData* Clone() const wxOVERRIDE
     {
         return new wxVariantDataULongLong(m_value);
     }
 
-    virtual wxString GetType() const { return wxS("ulonglong"); }
+    virtual wxString GetType() const wxOVERRIDE { return wxS("ulonglong"); }
 
     DECLARE_WXANY_CONVERSION()
 protected:
@@ -1945,20 +1945,20 @@ public:
     wxVariantList& GetValue() { return m_value; }
     void SetValue(const wxVariantList& value) ;
 
-    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
+    virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
 #endif
-    virtual bool Write(wxString& str) const;
+    virtual bool Write(wxString& str) const wxOVERRIDE;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& str) wxOVERRIDE;
 #endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("list"); }
+    virtual bool Read(wxString& str) wxOVERRIDE;
+    virtual wxString GetType() const wxOVERRIDE { return wxT("list"); }
 
     void Clear();
 
-    wxVariantData* Clone() const { return new wxVariantDataList(m_value); }
+    wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataList(m_value); }
 
     DECLARE_WXANY_CONVERSION()
 protected:

src/common/wincmn.cpp

@@ -2096,12 +2096,12 @@ bool wxWindowBase::Validate()
         {
         }
 
-        virtual bool OnDo(wxValidator* validator)
+        virtual bool OnDo(wxValidator* validator) wxOVERRIDE
         {
             return validator->Validate(m_win);
         }
 
-        virtual bool OnRecurse(wxWindow* child)
+        virtual bool OnRecurse(wxWindow* child) wxOVERRIDE
         {
             return child->Validate();
         }
@@ -2124,7 +2124,7 @@ bool wxWindowBase::TransferDataToWindow()
         {
         }
 
-        virtual bool OnDo(wxValidator* validator)
+        virtual bool OnDo(wxValidator* validator) wxOVERRIDE
         {
             if ( !validator->TransferToWindow() )
             {
@@ -2139,7 +2139,7 @@ bool wxWindowBase::TransferDataToWindow()
             return true;
         }
 
-        virtual bool OnRecurse(wxWindow* child)
+        virtual bool OnRecurse(wxWindow* child) wxOVERRIDE
         {
             return child->TransferDataToWindow();
         }
@@ -2162,12 +2162,12 @@ bool wxWindowBase::TransferDataFromWindow()
         {
         }
 
-        virtual bool OnDo(wxValidator* validator)
+        virtual bool OnDo(wxValidator* validator) wxOVERRIDE
         {
             return validator->TransferFromWindow();
         }
 
-        virtual bool OnRecurse(wxWindow* child)
+        virtual bool OnRecurse(wxWindow* child) wxOVERRIDE
         {
             return child->TransferDataFromWindow();
         }
@@ -3560,7 +3560,7 @@ public:
     DragAcceptFilesTarget(wxWindowBase *win) : m_win(win) {}
 
     virtual bool OnDropFiles(wxCoord x, wxCoord y,
-                             const wxArrayString& filenames)
+                             const wxArrayString& filenames) wxOVERRIDE
     {
         wxDropFilesEvent event(wxEVT_DROP_FILES,
                                filenames.size(),

src/common/xlocale.cpp

@@ -54,8 +54,8 @@ wxXLocale wxNullXLocale;
 class wxXLocaleModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(gs_cLocale); }
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE { wxDELETE(gs_cLocale); }
 
     DECLARE_DYNAMIC_CLASS(wxXLocaleModule)
 };

src/common/zipstrm.cpp

@@ -239,12 +239,12 @@ public:
     void Open(wxFileOffset len) { Close(); m_len = len; }
     void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; }
 
-    virtual char Peek() { return wxInputStream::Peek(); }
-    virtual wxFileOffset GetLength() const { return m_len; }
+    virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); }
+    virtual wxFileOffset GetLength() const wxOVERRIDE { return m_len; }
 
 protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
+    virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
+    virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
 
 private:
     wxFileOffset m_pos;
@@ -284,15 +284,15 @@ public:
     wxStoredOutputStream(wxOutputStream& stream) :
         wxFilterOutputStream(stream), m_pos(0) { }
 
-    bool Close() {
+    bool Close() wxOVERRIDE {
         m_pos = 0;
         m_lasterror = wxSTREAM_NO_ERROR;
         return true;
     }
 
 protected:
-    virtual size_t OnSysWrite(const void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
+    virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
+    virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
 
 private:
     wxFileOffset m_pos;
@@ -346,11 +346,11 @@ public:
     void Open();
     bool Final();
 
-    wxInputStream& Read(void *buffer, size_t size);
+    wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE;
 
 protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
+    virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
+    virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
 
 private:
     wxFileOffset m_pos;
@@ -444,8 +444,8 @@ public:
     wxInputStream& GetTee() const { return *m_tee; }
 
 protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
+    virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
+    virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
 
 private:
     wxFileOffset m_pos;
@@ -510,7 +510,7 @@ public:
         wxZlibOutputStream(stream, level, wxZLIB_NO_HEADER) { }
 
     bool Open(wxOutputStream& stream);
-    bool Close() { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); }
+    bool Close() wxOVERRIDE { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); }
 };
 
 bool wxZlibOutputStream2::Open(wxOutputStream& stream)

src/generic/animateg.cpp

@@ -253,8 +253,8 @@ class wxAnimationModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxAnimationModule)
 public:
     wxAnimationModule() {}
-    bool OnInit() { wxAnimation::InitStandardHandlers(); return true; }
-    void OnExit() { wxAnimation::CleanUpHandlers(); }
+    bool OnInit() wxOVERRIDE { wxAnimation::InitStandardHandlers(); return true; }
+    void OnExit() wxOVERRIDE { wxAnimation::CleanUpHandlers(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule)

src/generic/datectlg.cpp

@@ -63,14 +63,14 @@ public:
     {
     }
 
-    virtual void Init()
+    virtual void Init() wxOVERRIDE
     {
     }
 
     // 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)
+    virtual bool Create(wxWindow* parent) wxOVERRIDE
     {
         if ( !wxCalendarCtrl::Create(parent, wxID_ANY, wxDefaultDateTime,
                               wxPoint(0, 0), wxDefaultSize,
@@ -95,12 +95,12 @@ public:
 
     virtual wxSize GetAdjustedSize(int WXUNUSED(minWidth),
                                    int WXUNUSED(prefHeight),
-                                   int WXUNUSED(maxHeight))
+                                   int WXUNUSED(maxHeight)) wxOVERRIDE
     {
         return m_useSize;
     }
 
-    virtual wxWindow *GetControl() { return this; }
+    virtual wxWindow *GetControl() wxOVERRIDE { return this; }
 
     void SetDateValue(const wxDateTime& date)
     {
@@ -251,7 +251,7 @@ private:
         return true;
     }
 
-    virtual void SetStringValue(const wxString& s)
+    virtual void SetStringValue(const wxString& s) wxOVERRIDE
     {
         wxDateTime dt;
         if ( !s.empty() && ParseDateTime(s, &dt) )
@@ -259,7 +259,7 @@ private:
         //else: keep the old value
     }
 
-    virtual wxString GetStringValue() const
+    virtual wxString GetStringValue() const wxOVERRIDE
     {
         return GetStringValueFor(GetDate());
     }

src/generic/dbgrptg.cpp

@@ -252,8 +252,8 @@ class wxDebugReportDialog : public wxDialog
 public:
     wxDebugReportDialog(wxDebugReport& dbgrpt);
 
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
+    virtual bool TransferDataToWindow() wxOVERRIDE;
+    virtual bool TransferDataFromWindow() wxOVERRIDE;
 
 private:
     void OnView(wxCommandEvent& );

src/generic/dirctrlg.cpp

@@ -1529,8 +1529,8 @@ class wxFileIconsTableModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
 public:
     wxFileIconsTableModule() {}
-    bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
-    void OnExit()
+    bool OnInit() wxOVERRIDE { wxTheFileIconsTable = new wxFileIconsTable; return true; }
+    void OnExit() wxOVERRIDE
     {
         wxDELETE(wxTheFileIconsTable);
     }

src/generic/htmllbox.cpp

@@ -161,7 +161,7 @@ class wxHtmlListBoxStyle : public wxDefaultHtmlRenderingStyle
 public:
     wxHtmlListBoxStyle(const wxHtmlListBox& hlbox) : m_hlbox(hlbox) { }
 
-    virtual wxColour GetSelectedTextColour(const wxColour& colFg)
+    virtual wxColour GetSelectedTextColour(const wxColour& colFg) wxOVERRIDE
     {
         // by default wxHtmlListBox doesn't implement GetSelectedTextColour()
         // and returns wxNullColour from it, so use the default HTML colour for
@@ -175,7 +175,7 @@ public:
         return col;
     }
 
-    virtual wxColour GetSelectedTextBgColour(const wxColour& colBg)
+    virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) wxOVERRIDE
     {
         wxColour col = m_hlbox.GetSelectedTextBgColour(colBg);
         if ( !col.IsOk() )

src/generic/logg.cpp

@@ -448,7 +448,7 @@ public:
     virtual ~wxLogFrame();
 
     // Don't prevent the application from exiting if just this frame remains.
-    virtual bool ShouldPreventAppExit() const { return false; }
+    virtual bool ShouldPreventAppExit() const wxOVERRIDE { return false; }
 
     // menu callbacks
     void OnClose(wxCommandEvent& event);

src/generic/markuptext.cpp

@@ -59,7 +59,7 @@ public:
     const wxSize& GetSize() const { return m_size; }
 
 
-    virtual void OnText(const wxString& text_)
+    virtual void OnText(const wxString& text_) wxOVERRIDE
     {
         const wxString text(wxControl::RemoveMnemonics(text_));
 
@@ -79,12 +79,12 @@ public:
         }
     }
 
-    virtual void OnAttrStart(const Attr& attr)
+    virtual void OnAttrStart(const Attr& attr) wxOVERRIDE
     {
         m_dc.SetFont(attr.font);
     }
 
-    virtual void OnAttrEnd(const Attr& WXUNUSED(attr))
+    virtual void OnAttrEnd(const Attr& WXUNUSED(attr)) wxOVERRIDE
     {
         m_dc.SetFont(GetFont());
     }
@@ -132,7 +132,7 @@ public:
         m_origTextBackground = dc.GetTextBackground();
     }
 
-    virtual void OnText(const wxString& text_)
+    virtual void OnText(const wxString& text_) wxOVERRIDE
     {
         wxString text;
         int indexAccel = wxControl::FindAccelIndex(text_, &text);
@@ -161,7 +161,7 @@ public:
         m_pos += bounds.width;
     }
 
-    virtual void OnAttrStart(const Attr& attr)
+    virtual void OnAttrStart(const Attr& attr) wxOVERRIDE
     {
         m_dc.SetFont(attr.font);
         if ( attr.foreground.IsOk() )
@@ -176,7 +176,7 @@ public:
         }
     }
 
-    virtual void OnAttrEnd(const Attr& attr)
+    virtual void OnAttrEnd(const Attr& attr) wxOVERRIDE
     {
         // We always restore the font because we always change it...
         m_dc.SetFont(GetFont());

src/generic/msgdlgg.cpp

@@ -57,7 +57,7 @@ public:
     }
 
 protected:
-    virtual wxWindow *OnCreateLine(const wxString& s)
+    virtual wxWindow *OnCreateLine(const wxString& s) wxOVERRIDE
     {
         wxWindow * const win = wxTextSizerWrapper::OnCreateLine(s);
 

src/generic/renderg.cpp

@@ -55,84 +55,84 @@ public:
                                   const wxRect& rect,
                                   int flags = 0,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
-                                  wxHeaderButtonParams* params = NULL);
+                                  wxHeaderButtonParams* params = NULL) wxOVERRIDE;
 
     virtual int  DrawHeaderButtonContents(wxWindow *win,
                                           wxDC& dc,
                                           const wxRect& rect,
                                           int flags = 0,
                                           wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
-                                          wxHeaderButtonParams* params = NULL);
+                                          wxHeaderButtonParams* params = NULL) wxOVERRIDE;
 
-    virtual int GetHeaderButtonHeight(wxWindow *win);
+    virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE;
 
-    virtual int GetHeaderButtonMargin(wxWindow *win);
+    virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE;
 
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
-                                    int flags = 0);
+                                    int flags = 0) wxOVERRIDE;
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
-                                    int flags = 0);
+                                    int flags = 0) wxOVERRIDE;
 
     virtual void DrawSplitterSash(wxWindow *win,
                                   wxDC& dc,
                                   const wxSize& size,
                                   wxCoord position,
                                   wxOrientation orient,
-                                  int flags = 0);
+                                  int flags = 0) wxOVERRIDE;
 
     virtual void DrawComboBoxDropButton(wxWindow *win,
                                         wxDC& dc,
                                         const wxRect& rect,
-                                        int flags = 0);
+                                        int flags = 0) wxOVERRIDE;
 
     virtual void DrawDropArrow(wxWindow *win,
                                wxDC& dc,
                                const wxRect& rect,
-                               int flags = 0);
+                               int flags = 0) wxOVERRIDE;
 
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
-                              int flags = 0);
+                              int flags = 0) wxOVERRIDE;
 
-    virtual wxSize GetCheckBoxSize(wxWindow *win);
+    virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE;
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags = 0);
+                                int flags = 0) wxOVERRIDE;
 
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
-                                       int flags = 0);
+                                       int flags = 0) wxOVERRIDE;
 
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE;
 
-    virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
-    virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
-    virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
-    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
 #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
     virtual void DrawTitleBarBitmap(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
                                     wxTitleBarButton button,
-                                    int flags = 0);
+                                    int flags = 0) wxOVERRIDE;
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
-    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE;
 
-    virtual wxRendererVersion GetVersion() const
+    virtual wxRendererVersion GetVersion() const wxOVERRIDE
     {
         return wxRendererVersion(wxRendererVersion::Current_Version,
                                  wxRendererVersion::Current_Age);
@@ -802,8 +802,8 @@ class wxGenericRendererModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
 public:
     wxGenericRendererModule() {}
-    bool OnInit() { return true; }
-    void OnExit() { wxRendererGeneric::Cleanup(); }
+    bool OnInit() wxOVERRIDE { return true; }
+    void OnExit() wxOVERRIDE { wxRendererGeneric::Cleanup(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)

src/generic/richtooltipg.cpp

@@ -272,7 +272,7 @@ public:
     }
 
 protected:
-    virtual void OnDismiss()
+    virtual void OnDismiss() wxOVERRIDE
     {
         Destroy();
     }

src/generic/scrlwing.cpp

@@ -76,7 +76,7 @@ public:
         m_scrollHelper = scrollHelper;
     }
 
-    virtual bool ProcessEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
 
 private:
     wxScrollHelperBase *m_scrollHelper;
@@ -98,7 +98,7 @@ public:
                       wxEventType eventTypeToSend,
                       int pos, int orient);
 
-    virtual void Notify();
+    virtual void Notify() wxOVERRIDE;
 
 private:
     wxWindow *m_win;

src/generic/tipdlg.cpp

@@ -76,7 +76,7 @@ class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
 public:
     wxFileTipProvider(const wxString& filename, size_t currentTip);
 
-    virtual wxString GetTip();
+    virtual wxString GetTip() wxOVERRIDE;
 
 private:
     wxTextFile m_textfile;

src/generic/treectlg.cpp

@@ -80,7 +80,7 @@ public:
 
     wxTreeRenameTimer( wxGenericTreeCtrl *owner );
 
-    virtual void Notify();
+    virtual void Notify() wxOVERRIDE;
 
 private:
     wxGenericTreeCtrl *m_owner;
@@ -126,7 +126,7 @@ public:
 
     wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; }
 
-    virtual void Notify() { m_owner->ResetFindState(); }
+    virtual void Notify() wxOVERRIDE { m_owner->ResetFindState(); }
 
 private:
     wxGenericTreeCtrl *m_owner;

src/generic/treelist.cpp

@@ -363,24 +363,24 @@ public:
 
 
     // Implement the base class pure virtual methods.
-    virtual unsigned GetColumnCount() const;
-    virtual wxString GetColumnType(unsigned col) const;
+    virtual unsigned GetColumnCount() const wxOVERRIDE;
+    virtual wxString GetColumnType(unsigned col) const wxOVERRIDE;
     virtual void GetValue(wxVariant& variant,
                           const wxDataViewItem& item,
-                          unsigned col) const;
+                          unsigned col) const wxOVERRIDE;
     virtual bool SetValue(const wxVariant& variant,
                           const wxDataViewItem& item,
-                          unsigned col);
-    virtual wxDataViewItem GetParent(const wxDataViewItem& item) const;
-    virtual bool IsContainer(const wxDataViewItem& item) const;
-    virtual bool HasContainerColumns(const wxDataViewItem& item) const;
+                          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;
     virtual unsigned GetChildren(const wxDataViewItem& item,
-                                 wxDataViewItemArray& children) const;
-    virtual bool IsListModel() const { return m_isFlat; }
+                                 wxDataViewItemArray& children) const wxOVERRIDE;
+    virtual bool IsListModel() const wxOVERRIDE { return m_isFlat; }
     virtual int Compare(const wxDataViewItem& item1,
                         const wxDataViewItem& item2,
                         unsigned col,
-                        bool ascending) const;
+                        bool ascending) const wxOVERRIDE;
 
 private:
     // The control we're associated with.
@@ -456,18 +456,18 @@ public:
     {
     }
 
-    virtual bool SetValue(const wxVariant& value)
+    virtual bool SetValue(const wxVariant& value) wxOVERRIDE
     {
         m_value << value;
         return true;
     }
 
-    virtual bool GetValue(wxVariant& WXUNUSED(value)) const
+    virtual bool GetValue(wxVariant& WXUNUSED(value)) const wxOVERRIDE
     {
         return false;
     }
 
-    wxSize GetSize() const
+    wxSize GetSize() const wxOVERRIDE
     {
         wxSize size = GetCheckSize();
         size.x += MARGIN_CHECK_ICON;
@@ -494,7 +494,7 @@ public:
         return size;
     }
 
-    virtual bool Render(wxRect cell, wxDC* dc, int state)
+    virtual bool Render(wxRect cell, wxDC* dc, int state) wxOVERRIDE
     {
         // Draw the checkbox first.
         int renderFlags = 0;
@@ -552,7 +552,7 @@ public:
                               wxDataViewModel *model,
                               const wxDataViewItem & item,
                               unsigned int WXUNUSED(col),
-                              const wxMouseEvent *mouseEvent)
+                              const wxMouseEvent *mouseEvent) wxOVERRIDE
     {
         if ( mouseEvent )
         {

src/generic/vscroll.cpp

@@ -49,7 +49,7 @@ public:
         m_scrollHelper = scrollHelper;
     }
 
-    virtual bool ProcessEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
 
 private:
     wxVarScrollHelperBase *m_scrollHelper;

src/generic/wizard.cpp

@@ -53,10 +53,10 @@ class wxWizardSizer : public wxSizer
 public:
     wxWizardSizer(wxWizard *owner);
 
-    virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
+    virtual wxSizerItem *Insert(size_t index, wxSizerItem *item) wxOVERRIDE;
 
-    virtual void RecalcSizes();
-    virtual wxSize CalcMin();
+    virtual void RecalcSizes() wxOVERRIDE;
+    virtual wxSize CalcMin() wxOVERRIDE;
 
     // get the max size of all wizard pages
     wxSize GetMaxChildSize();

src/html/helpdata.cpp

@@ -121,10 +121,10 @@ public:
         GetEntitiesParser()->SetEncoding(wxFONTENCODING_ISO8859_1);
     }
 
-    wxObject* GetProduct() { return NULL; }
+    wxObject* GetProduct() wxOVERRIDE { return NULL; }
 
 protected:
-    virtual void AddText(const wxString& WXUNUSED(txt)) {}
+    virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE {}
 
     wxDECLARE_NO_COPY_CLASS(HP_Parser);
 };
@@ -158,8 +158,8 @@ class HP_TagHandler : public wxHtmlTagHandler
             m_count = 0;
             m_parentItem = NULL;
         }
-        wxString GetSupportedTags() { return wxT("UL,OBJECT,PARAM"); }
-        bool HandleTag(const wxHtmlTag& tag);
+        wxString GetSupportedTags() wxOVERRIDE { return wxT("UL,OBJECT,PARAM"); }
+        bool HandleTag(const wxHtmlTag& tag) wxOVERRIDE;
 
         void Reset(wxHtmlHelpDataItems& data)
         {

src/html/helpwnd.cpp

@@ -120,7 +120,7 @@ public:
         SetStandardFonts();
     }
 
-    virtual bool LoadPage(const wxString& location)
+    virtual bool LoadPage(const wxString& location) wxOVERRIDE
     {
         if ( !wxHtmlWindow::LoadPage(location) )
             return false;

src/html/htmlfilt.cpp

@@ -84,8 +84,8 @@ class wxHtmlFilterImage : public wxHtmlFilter
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage)
 
     public:
-        virtual bool CanRead(const wxFSFile& file) const;
-        virtual wxString ReadFile(const wxFSFile& file) const;
+        virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
+        virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE;
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter)
@@ -191,13 +191,13 @@ class wxHtmlFilterModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule)
 
     public:
-        virtual bool OnInit()
+        virtual bool OnInit() wxOVERRIDE
         {
             wxHtmlWindow::AddFilter(new wxHtmlFilterHTML);
             wxHtmlWindow::AddFilter(new wxHtmlFilterImage);
             return true;
         }
-        virtual void OnExit() {}
+        virtual void OnExit() wxOVERRIDE {}
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule)

src/html/htmlpars.cpp

@@ -889,10 +889,10 @@ class wxMetaTagParser : public wxHtmlParser
 public:
     wxMetaTagParser() { }
 
-    wxObject* GetProduct() { return NULL; }
+    wxObject* GetProduct() wxOVERRIDE { return NULL; }
 
 protected:
-    virtual void AddText(const wxString& WXUNUSED(txt)) {}
+    virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE {}
 
     wxDECLARE_NO_COPY_CLASS(wxMetaTagParser);
 };
@@ -901,8 +901,8 @@ class wxMetaTagHandler : public wxHtmlTagHandler
 {
 public:
     wxMetaTagHandler(wxString *retval) : wxHtmlTagHandler(), m_retval(retval) {}
-    wxString GetSupportedTags() { return wxT("META,BODY"); }
-    bool HandleTag(const wxHtmlTag& tag);
+    wxString GetSupportedTags() wxOVERRIDE { return wxT("META,BODY"); }
+    bool HandleTag(const wxHtmlTag& tag) wxOVERRIDE;
 
 private:
     wxString *m_retval;

src/html/htmlwin.cpp

@@ -66,7 +66,7 @@ public:
         m_orient = orient;
     }
 
-    virtual void Notify();
+    virtual void Notify() wxOVERRIDE;
 
 private:
     wxScrolledWindow *m_win;
@@ -1846,8 +1846,8 @@ class wxHtmlWinModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
 public:
     wxHtmlWinModule() : wxModule() {}
-    bool OnInit() { return true; }
-    void OnExit() { wxHtmlWindow::CleanUpStatics(); }
+    bool OnInit() wxOVERRIDE { return true; }
+    void OnExit() wxOVERRIDE { wxHtmlWindow::CleanUpStatics(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)

src/html/htmprint.cpp

@@ -830,8 +830,8 @@ class wxHtmlPrintingModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule)
 public:
     wxHtmlPrintingModule() : wxModule() {}
-    bool OnInit() { return true; }
-    void OnExit() { wxHtmlPrintout::CleanUpStatics(); }
+    bool OnInit() wxOVERRIDE { return true; }
+    void OnExit() wxOVERRIDE { wxHtmlPrintout::CleanUpStatics(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule)

src/html/m_hline.cpp

@@ -37,8 +37,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);
-        void Layout(int w)
+                  wxHtmlRenderingInfo& info) wxOVERRIDE;
+        void Layout(int w) wxOVERRIDE
             { m_Width = w; wxHtmlCell::Layout(w); }
 
     private:

src/html/m_image.cpp

@@ -61,11 +61,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;
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const wxOVERRIDE;
         void Draw(wxDC& WXUNUSED(dc),
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                  wxHtmlRenderingInfo& WXUNUSED(info)) {}
+                  wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {}
 
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell);
@@ -239,12 +239,12 @@ class wxHtmlImageMapCell : public wxHtmlCell
     protected:
         wxString m_Name;
     public:
-        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
-        virtual const wxHtmlCell *Find( int cond, const void *param ) const;
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const wxOVERRIDE;
+        virtual const wxHtmlCell *Find( int cond, const void *param ) const wxOVERRIDE;
         void Draw(wxDC& WXUNUSED(dc),
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                  wxHtmlRenderingInfo& WXUNUSED(info)) {}
+                  wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {}
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell);
 };
@@ -293,18 +293,18 @@ public:
                     const wxString& mapname = wxEmptyString);
     virtual ~wxHtmlImageCell();
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
-              wxHtmlRenderingInfo& info);
-    virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
+              wxHtmlRenderingInfo& info) wxOVERRIDE;
+    virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const wxOVERRIDE;
 
     void SetImage(const wxImage& img);
 
     // 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;
+    virtual wxString ConvertToText(wxHtmlSelection *sel) const wxOVERRIDE;
 
 #if wxUSE_GIF && wxUSE_TIMER
     void AdvanceAnimation(wxTimer *timer);
-    virtual void Layout(int w);
+    virtual void Layout(int w) wxOVERRIDE;
 #endif
 
 private:
@@ -334,7 +334,7 @@ class wxGIFTimer : public wxTimer
 {
     public:
         wxGIFTimer(wxHtmlImageCell *cell) : m_cell(cell) {}
-        virtual void Notify()
+        virtual void Notify() wxOVERRIDE
         {
             m_cell->AdvanceAnimation(this);
         }

src/html/m_layout.cpp

@@ -71,12 +71,12 @@ public:
 
     bool AdjustPagebreak(int* pagebreak,
                          const wxArrayInt& known_pagebreaks,
-                         int pageHeight) const;
+                         int pageHeight) const wxOVERRIDE;
 
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-              wxHtmlRenderingInfo& WXUNUSED(info)) {}
+              wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {}
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell);

src/html/m_links.cpp

@@ -36,9 +36,9 @@ public:
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-              wxHtmlRenderingInfo& WXUNUSED(info)) {}
+              wxHtmlRenderingInfo& WXUNUSED(info)) wxOVERRIDE {}
 
-    virtual const wxHtmlCell* Find(int condition, const void* param) const
+    virtual const wxHtmlCell* Find(int condition, const void* param) const wxOVERRIDE
     {
         if ((condition == wxHTML_COND_ISANCHOR) &&
             (m_AnchorName == (*((const wxString*)param))))

src/html/m_list.cpp

@@ -38,7 +38,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);
+                  wxHtmlRenderingInfo& info) wxOVERRIDE;
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlListmarkCell);
 };
@@ -90,7 +90,7 @@ class wxHtmlListCell : public wxHtmlContainerCell
         wxHtmlListCell(wxHtmlContainerCell *parent);
         virtual ~wxHtmlListCell();
         void AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont);
-        virtual void Layout(int w);
+        virtual void Layout(int w) wxOVERRIDE;
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlListCell);
 };
@@ -205,7 +205,7 @@ class wxHtmlListcontentCell : public wxHtmlContainerCell
 {
 public:
     wxHtmlListcontentCell(wxHtmlContainerCell *p) : wxHtmlContainerCell(p) {}
-    virtual void Layout(int w) {
+    virtual void Layout(int w) wxOVERRIDE {
         // Reset top indentation, fixes <li><p>
         SetIndent(0, wxHTML_INDENT_TOP);
         wxHtmlContainerCell::Layout(w);

src/html/m_tables.cpp

@@ -99,9 +99,9 @@ public:
     wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
     virtual ~wxHtmlTableCell();
 
-    virtual void RemoveExtraSpacing(bool top, bool bottom);
+    virtual void RemoveExtraSpacing(bool top, bool bottom) wxOVERRIDE;
 
-    virtual void Layout(int w);
+    virtual void Layout(int w) wxOVERRIDE;
 
     void AddRow(const wxHtmlTag& tag);
     void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag);

src/osx/artmac.cpp

@@ -35,12 +35,12 @@ class wxMacArtProvider : public wxArtProvider
 protected:
 #if wxOSX_USE_COCOA_OR_CARBON
     virtual wxIconBundle CreateIconBundle(const wxArtID& id,
-                                          const wxArtClient& client);
+                                          const wxArtClient& client) wxOVERRIDE;
 #endif
 #if wxOSX_USE_COCOA_OR_IPHONE
     virtual wxBitmap CreateBitmap(const wxArtID& id,
                                   const wxArtClient& client,
-                                  const wxSize& size)
+                                  const wxSize& size) wxOVERRIDE
     {
         return wxOSXCreateSystemBitmap(id, client, size);
     }

src/osx/carbon/cursor.cpp

@@ -33,7 +33,7 @@ public:
     wxCursorRefData(const wxCursorRefData& cursor);
     virtual ~wxCursorRefData();
 
-    virtual bool IsOk() const
+    virtual bool IsOk() const wxOVERRIDE
     {
 #if wxOSX_USE_COCOA_OR_CARBON
         if ( m_hCursor != NULL )

src/osx/carbon/dcprint.cpp

@@ -55,13 +55,13 @@ class wxMacCarbonPrinterDC : public wxNativePrinterDC
 public :
     wxMacCarbonPrinterDC( wxPrintData* data ) ;
     virtual ~wxMacCarbonPrinterDC() ;
-    virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
-    virtual void EndDoc( wxPrinterDC* dc ) ;
-    virtual void StartPage( wxPrinterDC* dc ) ;
-    virtual void EndPage( wxPrinterDC* dc ) ;
-    virtual wxUint32 GetStatus() const { return m_err ; }
-    virtual void GetSize( int *w , int *h) const ;
-    virtual wxSize GetPPI() const ;
+    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 ;
 private :
     wxCoord m_maxX ;
     wxCoord m_maxY ;

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);
+    virtual const wxFont* GetFont(Item item) wxOVERRIDE;
 
-    virtual bool OnInit();
-    virtual void OnExit();
+    virtual bool OnInit() wxOVERRIDE;
+    virtual void OnExit() wxOVERRIDE;
 
 private:
     typedef wxStockGDI super;

src/osx/carbon/graphics.cpp

@@ -212,7 +212,7 @@ public :
         Init( image , transform );
     }
 
-    virtual void Render( CGContextRef ctxRef )
+    virtual void Render( CGContextRef ctxRef ) wxOVERRIDE
     {
         if (m_image != NULL)
             wxMacDrawCGImage( ctxRef, &m_imageBounds, m_image );
@@ -260,7 +260,7 @@ public :
         CGContextStrokeLineSegments( ctxRef , pts , count );
     }
 
-    virtual void Render( CGContextRef ctxRef )
+    virtual void Render( CGContextRef ctxRef ) wxOVERRIDE
     {
         switch ( m_hatch )
         {
@@ -941,7 +941,7 @@ public:
     ~wxMacCoreGraphicsBitmapData();
 
     virtual CGImageRef GetBitmap() { return m_bitmap; }
-    virtual void* GetNativeBitmap() const { return m_bitmap; }
+    virtual void* GetNativeBitmap() const wxOVERRIDE { return m_bitmap; }
     bool IsMonochrome() { return m_monochrome; }
 
 #if wxUSE_IMAGE
@@ -982,53 +982,53 @@ public :
 
     virtual ~wxMacCoreGraphicsMatrixData() ;
 
-    virtual wxGraphicsObjectRefData *Clone() const ;
+    virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE ;
 
     // concatenates the matrix
-    virtual void Concat( const wxGraphicsMatrixData *t );
+    virtual void Concat( const wxGraphicsMatrixData *t ) wxOVERRIDE;
 
     // 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);
+        wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE;
 
     // 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;
+                     wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const wxOVERRIDE;
 
     // makes this the inverse matrix
-    virtual void Invert();
+    virtual void Invert() wxOVERRIDE;
 
     // returns true if the elements of the transformation matrix are equal ?
-    virtual bool IsEqual( const wxGraphicsMatrixData* t) const ;
+    virtual bool IsEqual( const wxGraphicsMatrixData* t) const wxOVERRIDE ;
 
     // return true if this is the identity matrix
-    virtual bool IsIdentity() const;
+    virtual bool IsIdentity() const wxOVERRIDE;
 
     //
     // transformation
     //
 
     // add the translation to this matrix
-    virtual void Translate( wxDouble dx , wxDouble dy );
+    virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE;
 
     // add the scale to this matrix
-    virtual void Scale( wxDouble xScale , wxDouble yScale );
+    virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE;
 
     // add the rotation to this matrix (radians)
-    virtual void Rotate( wxDouble angle );
+    virtual void Rotate( wxDouble angle ) wxOVERRIDE;
 
     //
     // apply the transforms
     //
 
     // applies that matrix to the point
-    virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
+    virtual void TransformPoint( wxDouble *x, wxDouble *y ) const wxOVERRIDE;
 
     // applies the matrix except for translations
-    virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
+    virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const wxOVERRIDE;
 
     // returns the native representation
-    virtual void * GetNativeMatrix() const;
+    virtual void * GetNativeMatrix() const wxOVERRIDE;
 
 private :
     CGAffineTransform m_matrix;
@@ -1161,25 +1161,25 @@ public :
 
     ~wxMacCoreGraphicsPathData();
 
-    virtual wxGraphicsObjectRefData *Clone() const;
+    virtual wxGraphicsObjectRefData *Clone() const wxOVERRIDE;
 
     // begins a new subpath at (x,y)
-    virtual void MoveToPoint( wxDouble x, wxDouble y );
+    virtual void MoveToPoint( wxDouble x, wxDouble y ) wxOVERRIDE;
 
     // adds a straight line from the current point to (x,y)
-    virtual void AddLineToPoint( wxDouble x, wxDouble y );
+    virtual void AddLineToPoint( wxDouble x, wxDouble y ) wxOVERRIDE;
 
     // 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 );
+    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) wxOVERRIDE;
 
     // closes the current sub-path
-    virtual void CloseSubpath();
+    virtual void CloseSubpath() wxOVERRIDE;
 
     // gets the last point of the current path, (0,0) if not yet set
-    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;
+    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const wxOVERRIDE;
 
     // 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 );
+    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) wxOVERRIDE;
 
     //
     // These are convenience functions which - if not available natively will be assembled
@@ -1187,36 +1187,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 );
+    virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ) wxOVERRIDE;
 
     // appends a rectangle as a new closed subpath
-    virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
 
     // appends a circle as a new closed subpath
-    virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
+    virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ) wxOVERRIDE;
 
     // appends an ellipsis as a new closed subpath fitting the passed rectangle
-    virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
+    virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE;
 
     // 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 );
+    virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) wxOVERRIDE;
 
     // adds another path
-    virtual void AddPath( const wxGraphicsPathData* path );
+    virtual void AddPath( const wxGraphicsPathData* path ) wxOVERRIDE;
 
     // returns the native path
-    virtual void * GetNativePath() const { return m_path; }
+    virtual void * GetNativePath() const wxOVERRIDE { return m_path; }
 
     // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
-    virtual void UnGetNativePath(void *WXUNUSED(p)) const {}
+    virtual void UnGetNativePath(void *WXUNUSED(p)) const wxOVERRIDE {}
 
     // transforms each point of this path by the matrix
-    virtual void Transform( const wxGraphicsMatrixData* matrix );
+    virtual void Transform( const wxGraphicsMatrixData* matrix ) wxOVERRIDE;
 
     // gets the bounding box enclosing all points (possibly including control points)
-    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const wxOVERRIDE;
 
-    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const;
+    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const wxOVERRIDE;
 private :
     CGMutablePathRef m_path;
 };
@@ -1362,74 +1362,74 @@ public:
 
     void Init();
 
-    virtual void StartPage( wxDouble width, wxDouble height );
+    virtual void StartPage( wxDouble width, wxDouble height ) wxOVERRIDE;
 
-    virtual void EndPage();
+    virtual void EndPage() wxOVERRIDE;
 
-    virtual void Flush();
+    virtual void Flush() wxOVERRIDE;
 
     // push the current state of the context, ie the transformation matrix on a stack
-    virtual void PushState();
+    virtual void PushState() wxOVERRIDE;
 
     // pops a stored state from the stack
-    virtual void PopState();
+    virtual void PopState() wxOVERRIDE;
 
     // clips drawings to the region
-    virtual void Clip( const wxRegion &region );
+    virtual void Clip( const wxRegion &region ) wxOVERRIDE;
 
     // clips drawings to the rect
-    virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
 
     // resets the clipping to original extent
-    virtual void ResetClip();
+    virtual void ResetClip() wxOVERRIDE;
 
-    virtual void * GetNativeContext();
+    virtual void * GetNativeContext() wxOVERRIDE;
 
-    virtual bool SetAntialiasMode(wxAntialiasMode antialias);
+    virtual bool SetAntialiasMode(wxAntialiasMode antialias) wxOVERRIDE;
 
-    virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation);
+    virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) wxOVERRIDE;
     
-    virtual bool SetCompositionMode(wxCompositionMode op);
+    virtual bool SetCompositionMode(wxCompositionMode op) wxOVERRIDE;
 
-    virtual void BeginLayer(wxDouble opacity);
+    virtual void BeginLayer(wxDouble opacity) wxOVERRIDE;
 
-    virtual void EndLayer();
+    virtual void EndLayer() wxOVERRIDE;
 
     //
     // transformation
     //
 
     // translate
-    virtual void Translate( wxDouble dx , wxDouble dy );
+    virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE;
 
     // scale
-    virtual void Scale( wxDouble xScale , wxDouble yScale );
+    virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE;
 
     // rotate (radians)
-    virtual void Rotate( wxDouble angle );
+    virtual void Rotate( wxDouble angle ) wxOVERRIDE;
 
     // concatenates this transform with the current transform of this context
-    virtual void ConcatTransform( const wxGraphicsMatrix& matrix );
+    virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE;
 
     // sets the transform of this context
-    virtual void SetTransform( const wxGraphicsMatrix& matrix );
+    virtual void SetTransform( const wxGraphicsMatrix& matrix ) wxOVERRIDE;
 
     // gets the matrix of this context
-    virtual wxGraphicsMatrix GetTransform() const;
+    virtual wxGraphicsMatrix GetTransform() const wxOVERRIDE;
     //
     // setting the paint
     //
 
     // strokes along a path with the current pen
-    virtual void StrokePath( const wxGraphicsPath &path );
+    virtual void StrokePath( const wxGraphicsPath &path ) wxOVERRIDE;
 
     // fills a path with the current brush
-    virtual void FillPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+    virtual void FillPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE;
 
     // draws a path by first filling and then stroking
-    virtual void DrawPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+    virtual void DrawPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) wxOVERRIDE;
 
-    virtual bool ShouldOffset() const
+    virtual bool ShouldOffset() const wxOVERRIDE
     {
         if ( !m_enableOffset )
             return false;
@@ -1448,24 +1448,24 @@ public:
     //
 
     virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height,
-        wxDouble *descent, wxDouble *externalLeading ) const;
+        wxDouble *descent, wxDouble *externalLeading ) const wxOVERRIDE;
 
-    virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
+    virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const wxOVERRIDE;
 
     //
     // image support
     //
 
-    virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
 
-    virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
 
-    virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
     
     // fast convenience methods
     
     
-    virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); 
+    virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
 
     void SetNativeContext( CGContextRef cg );
 
@@ -1475,8 +1475,8 @@ private:
     bool EnsureIsValid();
     void CheckInvariants() const;
 
-    virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y );
-    virtual void DoDrawRotatedText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
+    virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y ) wxOVERRIDE;
+    virtual void DoDrawRotatedText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) wxOVERRIDE;
 
     CGContextRef m_cgContext;
 #if wxOSX_USE_CARBON
@@ -2591,69 +2591,69 @@ public :
 
     // Context
 
-    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
-    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
+    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) wxOVERRIDE;
+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) wxOVERRIDE;
 #if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);
+    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) wxOVERRIDE;
 #endif
 
-    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
+    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) wxOVERRIDE;
 
-    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
+    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) wxOVERRIDE;
 
-    virtual wxGraphicsContext * CreateContext( wxWindow* window );
+    virtual wxGraphicsContext * CreateContext( wxWindow* window ) wxOVERRIDE;
 
 #if wxUSE_IMAGE
-    virtual wxGraphicsContext * CreateContextFromImage(wxImage& image);
+    virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) wxOVERRIDE;
 #endif // wxUSE_IMAGE
 
-    virtual wxGraphicsContext * CreateMeasuringContext();
+    virtual wxGraphicsContext * CreateMeasuringContext() wxOVERRIDE;
 
     // Path
 
-    virtual wxGraphicsPath CreatePath();
+    virtual wxGraphicsPath CreatePath() wxOVERRIDE;
 
     // 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);
+        wxDouble tx=0.0, wxDouble ty=0.0) wxOVERRIDE;
 
 
-    virtual wxGraphicsPen CreatePen(const wxPen& pen) ;
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) wxOVERRIDE ;
 
-    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) wxOVERRIDE ;
 
     virtual wxGraphicsBrush
     CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
                               wxDouble x2, wxDouble y2,
-                              const wxGraphicsGradientStops& stops);
+                              const wxGraphicsGradientStops& stops) wxOVERRIDE;
 
     virtual wxGraphicsBrush
     CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
                               wxDouble xc, wxDouble yc,
                               wxDouble radius,
-                              const wxGraphicsGradientStops& stops);
+                              const wxGraphicsGradientStops& stops) wxOVERRIDE;
 
    // sets the font
-    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) wxOVERRIDE ;
     virtual wxGraphicsFont CreateFont(double sizeInPixels,
                                       const wxString& facename,
                                       int flags = wxFONTFLAG_DEFAULT,
-                                      const wxColour& col = *wxBLACK);
+                                      const wxColour& col = *wxBLACK) wxOVERRIDE;
 
     // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) ;
+    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) wxOVERRIDE ;
 
 #if wxUSE_IMAGE
-    virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image);
-    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp);
+    virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) wxOVERRIDE;
+    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) wxOVERRIDE;
 #endif // wxUSE_IMAGE
 
     // create a graphics bitmap from a native bitmap
-    virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap );
+    virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) wxOVERRIDE;
 
     // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) ;
+    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) wxOVERRIDE ;
 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer)
 } ;

src/osx/carbon/icon.cpp

@@ -31,7 +31,7 @@ public:
     wxIconRefData( WXHICON iconref, int desiredWidth, int desiredHeight );
     virtual ~wxIconRefData() { Free(); }
 
-    virtual bool IsOk() const { return m_iconRef != NULL; }
+    virtual bool IsOk() const wxOVERRIDE { return m_iconRef != NULL; }
 
     virtual void Free();
 

src/osx/carbon/metafile.cpp

@@ -53,7 +53,7 @@ public:
 
     virtual ~wxMetafileRefData();
 
-    virtual bool IsOk() const { return m_data != NULL; }
+    virtual bool IsOk() const wxOVERRIDE { return m_data != NULL; }
 
     void Init();
 

src/osx/carbon/renderer.cpp

@@ -63,17 +63,17 @@ public:
         const wxRect& rect,
         int flags = 0,
         wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
-        wxHeaderButtonParams* params = NULL );
+        wxHeaderButtonParams* params = NULL ) wxOVERRIDE;
 
-    virtual int GetHeaderButtonHeight(wxWindow *win);
+    virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE;
 
-    virtual int GetHeaderButtonMargin(wxWindow *win);
+    virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE;
 
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton( wxWindow *win,
         wxDC& dc,
         const wxRect& rect,
-        int flags = 0 );
+        int flags = 0 ) wxOVERRIDE;
 
     // draw a (vertical) sash
     virtual void DrawSplitterSash( wxWindow *win,
@@ -81,49 +81,49 @@ public:
         const wxSize& size,
         wxCoord position,
         wxOrientation orient,
-        int flags = 0 );
+        int flags = 0 ) wxOVERRIDE;
 
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
-                              int flags = 0);
+                              int flags = 0) wxOVERRIDE;
 
-    virtual wxSize GetCheckBoxSize(wxWindow* win);
+    virtual wxSize GetCheckBoxSize(wxWindow* win) wxOVERRIDE;
 
     virtual void DrawComboBoxDropButton(wxWindow *win,
                                         wxDC& dc,
                                         const wxRect& rect,
-                                        int flags = 0);
+                                        int flags = 0) wxOVERRIDE;
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags = 0);
+                                int flags = 0) wxOVERRIDE;
 
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
-                                       int flags = 0);
+                                       int flags = 0) wxOVERRIDE;
 
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE;
 
-    virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
-    virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
-    virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
-    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
 
 #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
     virtual void DrawTitleBarBitmap(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
                                     wxTitleBarButton button,
-                                    int flags = 0);
+                                    int flags = 0) wxOVERRIDE;
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
-    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE;
 
 private:
     void DrawMacThemeButton(wxWindow *win,

src/osx/cocoa/button.mm

@@ -480,7 +480,7 @@ public :
     {
     }
 
-    virtual void controlAction(WXWidget slf, void* _cmd, void *sender)
+    virtual void controlAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE
     {
         wxDisclosureNSButton* db = (wxDisclosureNSButton*)m_osxView;
         [db toggle];

src/osx/cocoa/choice.mm

@@ -63,7 +63,7 @@ public:
     {
     }
     
-    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
+    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const wxOVERRIDE
     {
         left = top = right = bottom = 0;
         NSControlSize size = NSRegularControlSize;

src/osx/cocoa/datetimectrl.mm

@@ -75,7 +75,7 @@ public:
     {
     }
 
-    virtual void SetDateTime(const wxDateTime& dt)
+    virtual void SetDateTime(const wxDateTime& dt) wxOVERRIDE
     {
         wxDateTime dtFrom, dtTo;
         
@@ -85,12 +85,12 @@ public:
             [View() setDateValue: NSDateFromWX(dt)];
     }
 
-    virtual wxDateTime GetDateTime() const
+    virtual wxDateTime GetDateTime() const wxOVERRIDE
     {
         return NSDateToWX([View() dateValue]);
     }
 
-    virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2)
+    virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE
     {
         // Note that passing nil is ok here so we don't need to test for the
         // dates validity.
@@ -98,7 +98,7 @@ public:
         [View() setMaxDate: NSDateFromWX(dt2)];
     }
 
-    virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2)
+    virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) wxOVERRIDE
     {
         bool hasLimits = false;
         if ( dt1 )
@@ -118,7 +118,7 @@ public:
 
     virtual void controlAction(WXWidget WXUNUSED(slf),
                                void* WXUNUSED(cmd),
-                               void* WXUNUSED(sender))
+                               void* WXUNUSED(sender)) wxOVERRIDE
     {
         wxWindow* const wxpeer = GetWXPeer();
         if ( wxpeer )

src/osx/cocoa/gauge.mm

@@ -50,19 +50,19 @@ public :
     {
     }
 
-    void SetMaximum(wxInt32 v)
+    void SetMaximum(wxInt32 v) wxOVERRIDE
     {
         SetDeterminateMode();
         wxWidgetCocoaImpl::SetMaximum( v ) ;
     }
 
-    void SetValue(wxInt32 v)
+    void SetValue(wxInt32 v) wxOVERRIDE
     {
         SetDeterminateMode();
         wxWidgetCocoaImpl::SetValue( v ) ;
     }
 
-    void PulseGauge()
+    void PulseGauge() wxOVERRIDE
     {
         if ( ![(wxNSProgressIndicator*)m_osxView isIndeterminate] )
         {
@@ -71,7 +71,7 @@ public :
         }
     }
 
-    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
+    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const wxOVERRIDE
     {
         left = top = right = bottom = 0;
         NSControlSize size = [(wxNSProgressIndicator*)m_osxView controlSize];

src/osx/cocoa/listbox.mm

@@ -106,44 +106,44 @@ public :
     ~wxListWidgetCocoaImpl();
 
     virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
-                                wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1)  ;
+                                wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) wxOVERRIDE  ;
     virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
-                                wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1)  ;
+                                wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1) wxOVERRIDE  ;
 
     // add and remove
 
-    virtual void            ListDelete( unsigned int n ) ;
-    virtual void            ListInsert( unsigned int n ) ;
-    virtual void            ListClear() ;
+    virtual void            ListDelete( unsigned int n ) wxOVERRIDE ;
+    virtual void            ListInsert( unsigned int n ) wxOVERRIDE ;
+    virtual void            ListClear() wxOVERRIDE ;
 
     // selecting
 
-    virtual void            ListDeselectAll();
+    virtual void            ListDeselectAll() wxOVERRIDE;
 
-    virtual void            ListSetSelection( unsigned int n, bool select, bool multi ) ;
-    virtual int             ListGetSelection() const ;
+    virtual void            ListSetSelection( unsigned int n, bool select, bool multi ) wxOVERRIDE ;
+    virtual int             ListGetSelection() const wxOVERRIDE ;
 
-    virtual int             ListGetSelections( wxArrayInt& aSelections ) const ;
+    virtual int             ListGetSelections( wxArrayInt& aSelections ) const wxOVERRIDE ;
 
-    virtual bool            ListIsSelected( unsigned int n ) const ;
+    virtual bool            ListIsSelected( unsigned int n ) const wxOVERRIDE ;
 
     // display
 
-    virtual void            ListScrollTo( unsigned int n ) ;
+    virtual void            ListScrollTo( unsigned int n ) wxOVERRIDE ;
 
     // accessing content
 
-    virtual unsigned int    ListGetCount() const ;
-    virtual int             DoListHitTest( const wxPoint& inpoint ) const;
+    virtual unsigned int    ListGetCount() const wxOVERRIDE ;
+    virtual int             DoListHitTest( const wxPoint& inpoint ) const wxOVERRIDE;
 
     int                     ListGetColumnType( int col )
     {
         return col;
     }
-    virtual void            UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) ;
-    virtual void            UpdateLineToEnd( unsigned int n);
+    virtual void            UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) wxOVERRIDE ;
+    virtual void            UpdateLineToEnd( unsigned int n) wxOVERRIDE;
 
-    virtual void            controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
+    virtual void            controlDoubleAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE;
 
     
 protected :
@@ -186,20 +186,20 @@ public :
 
     virtual ~wxNSTableViewCellValue() {}
 
-    virtual void Set( CFStringRef v )
+    virtual void Set( CFStringRef v ) wxOVERRIDE
     {
         value = [[(NSString*)v retain] autorelease];
     }
-    virtual void Set( const wxString& value )
+    virtual void Set( const wxString& value ) wxOVERRIDE
     {
         Set( (CFStringRef) wxCFStringRef( value ) );
     }
-    virtual void Set( int v )
+    virtual void Set( int v ) wxOVERRIDE
     {
         value = [NSNumber numberWithInt:v];
     }
 
-    virtual int GetIntValue() const
+    virtual int GetIntValue() const wxOVERRIDE
     {
         if ( [value isKindOfClass:[NSNumber class]] )
             return [ (NSNumber*) value intValue ];
@@ -207,7 +207,7 @@ public :
         return 0;
     }
 
-    virtual wxString GetStringValue() const
+    virtual wxString GetStringValue() const wxOVERRIDE
     {
         if ( [value isKindOfClass:[NSString class]] )
             return wxCFStringRef::AsString( (NSString*) value );

src/osx/cocoa/mediactrl.mm

@@ -78,34 +78,34 @@ public:
                                      const wxSize& size,
                                      long style,
                                      const wxValidator& validator,
-                                     const wxString& name);
+                                     const wxString& name) wxOVERRIDE;
 
-    virtual bool Play();
-    virtual bool Pause();
-    virtual bool Stop();
+    virtual bool Play() wxOVERRIDE;
+    virtual bool Pause() wxOVERRIDE;
+    virtual bool Stop() wxOVERRIDE;
 
-    virtual bool Load(const wxString& fileName);
-    virtual bool Load(const wxURI& location);
+    virtual bool Load(const wxString& fileName) wxOVERRIDE;
+    virtual bool Load(const wxURI& location) wxOVERRIDE;
 
-    virtual wxMediaState GetState();
+    virtual wxMediaState GetState() wxOVERRIDE;
 
-    virtual bool SetPosition(wxLongLong where);
-    virtual wxLongLong GetPosition();
-    virtual wxLongLong GetDuration();
+    virtual bool SetPosition(wxLongLong where) wxOVERRIDE;
+    virtual wxLongLong GetPosition() wxOVERRIDE;
+    virtual wxLongLong GetDuration() wxOVERRIDE;
 
-    virtual void Move(int x, int y, int w, int h);
-    wxSize GetVideoSize() const;
+    virtual void Move(int x, int y, int w, int h) wxOVERRIDE;
+    wxSize GetVideoSize() const wxOVERRIDE;
 
-    virtual double GetPlaybackRate();
-    virtual bool SetPlaybackRate(double dRate);
+    virtual double GetPlaybackRate() wxOVERRIDE;
+    virtual bool SetPlaybackRate(double dRate) wxOVERRIDE;
 
-    virtual double GetVolume();
-    virtual bool SetVolume(double dVolume);
+    virtual double GetVolume() wxOVERRIDE;
+    virtual bool SetVolume(double dVolume) wxOVERRIDE;
     
     void Cleanup();
     void FinishLoad();
 
-    virtual bool   ShowPlayerControls(wxMediaCtrlPlayerControls flags);
+    virtual bool   ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE;
 private:
     void DoShowPlayerControls(wxMediaCtrlPlayerControls flags);
     

src/osx/cocoa/menu.mm

@@ -165,7 +165,7 @@ public :
 
     virtual ~wxMenuCocoaImpl();
 
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) wxOVERRIDE
     {
         NSMenuItem* nsmenuitem = (NSMenuItem*) pItem->GetPeer()->GetHMenuItem();
         // make sure a call of SetSubMenu is also reflected (occurring after Create)
@@ -188,12 +188,12 @@ public :
             [m_osxMenu insertItem:nsmenuitem atIndex:pos];
     }
 
-    virtual void Remove( wxMenuItem *pItem )
+    virtual void Remove( wxMenuItem *pItem ) wxOVERRIDE
     {
         [m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
     }
 
-    virtual void MakeRoot()
+    virtual void MakeRoot() wxOVERRIDE
     {
         wxMenu* peer = GetWXPeer();
         
@@ -230,13 +230,13 @@ public :
     {
     }
 
-    virtual void SetTitle( const wxString& text )
+    virtual void SetTitle( const wxString& text ) wxOVERRIDE
     {
         wxCFStringRef cfText(text);
         [m_osxMenu setTitle:cfText.AsNSString()];
     }
 
-    virtual void PopUp( wxWindow *win, int x, int y )
+    virtual void PopUp( wxWindow *win, int x, int y ) wxOVERRIDE
     {
         win->ScreenToClient( &x , &y ) ;
         NSView *view = win->GetPeer()->GetWXWidget();
@@ -254,7 +254,7 @@ public :
         [popUpButtonCell release];
     }
 
-    WXHMENU GetHMenu() { return m_osxMenu; }
+    WXHMENU GetHMenu() wxOVERRIDE { return m_osxMenu; }
 
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );

src/osx/cocoa/menuitem.mm

@@ -244,22 +244,22 @@ public :
 
     ~wxMenuItemCocoaImpl();
 
-    void SetBitmap( const wxBitmap& bitmap )
+    void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE
     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }
 
-    void Enable( bool enable )
+    void Enable( bool enable ) wxOVERRIDE
     {
         [m_osxMenuItem setEnabled:enable];
     }
 
-    void Check( bool check )
+    void Check( bool check ) wxOVERRIDE
     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }
 
-    void Hide( bool hide )
+    void Hide( bool hide ) wxOVERRIDE
     {
         // NB: setHidden is new as of 10.5 so we should not call it below there
         if ([m_osxMenuItem respondsToSelector:@selector(setHidden:)])
@@ -268,7 +268,7 @@ public :
             wxLogDebug("wxMenuItemCocoaImpl::Hide not yet supported under OS X < 10.5");
     }
 
-    void SetLabel( const wxString& text, wxAcceleratorEntry *entry )
+    void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) wxOVERRIDE
     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];
@@ -276,9 +276,9 @@ public :
         wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
     }
     
-    bool DoDefault();
+    bool DoDefault() wxOVERRIDE;
 
-    void * GetHMenuItem() { return m_osxMenuItem; }
+    void * GetHMenuItem() wxOVERRIDE { return m_osxMenuItem; }
 
 protected :
     NSMenuItem* m_osxMenuItem ;