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

other ifacecheck fixes, resulting in removal of the non-existing functions wxDatagramSocket::ReceiveFrom() and wxCloseEvent::SetForce()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-10-27 17:12:27 +00:00
parent 04e7bc9f90
commit 7323ff1aee
9 changed files with 31 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
interface/wx/dataobj.h
View File

@@ -409,8 +409,7 @@ public:
wxFileDataObject(); wxFileDataObject();
/** /**
Adds a file to the file list represented by this data object (Windows Adds a file to the file list represented by this data object (Windows only).
only).
*/ */
void AddFile(const wxString& file); void AddFile(const wxString& file);
@@ -489,7 +488,7 @@ public:
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.
*/ */
wxDataFormat(const wxChar format); wxDataFormat(const wxString& format);
/** /**
Returns the name of a custom format (this function will fail for a Returns the name of a custom format (this function will fail for a
@@ -505,7 +504,7 @@ public:
/** /**
Sets the format to be the custom format identified by the given name. Sets the format to be the custom format identified by the given name.
*/ */
void SetId(const wxChar format); void SetId(const wxString& format);
/** /**
Sets the format to the given value, which should be one of wxDF_XXX Sets the format to the given value, which should be one of wxDF_XXX
@@ -516,12 +515,12 @@ public:
/** /**
Returns @true if the formats are different. Returns @true if the formats are different.
*/ */
bool operator !=(const wxDataFormat& format) const; bool operator !=(wxDataFormatId format) const;
/** /**
Returns @true if the formats are equal. Returns @true if the formats are equal.
*/ */
bool operator ==(const wxDataFormat& format) const; bool operator ==(wxDataFormatId format) const;
}; };
@@ -657,8 +656,7 @@ public:
to by @a formats. There is enough space for GetFormatCount(dir) formats to by @a formats. There is enough space for GetFormatCount(dir) formats
in it. in it.
*/ */
virtual void GetAllFormats(wxDataFormat* formats, virtual void GetAllFormats(wxDataFormat* formats, Direction dir = Get) const;
Direction dir = Get) const;
/** /**
The method will write the data of the format @a format in the buffer The method will write the data of the format @a format in the buffer
@@ -690,7 +688,6 @@ 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);
}; };

20
interface/wx/datstrm.h
View File

@@ -31,15 +31,7 @@ public:
Constructs a datastream object from an output stream. Constructs a datastream object from an output stream.
Only write methods will be available. Only write methods will be available.
@param stream Note that the @a conv parameter is only available in Unicode builds of wxWidgets.
The output stream.
*/
wxDataOutputStream(wxOutputStream& stream);
/**
Constructs a datastream object from an output stream. Only write
methods will be available. This constructor is only available in
Unicode builds of wxWidgets.
@param stream @param stream
The output stream. The output stream.
@@ -176,15 +168,7 @@ public:
Constructs a datastream object from an input stream. Constructs a datastream object from an input stream.
Only read methods will be available. Only read methods will be available.
@param stream Note that the @a conv parameter is only available in Unicode builds of wxWidgets.
The input stream.
*/
wxDataInputStream(wxInputStream& stream);
/**
Constructs a datastream object from an input stream. Only read methods
will be available. This constructor is only available in Unicode builds
of wxWidgets.
@param stream @param stream
The input stream. The input stream.

5
interface/wx/event.h
View File

@@ -2907,11 +2907,6 @@ public:
*/ */
void SetCanVeto(bool canVeto); void SetCanVeto(bool canVeto);
/**
Sets the 'force' flag.
*/
void SetForce(bool force) const;
/** /**
Sets the 'logging off' flag. Sets the 'logging off' flag.
*/ */

4
interface/wx/html/winpars.h
View File

@@ -78,7 +78,7 @@ protected:
class wxHtmlWinParser : public wxHtmlParser class wxHtmlWinParser : public wxHtmlParser
{ {
public: public:
wxHtmlWinParser(); wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
/** /**
Constructor. Constructor.
@@ -87,7 +87,7 @@ public:
(@a wndIface is a pointer to interface object for the associated wxHtmlWindow (@a wndIface is a pointer to interface object for the associated wxHtmlWindow
or other HTML rendering window such as wxHtmlListBox). or other HTML rendering window such as wxHtmlListBox).
*/ */
wxHtmlWinParser(wxHtmlWindowInterface wndIface); wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
/** /**
Adds module() to the list of wxHtmlWinParser tag handler. Adds module() to the list of wxHtmlWinParser tag handler.

17
interface/wx/image.h
View File

@@ -941,9 +941,9 @@ public:
@param index @param index
See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload. See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload.
*/ */
bool LoadFile(const wxString& name, virtual bool LoadFile(const wxString& name,
wxBitmapType type = wxBITMAP_TYPE_ANY, wxBitmapType type = wxBITMAP_TYPE_ANY,
int index = -1); int index = -1);
/** /**
Loads an image from a file. Loads an image from a file.
@@ -971,9 +971,8 @@ public:
@param index @param index
See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload. See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload.
*/ */
bool LoadFile(wxInputStream& stream, virtual bool LoadFile(wxInputStream& stream, const wxString& mimetype,
const wxString& mimetype, int index = -1);
int index = -1);
/** /**
Returns a mirrored copy of the image. Returns a mirrored copy of the image.
@@ -1115,7 +1114,7 @@ public:
in 8 colors at the size supplied. in 8 colors at the size supplied.
@li wxBITMAP_TYPE_CUR: Save a Windows cursor file (CUR). @li wxBITMAP_TYPE_CUR: Save a Windows cursor file (CUR).
*/ */
bool SaveFile(const wxString& name, wxBitmapType type) const; virtual bool SaveFile(const wxString& name, wxBitmapType type) const;
/** /**
Saves an image in the named file. Saves an image in the named file.
@@ -1139,7 +1138,7 @@ public:
@param name @param name
Name of the file to save the image to. Name of the file to save the image to.
*/ */
bool SaveFile(const wxString& name) const; virtual bool SaveFile(const wxString& name) const;
/** /**
Saves an image in the given stream. Saves an image in the given stream.
@@ -1149,7 +1148,7 @@ public:
@param type @param type
MIME type. MIME type.
*/ */
bool SaveFile(wxOutputStream& stream, wxBitmapType type) const; virtual bool SaveFile(wxOutputStream& stream, wxBitmapType type) const;
/** /**
Returns a scaled version of the image. Returns a scaled version of the image.

13
interface/wx/intl.h
View File

@@ -550,10 +550,9 @@ public:
@remarks Domains are searched in the last to first order, i.e. catalogs @remarks Domains are searched in the last to first order, i.e. catalogs
added later override those added before. added later override those added before.
*/ */
const wxString& GetString(const wxString& origString, virtual const wxString& GetString(const wxString& origString,
const wxString& origString2, const wxString& origString2, size_t n,
size_t n, const wxString& domain = wxEmptyString) const;
const wxString& domain = wxEmptyString) const;
/** /**
Returns current platform-specific locale name as passed to setlocale(). Returns current platform-specific locale name as passed to setlocale().
@@ -640,10 +639,8 @@ public:
and windows-1250. and windows-1250.
See @ref overview_nonenglish for detailed description of this behaviour. See @ref overview_nonenglish for detailed description of this behaviour.
*/ */
bool Init(const wxString& name, bool Init(const wxString& name, const wxString& short = wxEmptyString,
const wxString& short = wxEmptyString, const wxString& locale = wxEmptyString, bool bLoadDefault = true,
const wxString& locale = wxEmptyString,
bool bLoadDefault = true,
bool bConvertEncoding = false); bool bConvertEncoding = false);
/** /**

8
interface/wx/object.h
View File

@@ -378,17 +378,17 @@ public:
/** /**
Returns the name of the first base class (@NULL if none). Returns the name of the first base class (@NULL if none).
*/ */
wxChar* GetBaseClassName1() const; const wxChar* GetBaseClassName1() const;
/** /**
Returns the name of the second base class (@NULL if none). Returns the name of the second base class (@NULL if none).
*/ */
wxChar* GetBaseClassName2() const; const wxChar* GetBaseClassName2() const;
/** /**
Returns the string form of the class name. Returns the string form of the class name.
*/ */
wxChar* GetClassName() const; const wxChar* GetClassName() const;
/** /**
Returns the size of the class. Returns the size of the class.
@@ -409,7 +409,7 @@ public:
/** /**
Returns @true if this class is a kind of (inherits from) the given class. Returns @true if this class is a kind of (inherits from) the given class.
*/ */
bool IsKindOf(wxClassInfo* info); bool IsKindOf(const wxClassInfo* info);
}; };

25
interface/wx/socket.h
View File

@@ -1220,27 +1220,6 @@ public:
*/ */
virtual ~wxDatagramSocket(); virtual ~wxDatagramSocket();
/**
This function reads a buffer of @a nbytes bytes from the socket.
Use wxSocketBase::LastCount() to verify the number of bytes actually read.
Use wxSocketBase::Error() to determine if the operation succeeded.
@param address
Any address - will be overwritten with the address of the peer that sent
that data.
@param buffer
Buffer where to put read data.
@param nbytes
Number of bytes.
@return Returns a reference to the current object, and the address of
the peer that sent the data on address param.
@see wxSocketBase::LastError(), wxSocketBase::SetFlags()
*/
wxDatagramSocket ReceiveFrom(wxSockAddress& address,
void* buffer, wxUint32 nbytes);
/** /**
This function writes a buffer of @a nbytes bytes to the socket. This function writes a buffer of @a nbytes bytes to the socket.
Use wxSocketBase::LastCount() to verify the number of bytes actually wrote. Use wxSocketBase::LastCount() to verify the number of bytes actually wrote.
@@ -1257,7 +1236,7 @@ public:
@see wxSocketBase::LastError(), wxSocketBase::SetFlags() @see wxSocketBase::LastError(), wxSocketBase::SetFlags()
*/ */
wxDatagramSocket SendTo(const wxSockAddress& address, wxDatagramSocket& SendTo(const wxSockAddress& address,
const void* buffer, wxUint32 nbytes); const void* buffer, wxUint32 nbytes);
}; };

2
interface/wx/thread.h
View File

@@ -130,7 +130,7 @@ public:
@see Signal() @see Signal()
*/ */
void Broadcast(); wxCondError Broadcast();
/** /**
Returns @true if the object had been initialized successfully, @false Returns @true if the object had been initialized successfully, @false