fix unused variable warning in release build

[wxWidgets.git] / src / generic / headerctrlg.cpp

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 4ec2a61120618eb18e1a8336d77d635297f63962..37d848fc184d9a4ddfef2ed873e1be3978494c02 100644 (file)
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -92,32 +92,12 @@ wxHeaderCtrl::~wxHeaderCtrl()
 
 void wxHeaderCtrl::DoSetCount(unsigned int count)
 {
-    // update the column indices array if necessary
-    if ( count > m_numColumns )
-    {
-        // all new columns have default positions equal to their indices
-        for ( unsigned n = m_numColumns; n < count; n++ )
-            m_colIndices.push_back(n);
-    }
-    else if ( count < m_numColumns )
-    {
-        // filter out all the positions which are invalid now while keeping the
-        // order of the remaining ones
-        wxArrayInt colIndices;
-        for ( unsigned n = 0; n < m_numColumns; n++ )
-        {
-            const unsigned idx = m_colIndices[n];
-            if ( idx < count )
-                colIndices.push_back(idx);
-        }
-
-        wxASSERT_MSG( colIndices.size() == count, "logic error" );
-
-        m_colIndices = colIndices;
-    }
+    // update the column indices order array before changing m_numColumns
+    DoResizeColumnIndices(m_colIndices, count);
 
     m_numColumns = count;
 
+    InvalidateBestSize();
     Refresh();
 }
 
@@ -128,6 +108,8 @@ unsigned int wxHeaderCtrl::DoGetCount() const
 
 void wxHeaderCtrl::DoUpdate(unsigned int idx)
 {
+    InvalidateBestSize();
+
     // we need to refresh not only this column but also the ones after it in
     // case it was shown or hidden or its width changed -- it would be nice to
     // avoid doing this unnecessary by storing the old column width (TODO)
@@ -154,15 +136,15 @@ wxSize wxHeaderCtrl::DoGetBestSize() const
 {
     // the vertical size is rather arbitrary but it looks better if we leave
     // some space around the text
-    return wxSize(IsEmpty() ? wxHeaderCtrlBase::DoGetBestSize().x
-                            : GetColEnd(GetColumnCount() - 1),
-                  (7*GetCharHeight())/4);
+    const wxSize size(IsEmpty() ? wxHeaderCtrlBase::DoGetBestSize().x
+                                : GetColEnd(GetColumnCount() - 1),
+                      (7*GetCharHeight())/4);
+    CacheBestSize(size);
+    return size;
 }
 
 int wxHeaderCtrl::GetColStart(unsigned int idx) const
 {
-    wxHeaderCtrl * const self = const_cast<wxHeaderCtrl *>(this);
-
     int pos = m_scrollOffset;
     for ( unsigned n = 0; ; n++ )
     {
@@ -170,7 +152,7 @@ int wxHeaderCtrl::GetColStart(unsigned int idx) const
         if ( i == idx )
             break;
 
-        const wxHeaderColumn& col = self->GetColumn(i);
+        const wxHeaderColumn& col = GetColumn(i);
         if ( col.IsShown() )
             pos += col.GetWidth();
     }
@@ -182,19 +164,17 @@ int wxHeaderCtrl::GetColEnd(unsigned int idx) const
 {
     int x = GetColStart(idx);
 
-    return x + const_cast<wxHeaderCtrl *>(this)->GetColumn(idx).GetWidth();
+    return x + GetColumn(idx).GetWidth();
 }
 
 unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
 {
-    wxHeaderCtrl * const self = const_cast<wxHeaderCtrl *>(this);
-
     int pos = 0;
     const unsigned count = GetColumnCount();
     for ( unsigned n = 0; n < count; n++ )
     {
         const unsigned idx = m_colIndices[n];
-        const wxHeaderColumn& col = self->GetColumn(idx);
+        const wxHeaderColumn& col = GetColumn(idx);
         if ( col.IsHidden() )
             continue;
 
@@ -220,6 +200,8 @@ unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
         }
     }
 
+    if ( onSeparator )
+        *onSeparator = false;
     return COL_NONE;
 }
 
@@ -429,10 +411,12 @@ void wxHeaderCtrl::StartReordering(unsigned int col, int xPhysical)
     SetCursor(wxCursor(wxCURSOR_HAND));
     CaptureMouse();
 
-    UpdateReorderingMarker(xPhysical);
+    // do not call UpdateReorderingMarker() here: we don't want to give
+    // feedback for reordering until the user starts to really move the mouse
+    // as he might want to just click on the column and not move it at all
 }
 
-void wxHeaderCtrl::EndReordering(int xPhysical)
+bool wxHeaderCtrl::EndReordering(int xPhysical)
 {
     wxASSERT_MSG( IsReordering(), "shouldn't be called if we're not reordering" );
 
@@ -440,20 +424,33 @@ void wxHeaderCtrl::EndReordering(int xPhysical)
 
     ReleaseMouse();
 
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_REORDER, GetId());
-    event.SetEventObject(this);
-    event.SetColumn(m_colBeingReordered);
+    const int colOld = m_colBeingReordered,
+              colNew = FindColumnAtPoint(xPhysical);
 
-    const unsigned pos = GetColumnPos(FindColumnAtPoint(xPhysical));
-    event.SetNewOrder(pos);
+    m_colBeingReordered = COL_NONE;
 
-    if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+    if ( xPhysical - GetColStart(colOld) == m_dragOffset )
+        return false;
+
+    if ( colNew != colOld )
     {
-        // do reorder the columns
-        DoMoveCol(m_colBeingReordered, pos);
+        wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_REORDER, GetId());
+        event.SetEventObject(this);
+        event.SetColumn(colOld);
+
+        const unsigned pos = GetColumnPos(FindColumnAtPoint(xPhysical));
+        event.SetNewOrder(pos);
+
+        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+        {
+            // do reorder the columns
+            DoMoveCol(colOld, pos);
+        }
     }
 
-    m_colBeingReordered = COL_NONE;
+    // whether we moved the column or not, the user did move the mouse and so
+    // did try to do it so return true
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -604,12 +601,18 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
 
     if ( IsReordering() )
     {
-        if ( mevent.LeftUp() )
-            EndReordering(xPhysical);
-        else // update the column position
+        if ( !mevent.LeftUp() )
+        {
+            // update the column position
             UpdateReorderingMarker(xPhysical);
 
-        return;
+            return;
+        }
+
+        // finish reordering and continue to generate a click event below if we
+        // didn't really reorder anything
+        if ( EndReordering(xPhysical) )
+            return;
     }