automated ifacecheck fixes

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

diff --git a/interface/wx/archive.h b/interface/wx/archive.h
index add0b2e93eb21a6068b416519dd3c21a92422b91..c20c3ef841a68bce4b0e89c45e5efaf2cacd9bbc 100644 (file)
--- 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.
     */
         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;
 
     /**
                    wxStreamProtocolType type = wxSTREAM_PROTOCOL) const;
 
     /**


@@ -366,7 +366,7 @@ public:
         translating meta-data. The initial default, set by the constructor,
         is wxConvLocal.
     */
         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
 
     /**
         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.
     */
         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.
 
     /**
         Returns the wxFileSystem protocol supported by this factory.


@@ -424,7 +424,7 @@ public:
             list << *p << _T("\n");
         @endcode
     */
             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.
 
     /**
         Create a new wxArchiveEntry object of the appropriate type.


@@ -499,7 +499,7 @@ public:
     /**
         This method must be overridden in your derived class.
     */
     /**
         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 a48a9443529ec9502f2fc104afe49b4ee1f99083..ac0e4057e664cf3383813afdc0406dc9f9480fdf 100644 (file)
--- 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.
     */
         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.
 
     /**
         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.
     */
         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.
 
     /**
         Show() indicates that a pane should be shown.

diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h
index 110bcd1d17d9537907d9564a133f1e7d0a34bb7e..6f0f34a906927008f97e6e54ff90498cfb65f7a2 100644 (file)
--- a/interface/wx/dcsvg.h
+++ b/interface/wx/dcsvg.h
@@ -378,7 +378,7 @@ public:
 
         @see SetMapMode()
     */
 
         @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.
     */
         - 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.
 
     /**
         Not implemented.

diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 763c62ecde01610a3c382553277b41a97a5629cd..93358c81fb37bb39a8996e9e579dbd154e0eb868 100644 (file)
--- 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.
     */
         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.
 
     /**
         Effectively save the changes in the grid.

diff --git a/interface/wx/headerctrl.h b/interface/wx/headerctrl.h
index c718467c170ca5fda1f3f7c773de705809d69a68..3cc2f34a54b09a6398316be38f9682cd14e382e1 100644 (file)
--- 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.
      */
             @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
 
     /**
         Helper function appending the checkable items corresponding to all the


@@ -554,14 +554,14 @@ public:
 
         @see AppendColumn()
      */
 
         @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()
      */
 
     /**
         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.
 
     /**
         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.
      */
             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.
 
     /**
         Remove the sort indicator from the given column.


@@ -622,7 +622,7 @@ public:
         @param idx
             The column to remove sort indicator for.
      */
         @param idx
             The column to remove sort indicator for.
      */

-    void RemoveSortIndicator(unsigned int idx);
+    void RemoveSortIndicator();

 
 protected:
     /**
 
 protected:
     /**

diff --git a/interface/wx/socket.h b/interface/wx/socket.h
index b5a2f058d833cdabf43b8814516b4c74af38df58..3efa425a6c9f92b38def40b570118d282d64dfe3 100644 (file)
--- a/interface/wx/socket.h
+++ b/interface/wx/socket.h
@@ -197,7 +197,7 @@ public:
 
         @return @true on success, @false if something went wrong.
     */
 
         @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.
 
     /**
         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.
     */
 
         @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.
 
     /**
         Set the port to that corresponding to the specified service.

diff --git a/utils/ifacecheck/README.txt b/utils/ifacecheck/README.txt
index df2fdc854b05f5321aaf319db181db0d00465a08..66301728163093957de2ef9bf69b9620b74dbcb9 100644 (file)
--- 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
 
  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)
 
  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.
 
  It's explicitely designed for wxWidgets documentation needs and is probably of little
  use for anything else than wxWidgets docs reviewing.