Ribbon compilation fixes for OS X.

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

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 961c42b5d4e020af13aca5047d407992832097cc..88f63ed867ab36cd1520215e019a6bd29f976df5 100644 (file)
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -23,8 +23,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
+#if wxUSE_HEADERCTRL

 
 #include "wx/headerctrl.h"
 
 
 #include "wx/headerctrl.h"
 


@@ -92,33 +91,8 @@ wxHeaderCtrl::~wxHeaderCtrl()
 
 void wxHeaderCtrl::DoSetCount(unsigned int count)
 {
 
 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;
-    }
-    else // count didn't really change
-    {
-        return;
-    }
+    // update the column indices order array before changing m_numColumns
+    DoResizeColumnIndices(m_colIndices, count);

 
     m_numColumns = count;
 
 
     m_numColumns = count;
 


@@ -159,19 +133,20 @@ void wxHeaderCtrl::DoScrollHorz(int dx)
 
 wxSize wxHeaderCtrl::DoGetBestSize() const
 {
 
 wxSize wxHeaderCtrl::DoGetBestSize() const
 {

+    wxWindow *win = GetParent();
+    int height = wxRendererNative::Get().GetHeaderButtonHeight( win );
+

     // the vertical size is rather arbitrary but it looks better if we leave
     // some space around the text
     const wxSize size(IsEmpty() ? wxHeaderCtrlBase::DoGetBestSize().x
                                 : GetColEnd(GetColumnCount() - 1),
     // the vertical size is rather arbitrary but it looks better if we leave
     // some space around the text
     const wxSize size(IsEmpty() ? wxHeaderCtrlBase::DoGetBestSize().x
                                 : GetColEnd(GetColumnCount() - 1),

-                      (7*GetCharHeight())/4);
+                                height ); // (7*GetCharHeight())/4);

     CacheBestSize(size);
     return size;
 }
 
 int wxHeaderCtrl::GetColStart(unsigned int idx) const
 {
     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++ )
     {
     int pos = m_scrollOffset;
     for ( unsigned n = 0; ; n++ )
     {


@@ -179,7 +154,7 @@ int wxHeaderCtrl::GetColStart(unsigned int idx) const
         if ( i == idx )
             break;
 
         if ( i == idx )
             break;
 

-        const wxHeaderColumn& col = self->GetColumn(i);
+        const wxHeaderColumn& col = GetColumn(i);

         if ( col.IsShown() )
             pos += col.GetWidth();
     }
         if ( col.IsShown() )
             pos += col.GetWidth();
     }


@@ -191,19 +166,17 @@ int wxHeaderCtrl::GetColEnd(unsigned int idx) const
 {
     int x = GetColStart(idx);
 
 {
     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
 {
 }
 
 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];
     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;
 
         if ( col.IsHidden() )
             continue;
 


@@ -229,6 +202,8 @@ unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
         }
     }
 
         }
     }
 

+    if ( onSeparator )
+        *onSeparator = false;

     return COL_NONE;
 }
 
     return COL_NONE;
 }
 


@@ -283,26 +258,14 @@ void wxHeaderCtrl::ClearMarkers()
     dcover.Clear();
 }
 
     dcover.Clear();
 }
 

-void wxHeaderCtrl::UpdateResizingMarker(int xPhysical)
-{
-    wxClientDC dc(this);
-
-    wxDCOverlay dcover(m_overlay, &dc);
-    dcover.Clear();
-
-    // unfortunately drawing the marker over the parent window doesn't work as
-    // it's usually covered by another window (the main control view) so just
-    // draw the marker over the header itself, even if it makes it not very
-    // useful
-    dc.SetPen(*wxLIGHT_GREY_PEN);
-    dc.DrawLine(xPhysical, 0, xPhysical, GetClientSize().y);
-}
-

 void wxHeaderCtrl::EndDragging()
 {
 void wxHeaderCtrl::EndDragging()
 {

-    ClearMarkers();
-
-    m_overlay.Reset();
+    // We currently only use markers for reordering, not for resizing
+    if (IsReordering())
+    {
+        ClearMarkers();
+        m_overlay.Reset();
+    }

 
     // don't use the special dragging cursor any more
     SetCursor(wxNullCursor);
 
     // don't use the special dragging cursor any more
     SetCursor(wxNullCursor);


@@ -369,7 +332,6 @@ void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical)
         }
         //else: we had already done the above when we started
 
         }
         //else: we had already done the above when we started
 

-        UpdateResizingMarker(xPhysical);

     }
 }
 
     }
 }
 


@@ -438,10 +400,12 @@ void wxHeaderCtrl::StartReordering(unsigned int col, int xPhysical)
     SetCursor(wxCursor(wxCURSOR_HAND));
     CaptureMouse();
 
     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" );
 
 {
     wxASSERT_MSG( IsReordering(), "shouldn't be called if we're not reordering" );
 


@@ -449,20 +413,33 @@ void wxHeaderCtrl::EndReordering(int xPhysical)
 
     ReleaseMouse();
 
 
     ReleaseMouse();
 

-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_REORDER, GetId());
-    event.SetEventObject(this);
-    event.SetColumn(m_colBeingReordered);
+    const int colOld = m_colBeingReordered,
+              colNew = FindColumnAtPoint(xPhysical);
+
+    m_colBeingReordered = COL_NONE;

 
 

-    const unsigned pos = GetColumnPos(FindColumnAtPoint(xPhysical));
-    event.SetNewOrder(pos);
+    if ( xPhysical - GetColStart(colOld) == m_dragOffset )
+        return false;

 
 

-    if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+    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;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -506,6 +483,11 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     int w, h;
     GetClientSize(&w, &h);
 
     int w, h;
     GetClientSize(&w, &h);
 

+#ifdef __WXGTK__
+//    int vw;
+//    GetVirtualSize(&vw, NULL);
+#endif
+

     wxAutoBufferedPaintDC dc(this);
 
     dc.SetBackground(GetBackgroundColour());
     wxAutoBufferedPaintDC dc(this);
 
     dc.SetBackground(GetBackgroundColour());


@@ -523,7 +505,7 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         if ( col.IsHidden() )
             continue;
 
         if ( col.IsHidden() )
             continue;
 

-        const int colWidth = col.GetWidth();
+        int colWidth = col.GetWidth();

 
         wxHeaderSortIconType sortArrow;
         if ( col.IsSortKey() )
 
         wxHeaderSortIconType sortArrow;
         if ( col.IsSortKey() )


@@ -547,11 +529,22 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
             state = wxCONTROL_DISABLED;
         }
 
             state = wxCONTROL_DISABLED;
         }
 

+        if (i == 0)
+           state |= wxCONTROL_SPECIAL;
+

         wxHeaderButtonParams params;
         params.m_labelText = col.GetTitle();
         params.m_labelBitmap = col.GetBitmap();
         params.m_labelAlignment = col.GetAlignment();
 
         wxHeaderButtonParams params;
         params.m_labelText = col.GetTitle();
         params.m_labelBitmap = col.GetBitmap();
         params.m_labelAlignment = col.GetAlignment();
 

+#ifdef __WXGTK__
+        if (i == count-1)
+        {
+//            colWidth = wxMax( colWidth, vw - xpos );
+            state |= wxCONTROL_DIRTY;
+        }
+#endif
+

         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,


@@ -613,12 +606,18 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
 
     if ( IsReordering() )
     {
 
     if ( IsReordering() )
     {

-        if ( mevent.LeftUp() )
-            EndReordering(xPhysical);
-        else // update the column position
+        if ( !mevent.LeftUp() )
+        {
+            // update the column position

             UpdateReorderingMarker(xPhysical);
 
             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;

     }
 
 
     }
 
 


@@ -720,3 +719,5 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
 }
 
 #endif // wxHAS_GENERIC_HEADERCTRL
 }
 
 #endif // wxHAS_GENERIC_HEADERCTRL

+
+#endif // wxUSE_HEADERCTRL