From 3a04a456397926c16588bbedfd3fbbf819a42948 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Fri, 22 Mar 2019 10:36:59 -0400
Subject: [PATCH] Fix inconsistent function declarations in documentation

Mostly remove the virtual keyword where the actual implementation isn't
virtual.

(Backport of ac18cfe7cc1c7c6f8e545ccdcb1a947392c3f320 plus some additional
fixes that were already in master.)
---
 interface/wx/dataview.h               |  6 +++---
 interface/wx/grid.h                   |  2 +-
 interface/wx/html/winpars.h           |  2 +-
 interface/wx/image.h                  |  2 +-
 interface/wx/intl.h                   | 10 +++++-----
 interface/wx/print.h                  |  2 +-
 interface/wx/propgrid/propgridiface.h |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/wxWidgets/interface/wx/dataview.h b/ext/wxWidgets/interface/wx/dataview.h
index 81bcd5adfde..658986a706c 100644
--- a/ext/wxWidgets/interface/wx/dataview.h
+++ b/ext/wxWidgets/interface/wx/dataview.h
@@ -132,7 +132,7 @@ class wxDataViewModel : public wxRefCounter
         Called to inform the model that all data has been cleared.
         The control will reread the data from the model again.
     */
-    virtual bool Cleared();
+    bool Cleared();
 
     /**
         The compare function to be used by control. The default compare function
@@ -336,8 +336,8 @@ class wxDataViewModel : public wxRefCounter
         This will eventually emit a @c wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
         event to the user.
     */
-    virtual bool ValueChanged(const wxDataViewItem& item,
-                              unsigned int col);
+    bool ValueChanged(const wxDataViewItem& item,
+                      unsigned int col);
 
     
     virtual bool IsListModel() const;
diff --git a/ext/wxWidgets/interface/wx/grid.h b/ext/wxWidgets/interface/wx/grid.h
index ff2cb695ec4..35554268d5c 100644
--- a/ext/wxWidgets/interface/wx/grid.h
+++ b/ext/wxWidgets/interface/wx/grid.h
@@ -446,7 +446,7 @@ class wxGridCellEditor : public wxClientDataContainer, public wxRefCounter
         Draws the part of the cell not occupied by the control: the base class
         version just fills it with background colour from the attribute.
     */
-    virtual void PaintBackground(wxDC& dc, const wxRect& rectCell, wxGridCellAttr& attr);
+    virtual void PaintBackground(wxDC& dc, const wxRect& rectCell, const wxGridCellAttr& attr);
 
     /**
         Reset the value in the control back to its starting value.
diff --git a/ext/wxWidgets/interface/wx/html/winpars.h b/ext/wxWidgets/interface/wx/html/winpars.h
index 6e7d0158fa9..5e629c955f0 100644
--- a/ext/wxWidgets/interface/wx/html/winpars.h
+++ b/ext/wxWidgets/interface/wx/html/winpars.h
@@ -59,7 +59,7 @@ class wxHtmlWinTagHandler : public wxHtmlTagHandler
         Assigns @a parser to this handler. Each @b instance of handler
         is guaranteed to be called only from the one parser.
     */
-    virtual void SetParser(wxHtmlWinParser* parser);
+    virtual void SetParser(wxHtmlParser* parser);
 
 protected:
     /**
diff --git a/ext/wxWidgets/interface/wx/image.h b/ext/wxWidgets/interface/wx/image.h
index e3735d4d3cb..242800be0b6 100644
--- a/ext/wxWidgets/interface/wx/image.h
+++ b/ext/wxWidgets/interface/wx/image.h
@@ -224,7 +224,7 @@ class wxImageHandler : public wxObject
                 for which this function returns the number of frames in the
                 animation).
     */
-    virtual int GetImageCount(wxInputStream& stream);
+    int GetImageCount(wxInputStream& stream);
 
     /**
         Gets the MIME type associated with this handler.
diff --git a/ext/wxWidgets/interface/wx/intl.h b/ext/wxWidgets/interface/wx/intl.h
index 357fa93a71b..fa443d9d042 100644
--- a/ext/wxWidgets/interface/wx/intl.h
+++ b/ext/wxWidgets/interface/wx/intl.h
@@ -362,15 +362,15 @@ class wxLocale
     /**
         Calls wxGetTranslation(const wxString&, const wxString&).
     */
-    virtual const wxString& GetString(const wxString& origString,
-                                      const wxString& domain = wxEmptyString) const;
+    const wxString& GetString(const wxString& origString,
+                              const wxString& domain = wxEmptyString) const;
 
     /**
         Calls wxGetTranslation(const wxString&, const wxString&, unsigned, const wxString&).
     */
-    virtual const wxString& GetString(const wxString& origString,
-                                      const wxString& origString2, unsigned n,
-                                      const wxString& domain = wxEmptyString) const;
+    const wxString& GetString(const wxString& origString,
+                              const wxString& origString2, unsigned n,
+                              const wxString& domain = wxEmptyString) const;
 
     /**
         Returns current platform-specific locale name as passed to setlocale().
diff --git a/ext/wxWidgets/interface/wx/print.h b/ext/wxWidgets/interface/wx/print.h
index 1a16f1d08e3..ebd5ba18d0e 100644
--- a/ext/wxWidgets/interface/wx/print.h
+++ b/ext/wxWidgets/interface/wx/print.h
@@ -262,7 +262,7 @@ class wxPreviewFrame : public wxFrame
 
         @since 2.9.2
     */
-    virtual void InitializeWithModality(wxPreviewFrameModalityKind kind);
+    void InitializeWithModality(wxPreviewFrameModalityKind kind);
 
     /**
         Enables any disabled frames in the application, and deletes the print preview
diff --git a/ext/wxWidgets/interface/wx/propgrid/propgridiface.h b/ext/wxWidgets/interface/wx/propgrid/propgridiface.h
index 7f30c0038e3..2186f8df999 100644
--- a/ext/wxWidgets/interface/wx/propgrid/propgridiface.h
+++ b/ext/wxWidgets/interface/wx/propgrid/propgridiface.h
@@ -596,7 +596,7 @@ class wxPropertyGridInterface
     /**
         Returns true if property is selected.
     */
-    virtual bool IsPropertySelected( wxPGPropArg id ) const;
+    bool IsPropertySelected( wxPGPropArg id ) const;
 
     /**
         Returns @true if property is shown (ie. HideProperty() with @true not