From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Mon, 13 Oct 2008 11:09:56 +0000 (+0000)
Subject: virtual/static attributes automated fixes by ifacecheck
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0004982c831f56c65c390fb617711ff52595c2f3

virtual/static attributes automated fixes by ifacecheck

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

diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h
index ef1996453c..07503809e9 100644
--- a/interface/wx/bitmap.h
+++ b/interface/wx/bitmap.h
@@ -492,7 +492,7 @@ public:
     /**
         Returns @true if bitmap data is present.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Loads a bitmap from a file or resource.
diff --git a/interface/wx/brush.h b/interface/wx/brush.h
index 512b7f00eb..7df0e78182 100644
--- a/interface/wx/brush.h
+++ b/interface/wx/brush.h
@@ -165,7 +165,7 @@ public:
         constructor has been used (for example, the brush is a member of a class, or
         @NULL has been assigned to it).
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     //@{
     /**
diff --git a/interface/wx/colour.h b/interface/wx/colour.h
index b1fcc6bebf..b1102d41e8 100644
--- a/interface/wx/colour.h
+++ b/interface/wx/colour.h
@@ -128,7 +128,7 @@ public:
         Returns @true if the colour object is valid (the colour has been initialised
         with RGB values).
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Returns the red intensity.
diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index 9f2c45ea2f..a13a5838e0 100644
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -179,42 +179,42 @@ public:
         Returns @true if the combobox is editable and there is a text selection
         to copy to the clipboard. Only available on Windows.
     */
-    bool CanCopy() const;
+    virtual bool CanCopy() const;
 
     /**
         Returns @true if the combobox is editable and there is a text selection
         to copy to the clipboard. Only available on Windows.
     */
-    bool CanCut() const;
+    virtual bool CanCut() const;
 
     /**
         Returns @true if the combobox is editable and there is text on the
         clipboard that can be pasted into the text field. Only available on
         Windows.
     */
-    bool CanPaste() const;
+    virtual bool CanPaste() const;
 
     /**
         Returns @true if the combobox is editable and the last undo can be
         redone. Only available on Windows.
     */
-    bool CanRedo() const;
+    virtual bool CanRedo() const;
 
     /**
         Returns @true if the combobox is editable and the last edit can be
         undone. Only available on Windows.
     */
-    bool CanUndo() const;
+    virtual bool CanUndo() const;
 
     /**
         Copies the selected text to the clipboard.
     */
-    void Copy();
+    virtual void Copy();
 
     /**
         Copies the selected text to the clipboard and removes the selection.
     */
-    void Cut();
+    virtual void Cut();
 
     /**
         This function does the same things as wxChoice::GetCurrentSelection()
@@ -229,7 +229,7 @@ public:
         @note Under wxMSW, this function always returns 0 if the combobox
               doesn't have the focus.
     */
-    long GetInsertionPoint() const;
+    virtual long GetInsertionPoint() const;
 
     /**
         Returns the last position in the combobox text field.
@@ -248,17 +248,17 @@ public:
     /**
         Returns the current value in the combobox text field.
     */
-    wxString GetValue() const;
+    virtual wxString GetValue() const;
 
     /**
         Pastes text from the clipboard to the text field.
     */
-    void Paste();
+    virtual void Paste();
 
     /**
         Redoes the last undo in the text field. Windows only.
     */
-    void Redo();
+    virtual void Redo();
 
     /**
         Removes the text between the two positions in the combobox text field.
@@ -268,7 +268,7 @@ public:
         @param to
             The last position.
     */
-    void Remove(long from, long to);
+    virtual void Remove(long from, long to);
 
     /**
         Replaces the text between two positions with the given text, in the
@@ -281,7 +281,7 @@ public:
         @param text
             The text to insert.
     */
-    void Replace(long from, long to, const wxString& text);
+    virtual void Replace(long from, long to, const wxString& text);
 
     /**
         Sets the insertion point in the combobox text field.
@@ -289,12 +289,12 @@ public:
         @param pos
             The new insertion point.
     */
-    void SetInsertionPoint(long pos);
+    virtual void SetInsertionPoint(long pos);
 
     /**
         Sets the insertion point at the end of the combobox text field.
     */
-    void SetInsertionPointEnd();
+    virtual void SetInsertionPointEnd();
 
     /**
         Selects the text between the two positions, in the combobox text field.
@@ -321,11 +321,11 @@ public:
         @param text
             The text to set.
     */
-    void SetValue(const wxString& text);
+    virtual void SetValue(const wxString& text);
 
     /**
         Undoes the last edit in the text field. Windows only.
     */
-    void Undo();
+    virtual void Undo();
 };
 
diff --git a/interface/wx/cursor.h b/interface/wx/cursor.h
index 2a7392fe16..5a6f9997fc 100644
--- a/interface/wx/cursor.h
+++ b/interface/wx/cursor.h
@@ -206,7 +206,7 @@ public:
     /**
         Returns @true if cursor data is present.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Assignment operator, using @ref overview_refcount "reference counting".
diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h
index 3536612216..17f92831cb 100644
--- a/interface/wx/dcsvg.h
+++ b/interface/wx/dcsvg.h
@@ -96,27 +96,27 @@ public:
         Convert device X coordinate to logical coordinate, using the current
         mapping mode.
     */
-    wxCoord DeviceToLogicalX(wxCoord x);
+    wxCoord DeviceToLogicalX(wxCoord x) const;
 
     /**
         Convert device X coordinate to relative logical coordinate, using the
         current mapping mode but ignoring the x axis orientation. Use this
         function for converting a width, for example.
     */
-    wxCoord DeviceToLogicalXRel(wxCoord x);
+    wxCoord DeviceToLogicalXRel(wxCoord x) const;
 
     /**
         Converts device Y coordinate to logical coordinate, using the current
         mapping mode.
     */
-    wxCoord DeviceToLogicalY(wxCoord y);
+    wxCoord DeviceToLogicalY(wxCoord y) const;
 
     /**
         Convert device Y coordinate to relative logical coordinate, using the
         current mapping mode but ignoring the y axis orientation. Use this
         function for converting a height, for example.
     */
-    wxCoord DeviceToLogicalYRel(wxCoord y);
+    wxCoord DeviceToLogicalYRel(wxCoord y) const;
 
     /**
         Draws an arc of a circle, centred on (@a xc, @a yc), with starting
@@ -352,12 +352,12 @@ public:
     /**
         Gets the character height of the currently set font.
     */
-    wxCoord GetCharHeight();
+    wxCoord GetCharHeight() const;
 
     /**
         Gets the average character width of the currently set font.
     */
-    wxCoord GetCharWidth();
+    wxCoord GetCharWidth() const;
 
     /**
         Not implemented.
@@ -379,14 +379,14 @@ public:
 
         @see SetLogicalFunction()
     */
-    int GetLogicalFunction();
+    int GetLogicalFunction() const;
 
     /**
         Gets the mapping mode for the device context.
 
         @see SetMapMode()
     */
-    int GetMapMode();
+    int GetMapMode() const;
 
     //@{
     /**
@@ -401,7 +401,7 @@ public:
     /**
         Not implemented.
     */
-    bool GetPixel(wxCoord x, wxCoord y, wxColour* colour);
+    bool GetPixel(wxCoord x, wxCoord y, wxColour* colour) const;
 
     /**
         For a Windows printer device context, this gets the horizontal and
@@ -467,47 +467,47 @@ public:
         Converts logical X coordinate to device coordinate, using the current
         mapping mode.
     */
-    wxCoord LogicalToDeviceX(wxCoord x);
+    wxCoord LogicalToDeviceX(wxCoord x) const;
 
     /**
         Converts logical X coordinate to relative device coordinate, using the
         current mapping mode but ignoring the x axis orientation. Use this for
         converting a width, for example.
     */
-    wxCoord LogicalToDeviceXRel(wxCoord x);
+    wxCoord LogicalToDeviceXRel(wxCoord x) const;
 
     /**
         Converts logical Y coordinate to device coordinate, using the current
         mapping mode.
     */
-    wxCoord LogicalToDeviceY(wxCoord y);
+    wxCoord LogicalToDeviceY(wxCoord y) const;
 
     /**
         Converts logical Y coordinate to relative device coordinate, using the
         current mapping mode but ignoring the y axis orientation. Use this for
         converting a height, for example.
     */
-    wxCoord LogicalToDeviceYRel(wxCoord y);
+    wxCoord LogicalToDeviceYRel(wxCoord y) const;
 
     /**
         Gets the maximum horizontal extent used in drawing commands so far.
     */
-    wxCoord MaxX();
+    wxCoord MaxX() const;
 
     /**
         Gets the maximum vertical extent used in drawing commands so far.
     */
-    wxCoord MaxY();
+    wxCoord MaxY() const;
 
     /**
         Gets the minimum horizontal extent used in drawing commands so far.
     */
-    wxCoord MinX();
+    wxCoord MinX() const;
 
     /**
         Gets the minimum vertical extent used in drawing commands so far.
     */
-    wxCoord MinY();
+    wxCoord MinY() const;
 
     /**
         Returns @true if the DC is ok to use. @false values arise from being
diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h
index ce50d802ac..f053d885be 100644
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -385,7 +385,7 @@ public:
         @remarks Always returns @false under Windows since dialogs cannot be
                  iconized.
     */
-    bool IsIconized() const;
+    virtual bool IsIconized() const;
 
     /**
         A static function returning @true if layout adaptation is enabled for
diff --git a/interface/wx/filesys.h b/interface/wx/filesys.h
index 4620a9825e..35f6324ece 100644
--- a/interface/wx/filesys.h
+++ b/interface/wx/filesys.h
@@ -391,7 +391,7 @@ public:
 
         @note the anchor is NOT part of the left location.
     */
-    wxString GetAnchor(const wxString& location) const;
+    static wxString GetAnchor(const wxString& location);
 
     /**
         Returns the left location string extracted from @e location.
@@ -401,7 +401,7 @@ public:
         GetLeftLocation("file:myzipfile.zip#zip:index.htm") == "file:myzipfile.zip"
         @endcode
     */
-    wxString GetLeftLocation(const wxString& location) const;
+    static wxString GetLeftLocation(const wxString& location);
 
     /**
         Returns the MIME type based on @b extension of @a location.
@@ -423,7 +423,7 @@ public:
         GetProtocol("file:myzipfile.zip#zip:index.htm") == "zip"
         @endcode
     */
-    wxString GetProtocol(const wxString& location) const;
+    static wxString GetProtocol(const wxString& location);
 
     /**
         Returns the right location string extracted from @a location.
@@ -433,7 +433,7 @@ public:
         GetRightLocation("file:myzipfile.zip#zip:index.htm") == "index.htm"
         @endcode
     */
-    wxString GetRightLocation(const wxString& location) const;
+    static wxString GetRightLocation(const wxString& location);
 
     /**
         Opens the file and returns wxFSFile pointer or @NULL if failed.
diff --git a/interface/wx/font.h b/interface/wx/font.h
index 5f49e1a9a8..2a2daa2bf4 100644
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -462,7 +462,7 @@ public:
     /**
         Returns @true if this object is a valid font, @false otherwise.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     //@{
     /**
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index da7bf9a117..bd4284dc55 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -470,7 +470,7 @@ public:
     /**
         The dtor is private because only DecRef() can delete us.
     */
-    ~wxGridCellEditor();
+    virtual ~wxGridCellEditor();
 
     /**
         Fetch the value from the table and prepare the edit control
@@ -723,12 +723,12 @@ public:
     /**
         Returns @true if the Alt key was down at the time of the event.
     */
-    bool AltDown();
+    bool AltDown() const;
 
     /**
         Returns @true if the Control key was down at the time of the event.
     */
-    bool ControlDown();
+    bool ControlDown() const;
 
     /**
         Top left corner of the rectangular area that was (de)selected.
@@ -763,7 +763,7 @@ public:
     /**
         Returns @true if the Meta key was down at the time of the event.
     */
-    bool MetaDown();
+    bool MetaDown() const;
 
     /**
         Returns @true if the area was selected, @false otherwise.
@@ -773,7 +773,7 @@ public:
     /**
         Returns @true if the Shift key was down at the time of the event.
     */
-    bool ShiftDown();
+    bool ShiftDown() const;
 };
 
 
@@ -891,12 +891,12 @@ public:
     /**
         Returns @true if the Alt key was down at the time of the event.
     */
-    bool AltDown();
+    bool AltDown() const;
 
     /**
         Returns @true if the Control key was down at the time of the event.
     */
-    bool ControlDown();
+    bool ControlDown() const;
 
     /**
         Position in pixels at which the event occurred.
@@ -911,12 +911,12 @@ public:
     /**
         Returns @true if the Meta key was down at the time of the event.
     */
-    bool MetaDown();
+    bool MetaDown() const;
 
     /**
         Returns @true if the Shift key was down at the time of the event.
     */
-    bool ShiftDown();
+    bool ShiftDown() const;
 };
 
 
@@ -1146,12 +1146,12 @@ public:
     /**
         Returns @true if the Alt key was down at the time of the event.
     */
-    bool AltDown();
+    bool AltDown() const;
 
     /**
         Returns @true if the Control key was down at the time of the event.
     */
-    bool ControlDown();
+    bool ControlDown() const;
 
     /**
         Column at which the event occurred.
@@ -1171,7 +1171,7 @@ public:
     /**
         Returns @true if the Meta key was down at the time of the event.
     */
-    bool MetaDown();
+    bool MetaDown() const;
 
     /**
         Returns @true if the user is selecting grid cells, @false -- if
@@ -1182,7 +1182,7 @@ public:
     /**
         Returns @true if the Shift key was down at the time of the event.
     */
-    bool ShiftDown();
+    bool ShiftDown() const;
 };
 
 
diff --git a/interface/wx/html/htmlpars.h b/interface/wx/html/htmlpars.h
index fb5ca68e2f..ae1a20d7e0 100644
--- a/interface/wx/html/htmlpars.h
+++ b/interface/wx/html/htmlpars.h
@@ -106,7 +106,7 @@ public:
         First it finds a handler capable of handling this tag and then it calls
         handler's HandleTag method.
     */
-    void AddTag(const wxHtmlTag& tag);
+    virtual void AddTag(const wxHtmlTag& tag);
 
     /**
         Adds handler to the internal list ( hash table) of handlers. This
diff --git a/interface/wx/htmllbox.h b/interface/wx/htmllbox.h
index 7096573fc0..4d17a4caf0 100644
--- a/interface/wx/htmllbox.h
+++ b/interface/wx/htmllbox.h
@@ -79,7 +79,7 @@ public:
 
         @see GetSelectedTextColour()
     */
-    wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
+    virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 
     /**
         This virtual function may be overridden to customize the appearance of the
@@ -91,7 +91,7 @@ public:
         @see GetSelectedTextBgColour(),
              wxVListBox::SetSelectionBackground, wxSystemSettings::GetColour
     */
-    wxColour GetSelectedTextColour(const wxColour& colFg) const;
+    virtual wxColour GetSelectedTextColour(const wxColour& colFg) const;
 
     /**
         This method must be implemented in the derived class and should return
@@ -111,7 +111,7 @@ public:
         This function may be overridden to decorate HTML returned by
         OnGetItem().
     */
-    wxString OnGetItemMarkup(size_t n) const;
+    virtual wxString OnGetItemMarkup(size_t n) const;
 
     /**
         Called when the user clicks on hypertext link. Does nothing by default.
diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index c81d0d4188..b51860c24e 100644
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -213,7 +213,7 @@ public:
     /**
         Returns @true if icon data is present.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Loads an icon from a file or resource.
diff --git a/interface/wx/listbook.h b/interface/wx/listbook.h
index 6c641230e7..50906f2a42 100644
--- a/interface/wx/listbook.h
+++ b/interface/wx/listbook.h
@@ -34,7 +34,7 @@
            Place labels below the page area.
     @endStyleTable
 
-    @beginEventTable{wxListbookEvent}
+    @beginEventTable{wxBookCtrlEvent}
     @event{EVT_LISTBOOK_PAGE_CHANGED(id, func)}
         The page selection was changed.
         Processes a @c wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED event.
diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h
index 29231640c7..ff39121e6d 100644
--- a/interface/wx/mdi.h
+++ b/interface/wx/mdi.h
@@ -276,7 +276,7 @@ public:
         width and height.
         @endWxPythonOnly
     */
-    virtual void GetClientSize(int* width, int* height) const;
+    void GetClientSize(int* width, int* height) const;
 
     /**
         Returns a pointer to the client window.
diff --git a/interface/wx/object.h b/interface/wx/object.h
index 6a7ff2de52..e3f7e93a0d 100644
--- a/interface/wx/object.h
+++ b/interface/wx/object.h
@@ -125,7 +125,7 @@ protected:
         It's declared @c protected so that wxObjectRefData instances
         will never be destroyed directly but only as result of a DecRef() call.
     */
-    ~wxObjectRefData();
+    virtual ~wxObjectRefData();
 
 public:
     /**
diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h
index a52627f528..778ea4e202 100644
--- a/interface/wx/odcombo.h
+++ b/interface/wx/odcombo.h
@@ -219,7 +219,7 @@ public:
         The default implementation returns text height, as if this control was
         a normal combobox.
     */
-    wxCoord OnMeasureItem(size_t item) const;
+    virtual wxCoord OnMeasureItem(size_t item) const;
 
     /**
         The derived class may implement this method to return the width of the
@@ -228,6 +228,6 @@ public:
 
         The default implementation returns -1.
     */
-    wxCoord OnMeasureItemWidth(size_t item) const;
+    virtual wxCoord OnMeasureItemWidth(size_t item) const;
 };
 
diff --git a/interface/wx/palette.h b/interface/wx/palette.h
index fd7406c8d6..1884f01f16 100644
--- a/interface/wx/palette.h
+++ b/interface/wx/palette.h
@@ -139,7 +139,7 @@ public:
     /**
         Returns @true if palette data is present.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Assignment operator, using @ref overview_refcount.
diff --git a/interface/wx/pen.h b/interface/wx/pen.h
index 86374646c6..8dd77c3093 100644
--- a/interface/wx/pen.h
+++ b/interface/wx/pen.h
@@ -265,7 +265,7 @@ public:
     /**
         Returns @true if the pen is initialised.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Sets the pen cap style, which may be one of @c wxCAP_ROUND, @c wxCAP_PROJECTING
diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index 37fb44f586..37df727d2f 100644
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -149,7 +149,7 @@ public:
 
         @note On PocketPC, no buttons are created.
     */
-    void CreateButtons(int flags = wxOK|wxCANCEL);
+    virtual void CreateButtons(int flags = wxOK|wxCANCEL);
 
     /**
         Returns the book control that will contain your settings pages.
diff --git a/interface/wx/quantize.h b/interface/wx/quantize.h
index d412add94a..a9cfec9df6 100644
--- a/interface/wx/quantize.h
+++ b/interface/wx/quantize.h
@@ -44,22 +44,22 @@ public:
         Specify an optional palette pointer to receive the resulting palette.
         This palette may be passed to ConvertImageToBitmap, for example.
     */
-    bool Quantize(const wxImage& src, wxImage& dest,
-                  wxPalette** pPalette, int desiredNoColours = 236,
-                  unsigned char** eightBitData = 0,
-                  int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS
-                             |wxQUANTIZE_FILL_DESTINATION_IMAGE
-                             |wxQUANTIZE_RETURN_8BIT_DATA);
+    static bool Quantize(const wxImage& src, wxImage& dest,
+                         wxPalette** pPalette, int desiredNoColours = 236,
+                         unsigned char** eightBitData = 0,
+                         int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|
+                                     wxQUANTIZE_FILL_DESTINATION_IMAGE|
+                                     wxQUANTIZE_RETURN_8BIT_DATA);
 
     /**
         This version sets a palette in the destination image so you don't
         have to manage it yourself.
     */
-    bool Quantize(const wxImage& src, wxImage& dest,
-                  int desiredNoColours = 236,
-                  unsigned char** eightBitData = 0,
-                  int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS
-                             |wxQUANTIZE_FILL_DESTINATION_IMAGE
-                             |wxQUANTIZE_RETURN_8BIT_DATA);
+    static bool Quantize(const wxImage& src, wxImage& dest,
+                         int desiredNoColours = 236,
+                         unsigned char** eightBitData = 0,
+                         int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|
+                                     wxQUANTIZE_FILL_DESTINATION_IMAGE|
+                                     wxQUANTIZE_RETURN_8BIT_DATA);
 };
 
diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h
index 0b63bdfd7d..5eeda8adc7 100644
--- a/interface/wx/richtext/richtextbuffer.h
+++ b/interface/wx/richtext/richtextbuffer.h
@@ -358,7 +358,7 @@ public:
     /**
         Clears the buffer.
     */
-    void Clear();
+    virtual void Clear();
 
     //@{
     /**
@@ -534,7 +534,7 @@ public:
     /**
         Finds a handler by name.
     */
-    wxRichTextFileHandler* FindHandler(const wxString& name);
+    static wxRichTextFileHandler* FindHandler(const wxString& name);
 
     /**
         Finds a handler by filename or, if supplied, type.
@@ -598,7 +598,7 @@ public:
         style attributes. To get the character or paragraph style alone,
         use GetUncombinedStyle().
     */
-    bool GetStyle(long position, wxTextAttr& style);
+    virtual bool GetStyle(long position, wxTextAttr& style);
 
     /**
         This function gets a style representing the common, combined attributes in the
@@ -646,7 +646,7 @@ public:
         will fetch the paragraph attributes.
         Otherwise, it will return the character attributes.
     */
-    bool GetUncombinedStyle(long position, wxTextAttr& style);
+    virtual bool GetUncombinedStyle(long position, wxTextAttr& style);
 
     /**
         Finds the text position for the given position, putting the position in
@@ -655,7 +655,7 @@ public:
 
         @return One of the ::wxRichTextHitTestFlags values.
     */
-    int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition);
+    virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition);
 
     /**
         Initialisation.
@@ -810,7 +810,7 @@ public:
         only affects the style currently being applied (for example, setting the default
         style to bold will cause subsequently inserted text to be bold).
     */
-    void SetBasicStyle(const wxTextAttr& style);
+    virtual void SetBasicStyle(const wxTextAttr& style);
 
     /**
         Sets the default style, affecting the style currently being applied
@@ -888,9 +888,8 @@ public:
         - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style.
           Only the style flags are used in this operation.
     */
-    bool SetStyle(const wxRichTextRange& range,
-                  const wxTextAttr& style,
-                  int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
+    virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style,
+                          int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
 
     /**
         Sets the current style sheet, if any.
diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
index 45d35b9e47..a3b6aa953d 100644
--- a/interface/wx/richtext/richtextctrl.h
+++ b/interface/wx/richtext/richtextctrl.h
@@ -516,7 +516,7 @@ public:
     /**
         Currently this simply returns @c wxSize(10, 10).
     */
-    wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const;
 
     /**
         Ends alignment.
@@ -1427,7 +1427,7 @@ public:
     /**
         Replaces existing content with the given text.
     */
-    void SetValue(const wxString& value);
+    virtual void SetValue(const wxString& value);
 
     /**
         A helper function setting up scrollbars, for example after a resize.
@@ -1472,7 +1472,7 @@ public:
     /**
         Writes an image block at the current insertion point.
     */
-    bool WriteImage(const wxRichTextImageBlock& imageBlock);
+    virtual bool WriteImage(const wxRichTextImageBlock& imageBlock);
 
     //@{
     /**
diff --git a/interface/wx/richtext/richtextformatdlg.h b/interface/wx/richtext/richtextformatdlg.h
index fb430cc3ec..3fc735b578 100644
--- a/interface/wx/richtext/richtextformatdlg.h
+++ b/interface/wx/richtext/richtextformatdlg.h
@@ -156,9 +156,8 @@ public:
         Apply attributes to the given range, only changing attributes that
         need to be changed.
     */
-    bool ApplyStyle(wxRichTextCtrl* ctrl,
-                    const wxRichTextRange& range,
-                    int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE);
+    virtual bool ApplyStyle(wxRichTextCtrl* ctrl, const wxRichTextRange& range,
+                            int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE);
 
     /**
         Creation: see wxRichTextFormattingDialog() "the constructor" for
diff --git a/interface/wx/richtext/richtexthtml.h b/interface/wx/richtext/richtexthtml.h
index 89760f1c23..a4baf9d6d2 100644
--- a/interface/wx/richtext/richtexthtml.h
+++ b/interface/wx/richtext/richtexthtml.h
@@ -85,7 +85,7 @@ public:
     /**
         Saves the buffer content to the HTML stream.
     */
-    bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
+    virtual bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
 
     /**
         Returns the mapping for converting point sizes to HTML font sizes.
diff --git a/interface/wx/richtext/richtextstyles.h b/interface/wx/richtext/richtextstyles.h
index 3cc9fc99d6..23cba9b4a7 100644
--- a/interface/wx/richtext/richtextstyles.h
+++ b/interface/wx/richtext/richtextstyles.h
@@ -292,7 +292,7 @@ public:
     /**
         Returns the HTML for this item.
     */
-    wxString OnGetItem(size_t n) const;
+    virtual wxString OnGetItem(size_t n) const;
 
     /**
         Implements left click behaviour, applying the clicked style to the
diff --git a/interface/wx/richtext/richtextxml.h b/interface/wx/richtext/richtextxml.h
index 9c11dbe355..309a5e0142 100644
--- a/interface/wx/richtext/richtextxml.h
+++ b/interface/wx/richtext/richtextxml.h
@@ -37,7 +37,7 @@ public:
     */
     wxRichTextXMLHandler(const wxString& name = wxT("XML"),
                          const wxString& ext = wxT("xml"),
-                         int type = wxRICHTEXT_TYPE_XML) const;
+                         int type = wxRICHTEXT_TYPE_XML);
 
     /**
         Returns @true.
@@ -57,12 +57,12 @@ public:
     /**
         Loads buffer context from the given stream.
     */
-    bool DoLoadFile(wxRichTextBuffer* buffer, wxInputStream& stream);
+    virtual bool DoLoadFile(wxRichTextBuffer* buffer, wxInputStream& stream);
 
     /**
         Saves buffer context to the given stream.
     */
-    bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
+    virtual bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
 
     /**
         Recursively exports an object to the stream.
diff --git a/interface/wx/spinctrl.h b/interface/wx/spinctrl.h
index a2eb52078f..3095b42a2a 100644
--- a/interface/wx/spinctrl.h
+++ b/interface/wx/spinctrl.h
@@ -127,7 +127,7 @@ public:
         @note this is currently only implemented for Windows and generic versions
               of the control.
     */
-    void SetSelection(long from, long to);
+    virtual void SetSelection(long from, long to);
 
     /**
         Sets the value of the spin control. Use the variant using int instead.
diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index 5d02acabb6..2d2b1466de 100644
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -884,20 +884,23 @@ public:
     size_t OnSysRead(void* buffer, size_t bufsize);
 
     /**
-        Internal function.
-        It is called when the stream needs to change the current position.
+        See OnSysRead().
     */
-    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    size_t OnSysWrite(const void* buffer, size_t bufsize);
+
+
+protected:
 
     /**
         Internal function.
-        It is called when the stream needs to know the real position.
+        It is called when the stream needs to change the current position.
     */
-    wxFileOffset OnSysTell() const;
+    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
 
     /**
-        See OnSysRead().
+        Internal function.
+        It is called when the stream needs to know the real position.
     */
-    size_t OnSysWrite(const void* buffer, size_t bufsize);
+    virtual wxFileOffset OnSysTell() const;
 };
 
diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h
index d3815cada7..be226d3b26 100644
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -1069,7 +1069,7 @@ public:
 
         @see WriteText()
     */
-    void AppendText(const wxString& text);
+    virtual void AppendText(const wxString& text);
 
     /**
         Call this function to enable auto-completion of the text typed in a
@@ -1087,7 +1087,7 @@ public:
 
         @see AutoCompleteFileNames()
     */
-    bool AutoComplete(const wxArrayString& choices);
+    virtual bool AutoComplete(const wxArrayString& choices);
 
     /**
         Call this function to enable auto-completion of the text typed in a
@@ -1105,17 +1105,17 @@ public:
 
         @see AutoComplete()
     */
-    bool AutoCompleteFileNames();
+    virtual bool AutoCompleteFileNames();
 
     /**
         Returns @true if the selection can be copied to the clipboard.
     */
-    virtual bool CanCopy();
+    virtual bool CanCopy() const;
 
     /**
         Returns @true if the selection can be cut to the clipboard.
     */
-    virtual bool CanCut();
+    virtual bool CanCut() const;
 
     /**
         Returns @true if the contents of the clipboard can be pasted into the
@@ -1124,19 +1124,19 @@ public:
         On some platforms (Motif, GTK) this is an approximation and returns
         @true if the control is editable, @false otherwise.
     */
-    virtual bool CanPaste();
+    virtual bool CanPaste() const;
 
     /**
         Returns @true if there is a redo facility available and the last
         operation can be redone.
     */
-    virtual bool CanRedo();
+    virtual bool CanRedo() const;
 
     /**
         Returns @true if there is an undo facility available and the last
         operation can be undone.
     */
-    virtual bool CanUndo();
+    virtual bool CanUndo() const;
 
     /**
         Sets the new text control value.
@@ -1326,7 +1326,7 @@ public:
 
         If there is no selection, the returned string is empty.
     */
-    virtual wxString GetStringSelection();
+    virtual wxString GetStringSelection() const;
 
     /**
         Returns the style at this position in the text control.
diff --git a/interface/wx/textfile.h b/interface/wx/textfile.h
index 32f330cbec..f156227a47 100644
--- a/interface/wx/textfile.h
+++ b/interface/wx/textfile.h
@@ -90,13 +90,13 @@ public:
     /**
         Delete all lines from the file, set current line number to 0.
     */
-    void Clear() const;
+    void Clear();
 
     /**
         Closes the file and frees memory, @b "losing all changes".
         Use Write() if you want to save them.
     */
-    bool Close() const;
+    bool Close();
 
     //@{
     /**
@@ -213,7 +213,7 @@ public:
         Changes the value returned by GetCurrentLine() and used by GetFirstLine()
         and GetNextLine().
     */
-    void GoToLine(size_t n) const;
+    void GoToLine(size_t n);
 
     /**
         Guess the type of file (which is supposed to be opened).
@@ -252,7 +252,7 @@ public:
     /**
         Delete line number @a n from the file.
     */
-    void RemoveLine(size_t n) const;
+    void RemoveLine(size_t n);
 
     /**
         Change the file on disk.
diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 69aa5a6bf1..197bf2df3e 100644
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -84,7 +84,7 @@ public:
         (including GTK+) where the window manager may not support this operation
         and there is no way to find out.
     */
-    bool EnableCloseButton(bool enable = true);
+    virtual bool EnableCloseButton(bool enable = true);
 
     /**
         Returns a pointer to the button which is the default for this window, or
@@ -115,7 +115,7 @@ public:
 
         @see SetTitle()
     */
-    wxString GetTitle() const;
+    virtual wxString GetTitle() const;
 
     /**
         Unique to the wxWinCE port. Responds to showing/hiding SIP (soft input
@@ -153,17 +153,17 @@ public:
 
         @see ShowFullScreen()
     */
-    bool IsFullScreen();
+    virtual bool IsFullScreen() const;
 
     /**
         Returns @true if the window is iconized.
     */
-    bool IsIconized() const;
+    virtual bool IsIconized() const;
 
     /**
         Returns @true if the window is maximized.
     */
-    bool IsMaximized() const;
+    virtual bool IsMaximized() const;
 
     /**
         This method is specific to wxUniversal port.
@@ -394,7 +394,7 @@ public:
 
         @see IsFullScreen()
     */
-    bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     /**
         This method is specific to wxUniversal port.
diff --git a/interface/wx/vlbox.h b/interface/wx/vlbox.h
index caf04f3a74..377857c9af 100644
--- a/interface/wx/vlbox.h
+++ b/interface/wx/vlbox.h
@@ -201,7 +201,7 @@ public:
 
         @todo Change this function signature to non-const.
     */
-    void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
+    virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
 
     /**
         The derived class must implement this function to actually draw the
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 252c4e2be9..9dd975e787 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -1867,7 +1867,7 @@ public:
         @param y
             Stores the screen x coordinate and receives the client x coordinate.
     */
-    virtual void ScreenToClient(int* x, int* y) const;
+    void ScreenToClient(int* x, int* y) const;
 
     /**
         Converts from screen to client window coordinates.
@@ -1875,7 +1875,7 @@ public:
         @param pt
             The screen position.
     */
-    virtual wxPoint ScreenToClient(const wxPoint& pt) const;
+    wxPoint ScreenToClient(const wxPoint& pt) const;
 
     /**
         Scrolls the window by the given number of lines down (if @a lines is