X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5d3d8ad459facd397afef9f1889f932c8a2f474..c07e1e2c855d4b8b9a138773c7ef7cd5c0b71418:/src/mac/carbon/listctrl_mac.cpp

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index b614cf3877..ba97e1840b 100644
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -102,7 +102,7 @@ wxEND_HANDLERS_TABLE()
 wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
 
 /*
- TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo)
+ TODO : Expose more information of a list's layout etc. via appropriate objects (ï¿  la NotebookPageInfo)
 */
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
@@ -152,7 +152,7 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                     // 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 );
+                        window->HandleWindowEvent( le );
                 }
                 result = CallNextEventHandler(handler, event);
                 break;
@@ -220,7 +220,7 @@ public:
     virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
     virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
     int GetFlags() { return m_flags; }
-    
+
 protected:
     // we need to override to provide specialized handling for virtual wxListCtrls
     virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
@@ -259,11 +259,11 @@ protected:
                                     Rect *maxEditTextRect,
                                     Boolean *shrinkToFit);
 
-    static pascal Boolean  DataBrowserHitTestProc(ControlRef browser,
-                                    DataBrowserItemID itemID,
-                                    DataBrowserPropertyID property,
-                                    const Rect *theRect,
-                                    const Rect *mouseRect) { return true; }
+    static pascal Boolean  DataBrowserHitTestProc(ControlRef WXUNUSED(browser),
+                                    DataBrowserItemID WXUNUSED(itemID),
+                                    DataBrowserPropertyID WXUNUSED(property),
+                                    const Rect *WXUNUSED(theRect),
+                                    const Rect *WXUNUSED(mouseRect)) { return true; }
 
     virtual bool        ConfirmEditText(DataBrowserItemID item,
                                     DataBrowserPropertyID property,
@@ -305,7 +305,7 @@ bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 
     if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
     {
-        if (m_list->GetEventHandler()->ProcessEvent( event ))
+        if (m_list->HandleWindowEvent( event ))
             return true;
     }
     return wxEvtHandler::ProcessEvent(event);
@@ -640,24 +640,22 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
     le.SetEventObject(this);
     le.m_pointDrag = position;
     le.m_itemIndex = -1;
-    
+
     int flags;
     long item = HitTest(position, flags);
     if (flags & wxLIST_HITTEST_ONITEM)
     {
         le.m_itemIndex = item;
-        if (!IsVirtual())
-        {
-            
-            le.m_item.m_itemId = item;
-            GetItem(le.m_item);
-        }
-        GetEventHandler()->ProcessEvent(le);
+        le.m_item.m_itemId = item;
+        GetItem(le.m_item);
+        HandleWindowEvent(le);
     }
 }
 
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
+
+    
     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
@@ -665,15 +663,41 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
         
+        if (m_current == -1)
+        {
+            // if m_current isn't set, check if there's been a selection
+            // made before continuing
+            m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
+        }
+        
+        // We need to determine m_current ourselves when navigation keys
+        // are used. Note that PAGEUP and PAGEDOWN do not alter the current
+        // item on native Mac ListCtrl, so we only handle up and down keys.
+        switch ( event.GetKeyCode() )
+        {
+            case WXK_UP:
+                if ( m_current > 0 )
+                    m_current -= 1;
+                else
+                    m_current = 0;
+                    
+                break;
+
+            case WXK_DOWN:
+                if ( m_current < GetItemCount() - 1 )
+                    m_current += 1;
+                else
+                    m_current = GetItemCount() - 1;
+                    
+                break;
+        }
+
         if (m_current != -1)
         {
             le.m_itemIndex = m_current;
-            if (!IsVirtual())
-            {
-                le.m_item.m_itemId = m_current;
-                GetItem(le.m_item);
-            }
-            GetEventHandler()->ProcessEvent(le);
+            le.m_item.m_itemId = m_current;
+            GetItem(le.m_item);
+            HandleWindowEvent(le);
         }
     }
     event.Skip();
@@ -956,13 +980,13 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
 
         if (item.GetMask() & wxLIST_MASK_IMAGE && item.GetImage() != -1 )
         {
-            columnDesc.btnContentInfo.contentType = kControlContentIconRef;
             wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL);
             if (imageList && imageList->GetImageCount() > 0 )
             {
                 wxBitmap bmp = imageList->GetBitmap( item.GetImage() );
-                IconRef icon = bmp.GetBitmapData()->GetIconRef();
+                IconRef icon = bmp.GetIconRef();
                 columnDesc.btnContentInfo.u.iconRef = icon;
+                columnDesc.btnContentInfo.contentType = kControlContentIconRef;
             }
         }
 
@@ -1030,7 +1054,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
         {
             wxListItem colInfo;
             GetColumn(col, colInfo);
-            
+
             colInfo.SetWidth(width);
             SetColumn(col, colInfo);
             m_dbImpl->SetColumnWidth(col, mywidth);
@@ -1052,6 +1076,10 @@ int wxListCtrl::GetCountPerPage() const
 
     if (m_dbImpl)
     {
+        UInt16 height = 1;
+        m_dbImpl->GetDefaultRowHeight( &height );
+        if (height > 0)
+            return GetClientSize().y / height;
     }
 
     return 1;
@@ -1075,23 +1103,37 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     if (m_dbImpl)
     {
         if (!IsVirtual())
-            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);
+                m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+                if (info.GetMask() & wxLIST_MASK_STATE)
+                {
+                    DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);
+                    if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), id ))
+                        info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
+                }
             }
-
-            wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
-            if (attrs)
+        }
+        else
+        {
+            if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
             {
-                info.SetFont( attrs->GetFont() );
-                info.SetBackgroundColour( attrs->GetBackgroundColour() );
-                info.SetTextColour( attrs->GetTextColour() );
+                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() );
+                }
             }
         }
     }
@@ -1175,7 +1217,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;
-        if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
+        if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 )
             option = kDataBrowserItemsRemove;
 
         if (item == -1)
@@ -1203,8 +1245,15 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
             if ( HasFlag(wxLC_VIRTUAL) )
             {
                 long itemID = item+1;
+                bool isSelected = IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), (DataBrowserItemID)itemID );
+                bool isSelectedState = (state == wxLIST_STATE_SELECTED);
+
+                // toggle the selection state if wxListInfo state and actual state don't match.
+                if ( (stateMask & wxLIST_STATE_SELECTED) && isSelected != isSelectedState )
+                {
                 SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
             }
+            }
             else
             {
                 wxListItem info;
@@ -1289,7 +1338,7 @@ long wxListCtrl::GetItemData(long item) const
 }
 
 // Sets the item data
-bool wxListCtrl::SetItemData(long item, long data)
+bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemData(item, data);
@@ -1568,29 +1617,34 @@ 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_ABOVE )
         {
             int item2 = item;
             if ( item2 == -1 )
                 item2 = m_dbImpl->MacGetCount();
-                
+
             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;
             }
         }
@@ -1689,7 +1743,7 @@ bool wxListCtrl::DeleteItem(long item)
         wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = item;
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
 
     }
     return true;
@@ -1706,7 +1760,7 @@ bool wxListCtrl::DeleteAllItems()
         m_dbImpl->MacClear();
         wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() );
         event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
     }
     return true;
 }
@@ -1780,7 +1834,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
         le.m_col = 0;
         GetItem( le.m_item );
 
-        if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+        if ( GetParent()->HandleWindowEvent( le ) && !le.IsAllowed() )
         {
             // vetoed by user code
             return NULL;
@@ -1794,7 +1848,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 }
 
 // End label editing, optionally cancelling the edit
-bool wxListCtrl::EndEditLabel(bool cancel)
+bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
 {
     // TODO: generic impl. doesn't have this method - is it needed for us?
     if (m_genericImpl)
@@ -1975,11 +2029,11 @@ long wxListCtrl::InsertItem(wxListItem& info)
             info.m_itemId = count;
 
         m_dbImpl->MacInsertItem(info.m_itemId, &info );
-        
+
         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
         return info.m_itemId;
     }
     return -1;
@@ -2121,7 +2175,7 @@ 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;
@@ -2146,7 +2200,7 @@ bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
 
     GetItem( le.m_item );
     le.m_item.m_text = value;
-    return !GetEventHandler()->ProcessEvent( le ) ||
+    return !HandleWindowEvent( le ) ||
                 le.IsAllowed();
 }
 
@@ -2161,7 +2215,7 @@ void wxListCtrl::OnRenameCancelled(long itemEdit)
     le.m_itemIndex = itemEdit;
 
     GetItem( le.m_item );
-    GetEventHandler()->ProcessEvent( le );
+    HandleWindowEvent( le );
 }
 
 // ----------------------------------------------------------------------------
@@ -2297,7 +2351,7 @@ void wxListCtrl::SetFocus()
                 m_genericImpl->SetFocus();
                 return;
         }
-       
+
         wxWindow::SetFocus();
 }
 #endif
@@ -2310,7 +2364,7 @@ wxMacListCtrlItem::~wxMacListCtrlItem()
 
 void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
     DataBrowserItemNotification message,
-    DataBrowserItemDataRef itemData ) const
+    DataBrowserItemDataRef WXUNUSED(itemData) ) const
 {
 
     wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl);
@@ -2343,10 +2397,8 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
 
         event.SetEventObject( list );
         event.m_itemIndex = owner->GetLineFromItem( this ) ;
-        if ( !list->IsVirtual() )
-        {
-            lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
-        }
+        event.m_item.m_itemId = event.m_itemIndex;
+        list->GetItem(event.m_item);
 
         switch (message)
         {
@@ -2444,9 +2496,9 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
         SetSortProperty( kMinColumnId - 1 );
     else
         SetSortProperty( kMinColumnId );
-    
+
     m_sortOrder = SortOrder_None;
-    
+
     if ( style & wxLC_SORT_DESCENDING )
     {
         SetSortOrder( kDataBrowserOrderDecreasing );
@@ -2458,9 +2510,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
 
     if ( style & wxLC_VRULES )
     {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
         verify_noerr( DataBrowserChangeAttributes(m_controlRef, kDataBrowserAttributeListViewDrawColumnDividers, kDataBrowserAttributeNone) );
-#endif
     }
 
     verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
@@ -2486,11 +2536,11 @@ pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
 }
 
 bool wxMacDataBrowserListCtrlControl::ConfirmEditText(
-        DataBrowserItemID itemID,
-        DataBrowserPropertyID property,
-        CFStringRef theString,
-        Rect *maxEditTextRect,
-        Boolean *shrinkToFit)
+        DataBrowserItemID WXUNUSED(itemID),
+        DataBrowserPropertyID WXUNUSED(property),
+        CFStringRef WXUNUSED(theString),
+        Rect *WXUNUSED(maxEditTextRect),
+        Boolean *WXUNUSED(shrinkToFit))
 {
     return false;
 }
@@ -2549,7 +2599,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         DataBrowserItemID itemID,
         DataBrowserPropertyID property,
         DataBrowserItemState itemState,
-        const Rect *itemRect,
+        const Rect *WXUNUSED(itemRect),
         SInt16 gdDepth,
         Boolean colorDevice)
 {
@@ -2589,17 +2639,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();
+                }
             }
         }
     }
@@ -2638,6 +2692,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
                       enclosingRect.right - enclosingRect.left,
                       enclosingRect.bottom - enclosingRect.top);
 
+    bool hasFocus = (wxWindow::FindFocus() == list);
     active = IsControlActive(GetControlRef());
 
     // don't paint the background over the vertical rule line
@@ -2650,8 +2705,8 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     {
 
         GetThemeDrawingState(&savedState);
-        
-        if (active)
+
+        if (active && hasFocus)
         {
             GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
             GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
@@ -2674,13 +2729,13 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     {
 
         if (color.Ok())
-            labelColor = MAC_WXCOLORREF( color.GetPixel() );
+            color.GetRGBColor(&labelColor);
         else if (list->GetTextColour().Ok())
-            labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() );
-        
+            list->GetTextColour().GetRGBColor(&labelColor);
+
         if (bgColor.Ok())
         {
-            backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() );
+            bgColor.GetRGBColor(&backgroundColor);
             CGContextSaveGState(context);
 
             CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
@@ -2699,7 +2754,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
         if (imageList && imageList->GetImageCount() > 0){
             wxBitmap bmp = imageList->GetBitmap(imgIndex);
-            IconRef icon = bmp.GetBitmapData()->GetIconRef();
+            IconRef icon = bmp.GetIconRef();
 
             CGContextSaveGState(context);
             CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect));
@@ -2713,19 +2768,29 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     }
 
     HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
-    UInt16 fontID = kThemeViewsFont;
+    HIThemeTextInfo info;
+
+#ifdef __LP64__
+    info.version = kHIThemeTextInfoVersionOne;
+    info.fontID = kThemeViewsFont;
+    if (font.Ok())
+    {
+        info.fontID = kThemeSpecifiedFont;
+        info.font = (CTFontRef) font.MacGetCTFont();
+    }
+#else
+    info.version = kHIThemeTextInfoVersionZero;
+    info.fontID = kThemeViewsFont;
 
     if (font.Ok())
     {
         if (font.GetFamily() != wxFONTFAMILY_DEFAULT)
-            fontID = font.MacGetThemeFontID();
+            info.fontID = font.MacGetThemeFontID();
 
-// FIXME: replace these with CG or ATSUI calls so we can remove this #ifndef.
-#ifndef __LP64__
         ::TextSize( (short)(font.MacGetFontSize()) ) ;
         ::TextFace( font.MacGetFontStyle() ) ;
-#endif
     }
+#endif
 
     wxListItem item;
     list->GetColumn(listColumn, item);
@@ -2742,10 +2807,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         }
     }
 
-    HIThemeTextInfo info;
-    info.version = kHIThemeTextInfoVersionZero;
     info.state = active ? kThemeStateActive : kThemeStateInactive;
-    info.fontID = fontID;
     info.horizontalFlushness = hFlush;
     info.verticalFlushness = kHIThemeTextVerticalFlushCenter;
     info.options = kHIThemeTextBoxOptionNone;
@@ -2761,8 +2823,10 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
 
     CGContextRestoreGState(context);
 
+#ifndef __LP64__
     if (savedState != NULL)
         SetThemeDrawingState(savedState, true);
+#endif
 }
 
 OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID,
@@ -2793,8 +2857,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 );
+            }
         }
     }
 
@@ -2814,7 +2882,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                 {
                     wxMacCFStringHolder cfStr;
 
-                    if (text){
+                    if (!text.IsEmpty()){
                         cfStr.Assign( text, wxLocale::GetSystemEncoding() );
                         err = ::SetDataBrowserItemDataText( itemData, cfStr );
                         err = noErr;
@@ -2827,7 +2895,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                         wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
                         if (imageList && imageList->GetImageCount() > 0){
                             wxBitmap bmp = imageList->GetBitmap(imgIndex);
-                            IconRef icon = bmp.GetBitmapData()->GetIconRef();
+                            IconRef icon = bmp.GetIconRef();
                             ::SetDataBrowserItemDataIcon(itemData, icon);
                         }
                     }
@@ -2868,7 +2936,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
 
 void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     DataBrowserItemNotification message,
-    DataBrowserItemDataRef itemData )
+    DataBrowserItemDataRef WXUNUSED(itemData) )
 {
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved)
@@ -2882,14 +2950,13 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         // avoid asserts by getting out now
         return  ;
     }
-    
+
     wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
     if ( list )
     {
         bool trigger = false;
 
         wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
-        bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
 
         event.SetEventObject( list );
         if ( !list->IsVirtual() )
@@ -2897,21 +2964,21 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
             DataBrowserTableViewRowIndex result = 0;
             verify_noerr( GetItemRow( itemID, &result ) ) ;
             event.m_itemIndex = result;
-
-            if (event.m_itemIndex >= 0)
-                MacGetColumnInfo(event.m_itemIndex,0,event.m_item);
         }
         else
         {
             event.m_itemIndex = (long)itemID-1;
         }
+        event.m_item.m_itemId = event.m_itemIndex;
+        list->GetItem(event.m_item);
 
         switch (message)
         {
             case kDataBrowserItemDeselected:
                 event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
-                if ( !isSingle )
-                    trigger = !IsSelectionSuppressed();
+                // as the generic implementation is also triggering this
+                // event for single selection, we do the same (different than listbox)
+                trigger = !IsSelectionSuppressed();
                 break;
 
             case kDataBrowserItemSelected:
@@ -2959,7 +3026,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     wxString otherItemText;
     long itemOrder;
     long otherItemOrder;
-    
+
     int colId = sortProperty - kMinColumnId;
 
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
@@ -2976,7 +3043,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
 
             itemOrder = item->GetOrder();
             otherItemOrder = item->GetOrder();
-                            
+
             wxListCtrlCompare func = list->GetCompareFunc();
             if (func != NULL)
             {
@@ -2985,8 +3052,8 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
                 if (item && item->HasColumnInfo(0))
                     item1 = item->GetColumnInfo(0)->GetData();
                 if (otherItem && otherItem->HasColumnInfo(0))
-                    item2 = otherItem->GetColumnInfo(0)->GetData(); 
-                
+                    item2 = otherItem->GetColumnInfo(0)->GetData();
+
                 if (item1 > -1 && item2 > -1)
                 {
                     int result = func(item1, item2, list->GetCompareFuncData());
@@ -2996,7 +3063,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
                         return result < 0;
                 }
             }
-            
+
             // we can't use the native control's sorting abilities, so just
             // sort by item id.
             return itemOrder < otherItemOrder;
@@ -3006,9 +3073,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;
         }
@@ -3036,11 +3101,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
         listItem->SetColumnInfo( column, item );
         listItem->SetOrder(row);
         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, 
+        // 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.
@@ -3057,7 +3122,7 @@ void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxLis
     bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED);
 
     // toggle the selection state if wxListInfo state and actual state don't match.
-    if ( isSelected != isSelectedState )
+    if ( listItem->GetMask() & wxLIST_MASK_STATE && isSelected != isSelectedState )
     {
         DataBrowserSetOption options = kDataBrowserItemsAdd;
         if (!isSelectedState)
@@ -3162,7 +3227,7 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString&
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {
     wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
-    return m_rowItems[column]; 
+    return m_rowItems[column];
 }
 
 bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )