Fixed uninstalled toolbars in native toolbar mode, with a method for

[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 52cf2e32b23e8b628d139de385e31e54500a2670..5a1a1f0bc825a525b0c769d581c58b1e0bf74a09 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -38,7 +38,7 @@
 #include "wx/sysopt.h"
 #include "wx/timer.h"
 
 #include "wx/sysopt.h"
 #include "wx/timer.h"
 

-#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
+#include "wx/hashmap.h"

 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxListCtrlStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxListCtrlStyle )


@@ -113,9 +113,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 

-WX_DECLARE_EXPORTED_LIST(wxListItem, wxListItemList);
+WX_DECLARE_HASH_MAP( int, wxListItem*, wxIntegerHash, wxIntegerEqual, wxListItemList );
+

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListItemList)

 WX_DEFINE_LIST(wxColumnList)
 
 // so we can check for column clicks
 WX_DEFINE_LIST(wxColumnList)
 
 // so we can check for column clicks


@@ -208,6 +208,7 @@ class wxMacDataBrowserListCtrlControl : public wxMacDataItemBrowserControl
 {
 public:
     wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
 {
 public:
     wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );

+    wxMacDataBrowserListCtrlControl() {}

     virtual ~wxMacDataBrowserListCtrlControl();
 
     // create a list item (can be a subclass of wxMacListBoxItem)
     virtual ~wxMacDataBrowserListCtrlControl();
 
     // create a list item (can be a subclass of wxMacListBoxItem)


@@ -218,6 +219,7 @@ public:
     virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
     virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
     virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item);
     virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
     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
 
 protected:
     // we need to override to provide specialized handling for virtual wxListCtrls


@@ -273,7 +275,8 @@ protected:
 
     wxClientDataType m_clientDataItemsType;
     bool m_isVirtual;
 
     wxClientDataType m_clientDataItemsType;
     bool m_isVirtual;

-
+    int m_flags;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListCtrlControl)

 };
 
 class wxMacListCtrlEventDelegate : public wxEvtHandler
 };
 
 class wxMacListCtrlEventDelegate : public wxEvtHandler


@@ -504,6 +507,9 @@ void wxListCtrlTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
     EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
     EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)

+    EVT_MIDDLE_DOWN(wxListCtrl::OnMiddleDown)
+    EVT_RIGHT_DOWN(wxListCtrl::OnRightDown)
+    EVT_CHAR(wxListCtrl::OnChar)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -512,7 +518,8 @@ END_EVENT_TABLE()
 
 wxMacListControl* wxListCtrl::GetPeer() const
 {
 
 wxMacListControl* wxListCtrl::GetPeer() const
 {

-    return dynamic_cast<wxMacListControl*>(m_peer);
+    wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListCtrlControl);
+    return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;

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


@@ -612,6 +619,91 @@ void wxListCtrl::OnDblClick(wxMouseEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+#if wxABI_VERSION >= 20801
+void wxListCtrl::OnRightDown(wxMouseEvent& event)
+{
+    if (m_dbImpl)
+        FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition());
+    event.Skip();
+}
+
+void wxListCtrl::OnMiddleDown(wxMouseEvent& event)
+{
+    if (m_dbImpl)
+        FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, event.GetPosition());
+    event.Skip();
+}
+
+void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
+{
+    wxListEvent le( eventType, GetId() );
+    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;
+        le.m_item.m_itemId = item;
+        GetItem(le.m_item);
+        GetEventHandler()->ProcessEvent(le);
+    }
+}
+
+void wxListCtrl::OnChar(wxKeyEvent& event)
+{
+
+    
+    if (m_dbImpl)
+    {
+        wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
+        le.SetEventObject(this);
+        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;
+            le.m_item.m_itemId = m_current;
+            GetItem(le.m_item);
+            GetEventHandler()->ProcessEvent(le);
+        }
+    }
+    event.Skip();
+}
+#endif
+

 bool wxListCtrl::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxPoint& pos,
 bool wxListCtrl::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxPoint& pos,


@@ -648,8 +740,7 @@ bool wxListCtrl::Create(wxWindow *parent,
     else
     {
          m_macIsUserPane = false;
     else
     {
          m_macIsUserPane = false;

-
-        if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )

             return false;
         m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
         m_peer = m_dbImpl;
             return false;
         m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
         m_peer = m_dbImpl;


@@ -741,12 +832,15 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
               totalWidth += m_dbImpl->GetColumnWidth( 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 );
+        if ( !(m_dbImpl->GetFlags() & wxHSCROLL) )
+        {
+            Boolean vertScrollBar;
+            GetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), NULL, &vertScrollBar );
+            if (totalWidth > width)
+                SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), true, vertScrollBar );
+            else
+                SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), false, vertScrollBar );
+        }

     }
 }
 
     }
 }
 


@@ -1005,23 +1099,29 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     if (m_dbImpl)
     {
         if (!IsVirtual())
     if (m_dbImpl)
     {
         if (!IsVirtual())

-            m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+        {
+            if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
+                m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+        }

         else
         {
         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 (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) 
-                    info.SetState(info.GetState() | wxLIST_STATE_SELECTED);
-            }
-            
-            wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
-            if (attrs)
+            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() );
+                }

             }
         }
     }
             }
         }
     }


@@ -1071,11 +1171,11 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
         if ( HasFlag(wxLC_VIRTUAL) )
         {
             if (stateMask == wxLIST_STATE_SELECTED)
         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 wxLIST_STATE_SELECTED;
                 else

-                    return 0; 
+                    return 0;

             }
         }
         else
             }
         }
         else


@@ -1092,6 +1192,8 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
             return info.m_state;
         }
     }
             return info.m_state;
         }
     }

+
+    return 0;

 }
 
 // Sets the item state
 }
 
 // Sets the item state


@@ -1099,13 +1201,13 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemState(item, state, stateMask);
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemState(item, state, stateMask);

-        
+

     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;
     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;

-        if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
+        if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 )

             option = kDataBrowserItemsRemove;
             option = kDataBrowserItemsRemove;

-    
+

         if (item == -1)
         {
             if ( HasFlag(wxLC_VIRTUAL) )
         if (item == -1)
         {
             if ( HasFlag(wxLC_VIRTUAL) )


@@ -1131,8 +1233,15 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
             if ( HasFlag(wxLC_VIRTUAL) )
             {
                 long itemID = item+1;
             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);
             }
                 SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
             }

+            }

             else
             {
                 wxListItem info;
             else
             {
                 wxListItem info;


@@ -1217,7 +1326,7 @@ long wxListCtrl::GetItemData(long item) const
 }
 
 // Sets the item data
 }
 
 // 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);
 {
     if (m_genericImpl)
         return m_genericImpl->SetItemData(item, data);


@@ -1488,19 +1597,48 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
     if (m_genericImpl)
         return m_genericImpl->GetNextItem(item, geom, state);
 
     if (m_genericImpl)
         return m_genericImpl->GetNextItem(item, geom, state);
 

-    if (m_dbImpl && geom == wxLIST_NEXT_ALL && state == wxLIST_STATE_SELECTED )
+    // TODO: implement all geometry and state options?
+    if ( m_dbImpl )

     {
     {

-        long count = m_dbImpl->MacGetCount() ;
-        for ( long line = item + 1 ; line < count; line++ )
+        if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_BELOW )
+        {
+            long count = m_dbImpl->MacGetCount() ;
+            for ( long line = item + 1 ; line < count; 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) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
+                    return line;
+            }
+        }
+
+        if ( geom == wxLIST_NEXT_ABOVE )

         {
         {

-            wxMacDataItem* id = m_dbImpl->GetItemFromLine(line);
-            if ( m_dbImpl->IsItemSelected(id ) )
-                return line;
+            int item2 = item;
+            if ( item2 == -1 )
+                item2 = m_dbImpl->MacGetCount();
+
+            for ( long line = item2 - 1 ; line >= 0; 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) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) )
+                    return line;
+            }

         }
         }

-        return -1;

     }
 
     }
 

-    return 0;
+    return -1;

 }
 
 
 }
 
 


@@ -1731,7 +1869,31 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, str, 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'
 }
 
 // Find an item whose data matches this data, starting from the item after 'start'


@@ -1741,7 +1903,9 @@ long wxListCtrl::FindItem(long start, long data)
     if (m_genericImpl)
         return m_genericImpl->FindItem(start, 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)
     long count = GetItemCount();
 
     while (idx < count)


@@ -1751,7 +1915,7 @@ long wxListCtrl::FindItem(long start, long data)
         idx++;
     };
 
         idx++;
     };
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 // Find an item nearest this position in the specified direction, starting from
 }
 
 // Find an item nearest this position in the specified direction, starting from


@@ -1822,7 +1986,7 @@ int wxListCtrl::GetScrollPos(int orient) const
 {
     if (m_genericImpl)
         return m_genericImpl->GetScrollPos(orient);
 {
     if (m_genericImpl)
         return m_genericImpl->GetScrollPos(orient);

-        
+

     if (m_dbImpl)
     {
         UInt32 offsetX, offsetY;
     if (m_dbImpl)
     {
         UInt32 offsetX, offsetY;


@@ -1853,6 +2017,7 @@ long wxListCtrl::InsertItem(wxListItem& info)
             info.m_itemId = count;
 
         m_dbImpl->MacInsertItem(info.m_itemId, &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;
         wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = info.m_itemId;


@@ -1997,6 +2162,12 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
     {
         m_compareFunc = fn;
         m_compareFuncData = 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;
     }
 
     return true;


@@ -2088,10 +2259,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...
         // 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();
         // FIXME: Find a more efficient way to do this.
         m_dbImpl->MacClear();

-        
+

         DataBrowserCallbacks callbacks;
         DataBrowserItemNotificationUPP itemUPP;
         GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);
         DataBrowserCallbacks callbacks;
         DataBrowserItemNotificationUPP itemUPP;
         GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks);


@@ -2142,7 +2313,7 @@ void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
 #if wxUSE_DRAG_AND_DROP
     if (m_genericImpl)
         m_genericImpl->SetDropTarget( dropTarget );
 #if wxUSE_DRAG_AND_DROP
     if (m_genericImpl)
         m_genericImpl->SetDropTarget( dropTarget );

-        
+

     if (m_dbImpl)
         wxWindow::SetDropTarget( dropTarget );
 #endif
     if (m_dbImpl)
         wxWindow::SetDropTarget( dropTarget );
 #endif


@@ -2153,13 +2324,26 @@ wxDropTarget *wxListCtrl::GetDropTarget() const
 #if wxUSE_DRAG_AND_DROP
     if (m_genericImpl)
         return m_genericImpl->GetDropTarget();
 #if wxUSE_DRAG_AND_DROP
     if (m_genericImpl)
         return m_genericImpl->GetDropTarget();

-        
+

     if (m_dbImpl)
         return wxWindow::GetDropTarget();
 #endif
     return NULL;
 }
 
     if (m_dbImpl)
         return wxWindow::GetDropTarget();
 #endif
     return NULL;
 }
 

+#if wxABI_VERSION >= 20801
+void wxListCtrl::SetFocus()
+{
+        if (m_genericImpl)
+        {
+                m_genericImpl->SetFocus();
+                return;
+        }
+
+        wxWindow::SetFocus();
+}
+#endif
+

 // wxMac internal data structures
 
 wxMacListCtrlItem::~wxMacListCtrlItem()
 // wxMac internal data structures
 
 wxMacListCtrlItem::~wxMacListCtrlItem()


@@ -2171,7 +2355,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
     DataBrowserItemDataRef itemData ) const
 {
 
     DataBrowserItemDataRef itemData ) const
 {
 

-    wxMacDataBrowserListCtrlControl *lb = dynamic_cast<wxMacDataBrowserListCtrlControl*>(owner);
+    wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl);

 
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved)
 
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved)


@@ -2201,10 +2385,8 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
 
         event.SetEventObject( list );
         event.m_itemIndex = owner->GetLineFromItem( this ) ;
 
         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)
         {
 
         switch (message)
         {


@@ -2249,12 +2431,15 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
 
 }
 
 
 }
 

+IMPLEMENT_DYNAMIC_CLASS(wxMacDataBrowserListCtrlControl, wxMacDataItemBrowserControl )
+

 wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
     : wxMacDataItemBrowserControl( peer, pos, size, style )
 {
     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     m_isVirtual = false;
 wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
     : wxMacDataItemBrowserControl( peer, pos, size, style )
 {
     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     m_isVirtual = false;

+    m_flags = 0;

 
     if ( style & wxLC_VIRTUAL )
         m_isVirtual = true;
 
     if ( style & wxLC_VIRTUAL )
         m_isVirtual = true;


@@ -2299,19 +2484,16 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
         SetSortProperty( kMinColumnId - 1 );
     else
         SetSortProperty( kMinColumnId );
         SetSortProperty( kMinColumnId - 1 );
     else
         SetSortProperty( kMinColumnId );

-    if ( style & wxLC_SORT_ASCENDING )
-    {
-        m_sortOrder = SortOrder_Text_Ascending;
-        SetSortOrder( kDataBrowserOrderIncreasing );
-    }
-    else if ( style & wxLC_SORT_DESCENDING )
+
+    m_sortOrder = SortOrder_None;
+
+    if ( style & wxLC_SORT_DESCENDING )

     {
     {

-        m_sortOrder = SortOrder_Text_Descending;

         SetSortOrder( kDataBrowserOrderDecreasing );
     }
         SetSortOrder( kDataBrowserOrderDecreasing );
     }

-    else
+    else if ( style & wxLC_SORT_ASCENDING )

     {
     {

-        m_sortOrder = SortOrder_None;
+        SetSortOrder( kDataBrowserOrderIncreasing );

     }
 
     if ( style & wxLC_VRULES )
     }
 
     if ( style & wxLC_VRULES )


@@ -2322,7 +2504,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
     }
 
     verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
     }
 
     verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );

-    err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
+    verify_noerr( SetHasScrollBars( (style & wxHSCROLL) != 0 , true ) );

 }
 
 pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
 }
 
 pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(


@@ -2334,7 +2516,7 @@ pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
         Boolean *shrinkToFit)
 {
     Boolean result = false;
         Boolean *shrinkToFit)
 {
     Boolean result = false;

-    wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    wxMacDataBrowserListCtrlControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserListCtrlControl);

     if ( ctl != 0 )
     {
         result = ctl->ConfirmEditText(itemID, property, theString, maxEditTextRect, shrinkToFit);
     if ( ctl != 0 )
     {
         result = ctl->ConfirmEditText(itemID, property, theString, maxEditTextRect, shrinkToFit);


@@ -2362,7 +2544,7 @@ pascal void wxMacDataBrowserListCtrlControl::DataBrowserDrawItemProc(
         SInt16 gdDepth,
         Boolean colorDevice)
 {
         SInt16 gdDepth,
         Boolean colorDevice)
 {

-    wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    wxMacDataBrowserListCtrlControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserListCtrlControl);

     if ( ctl != 0 )
     {
         ctl->DrawItem(itemID, property, itemState, itemRect, gdDepth, colorDevice);
     if ( ctl != 0 )
     {
         ctl->DrawItem(itemID, property, itemState, itemRect, gdDepth, colorDevice);


@@ -2447,17 +2629,21 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         }
         else
         {
         }
         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();
+                }

             }
         }
     }
             }
         }
     }


@@ -2496,6 +2682,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
                       enclosingRect.right - enclosingRect.left,
                       enclosingRect.bottom - enclosingRect.top);
 
                       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
     active = IsControlActive(GetControlRef());
 
     // don't paint the background over the vertical rule line


@@ -2509,9 +2696,16 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
 
         GetThemeDrawingState(&savedState);
 
 
         GetThemeDrawingState(&savedState);
 

-        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
-        GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
-
+        if (active && hasFocus)
+        {
+            GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor);
+            GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor);
+        }
+        else
+        {
+            GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &backgroundColor);
+            GetThemeTextColor(kThemeTextColorBlack, gdDepth, colorDevice, &labelColor);
+        }

         CGContextSaveGState(context);
 
         CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,
         CGContextSaveGState(context);
 
         CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX,


@@ -2644,8 +2838,12 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
         }
         else
         {
         }
         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 );
+            }

         }
     }
 
         }
     }
 


@@ -2657,19 +2855,13 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                 if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
                 {
                     verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
                 if ( list && list->HasFlag( wxLC_EDIT_LABELS ) )
                 {
                     verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));

-                    err = noErr ;

                 }
                 break ;
             default :
                 if ( property >= kMinColumnId )
                 {
                 }
                 break ;
             default :
                 if ( property >= kMinColumnId )
                 {

-                    wxMacCFStringHolder cfStr;
-
-                    if (text){
-                        cfStr.Assign( text, wxLocale::GetSystemEncoding() );
-                        err = ::SetDataBrowserItemDataText( itemData, cfStr );
-                        err = noErr;
-                    }
+                    wxMacCFStringHolder cfStr(text);
+                    verify_noerr( ::SetDataBrowserItemDataText( itemData, cfStr) );

 
 
 
 
 
 


@@ -2748,14 +2940,13 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
             DataBrowserTableViewRowIndex result = 0;
             verify_noerr( GetItemRow( itemID, &result ) ) ;
             event.m_itemIndex = result;
             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;
         }
         }
         else
         {
             event.m_itemIndex = (long)itemID-1;
         }

+        event.m_item.m_itemId = event.m_itemIndex;
+        list->GetItem(event.m_item);

 
         switch (message)
         {
 
         switch (message)
         {


@@ -2808,54 +2999,58 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     bool retval = false;
     wxString itemText;
     wxString otherItemText;
     bool retval = false;
     wxString itemText;
     wxString otherItemText;

+    long itemOrder;
+    long otherItemOrder;
+

     int colId = sortProperty - kMinColumnId;
 
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
 
     int colId = sortProperty - kMinColumnId;
 
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
 

+    DataBrowserSortOrder sort;
+    verify_noerr(GetSortOrder(&sort));
+

     if (colId >= 0)
     {
         if (!m_isVirtual)
         {
             wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID;
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
     if (colId >= 0)
     {
         if (!m_isVirtual)
         {
             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;
-
-            if (item->HasColumnInfo(colId))
-                itemText = item->GetColumnInfo(colId)->GetText();
-            if (otherItem->HasColumnInfo(colId))
-                otherItemText = otherItem->GetColumnInfo(colId)->GetText();
+
+            itemOrder = item->GetOrder();
+            otherItemOrder = item->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());
+                    if (sort == kDataBrowserOrderIncreasing)
+                        return result >= 0;
+                    else
+                        return result < 0;
+                }
+            }
+
+            // we can't use the native control's sorting abilities, so just
+            // sort by item id.
+            return itemOrder < otherItemOrder;

         }
         else
         {
 
             long itemNum = (long)itemOneID;
             long otherItemNum = (long)itemTwoID;
         }
         else
         {
 
             long itemNum = (long)itemOneID;
             long otherItemNum = (long)itemTwoID;

-            itemText = list->OnGetItemText( itemNum-1, colId );
-            otherItemText = list->OnGetItemText( otherItemNum-1, colId );

 
 

-        }
-
-        DataBrowserSortOrder sort;
-        verify_noerr(GetSortOrder(&sort));
-
-        if ( sort == kDataBrowserOrderIncreasing )
-        {
-            retval = itemText.CmpNoCase( otherItemText ) > 0;
-        }
-        else if ( sort == kDataBrowserOrderDecreasing )
-        {
-            retval = itemText.CmpNoCase( otherItemText ) < 0;
+            // virtual listctrls don't support sorting
+            return itemNum < otherItemNum;

         }
     }
     else{
         }
     }
     else{


@@ -2876,9 +3071,21 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
     wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
     if (item)
     {
     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);
+        wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem);
+        bool hasInfo = listItem->HasColumnInfo( column );

         listItem->SetColumnInfo( column, item );
         listItem->SetColumnInfo( column, item );

+        listItem->SetOrder(row);

         UpdateState(dataItem, 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 );

     }
 }
 
     }
 }
 


@@ -2907,7 +3114,7 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign
     // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
     //if (item)
     {
     // 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);
+        wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem);

 
         if (!listItem->HasColumnInfo( column ))
             return;
 
         if (!listItem->HasColumnInfo( column ))
             return;


@@ -2954,7 +3161,7 @@ wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
 
 wxMacListCtrlItem::wxMacListCtrlItem()
 {
 
 wxMacListCtrlItem::wxMacListCtrlItem()
 {

-    m_rowItems = wxListItemList( wxKEY_INTEGER );
+    m_rowItems = wxListItemList();

 }
 
 int wxMacListCtrlItem::GetColumnImageValue( unsigned int column )
 }
 
 int wxMacListCtrlItem::GetColumnImageValue( unsigned int column )


@@ -2994,15 +3201,13 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString&
 
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {
 
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {

-    wxListItemList::compatibility_iterator node = m_rowItems.Find( column );
-    wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
-
-    return node->GetData();
+    wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
+    return m_rowItems[column];

 }
 
 bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )
 {
 }
 
 bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )
 {

-    return m_rowItems.Find( column ) != NULL;
+    return !(m_rowItems.find( column ) == m_rowItems.end());

 }
 
 void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
 }
 
 void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )


@@ -3011,7 +3216,7 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
     if ( !HasColumnInfo(column) )
     {
         wxListItem* listItem = new wxListItem(*item);
     if ( !HasColumnInfo(column) )
     {
         wxListItem* listItem = new wxListItem(*item);

-        m_rowItems.Append( column, listItem );
+        m_rowItems[column] = listItem;

     }
     else
     {
     }
     else
     {


@@ -3045,3 +3250,4 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
 }
 
 #endif // wxUSE_LISTCTRL
 }
 
 #endif // wxUSE_LISTCTRL

+