suppress warnings about missing_semicolons file not existing

[wxWidgets.git] / interface / wx / headerctrl.h

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:
     /**