X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e409b62aaf6b333803027645ecc77de6c92cae2d..7564225f8bff6e6c2ed27695836035fa85a81189:/src/mac/carbon/listctrl_mac.cpp

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index 46d53fe1bc..5450de5164 100644
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -36,6 +36,7 @@
 
 #include "wx/imaglist.h"
 #include "wx/sysopt.h"
+#include "wx/timer.h"
 
 #define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
 
@@ -115,6 +116,61 @@ IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 WX_DECLARE_EXPORTED_LIST(wxListItem, wxListItemList);
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListItemList)
+WX_DEFINE_LIST(wxColumnList)
+
+// so we can check for column clicks
+static const EventTypeSpec eventList[] =
+{
+    { kEventClassControl, kEventControlHit },
+    { kEventClassControl, kEventControlDraw }
+};
+
+static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+
+    ControlRef controlRef ;
+    cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+    wxListCtrl *window = (wxListCtrl*) data ;
+    wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, window->GetId() );
+    le.SetEventObject( window );
+
+    switch ( GetEventKind( event ) )
+    {
+        // check if the column was clicked on and fire an event if so
+        case kEventControlHit :
+            {
+                ControlPartCode result = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart, typeControlPartCode) ;
+                if (result == kControlButtonPart){
+                    DataBrowserPropertyID col;
+                    GetDataBrowserSortProperty(controlRef, &col);
+                    int column = col - kMinColumnId;
+                    le.m_col = column;
+                    window->GetEventHandler()->ProcessEvent( le );
+                }
+                result = CallNextEventHandler(handler, event);
+                break;
+            }
+        case kEventControlDraw:
+            {
+                CGContextRef context = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, typeCGContextRef) ;
+                window->MacSetDrawingContext(context);
+                result = CallNextEventHandler(handler, event);
+                window->MacSetDrawingContext(NULL);
+                break;
+            }
+        default :
+            break ;
+    }
+
+
+    return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacListCtrlEventHandler )
 
 class wxMacListCtrlItem : public wxMacListBoxItem
 {
@@ -134,12 +190,16 @@ public:
 
     virtual int GetColumnImageValue( unsigned int column );
     virtual void SetColumnImageValue( unsigned int column, int imageIndex );
-        
+
     virtual ~wxMacListCtrlItem();
 protected:
     wxListItemList m_rowItems;
 };
 
+DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL;
+//DataBrowserEditItemUPP gDataBrowserEditItemUPP = NULL;
+DataBrowserHitTestUPP gDataBrowserHitTestUPP = NULL;
+
 // TODO: Make a better name!!
 class wxMacDataBrowserListCtrlControl : public wxMacDataItemBrowserControl
 {
@@ -149,7 +209,7 @@ public:
 
     // create a list item (can be a subclass of wxMacListBoxItem)
 
-    virtual wxMacListCtrlItem* CreateItem();
+    virtual wxMacDataItem* CreateItem();
 
     virtual void MacInsertItem( unsigned int n, wxListItem* item );
     virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
@@ -167,20 +227,280 @@ protected:
                         DataBrowserItemID itemID,
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData);
-                        
+
     virtual Boolean CompareItems(DataBrowserItemID itemOneID,
                         DataBrowserItemID itemTwoID,
                         DataBrowserPropertyID sortProperty);
 
+    static pascal void    DataBrowserDrawItemProc(ControlRef browser,
+                        DataBrowserItemID item,
+                        DataBrowserPropertyID property,
+                        DataBrowserItemState itemState,
+                        const Rect *theRect,
+                        SInt16 gdDepth,
+                        Boolean colorDevice);
+
+    virtual void        DrawItem(DataBrowserItemID itemID,
+                            DataBrowserPropertyID property,
+                            DataBrowserItemState itemState,
+                            const Rect *itemRect,
+                            SInt16 gdDepth,
+                            Boolean colorDevice);
+
+    static pascal Boolean  DataBrowserEditTextProc(ControlRef browser,
+                                    DataBrowserItemID item,
+                                    DataBrowserPropertyID property,
+                                    CFStringRef theString,
+                                    Rect *maxEditTextRect,
+                                    Boolean *shrinkToFit);
+
+    static pascal Boolean  DataBrowserHitTestProc(ControlRef browser,
+                                    DataBrowserItemID itemID,
+                                    DataBrowserPropertyID property,
+                                    const Rect *theRect,
+                                    const Rect *mouseRect) { return true; }
+
+    virtual bool        ConfirmEditText(DataBrowserItemID item,
+                                    DataBrowserPropertyID property,
+                                    CFStringRef theString,
+                                    Rect *maxEditTextRect,
+                                    Boolean *shrinkToFit);
+
+
+
     wxClientDataType m_clientDataItemsType;
     bool m_isVirtual;
 
 };
 
-// TODO: This gives errors, find out why. 
-//BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
-//    EVT_PAINT(wxListCtrl::OnPaint)
-//END_EVENT_TABLE()
+class wxMacListCtrlEventDelegate : public wxEvtHandler
+{
+public:
+    wxMacListCtrlEventDelegate( wxListCtrl* list, int id );
+    virtual bool ProcessEvent( wxEvent& event );
+
+private:
+    wxListCtrl* m_list;
+    int         m_id;
+};
+
+wxMacListCtrlEventDelegate::wxMacListCtrlEventDelegate( wxListCtrl* list, int id )
+{
+    m_list = list;
+    m_id = id;
+}
+
+bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
+{
+    // even though we use a generic list ctrl underneath, make sure
+    // we present ourselves as wxListCtrl.
+    event.SetEventObject( m_list );
+    event.SetId( m_id );
+
+    if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
+    {
+        if (m_list->GetEventHandler()->ProcessEvent( event ))
+            return true;
+    }
+    return wxEvtHandler::ProcessEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+// wxListCtrlRenameTimer (internal)
+//-----------------------------------------------------------------------------
+
+class wxListCtrlRenameTimer: public wxTimer
+{
+private:
+    wxListCtrl *m_owner;
+
+public:
+    wxListCtrlRenameTimer( wxListCtrl *owner );
+    void Notify();
+};
+
+//-----------------------------------------------------------------------------
+// wxListCtrlTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
+//-----------------------------------------------------------------------------
+
+class wxListCtrlTextCtrlWrapper : public wxEvtHandler
+{
+public:
+    // NB: text must be a valid object but not Create()d yet
+    wxListCtrlTextCtrlWrapper(wxListCtrl *owner,
+                          wxTextCtrl *text,
+                          long itemEdit);
+
+    wxTextCtrl *GetText() const { return m_text; }
+
+    void AcceptChangesAndFinish();
+
+protected:
+    void OnChar( wxKeyEvent &event );
+    void OnKeyUp( wxKeyEvent &event );
+    void OnKillFocus( wxFocusEvent &event );
+
+    bool AcceptChanges();
+    void Finish();
+
+private:
+    wxListCtrl         *m_owner;
+    wxTextCtrl         *m_text;
+    wxString            m_startValue;
+    long              m_itemEdited;
+    bool                m_finished;
+    bool                m_aboutToFinish;
+
+    DECLARE_EVENT_TABLE()
+};
+
+//-----------------------------------------------------------------------------
+// wxListCtrlRenameTimer (internal)
+//-----------------------------------------------------------------------------
+
+wxListCtrlRenameTimer::wxListCtrlRenameTimer( wxListCtrl *owner )
+{
+    m_owner = owner;
+}
+
+void wxListCtrlRenameTimer::Notify()
+{
+    m_owner->OnRenameTimer();
+}
+
+//-----------------------------------------------------------------------------
+// wxListCtrlTextCtrlWrapper (internal)
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxListCtrlTextCtrlWrapper, wxEvtHandler)
+    EVT_CHAR           (wxListCtrlTextCtrlWrapper::OnChar)
+    EVT_KEY_UP         (wxListCtrlTextCtrlWrapper::OnKeyUp)
+    EVT_KILL_FOCUS     (wxListCtrlTextCtrlWrapper::OnKillFocus)
+END_EVENT_TABLE()
+
+wxListCtrlTextCtrlWrapper::wxListCtrlTextCtrlWrapper(wxListCtrl *owner,
+                                             wxTextCtrl *text,
+                                             long itemEdit)
+              : m_startValue(owner->GetItemText(itemEdit)),
+                m_itemEdited(itemEdit)
+{
+    m_owner = owner;
+    m_text = text;
+    m_finished = false;
+    m_aboutToFinish = false;
+
+    wxRect rectLabel;
+    owner->GetItemRect(itemEdit, rectLabel);
+
+    m_text->Create(owner, wxID_ANY, m_startValue,
+                   wxPoint(rectLabel.x+8,rectLabel.y),
+                   wxSize(rectLabel.width,rectLabel.height));
+    m_text->SetFocus();
+
+    m_text->PushEventHandler(this);
+}
+
+void wxListCtrlTextCtrlWrapper::Finish()
+{
+    if ( !m_finished )
+    {
+        m_finished = true;
+
+        m_text->RemoveEventHandler(this);
+        m_owner->FinishEditing(m_text);
+
+        wxPendingDelete.Append( this );
+    }
+}
+
+bool wxListCtrlTextCtrlWrapper::AcceptChanges()
+{
+    const wxString value = m_text->GetValue();
+
+    if ( value == m_startValue )
+        // nothing changed, always accept
+        return true;
+
+    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
+        // vetoed by the user
+        return false;
+
+    // accepted, do rename the item
+    m_owner->SetItemText(m_itemEdited, value);
+
+    return true;
+}
+
+void wxListCtrlTextCtrlWrapper::AcceptChangesAndFinish()
+{
+    m_aboutToFinish = true;
+
+    // Notify the owner about the changes
+    AcceptChanges();
+
+    // Even if vetoed, close the control (consistent with MSW)
+    Finish();
+}
+
+void wxListCtrlTextCtrlWrapper::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            AcceptChangesAndFinish();
+            break;
+
+        case WXK_ESCAPE:
+            m_owner->OnRenameCancelled( m_itemEdited );
+            Finish();
+            break;
+
+        default:
+            event.Skip();
+    }
+}
+
+void wxListCtrlTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )
+{
+    if (m_finished)
+    {
+        event.Skip();
+        return;
+    }
+
+    // auto-grow the textctrl:
+    wxSize parentSize = m_owner->GetSize();
+    wxPoint myPos = m_text->GetPosition();
+    wxSize mySize = m_text->GetSize();
+    int sx, sy;
+    m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
+    if (myPos.x + sx > parentSize.x)
+        sx = parentSize.x - myPos.x;
+    if (mySize.x > sx)
+        sx = mySize.x;
+    m_text->SetSize(sx, wxDefaultCoord);
+
+    event.Skip();
+}
+
+void wxListCtrlTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
+{
+    if ( !m_finished && !m_aboutToFinish )
+    {
+        if ( !AcceptChanges() )
+            m_owner->OnRenameCancelled( m_itemEdited );
+
+        Finish();
+    }
+
+    // We must let the native text control handle focus
+    event.Skip();
+}
+
+BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
+    EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
+    EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)
+END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
@@ -200,7 +520,7 @@ void wxListCtrl::Init()
     m_imageListNormal = NULL;
     m_imageListSmall = NULL;
     m_imageListState = NULL;
-    
+
     // keep track of if we created our own image lists, or if they were assigned
     // to us.
     m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false;
@@ -209,6 +529,14 @@ void wxListCtrl::Init()
     m_textCtrl = NULL;
     m_genericImpl = NULL;
     m_dbImpl = NULL;
+    m_compareFunc = NULL;
+    m_compareFuncData = 0;
+    m_colsInfo = wxColumnList();
+    m_textColor = wxNullColour;
+    m_bgColor = wxNullColour;
+    m_textctrlWrapper = NULL;
+    m_current = -1;
+    m_renameTimer = new wxListCtrlRenameTimer( this );
 }
 
 class wxGenericListCtrlHook : public wxGenericListCtrl
@@ -226,6 +554,7 @@ public:
     {
     }
 
+protected:
     virtual wxListItemAttr * OnGetItemAttr(long item) const
     {
         return m_nativeListCtrl->OnGetItemAttr(item);
@@ -246,11 +575,39 @@ public:
         return m_nativeListCtrl->OnGetItemText(item, column);
     }
 
-protected:
     wxListCtrl* m_nativeListCtrl;
 
 };
 
+void wxListCtrl::OnLeftDown(wxMouseEvent& event)
+{
+    if ( m_textctrlWrapper )
+    {
+        m_current = -1;
+        m_textctrlWrapper->AcceptChangesAndFinish();
+    }
+
+    int hitResult;
+    long current = HitTest(event.GetPosition(), hitResult);
+    if ((current == m_current) &&
+        (hitResult == wxLIST_HITTEST_ONITEM) &&
+        HasFlag(wxLC_EDIT_LABELS) )
+    {
+        m_renameTimer->Start( 100, true );
+    }
+    else
+    {
+        m_current = current;
+    }
+    event.Skip();
+}
+
+void wxListCtrl::OnDblClick(wxMouseEvent& event)
+{
+    m_current = -1;
+    event.Skip();
+}
+
 bool wxListCtrl::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxPoint& pos,
@@ -266,13 +623,16 @@ bool wxListCtrl::Create(wxWindow *parent,
     // 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) || (style & wxLC_VIRTUAL)  )
+            (style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) )
     {
         m_macIsUserPane = true;
 
-        if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        if ( !wxWindow::Create(parent, id, pos, size, style & wxNO_BORDER, name) )
             return false;
-        m_genericImpl = new wxGenericListCtrlHook(this, id, pos, size, style, validator, name);
+        
+        // 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() ) );
         return true;
     }
 
@@ -286,6 +646,10 @@ bool wxListCtrl::Create(wxWindow *parent,
         m_peer = m_dbImpl;
 
         MacPostControlCreate( pos, size );
+
+        InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
+            GetEventTypeCount(eventList), eventList, this,
+            (EventHandlerRef *)&m_macListCtrlEventHandler);
     }
 
     return true;
@@ -293,12 +657,19 @@ bool wxListCtrl::Create(wxWindow *parent,
 
 wxListCtrl::~wxListCtrl()
 {
+    if (m_genericImpl)
+    {
+        m_genericImpl->PopEventHandler(/* deleteHandler = */ true);
+    }
+
     if (m_ownsImageListNormal)
         delete m_imageListNormal;
     if (m_ownsImageListSmall)
         delete m_imageListSmall;
     if (m_ownsImageListState)
         delete m_imageListState;
+
+    delete m_renameTimer;
 }
 
 // ----------------------------------------------------------------------------
@@ -350,7 +721,51 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
 
     if (m_genericImpl)
-        m_genericImpl->SetSize(x, y, width, height, sizeFlags);
+        m_genericImpl->SetSize(0, 0, width, height, sizeFlags);
+}
+
+wxSize wxListCtrl::DoGetBestSize() const
+{
+    return wxWindow::DoGetBestSize();
+}
+
+bool wxListCtrl::SetFont(const wxFont& font)
+{
+    bool rv = true;
+    rv = wxControl::SetFont(font);
+    if (m_genericImpl)
+        rv = m_genericImpl->SetFont(font);
+    return rv;
+}
+
+bool wxListCtrl::SetForegroundColour(const wxColour& colour)
+{
+    bool rv = true;
+    if (m_genericImpl)
+        rv = m_genericImpl->SetForegroundColour(colour);
+    if (m_dbImpl)
+        SetTextColour(colour);
+    return rv;
+}
+
+bool wxListCtrl::SetBackgroundColour(const wxColour& colour)
+{
+    bool rv = true;
+    if (m_genericImpl)
+        rv = m_genericImpl->SetBackgroundColour(colour);
+    if (m_dbImpl)
+        m_bgColor = colour;
+    return rv;
+}
+
+wxColour wxListCtrl::GetBackgroundColour()
+{
+    if (m_genericImpl)
+        return m_genericImpl->GetBackgroundColour();
+    if (m_dbImpl)
+        return m_bgColor;
+
+    return wxNullColour;
 }
 
 // ----------------------------------------------------------------------------
@@ -365,23 +780,28 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 
     bool success = true;
 
-    if ( item.m_mask & wxLIST_MASK_TEXT )
-    {
-    }
-
-    if ( item.m_mask & wxLIST_MASK_FORMAT )
+    if (m_dbImpl)
     {
-    }
 
-    if ( item.m_mask & wxLIST_MASK_IMAGE )
-    {
-    }
+        wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
+        wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
+        wxListItem* column = node->GetData();
 
-    if ( (item.m_mask & wxLIST_MASK_TEXT) )
-    {
+        long mask = column->GetMask();
+        if (mask & wxLIST_MASK_TEXT)
+            item.SetText(column->GetText());
+        if (mask & wxLIST_MASK_DATA)
+            item.SetData(column->GetData());
+        if (mask & wxLIST_MASK_IMAGE)
+            item.SetImage(column->GetImage());
+        if (mask & wxLIST_MASK_STATE)
+            item.SetState(column->GetState());
+        if (mask & wxLIST_MASK_FORMAT)
+            item.SetAlign(column->GetAlign());
+        if (mask & wxLIST_MASK_WIDTH)
+            item.SetWidth(column->GetWidth());
     }
 
-
     return success;
 }
 
@@ -391,7 +811,69 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
     if (m_genericImpl)
         return m_genericImpl->SetColumn(col, item);
 
-    return false;
+    if (m_dbImpl)
+    {
+        if ( col >= (int)m_colsInfo.GetCount() )
+        {
+            wxListItem* listItem = new wxListItem(item);
+            m_colsInfo.Append( listItem );
+        }
+        else
+        {
+            wxListItem listItem;
+            GetColumn( col, listItem );
+            long mask = item.GetMask();
+            if (mask & wxLIST_MASK_TEXT)
+                listItem.SetText(item.GetText());
+            if (mask & wxLIST_MASK_DATA)
+                listItem.SetData(item.GetData());
+            if (mask & wxLIST_MASK_IMAGE)
+                listItem.SetImage(item.GetImage());
+            if (mask & wxLIST_MASK_STATE)
+                listItem.SetState(item.GetState());
+            if (mask & wxLIST_MASK_FORMAT)
+                listItem.SetAlign(item.GetAlign());
+            if (mask & wxLIST_MASK_WIDTH)
+                listItem.SetWidth(item.GetWidth());
+        }
+
+        // change the appearance in the databrowser.
+        DataBrowserListViewHeaderDesc columnDesc;
+        columnDesc.version=kDataBrowserListViewLatestHeaderDesc;
+        verify_noerr( m_dbImpl->GetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+
+        /*
+        if (item.GetMask() & wxLIST_MASK_TEXT)
+        {
+            wxFontEncoding enc;
+            if ( m_font.Ok() )
+                enc = m_font.GetEncoding();
+            else
+                enc = wxLocale::GetSystemEncoding();
+            wxMacCFStringHolder cfTitle;
+            cfTitle.Assign( item.GetText() , enc );
+            if(columnDesc.titleString)
+                CFRelease(columnDesc.titleString);
+            columnDesc.titleString = cfTitle;
+        }
+        */
+
+        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();
+                columnDesc.btnContentInfo.u.iconRef = icon;
+            }
+        }
+
+        verify_noerr( m_dbImpl->SetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+
+    }
+    return true;
 }
 
 int wxListCtrl::GetColumnCount() const
@@ -429,10 +911,6 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
     if (m_genericImpl)
         return m_genericImpl->SetColumnWidth(col, width);
 
-    // TODO: This is setting the width of the first column
-    //       to the entire window width; investigate why
-    //       this is.
-
     if (m_dbImpl)
     {
         int mywidth = width;
@@ -487,7 +965,22 @@ bool wxListCtrl::GetItem(wxListItem& info) const
         return m_genericImpl->GetItem(info);
 
     if (m_dbImpl)
-        m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
+    {
+        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) );
+            wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId );
+            if (attrs)
+            {
+                info.SetFont( attrs->GetFont() );
+                info.SetBackgroundColour( attrs->GetBackgroundColour() );
+                info.SetTextColour( attrs->GetTextColour() );
+            }
+        }
+    }
     bool success = true;
     return success;
 }
@@ -657,6 +1150,34 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
     if (m_genericImpl)
         return m_genericImpl->GetItemRect(item, rect, code);
 
+
+    if (m_dbImpl)
+    {
+        DataBrowserItemID id;
+        DataBrowserPropertyID col = kMinColumnId;
+        Rect bounds;
+        DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
+        if ( code == wxLIST_RECT_LABEL )
+            part = kDataBrowserPropertyTextPart;
+        else if ( code == wxLIST_RECT_ICON )
+            part = kDataBrowserPropertyIconPart;
+
+        if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL) )
+        {
+            wxMacDataItem* thisItem = m_dbImpl->GetItemFromLine(item);
+            id = (DataBrowserItemID) thisItem;
+        }
+        else
+            id = item;
+
+        GetDataBrowserItemPartBounds( m_dbImpl->GetControlRef(), id, col, part, &bounds );
+
+        rect.x = bounds.left;
+        rect.y = bounds.top;
+        rect.width = bounds.right - bounds.left; //GetClientSize().x; // we need the width of the whole row, not just the item.
+        rect.height = bounds.bottom - bounds.top;
+        //fprintf("id = %d, bounds = %d, %d, %d, %d\n", id, rect.x, rect.y, rect.width, rect.height);
+    }
     return true;
 }
 
@@ -668,6 +1189,14 @@ bool wxListCtrl::GetItemPosition(long item, wxPoint& pos) const
 
     bool success = false;
 
+    if (m_dbImpl)
+    {
+        wxRect itemRect;
+        GetItemRect(item, itemRect);
+        pos = itemRect.GetPosition();
+        success = true;
+    }
+
     return success;
 }
 
@@ -811,8 +1340,8 @@ wxColour wxListCtrl::GetTextColour() const
 
     // TODO: we need owner drawn list items to customize text color.
     if (m_dbImpl)
-        return *wxBLACK;
-        
+        return m_textColor;
+
     return wxNullColour;
 }
 
@@ -825,8 +1354,8 @@ void wxListCtrl::SetTextColour(const wxColour& col)
         return;
     }
 
-    // TODO: if we add owner-drawn item support for DataBrowser,
-    // consider supporting this property
+    if (m_dbImpl)
+        m_textColor = col;
 }
 
 // Gets the index of the topmost visible item when in
@@ -852,6 +1381,18 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
     if (m_genericImpl)
         return m_genericImpl->GetNextItem(item, geom, state);
 
+    if (m_dbImpl && geom == wxLIST_NEXT_ALL && state == wxLIST_STATE_SELECTED )
+    {
+        long count = m_dbImpl->MacGetCount() ;
+        for ( long line = item + 1 ; line < count; line++ )
+        {
+            wxMacDataItem* id = m_dbImpl->GetItemFromLine(line);
+            if ( m_dbImpl->IsItemSelected(id ) )
+                return line;
+        }
+        return -1;
+    }
+
     return 0;
 }
 
@@ -945,7 +1486,7 @@ bool wxListCtrl::DeleteItem(long item)
         wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() );
         event.SetEventObject( this );
         event.m_itemIndex = item;
-        GetEventHandler()->ProcessEvent( event );   
+        GetEventHandler()->ProcessEvent( event );
 
     }
     return true;
@@ -1024,8 +1565,27 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 
     if (m_dbImpl)
     {
-        wxMacDataItem* id = m_dbImpl->GetItemFromLine(item);
-        verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), (DataBrowserItemID)id, kMinColumnId) );
+        wxCHECK_MSG( (item >= 0) && ((long)item < GetItemCount()), NULL,
+                     wxT("wrong index in wxListCtrl::EditLabel()") );
+
+        wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
+                     wxT("EditLabel() needs a text control") );
+
+        wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
+        le.SetEventObject( this );
+        le.m_itemIndex = item;
+        le.m_col = 0;
+        GetItem( le.m_item );
+
+        if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+        {
+            // vetoed by user code
+            return NULL;
+        }
+
+        wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
+        m_textctrlWrapper = new wxListCtrlTextCtrlWrapper(this, text, item);
+        return m_textctrlWrapper->GetText();
     }
     return NULL;
 }
@@ -1104,6 +1664,47 @@ wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
     if (m_genericImpl)
         return m_genericImpl->HitTest(point, flags, ptrSubItem);
 
+    flags = wxLIST_HITTEST_NOWHERE;
+    if (m_dbImpl)
+    {
+        int colHeaderHeight = 22; // TODO: Find a way to get this value from the db control?
+        UInt16 rowHeight = 0;
+        m_dbImpl->GetDefaultRowHeight(&rowHeight);
+
+        int y = point.y;
+        // get the actual row by taking scroll position into account
+        UInt32 offsetX, offsetY;
+        m_dbImpl->GetScrollPosition( &offsetY, &offsetX );
+        y += offsetY;
+
+        if ( !(GetWindowStyleFlag() & wxLC_NO_HEADER) )
+            y -= colHeaderHeight;
+
+        int row = y / rowHeight;
+        DataBrowserItemID id;
+        m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );
+
+        // TODO: Use GetDataBrowserItemPartBounds to return if we are in icon or label
+        if ( !(GetWindowStyleFlag() & wxLC_VIRTUAL ) )
+        {
+            wxMacListCtrlItem* lcItem;
+            lcItem = (wxMacListCtrlItem*) id;
+            if (lcItem)
+            {
+                flags = wxLIST_HITTEST_ONITEM;
+                return row;
+            }
+        }
+        else
+        {
+            if (row < GetItemCount() )
+            {
+                flags = wxLIST_HITTEST_ONITEM;
+                return row;
+            }
+        }
+
+    }
     return -1;
 }
 
@@ -1181,16 +1782,17 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
 
     if (m_dbImpl)
     {
+        int width = item.GetWidth();
         if ( !(item.GetMask() & wxLIST_MASK_WIDTH) )
-            item.SetWidth(150);
+            width = 150;
 
-        DataBrowserPropertyType type = kDataBrowserTextType;
+        DataBrowserPropertyType type = kDataBrowserCustomType; //kDataBrowserTextType;
         wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL);
         if (imageList && imageList->GetImageCount() > 0)
         {
             wxBitmap bmp = imageList->GetBitmap(0);
-            if (bmp.Ok())
-                type = kDataBrowserIconAndTextType;
+            //if (bmp.Ok())
+            //    type = kDataBrowserIconAndTextType;
         }
 
         SInt16 just = teFlushDefault;
@@ -1203,17 +1805,21 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
             else if (item.GetAlign() == wxLIST_FORMAT_RIGHT)
                 just = teFlushRight;
         }
-        m_dbImpl->InsertColumn(col, type, item.GetText(), just, item.GetWidth());
-
+        m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);
+        SetColumn(col, item);
+
+        // set/remove options based on the wxListCtrl type.
+        DataBrowserTableViewColumnID id;
+        m_dbImpl->GetColumnIDFromIndex(col, &id);
+        DataBrowserPropertyFlags flags;
+        verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags));
         if (GetWindowStyleFlag() & wxLC_EDIT_LABELS)
-        {
-            DataBrowserTableViewColumnID id;
-            m_dbImpl->GetColumnIDFromIndex(col, &id);
-            DataBrowserPropertyFlags flags;
-            verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags));
             flags |= kDataBrowserPropertyIsEditable;
-            verify_noerr(m_dbImpl->SetPropertyFlags(id, flags));
+
+        if (GetWindowStyleFlag() & wxLC_VIRTUAL){
+            flags &= ~kDataBrowserListViewSortableColumn;
         }
+        verify_noerr(m_dbImpl->SetPropertyFlags(id, flags));
     }
 
     return col;
@@ -1260,9 +1866,48 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
     if (m_genericImpl)
         return m_genericImpl->SortItems(fn, data);
 
+    if (m_dbImpl)
+    {
+        m_compareFunc = fn;
+        m_compareFuncData = data;
+    }
+
     return true;
 }
 
+void wxListCtrl::OnRenameTimer()
+{
+    wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") );
+
+    EditLabel( m_current );
+}
+
+bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value)
+{
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetId() );
+    le.SetEventObject( this );
+    le.m_itemIndex = itemEdit;
+
+    GetItem( le.m_item );
+    le.m_item.m_text = value;
+    return !GetEventHandler()->ProcessEvent( le ) ||
+                le.IsAllowed();
+}
+
+void wxListCtrl::OnRenameCancelled(long itemEdit)
+{
+    // let owner know that the edit was cancelled
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+
+    le.SetEditCanceled(true);
+
+    le.SetEventObject( this );
+    le.m_itemIndex = itemEdit;
+
+    GetItem( le.m_item );
+    GetEventHandler()->ProcessEvent( le );
+}
+
 // ----------------------------------------------------------------------------
 // virtual list controls
 // ----------------------------------------------------------------------------
@@ -1399,7 +2044,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
         bool trigger = false;
 
         wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
-        bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL;
+        bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
 
         event.SetEventObject( list );
         event.m_itemIndex = owner->GetLineFromItem( this ) ;
@@ -1421,7 +2066,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
                 break;
 
             case kDataBrowserItemDoubleClicked:
-                event.SetEventType( wxEVT_LEFT_DCLICK );
+                event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
                 trigger = true;
                 break;
 
@@ -1457,7 +2102,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     m_isVirtual = false;
-    
+
     if ( style & wxLC_VIRTUAL )
         m_isVirtual = true;
 
@@ -1474,6 +2119,24 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
     err = SetSelectionFlags( options );
     verify_noerr( err );
 
+    DataBrowserCustomCallbacks callbacks;
+    InitializeDataBrowserCustomCallbacks( &callbacks, kDataBrowserLatestCustomCallbacks );
+
+    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 );
+
     if ( style & wxLC_LIST )
     {
         InsertColumn(0, kDataBrowserIconAndTextType, wxEmptyString, -1, -1);
@@ -1483,7 +2146,10 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
     if ( style & wxLC_LIST || style & wxLC_NO_HEADER )
         verify_noerr( SetHeaderButtonHeight( 0 ) );
 
-    SetSortProperty( kMinColumnId );
+    if ( m_isVirtual )
+        SetSortProperty( kMinColumnId - 1 );
+    else
+        SetSortProperty( kMinColumnId );
     if ( style & wxLC_SORT_ASCENDING )
     {
         m_sortOrder = SortOrder_Text_Ascending;
@@ -1510,6 +2176,296 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 }
 
+pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(
+        ControlRef browser,
+        DataBrowserItemID itemID,
+        DataBrowserPropertyID property,
+        CFStringRef theString,
+        Rect *maxEditTextRect,
+        Boolean *shrinkToFit)
+{
+    Boolean result = false;
+    wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    if ( ctl != 0 )
+    {
+        result = ctl->ConfirmEditText(itemID, property, theString, maxEditTextRect, shrinkToFit);
+        theString = CFSTR("Hello!");
+    }
+    return result;
+}
+
+bool wxMacDataBrowserListCtrlControl::ConfirmEditText(
+        DataBrowserItemID itemID,
+        DataBrowserPropertyID property,
+        CFStringRef theString,
+        Rect *maxEditTextRect,
+        Boolean *shrinkToFit)
+{
+    //wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+    return false;
+}
+
+pascal void wxMacDataBrowserListCtrlControl::DataBrowserDrawItemProc(
+        ControlRef browser,
+        DataBrowserItemID itemID,
+        DataBrowserPropertyID property,
+        DataBrowserItemState itemState,
+        const Rect *itemRect,
+        SInt16 gdDepth,
+        Boolean colorDevice)
+{
+    wxMacDataBrowserListCtrlControl* ctl = dynamic_cast<wxMacDataBrowserListCtrlControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    if ( ctl != 0 )
+    {
+        ctl->DrawItem(itemID, property, itemState, itemRect, gdDepth, colorDevice);
+    }
+}
+
+// routines needed for DrawItem
+enum
+{
+  kIconWidth = 16,
+  kIconHeight = 16,
+  kTextBoxHeight = 14,
+  kIconTextSpacingV = 2,
+  kItemPadding = 4,
+  kContentHeight = kIconHeight + kTextBoxHeight + kIconTextSpacingV
+};
+
+static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
+{
+  float textBottom;
+  float iconH, iconW = 0;
+  float padding = kItemPadding;
+  if (hasIcon)
+  {
+    iconH = kIconHeight;
+    iconW = kIconWidth;
+    padding = padding*2;
+  }
+
+  textBottom = inItemRect.origin.y;
+
+  *outIconRect = CGRectMake(inItemRect.origin.x + kItemPadding,
+                textBottom + kIconTextSpacingV, kIconWidth,
+                kIconHeight);
+
+  *outTextRect = CGRectMake(inItemRect.origin.x + padding + iconW,
+                textBottom + kIconTextSpacingV, inItemRect.size.width - padding - iconW,
+                inItemRect.size.height - kIconTextSpacingV);
+}
+
+void wxMacDataBrowserListCtrlControl::DrawItem(
+        DataBrowserItemID itemID,
+        DataBrowserPropertyID property,
+        DataBrowserItemState itemState,
+        const Rect *itemRect,
+        SInt16 gdDepth,
+        Boolean colorDevice)
+{
+    wxString text;
+    wxFont font = wxNullFont;
+    int imgIndex = -1;
+    short listColumn = property - kMinColumnId;
+
+    wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+    wxMacListCtrlItem* lcItem;
+    wxColour color = *wxBLACK;
+    wxColour bgColor = wxNullColour;
+
+    if (listColumn >= 0)
+    {
+        if (!m_isVirtual)
+        {
+            lcItem = (wxMacListCtrlItem*) itemID;
+            if (lcItem->HasColumnInfo(listColumn)){
+                wxListItem* item = lcItem->GetColumnInfo(listColumn);
+
+                // we always use the 0 column to get font and text/background colors.
+                if (lcItem->HasColumnInfo(0))
+                {
+                    wxListItem* firstItem = lcItem->GetColumnInfo(0);
+                    color = firstItem->GetTextColour();
+                    bgColor = firstItem->GetBackgroundColour();
+                    font = firstItem->GetFont();
+                }
+
+                if (item->GetMask() & wxLIST_MASK_TEXT)
+                    text = item->GetText();
+                if (item->GetMask() & wxLIST_MASK_IMAGE)
+                    imgIndex = item->GetImage();
+            }
+
+        }
+        else
+        {
+            text = list->OnGetItemText( (long)itemID-1, listColumn );
+            imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn );
+            wxListItemAttr* attrs = list->OnGetItemAttr( (long)itemID-1 );
+            if (attrs)
+            {
+                if (attrs->HasBackgroundColour())
+                    bgColor = attrs->GetBackgroundColour();
+                if (attrs->HasTextColour())
+                    color = attrs->GetTextColour();
+                if (attrs->HasFont())
+                    font = attrs->GetFont();
+            }
+        }
+    }
+
+    wxColour listBgColor = list->GetBackgroundColour();
+    if (bgColor == wxNullColour)
+        bgColor = listBgColor;
+
+    wxFont listFont = list->GetFont();
+    if (font == wxNullFont)
+        font = listFont;
+
+    wxMacCFStringHolder cfString;
+    cfString.Assign( text, wxLocale::GetSystemEncoding() );
+
+    Rect enclosingRect;
+    CGRect enclosingCGRect, iconCGRect, textCGRect;
+    Boolean active;
+    ThemeDrawingState savedState = NULL;
+    CGContextRef context = (CGContextRef)list->MacGetDrawingContext();
+    RGBColor labelColor;
+
+    GetDataBrowserItemPartBounds(GetControlRef(), itemID, property, kDataBrowserPropertyEnclosingPart,
+              &enclosingRect);
+
+    enclosingCGRect = CGRectMake(enclosingRect.left,
+                      enclosingRect.top,
+                      enclosingRect.right - enclosingRect.left,
+                      enclosingRect.bottom - enclosingRect.top);
+
+    active = IsControlActive(GetControlRef());
+
+    if (itemState == kDataBrowserItemIsSelected)
+    {
+        RGBColor foregroundColor;
+
+        GetThemeDrawingState(&savedState);
+
+        GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &foregroundColor);
+        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);
+        CGContextFillRect(context, enclosingCGRect);
+
+        CGContextRestoreGState(context);
+    }
+    else
+    {
+
+        if (color.Ok())
+            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() );
+            CGContextSaveGState(context);
+
+            CGContextSetRGBFillColor(context, (float)foregroundColor.red / (float)USHRT_MAX,
+                          (float)foregroundColor.green / (float)USHRT_MAX,
+                          (float)foregroundColor.blue / (float)USHRT_MAX, 1.0);
+            CGContextFillRect(context, enclosingCGRect);
+
+            CGContextRestoreGState(context);
+        }
+    }
+
+    calculateCGDrawingBounds(enclosingCGRect, &iconCGRect, &textCGRect, (imgIndex != -1) );
+
+    if (imgIndex != -1)
+    {
+        wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
+        if (imageList && imageList->GetImageCount() > 0){
+            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,
+              kPlotIconRefNormalFlags, icon);
+
+            CGContextRestoreGState(context);
+        }
+    }
+
+    HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
+    UInt16 fontID = kThemeViewsFont;
+
+    if (font.Ok())
+    {
+        if (font.GetFamily() != wxFONTFAMILY_DEFAULT)
+            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
+    }
+
+    wxListItem item;
+    list->GetColumn(listColumn, item);
+    if (item.GetMask() & wxLIST_MASK_FORMAT)
+    {
+        if (item.GetAlign() == wxLIST_FORMAT_LEFT)
+            hFlush = kHIThemeTextHorizontalFlushLeft;
+        else if (item.GetAlign() == wxLIST_FORMAT_CENTER)
+            hFlush = kHIThemeTextHorizontalFlushCenter;
+        else if (item.GetAlign() == wxLIST_FORMAT_RIGHT)
+        {
+            hFlush = kHIThemeTextHorizontalFlushRight;
+            textCGRect.origin.x -= kItemPadding; // give a little extra paddding
+        }
+    }
+
+    HIThemeTextInfo info;
+    info.version = kHIThemeTextInfoVersionZero;
+    info.state = active ? kThemeStateActive : kThemeStateInactive;
+    info.fontID = fontID;
+    info.horizontalFlushness = hFlush;
+    info.verticalFlushness = kHIThemeTextVerticalFlushCenter;
+    info.options = kHIThemeTextBoxOptionNone;
+    info.truncationPosition = kHIThemeTextTruncationEnd;
+    info.truncationMaxLines = 1;
+
+    CGContextSaveGState(context);
+    CGContextSetRGBFillColor (context, (float)labelColor.red / (float)USHRT_MAX,
+                      (float)labelColor.green / (float)USHRT_MAX,
+                      (float)labelColor.blue / (float)USHRT_MAX, 1.0);
+
+    HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
+
+    CGContextRestoreGState(context);
+
+    if (savedState != NULL)
+        SetThemeDrawingState(savedState, true);
+}
+
 OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID,
                         DataBrowserPropertyID property,
                         DataBrowserItemDataRef itemData,
@@ -1558,15 +2514,15 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                 if ( property >= kMinColumnId )
                 {
                     wxMacCFStringHolder cfStr;
-                    
+
                     if (text){
                         cfStr.Assign( text, wxLocale::GetSystemEncoding() );
                         err = ::SetDataBrowserItemDataText( itemData, cfStr );
                         err = noErr;
                     }
-                    
 
-                        
+
+
                     if ( imgIndex != -1 )
                     {
                         wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL);
@@ -1576,11 +2532,11 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                             ::SetDataBrowserItemDataIcon(itemData, icon);
                         }
                     }
-                        
+
                 }
                 break ;
         }
-                
+
     }
     else
     {
@@ -1603,7 +2559,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
                         if (lcItem)
                             lcItem->SetColumnTextValue( listColumn, cfStr.AsString() );
                     }
-                    err = noErr ;                        
+                    err = noErr ;
                 }
                 break;
         }
@@ -1624,7 +2580,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     else if ( message == kDataBrowserItemAdded )
     {
         // we don't issue events on adding, the item is not really stored in the list yet, so we
-        // avoid asserts by gettting out now
+        // avoid asserts by getting out now
         return  ;
     }
 
@@ -1632,14 +2588,13 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     if ( list )
     {
         bool trigger = false;
-            
+
         wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() );
-        bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL;
-        
+        bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0;
+
         event.SetEventObject( list );
         if ( !list->IsVirtual() )
         {
-            wxMacDataItem* item = (wxMacDataItem*)itemID;
             DataBrowserTableViewRowIndex result = 0;
             verify_noerr( GetItemRow( itemID, &result ) ) ;
             event.m_itemIndex = result;
@@ -1651,21 +2606,22 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         {
             event.m_itemIndex = (long)itemID;
         }
-        
+
         switch (message)
         {
             case kDataBrowserItemDeselected:
                 event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
                 if ( !isSingle )
-                    trigger = IsSelectionSuppressed();
+                    trigger = !IsSelectionSuppressed();
                 break;
 
             case kDataBrowserItemSelected:
-                trigger = IsSelectionSuppressed();
+                trigger = !IsSelectionSuppressed();
+
                 break;
 
             case kDataBrowserItemDoubleClicked:
-                event.SetEventType( wxEVT_LEFT_DCLICK );
+                event.SetEventType( wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
                 trigger = true;
                 break;
 
@@ -1674,7 +2630,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
                 event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ;
                 trigger = true ;
                 break ;
-                
+
             case kDataBrowserEditStopped :
                 // TODO probably trigger only upon the value store callback, because
                 // here IIRC we cannot veto
@@ -1705,16 +2661,20 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     int colId = sortProperty - kMinColumnId;
     long itemNum = 0;
     long otherItemNum = 0;
-    
+
     wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
-    
-    // means we need to 
+
+    // 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();
             if (item->HasColumnInfo(colId))
@@ -1728,12 +2688,12 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
             otherItemNum = (long)itemTwoID;
             itemText = list->OnGetItemText( itemNum-1, colId );
             otherItemText = list->OnGetItemText( otherItemNum-1, colId );
-            
+
         }
-        
+
         DataBrowserSortOrder sort;
-        verify_noerr(GetSortOrder(&sort)); 
-        
+        verify_noerr(GetSortOrder(&sort));
+
         if ( sort == kDataBrowserOrderIncreasing )
         {
             retval = itemText.CmpNoCase( otherItemText ) > 0;
@@ -1756,7 +2716,7 @@ wxMacDataBrowserListCtrlControl::~wxMacDataBrowserListCtrlControl()
 }
 
 void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
-{ 
+{
     wxMacDataItem* dataItem = GetItemFromLine(row);
     if (item)
     {
@@ -1766,14 +2726,14 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
     }
 }
 
-// apply changes that need to happen immediately, rather than when the 
+// apply changes that need to happen immediately, rather than when the
 // databrowser control fires a callback.
 void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxListItem* listItem)
 {
     bool isSelected = IsItemSelected( dataItem );
     bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED);
 
-    // toggle the selection state if wxListInfo state and actual state don't match.    
+    // toggle the selection state if wxListInfo state and actual state don't match.
     if ( isSelected != isSelectedState )
     {
         DataBrowserSetOption options = kDataBrowserItemsAdd;
@@ -1785,14 +2745,14 @@ void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxLis
 }
 
 void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item )
-{ 
+{
     wxMacDataItem* dataItem = GetItemFromLine(row);
     // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
-    //if (item) 
+    //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
@@ -1823,7 +2783,7 @@ void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem*
     MacSetColumnInfo(n, 0, item);
 }
 
-wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem()
+wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
 {
     return new wxMacListCtrlItem();
 }
@@ -1878,7 +2838,7 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
 
     if ( column >= m_rowItems.GetCount() )
     {
-        wxListItem* listItem = new wxListItem(*item);    
+        wxListItem* listItem = new wxListItem(*item);
         m_rowItems.Append( listItem );
     }
     else
@@ -1897,6 +2857,10 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item )
             listItem->SetAlign(item->GetAlign());
         if (mask & wxLIST_MASK_WIDTH)
             listItem->SetWidth(item->GetWidth());
+
+        listItem->SetTextColour(item->GetTextColour());
+        listItem->SetBackgroundColour(item->GetBackgroundColour());
+        listItem->SetFont(item->GetFont());
     }
 }