From bd1e13df4288911391f22c47a7ecb05cb5058877 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 10 Feb 2018 15:13:01 -0800
Subject: [PATCH] Minor cleanup and changes from Code Review comments.

---
 interface/wx/aui/floatpane.h |  3 ---
 interface/wx/dataview.h      |  2 --
 interface/wx/grid.h          |  9 ---------
 interface/wx/toolbar.h       | 24 ++++++++++++------------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/interface/wx/aui/floatpane.h b/interface/wx/aui/floatpane.h
index 6bad7019fa..04a04a649b 100644
--- a/interface/wx/aui/floatpane.h
+++ b/interface/wx/aui/floatpane.h
@@ -2,7 +2,6 @@
 // Name:        wx/aui/floatpane.h
 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
-// Modified by:
 // Created:     2005-05-17
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
@@ -29,5 +28,3 @@ protected:
     virtual void OnMoving(const wxRect& windowRect, wxDirection dir);
     virtual void OnMoveFinished();
 };
-
-
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index c2214852c7..9ef314b359 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3847,8 +3847,6 @@ public:
     void SetDataBuffer( void* buf );
     int GetDragFlags() const;
     void SetDropEffect( wxDragResult effect );
-    void SetEditCancelled();
-
 };
 
 
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 2426c89714..39820c5716 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -10,15 +10,6 @@
 /// the appropriate size
 #define wxGRID_AUTOSIZE (-1)
 
-/// Many wxGrid methods work either with columns or rows, this enum is used for
-/// the parameter indicating which one should it be
-enum wxGridDirection
-{
-    wxGRID_COLUMN,
-    wxGRID_ROW
-};
-
-
 
 /**
     @class wxGridCellRenderer
diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index e3a58f53e8..783531ab65 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -123,21 +123,21 @@ public:
 
     wxObject *GetClientData() const;
 
-    virtual bool Enable(bool enable);
-    virtual bool Toggle(bool toggle);
-    virtual bool SetToggle(bool toggle);
-    virtual bool SetShortHelp(const wxString& help);
-    virtual bool SetLongHelp(const wxString& help);
+    bool Enable(bool enable);
+    bool Toggle(bool toggle);
+    bool SetToggle(bool toggle);
+    bool SetShortHelp(const wxString& help);
+    bool SetLongHelp(const wxString& help);
     void Toggle();
-    virtual void SetNormalBitmap(const wxBitmap& bmp);
-    virtual void SetDisabledBitmap(const wxBitmap& bmp);
-    virtual void SetLabel(const wxString& label);
+    void SetNormalBitmap(const wxBitmap& bmp);
+    void SetDisabledBitmap(const wxBitmap& bmp);
+    void SetLabel(const wxString& label);
     void SetClientData(wxObject *clientData);
-    
-    virtual void Detach();
-    virtual void Attach(wxToolBarBase *tbar);
 
-    virtual void SetDropdownMenu(wxMenu *menu);
+    void Detach();
+    void Attach(wxToolBarBase *tbar);
+
+    void SetDropdownMenu(wxMenu *menu);
     wxMenu *GetDropdownMenu() const;
 };