X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba3241e64324f2f84688556f7a574441504cc885..589abe2cdb7ce83a8c4f3c8785137974f8c3d30f:/src/mac/carbon/listctrl_mac.cpp

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index 5450de5164..1b758fb0a7 100644
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -149,7 +149,10 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                     GetDataBrowserSortProperty(controlRef, &col);
                     int column = col - kMinColumnId;
                     le.m_col = column;
-                    window->GetEventHandler()->ProcessEvent( le );
+                    // FIXME: we can't use the sort property for virtual listctrls
+                    // so we need to find a better way to determine which column was clicked...
+                    if (!window->IsVirtual())
+                        window->GetEventHandler()->ProcessEvent( le );
                 }
                 result = CallNextEventHandler(handler, event);
                 break;
@@ -186,7 +189,7 @@ public:
     virtual bool HasColumnInfo( unsigned int column );
 
     virtual void SetColumnTextValue( unsigned int column, const wxString& text );
-    virtual const wxString& GetColumnTextValue( unsigned int column );
+    virtual wxString GetColumnTextValue( unsigned int column );
 
     virtual int GetColumnImageValue( unsigned int column );
     virtual void SetColumnImageValue( unsigned int column, int imageIndex );
@@ -390,11 +393,12 @@ wxListCtrlTextCtrlWrapper::wxListCtrlTextCtrlWrapper(wxListCtrl *owner,
     m_aboutToFinish = false;
 
     wxRect rectLabel;
+    int offset = 8;
     owner->GetItemRect(itemEdit, rectLabel);
 
     m_text->Create(owner, wxID_ANY, m_startValue,
-                   wxPoint(rectLabel.x+8,rectLabel.y),
-                   wxSize(rectLabel.width,rectLabel.height));
+                   wxPoint(rectLabel.x+offset,rectLabel.y),
+                   wxSize(rectLabel.width-offset,rectLabel.height));
     m_text->SetFocus();
 
     m_text->PushEventHandler(this);
@@ -620,16 +624,21 @@ bool wxListCtrl::Create(wxWindow *parent,
     // for now, we'll always use the generic list control for ICON and LIST views,
     // because they dynamically change the number of columns on resize.
     // Also, allow the user to set it to use the list ctrl as well.
-    // Also, use generic list control in VIRTUAL mode.
     if ( (wxSystemOptions::HasOption( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL )
             && (wxSystemOptions::GetOptionInt( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) == 1)) ||
             (style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) )
     {
         m_macIsUserPane = true;
 
-        if ( !wxWindow::Create(parent, id, pos, size, style & wxNO_BORDER, name) )
+        long paneStyle = style;
+        paneStyle &= ~wxSIMPLE_BORDER;
+        paneStyle &= ~wxDOUBLE_BORDER;
+        paneStyle &= ~wxSUNKEN_BORDER;
+        paneStyle &= ~wxRAISED_BORDER;
+        paneStyle &= ~wxSTATIC_BORDER;
+        if ( !wxWindow::Create(parent, id, pos, size, paneStyle | wxNO_BORDER, name) )
             return false;
-        
+
         // since the generic control is a child, make sure we position it at 0, 0
         m_genericImpl = new wxGenericListCtrlHook(this, id, wxPoint(0, 0), size, style, validator, name);
         m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) );
@@ -722,6 +731,23 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
     if (m_genericImpl)
         m_genericImpl->SetSize(0, 0, width, height, sizeFlags);
+
+    // determine if we need a horizontal scrollbar, and add it if so
+    if (m_dbImpl)
+    {
+        int totalWidth = 0;
+        for (int column = 0; column < GetColumnCount(); column++)
+        {
+              totalWidth += m_dbImpl->GetColumnWidth( column );
+        }
+
+        Boolean vertScrollBar;
+        GetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), NULL, &vertScrollBar );
+        if (totalWidth > width)
+            SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), true, vertScrollBar );
+        else
+            SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), false, vertScrollBar );
+    }
 }
 
 wxSize wxListCtrl::DoGetBestSize() const
@@ -782,7 +808,6 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 
     if (m_dbImpl)
     {
-
         wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
         wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
         wxListItem* column = node->GetData();
@@ -813,6 +838,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
 
     if (m_dbImpl)
     {
+        long mask = item.GetMask();
         if ( col >= (int)m_colsInfo.GetCount() )
         {
             wxListItem* listItem = new wxListItem(item);
@@ -822,7 +848,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
         {
             wxListItem listItem;
             GetColumn( col, listItem );
-            long mask = item.GetMask();
+
             if (mask & wxLIST_MASK_TEXT)
                 listItem.SetText(item.GetText());
             if (mask & wxLIST_MASK_DATA)
@@ -921,10 +947,22 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
         {
             for (int column = 0; column < GetColumnCount(); column++)
             {
+                wxListItem colInfo;
+                GetColumn(col, colInfo);
+
+                colInfo.SetWidth(width);
+                SetColumn(col, colInfo);
+
                 m_dbImpl->SetColumnWidth(col, mywidth);
             }
         }
-        else{
+        else
+        {
+            wxListItem colInfo;
+            GetColumn(col, colInfo);
+
+            colInfo.SetWidth(width);
+            SetColumn(col, colInfo);
             m_dbImpl->SetColumnWidth(col, mywidth);
         }
         return true;
@@ -972,6 +1010,12 @@ bool wxListCtrl::GetItem(wxListItem& info) const
         {
             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)
             {
@@ -1022,16 +1066,34 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
     if (m_genericImpl)
         return m_genericImpl->GetItemState(item, stateMask);
 
-    wxListItem info;
+    if (m_dbImpl)
+    {
+        if ( HasFlag(wxLC_VIRTUAL) )
+        {
+            if (stateMask == wxLIST_STATE_SELECTED)
+            {
+                if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), item+1 ))
+                    return wxLIST_STATE_SELECTED;
+                else
+                    return 0;
+            }
+        }
+        else
+        {
+            wxListItem info;
 
-    info.m_mask = wxLIST_MASK_STATE;
-    info.m_stateMask = stateMask;
-    info.m_itemId = item;
+            info.m_mask = wxLIST_MASK_STATE;
+            info.m_stateMask = stateMask;
+            info.m_itemId = item;
 
-    if (!GetItem(info))
-        return 0;
+            if (!GetItem(info))
+                return 0;
 
-    return info.m_state;
+            return info.m_state;
+        }
+    }
+
+    return 0;
 }
 
 // Sets the item state
@@ -1040,12 +1102,51 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
     if (m_genericImpl)
         return m_genericImpl->SetItemState(item, state, stateMask);
 
-    wxListItem info;
-    info.m_mask = wxLIST_MASK_STATE;
-    info.m_stateMask = stateMask;
-    info.m_state = state;
-    info.m_itemId = item;
-    return SetItem(info);
+    if (m_dbImpl)
+    {
+        DataBrowserSetOption option = kDataBrowserItemsAdd;
+        if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
+            option = kDataBrowserItemsRemove;
+
+        if (item == -1)
+        {
+            if ( HasFlag(wxLC_VIRTUAL) )
+            {
+                wxMacDataItemBrowserSelectionSuppressor suppressor(m_dbImpl);
+                m_dbImpl->SetSelectedAllItems(option);
+            }
+            else
+            {
+                for(int i = 0; i < GetItemCount();i++)
+                {
+                    wxListItem info;
+                    info.m_itemId = i;
+                    info.m_mask = wxLIST_MASK_STATE;
+                    info.m_stateMask = stateMask;
+                    info.m_state = state;
+                    SetItem(info);
+                }
+            }
+        }
+        else
+        {
+            if ( HasFlag(wxLC_VIRTUAL) )
+            {
+                long itemID = item+1;
+                SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
+            }
+            else
+            {
+                wxListItem info;
+                info.m_itemId = item;
+                info.m_mask = wxLIST_MASK_STATE;
+                info.m_stateMask = stateMask;
+                info.m_state = state;
+                return SetItem(info);
+            }
+        }
+    }
+    return true;
 }
 
 // Sets the item image
@@ -1168,7 +1269,7 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
             id = (DataBrowserItemID) thisItem;
         }
         else
-            id = item;
+            id = item+1;
 
         GetDataBrowserItemPartBounds( m_dbImpl->GetControlRef(), id, col, part, &bounds );
 
@@ -1365,6 +1466,14 @@ long wxListCtrl::GetTopItem() const
     if (m_genericImpl)
         return m_genericImpl->GetTopItem();
 
+    if (m_dbImpl)
+    {
+        int flags = 0;
+        long item = HitTest( wxPoint(1, 1), flags);
+        if (flags == wxLIST_HITTEST_ONITEM)
+            return item;
+    }
+
     return 0;
 }
 
@@ -1520,7 +1629,7 @@ bool wxListCtrl::DeleteAllColumns()
         m_dbImpl->GetColumnCount(&cols);
         for (UInt32 col = 0; col < cols; col++)
         {
-                DeleteColumn(col);
+                DeleteColumn(0);
         }
     }
 
@@ -1624,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'
@@ -1634,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)
@@ -1644,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
@@ -1680,6 +1815,9 @@ wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
         if ( !(GetWindowStyleFlag() & wxLC_NO_HEADER) )
             y -= colHeaderHeight;
 
+        if ( y < 0 )
+            return -1;
+
         int row = y / rowHeight;
         DataBrowserItemID id;
         m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );
@@ -1708,6 +1846,23 @@ wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
     return -1;
 }
 
+int wxListCtrl::GetScrollPos(int orient) const
+{
+    if (m_genericImpl)
+        return m_genericImpl->GetScrollPos(orient);
+
+    if (m_dbImpl)
+    {
+        UInt32 offsetX, offsetY;
+        m_dbImpl->GetScrollPosition( &offsetY, &offsetX );
+        if ( orient == wxHORIZONTAL )
+           return offsetX;
+        else
+           return offsetY;
+    }
+
+    return 0;
+}
 
 // Inserts an item, returning the index of the new item if successful,
 // -1 otherwise.
@@ -1718,7 +1873,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
     if (m_genericImpl)
         return m_genericImpl->InsertItem(info);
 
-    if (m_dbImpl)
+    if (m_dbImpl && !IsVirtual())
     {
         int count = GetItemCount();
 
@@ -1726,13 +1881,15 @@ 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;
         GetEventHandler()->ProcessEvent( event );
+        return info.m_itemId;
     }
-
-    return info.m_itemId;
+    return -1;
 }
 
 long wxListCtrl::InsertItem(long index, const wxString& label)
@@ -1870,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;
@@ -1961,6 +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);
@@ -2006,6 +2173,28 @@ void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
     RefreshRect(rect);
 }
 
+void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
+{
+#if wxUSE_DRAG_AND_DROP
+    if (m_genericImpl)
+        m_genericImpl->SetDropTarget( dropTarget );
+
+    if (m_dbImpl)
+        wxWindow::SetDropTarget( dropTarget );
+#endif
+}
+
+wxDropTarget *wxListCtrl::GetDropTarget() const
+{
+#if wxUSE_DRAG_AND_DROP
+    if (m_genericImpl)
+        return m_genericImpl->GetDropTarget();
+
+    if (m_dbImpl)
+        return wxWindow::GetDropTarget();
+#endif
+    return NULL;
+}
 
 // wxMac internal data structures
 
@@ -2039,7 +2228,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
     }
 
     wxListCtrl *list = wxDynamicCast( owner->GetPeer() , wxListCtrl );
-    if ( list )
+    if ( list && lb )
     {
         bool trigger = false;
 
@@ -2125,14 +2314,10 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
     if ( gDataBrowserDrawItemUPP == NULL )
         gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(DataBrowserDrawItemProc);
 
-//    if ( gDataBrowserEditItemUPP == NULL )
-//        gDataBrowserEditItemUPP = NewDataBrowserEditItemUPP(DataBrowserEditTextProc);
-
     if ( gDataBrowserHitTestUPP == NULL )
         gDataBrowserHitTestUPP = NewDataBrowserHitTestUPP(DataBrowserHitTestProc);
 
     callbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP;
-//    callbacks.u.v1.editTextCallback = gDataBrowserEditItemUPP;
     callbacks.u.v1.hitTestCallback = gDataBrowserHitTestUPP;
 
     SetDataBrowserCustomCallbacks( GetControlRef(), &callbacks );
@@ -2201,7 +2386,6 @@ bool wxMacDataBrowserListCtrlControl::ConfirmEditText(
         Rect *maxEditTextRect,
         Boolean *shrinkToFit)
 {
-    //wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
     return false;
 }
 
@@ -2331,6 +2515,14 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     ThemeDrawingState savedState = NULL;
     CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
     RGBColor labelColor;
+    labelColor.red = 0;
+    labelColor.green = 0;
+    labelColor.blue = 0;
+
+    RGBColor backgroundColor;
+    backgroundColor.red = 255;
+    backgroundColor.green = 255;
+    backgroundColor.blue = 255;
 
     GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
               &enclosingRect);
@@ -2342,20 +2534,25 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
 
     active = IsControlActive(GetControlRef());
 
+    // don't paint the background over the vertical rule line
+    if ( list->GetWindowStyleFlag() & wxLC_VRULES )
+    {
+        enclosingCGRect.origin.x += 1;
+        enclosingCGRect.size.width -= 1;
+    }
     if (itemState == kDataBrowserItemIsSelected)
     {
-        RGBColor foregroundColor;
 
         GetThemeDrawingState(&savedState);
 
-        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &foregroundColor);
+        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
         GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
 
         CGContextSaveGState(context);
 
-        CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
-                      (float)foregroundColor.green / (float)USHRT_MAX,
-                      (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+        CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
+                      (float)backgroundColor.green / (float)USHRT_MAX,
+                      (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);
         CGContextFillRect(context, enclosingCGRect);
 
         CGContextRestoreGState(context);
@@ -2367,21 +2564,15 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
             labelColor = MAC_WXCOLORREF( color.GetPixel() );
         else if (list->GetTextColour().Ok())
             labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
-        else
-        {
-            labelColor.red = 0;
-            labelColor.green = 0;
-            labelColor.blue = 0;
-        }
 
         if (bgColor.Ok())
         {
-            RGBColor foregroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+            backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
             CGContextSaveGState(context);
 
-            CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
-                          (float)foregroundColor.green / (float)USHRT_MAX,
-                          (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+            CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
+                          (float)backgroundColor.green / (float)USHRT_MAX,
+                          (float)backgroundColor.blue / (float)USHRT_MAX, 1.0);
             CGContextFillRect(context, enclosingCGRect);
 
             CGContextRestoreGState(context);
@@ -2397,16 +2588,11 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
             wxBitmap bmp = imageList->GetBitmap(imgIndex);
             IconRef icon = bmp.GetBitmapData()->GetIconRef();
 
-            RGBColor iconLabel;
-            iconLabel.red = 0;
-            iconLabel.green = 0;
-            iconLabel.blue = 0;
-
             CGContextSaveGState(context);
             CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
             CGContextScaleCTM(context,1.0f,-1.0f);
             PlotIconRefInContext(context, &iconCGRect, kAlignNone,
-              active ? kTransformNone : kTransformDisabled, &iconLabel,
+              active ? kTransformNone : kTransformDisabled, NULL,
               kPlotIconRefNormalFlags, icon);
 
             CGContextRestoreGState(context);
@@ -2484,7 +2670,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
         if (!m_isVirtual)
         {
             lcItem = (wxMacListCtrlItem*) itemID;
-            if (lcItem->HasColumnInfo(listColumn)){
+            if (lcItem && lcItem->HasColumnInfo(listColumn)){
                 wxListItem* item = lcItem->GetColumnInfo(listColumn);
                 if (item->GetMask() & wxLIST_MASK_TEXT)
                     text = item->GetText();
@@ -2604,7 +2790,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         }
         else
         {
-            event.m_itemIndex = (long)itemID;
+            event.m_itemIndex = (long)itemID-1;
         }
 
         switch (message)
@@ -2659,24 +2845,32 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     wxString itemText;
     wxString otherItemText;
     int colId = sortProperty - kMinColumnId;
-    long itemNum = 0;
-    long otherItemNum = 0;
 
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
 
-    // means we need to
     if (colId >= 0)
     {
         if (!m_isVirtual)
         {
             wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
-            wxListCtrlCompare func = list->GetCompareFunc();
-            if (func != NULL && item->HasColumnInfo(colId) && otherItem->HasColumnInfo(colId))
-                return func(item->GetColumnInfo(colId)->GetData(), otherItem->GetColumnInfo(colId)->GetData(), list->GetCompareFuncData()) >= 0;
 
-            itemNum = item->GetOrder();
-            otherItemNum = otherItem->GetOrder();
+            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))
@@ -2684,8 +2878,9 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
         }
         else
         {
-            itemNum = (long)itemOneID;
-            otherItemNum = (long)itemTwoID;
+
+            long itemNum = (long)itemOneID;
+            long otherItemNum = (long)itemTwoID;
             itemText = list->OnGetItemText( itemNum-1, colId );
             otherItemText = list->OnGetItemText( otherItemNum-1, colId );
 
@@ -2718,11 +2913,23 @@ wxMacDataBrowserListCtrlControl::~wxMacDataBrowserListCtrlControl()
 void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
 {
     wxMacDataItem* dataItem = GetItemFromLine(row);
+    wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
     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 );
     }
 }
 
@@ -2747,33 +2954,41 @@ void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxLis
 void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item )
 {
     wxMacDataItem* dataItem = GetItemFromLine(row);
+    wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") );
     // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
     //if (item)
     {
         wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
-        wxListItem* oldItem = listItem->GetColumnInfo( column );
 
-        long mask = item.GetMask();
-        if ( !mask )
-            // by default, get everything for backwards compatibility
-            mask = -1;
+        if (!listItem->HasColumnInfo( column ))
+            return;
 
-        if ( mask & wxLIST_MASK_TEXT )
-            item.SetText(oldItem->GetText());
-        if ( mask & wxLIST_MASK_IMAGE )
-            item.SetImage(oldItem->GetImage());
-        if ( mask & wxLIST_MASK_DATA )
-            item.SetData(oldItem->GetData());
-        if ( mask & wxLIST_MASK_STATE )
-            item.SetState(oldItem->GetState());
-        if ( mask & wxLIST_MASK_WIDTH )
-            item.SetWidth(oldItem->GetWidth());
-        if ( mask & wxLIST_MASK_FORMAT )
-            item.SetAlign(oldItem->GetAlign());
+        wxListItem* oldItem = listItem->GetColumnInfo( column );
 
-        item.SetTextColour(oldItem->GetTextColour());
-        item.SetBackgroundColour(oldItem->GetBackgroundColour());
-        item.SetFont(oldItem->GetFont());
+        if (oldItem)
+        {
+            long mask = item.GetMask();
+            if ( !mask )
+                // by default, get everything for backwards compatibility
+                mask = -1;
+
+            if ( mask & wxLIST_MASK_TEXT )
+                item.SetText(oldItem->GetText());
+            if ( mask & wxLIST_MASK_IMAGE )
+                item.SetImage(oldItem->GetImage());
+            if ( mask & wxLIST_MASK_DATA )
+                item.SetData(oldItem->GetData());
+            if ( mask & wxLIST_MASK_STATE )
+                item.SetState(oldItem->GetState());
+            if ( mask & wxLIST_MASK_WIDTH )
+                item.SetWidth(oldItem->GetWidth());
+            if ( mask & wxLIST_MASK_FORMAT )
+                item.SetAlign(oldItem->GetAlign());
+
+            item.SetTextColour(oldItem->GetTextColour());
+            item.SetBackgroundColour(oldItem->GetBackgroundColour());
+            item.SetFont(oldItem->GetFont());
+        }
     }
 }
 
@@ -2790,30 +3005,38 @@ wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
 
 wxMacListCtrlItem::wxMacListCtrlItem()
 {
-    m_rowItems = wxListItemList();
+    m_rowItems = wxListItemList( wxKEY_INTEGER );
 }
 
 int wxMacListCtrlItem::GetColumnImageValue( unsigned int column )
 {
-    return GetColumnInfo(column)->GetImage();
+    if ( HasColumnInfo(column) )
+        return GetColumnInfo(column)->GetImage();
+
+    return -1;
 }
 
 void wxMacListCtrlItem::SetColumnImageValue( unsigned int column, int imageIndex )
 {
-    GetColumnInfo(column)->SetImage(imageIndex);
+    if ( HasColumnInfo(column) )
+        GetColumnInfo(column)->SetImage(imageIndex);
 }
 
-const wxString& wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
+wxString wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
 {
     if ( column == 0 )
         return GetLabel();
 
-    return GetColumnInfo(column)->GetText();
+    if ( HasColumnInfo(column) )
+        return GetColumnInfo(column)->GetText();
+
+    return wxEmptyString;
 }
 
 void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& text )
 {
-    GetColumnInfo(column)->SetText(text);
+    if ( HasColumnInfo(column) )
+        GetColumnInfo(column)->SetText(text);
 
     // for compatibility with superclass APIs
     if ( column == 0 )
@@ -2822,7 +3045,7 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString&
 
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {
-    wxListItemList::compatibility_iterator node = m_rowItems.Item( column );
+    wxListItemList::compatibility_iterator node = m_rowItems.Find( column );
     wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
 
     return node->GetData();
@@ -2830,16 +3053,16 @@ wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 
 bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )
 {
-    return m_rowItems.GetCount() > column;
+    return m_rowItems.Find( column ) != NULL;
 }
 
 void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
 {
 
-    if ( column >= m_rowItems.GetCount() )
+    if ( !HasColumnInfo(column) )
     {
         wxListItem* listItem = new wxListItem(*item);
-        m_rowItems.Append( listItem );
+        m_rowItems.Append( column, listItem );
     }
     else
     {
@@ -2858,9 +3081,17 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
         if (mask & wxLIST_MASK_WIDTH)
             listItem->SetWidth(item->GetWidth());
 
-        listItem->SetTextColour(item->GetTextColour());
-        listItem->SetBackgroundColour(item->GetBackgroundColour());
-        listItem->SetFont(item->GetFont());
+        if ( item->HasAttributes() )
+        {
+            if ( listItem->HasAttributes() )
+                listItem->GetAttributes()->AssignFrom(*item->GetAttributes());
+            else
+            {
+                listItem->SetTextColour(item->GetTextColour());
+                listItem->SetBackgroundColour(item->GetBackgroundColour());
+                listItem->SetFont(item->GetFont());
+            }
+        }
     }
 }