Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc fixes to function signatures

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-10-14 19:48:14 +00:00
parent 9f1ce8bfa9
commit 9f5737d793
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
interface/wx/dataobj.h
View File

@@ -336,7 +336,8 @@ public:
Constructs a data format object for one of the standard data formats or 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). 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 Constructs a data format object for a custom format identified by its
name @a format. name @a format.
@@ -583,7 +584,7 @@ public:
@return @true on success, @false on failure. @return @true on success, @false on failure.
*/ */
virtual bool SetData(const wxDataFormat& format, size_t len, virtual bool SetData(const wxDataFormat& format, size_t len,
const void buf); const void* buf);
}; };

6
interface/wx/datstrm.h
View File

@@ -34,8 +34,7 @@ public:
@param stream @param stream
The output stream. The output stream.
*/ */
wxDataOutputStream(wxOutputStream& stream, wxDataOutputStream(wxOutputStream& stream);
const wxMBConv& conv = wxConvAuto());
/** /**
Constructs a datastream object from an output stream. Only write Constructs a datastream object from an output stream. Only write
@@ -180,8 +179,7 @@ public:
@param stream @param stream
The input stream. The input stream.
*/ */
wxDataInputStream(wxInputStream& stream, wxDataInputStream(wxInputStream& stream);
const wxMBConv& conv = wxConvAuto());
/** /**
Constructs a datastream object from an input stream. Only read methods Constructs a datastream object from an input stream. Only read methods

2
interface/wx/event.h
View File

@@ -213,7 +213,7 @@ public:
Note that the @a win window @b must remain alive until the Note that the @a win window @b must remain alive until the
wxEventBlocker object destruction. 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 Destructor. The blocker will remove itself from the chain of event handlers for

2
interface/wx/fileconf.h
View File

@@ -69,7 +69,7 @@ public:
@see wxConfigBase::Flush @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 Allows to set the mode to be used for the config file creation. For example, to

2
interface/wx/sstream.h
View File

@@ -63,7 +63,7 @@ public:
with default value of this argument the data written to the stream must 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. 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. Returns the string containing all the data written to the stream so far.

3
interface/wx/txtstrm.h
View File

@@ -65,8 +65,7 @@ public:
<b>In Unicode build only:</b> The encoding converter used to <b>In Unicode build only:</b> The encoding converter used to
convert the bytes in the underlying input stream to characters. convert the bytes in the underlying input stream to characters.
*/ */
wxTextInputStream(wxInputStream& stream, wxTextInputStream(wxInputStream& stream, const wxString& sep = " \t",
const wxString& sep = " \t",
const wxMBConv& conv = wxConvAuto()); const wxMBConv& conv = wxConvAuto());
/** /**