get rid of one of the extra slashes in the download URLs

[wxWidgets.git] / src / mac / carbon / listctrl_mac.cpp

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index b54dba2296e2d6340e7d6f75be0bb8632e67e06e..1b758fb0a72404ced9f188c8b015edee55acc55f 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -1012,10 +1012,10 @@ bool wxListCtrl::GetItem(wxListItem& info) const
             info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );
             if (info.GetMask() & wxLIST_MASK_STATE)
             {
-                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) 
+                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 ))
                     info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
             }
-            
+
             wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
             if (attrs)
             {
@@ -1071,11 +1071,11 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
         if ( HasFlag(wxLC_VIRTUAL) )
         {
             if (stateMask == wxLIST_STATE_SELECTED)
-            { 
-                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), item+1 )) 
+            {
+                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), item+1 ))
                     return wxLIST_STATE_SELECTED;
                 else
-                    return 0; 
+                    return 0;
             }
         }
         else
@@ -1092,6 +1092,8 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
             return info.m_state;
         }
     }
+
+    return 0;
 }
 
 // Sets the item state
@@ -1099,13 +1101,13 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemState(item, state, stateMask);
-        
+
     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;
         if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
             option = kDataBrowserItemsRemove;
-    
+
         if (item == -1)
         {
             if ( HasFlag(wxLC_VIRTUAL) )
@@ -1731,7 +1733,31 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, str, partial);
 
-    return -1;
+    wxString str_upper = str.Upper();
+
+    long idx = start;
+    if (idx < 0)
+        idx = 0;
+    long count = GetItemCount();
+
+    while (idx < count)
+    {
+        wxString line_upper = GetItemText(idx).Upper();
+        if (!partial)
+        {
+            if (line_upper == str_upper )
+                return idx;
+        }
+        else
+        {
+            if (line_upper.find(str_upper) == 0)
+                return idx;
+        }
+
+        idx++;
+    };
+
+    return wxNOT_FOUND;
 }
 
 // Find an item whose data matches this data, starting from the item after 'start'
@@ -1741,7 +1767,9 @@ long wxListCtrl::FindItem(long start, long data)
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, data);
 
-    long  idx = start + 1;
+    long idx = start;
+    if (idx < 0)
+        idx = 0;
     long count = GetItemCount();
 
     while (idx < count)
@@ -1751,7 +1779,7 @@ long wxListCtrl::FindItem(long start, long data)
         idx++;
     };
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 // Find an item nearest this position in the specified direction, starting from
@@ -1822,7 +1850,7 @@ int wxListCtrl::GetScrollPos(int orient) const
 {
     if (m_genericImpl)
         return m_genericImpl->GetScrollPos(orient);
-        
+
     if (m_dbImpl)
     {
         UInt32 offsetX, offsetY;
@@ -1853,6 +1881,8 @@ long wxListCtrl::InsertItem(wxListItem& info)
             info.m_itemId = count;
 
         m_dbImpl->MacInsertItem(info.m_itemId, &info );
+        wxMacDataItem* dataItem = m_dbImpl->GetItemFromLine(info.m_itemId);
+        
         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
@@ -1997,6 +2027,12 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
     {
         m_compareFunc = fn;
         m_compareFuncData = data;
+        SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true);
+        
+        // we need to do this after each call, else we get a crash from wxPython when
+        // SortItems is called the second time.
+        m_compareFunc = NULL;
+        m_compareFuncData = 0;
     }
 
     return true;
@@ -2088,10 +2124,10 @@ void wxListCtrl::SetItemCount(long count)
         // we need to temporarily disable the new item creation notification
         // procedure to speed things up
         // FIXME: Even this doesn't seem to help much...
-        
+
         // FIXME: Find a more efficient way to do this.
         m_dbImpl->MacClear();
-        
+
         DataBrowserCallbacks callbacks;
         DataBrowserItemNotificationUPP itemUPP;
         GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);
@@ -2142,7 +2178,7 @@ void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
 #if wxUSE_DRAG_AND_DROP
     if (m_genericImpl)
         m_genericImpl->SetDropTarget( dropTarget );
-        
+
     if (m_dbImpl)
         wxWindow::SetDropTarget( dropTarget );
 #endif
@@ -2153,7 +2189,7 @@ wxDropTarget *wxListCtrl::GetDropTarget() const
 #if wxUSE_DRAG_AND_DROP
     if (m_genericImpl)
         return m_genericImpl->GetDropTarget();
-        
+
     if (m_dbImpl)
         return wxWindow::GetDropTarget();
 #endif
@@ -2754,7 +2790,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         }
         else
         {
-            event.m_itemIndex = (long)itemID;
+            event.m_itemIndex = (long)itemID-1;
         }
 
         switch (message)
@@ -2818,19 +2854,23 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
         {
             wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
-            
-            // FIXME: This code causes a crash in wxPython for some reason
-            // and moreover, further testing shows that the column click event
-            // is only sent to the list ctrl after the native control has finished
-            // sorting items anyway. So just disable this for now.
-            
-            //wxListCtrlCompare func = list->GetCompareFunc();
-            //long item1 = GetLineFromItem(item);
-            //long item2 = GetLineFromItem(otherItem);
-            
-            //if (func != NULL && item->HasColumnInfo(colId) && otherItem->HasColumnInfo(colId))
-            //    return func(item1, item2, list->GetCompareFuncData()) >= 0;
 
+            wxListCtrlCompare func = list->GetCompareFunc();
+            if (func != NULL)
+            {
+                long item1 = -1;
+                long item2 = -1;
+                if (item && item->HasColumnInfo(0))
+                    item1 = item->GetColumnInfo(0)->GetData();
+                if (otherItem && otherItem->HasColumnInfo(0))
+                    item2 = otherItem->GetColumnInfo(0)->GetData(); 
+                
+                if (item1 > -1 && item2 > -1)
+                {
+                    int result = func(item1, item2, list->GetCompareFuncData());
+                    return result >= 0;
+                }
+            }
             if (item->HasColumnInfo(colId))
                 itemText = item->GetColumnInfo(colId)->GetText();
             if (otherItem->HasColumnInfo(colId))
@@ -2877,8 +2917,19 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
     if (item)
     {
         wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
+        bool hasInfo = listItem->HasColumnInfo( column );
         listItem->SetColumnInfo( column, item );
         UpdateState(dataItem, item);
+        
+        wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+        
+        // NB: When this call was made before a control was completely shown, it would
+        // update the item prematurely (i.e. no text would be listed) and, on show, 
+        // only the sorted column would be refreshed, meaning only first column text labels
+        // would be shown. Making sure not to update items until the control is visible
+        // seems to fix this issue.
+        if (hasInfo && list->IsShown())
+            UpdateItem( wxMacDataBrowserRootContainer, listItem , kMinColumnId + column );
     }
 }