From d56f17d882e365addf168c8aae9a64754a9500a2 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi <f18m_cpp217828@yahoo.it> Date: Thu, 8 Jan 2009 15:36:37 +0000 Subject: [PATCH] automated ifacecheck fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/archive.h | 12 ++++++------ interface/wx/aui/framemanager.h | 4 ++-- interface/wx/dcsvg.h | 4 ++-- interface/wx/grid.h | 2 +- interface/wx/headerctrl.h | 10 +++++----- interface/wx/socket.h | 4 ++-- utils/ifacecheck/README.txt | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/interface/wx/archive.h b/interface/wx/archive.h index add0b2e93e..c20c3ef841 100644 --- a/interface/wx/archive.h +++ b/interface/wx/archive.h @@ -347,7 +347,7 @@ public: When using wxSTREAM_FILEEXT for the second parameter, the first parameter can be a complete filename rather than just an extension. */ - bool CanHandle(const wxChar* protocol, + bool CanHandle(const wxString& protocol, wxStreamProtocolType type = wxSTREAM_PROTOCOL) const; /** @@ -366,7 +366,7 @@ public: translating meta-data. The initial default, set by the constructor, is wxConvLocal. */ - wxMBConv GetConv() const; + wxMBConv& GetConv() const; /** Sets the wxMBConv object that the created streams will use when @@ -400,8 +400,8 @@ public: Calls the static GetInternalName() function for the archive entry type, for example wxZipEntry::GetInternalName. */ - wxString GetInternalName(const wxString& name, - wxPathFormat format = wxPATH_NATIVE) const; + virtual wxString GetInternalName(const wxString& name, + wxPathFormat format = wxPATH_NATIVE) const = 0; /** Returns the wxFileSystem protocol supported by this factory. @@ -424,7 +424,7 @@ public: list << *p << _T("\n"); @endcode */ - const wxChar* const* GetProtocols(wxStreamProtocolType type = wxSTREAM_PROTOCOL) const; + virtual const wxChar** GetProtocols(wxStreamProtocolType type = wxSTREAM_PROTOCOL) const = 0; /** Create a new wxArchiveEntry object of the appropriate type. @@ -499,7 +499,7 @@ public: /** This method must be overridden in your derived class. */ - void OnEntryUpdated(class wxArchiveEntry& entry); + virtual void OnEntryUpdated(wxArchiveEntry& entry) = 0; }; diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h index a48a944352..ac0e4057e6 100644 --- a/interface/wx/aui/framemanager.h +++ b/interface/wx/aui/framemanager.h @@ -285,7 +285,7 @@ public: This method is used to specify wxAuiManager's settings flags. @a flags specifies options which allow the frame management behavior to be modified. */ - void SetFlags(int flags); + void SetFlags(unsigned int flags); /** Called to specify the frame or window which is to be managed by wxAuiManager. @@ -731,7 +731,7 @@ public: SetFlag() turns the property given by flag on or off with the option_state parameter. */ - wxAuiPaneInfo& SetFlag(unsigned int flag, bool option_state); + wxAuiPaneInfo& SetFlag(int flag, bool option_state); /** Show() indicates that a pane should be shown. diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h index 110bcd1d17..6f0f34a906 100644 --- a/interface/wx/dcsvg.h +++ b/interface/wx/dcsvg.h @@ -378,7 +378,7 @@ public: @see SetMapMode() */ - int GetMapMode() const; + wxMappingMode GetMapMode() const; //@{ /** @@ -606,7 +606,7 @@ public: - wxMM_LOMETRIC - Each logical unit is 1/10 of a mm. - wxMM_TEXT - Each logical unit is 1 pixel. */ - void SetMapMode(int mode); + void SetMapMode(wxMappingMode mode); /** Not implemented. diff --git a/interface/wx/grid.h b/interface/wx/grid.h index 763c62ecde..93358c81fb 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -225,7 +225,7 @@ public: If the user-defined wxEVT_GRID_CELL_CHANGING event handler doesn't veto this change, ApplyEdit() will be called next. */ - virtual bool EndEdit(int row, int col, wxGrid* grid) = 0; + virtual bool EndEdit(const wxString& oldval, wxString* newval) = 0; /** Effectively save the changes in the grid. diff --git a/interface/wx/headerctrl.h b/interface/wx/headerctrl.h index c718467c17..3cc2f34a54 100644 --- a/interface/wx/headerctrl.h +++ b/interface/wx/headerctrl.h @@ -325,7 +325,7 @@ public: @true if a column was shown or hidden or @false if nothing was done, e.g. because the menu was cancelled. */ - int ShowColumnsMenu(const wxPoint& pt, const wxString& title = wxString()); + bool ShowColumnsMenu(const wxPoint& pt, const wxString& title = wxString()); /** Helper function appending the checkable items corresponding to all the @@ -554,14 +554,14 @@ public: @see AppendColumn() */ - void InsertColumn(const wxHeaderColumn& col, unsigned int idx); + void InsertColumn(const wxHeaderColumnSimple& col, unsigned int idx); /** Append the column to the end of the control. @see InsertColumn() */ - void AppendColumn(const wxHeaderColumn& col); + void AppendColumn(const wxHeaderColumnSimple& col); /** Delete the column at the given position. @@ -612,7 +612,7 @@ public: ascending or descending sort order respectively, if @c -1 remove the currently shown sort indicator. */ - virtual void ShowSortIndicator(unsigned int idx, int sortOrder); + void ShowSortIndicator(unsigned int idx, bool ascending = true); /** Remove the sort indicator from the given column. @@ -622,7 +622,7 @@ public: @param idx The column to remove sort indicator for. */ - void RemoveSortIndicator(unsigned int idx); + void RemoveSortIndicator(); protected: /** diff --git a/interface/wx/socket.h b/interface/wx/socket.h index b5a2f058d8..3efa425a6c 100644 --- a/interface/wx/socket.h +++ b/interface/wx/socket.h @@ -197,7 +197,7 @@ public: @return @true on success, @false if something went wrong. */ - virtual bool AnyAddress() = 0; + bool AnyAddress(); /** Internally, this is the same as setting the IP address to @b INADDR_BROADCAST. @@ -243,7 +243,7 @@ public: @return @true on success, @false if something went wrong. */ - virtual bool LocalHost() = 0; + bool LocalHost(); /** Set the port to that corresponding to the specified service. diff --git a/utils/ifacecheck/README.txt b/utils/ifacecheck/README.txt index df2fdc854b..6630172816 100644 --- a/utils/ifacecheck/README.txt +++ b/utils/ifacecheck/README.txt @@ -6,12 +6,12 @@ This utility compares the wxWidgets real interface contained in the "include" hierarchy with the wxWidgets interface used for documentation purposes and - kept in the @c interface hierarchy. + kept in the "interface" hierarchy. Ifacecheck warns about incoherences (mainly wrong prototype signatures) and can even correct them automatically. It uses the XML outputs of the gccxml utility (see http://www.gccxml.org) and of the Doxygen utility (see http://www.doxygen.org) - to do the comparisons. + to do the comparison. It's explicitely designed for wxWidgets documentation needs and is probably of little use for anything else than wxWidgets docs reviewing. -- 2.45.2