From 11e3af6e7eed3c4717608ba2095a688b1fea60e0 Mon Sep 17 00:00:00 2001
From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Thu, 13 Nov 2008 21:32:53 +0000
Subject: [PATCH] further ifacecheck fixes (now only 3.3% of documented methods
 have a wrong signature\!)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 interface/wx/cmndata.h                 |  2 +-
 interface/wx/config.h                  | 30 +++++++++++------------
 interface/wx/dcprint.h                 |  2 +-
 interface/wx/dcsvg.h                   | 30 ++++++++---------------
 interface/wx/dialog.h                  |  4 +--
 interface/wx/font.h                    |  8 +++---
 interface/wx/grid.h                    |  4 +--
 interface/wx/htmllbox.h                | 34 +++++++++++++-------------
 interface/wx/print.h                   |  4 +--
 interface/wx/printdlg.h                |  2 +-
 interface/wx/progdlg.h                 |  2 +-
 interface/wx/propdlg.h                 |  2 +-
 interface/wx/radiobox.h                | 14 +++++------
 interface/wx/radiobut.h                |  2 +-
 interface/wx/regex.h                   |  4 +--
 interface/wx/region.h                  | 10 ++++----
 interface/wx/richtext/richtextbuffer.h | 21 ++++++++--------
 interface/wx/richtext/richtextctrl.h   |  2 +-
 interface/wx/scrolbar.h                |  2 +-
 interface/wx/sizer.h                   | 14 +++++------
 interface/wx/slider.h                  |  2 +-
 interface/wx/spinbutt.h                |  7 +++---
 interface/wx/spinctrl.h                |  4 +--
 interface/wx/splitter.h                |  2 +-
 interface/wx/srchctrl.h                |  2 +-
 interface/wx/stackwalk.h               |  2 +-
 interface/wx/statbmp.h                 |  2 +-
 interface/wx/statbox.h                 |  2 +-
 interface/wx/statline.h                |  2 +-
 interface/wx/stattext.h                |  2 +-
 interface/wx/statusbr.h                |  2 +-
 interface/wx/stream.h                  |  6 ++---
 interface/wx/textctrl.h                |  4 +--
 interface/wx/variant.h                 | 18 +++++++-------
 34 files changed, 120 insertions(+), 130 deletions(-)

diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h
index 1f68d41cab..bdc7f4c421 100644
--- a/interface/wx/cmndata.h
+++ b/interface/wx/cmndata.h
@@ -661,7 +661,7 @@ public:
     /**
         Assigns print data to this object.
     */
-    void operator =(const wxPrintData& data);
+    wxPrintData& operator =(const wxPrintData& data);
 };
 
 
diff --git a/interface/wx/config.h b/interface/wx/config.h
index 7c71b949bf..b2504846e5 100644
--- a/interface/wx/config.h
+++ b/interface/wx/config.h
@@ -504,64 +504,64 @@ public:
 
         @return @true if value was really read, @false if the default was used.
     */
-    const bool Read(const wxString& key, wxString* str,
-                      const wxString& defaultVal) const;
+    bool Read(const wxString& key, wxString* str,
+              const wxString& defaultVal) const;
     /**
         Another version of Read(), returning the string value directly.
     */
     const wxString Read(const wxString& key,
-                         const wxString& defaultVal) const;
+                        const wxString& defaultVal) const;
     /**
         Reads a long value, returning @true if the value was found. If the
         value was not found, @a l is not changed.
     */
-    const bool Read(const wxString& key, long* l) const;
+    bool Read(const wxString& key, long* l) const;
     /**
         Reads a long value, returning @true if the value was found. If the
         value was not found, @a defaultVal is used instead.
     */
-    const bool Read(const wxString& key, long* l,
-                    long defaultVal) const;
+    bool Read(const wxString& key, long* l,
+              long defaultVal) const;
     /**
         Reads a double value, returning @true if the value was found. If the
         value was not found, @a d is not changed.
     */
-    const bool Read(const wxString& key, double* d) const;
+    bool Read(const wxString& key, double* d) const;
     /**
         Reads a double value, returning @true if the value was found. If the
         value was not found, @a defaultVal is used instead.
     */
-    const bool Read(const wxString& key, double* d,
+    bool Read(const wxString& key, double* d,
                      double defaultVal) const;
     /**
         Reads a bool value, returning @true if the value was found. If the
         value was not found, @a b is not changed.
     */
-    const bool Read(const wxString& key, bool* b) const;
+    bool Read(const wxString& key, bool* b) const;
     /**
         Reads a bool value, returning @true if the value was found. If the
         value was not found, @a defaultVal is used instead.
     */
-    const bool Read(const wxString& key, bool* d,
-                     bool defaultVal) const;
+    bool Read(const wxString& key, bool* d,
+              bool defaultVal) const;
     /**
         Reads a binary block, returning @true if the value was found. If the
         value was not found, @a buf is not changed.
     */
-    const bool Read(const wxString& key, wxMemoryBuffer* buf) const;
+    bool Read(const wxString& key, wxMemoryBuffer* buf) const;
     /**
         Reads a value of type T, for which function wxFromString() is defined,
         returning @true if the value was found. If the value was not found,
         @a value is not changed.
     */
-    const bool Read(const wxString& key, T* value) const;
+    bool Read(const wxString& key, T* value) const;
     /**
         Reads a value of type T, for which function wxFromString() is defined,
         returning @true if the value was found. If the value was not found,
         @a defaultVal is used instead.
     */
-    const bool Read(const wxString& key, T* value,
-                     const T& defaultVal) const;
+    bool Read(const wxString& key, T* value,
+              const T& defaultVal) const;
 
     /**
         Reads a bool value from the key and returns it. @a defaultVal is
diff --git a/interface/wx/dcprint.h b/interface/wx/dcprint.h
index ef233d1149..0a9d7f7ab8 100644
--- a/interface/wx/dcprint.h
+++ b/interface/wx/dcprint.h
@@ -42,7 +42,7 @@ public:
                     backward compatibility.
     */
     wxPrinterDC(const wxString& driver, const wxString& device,
-                const wxString& output, const bool interactive = true,
+                const wxString& output, bool interactive = true,
                 int orientation = wxPORTRAIT);
 
     /**
diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h
index 065e2f87e9..d2d19b5709 100644
--- a/interface/wx/dcsvg.h
+++ b/interface/wx/dcsvg.h
@@ -36,21 +36,11 @@
 class wxSVGFileDC : public wxDC
 {
 public:
-    /**
-        Initializes a wxSVGFileDC with the given @a f filename with a default
-        size (340x240) at 72.0 dots per inch (a frequent screen resolution).
-    */
-    wxSVGFileDC(wxString f);
-    /**
-        Initializes a wxSVGFileDC with the given @a f filename with the given
-        @a Width and @a Height at 72.0 dots per inch.
-    */
-    wxSVGFileDC(wxString f, int Width, int Height);
     /**
         Initializes a wxSVGFileDC with the given @a f filename with the given
         @a Width and @a Height at @a dpi resolution.
     */
-    wxSVGFileDC(wxString f, int Width, int Height, float dpi);
+    wxSVGFileDC(const wxString& filename, int width = 320, int height = 240, double dpi = 72);
 
     /**
         Destructor.
@@ -66,9 +56,9 @@ public:
         @see wxDC::Blit()
     */
     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-              wxSVGFileDC* source, wxCoord xsrc, wxCoord ysrc,
-              int logicalFunc = wxCOPY, bool useMask = FALSE,
-              wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+              wxDC* source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY,
+              bool useMask = false, wxCoord xsrcMask = wxDefaultCoord,
+              wxCoord ysrcMask = wxDefaultCoord);
 
     /**
         Adds the specified point to the bounding box which can be retrieved
@@ -131,7 +121,7 @@ public:
 
     /**
         Draw a bitmap on the device context at the specified point. If
-        @a transparent is @true and the bitmap has a transparency mask, the
+        @a useMask is @true and the bitmap has a transparency mask, the
         bitmap will be drawn transparently.
 
         When drawing a mono-bitmap, the current text foreground colour will be
@@ -142,7 +132,7 @@ public:
         @see wxDC::SetTextForeground(), wxDC::SetTextBackground(), wxMemoryDC
     */
     void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y,
-                    bool transparent);
+                    bool useMask = false);
 
     //@{
     /**
@@ -283,7 +273,7 @@ public:
         The spline is drawn using a series of lines, using an algorithm taken from
         the X drawing program "XFIG".
     */
-    void DrawSpline(wxList* points);
+    void DrawSpline(const wxPointList* points);
 
     /**
         Draws a three-point spline using the current pen.
@@ -319,7 +309,7 @@ public:
     /**
         Not implemented.
     */
-    void FloodFill(wxCoord x, wxCoord y, const wxColour& colour,
+    bool FloodFill(wxCoord x, wxCoord y, const wxColour& colour,
                    int style = wxFLOOD_SURFACE);
 
     //@{
@@ -362,7 +352,7 @@ public:
     /**
         Not implemented.
     */
-    void GetClippingBox(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height);
 
     //@{
     /**
@@ -444,7 +434,7 @@ public:
     void GetTextExtent(const wxString& string, wxCoord* w, wxCoord* h,
                        wxCoord* descent = NULL,
                        wxCoord* externalLeading = NULL,
-                       wxFont* font = NULL);
+                       const wxFont* font = NULL) const;
 
     //@{
     /**
diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h
index 0ffb51d883..0480e667f8 100644
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -190,7 +190,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
-    bool CanDoLayoutAdapation();
+    bool CanDoLayoutAdaptation();
 
     /**
         Centres the dialog box on the display.
@@ -251,7 +251,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
-    bool DoLayoutAdapation();
+    bool DoLayoutAdaptation();
 
     /**
         This function is called when the titlebar OK button is pressed
diff --git a/interface/wx/font.h b/interface/wx/font.h
index a008843ba7..496aac3c79 100644
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -312,7 +312,7 @@ public:
     */
     wxFont(int pointSize, wxFontFamily family, int style,
            wxFontWeight weight,
-           const bool underline = false,
+           bool underline = false,
            const wxString& faceName = "",
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -361,7 +361,7 @@ public:
     */
     wxFont(const wxSize& pixelSize, wxFontFamily family,
            int style, wxFontWeight weight,
-           const bool underline = false,
+           bool underline = false,
            const wxString& faceName = "",
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     //@}
@@ -475,7 +475,7 @@ public:
     */
     static wxFont* New(int pointSize, wxFontFamily family, int style,
                        wxFontWeight weight,
-                       const bool underline = false,
+                       bool underline = false,
                        const wxString& faceName = "",
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(int pointSize, wxFontFamily family,
@@ -486,7 +486,7 @@ public:
                        wxFontFamily family,
                        int style,
                        wxFontWeight weight,
-                       const bool underline = false,
+                       bool underline = false,
                        const wxString& faceName = "",
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     static wxFont* New(const wxSize& pixelSize,
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 3777a22a1e..4a01123316 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -2306,8 +2306,8 @@ public:
         @true even if the cell is only partially visible.
     */
     bool IsVisible(int row, int col, bool wholeCellVisible = true) const;
-    const bool IsVisible(const wxGridCellCoords& coords,
-                         bool wholeCellVisible = true) const;
+    bool IsVisible(const wxGridCellCoords& coords,
+                   bool wholeCellVisible = true) const;
     //@}
 
     //@{
diff --git a/interface/wx/htmllbox.h b/interface/wx/htmllbox.h
index c7cb35e86d..9f728ac07e 100644
--- a/interface/wx/htmllbox.h
+++ b/interface/wx/htmllbox.h
@@ -233,14 +233,14 @@ public:
         @param name
             Window name.
     */
-    wxHtmlListBox(wxWindow* parent, wxWindowID id,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  int n = 0,
-                  const wxString choices[] = NULL,
-                  long style = wxHLB_DEFAULT_STYLE,
-                  const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = "simpleHtmlListBox");
+    wxSimpleHtmlListBox(wxWindow* parent, wxWindowID id,
+                        const wxPoint& pos = wxDefaultPosition,
+                        const wxSize& size = wxDefaultSize,
+                        int n = 0,
+                        const wxString choices[] = NULL,
+                        long style = wxHLB_DEFAULT_STYLE,
+                        const wxValidator& validator = wxDefaultValidator,
+                        const wxString& name = wxSimpleHtmlListBoxNameStr);
 
     /**
         Constructor, creating and showing the HTML list box.
@@ -262,13 +262,13 @@ public:
         @param name
             Window name.
     */
-    wxHtmlListBox(wxWindow* parent, wxWindowID id,
-                  const wxPoint& pos,
-                  const wxSize& size,
-                  const wxArrayString& choices,
-                  long style = wxHLB_DEFAULT_STYLE,
-                  const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = "simpleHtmlListBox");
+    wxSimpleHtmlListBox(wxWindow* parent, wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        long style = wxHLB_DEFAULT_STYLE,
+                        const wxValidator& validator = wxDefaultValidator,
+                        const wxString& name = wxSimpleHtmlListBoxNameStr);
 
     /**
         Default constructor, you must call Create() later.
@@ -292,14 +292,14 @@ public:
                 const wxString choices[] = NULL,
                 long style = wxHLB_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "simpleHtmlListBox");
+                const wxString& name = wxSimpleHtmlListBoxNameStr);
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = wxHLB_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "simpleHtmlListBox");
+                const wxString& name = wxSimpleHtmlListBoxNameStr);
     //@}
 };
 
diff --git a/interface/wx/print.h b/interface/wx/print.h
index c8c6e68ed2..53ce4e2f3e 100644
--- a/interface/wx/print.h
+++ b/interface/wx/print.h
@@ -231,8 +231,8 @@ public:
         Use IsOk() to check whether the wxPrintPreview object was created correctly.
     */
     wxPrintPreview(wxPrintout* printout,
-                   wxPrintout* printoutForPrinting,
-                   wxPrintData* data = NULL);
+                   wxPrintout* printoutForPrinting = NULL,
+                   wxPrintDialogData* data = NULL);
 
     /**
         Destructor.
diff --git a/interface/wx/printdlg.h b/interface/wx/printdlg.h
index a02e924c55..bdd743179d 100644
--- a/interface/wx/printdlg.h
+++ b/interface/wx/printdlg.h
@@ -121,6 +121,6 @@ public:
         Shows the dialog, returning @c wxID_OK if the user pressed OK, and
         @c wxID_CANCEL otherwise.
     */
-    int ShowModal();
+    virtual int ShowModal();
 };
 
diff --git a/interface/wx/progdlg.h b/interface/wx/progdlg.h
index 1c56dd98ad..7f229492c6 100644
--- a/interface/wx/progdlg.h
+++ b/interface/wx/progdlg.h
@@ -105,7 +105,7 @@ public:
             If "Skip" button was pressed since last Update() call,
             this is set to @true.
     */
-    virtual bool Update(int value, const wxString& newmsg = "",
+    virtual bool Update(int value, const wxString& newmsg = wxEmptyString,
                         bool* skip = NULL);
 };
 
diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index e072904cb2..07af2d11ea 100644
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -116,7 +116,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxDEFAULT_DIALOG_STYLE,
-                          const wxString& name = "dialogBox");
+                          const wxString& name = wxDialogNameStr);
 
     /**
         Override this if you wish to add the book control in a way different from the
diff --git a/interface/wx/radiobox.h b/interface/wx/radiobox.h
index bb5cb609d4..bf5f170776 100644
--- a/interface/wx/radiobox.h
+++ b/interface/wx/radiobox.h
@@ -85,10 +85,10 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0,
                const wxString choices[] = NULL,
-               int majorDimension = 0,
+               int majorDimension = 1,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = "radioBox");
+               const wxString& name = wxRadioBoxNameStr);
 
     /**
         Constructor, creating and showing a radiobox.
@@ -125,10 +125,10 @@ public:
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,
-               int majorDimension = 0,
+               int majorDimension = 1,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = "radioBox");
+               const wxString& name = wxRadioBoxNameStr);
 
     /**
         Destructor, destroying the radiobox item.
@@ -148,7 +148,7 @@ public:
                 int majorDimension = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "radioBox");
+                const wxString& name = wxRadioBoxNameStr);
 
     /**
         Creates the radiobox for two-step construction. See wxRadioBox()
@@ -162,7 +162,7 @@ public:
                 int majorDimension = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "radioBox");
+                const wxString& name = wxRadioBoxNameStr);
 
     /**
         Enables or disables an individual button in the radiobox.
@@ -314,5 +314,5 @@ public:
         @endWxPythonOnly
 
     */
-    virtual bool Show(unsigned int item, const bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);
 };
diff --git a/interface/wx/radiobut.h b/interface/wx/radiobut.h
index ef4dd21c76..439fc32bfd 100644
--- a/interface/wx/radiobut.h
+++ b/interface/wx/radiobut.h
@@ -83,7 +83,7 @@ public:
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = "radioButton");
+                  const wxString& name = wxRadioButtonNameStr);
 
     /**
         Destructor, destroying the radio button item.
diff --git a/interface/wx/regex.h b/interface/wx/regex.h
index 6685bd878c..147ea7622e 100644
--- a/interface/wx/regex.h
+++ b/interface/wx/regex.h
@@ -198,7 +198,7 @@ public:
         May only be called after successful call to Compile().
     */
     bool Matches(const wxChar* text, int flags = 0) const;
-    const bool Matches(const wxChar* text, int flags, size_t len) const;
+    bool Matches(const wxChar* text, int flags, size_t len) const;
     //@}
 
     /**
@@ -210,7 +210,7 @@ public:
 
         May only be called after successful call to Compile().
     */
-    const bool Matches(const wxString& text, int flags = 0) const;
+    bool Matches(const wxString& text, int flags = 0) const;
 
     /**
         Replaces the current regular expression in the string pointed to by
diff --git a/interface/wx/region.h b/interface/wx/region.h
index 5d190a430d..7710f308c3 100644
--- a/interface/wx/region.h
+++ b/interface/wx/region.h
@@ -120,7 +120,7 @@ public:
         A wxPython alias for this operator is called Next.
         @endWxPythonOnly
     */
-    void operator ++();
+    wxRegionIterator& operator ++();
 
     /**
         Returns @true if there are still some rectangles; otherwise returns @false.
@@ -181,7 +181,7 @@ public:
         in the provided array.
         @a fillStyle parameter may have values @c wxWINDING_RULE or @c wxODDEVEN_RULE.
     */
-    wxRegion(size_t n, const wxPoint* points, int fillStyle = wxWINDING_RULE);
+    wxRegion(size_t n, const wxPoint* points, int fillStyle = wxODDEVEN_RULE);
     /**
         Constructs a region using a bitmap. See Union() for more details.
     */
@@ -210,7 +210,7 @@ public:
 
         @return The return value is one of @c wxOutRegion and @c wxInRegion.
     */
-    wxRegionContain Contains(long& x, long& y) const;
+    wxRegionContain Contains(wxCoord x, wxCoord y) const;
     /**
         Returns a value indicating whether the given point is contained within the region.
 
@@ -227,7 +227,7 @@ public:
               ::wxInRegion then indicates that all or some part of the region is
               contained in this region.
     */
-    wxRegionContain Contains(long& x, long& y, long& width, long& height) const;
+    wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord width, wxCoord height) const;
     /**
         Returns a value indicating whether the given rectangle is contained within the
         region.
@@ -252,7 +252,7 @@ public:
     */
     void GetBox(wxCoord& x, wxCoord& y, wxCoord& width,
                 wxCoord& height) const;
-    const wxRect  GetBox() const;
+    wxRect GetBox() const;
     //@}
 
     /**
diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h
index ade84e7cea..5731c8c28b 100644
--- a/interface/wx/richtext/richtextbuffer.h
+++ b/interface/wx/richtext/richtextbuffer.h
@@ -524,13 +524,12 @@ public:
     /**
         Finds a handler by type.
     */
-    wxRichTextFileHandler* FindHandler(int imageType);
+    static wxRichTextFileHandler* FindHandler(wxRichTextFileType imageType);
 
     /**
         Finds a handler by extension and type.
     */
-    wxRichTextFileHandler* FindHandler(const wxString& extension,
-                                       int imageType);
+    static wxRichTextFileHandler* FindHandler(const wxString& extension, wxRichTextFileType imageType);
 
     /**
         Finds a handler by name.
@@ -698,14 +697,14 @@ public:
     /**
         Loads content from a stream.
     */
-    bool LoadFile(wxInputStream& stream,
-                  int type = wxRICHTEXT_TYPE_ANY);
+    virtual bool LoadFile(wxInputStream& stream,
+                          wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
 
     /**
         Loads content from a file.
     */
-    bool LoadFile(const wxString& filename,
-                  int type = wxRICHTEXT_TYPE_ANY);
+    virtual bool LoadFile(const wxString& filename,
+                          wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
 
     /**
         Marks the buffer as modified or unmodified.
@@ -794,14 +793,14 @@ public:
     /**
         Saves content to a stream.
     */
-    bool SaveFile(wxOutputStream& stream,
-                  int type = wxRICHTEXT_TYPE_ANY);
+    virtual bool SaveFile(wxOutputStream& stream,
+                          wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
 
     /**
         Saves content to a file.
     */
-    bool SaveFile(const wxString& filename,
-                  int type = wxRICHTEXT_TYPE_ANY);
+    virtual bool SaveFile(const wxString& filename,
+                          wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
 
     /**
         Sets the basic (overall) style. This is the style of the whole
diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
index ba7d55e7b2..cda726e4df 100644
--- a/interface/wx/richtext/richtextctrl.h
+++ b/interface/wx/richtext/richtextctrl.h
@@ -1456,7 +1456,7 @@ public:
     /**
         Loads an image from a file and writes it at the current insertion point.
     */
-    bool WriteImage(const wxString& filename, int bitmapType);
+    virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType);
 
     /**
         Writes an image block at the current insertion point.
diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h
index 03c651bf30..76d5bba01a 100644
--- a/interface/wx/scrolbar.h
+++ b/interface/wx/scrolbar.h
@@ -144,7 +144,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "scrollBar");
+                const wxString& name = wxScrollBarNameStr);
 
     /**
         Destructor, destroying the scrollbar.
diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h
index 58b506b686..847cfd7a06 100644
--- a/interface/wx/sizer.h
+++ b/interface/wx/sizer.h
@@ -1079,7 +1079,7 @@ public:
 
         @see Remove()
     */
-    bool Detach(size_t index);
+    virtual bool Detach(int index);
 
     /**
         Tell the sizer to resize the @a window so that its client area matches the
@@ -1374,7 +1374,7 @@ public:
 
         @return @true if the child item was found and removed, @false otherwise.
     */
-    bool Remove(wxWindow* window);
+    virtual bool Remove(wxWindow* window);
 
     /**
         Removes a sizer child from the sizer and destroys it.
@@ -1403,7 +1403,7 @@ public:
 
         @return @true if the child item was found and removed, @false otherwise.
     */
-    bool Remove(size_t index);
+    virtual bool Remove(int index);
 
     /**
         Detaches the given @a oldwin from the sizer and replaces it with the
@@ -1473,7 +1473,7 @@ public:
 
         @see wxSizerItem::SetMinSize()
     */
-    void SetItemMinSize(wxWindow* window, int width, int height);
+    bool SetItemMinSize(wxWindow* window, int width, int height);
 
     /**
         Set an item's minimum size by window, sizer, or position.
@@ -1484,7 +1484,7 @@ public:
 
         @see wxSizerItem::SetMinSize()
     */
-    void SetItemMinSize(wxSizer* sizer, int width, int height);
+    bool SetItemMinSize(wxSizer* sizer, int width, int height);
 
     /**
         Set an item's minimum size by window, sizer, or position.
@@ -1495,7 +1495,7 @@ public:
 
         @see wxSizerItem::SetMinSize()
     */
-    void SetItemMinSize(size_t index, int width, int height);
+    bool SetItemMinSize(size_t index, int width, int height);
 
     /**
         Call this to give the sizer a minimal size.
@@ -1678,7 +1678,7 @@ public:
     /**
         This constructor creates a new static box with the given label and parent window.
     */
-    wxStaticBoxSizer(int orient, wxWindow parent,
+    wxStaticBoxSizer(int orient, wxWindow *parent,
                      const wxString& label = wxEmptyString);
 
     /**
diff --git a/interface/wx/slider.h b/interface/wx/slider.h
index 55f112fccb..82f6384e9f 100644
--- a/interface/wx/slider.h
+++ b/interface/wx/slider.h
@@ -151,7 +151,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = "slider");
+             const wxString& name = wxSliderNameStr);
 
     /**
         Destructor, destroying the slider.
diff --git a/interface/wx/spinbutt.h b/interface/wx/spinbutt.h
index 2465c5bef4..e596243c80 100644
--- a/interface/wx/spinbutt.h
+++ b/interface/wx/spinbutt.h
@@ -124,10 +124,10 @@ public:
 
         @see Create()
     */
-    wxSpinButton(wxWindow* parent, wxWindowID id,
+    wxSpinButton(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
-                 long style = wxSP_HORIZONTAL,
+                 long style = wxSP_VERTICAL,
                  const wxString& name = "spinButton");
 
     /**
@@ -141,7 +141,8 @@ public:
     */
     bool Create(wxWindow* parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = wxSP_HORIZONTAL,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_VERTICAL,
                 const wxString& name = "wxSpinButton");
 
     /**
diff --git a/interface/wx/spinctrl.h b/interface/wx/spinctrl.h
index 2d25732693..7274bf1aec 100644
--- a/interface/wx/spinctrl.h
+++ b/interface/wx/spinctrl.h
@@ -79,13 +79,13 @@ public:
 
         @see Create()
     */
-    wxSpinCtrl(wxWindow* parent, wxWindowID id = -1,
+    wxSpinCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100,
-               int initial = 0, const wxString& name = _T("wxSpinCtrl"));
+               int initial = 0, const wxString& name = "wxSpinCtrl");
 
     /**
         Creation function called by the spin control constructor.
diff --git a/interface/wx/splitter.h b/interface/wx/splitter.h
index 16b3e22844..7934d3db1e 100644
--- a/interface/wx/splitter.h
+++ b/interface/wx/splitter.h
@@ -95,7 +95,7 @@ public:
 
         @see Initialize(), SplitVertically(), SplitHorizontally(), Create()
     */
-    wxSplitterWindow(wxWindow* parent, wxWindowID id,
+    wxSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
diff --git a/interface/wx/srchctrl.h b/interface/wx/srchctrl.h
index a0ccf76145..eec053b845 100644
--- a/interface/wx/srchctrl.h
+++ b/interface/wx/srchctrl.h
@@ -87,7 +87,7 @@ public:
         @see wxTextCtrl::Create, wxValidator
     */
     wxSearchCtrl(wxWindow* parent, wxWindowID id,
-                 const wxString& value = "",
+                 const wxString& value = wxEmptyString,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
diff --git a/interface/wx/stackwalk.h b/interface/wx/stackwalk.h
index 0777d9b3e0..9d1987f756 100644
--- a/interface/wx/stackwalk.h
+++ b/interface/wx/stackwalk.h
@@ -47,7 +47,7 @@ public:
     /**
         Constructor does nothing, use Walk() to walk the stack.
     */
-    wxStackWalker();
+    wxStackWalker(const char* argv0 = NULL);
 
     /**
         Destructor does nothing neither but should be virtual as this class is used as
diff --git a/interface/wx/statbmp.h b/interface/wx/statbmp.h
index 3ea164f8f7..b84ffcfd43 100644
--- a/interface/wx/statbmp.h
+++ b/interface/wx/statbmp.h
@@ -56,7 +56,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
-                   const wxString& name = "staticBitmap");
+                   const wxString& name = wxStaticBitmapNameStr);
 
     /**
         Creation function, for two-step construction. For details see wxStaticBitmap().
diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index bf750622b7..b69eace3d8 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -63,7 +63,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = "staticBox");
+                const wxString& name = wxStaticBoxNameStr);
 
     /**
         Destructor, destroying the group box.
diff --git a/interface/wx/statline.h b/interface/wx/statline.h
index f2830d91cd..198e5a8824 100644
--- a/interface/wx/statline.h
+++ b/interface/wx/statline.h
@@ -61,7 +61,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString& name = "staticLine");
+                 const wxString& name = wxStaticLineNameStr);
 
     /**
         Creates the static line for two-step construction.
diff --git a/interface/wx/stattext.h b/interface/wx/stattext.h
index ca1a02a315..21d1affe1b 100644
--- a/interface/wx/stattext.h
+++ b/interface/wx/stattext.h
@@ -76,7 +76,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
-                 const wxString& name = "staticText");
+                 const wxString& name = wxStaticTextNameStr);
 
     /**
         Creation function, for two-step construction. For details see wxStaticText().
diff --git a/interface/wx/statusbr.h b/interface/wx/statusbr.h
index 531371d437..d224501963 100644
--- a/interface/wx/statusbr.h
+++ b/interface/wx/statusbr.h
@@ -56,7 +56,7 @@ public:
     */
     wxStatusBar(wxWindow* parent, wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,
-                const wxString& name = "statusBar");
+                const wxString& name = wxStatusBarNameStr);
 
     /**
         Destructor.
diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index 6de6fa871c..1a2e0531bd 100644
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -290,7 +290,7 @@ public:
 
         @see Write()
     */
-    Return value size_t Read(wxStreamBuffer* buffer);
+    size_t Read(wxStreamBuffer* buffer);
 
     /**
         Resets to the initial state variables concerning the buffer.
@@ -326,7 +326,7 @@ public:
 
         @see wxStreamBuffer(), Fixed(), Flushable()
     */
-    void SetBufferIO(char* buffer_start, char* buffer_end);
+    void SetBufferIO(void* start, void* end, bool takeOwnership = false);
 
     /**
         Destroys or invalidates the previous IO buffer and allocates a new one of the
@@ -463,7 +463,7 @@ public:
         This function returns a reference on the current object, so the user can
         test any states of the stream right away.
     */
-    wxOutputStream& Write(const void* buffer, size_t size);
+    virtual wxOutputStream& Write(const void* buffer, size_t size);
 
     /**
         Reads data from the specified input stream and stores them
diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h
index 2e8f2cd1c6..f5f35e670c 100644
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -1636,7 +1636,7 @@ public:
 
     /**
         Sets the new text control value.
-       
+
         It also marks the control as not-modified which means that IsModified()
         would return @false immediately after the call to SetValue().
 
@@ -1771,7 +1771,7 @@ public:
         @param ostr
             The C++ stream to redirect, cout is used if it is @NULL
     */
-    wxStreamToTextRedirector(wxTextCtrl text, ostream* ostr = NULL);
+    wxStreamToTextRedirector(wxTextCtrl *text, ostream* ostr);
 
     /**
         When a wxStreamToTextRedirector object is destroyed, the redirection is ended
diff --git a/interface/wx/variant.h b/interface/wx/variant.h
index c1dfa9b0c6..3d2efeb4d3 100644
--- a/interface/wx/variant.h
+++ b/interface/wx/variant.h
@@ -384,9 +384,9 @@ public:
     bool operator !=(const wxString& value) const;
     bool operator !=(const wxChar* value) const;
     bool operator !=(wxChar value) const;
-    bool operator !=(const long value) const;
-    bool operator !=(const bool value) const;
-    bool operator !=(const double value) const;
+    bool operator !=(long value) const;
+    bool operator !=(bool value) const;
+    bool operator !=(double value) const;
     bool operator !=(void* value) const;
     bool operator !=(wxObject* value) const;
     bool operator !=(const wxVariantList& value) const;
@@ -404,9 +404,9 @@ public:
     void operator =(const wxString& value);
     void operator =(const wxChar* value);
     void operator =(wxChar value);
-    void operator =(const long value);
-    void operator =(const bool value);
-    void operator =(const double value);
+    void operator =(long value);
+    void operator =(bool value);
+    void operator =(double value);
     void operator =(void* value);
     void operator =(wxObject* value);
     void operator =(const wxVariantList& value);
@@ -422,9 +422,9 @@ public:
     bool operator ==(const wxString& value) const;
     bool operator ==(const wxChar* value) const;
     bool operator ==(wxChar value) const;
-    bool operator ==(const long value) const;
-    bool operator ==(const bool value) const;
-    bool operator ==(const double value) const;
+    bool operator ==(long value) const;
+    bool operator ==(bool value) const;
+    bool operator ==(double value) const;
     bool operator ==(void* value) const;
     bool operator ==(wxObject* value) const;
     bool operator ==(const wxVariantList& value) const;
-- 
2.45.2