splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

[wxWidgets.git] / src / mac / carbon / listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index cf43eeaa16576761fae1466a76c74f89df20aefe..7a21c3bc8f461fa983c19c41564ec2d0880ba38a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,192 +13,57 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

-#include "wx/app.h"

 #include "wx/listbox.h"
 #include "wx/listbox.h"

-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/toplevel.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
-
-#include "wx/utils.h"
-
-#include "wx/mac/uma.h"
-
-const short kTextColumnId = 1024 ;
-
-// new DataBrowser-based version:
-// because of the limited insert functionality of DataBrowser,
-// we just introduce IDs corresponding to the line number

 
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/arrstr.h"
+    #include "wx/dcclient.h"
+#endif

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)

 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

-#ifndef __WXMAC_OSX__
-//    EVT_SIZE( wxListBox::OnSize )
-    EVT_CHAR( wxListBox::OnChar )
-#endif

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+#include "wx/mac/uma.h"

 
 

-DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ;
-DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ;
-DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ;
-
-
-#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
-{
-    long ref = GetControlReference( browser ) ;
-    if ( ref )
-    {
-        wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
-        int i = itemID - 1 ;
-        if (i >= 0 && i < list->GetCount() )
-        {
-            bool trigger = false ;
-            wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
-            switch ( message )
-            {
-                case kDataBrowserItemDeselected :
-                    if ( list->HasMultipleSelection() )
-                        trigger = !list->MacIsSelectionSuppressed() ;
-                    break ;
-
-                case kDataBrowserItemSelected :
-                    trigger = !list->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) ;
-            }
-        }
-    }
-}
-
-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
-    DataBrowserItemID itemID, DataBrowserPropertyID property,
-    DataBrowserItemDataRef itemData, Boolean changeValue)
-{
-    OSStatus err = errDataBrowserPropertyNotSupported;
-
-    if ( ! changeValue )
-    {
-        switch (property)
-        {
-            case kTextColumnId:
-            {
-                long ref = GetControlReference( browser ) ;
-                if ( ref )
-                {
-                    wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
-                    int i = itemID - 1 ;
-                    if (i >= 0 && i < list->GetCount() )
-                    {
-                        wxMacCFStringHolder cf( list->GetString( i ) , list->GetFont().GetEncoding() ) ;
-                        verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
-                        err = noErr ;
-                    }
-                }
-            }
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    return err;
-}
-
-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 )
-    {
-        ThemeBrush colorBrushID;
-
-        Gestalt( gestaltSystemVersion, &systemVersion );
-
-        // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor is incorporated
-        // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting
-        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 ) ;
-    }
-
-    DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
-    SetThemeDrawingState( themeState , true ) ;
-
-    if ( cfString != NULL )
-        CFRelease( cfString );
-}
+// ============================================================================
+// list box control implementation
+// ============================================================================

 
 

-// Listbox item

 wxListBox::wxListBox()
 {
 wxListBox::wxListBox()
 {

-    m_noItems = 0;
-    m_selected = 0;
-    m_macList = NULL ;
-    m_suppressSelection = false ;

 }
 
 }
 

-bool wxListBox::Create(wxWindow *parent,
+bool wxListBox::Create(
+    wxWindow *parent,

     wxWindowID id,
     const wxPoint& pos,
     const wxSize& size,
     const wxArrayString& choices,
     long style,
     const wxValidator& validator,
     wxWindowID id,
     const wxPoint& pos,
     const wxSize& size,
     const wxArrayString& choices,
     long style,
     const wxValidator& validator,

-    const wxString& name)
+    const wxString& name )

 {
     wxCArrayString chs(choices);
 
 {
     wxCArrayString chs(choices);
 

-    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
-                  style, validator, name);
+    return Create(
+        parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+        style, validator, name );
+}
+
+wxMacListControl* wxListBox::GetPeer() const
+{
+    wxMacDataBrowserListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListControl);
+    return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;

 }
 
 }
 

-bool wxListBox::Create(wxWindow *parent,
+bool wxListBox::Create(
+    wxWindow *parent,

     wxWindowID id,
     const wxPoint& pos,
     const wxSize& size,
     wxWindowID id,
     const wxPoint& pos,
     const wxSize& size,


@@ -206,337 +71,144 @@ bool wxListBox::Create(wxWindow *parent,
     const wxString choices[],
     long style,
     const wxValidator& validator,
     const wxString choices[],
     long style,
     const wxValidator& validator,

-    const wxString& name)
+    const wxString& name )

 {
 {

-    m_macIsUserPane = false ;
+    m_macIsUserPane = false;

 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),

-                  _T("only one of listbox selection modes can be specified") );
+                  wxT("only a single listbox selection mode can be specified") );

 
 

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

         return false;
 
         return false;
 

-    m_noItems = 0 ; // this will be increased by our append command
-    m_selected = 0;
-
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-
-    m_peer = new wxMacControl( this ) ;
-    verify_noerr(
-        ::CreateDataBrowserControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
-            kDataBrowserListView, m_peer->GetControlRefAddr() ) );
-
-    DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
-    if ( style & wxLB_MULTIPLE )
-        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection  ;
-    else if ( style & wxLB_EXTENDED )
-        ; // default behaviour
-    else
-        options |= kDataBrowserSelectOnlyOne ;
-
-    verify_noerr( m_peer->SetSelectionFlags( options ) );
-
-    if ( gDataBrowserItemDataUPP == NULL )
-        gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
-    if ( gDataBrowserItemNotificationUPP == NULL )
-    {
-        gDataBrowserItemNotificationUPP =
-#if TARGET_API_MAC_OSX
-            (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
-#else
-            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
-#endif
-    }
-
-    if ( gDataBrowserDrawItemUPP == NULL )
-        gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;
+    wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style );
+    // TODO CHECK control->SetClientDataType( m_clientDataItemsType );
+    m_peer = control;

 
 

-    DataBrowserCallbacks callbacks ;
-    InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;
+    MacPostControlCreate( pos, size );

 
 

-    callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
-    callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
-    m_peer->SetCallbacks( &callbacks);
+    Append(n, choices);

 
 

-    DataBrowserCustomCallbacks customCallbacks ;
-    InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ;
-
-    customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;
-
-    SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;
-
-    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.minimumWidth = 0;
-    columnDesc.headerBtnDesc.maximumWidth = 10000;
-
-    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
-    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
-    columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
-
-    columnDesc.propertyDesc.propertyID = kTextColumnId;
-    columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;
-    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
-#endif
-
-    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ) ;
-    verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
-    verify_noerr( m_peer->SetHasScrollBars( false, true ) ) ;
-    verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite ) ) ;
-    verify_noerr( m_peer->SetListViewHeaderBtnHeight( 0 ) ) ;
-
-#if 0
-    // shouldn't be necessary anymore under 10.2
-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
-    m_peer->SetNeedsFocusRect( true ) ;
-#endif
-
-    MacPostControlCreate( pos, size ) ;
-
-    for ( int i = 0 ; i < n ; i++ )
-    {
-        Append( choices[i] ) ;
-    }
-
-    // Needed because it is a wxControlWithItems
-    SetBestSize(size);
+   // Needed because it is a wxControlWithItems
+    SetInitialSize( size );

 
     return true;
 }
 
 wxListBox::~wxListBox()
 {
 
     return true;
 }
 
 wxListBox::~wxListBox()
 {

-    m_peer->SetReference( 0 ) ;
-    FreeData() ;
-
-    // avoid access during destruction
-    if ( m_macList )
-        m_macList = NULL ;
+    FreeData();
+    m_peer->SetReference( 0 );

 }
 
 void wxListBox::FreeData()
 {
 }
 
 void wxListBox::FreeData()
 {

-    if ( HasClientObjectData() )
-    {
-        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
-        {
-            delete GetClientObject( n );
-        }
-    }
-}
-
-void  wxListBox::DoSetSize(int x, int y,
-            int width, int height,
-            int sizeFlags )
-{
-    wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
+    GetPeer()->MacClear();

 }
 
 void wxListBox::DoSetFirstItem(int n)
 {
 }
 
 void wxListBox::DoSetFirstItem(int n)
 {

-    MacScrollTo( n ) ;
+    GetPeer()->MacScrollTo( n );

 }
 
 }
 

-void wxListBox::Delete(int n)
+void wxListBox::EnsureVisible(int n)

 {
 {

-    wxCHECK_RET( n >= 0 && n < m_noItems,
-                 wxT("invalid index in wxListBox::Delete") );
-
-    if ( HasClientObjectData() )
-        delete GetClientObject( n );
-
-    m_stringArray.RemoveAt( n ) ;
-    m_dataArray.RemoveAt( n ) ;
-    m_noItems--;
-
-    MacDelete( n ) ;
+    GetPeer()->MacScrollTo( n );

 }
 
 }
 

-int wxListBox::DoAppend(const wxString& item)
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
 {

-    InvalidateBestSize();
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") );

 
 

-    int index = m_noItems ;
-    m_stringArray.Add( item ) ;
-    m_dataArray.Add( NULL );
-    m_noItems++;
-    DoSetItemClientData( index , NULL ) ;
-    MacAppend( item ) ;
-
-    return index ;
+    GetPeer()->MacDelete( n );

 }
 
 }
 

-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

-    Clear() ;
-    int n = choices.GetCount();
+    InvalidateBestSize();

 
 

-    for ( int i = 0 ; i < n ; ++i )
+    GetPeer()->MacInsert( pos, items );
+    const unsigned int count = items.GetCount();
+    if ( clientData )

     {
     {

-        if ( clientData )
-            Append( choices[i] , clientData[i] ) ;
-        else
-            Append( choices[i] ) ;
+        for (unsigned int i = 0; i < count; ++i)
+            AssignNewItemClientData( pos + i, clientData, i, type );

     }
     }

+
+    return pos + count - 1;

 }
 
 int wxListBox::FindString(const wxString& s, bool bCase) const
 {
 }
 
 int wxListBox::FindString(const wxString& s, bool bCase) const
 {

-    if ( s.Right(1) == wxT("*") )
-    {
-        wxString search = s.Left( s.Length() - 1 ) ;
-        int len = search.Length() ;
-        Str255 s1 , s2 ;
-        wxMacStringToPascal( search , s2 ) ;
-
-        for ( int i = 0 ; i < m_noItems ; ++ i )
-        {
-            wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
-
-            if ( EqualString( s1 , s2 , bCase , false ) )
-                return i ;
-        }
-
-        if ( s.Left(1) == wxT("*") && s.Length() > 1 )
-        {
-            wxString st = s ;
-            st.MakeLower() ;
-
-            for ( int i = 0 ; i < m_noItems ; ++i )
-            {
-                if ( GetString( i ).Lower().Matches(st) )
-                    return i ;
-            }
-        }
-    }
-    else
+    for ( size_t i = 0; i < GetCount(); ++ i )

     {
     {

-        Str255 s1 , s2 ;
-
-        wxMacStringToPascal( s , s2 ) ;
-
-        for ( int i = 0 ; i < m_noItems ; ++ i )
-        {
-            wxMacStringToPascal( m_stringArray[i] , s1 ) ;
-
-            if ( EqualString( s1 , s2 , bCase , false ) )
-                return i ;
-        }
+        if (s.IsSameAs( GetString( i ), bCase) )
+            return (int)i;

     }
 
     return wxNOT_FOUND;
 }
 
     }
 
     return wxNOT_FOUND;
 }
 

-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
     FreeData();
 {
     FreeData();

-    m_noItems = 0;
-    m_stringArray.Empty() ;
-    m_dataArray.Empty() ;
-    MacClear() ;

 }
 
 void wxListBox::DoSetSelection(int n, bool select)
 {
 }
 
 void wxListBox::DoSetSelection(int n, bool select)
 {

-    wxCHECK_RET( n == wxNOT_FOUND || (n >= 0 && n < m_noItems) ,
+    wxCHECK_RET( n == wxNOT_FOUND || IsValid(n),

         wxT("invalid index in wxListBox::SetSelection") );
 
     if ( n == wxNOT_FOUND )
         wxT("invalid index in wxListBox::SetSelection") );
 
     if ( n == wxNOT_FOUND )

-        MacDeselectAll() ;
+        GetPeer()->MacDeselectAll();

     else
     else

-        MacSetSelection( n , select ) ;
+        GetPeer()->MacSetSelection( n, select, HasMultipleSelection() );

 }
 
 bool wxListBox::IsSelected(int n) const
 {
 }
 
 bool wxListBox::IsSelected(int n) const
 {

-    wxCHECK_MSG( n >= 0 && n < m_noItems, false,
-        wxT("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"));
-
-    return (void *)m_dataArray[n];
+    wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+    return GetPeer()->MacGetClientData( n );

 }
 
 }
 

-wxClientData *wxListBox::DoGetItemClientObject(int n) const
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)

 {
 {

-    return (wxClientData *) DoGetItemClientData( n ) ;
-}
-
-void wxListBox::DoSetItemClientData(int n, void *clientData)
-{
-    wxCHECK_RET( n >= 0 && n < m_noItems,
-        wxT("invalid index in wxListBox::SetClientData") );
-
-    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) n , wxT("invalid client_data array") ) ;
-
-    if ( m_dataArray.GetCount() > (size_t) n )
-        m_dataArray[n] = (char*)clientData ;
-    else
-        m_dataArray.Add( (char*)clientData ) ;
-}
-
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
-{
-    DoSetItemClientData(n, clientData);
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
+    GetPeer()->MacSetClientData( n , clientData);

 }
 
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
 }
 
 // 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
 {
 }
 
 // Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {

-    return MacGetSelection() ;
+    return GetPeer()->MacGetSelection();

 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(int n) const
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-    wxCHECK_MSG( n >= 0 && n < m_noItems, wxEmptyString,
-                 wxT("invalid index in wxListBox::GetString") );
-
-    return m_stringArray[n]  ;
+    wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") );
+    return GetPeer()->MacGetString(n);

 }
 
 }
 

-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::SetString(unsigned int n, const wxString& s)

 {
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-        wxT("invalid index in wxListBox::InsertItems") );
-
-    InvalidateBestSize();
-
-    int nItems = items.GetCount();
-
-    for ( int i = 0 ; i < nItems ; i++ )
-    {
-        m_stringArray.Insert( items[i] , pos + i ) ;
-        m_dataArray.Insert( NULL , pos + i ) ;
-        m_noItems++ ;
-        MacInsert( pos + i , items[i] ) ;
-    }
-}
-
-void wxListBox::SetString(int n, const wxString& s)
-{
-    m_stringArray[n] = s ;
-    MacSet( n , s ) ;
+    GetPeer()->MacSetString( n, s );

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -546,54 +218,30 @@ wxSize wxListBox::DoGetBestSize() const
     int wLine;
 
     {
     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 ) ;
-        }
+        wxClientDC dc(const_cast<wxListBox*>(this));
+        dc.SetFont(GetFont());

 
         // Find the widest line
 
         // Find the widest line

-        for (int i = 0; i < GetCount(); i++)
+        for (unsigned int i = 0; i < GetCount(); i++)

         {
             wxString str( GetString( 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
-
+            wxCoord width, height ;
+            dc.GetTextExtent( str , &width, &height);
+            wLine = width ;

             lbWidth = wxMax( lbWidth, wLine );
         }
 
         // Add room for the scrollbar
             lbWidth = wxMax( lbWidth, wLine );
         }
 
         // Add room for the scrollbar

-        lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+        lbWidth += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X );

 
         // And just a bit more
 
         // And just a bit more

-        int cy = 12 ;
-        int cx = ::TextWidth( "X" , 0 , 1 ) ;
-        lbWidth += cx ;
+        int cy = 12;
+
+        wxCoord width, height ;
+        dc.GetTextExtent( wxT("XX") , &width, &height);
+        int cx = width ;
+        lbWidth += cx;

 
         // don't make the listbox too tall (limit height to around 10 items)
         // but don't make it too small neither
 
         // don't make the listbox too tall (limit height to around 10 items)
         // but don't make it too small neither


@@ -603,14 +251,14 @@ wxSize wxListBox::DoGetBestSize() const
     return wxSize( lbWidth, lbHeight );
 }
 
     return wxSize( lbWidth, lbHeight );
 }
 

-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
 {

-    return m_noItems;
+    return GetPeer()->MacGetCount();

 }
 
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
 }
 
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {

-    wxControl::Refresh( eraseBack , rect ) ;
+    wxControl::Refresh( eraseBack, rect );

 }
 
 // Some custom controls depend on this
 }
 
 // Some custom controls depend on this


@@ -621,316 +269,331 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );

-    attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+    attr.font.MacCreateFromThemeFont(kThemeViewsFont);

 
     return attr;
 }
 
 
     return attr;
 }
 

-// ============================================================================
-// list box control implementation
-// ============================================================================
-
-void wxListBox::MacDelete( int n )
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const

 {
 {

-    wxArrayInt selectionBefore ;
-    MacGetSelections( selectionBefore ) ;
+    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;

 
 

-    UInt32 id = m_noItems + 1 ;
+    // 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 )
+    {
+        Rect bounds;
+        err = GetDataBrowserItemPartBounds(
+            m_peer->GetControlRef(), low + 1, colId,
+            kDataBrowserPropertyEnclosingPart,
+            &bounds); // note +1 to translate to Mac ID
+        if ( err == noErr )
+            break;
+
+        // 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") );
+
+        low++;
+    }

 
 

-    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
-    for ( size_t i = 0 ; i < selectionBefore.GetCount() ; ++i )
+    // 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 )

     {
     {

-        int current = selectionBefore[i] ;
-        if ( current == n )
+        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 )

         {
         {

-            // selection was deleted
-            MacSetSelection( current , false ) ;
+            // item not visible, attempt to find a visible one
+            // search lower
+            high = mid - 1;

         }
         }

-        else if ( current > n )
+        else // visible item, do actual hitttest

         {
         {

-            // something behind the deleted item was selected -> move up
-            MacSetSelection( current - 1 , true ) ;
-            MacSetSelection( current , false ) ;
+            // 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 ( point.y < bounds.top )
+                // index(bounds) greater then key(point)
+                high = mid - 1;
+            else
+                // index(bounds) less then key(point)
+                low = mid + 1;

         }
     }
 
         }
     }
 

-    // refresh all
-    verify_noerr(
-        m_peer->UpdateItems(
-            kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
-            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;
+    return wxNOT_FOUND;
+}
+
+// ============================================================================
+// data browser based implementation
+// ============================================================================
+
+wxMacListBoxItem::wxMacListBoxItem()
+        :wxMacDataItem()
+{
+}
+
+wxMacListBoxItem::~wxMacListBoxItem()
+{

 }
 
 }
 

-void wxListBox::MacInsert( int n , const wxString& text )
+void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
+    DataBrowserItemNotification message,
+    DataBrowserItemDataRef WXUNUSED(itemData) ) const

 {
 {

-    wxArrayInt selectionBefore ;
-    MacGetSelections( selectionBefore ) ;
+    wxMacDataBrowserListControl *lb = wxDynamicCast(owner,wxMacDataBrowserListControl);

 
 

-    // this has already been increased
-    UInt32 id = m_noItems ;
-    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+    // we want to depend on as little as possible to make sure tear-down of controls is safe

 
 

-    for ( int i = selectionBefore.GetCount()-1 ; i >= 0 ; --i )
+    if ( message == kDataBrowserItemRemoved)

     {
     {

-        int current = selectionBefore[i] ;
-        if ( current >= n )
+        if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )

         {
         {

-            MacSetSelection( current + 1 , true ) ;
-            MacSetSelection( current , false ) ;
+            delete (wxClientData*) (m_data);

         }
         }

+
+        delete this;
+        return;

     }
 
     }
 

-    // refresh all
-    verify_noerr(
-        m_peer->UpdateItems(
-            kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
-            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;
-}
+    wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
+    wxCHECK_RET( list != NULL , wxT("Listbox expected"));

 
 

-void wxListBox::MacAppend( const wxString& text )
-{
-    UInt32 id = m_noItems ; // this has already been increased
-    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
-    // no need to deal with selections nor refreshed, as we have appended
-}
+    bool trigger = false;
+    wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+    switch (message)
+    {
+        case kDataBrowserItemDeselected:
+            if ( list->HasMultipleSelection() )
+                trigger = !lb->IsSelectionSuppressed();
+            break;
+
+        case kDataBrowserItemSelected:
+            trigger = !lb->IsSelectionSuppressed();
+            break;
+
+        case kDataBrowserItemDoubleClicked:
+            event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED );
+            trigger = true;
+            break;
+
+        default:
+            break;
+    }

 
 

-void wxListBox::MacClear()
-{
-    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
+    if ( trigger )
+    {
+        event.SetEventObject( list );
+        if ( list->HasClientObjectData() )
+            event.SetClientObject( (wxClientData*) m_data );
+        else if ( list->HasClientUntypedData() )
+            event.SetClientData( m_data );
+        event.SetString( m_label );
+        event.SetInt( owner->GetLineFromItem( this ) );
+        event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : true );
+
+        // direct notification is not always having the listbox GetSelection()
+        // having in synch with event, so use wxPostEvent instead
+        // list->HandleWindowEvent(event);
+
+        wxPostEvent( list->GetEventHandler(), event );
+    }

 }
 
 }
 

-void wxListBox::MacDeselectAll()
-{
-    bool former = MacSuppressSelection( true ) ;
-    verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;
-    MacSuppressSelection( former ) ;
-}
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserListControl , wxMacDataItemBrowserControl )

 
 

-void wxListBox::MacSetSelection( int n , bool select )
+wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
+    : wxMacDataItemBrowserControl( peer, pos, size, style )

 {
 {

-    bool former = MacSuppressSelection( true ) ;
-    UInt32 id = n + 1 ;
+    OSStatus err = noErr;
+    m_clientDataItemsType = wxClientData_None;
+    if ( style & wxLB_SORT )
+        m_sortOrder = SortOrder_Text_Ascending;

 
 

-    if ( m_peer->IsItemSelected( id ) != select )
+    DataBrowserSelectionFlags  options = kDataBrowserDragSelect;
+    if ( style & wxLB_MULTIPLE )

     {
     {

-        if ( select )
-            verify_noerr( m_peer->SetSelectedItems( 1 , & id , HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) ) ;
-        else
-            verify_noerr( m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) ) ;
+        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options |= kDataBrowserCmdTogglesSelection;

     }
     }

+    else
+    {
+        options |= kDataBrowserSelectOnlyOne;
+    }
+    err = SetSelectionFlags( options );
+    verify_noerr( err );

 
 

-    MacScrollTo( n ) ;
-    MacSuppressSelection( former ) ;
-}
+    DataBrowserListViewColumnDesc columnDesc;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;

 
 

-bool wxListBox::MacSuppressSelection( bool suppress )
-{
-    bool former = m_suppressSelection ;
-    m_suppressSelection = suppress ;
-    return former ;
-}
+    columnDesc.headerBtnDesc.btnFontStyle.flags =
+        kControlUseFontMask | kControlUseJustMask;

 
 

-bool wxListBox::MacIsSelected( int n ) const
-{
-    return m_peer->IsItemSelected( n + 1 ) ;
-}
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+    columnDesc.headerBtnDesc.titleString = NULL;

 
 

-int wxListBox::MacGetSelection() const
-{
-    for ( int i = 0 ; i < GetCount() ; ++i )
-    {
-        if ( m_peer->IsItemSelected( i + 1 ) )
-            return i ;
-    }
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 10000;

 
 

-    return -1 ;
-}
+    columnDesc.propertyDesc.propertyID = kTextColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;

 
 

-int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
-{
-    int no_sel = 0 ;
+    verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );

 
 

-    aSelections.Empty();
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 0;
+    columnDesc.propertyDesc.propertyID = kNumericOrderColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserPropertyRelevanceRankPart;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;

 
 

-    UInt32 first , last ;
-    m_peer->GetSelectionAnchor( &first , &last ) ;
-    if ( first != kDataBrowserNoItem )
+    verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+    SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+    if ( m_sortOrder == SortOrder_Text_Ascending )

     {
     {

-        for ( size_t i = first ; i <= last ; ++i )
-        {
-            if ( m_peer->IsItemSelected( i ) )
-            {
-                aSelections.Add( i - 1 ) ;
-                no_sel++ ;
-            }
-        }
+        SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+        SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
+    }
+    else
+    {
+        SetDataBrowserSortProperty( m_controlRef , kNumericOrderColumnId);
+        SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);

     }
 
     }
 

-    return no_sel ;
+    verify_noerr( AutoSizeColumns() );
+    verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
+    verify_noerr( SetHeaderButtonHeight( 0 ) );
+    err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
+#if 0
+    // shouldn't be necessary anymore under 10.2
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+    m_peer->SetNeedsFocusRect( true );
+#endif

 }
 
 }
 

-void wxListBox::MacSet( int n , const wxString& text )
+wxMacDataBrowserListControl::~wxMacDataBrowserListControl()

 {
 {

-    // as we don't store the strings we only have to issue a redraw
-    UInt32 id = n + 1 ;
-    verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-void wxListBox::MacScrollTo( int n )
+wxWindow * wxMacDataBrowserListControl::GetPeer() const

 {
 {

-    UInt32 id = n + 1 ;
-    verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
+    return wxDynamicCast( wxMacControl::GetPeer() , wxWindow );

 }
 
 }
 

-int wxListBox::DoListHitTest(const wxPoint& point) const
+wxMacDataItem* wxMacDataBrowserListControl::CreateItem()

 {
 {

-    //Yuck - there is no easy way to get a databrowseritem from a point
-    //so we need to iterate through our items to see which one this falls under
-
-    // TODO: binary search would be faster
-    int count = GetCount();
-    DataBrowserTableViewColumnID colId = 0;
-
-    //Get column property id (req. for call to itempartbounds)
-    GetDataBrowserTableViewColumnProperty(m_peer->GetControlRef(), 0, &colId);
-    
-    for(int i = 1; i <= count; ++i)
-    {
-        Rect bounds;
-        GetDataBrowserItemPartBounds(m_peer->GetControlRef(), i, colId, 
-                                     kDataBrowserPropertyEnclosingPart,
-                                     &bounds);
-        
-        //translate to client coords
-        //
-        // TODO: it would probably be more efficient to translate point to
-        //       screen coordinates once outside of the loop
-        MacRootWindowToWindow(&bounds.left, &bounds.top);
-        MacRootWindowToWindow(&bounds.right, &bounds.bottom);
-        
-        //if point is within the bounds, return this item
-        if( (point.x >= bounds.left && point.x <= bounds.right) &&
-            (point.y >= bounds.top && point.y <= bounds.bottom) )
-        {
-            return i - 1; //found
-        }
-    }
-    
-    return wxNOT_FOUND;
+    return new wxMacListBoxItem();

 }
 
 }
 

-#if !TARGET_API_MAC_OSX
-
-void wxListBox::OnChar(wxKeyEvent& event)
-{
-    // TODO: trigger proper events here
-    event.Skip() ;
-    return ;
-
-    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
-    {
-        wxWindow* parent = GetParent() ;
+#if 0

 
 

-        while ( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
-            parent = parent->GetParent() ;
+// in case we need that one day

 
 

-        if ( parent && parent->GetDefaultItem() )
-        {
-            wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton);
-            if ( def && def->IsEnabled() )
-            {
-                wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-                event.SetEventObject( def );
-                def->Command( event );
+// ============================================================================
+// HIView owner-draw-based implementation
+// ============================================================================

 
 

-                return ;
-            }
-        }
+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;

 
 

-        event.Skip() ;
-    }
+    GetThemeDrawingState( &themeState );
+    cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );

 
 

-    /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
-    else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
-    {
-        // FIXME: look in ancestors, not just parent.
-        wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
-        if (win)
-        {
-            wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-            new_event.SetEventObject( win );
-            win->GetEventHandler()->ProcessEvent( new_event );
-          }
-    }
-    else if ( event.GetKeyCode() == WXK_TAB )
-    {
-        wxNavigationKeyEvent new_event;
-        new_event.SetEventObject( this );
-        new_event.SetDirection( !event.ShiftDown() );
-        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
-        new_event.SetWindowChange( event.ControlDown() );
-        new_event.SetCurrentFocus( this );
-        if ( !GetEventHandler()->ProcessEvent( new_event ) )
-            event.Skip() ;
-    }
-    else if ( event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_UP )
+    //  In this sample we handle the "selected" state; all others fall through to our "active" state
+    if ( itemState == kDataBrowserItemIsSelected )

     {
     {

-        // perform the default key handling first
-        wxControl::OnKeyDown( event ) ;
-
-        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId );
-        event.SetEventObject( this );
+        ThemeBrush colorBrushID;

 
 

-        wxArrayInt aSelections;
-        int n, count = GetSelections(aSelections);
-        if ( count > 0 )
-        {
-            n = aSelections[0];
-            if ( HasClientObjectData() )
-                event.SetClientObject( GetClientObject( n ) );
-            else if ( HasClientUntypedData() )
-                event.SetClientData( GetClientData( n ) );
-            event.SetString( GetString( n ) );
-        }
+        // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor
+        // is incorporated Panther DB starts using kThemeBrushSecondaryHighlightColor
+        // for inactive browser highlighting
+        if ( !IsControlActive( browser ) )
+            colorBrushID = kThemeBrushSecondaryHighlightColor;

         else
         else

-        {
-            n = -1;
-        }
-
-        event.SetInt( n );
+            colorBrushID = kThemeBrushPrimaryHighlightColor;

 
 

-        GetEventHandler()->ProcessEvent(event);
+        // First paint the hilite rect, then the text on top
+        SetThemePen( colorBrushID, 32, true );
+        PaintRect( itemRect );
+        SetThemeDrawingState( themeState, false );

     }
     }

-    else
-    {
-        if ( event.GetTimestamp() > m_lastTypeIn + 60 )
-            m_typeIn = wxEmptyString ;
-
-        m_lastTypeIn = event.GetTimestamp() ;
-        m_typeIn += (char) event.GetKeyCode() ;
-        int line = FindString( wxT("*") + m_typeIn + wxT("*") ) ;
-        if ( line >= 0 )
-        {
-            if ( GetSelection() != line )
-            {
-                SetSelection( line ) ;
-
-                wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId );
-                event.SetEventObject( this );

 
 

-                if ( HasClientObjectData() )
-                    event.SetClientObject( GetClientObject( line ) );
-                else if ( HasClientUntypedData() )
-                    event.SetClientData( GetClientData( line ) );
-                event.SetString( GetString( line ) );
-                event.SetInt( line );
+    DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+    SetThemeDrawingState( themeState, true );

 
 

-                GetEventHandler()->ProcessEvent(event);
-            }
-        }
-    }
+    if ( cfString != NULL )
+        CFRelease( cfString );

 }
 
 }
 

-#endif // !TARGET_API_MAC_OSX
-

 #endif
 #endif

+
+
+#endif // wxUSE_LISTBOX