diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h index 6e7d0158fa..5e629c955f 100644 --- a/interface/wx/html/winpars.h +++ b/interface/wx/html/winpars.h @@ -59,7 +59,7 @@ public: 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/interface/wx/image.h b/interface/wx/image.h index 055fcbbe77..a64578b02a 100644 --- a/interface/wx/image.h +++ b/interface/wx/image.h @@ -227,7 +227,7 @@ public: 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/interface/wx/intl.h b/interface/wx/intl.h index 17d42de8d8..8fbe58fbd4 100644 --- a/interface/wx/intl.h +++ b/interface/wx/intl.h @@ -367,15 +367,15 @@ public: /** 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/interface/wx/print.h b/interface/wx/print.h index 83a6b1fcca..62310ba6a3 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -262,7 +262,7 @@ public: @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/interface/wx/propgrid/propgridiface.h b/interface/wx/propgrid/propgridiface.h index 9c3e916702..9ce491ee8a 100644 --- a/interface/wx/propgrid/propgridiface.h +++ b/interface/wx/propgrid/propgridiface.h @@ -691,7 +691,7 @@ public: /** Returns @true if property is selected. */ - virtual bool IsPropertySelected( wxPGPropArg id ) const; + bool IsPropertySelected( wxPGPropArg id ) const; /** Returns @true if property is shown (i.e. HideProperty() with @true not