From 7323ff1aee02cc8c8979b6b25f84049ab0c081ae Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Mon, 27 Oct 2008 17:12:27 +0000 Subject: [PATCH] other ifacecheck fixes, resulting in removal of the non-existing functions wxDatagramSocket::ReceiveFrom() and wxCloseEvent::SetForce() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/dataobj.h | 17 +++++++---------- interface/wx/datstrm.h | 20 ++------------------ interface/wx/event.h | 5 ----- interface/wx/html/winpars.h | 4 ++-- interface/wx/image.h | 17 ++++++++--------- interface/wx/intl.h | 13 +++++-------- interface/wx/object.h | 8 ++++---- interface/wx/socket.h | 25 ++----------------------- interface/wx/thread.h | 2 +- 9 files changed, 31 insertions(+), 80 deletions(-) diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h index 97b48831fa..830a4c1a9f 100644 --- a/interface/wx/dataobj.h +++ b/interface/wx/dataobj.h @@ -409,8 +409,7 @@ public: wxFileDataObject(); /** - Adds a file to the file list represented by this data object (Windows - only). + Adds a file to the file list represented by this data object (Windows only). */ void AddFile(const wxString& file); @@ -489,7 +488,7 @@ public: Constructs a data format object for a custom format identified by its name @a format. */ - wxDataFormat(const wxChar format); + wxDataFormat(const wxString& format); /** 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. */ - void SetId(const wxChar format); + void SetId(const wxString& format); /** 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. */ - bool operator !=(const wxDataFormat& format) const; + bool operator !=(wxDataFormatId format) const; /** 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 in it. */ - virtual void GetAllFormats(wxDataFormat* formats, - Direction dir = Get) const; + virtual void GetAllFormats(wxDataFormat* formats, Direction dir = Get) const; /** 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. */ - virtual bool SetData(const wxDataFormat& format, size_t len, - const void* buf); + virtual bool SetData(const wxDataFormat& format, size_t len, const void* buf); }; diff --git a/interface/wx/datstrm.h b/interface/wx/datstrm.h index c9548c66f6..8ff65a4495 100644 --- a/interface/wx/datstrm.h +++ b/interface/wx/datstrm.h @@ -31,15 +31,7 @@ public: Constructs a datastream object from an output stream. Only write methods will be available. - @param stream - 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. + Note that the @a conv parameter is only available in Unicode builds of wxWidgets. @param stream The output stream. @@ -176,15 +168,7 @@ public: Constructs a datastream object from an input stream. Only read methods will be available. - @param stream - 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. + Note that the @a conv parameter is only available in Unicode builds of wxWidgets. @param stream The input stream. diff --git a/interface/wx/event.h b/interface/wx/event.h index fdc99e5c8e..4c3ac98ffe 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -2907,11 +2907,6 @@ public: */ void SetCanVeto(bool canVeto); - /** - Sets the 'force' flag. - */ - void SetForce(bool force) const; - /** Sets the 'logging off' flag. */ diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h index 4a2f2aed36..97a39b1e49 100644 --- a/interface/wx/html/winpars.h +++ b/interface/wx/html/winpars.h @@ -78,7 +78,7 @@ protected: class wxHtmlWinParser : public wxHtmlParser { public: - wxHtmlWinParser(); + wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0); /** Constructor. @@ -87,7 +87,7 @@ public: (@a wndIface is a pointer to interface object for the associated wxHtmlWindow or other HTML rendering window such as wxHtmlListBox). */ - wxHtmlWinParser(wxHtmlWindowInterface wndIface); + wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0); /** Adds module() to the list of wxHtmlWinParser tag handler. diff --git a/interface/wx/image.h b/interface/wx/image.h index f1bd3ffc02..f78827b117 100644 --- a/interface/wx/image.h +++ b/interface/wx/image.h @@ -941,9 +941,9 @@ public: @param index See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload. */ - bool LoadFile(const wxString& name, - wxBitmapType type = wxBITMAP_TYPE_ANY, - int index = -1); + virtual bool LoadFile(const wxString& name, + wxBitmapType type = wxBITMAP_TYPE_ANY, + int index = -1); /** Loads an image from a file. @@ -971,9 +971,8 @@ public: @param index See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload. */ - bool LoadFile(wxInputStream& stream, - const wxString& mimetype, - int index = -1); + virtual bool LoadFile(wxInputStream& stream, const wxString& mimetype, + int index = -1); /** Returns a mirrored copy of the image. @@ -1115,7 +1114,7 @@ public: in 8 colors at the size supplied. @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. @@ -1139,7 +1138,7 @@ public: @param name 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. @@ -1149,7 +1148,7 @@ public: @param 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. diff --git a/interface/wx/intl.h b/interface/wx/intl.h index e0d3d4899a..f6f51f127a 100644 --- a/interface/wx/intl.h +++ b/interface/wx/intl.h @@ -550,10 +550,9 @@ public: @remarks Domains are searched in the last to first order, i.e. catalogs added later override those added before. */ - const wxString& GetString(const wxString& origString, - const wxString& origString2, - size_t n, - const wxString& domain = wxEmptyString) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& origString2, size_t n, + const wxString& domain = wxEmptyString) const; /** Returns current platform-specific locale name as passed to setlocale(). @@ -640,10 +639,8 @@ public: and windows-1250. See @ref overview_nonenglish for detailed description of this behaviour. */ - bool Init(const wxString& name, - const wxString& short = wxEmptyString, - const wxString& locale = wxEmptyString, - bool bLoadDefault = true, + bool Init(const wxString& name, const wxString& short = wxEmptyString, + const wxString& locale = wxEmptyString, bool bLoadDefault = true, bool bConvertEncoding = false); /** diff --git a/interface/wx/object.h b/interface/wx/object.h index e3f7e93a0d..a526b79d5a 100644 --- a/interface/wx/object.h +++ b/interface/wx/object.h @@ -378,17 +378,17 @@ public: /** 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). */ - wxChar* GetBaseClassName2() const; + const wxChar* GetBaseClassName2() const; /** Returns the string form of the class name. */ - wxChar* GetClassName() const; + const wxChar* GetClassName() const; /** 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. */ - bool IsKindOf(wxClassInfo* info); + bool IsKindOf(const wxClassInfo* info); }; diff --git a/interface/wx/socket.h b/interface/wx/socket.h index bfdb1c5cf8..3a7adebb30 100644 --- a/interface/wx/socket.h +++ b/interface/wx/socket.h @@ -1220,27 +1220,6 @@ public: */ 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. Use wxSocketBase::LastCount() to verify the number of bytes actually wrote. @@ -1257,7 +1236,7 @@ public: @see wxSocketBase::LastError(), wxSocketBase::SetFlags() */ - wxDatagramSocket SendTo(const wxSockAddress& address, - const void* buffer, wxUint32 nbytes); + wxDatagramSocket& SendTo(const wxSockAddress& address, + const void* buffer, wxUint32 nbytes); }; diff --git a/interface/wx/thread.h b/interface/wx/thread.h index 77ef003e02..f530c12157 100644 --- a/interface/wx/thread.h +++ b/interface/wx/thread.h @@ -130,7 +130,7 @@ public: @see Signal() */ - void Broadcast(); + wxCondError Broadcast(); /** Returns @true if the object had been initialized successfully, @false -- 2.45.2