X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..77631b1d818c890391b7111a1e499f1317a9ea07:/src/mac/carbon/listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 9533882e9e..b0d596e693 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,20 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.cpp
+// Name:        src/mac/carbon/listbox.cpp
 // Purpose:     wxListBox
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "listbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
 
 #include "wx/app.h"
 #include "wx/listbox.h"
+#include "wx/checklst.h"
+#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 #include "wx/dynarray.h"
@@ -22,245 +24,846 @@
 
 #include "wx/utils.h"
 
-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
-    EVT_SIZE( wxListBox::OnSize ) 
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 
+// common interface for all implementations
+class wxMacListControl : public wxMacControl
+{
+public:
+    wxMacListControl( wxListBox *peer )
+    : wxMacControl( peer )
+    {
+    }
 
-typedef struct {
- unsigned short instruction;
- void (*function)();
-} ldefRec, *ldefPtr, **ldefHandle;
-
-extern "C"
-{
-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
-                                     Cell cell, short dataOffset, short dataLength,
-                                     ListHandle listHandle ) ;
-}
-
-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
-                                     Cell cell, short dataOffset, short dataLength,
-                                     ListHandle listHandle )
-{
-    FontInfo fontInfo;
-    GrafPtr savePort;
-    GrafPtr grafPtr;
-    RgnHandle savedClipRegion;
-    SInt32 savedPenMode;
-    wxListBox*          list;
-  GetPort(&savePort);
-  SetPort((**listHandle).port);
-  grafPtr = (**listHandle).port ;
-    // typecast our refCon
-    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
-    
-    //  Calculate the cell rect.
-    
-    switch( message ) {
-        case lInitMsg:
-            break;
+    ~wxMacListControl()
+    {
+    }
 
-        case lCloseMsg:
-            break;
+    virtual void            UpdateLine( int n ) = 0;
+
+    virtual void            MacDelete( int n ) = 0;
+    virtual void            MacInsert( int n, const wxString& item ) = 0;
+    virtual void            MacInsert( int n, const wxArrayString& items ) = 0;
+    virtual void            MacAppend( const wxString& item ) = 0;
+    virtual void            MacSet( int n, const wxString& item ) = 0;
+    virtual void            MacClear() = 0;
+    virtual void            MacDeselectAll() = 0;
+    virtual void            MacSetSelection( int n, bool select ) = 0;
+    virtual int             MacGetSelection() const = 0;
+    virtual int             MacGetSelections( wxArrayInt& aSelections ) const = 0;
+    virtual bool            MacIsSelected( int n ) const = 0;
+    virtual void            MacScrollTo( int n ) = 0;
+
+    wxListBox * GetPeer() const
+    { return (wxListBox*)m_peer; }
+};
+
+#if 0
+// In case we have to replace data browser ...
+// custom HIView-based implementation
+
+class wxMacCustomHIViewListControl : public wxMacListControl
+{
+public:
+    wxMacCustomHIViewListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
+    ~wxMacCustomHIViewListControl();
+
+    void            MacDelete( int n );
+    void            MacInsert( int n, const wxString& item );
+    void            MacInsert( int n, const wxArrayString& items );
+    void            MacAppend( const wxString& item );
+    void            MacSet( int n, const wxString& item );
+    void            MacClear();
+    void            MacDeselectAll();
+    void            MacSetSelection( int n, bool select );
+    int             MacGetSelection() const;
+    int             MacGetSelections( wxArrayInt& aSelections ) const;
+    bool            MacIsSelected( int n ) const;
+    void            MacScrollTo( int n );
+};
+#endif
+
+// DataBrowser-based implementation
+
+class wxMacDataBrowserListControl : public wxMacListControl
+{
+public:
+    wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
+    ~wxMacDataBrowserListControl();
+
+    void            UpdateLine( int n );
+
+    void            MacDelete( int n );
+    void            MacInsert( int n, const wxString& item );
+    void            MacInsert( int n, const wxArrayString& items );
+    void            MacAppend( const wxString& item );
+    void            MacSet( int n, const wxString& item );
+    void            MacClear();
+    void            MacDeselectAll();
+    void            MacSetSelection( int n, bool select );
+    int             MacGetSelection() const;
+    int             MacGetSelections( wxArrayInt& aSelections ) const;
+    bool            MacIsSelected( int n ) const;
+    void            MacScrollTo( int n );
+
+    virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags );
+    virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+        DataBrowserTableViewColumnIndex position );
+    virtual OSStatus AutoSizeListViewColumns();
+    virtual OSStatus SetHasScrollBars( bool horiz, bool vert );
+    virtual OSStatus SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );
+    virtual OSStatus SetListViewHeaderBtnHeight( UInt16 height );
+    virtual OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
+    virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID *items,
+            DataBrowserPropertyID preSortProperty,
+            DataBrowserPropertyID propertyID );
+    virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID *items,
+            DataBrowserPropertyID preSortProperty );
+    virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID *items,
+            DataBrowserPropertyID preSortProperty );
+    virtual OSStatus RevealItem( DataBrowserItemID item,
+            DataBrowserPropertyID propertyID,
+            DataBrowserRevealOptions options );
+    virtual OSStatus GetSelectionAnchor( DataBrowserItemID *first, DataBrowserItemID *last ) const;
+    virtual bool IsItemSelected( DataBrowserItemID item ) const;
+    virtual OSStatus SetSelectedItems( UInt32 numItems,
+            const DataBrowserItemID *items,
+            DataBrowserSetOption operation );
+
+private:
+    // as we are getting the same events for human and API selection we have to suppress
+    // events in the latter case
+    bool MacSuppressSelection( bool suppress );
+    bool MacIsSelectionSuppressed() const { return m_suppressSelection; }
+
+    bool m_suppressSelection;
+
+#if TARGET_API_MAC_OSX
+    static pascal void DataBrowserItemNotificationProc(
+        ControlRef browser,
+        DataBrowserItemID itemID,
+        DataBrowserItemNotification message,
+        DataBrowserItemDataRef itemData );
+#else
+    static pascal  void DataBrowserItemNotificationProc(
+        ControlRef browser,
+        DataBrowserItemID itemID,
+        DataBrowserItemNotification message );
+#endif
+};
+
+// ============================================================================
+// data browser based implementation
+// ============================================================================
+
+const short kTextColumnId = 1024;
+const short kCheckboxColumnId = 1025;
+
+// new DataBrowser-based version
+// because of the limited insert
+// functionality of DataBrowser,
+// we just introduce IDs corresponding
+// to the line number
 
-        case lDrawMsg:
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL;
+
+#if TARGET_API_MAC_OSX
+pascal void wxMacDataBrowserListControl::DataBrowserItemNotificationProc(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserItemNotification message,
+    DataBrowserItemDataRef itemData )
+#else
+pascal void wxMacDataBrowserListControl::DataBrowserItemNotificationProc(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserItemNotification message )
+#endif
+{
+    long ref = GetControlReference( browser );
+    if ( ref != 0 )
+    {
+        wxListBox *list = wxDynamicCast( (wxObject*)ref, wxListBox );
+        wxMacDataBrowserListControl *peer = (wxMacDataBrowserListControl*) list->GetPeer();
+
+        int i = itemID - 1;
+        if (i >= 0 && i < (int)list->GetCount())
         {
-            const wxString text = list->m_stringArray[cell.v] ;
-
-            //  Save the current clip region, and set the clip region to the area we are about
-            //  to draw.
-            
-            savedClipRegion = NewRgn();
-            GetClip( savedClipRegion );
-
-            ClipRect( drawRect );
-            EraseRect( drawRect );
-            
-        MoveTo(drawRect->left + 4 , drawRect->top + 10 );
-        ::TextFont( kFontIDMonaco ) ;
-        ::TextSize( 9  );
-        ::TextFace( 0 ) ;
- 
-        DrawText(text, 0 , text.Length());
-            //  If the cell is hilited, do the hilite now. Paint the cell contents with the
-            //  appropriate QuickDraw transform mode.
-            
-            if( isSelected ) {
-                savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
-                SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
-                PaintRect( drawRect );
-                SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
+            bool trigger = false;
+            wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+            switch (message)
+            {
+                case kDataBrowserItemDeselected:
+                    if ( list->HasMultipleSelection() )
+                        trigger = !peer->MacIsSelectionSuppressed();
+                    break;
+
+                case kDataBrowserItemSelected:
+                    trigger = !peer->MacIsSelectionSuppressed();
+                    break;
+
+                case kDataBrowserItemDoubleClicked:
+                    event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED );
+                    trigger = true;
+                    break;
+
+                default:
+                    break;
+            }
+
+            if ( trigger )
+            {
+                event.SetEventObject( list );
+                if ( list->HasClientObjectData() )
+                    event.SetClientObject( list->GetClientObject( i ) );
+                else if ( list->HasClientUntypedData() )
+                    event.SetClientData( list->GetClientData( i ) );
+                event.SetString( list->GetString( i ) );
+                event.SetInt( i );
+                event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : true );
+                wxPostEvent( list->GetEventHandler(), event );
+
+                // direct notification is not always having the listbox GetSelection() having in synch with event
+                // list->GetEventHandler()->ProcessEvent(event);
             }
-            
-            //  Restore the saved clip region.
-            
-            SetClip( savedClipRegion );
-            DisposeRgn( savedClipRegion );
+        }
+    }
+}
+
+static pascal OSStatus ListBoxGetSetItemData(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData,
+    Boolean changeValue )
+{
+    OSStatus err = errDataBrowserPropertyNotSupported;
+
+    long ref = GetControlReference( browser );
+
+    if ( !changeValue )
+    {
+        wxListBox *list = wxDynamicCast( (wxObject*)ref, wxListBox );
+        bool isCheckList = false;
+        if (list)
+            isCheckList = list->IsKindOf( CLASSINFO(wxCheckListBox) );
+
+        switch (property)
+        {
+            case kTextColumnId:
+                if ( ref != 0 )
+                {
+                    int i = itemID - 1;
+                    if (i >= 0 && i < (int)list->GetCount())
+                    {
+                        wxMacCFStringHolder cf( list->GetString( i ), list->GetFont().GetEncoding() );
+                        err = ::SetDataBrowserItemDataText( itemData, cf );
+                        verify_noerr( err );
+                        err = noErr;
+                    }
+                }
+                break;
+
+            case kCheckboxColumnId:
+                if ( ref != 0 )
+                {
+                    wxCheckListBox *list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
+                    int i = itemID - 1;
+                    if (i >= 0 && (unsigned int) i < list->GetCount())
+                    {
+                        err = ::SetDataBrowserItemDataButtonValue( itemData, list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff );
+                        verify_noerr( err );
+                        err = noErr;
+                    }
+                }
+                break;
+
+            case kDataBrowserItemIsEditableProperty:
+                if ( isCheckList )
+                    err = ::SetDataBrowserItemDataBooleanValue( itemData, true );
+                break;
+
+            default:
+                break;
+        }
+    }
+    else
+    {
+        switch (property)
+        {
+        case kCheckboxColumnId:
+            if ( ref != 0 )
+            {
+                wxCheckListBox *list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
+                int i = itemID - 1;
+                if (i >= 0 && (unsigned int)i < list->GetCount())
+                {
+                    // we have to change this behind the back, since Check() would be triggering another update round
+                    bool newVal = !list->IsChecked( i );
+                    err = ::SetDataBrowserItemDataButtonValue( itemData, newVal ? kThemeButtonOn : kThemeButtonOff );
+                    verify_noerr( err );
+                    err = noErr;
+                    list->m_checks[i] = newVal;
+
+                    wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId() );
+                    event.SetInt( i );
+                    event.SetEventObject( list );
+                    list->GetEventHandler()->ProcessEvent( event );
+                }
             }
             break;
-        case lHiliteMsg:
-            
-            //  Hilite or unhilite the cell. Paint the cell contents with the
-            //  appropriate QuickDraw transform mode.
-            
-            GetPort( &grafPtr );
-            savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
-            SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
-            PaintRect( drawRect );
-            SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
+
+        default:
             break;
-        default :
-          break ;
+        }
     }
-    SetPort(savePort);  
+
+    return err;
 }
 
-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-const short kwxMacListWithVerticalScrollbar = 128 ;
-const short kwxMacListItemHeight = 14 ;
+wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style)
+    : wxMacListControl( peer )
+{
+    bool isCheckList = peer->IsKindOf( CLASSINFO(wxCheckListBox));
 
-// ============================================================================
-// list box control implementation
-// ============================================================================
+    m_suppressSelection = false;
+    Rect bounds = wxMacGetBoundsForControl( peer, pos, size );
+    OSStatus err = ::CreateDataBrowserControl(
+        MAC_WXHWND(peer->MacGetTopLevelWindowRef()),
+        &bounds, kDataBrowserListView, &m_controlRef );
+    verify_noerr( err );
 
-// Listbox item
-wxListBox::wxListBox()
-{
-  m_noItems = 0;
-  m_selected = 0;
-  m_macList = NULL ;
+    DataBrowserSelectionFlags  options = kDataBrowserDragSelect;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        // default behaviour
+    }
+    else
+    {
+        options |= kDataBrowserSelectOnlyOne;
+    }
+    err = SetSelectionFlags( options );
+    verify_noerr( err );
+
+    if ( gDataBrowserItemDataUPP == NULL )
+        gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
+    if ( gDataBrowserItemNotificationUPP == NULL )
+    {
+        gDataBrowserItemNotificationUPP =
+#if TARGET_API_MAC_OSX
+            (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);
+#else
+            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc);
+#endif
+    }
+
+    DataBrowserCallbacks callbacks;
+    InitializeDataBrowserCallbacks( &callbacks, kDataBrowserLatestCallbacks );
+
+    callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+    callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+    SetCallbacks( &callbacks );
+
+    DataBrowserListViewColumnDesc columnDesc;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+
+    columnDesc.headerBtnDesc.btnFontStyle.flags =
+        kControlUseFontMask | kControlUseJustMask;
+
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+    columnDesc.headerBtnDesc.titleString = NULL;
+
+    if ( isCheckList )
+    {
+        columnDesc.headerBtnDesc.minimumWidth = 30;
+        columnDesc.headerBtnDesc.maximumWidth = 30;
+
+        columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
+        columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
+        columnDesc.propertyDesc.propertyFlags =
+            kDataBrowserPropertyIsMutable
+            | kDataBrowserTableViewSelectionColumn
+            | kDataBrowserDefaultPropertyFlags;
+        err = AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn );
+        verify_noerr( err );
+    }
+
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 10000;
+
+    columnDesc.propertyDesc.propertyID = kTextColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+#endif
+
+    verify_noerr( AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+    verify_noerr( AutoSizeListViewColumns() );
+    verify_noerr( SetHasScrollBars( false, true ) );
+    verify_noerr( SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) );
+    verify_noerr( SetListViewHeaderBtnHeight( 0 ) );
+
+#if 0
+    // shouldn't be necessary anymore under 10.2
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+    m_peer->SetNeedsFocusRect( true );
+#endif
 }
 
-static ListDefUPP macListDefUPP = NULL ;
+wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
+{
+}
 
-bool wxListBox::Create(wxWindow *parent, wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       int n, const wxString choices[],
-                       long style,
-                       const wxValidator& validator,
-                       const wxString& name)
+void wxMacDataBrowserListControl::MacDelete( int n )
 {
-    m_noItems = 0 ; // this will be increased by our append command
-    m_selected = 0;
-    
-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    wxArrayInt selectionBefore;
+    MacGetSelections( selectionBefore );
 
-    ListDefSpec listDef;
-    listDef.defType = kListDefUserProcType;
-    if ( macListDefUPP == NULL )
+    UInt32 id = GetPeer()->GetCount() + 1;
+
+    OSStatus err = RemoveItems( kDataBrowserNoItem, 1, (UInt32*) &id, kDataBrowserItemNoProperty );
+    verify_noerr( err );
+
+    for ( size_t i = 0; i < selectionBefore.GetCount(); ++i )
     {
-      macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
+        int current = selectionBefore[i];
+        if ( current == n )
+        {
+            // selection was deleted
+            MacSetSelection( current, false );
+        }
+        else if ( current > n )
+        {
+            // something behind the deleted item was selected -> move up
+            MacSetSelection( current - 1, true );
+            MacSetSelection( current, false );
+        }
     }
-        listDef.u.userProc = macListDefUPP ;
 
-#if TARGET_CARBON
-    Size asize;
+    // refresh all
+    err = UpdateItems(
+        kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+        kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+    verify_noerr( err );
+}
 
+void wxMacDataBrowserListControl::MacInsert( int n, const wxString& text)
+{
+    wxArrayInt selectionBefore;
+    MacGetSelections( selectionBefore );
 
-    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
-                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, &m_macControl );
+    UInt32 id = GetPeer()->GetCount(); // this has already been increased
+    OSStatus err = AddItems( kDataBrowserNoItem, 1,  (UInt32*) &id, kDataBrowserItemNoProperty );
+    verify_noerr( err );
 
-    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
-                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
+    for ( int i = selectionBefore.GetCount() - 1; i >= 0; --i )
+    {
+        int current = selectionBefore[i];
+        if ( current >= n )
+        {
+            MacSetSelection( current + 1, true );
+            MacSetSelection( current, false );
+        }
+    }
 
-    SetControlReference( (ControlHandle) m_macControl, (long) this);
-    SetControlVisibility( (ControlHandle) m_macControl, false, false);
+    // refresh all
+    err = UpdateItems(
+        kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+        kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+    verify_noerr( err );
+}
 
-#else
+void wxMacDataBrowserListControl::MacInsert( int n, const wxArrayString& items)
+{
+    wxArrayInt selectionBefore;
+    MacGetSelections( selectionBefore );
+    size_t itemsCount = items.GetCount();
 
-    long    result ;
+    UInt32 *ids = new UInt32[itemsCount];
+    for ( unsigned int i = 0; i < itemsCount; ++i )
+        ids[i] = GetPeer()->GetCount() - itemsCount + i + 1;
 
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
-                  kwxMacListWithVerticalScrollbar , 0 , 0, 
-                  kControlListBoxProc , (long) this ) ;
-    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
-               sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+    OSStatus err = AddItems( kDataBrowserNoItem, itemsCount, ids, kDataBrowserItemNoProperty );
+    verify_noerr( err );
+    delete [] ids;
 
-    HLock( (Handle) m_macList ) ;
-    ldefHandle ldef ;
-    ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
-    if (  (**(ListHandle)m_macList).listDefProc != NULL )
+    for ( int i = selectionBefore.GetCount() - 1; i >= 0; --i )
     {
-      (**ldef).instruction = 0x4EF9;  /* JMP instruction */
-      (**ldef).function = (void(*)()) listDef.u.userProc;
-      (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
+        int current = selectionBefore[i];
+        if ( current >= n )
+        {
+            MacSetSelection( current + 1, true );
+            MacSetSelection( current, false );
+        }
     }
-        
-    Point pt = (**(ListHandle)m_macList).cellSize ;
-    pt.v = kwxMacListItemHeight ;
-    LCellSize( pt , (ListHandle)m_macList ) ;
-    LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
-#endif
-    OptionBits  options = 0;
-    if ( style & wxLB_MULTIPLE )
+
+    // refresh all
+    err = UpdateItems(
+        kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+        kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+    verify_noerr( err );
+}
+
+void wxMacDataBrowserListControl::MacAppend( const wxString& text)
+{
+    UInt32 id = GetPeer()->GetCount(); // this has already been increased
+    verify_noerr( AddItems( kDataBrowserNoItem, 1,  (UInt32*) &id, kDataBrowserItemNoProperty ) );
+    // no need to deal with selections nor refreshed, as we have appended
+}
+
+void wxMacDataBrowserListControl::MacClear()
+{
+    verify_noerr( RemoveItems( kDataBrowserNoItem, 0, NULL, kDataBrowserItemNoProperty ) );
+}
+
+void wxMacDataBrowserListControl::MacDeselectAll()
+{
+    bool former = MacSuppressSelection( true );
+    verify_noerr(SetSelectedItems( 0, NULL, kDataBrowserItemsRemove ) );
+    MacSuppressSelection( former );
+}
+
+void wxMacDataBrowserListControl::MacSetSelection( int n, bool select )
+{
+    UInt32 id = n + 1;
+    bool former = MacSuppressSelection( true );
+
+    if ( IsItemSelected( id ) != select )
     {
-        options += lNoExtend ;
+        OSStatus err;
+
+        if ( select )
+            err = SetSelectedItems( 1, &id, GetPeer()->HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign );
+        else
+            err = SetSelectedItems( 1, &id, kDataBrowserItemsRemove );
+
+        verify_noerr( err );
     }
-    else if ( style & wxLB_EXTENDED )
+
+    MacScrollTo( n );
+    MacSuppressSelection( former );
+}
+
+bool  wxMacDataBrowserListControl::MacSuppressSelection( bool suppress )
+{
+    bool former = m_suppressSelection;
+    m_suppressSelection = suppress;
+
+    return former;
+}
+
+bool wxMacDataBrowserListControl::MacIsSelected( int n ) const
+{
+    return IsItemSelected( n + 1 );
+}
+
+int wxMacDataBrowserListControl::MacGetSelection() const
+{
+    for ( unsigned int i = 0; i < GetPeer()->GetCount(); ++i )
     {
-        options += lExtendDrag ;
+        if ( IsItemSelected( i + 1 ) )
+        {
+            return i;
+        }
     }
-    else
+
+    return -1;
+}
+
+int wxMacDataBrowserListControl::MacGetSelections( wxArrayInt& aSelections ) const
+{
+    int no_sel = 0;
+
+    aSelections.Empty();
+
+    UInt32 first, last;
+    GetSelectionAnchor( &first, &last );
+    if ( first != kDataBrowserNoItem )
     {
-        options = lOnlyOne ;
+        for ( size_t i = first; i <= last; ++i )
+        {
+            if ( IsItemSelected( i ) )
+            {
+                aSelections.Add( i - 1 );
+                no_sel++;
+            }
+        }
     }
-    SetListSelectionFlags((ListHandle)m_macList, options);
-    
-    MacPostControlCreate() ;
-    
-    for ( int i = 0 ; i < n ; i++ )
+
+    return no_sel;
+}
+
+void wxMacDataBrowserListControl::MacSet( int n, const wxString& text )
+{
+    // as we don't store the strings we only have to issue a redraw
+    UInt32 id = n + 1;
+    verify_noerr( UpdateItems( kDataBrowserNoItem, 1, &id, kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) );
+}
+
+void wxMacDataBrowserListControl::MacScrollTo( int n )
+{
+    UInt32 id = n + 1;
+    verify_noerr(  RevealItem( id, kTextColumnId, kDataBrowserRevealWithoutSelecting ) );
+}
+
+void wxMacDataBrowserListControl::UpdateLine( int n )
+{
+    UInt32 id = n + 1;
+    verify_noerr( UpdateItems(kDataBrowserNoItem, 1, &id, kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) );
+}
+
+//
+// Databrowser
+//
+
+OSStatus wxMacDataBrowserListControl::SetSelectionFlags( DataBrowserSelectionFlags options )
+{
+    return SetDataBrowserSelectionFlags( m_controlRef, options );
+}
+
+OSStatus wxMacDataBrowserListControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+        DataBrowserTableViewColumnIndex position )
+{
+    return AddDataBrowserListViewColumn( m_controlRef, columnDesc, position );
+}
+
+OSStatus wxMacDataBrowserListControl::AutoSizeListViewColumns()
+{
+    return AutoSizeDataBrowserListViewColumns(m_controlRef);
+}
+
+OSStatus wxMacDataBrowserListControl::SetHasScrollBars( bool horiz, bool vert )
+{
+    return SetDataBrowserHasScrollBars( m_controlRef, horiz, vert );
+}
+
+OSStatus wxMacDataBrowserListControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+{
+    return SetDataBrowserTableViewHiliteStyle( m_controlRef, hiliteStyle );
+}
+
+OSStatus wxMacDataBrowserListControl::SetListViewHeaderBtnHeight(UInt16 height)
+{
+    return SetDataBrowserListViewHeaderBtnHeight( m_controlRef, height );
+}
+
+OSStatus wxMacDataBrowserListControl::SetCallbacks(const DataBrowserCallbacks *callbacks)
+{
+    return SetDataBrowserCallbacks( m_controlRef, callbacks );
+}
+
+OSStatus wxMacDataBrowserListControl::UpdateItems( 
+    DataBrowserItemID container,
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserPropertyID preSortProperty,
+    DataBrowserPropertyID propertyID )
+{
+    return UpdateDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty, propertyID );
+}
+
+bool wxMacDataBrowserListControl::IsItemSelected( DataBrowserItemID item ) const
+{
+    return IsDataBrowserItemSelected( m_controlRef, item );
+}
+
+OSStatus wxMacDataBrowserListControl::AddItems(
+    DataBrowserItemID container,
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserPropertyID preSortProperty )
+{
+    return AddDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}
+
+OSStatus wxMacDataBrowserListControl::RemoveItems(
+    DataBrowserItemID container,
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserPropertyID preSortProperty )
+{
+    return RemoveDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}
+
+OSStatus wxMacDataBrowserListControl::RevealItem(
+    DataBrowserItemID item,
+    DataBrowserPropertyID propertyID,
+    DataBrowserRevealOptions options )
+{
+    return RevealDataBrowserItem( m_controlRef, item, propertyID, options );
+}
+
+OSStatus wxMacDataBrowserListControl::SetSelectedItems(
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserSetOption operation )
+{
+    return SetDataBrowserSelectedItems( m_controlRef, numItems, items, operation );
+}
+
+OSStatus wxMacDataBrowserListControl::GetSelectionAnchor( DataBrowserItemID *first, DataBrowserItemID *last ) const
+{
+    return GetDataBrowserSelectionAnchor( m_controlRef, first, last );
+}
+
+#if 0
+
+// in case we need that one day
+
+// ============================================================================
+// HIView owner-draw-based implementation
+// ============================================================================
+
+static pascal void ListBoxDrawProc(
+    ControlRef browser, DataBrowserItemID item, DataBrowserPropertyID property,
+    DataBrowserItemState itemState, const Rect *itemRect, SInt16 depth, Boolean isColorDevice )
+{
+    CFStringRef cfString;
+    ThemeDrawingState themeState;
+    long systemVersion;
+
+    GetThemeDrawingState( &themeState );
+    cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
+
+    //  In this sample we handle the "selected" state; all others fall through to our "active" state
+    if ( itemState == kDataBrowserItemIsSelected )
     {
-        Append( choices[i] ) ;
+        ThemeBrush colorBrushID;
+
+        // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor
+        // is incorporated Panther DB starts using kThemeBrushSecondaryHighlightColor
+        // for inactive browser highlighting
+        Gestalt( gestaltSystemVersion, &systemVersion );
+        if ( (systemVersion >= 0x00001030) && !IsControlActive( browser ) )
+            colorBrushID = kThemeBrushSecondaryHighlightColor;
+        else
+            colorBrushID = kThemeBrushPrimaryHighlightColor;
+
+        // First paint the hilite rect, then the text on top
+        SetThemePen( colorBrushID, 32, true );
+        PaintRect( itemRect );
+        SetThemeDrawingState( themeState, false );
     }
-    
-    LSetDrawingMode( true , (ListHandle)m_macList ) ;
 
-    return TRUE;
+    DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+    SetThemeDrawingState( themeState, true );
+
+    if ( cfString != NULL )
+        CFRelease( cfString );
+}
+#endif
+
+// ============================================================================
+// list box control implementation
+// ============================================================================
+
+wxListBox::wxListBox()
+{
+    m_noItems = 0;
+}
+
+bool wxListBox::Create(
+    wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )
+{
+    wxCArrayString chs(choices);
+
+    return Create(
+        parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+        style, validator, name );
+}
+
+bool wxListBox::Create(
+    wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    int n,
+    const wxString choices[],
+    long style,
+    const wxValidator& validator,
+    const wxString& name )
+{
+    m_macIsUserPane = false;
+
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  wxT("only a single listbox selection mode can be specified") );
+
+    if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+        return false;
+
+   // this will be increased by our append command
+    m_noItems = 0;
+
+    m_peer = CreateMacListControl( pos, size, style );
+
+    MacPostControlCreate( pos, size );
+
+    InsertItems( n, choices, 0 );
+
+   // Needed because it is a wxControlWithItems
+    SetBestSize( size );
+
+    return true;
 }
 
 wxListBox::~wxListBox()
 {
-    Free() ;
-    if ( m_macList )
-    {
-#if !TARGET_CARBON
-      DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
-      (**(ListHandle)m_macList).listDefProc = NULL ;
-#endif
-        m_macList = NULL ;
-    }
+    m_peer->SetReference( 0 );
+    FreeData();
 }
 
-void wxListBox::Free()
+wxMacListControl * wxListBox::CreateMacListControl(const wxPoint& pos, const wxSize& size, long style)
+{
+    return new wxMacDataBrowserListControl( this, pos, size, style );
+}
+
+void wxListBox::FreeData()
 {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
         size_t uiCount = m_aItems.Count();
-        while ( uiCount-- != 0 ) {
+        while ( uiCount != 0 )
+        {
+            uiCount--;
             delete m_aItems[uiCount];
+            m_aItems[uiCount] = NULL;
         }
 
         m_aItems.Clear();
     }
     else
-#endif // wxUSE_OWNER_DRAWN
+#endif
     if ( HasClientObjectData() )
     {
-        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+        for ( unsigned int n = 0; n < m_noItems; n++ )
         {
-            delete GetClientObject(n);
+            delete GetClientObject( n );
         }
     }
 }
@@ -269,249 +872,168 @@ void  wxListBox::DoSetSize(int x, int y,
             int width, int height,
             int sizeFlags )
 {
-    wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
-#if TARGET_CARBON
-    Rect bounds ;
-    GetControlBounds( (ControlHandle) m_macControl , &bounds ) ;
-    ControlRef control = GetListVerticalScrollBar( m_macList ) ;
-    if ( control )
-    {
-        Rect scrollbounds ;
-        GetControlBounds( control , &scrollbounds ) ;
-        if( scrollbounds.right != bounds.right + 1 )
-        {
-            UMAMoveControl( control , bounds.right - (scrollbounds.right - scrollbounds.left) + 1 , 
-                scrollbounds.top ) ;
-        }
-    }
-#endif
+    wxControl::DoSetSize( x, y, width, height, sizeFlags );
 }
-void wxListBox::DoSetFirstItem(int N)
+
+void wxListBox::DoSetFirstItem(int n)
 {
-    MacScrollTo( N ) ;
+    GetPeer()->MacScrollTo( n );
 }
 
-void wxListBox::Delete(int N)
+void wxListBox::Delete(unsigned int n)
 {
-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 wxT("invalid index in wxListBox::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") );
 
 #if wxUSE_OWNER_DRAWN
-    delete m_aItems[N];
-    m_aItems.RemoveAt(N);
-#else // !wxUSE_OWNER_DRAWN
+    delete m_aItems[n];
+    m_aItems.RemoveAt(n);
+#else
     if ( HasClientObjectData() )
     {
-        delete GetClientObject(N);
+        delete GetClientObject(n);
     }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-    m_stringArray.Remove( N ) ;
-    m_dataArray.RemoveAt( N ) ;
-    m_noItems --;
-    
-    MacDelete( N ) ;
+#endif
+
+    m_stringArray.RemoveAt( n );
+    m_dataArray.RemoveAt( n );
+    m_noItems--;
+
+    GetPeer()->MacDelete( n );
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
-    int index = m_noItems ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
-        m_dataArray.Add( NULL );
-    }
-    else {
-        m_stringArray.Add( item ) ;
-        m_dataArray.Add( NULL );
-    }
-    m_noItems ++;
-    DoSetItemClientData( index , NULL ) ;
-    MacAppend( item ) ;
+    InvalidateBestSize();
+
+    unsigned int index = m_noItems;
+    m_stringArray.Add( item );
+    m_dataArray.Add( NULL );
+    m_noItems++;
+    DoSetItemClientData( index, NULL );
+    GetPeer()->MacAppend( item );
 
-    return index ;
+    return index;
 }
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
-{ 
-  MacSetRedraw( false ) ;
-  Clear() ;  
-  int n = choices.GetCount();
-
-  for( int i = 0 ; i < n ; ++i )
-  {
-    if ( clientData )
+{
+    Clear();
+    unsigned int n = choices.GetCount();
+
+    for ( size_t i = 0; i < n; ++i )
     {
+        if ( clientData )
+        {
 #if wxUSE_OWNER_DRAWN
             wxASSERT_MSG(clientData[i] == NULL,
-                         wxT("Can't use client data with owner-drawn listboxes"));
-#else // !wxUSE_OWNER_DRAWN
-        Append( choices[i] , clientData[i] ) ;
- #endif
+                wxT("Cannot use client data with owner-drawn listboxes"));
+#else
+            Append( choices[i], clientData[i] );
+#endif
+        }
+        else
+            Append( choices[i] );
     }
-    else
-        Append( choices[i] ) ;
-  }
 
 #if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
         // first delete old items
         size_t ui = m_aItems.Count();
-        while ( ui-- != 0 ) {
+        while ( ui != 0 )
+        {
+            ui--;
             delete m_aItems[ui];
+            m_aItems[ui] = NULL;
         }
+
         m_aItems.Empty();
 
         // then create new ones
-        for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
+        for ( ui = 0; ui < (size_t)m_noItems; ui++ )
+        {
             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);
         }
     }
-#endif // wxUSE_OWNER_DRAWN
-  MacSetRedraw( true ) ;
-}
-
-bool wxListBox::HasMultipleSelection() const
-{
-    return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
+#endif
 }
 
-int wxListBox::FindString(const wxString& st) const
+int wxListBox::FindString(const wxString& s, bool bCase) const
 {
-    wxString s ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        s = wxMacMakeMacStringFromPC( st ) ;
-    }
-    else
-        s = st ;
-        
-    if ( s.Right(1) == "*" )
+    for ( size_t i = 0; i < m_noItems; ++ i )
     {
-        wxString search = s.Left( s.Length() - 1 ) ;
-        int len = search.Length() ;
-        Str255 s1 , s2 ;
-
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
-#else
-        strcpy( (char *) s2 , search.c_str() ) ;
-        c2pstr( (char *) s2 ) ;
-#endif
-
-        for ( int i = 0 ; i < m_noItems ; ++ i )
-        {
-#if TARGET_CARBON
-            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-#else
-            strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-            c2pstr( (char *) s1 ) ;
-#endif
-            if ( EqualString( s1 , s2 , false , false ) )
-                return i ;
-        }
-        if ( s.Left(1) == "*" && s.Length() > 1 )
-        {
-            s.MakeLower() ;
-            for ( int i = 0 ; i < m_noItems ; ++i )
-            {
-                if ( GetString(i).Lower().Matches(s) )
-                    return i ;
-            }
-        }   
-
+        if (s.IsSameAs( GetString( i ), bCase) )
+            return (int)i;
     }
-    else
-    {
-        Str255 s1 , s2 ;
 
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
-#else
-        strcpy( (char *) s2 , s.c_str() ) ;
-        c2pstr( (char *) s2 ) ;
-#endif
-
-        for ( int i = 0 ; i < m_noItems ; ++ i )
-        {
-#if TARGET_CARBON
-            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
-#else
-            strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
-            c2pstr( (char *) s1 ) ;
-#endif
-            if ( EqualString( s1 , s2 , false , false ) )
-                return i ;
-        }
-   }
-   return -1;
+    return wxNOT_FOUND;
 }
 
 void wxListBox::Clear()
 {
-  Free();
-  m_noItems = 0;
-  m_stringArray.Empty() ;
-  m_dataArray.Empty() ;
-  MacClear() ;
+    FreeData();
+    m_noItems = 0;
+    m_stringArray.Empty();
+    m_dataArray.Empty();
+    GetPeer()->MacClear();
 }
 
-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int n, bool select)
 {
-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetSelection" );
-      MacSetSelection( N , select ) ;
-      GetSelections( m_selectionPreImage ) ;
+    wxCHECK_RET( n == wxNOT_FOUND || IsValid(n),
+        wxT("invalid index in wxListBox::SetSelection") );
+
+    if ( n == wxNOT_FOUND )
+        GetPeer()->MacDeselectAll();
+    else
+        GetPeer()->MacSetSelection( n, select );
 }
 
-bool wxListBox::IsSelected(int N) const
+bool wxListBox::IsSelected(int n) const
 {
-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-                 "invalid index in wxListBox::Selected" );
+    wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxListBox::Selected") );
 
-      return MacIsSelected( N ) ;
+    return GetPeer()->MacIsSelected( n );
 }
 
-void *wxListBox::DoGetItemClientData(int N) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const
 {
-    wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
-                 wxT("invalid index in wxListBox::GetClientData"));
+    wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+
+    wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int)n, wxT("invalid client_data array") );
 
-    return (void *)m_dataArray[N];
+    return (void*)m_dataArray[n];
 }
 
-wxClientData *wxListBox::DoGetItemClientObject(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const
 {
-    return (wxClientData *) DoGetItemClientData( N ) ;
+    return (wxClientData*)DoGetItemClientData( n );
 }
 
-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
 {
-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetClientData" );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
         // client data must be pointer to wxOwnerDrawn, otherwise we would crash
         // in OnMeasure/OnDraw.
-        wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
-    }
-#endif // wxUSE_OWNER_DRAWN
-    wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
-    
-    if ( m_dataArray.GetCount() > N )
-    {
-        m_dataArray[N] = (char*) Client_data ;
+        wxFAIL_MSG(wxT("Cannot use client data with owner-drawn listboxes"));
     }
+#endif
+
+    wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int)n, wxT("invalid client_data array") );
+
+    if ( m_dataArray.GetCount() > (unsigned int)n )
+        m_dataArray[n] = (char*)clientData;
     else
-    {
-        m_dataArray.Add( (char*) Client_data ) ;
-    }
+        m_dataArray.Add( (char*)clientData );
 }
 
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
     DoSetItemClientData(n, clientData);
 }
@@ -519,76 +1041,121 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
-    return MacGetSelections( aSelections ) ;
+    return GetPeer()->MacGetSelections( aSelections );
 }
 
 // Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {
-    return MacGetSelection() ;
+    return GetPeer()->MacGetSelection();
 }
 
 // Find string for position
-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned int n) const
 {
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        return      wxMacMakePCStringFromMac( m_stringArray[N] ) ;
-    }
-    else
-        return m_stringArray[N]  ;
+    wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") );
+
+    return m_stringArray[n];
 }
 
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 {
-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 wxT("invalid index in wxListBox::InsertItems") );
+    wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") );
 
-    int nItems = items.GetCount();
+    InvalidateBestSize();
 
-    for ( int i = 0 ; i < nItems ; i++ )
-    {
-        m_stringArray.Insert( items[i] , pos + i ) ;
-        m_dataArray.Insert( NULL , pos + i ) ;
-        MacInsert( pos + i , items[i] ) ;
-    }
+    unsigned int nItems = items.GetCount();
 
+    for ( unsigned int i = 0; i < nItems; i++ )
+        m_stringArray.Insert( items[i], pos + i );
+    m_dataArray.Insert( NULL, pos, nItems );
     m_noItems += nItems;
+    GetPeer()->MacInsert( pos, items );
 }
 
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)
 {
-    wxString str ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        str = wxMacMakeMacStringFromPC( s )  ;
-    }
-    else
-        str = s ;
-    m_stringArray[N] = str ;
-    MacSet( N , s ) ;
+    m_stringArray[n] = s;
+    GetPeer()->MacSet( n, s );
 }
 
 wxSize wxListBox::DoGetBestSize() const
 {
-    return wxSize(100, 100);
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 110;
+    int wLine;
+
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
+
+        // TODO: clean this up
+        if ( m_font.Ok() )
+        {
+            ::TextFont( m_font.MacGetFontNum() );
+            ::TextSize( m_font.MacGetFontSize() );
+            ::TextFace( m_font.MacGetFontStyle() );
+        }
+        else
+        {
+            ::TextFont( kFontIDMonaco );
+            ::TextSize( 9 );
+            ::TextFace( 0 );
+        }
+
+        // Find the widest line
+        for (unsigned int i = 0; i < GetCount(); i++)
+        {
+            wxString str( GetString( i ) );
+
+#if wxUSE_UNICODE
+            Point bounds = {0, 0};
+            SInt16 baseline;
+
+            // NB: what if m_font.Ok() == false ???
+            ::GetThemeTextDimensions(
+                wxMacCFStringHolder( str, m_font.GetEncoding() ),
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+            wLine = bounds.h;
+#else
+            wLine = ::TextWidth( str.c_str(), 0, str.length() );
+#endif
+
+            lbWidth = wxMax( lbWidth, wLine );
+        }
+
+        // Add room for the scrollbar
+        lbWidth += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X );
+
+        // And just a bit more
+        int cy = 12;
+        int cx = ::TextWidth( "X", 0, 1 );
+        lbWidth += cx;
+
+        // don't make the listbox too tall (limit height to around 10 items)
+        // but don't make it too small neither
+        lbHeight = wxMax( (cy + 4) * wxMin( wxMax( GetCount(), 3 ), 10 ), 70 );
+    }
+
+    return wxSize( lbWidth, lbHeight );
 }
 
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
 {
     return m_noItems;
 }
 
-void wxListBox::SetupColours()
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(GetParent()->GetForegroundColour());
+    wxControl::Refresh( eraseBack, rect );
 }
 
-void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
+void wxListBox::MacUpdateLine(int n)
 {
-    wxControl::Refresh( eraseBack , rect ) ;
-//    MacRedrawControl() ;
+    GetPeer()->UpdateLine(n);
 }
 
 #if wxUSE_OWNER_DRAWN
@@ -599,10 +1166,11 @@ public:
     wxListBoxItem(const wxString& str = "");
 };
 
-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+wxListBoxItem::wxListBoxItem(const wxString& str)
+    : wxOwnerDrawn(str, false)
 {
     // no bitmaps/checkmarks
-    SetMarginWidth(0);
+    SetMarginWidth( 0 );
 }
 
 wxOwnerDrawn *wxListBox::CreateItem(size_t n)
@@ -610,212 +1178,129 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
     return new wxListBoxItem();
 }
 
-#endif  //USE_OWNER_DRAWN
-
-// ============================================================================
-// list box control implementation
-// ============================================================================
-
-void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
-{
-    wxListBox*          list;
-    // typecast our refCon
-    list = (wxListBox*)refCon;
-        
-    MoveTo(cellRect->left + 4 , cellRect->top + 10 );
-    const wxString text = list->m_stringArray[lCell.v] ;
-    ::TextFont( kFontIDMonaco ) ;
-    ::TextSize( 9  );
-    ::TextFace( 0 ) ;
-    DrawText(text, 0 , text.Length());
-        
-}
-
-void wxListBox::MacDelete( int N )
-{
-    LDelRow( 1 , N , (ListHandle)m_macList) ;
-    Refresh();
-}
-
-void wxListBox::MacInsert( int n , const char * text) 
-{
-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
-//    LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
-}
-
-void wxListBox::MacAppend( const char * text) 
-{
-    Cell cell = { 0 , 0 } ;
-    cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
-    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
- //   LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
-}
-
-void wxListBox::MacClear() 
-{
-    LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
-    Refresh();
-}
+#endif // USE_OWNER_DRAWN
 
-void wxListBox::MacSetSelection( int n , bool select )
-{
-    Cell cell = { 0 , 0 } ;
-    if ( ! (m_windowStyle & wxLB_MULTIPLE) )
-    {
-    if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
-    {
-        LSetSelect( false , cell , (ListHandle)m_macList ) ;
-    }
-    }
-    
-    cell.v = n ;
-    LSetSelect( select , cell , (ListHandle)m_macList ) ;
-    LAutoScroll( (ListHandle)m_macList ) ;
-    Refresh();
-}
 
-bool wxListBox::MacIsSelected( int n ) const
+// Some custom controls depend on this
+/* static */ wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-    return LGetSelect( false , &cell , (ListHandle)m_macList ) ;
-}
+    wxVisualAttributes attr;
 
-void wxListBox::MacDestroy()
-{
-//    DisposeExtLDEFInfo( m_macList ) ;
-}
+    attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
+    attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
 
-int wxListBox::MacGetSelection() const
-{
-    Cell cell = { 0 , 0 } ;
-    if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
-        return cell.v ;
-    else
-        return -1 ;
+    return attr;
 }
 
-int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
 {
-    int no_sel = 0 ;
-    
-    aSelections.Empty();
-
-    Cell cell = { 0 , 0 } ;
-    cell.v = 0 ;
-    
-    while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
+    OSStatus err;
+
+    // There are few reasons why this is complicated:
+    // 1) There is no native HitTest function for Mac
+    // 2) GetDataBrowserItemPartBounds only works on visible items
+    // 3) We can't do it through GetDataBrowserTableView[Item]RowHeight
+    //    because what it returns is basically inaccurate in the context
+    //    of the coordinates we want here, but we use this as a guess
+    //    for where the first visible item lies
+
+    wxPoint point = inpoint;
+
+    // interestingly enough 10.2 (and below?) have GetDataBrowserItemPartBounds
+    // giving root window coordinates but 10.3 and above give client coordinates
+    // so we only compare using root window coordinates on 10.3 and up
+    if ( UMAGetSystemVersion() < 0x1030 )
+        MacClientToRootWindow(&point.x, &point.y);
+
+    // get column property ID (req. for call to itempartbounds)
+    DataBrowserTableViewColumnID colId = 0;
+    err = GetDataBrowserTableViewColumnProperty(m_peer->GetControlRef(), 0, &colId);
+    wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewColumnProperty"));
+
+    // OK, first we need to find the first visible item we have -
+    // this will be the "low" for our binary search. There is no real
+    // easy way around this, as we will need to do a SLOW linear search
+    // until we find a visible item, but we can do a cheap calculation
+    // via the row height to speed things up a bit
+    UInt32 scrollx, scrolly;
+    err = GetDataBrowserScrollPosition(m_peer->GetControlRef(), &scrollx, &scrolly);
+    wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserScrollPosition"));
+
+    UInt16 height;
+    err = GetDataBrowserTableViewRowHeight(m_peer->GetControlRef(), &height);
+    wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewRowHeight"));
+
+    // these indices are 0-based, as usual, so we need to add 1 to them when
+    // passing them to data browser functions which use 1-based indices
+    int low = scrolly / height,
+        high = GetCount() - 1;
+
+    // search for the first visible item (note that the scroll guess above
+    // is the low bounds of where the item might lie so we only use that as a
+    // starting point - we should reach it within 1 or 2 iterations of the loop)
+    while ( low <= high )
     {
-        aSelections.Add( cell.v ) ;
-        no_sel++ ;
-        cell.v++ ;
-    }
-    return no_sel ;
-}
-
-void wxListBox::MacSet( int n , const char * text )
-{
-    // our implementation does not store anything in the list
-    // so we just have to redraw
-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-//  LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
-}
-
-void wxListBox::MacScrollTo( int n )
-{
-    // TODO implement scrolling
-}
-
-void wxListBox::OnSize( const wxSizeEvent &event)
-{
-    Point pt;
-
-#if TARGET_CARBON
-    GetListCellSize(m_macList, &pt);
-#else
-    pt = (**(ListHandle)m_macList).cellSize ;
-#endif
-    pt.h =  m_width - 15  ;
-    LCellSize( pt , (ListHandle)m_macList ) ;
-}
+        Rect bounds;
+        err = GetDataBrowserItemPartBounds(
+            m_peer->GetControlRef(), low + 1, colId,
+            kDataBrowserPropertyEnclosingPart,
+            &bounds); // note +1 to translate to Mac ID
+        if ( err == noErr )
+            break;
 
-void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
-{
-    Boolean wasDoubleClick = false ;
-    long    result ;
+        // errDataBrowserItemNotFound is expected as it simply means that the
+        // item is not currently visible -- but other errors are not
+        wxCHECK_MSG( err == errDataBrowserItemNotFound, wxNOT_FOUND,
+                     wxT("Unexpected error from GetDataBrowserItemPartBounds") );
 
-    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
-    if ( !wasDoubleClick )
-    {
-        MacDoClick() ;
-    }
-    else
-    {
-        MacDoDoubleClick() ;
+        low++;
     }
-}
-
-void wxListBox::MacSetRedraw( bool doDraw ) 
-{
-    LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
-    
-}
 
-void wxListBox::MacDoClick()
-{
-    wxArrayInt aSelections;
-    int n, count = GetSelections(aSelections);
-    
-    if ( count == m_selectionPreImage.GetCount() )
+    // NOW do a binary search for where the item lies, searching low again if
+    // we hit an item that isn't visible
+    while ( low <= high )
     {
-        bool hasChanged = false ;
-        for ( int i = 0 ; i < count ; ++i )
+        int mid = (low + high) / 2;
+
+        Rect bounds;
+        err = GetDataBrowserItemPartBounds(
+            m_peer->GetControlRef(), mid + 1, colId,
+            kDataBrowserPropertyEnclosingPart,
+            &bounds); //note +1 to trans to mac id
+        wxCHECK_MSG( err == noErr || err == errDataBrowserItemNotFound,
+                     wxNOT_FOUND,
+                     wxT("Unexpected error from GetDataBrowserItemPartBounds") );
+
+        if ( err == errDataBrowserItemNotFound )
         {
-            if ( aSelections[i] != m_selectionPreImage[i] )
-            {
-                hasChanged = true ;
-                break ;
-            }
+            // item not visible, attempt to find a visible one
+            // search lower
+            high = mid - 1;
         }
-        if ( !hasChanged )
+        else // visible item, do actual hitttest
         {
-            return ;
-        }
-    }
-    
-    m_selectionPreImage = aSelections;
-    
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
-    event.SetEventObject( this );
+            // if point is within the bounds, return this item (since we assume
+            // all x coords of items are equal we only test the x coord in
+            // equality)
+            if ((point.x >= bounds.left && point.x <= bounds.right) &&
+                (point.y >= bounds.top && point.y <= bounds.bottom) )
+            {
+                // found!
+                return mid;
+            }
 
-    if ( count > 0 )
-    {
-        n = aSelections[0];
-        if ( HasClientObjectData() )
-            event.SetClientObject( GetClientObject(n) );
-        else if ( HasClientUntypedData() )
-            event.SetClientData( GetClientData(n) );
-        event.SetString( GetString(n) );
-    }
-    else
-    {
-         n = -1;
+            if ( point.y < bounds.top )
+                // index(bounds) greater then key(point)
+                high = mid - 1;
+            else
+                // index(bounds) less then key(point)
+                low = mid + 1;
+        }
     }
-    
-    event.m_commandInt = n;
 
-    GetEventHandler()->ProcessEvent(event);
+    return wxNOT_FOUND;
 }
 
-void wxListBox::MacDoDoubleClick()
-{
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event) ; 
-}
+#endif