Added clipboard sample

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

diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index e404f166dbd48b2b19cfc4c0d4d1aed04984656a..a95d094cb3f400fa922f3d462a6614c239a066ae 100644 (file)
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -132,7 +132,7 @@ public:
 
     // show the columns customization dialog and return true if something was
     // changed using it (in which case UpdateColumnVisibility() and/or
 
     // show the columns customization dialog and return true if something was
     // changed using it (in which case UpdateColumnVisibility() and/or

-    // UpdateColumnWidth() will have been called)
+    // UpdateColumnsOrder() will have been called)

     //
     // this is called by the control itself from ShowColumnsMenu() (which in
     // turn is only called by the control if wxHD_ALLOW_HIDE style was
     //
     // this is called by the control itself from ShowColumnsMenu() (which in
     // turn is only called by the control if wxHD_ALLOW_HIDE style was


@@ -154,7 +154,7 @@ public:
 protected:
     // this method must be implemented by the derived classes to return the
     // information for the given column
 protected:
     // this method must be implemented by the derived classes to return the
     // information for the given column

-    virtual wxHeaderColumn& GetColumn(unsigned int idx) = 0;
+    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const = 0;

 
     // this method is called from the default EVT_HEADER_SEPARATOR_DCLICK
     // handler to update the fitting column width of the given column, it
 
     // this method is called from the default EVT_HEADER_SEPARATOR_DCLICK
     // handler to update the fitting column width of the given column, it


@@ -174,6 +174,15 @@ protected:
         wxFAIL_MSG( "must be overridden if called" );
     }
 
         wxFAIL_MSG( "must be overridden if called" );
     }
 

+    // this method is called from ShowCustomizeDialog() to reorder all columns
+    // at once and should be implemented for controls using wxHD_ALLOW_REORDER
+    // style (there is no need to call SetColumnsOrder() from here, this is
+    // done by the control itself)
+    virtual void UpdateColumnsOrder(const wxArrayInt& WXUNUSED(order))
+    {
+        wxFAIL_MSG( "must be overridden if called" );
+    }
+

     // this method can be overridden in the derived classes to do something
     // (e.g. update/resize some internal data structures) before the number of
     // columns in the control changes
     // this method can be overridden in the derived classes to do something
     // (e.g. update/resize some internal data structures) before the number of
     // columns in the control changes


@@ -302,7 +311,7 @@ public:
 
 protected:
     // implement/override base class methods
 
 protected:
     // implement/override base class methods

-    virtual wxHeaderColumn& GetColumn(unsigned int idx);
+    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const;

     virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle);
 
     // and define another one to be overridden in the derived classes: it
     virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle);
 
     // and define another one to be overridden in the derived classes: it