misc fixes to function signatures

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

diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h
index 0a3e9618453850cfbb121892beb043692a34d435..3ac50c970c985a361a469d3894d3447788b1020e 100644 (file)
--- a/interface/wx/dataobj.h
+++ b/interface/wx/dataobj.h
@@ -336,7 +336,8 @@ public:
         Constructs a data format object for one of the standard data formats or
         an empty data object (use SetType() or SetId() later in this case).
     */
-    wxDataFormat(NativeFormat format = wxDF_INVALID);
+    wxDataFormat(wxDataFormatId format = wxDF_INVALID);
+
     /**
         Constructs a data format object for a custom format identified by its
         name @a format.
@@ -583,7 +584,7 @@ public:
         @return @true on success, @false on failure.
     */
     virtual bool SetData(const wxDataFormat& format, size_t len,
-                           const void buf);
+                         const void* buf);
 };
 
 

diff --git a/interface/wx/datstrm.h b/interface/wx/datstrm.h
index 6972b882b7d623ce784fa8b26fef89f1aa0d6f89..c9548c66f6659204a06d1a0e9ec3c5bd5c4d172c 100644 (file)
--- a/interface/wx/datstrm.h
+++ b/interface/wx/datstrm.h
@@ -34,8 +34,7 @@ public:
         @param stream
             The output stream.
     */
-    wxDataOutputStream(wxOutputStream& stream,
-                       const wxMBConv& conv = wxConvAuto());
+    wxDataOutputStream(wxOutputStream& stream);
 
     /**
         Constructs a datastream object from an output stream. Only write
@@ -180,8 +179,7 @@ public:
         @param stream
             The input stream.
     */
-    wxDataInputStream(wxInputStream& stream,
-                      const wxMBConv& conv = wxConvAuto());
+    wxDataInputStream(wxInputStream& stream);
 
     /**
         Constructs a datastream object from an input stream. Only read methods

diff --git a/interface/wx/event.h b/interface/wx/event.h
index eb776912fea0de60918e12c130049aa1a32c8902..e60017f376c583ab3ac528ffd1a59ab363c0228b 100644 (file)
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -213,7 +213,7 @@ public:
         Note that the @a win window @b must remain alive until the
         wxEventBlocker object destruction.
     */
-    wxEventBlocker(wxWindow* win, wxEventType = wxEVT_ANY);
+    wxEventBlocker(wxWindow* win, wxEventType type = wxEVT_ANY);
 
     /**
         Destructor. The blocker will remove itself from the chain of event handlers for

diff --git a/interface/wx/fileconf.h b/interface/wx/fileconf.h
index 7223e1c322b77f694630cab49f3351de8b326211..641b3b5adf3d5cbfcaabc374a54b81608d75fee6 100644 (file)
--- a/interface/wx/fileconf.h
+++ b/interface/wx/fileconf.h
@@ -69,7 +69,7 @@ public:
 
         @see wxConfigBase::Flush
     */
-    bool Save(wxOutputStream& os, const wxMBConv& conv = wxConvAuto());
+    virtual bool Save(wxOutputStream& os, const wxMBConv& conv = wxConvAuto());
 
     /**
         Allows to set the mode to be used for the config file creation. For example, to

diff --git a/interface/wx/sstream.h b/interface/wx/sstream.h
index 06d309ab06c1abfb9c9b33cca7e4147cb347870a..462e38fef9faac5d69529997ca84a5e8b8e7df63 100644 (file)
--- a/interface/wx/sstream.h
+++ b/interface/wx/sstream.h
@@ -63,7 +63,7 @@ public:
         with default value of this argument the data written to the stream must
         be valid UTF-8, pass @c wxConvISO8859_1 to deal with arbitrary 8 bit data.
     */
-    wxStringOutputStream(wxString str = NULL, wxMBConv& conv = wxConvUTF8);
+    wxStringOutputStream(wxString* pString = 0, wxMBConv& conv = wxConvUTF8);
 
     /**
         Returns the string containing all the data written to the stream so far.

diff --git a/interface/wx/txtstrm.h b/interface/wx/txtstrm.h
index 46c364a4f24646acd321e2c0851d8c2e232e2056..1592d75f272a9dd7bb818b94363ed8e538e98712 100644 (file)
--- a/interface/wx/txtstrm.h
+++ b/interface/wx/txtstrm.h
@@ -65,8 +65,7 @@ public:
             <b>In Unicode build only:</b> The encoding converter used to
             convert the bytes in the underlying input stream to characters.
     */
-    wxTextInputStream(wxInputStream& stream,
-                      const wxString& sep = " \t",
+    wxTextInputStream(wxInputStream& stream, const wxString& sep = " \t",
                       const wxMBConv& conv = wxConvAuto());
 
     /**