From c09ff65f7ef7c6afdec093bc54db68ac1bc2325f Mon Sep 17 00:00:00 2001
From: Hartwig <git@skywind.eu>
Date: Sun, 22 Nov 2015 09:52:21 +0100
Subject: [PATCH] Addition of missing overrides in statusbr.h and toolbar.h

---
 include/wx/osx/statusbr.h |  8 +++----
 include/wx/osx/toolbar.h  | 48 +++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index 57f738118d..76d6bbaebd 100644
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -27,13 +27,13 @@ public:
               const wxString& name = wxStatusBarNameStr);
 
     // Implementation
-    virtual void MacHiliteChanged();
+    virtual void MacHiliteChanged() wxOVERRIDE;
     void OnPaint(wxPaintEvent& event);
 
 protected:
-    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
-    virtual void DrawField(wxDC& dc, int i, int textHeight);
-    virtual void DoUpdateStatusText(int number = 0);
+    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight) wxOVERRIDE;
+    virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE;
+    virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac);
     wxDECLARE_EVENT_TABLE();
diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 3efd810467..70a33f77a7 100644
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -40,34 +40,34 @@ public:
             long style = wxTB_DEFAULT_STYLE,
             const wxString& name = wxToolBarNameStr);
 
-    virtual void SetWindowStyleFlag(long style);
+    virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
 
-    virtual bool Destroy();
+    virtual bool Destroy() wxOVERRIDE;
 
     // override/implement base class virtuals
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
 
 #ifndef __WXOSX_IPHONE__
-    virtual bool Show(bool show = true);
-    virtual bool IsShown() const;
+    virtual bool Show(bool show = true) wxOVERRIDE;
+    virtual bool IsShown() const wxOVERRIDE;
 #endif
-    virtual bool Realize();
+    virtual bool Realize() wxOVERRIDE;
 
-    virtual void SetToolBitmapSize(const wxSize& size);
-    virtual wxSize GetToolSize() const;
+    virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE;
+    virtual wxSize GetToolSize() const wxOVERRIDE;
 
-    virtual void SetRows(int nRows);
+    virtual void SetRows(int nRows) wxOVERRIDE;
 
-    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
-    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
+    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
 
 #ifndef __WXOSX_IPHONE__
     // Add all the buttons
 
-    virtual wxString MacGetToolTipString( wxPoint &where ) ;
+    virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE;
     void OnPaint(wxPaintEvent& event) ;
     void OnMouse(wxMouseEvent& event) ;
-    virtual void MacSuperChangedPosition() ;
+    virtual void MacSuperChangedPosition() wxOVERRIDE;
 #endif
 
 #if wxOSX_USE_NATIVE_TOOLBAR
@@ -88,9 +88,9 @@ public:
                                           wxItemKind kind = wxITEM_NORMAL,
                                           wxObject *clientData = NULL,
                                           const wxString& shortHelp = wxEmptyString,
-                                          const wxString& longHelp = wxEmptyString);
+                                          const wxString& longHelp = wxEmptyString) wxOVERRIDE;
     virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
+                                          const wxString& label) wxOVERRIDE;
 
 protected:
     // common part of all ctors
@@ -98,21 +98,21 @@ protected:
     
     void DoLayout();
     
-    void DoSetSize(int x, int y, int width, int height, int sizeFlags);
+    void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
 
 #ifndef __WXOSX_IPHONE__
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual wxSize DoGetBestSize() const;
+    virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 #endif
 #ifdef __WXOSX_COCOA__
-    virtual void DoGetPosition(int*x, int *y) const;
+    virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE;
 #endif
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
 
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
 
     wxDECLARE_EVENT_TABLE();
 #if wxOSX_USE_NATIVE_TOOLBAR