Add wxToolBarToolBase, missing flags, etc.

[wxWidgets.git] / include / wx / generic / headerctrlg.h

diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h
index 3550f179cad58404b3b0a99bf7972df6fd37c8f8..8c9a842d3c5cfd5501395215bb822a813928047e 100644 (file)
--- a/include/wx/generic/headerctrlg.h
+++ b/include/wx/generic/headerctrlg.h
@@ -127,15 +127,16 @@ private:
     // same functions as above but for column moving/reordering instead of
     // resizing
     void StartReordering(unsigned int col, int xPhysical);
     // same functions as above but for column moving/reordering instead of
     // resizing
     void StartReordering(unsigned int col, int xPhysical);

-    void EndReordering(int xPhysical);
+
+    // returns true if we did drag the column somewhere else or false if we
+    // didn't really move it -- in this case we consider that no reordering
+    // took place and that a normal column click event should be generated
+    bool EndReordering(int xPhysical);

 
     // constrain the given position to be larger than the start position of the
     // given column plus its minimal width and return the effective width
     int ConstrainByMinWidth(unsigned int col, int& xPhysical);
 
 
     // constrain the given position to be larger than the start position of the
     // given column plus its minimal width and return the effective width
     int ConstrainByMinWidth(unsigned int col, int& xPhysical);
 

-    // update the current position of the resizing marker
-    void UpdateResizingMarker(int xPhysical);
-

     // update the information displayed while a column is being moved around
     void UpdateReorderingMarker(int xPhysical);
 
     // update the information displayed while a column is being moved around
     void UpdateReorderingMarker(int xPhysical);
 


@@ -173,7 +174,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxHeaderCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);

 };
 
 #endif // _WX_GENERIC_HEADERCTRLG_H_
 };
 
 #endif // _WX_GENERIC_HEADERCTRLG_H_