X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a44a646b7e4036b55871da474e5277442560e6f8..4e1fd51de7349097a30b3b994e5c6e9b074de77c:/src/mac/carbon/listctrl_mac.cpp

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index bdda88c39e..3b4941dc08 100644
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -1069,25 +1069,28 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     {
         if (!IsVirtual())
         {
-            if (info.m_itemId > 0 && info.m_itemId < GetItemCount())
+            if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
                 m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
         }
         else
         {
-            info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
-            info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );
-            if (info.GetMask() & wxLIST_MASK_STATE)
+            if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
             {
-                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 ))
-                    info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
-            }
+                info.SetText( OnGetItemText(info.m_itemId, info.m_col) );
+                info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) );
+                if (info.GetMask() & wxLIST_MASK_STATE)
+                {
+                    if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 ))
+                        info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
+                }
 
-            wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
-            if (attrs)
-            {
-                info.SetFont( attrs->GetFont() );
-                info.SetBackgroundColour( attrs->GetBackgroundColour() );
-                info.SetTextColour( attrs->GetTextColour() );
+                wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
+                if (attrs)
+                {
+                    info.SetFont( attrs->GetFont() );
+                    info.SetBackgroundColour( attrs->GetBackgroundColour() );
+                    info.SetTextColour( attrs->GetTextColour() );
+                }
             }
         }
     }
@@ -1564,16 +1567,19 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
             long count = m_dbImpl->MacGetCount() ;
             for ( long line = item + 1 ; line < count; line++ )
             {
-                wxMacDataItem* id = m_dbImpl->GetItemFromLine(line);
+                DataBrowserItemID id = line + 1;
+                if ( !IsVirtual() )
+                    id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
                 
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
                 
-                if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) )
+                if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
                     return line;
             }
         }
-        else if ( geom == wxLIST_NEXT_ABOVE )
+        
+        if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE )
         {
             int item2 = item;
             if ( item2 == -1 )
@@ -1581,12 +1587,14 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 
             for ( long line = item2 - 1 ; line >= 0; line-- )
             {
-                wxMacDataItem* id = m_dbImpl->GetItemFromLine(line);
+                DataBrowserItemID id = line + 1; 
+                if ( !IsVirtual() )
+                    id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
                 
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
                 
-                if ( (state & wxLIST_STATE_SELECTED) && m_dbImpl->IsItemSelected( id ) )
+                if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
                     return line;
             }
         }
@@ -2583,17 +2591,21 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         }
         else
         {
-            text = list->OnGetItemText( (long)itemID-1, listColumn );
-            imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn );
-            wxListItemAttr* attrs = list->OnGetItemAttr( (long)itemID-1 );
-            if (attrs)
+            long itemNum = (long)itemID-1;
+            if (itemNum >= 0 && itemNum < list->GetItemCount())
             {
-                if (attrs->HasBackgroundColour())
-                    bgColor = attrs->GetBackgroundColour();
-                if (attrs->HasTextColour())
-                    color = attrs->GetTextColour();
-                if (attrs->HasFont())
-                    font = attrs->GetFont();
+                text = list->OnGetItemText( itemNum, listColumn );
+                imgIndex = list->OnGetItemColumnImage( itemNum, listColumn );
+                wxListItemAttr* attrs = list->OnGetItemAttr( itemNum );
+                if (attrs)
+                {
+                    if (attrs->HasBackgroundColour())
+                        bgColor = attrs->GetBackgroundColour();
+                    if (attrs->HasTextColour())
+                        color = attrs->GetTextColour();
+                    if (attrs->HasFont())
+                        font = attrs->GetFont();
+                }
             }
         }
     }
@@ -2788,8 +2800,12 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
         }
         else
         {
-            text = list->OnGetItemText( (long)itemID-1, listColumn );
-            imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn );
+            long itemNum = (long)itemID-1;
+            if (itemNum >= 0 && itemNum < list->GetItemCount())
+            {
+                text = list->OnGetItemText( itemNum, listColumn );
+                imgIndex = list->OnGetItemColumnImage( itemNum, listColumn );
+            }
         }
     }
 
@@ -3000,9 +3016,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
 
             long itemNum = (long)itemOneID;
             long otherItemNum = (long)itemTwoID;
-            itemText = list->OnGetItemText( itemNum-1, colId );
-            otherItemText = list->OnGetItemText( otherItemNum-1, colId );
-            
+
             // virtual listctrls don't support sorting
             return itemNum < otherItemNum;
         }