pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 17efb46fabf84aa26f483b5b0ad704777b4029c5..7a21c3bc8f461fa983c19c41564ec2d0880ba38a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,625 +1,599 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/mac/carbon/listbox.cpp

 // Purpose:     wxListBox
 // Purpose:     wxListBox

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "listbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX

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

-#include "wx/settings.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"

 
 

-#include "wx/utils.h"
-#include "extldef.h"
+#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

 
 

-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)

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

-       EVT_SIZE( wxListBox::OnSize ) 

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif
-
-#include <wx/mac/uma.h>

 
 

-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-const short kwxMacListWithVerticalScrollbar = 128 ;
+#include "wx/mac/uma.h"

 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 
 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 

-// Listbox item

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

-  m_noItems = 0;
-  m_selected = 0;
-  m_macList = NULL ;
-}
-
-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_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 ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0, 
-               kControlListBoxProc , (long) this ) ;
-       
-       long    result ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
-
-       HLock( (Handle) m_macList ) ;
-       NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-       (**m_macList).selFlags = 0 ;
-       if ( style & wxLB_MULTIPLE )
-       {
-               (**m_macList).selFlags += lNoExtend ;
-       }
-       else if ( style & wxLB_EXTENDED )
-       {
-               (**m_macList).selFlags += lExtendDrag ;
-       }
-       else
-       {
-               (**m_macList).selFlags = lOnlyOne ;
-       }
-       Point pt = (**m_macList).cellSize ;
-       pt.v = 14 ;
-       LCellSize( pt , m_macList ) ;
-
-       LAddColumn( 1 , 0 , m_macList ) ;
-
-       MacPostControlCreate() ;
-
-       ControlFontStyleRec             controlstyle ;
-       controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
-       //controlstyle.font = kControlFontSmallSystemFont ;
-       controlstyle.font = kFontIDMonaco ;
-       controlstyle.size = 9 ;
-       ::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
-
-       for ( int i = 0 ; i < n ; i++ )
-       {
-               Append( choices[i] ) ;
-       }
-
-       LSetDrawingMode( true , m_macList ) ;
-
-  return TRUE;

 }
 
 }
 

-wxListBox::~wxListBox()
+bool wxListBox::Create(
+    wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )

 {
 {

-       Free() ;
-       if ( m_macList )
-       {
-               DisposeExtLDEFInfo( m_macList ) ;
-               m_macList = NULL ;
-       }
-}
+    wxCArrayString chs(choices);

 
 

-void wxListBox::Free()
-{
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
-    {
-        size_t uiCount = m_aItems.Count();
-        while ( uiCount-- != 0 ) {
-            delete m_aItems[uiCount];
-        }
-
-        m_aItems.Clear();
-    }
-    else
-#endif // wxUSE_OWNER_DRAWN
-    if ( HasClientObjectData() )
-    {
-        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
-        {
-            delete GetClientObject(n);
-        }
-    }
+    return Create(
+        parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+        style, validator, name );

 }
 
 }
 

-void wxListBox::DoSetFirstItem(int N)
+wxMacListControl* wxListBox::GetPeer() const

 {
 {

-       MacScrollTo( N ) ;
+    wxMacDataBrowserListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListControl);
+    return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;

 }
 
 }
 

-void wxListBox::Delete(int N)
+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 )

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 wxT("invalid index in wxListBox::Delete") );
+    m_macIsUserPane = false;

 
 

-#if wxUSE_OWNER_DRAWN
-    delete m_aItems[N];
-    m_aItems.Remove(N);
-#else // !wxUSE_OWNER_DRAWN
-    if ( HasClientObjectData() )
-    {
-        delete GetClientObject(N);
-    }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-       m_stringArray.Remove( N ) ;
-       m_dataArray.Remove( N ) ;
-       m_noItems --;
-       
-       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 ++;
-       MacAppend( item ) ;
-
-       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 )
-       {
-#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
-       }
-       else
-               Append( choices[i] ) ;
-  }
-
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        // first delete old items
-        size_t ui = m_aItems.Count();
-        while ( ui-- != 0 ) {
-            delete m_aItems[ui];
-        }
-        m_aItems.Empty();
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  wxT("only a single listbox selection mode can be specified") );

 
 

-        // then create new ones
-        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 ) ;
+    if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+        return false;
+
+    wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style );
+    // TODO CHECK control->SetClientDataType( m_clientDataItemsType );
+    m_peer = control;
+
+    MacPostControlCreate( pos, size );
+
+    Append(n, choices);
+
+   // Needed because it is a wxControlWithItems
+    SetInitialSize( size );
+
+    return true;

 }
 
 }
 

-bool wxListBox::HasMultipleSelection() const
+wxListBox::~wxListBox()

 {
 {

-    return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
+    FreeData();
+    m_peer->SetReference( 0 );

 }
 
 }
 

-int wxListBox::FindString(const wxString& st) const
+void wxListBox::FreeData()

 {
 {

-       wxString s ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-       {
-               s = wxMacMakeMacStringFromPC( st ) ;
-       }
-       else
-               s = st ;
-               
-       if ( s.Right(1) == "*" )
-       {
-               wxString search = s.Left( s.Length() - 1 ) ;
-               int len = search.Length() ;
-       Str255 s1 , s2 ;
-           strcpy( (char*) s2 , search.c_str() ) ;
-           c2pstr( (char*) s2 ) ;
-       for ( int i = 0 ; i < m_noItems ; ++ i )
-           {
-               strcpy( (char*) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-               c2pstr( (char*) s1 ) ;
-               if ( EqualString( s1 , s2 , false , false ) )
-                       return i ;
-           }
-       }
-       else
-       {
-       Str255 s1 , s2 ;
-           strcpy( (char*) s2 , s.c_str() ) ;
-           c2pstr( (char*) s2 ) ;
-           for ( int i = 0 ; i < m_noItems ; ++ i )
-           {
-               strcpy( (char*) s1 , m_stringArray[i].c_str() ) ;
-               c2pstr( (char*) s1 ) ;
-               if ( EqualString( s1 , s2 , false , false ) )
-                       return i ;
-           }
-   }
-   return -1;
+    GetPeer()->MacClear();

 }
 
 }
 

-void wxListBox::Clear()
+void wxListBox::DoSetFirstItem(int n)

 {
 {

-  Free();
-  m_noItems = 0;
-  m_stringArray.Empty() ;
-  m_dataArray.Empty() ;
-  MacClear() ;
+    GetPeer()->MacScrollTo( n );

 }
 
 }
 

-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::EnsureVisible(int n)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetSelection" );
-       MacSetSelection( N , select ) ;
+    GetPeer()->MacScrollTo( n );

 }
 
 }
 

-bool wxListBox::IsSelected(int N) const
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-                 "invalid index in wxListBox::Selected" );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") );

 
 

-       return MacIsSelected( N ) ;
+    GetPeer()->MacDelete( n );

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
-                 "invalid index in wxListBox::GetClientData" );
+    InvalidateBestSize();

 
 

-    return (void *)m_dataArray[N];
+    GetPeer()->MacInsert( pos, items );
+    const unsigned int count = items.GetCount();
+    if ( clientData )
+    {
+        for (unsigned int i = 0; i < count; ++i)
+            AssignNewItemClientData( pos + i, clientData, i, type );
+    }
+
+    return pos + count - 1;

 }
 
 }
 

-wxClientData *wxListBox::DoGetItemClientObject(int N) const
+int wxListBox::FindString(const wxString& s, bool bCase) const

 {
 {

-       return (wxClientData *) DoGetItemClientData( N ) ;
+    for ( size_t i = 0; i < GetCount(); ++ i )
+    {
+        if (s.IsSameAs( GetString( i ), bCase) )
+            return (int)i;
+    }
+
+    return wxNOT_FOUND;

 }
 
 }
 

-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoClear()

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetClientData" );
+    FreeData();
+}

 
 

-#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 ;
-    }
+void wxListBox::DoSetSelection(int n, bool select)
+{
+    wxCHECK_RET( n == wxNOT_FOUND || IsValid(n),
+        wxT("invalid index in wxListBox::SetSelection") );
+
+    if ( n == wxNOT_FOUND )
+        GetPeer()->MacDeselectAll();

     else
     else

-    {
-       m_dataArray.Add( (char*) Client_data ) ;
-    }
+        GetPeer()->MacSetSelection( n, select, HasMultipleSelection() );

 }
 
 }
 

-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+bool wxListBox::IsSelected(int n) const

 {
 {

-    DoSetItemClientData(n, clientData);
+    wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxListBox::Selected") );
+
+    return GetPeer()->MacIsSelected( n );

 }
 
 }
 

-// Return number of selections and an array of selected integers
-int wxListBox::GetSelections(wxArrayInt& aSelections) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const

 {
 {

-       return MacGetSelections( aSelections ) ;
-
-/* TODO
-    if ((m_windowStyle & wxLB_MULTIMacE) || (m_windowStyle & wxLB_EXTENDED))
-    {
-        int no_sel = ??
-        for ( int n = 0; n < no_sel; n++ )
-            aSelections.Add(??);
+    wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+    return GetPeer()->MacGetClientData( n );
+}

 
 

-        return no_sel;
-    }
-    else  // single-selection listbox
-    {
-        aSelections.Add(??);
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
+{
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
+    GetPeer()->MacSetClientData( n , clientData);
+}

 
 

-        return 1;
-    }
-*/
+// Return number of selections and an array of selected integers
+int wxListBox::GetSelections(wxArrayInt& aSelections) const
+{
+    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

 {
 {

-       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 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") );
+    GetPeer()->MacSetString( n, s );
+}

 
 

-    int nItems = items.GetCount();
+wxSize wxListBox::DoGetBestSize() const
+{
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 110;
+    int wLine;
+
+    {
+        wxClientDC dc(const_cast<wxListBox*>(this));
+        dc.SetFont(GetFont());
+
+        // Find the widest line
+        for (unsigned int i = 0; i < GetCount(); i++)
+        {
+            wxString str( GetString( i ) );
+
+            wxCoord width, height ;
+            dc.GetTextExtent( str , &width, &height);
+            wLine = width ;
+            lbWidth = wxMax( lbWidth, wLine );
+        }
+
+        // Add room for the scrollbar
+        lbWidth += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X );

 
 

-       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] ) ;
-       }
+        // And just a bit more
+        int cy = 12;

 
 

-    m_noItems += nItems;
+        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
+        lbHeight = wxMax( (cy + 4) * wxMin( wxMax( GetCount(), 3 ), 10 ), 70 );
+    }
+
+    return wxSize( lbWidth, lbHeight );

 }
 
 }
 

-void wxListBox::SetString(int N, const wxString& s)
+unsigned int wxListBox::GetCount() const

 {
 {

-       wxString str ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-       {
-               str = wxMacMakeMacStringFromPC( s )  ;
-       }
-       else
-               str = s ;
-       m_stringArray[N] = str ;
-       MacSet( N , s ) ;
+    return GetPeer()->MacGetCount();

 }
 
 }
 

-wxSize wxListBox::DoGetBestSize() const
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)

 {
 {

-    return wxSize(100, 100);
+    wxControl::Refresh( eraseBack, rect );

 }
 
 }
 

-int wxListBox::GetCount() const
+// Some custom controls depend on this
+/* static */ wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    return m_noItems;
+    wxVisualAttributes attr;
+
+    attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+    attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
+    attr.font.MacCreateFromThemeFont(kThemeViewsFont);
+
+    return attr;

 }
 
 }
 

-void wxListBox::SetupColours()
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(GetParent()->GetForegroundColour());
-}
+    OSStatus err;

 
 

-#if wxUSE_OWNER_DRAWN
+    // 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

 
 

-class wxListBoxItem : public wxOwnerDrawn
-{
-public:
-    wxListBoxItem(const wxString& str = "");
-};
+    wxPoint point = inpoint;

 
 

-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
-{
-    // no bitmaps/checkmarks
-    SetMarginWidth(0);
-}
+    // 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"));

 
 

-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
-{
-    return new wxListBoxItem();
-}
+    // 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;

 
 

-#endif  //USE_OWNER_DRAWN
+    // 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++;
+    }
+
+    // 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 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 )
+        {
+            // item not visible, attempt to find a visible one
+            // search lower
+            high = mid - 1;
+        }
+        else // visible item, do actual hitttest
+        {
+            // 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;
+        }
+    }
+
+    return wxNOT_FOUND;
+}

 
 // ============================================================================
 
 // ============================================================================

-// list box control implementation
+// data browser based implementation

 // ============================================================================
 
 // ============================================================================
 

-void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
+wxMacListBoxItem::wxMacListBoxItem()
+        :wxMacDataItem()

 {
 {

-       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 )
+wxMacListBoxItem::~wxMacListBoxItem()

 {
 {

-       ListHandle list ;
-       long    result ;
-       Cell cell = { 0 , 0 } ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &list  , &result ) ;
-       LDelRow( 1 , N , list ) ;

 }
 
 }
 

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

 {
 {

-       Cell    cell ;
+    wxMacDataBrowserListControl *lb = wxDynamicCast(owner,wxMacDataBrowserListControl);

 
 

-       cell.h = 0 ;
-       cell.v = n ;
+    // we want to depend on as little as possible to make sure tear-down of controls is safe

 
 

-       LAddRow( 1 , cell.v , m_macList ) ;
-}
+    if ( message == kDataBrowserItemRemoved)
+    {
+        if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )
+        {
+            delete (wxClientData*) (m_data);
+        }

 
 

-void wxListBox::MacAppend( const char * text) 
-{
-       Cell cell = { 0 , 0 } ;
-       cell.v = (**m_macList).dataBounds.bottom ;
-       LAddRow( 1 , cell.v , m_macList ) ;
-}
+        delete this;
+        return;
+    }

 
 

-void wxListBox::MacClear() 
-{
-       LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
-}
+    wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
+    wxCHECK_RET( list != NULL , wxT("Listbox expected"));

 
 

-void wxListBox::MacSetSelection( int n , bool select )
-{
-       Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( TRUE , &cell , m_macList ) )
-       {
-               LSetSelect( false , cell , m_macList ) ;
-       }
-       
-       cell.v = n ;
-       LSetSelect( select , cell , m_macList ) ;
-       LAutoScroll( m_macList ) ;
-}
+    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;
+    }

 
 

-bool wxListBox::MacIsSelected( int n ) const
-{
-       Cell cell = { 0 , 0 } ;
-       cell.v = n ;
-       return LGetSelect( false , &cell , m_macList ) ;
+    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::MacDestroy()
-{
-//     DisposeExtLDEFInfo( m_macList ) ;
-}
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserListControl , wxMacDataItemBrowserControl )

 
 

-int wxListBox::MacGetSelection() const
+wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
+    : wxMacDataItemBrowserControl( peer, pos, size, style )

 {
 {

-       Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( true , &cell , m_macList ) )
-               return cell.v ;
-       else
-               return -1 ;
-}
+    OSStatus err = noErr;
+    m_clientDataItemsType = wxClientData_None;
+    if ( style & wxLB_SORT )
+        m_sortOrder = SortOrder_Text_Ascending;

 
 

-int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
-{
-       int no_sel = 0 ;
-       
-    aSelections.Empty();
+    DataBrowserSelectionFlags  options = kDataBrowserDragSelect;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options |= kDataBrowserCmdTogglesSelection;
+    }
+    else
+    {
+        options |= kDataBrowserSelectOnlyOne;
+    }
+    err = SetSelectionFlags( options );
+    verify_noerr( err );
+
+    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;

 
 

-       Cell cell = { 0 , 0 } ;
-       cell.v = 0 ;
-       
-       while ( LGetSelect( true , &cell , m_macList ) )
-       {
-               aSelections.Add( cell.v ) ;
-               no_sel++ ;
-               cell.v++ ;
-       }
-       return no_sel ;
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 10000;
+
+    columnDesc.propertyDesc.propertyID = kTextColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+
+    verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 0;
+    columnDesc.propertyDesc.propertyID = kNumericOrderColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserPropertyRelevanceRankPart;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+
+    verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+    SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+    if ( m_sortOrder == SortOrder_Text_Ascending )
+    {
+        SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+        SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
+    }
+    else
+    {
+        SetDataBrowserSortProperty( m_controlRef , kNumericOrderColumnId);
+        SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
+    }
+
+    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 char * text )
+wxMacDataBrowserListControl::~wxMacDataBrowserListControl()

 {
 {

-       // our implementation does not store anything in the list
-       // so we just have to redraw
-       Cell cell = { 0 , 0 } ;
-       cell.v = n ;
-       LDraw( cell , m_macList ) ;

 }
 
 }
 

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

 {
 {

-       // TODO implement scrolling
+    return wxDynamicCast( wxMacControl::GetPeer() , wxWindow );

 }
 
 }
 

-void wxListBox::OnSize( const wxSizeEvent &event)
+wxMacDataItem* wxMacDataBrowserListControl::CreateItem()

 {
 {

-       Point pt = (**m_macList).cellSize ;
-       pt.h =  m_width - 15  ;
-       LCellSize( pt , m_macList ) ;
+    return new wxMacListBoxItem();

 }
 
 }
 

-void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
-{
-       Boolean wasDoubleClick = false ;
-       long    result ;
+#if 0

 
 

-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
-       if ( !wasDoubleClick )
-       {
-               MacDoClick() ;
-       }
-       else
-       {
-               MacDoDoubleClick() ;
-       }
-}
+// in case we need that one day

 
 

-void wxListBox::MacSetRedraw( bool doDraw ) 
-{
-       LSetDrawingMode( doDraw , m_macList ) ;
-       
-}
+// ============================================================================
+// HIView owner-draw-based implementation
+// ============================================================================

 
 

-void wxListBox::MacDoClick()
+static pascal void ListBoxDrawProc(
+    ControlRef browser, DataBrowserItemID item, DataBrowserPropertyID property,
+    DataBrowserItemState itemState, const Rect *itemRect, SInt16 depth, Boolean isColorDevice )

 {
 {

-       wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
-    event.SetEventObject( this );
+    CFStringRef cfString;
+    ThemeDrawingState themeState;
+    long systemVersion;

 
 

-       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) );
-       }
-       else
-       {
-         n = -1;
-       }
-       
-    event.m_commandInt = n;
+    GetThemeDrawingState( &themeState );
+    cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );

 
 

-    GetEventHandler()->ProcessEvent(event);
-}
+    //  In this sample we handle the "selected" state; all others fall through to our "active" state
+    if ( itemState == kDataBrowserItemIsSelected )
+    {
+        ThemeBrush colorBrushID;
+
+        // 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
+            colorBrushID = kThemeBrushPrimaryHighlightColor;
+
+        // First paint the hilite rect, then the text on top
+        SetThemePen( colorBrushID, 32, true );
+        PaintRect( itemRect );
+        SetThemeDrawingState( themeState, false );
+    }

 
 

-void wxListBox::MacDoDoubleClick()
-{
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
-    event.SetEventObject( this );
-       GetEventHandler()->ProcessEvent(event) ; 
+    DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+    SetThemeDrawingState( themeState, true );
+
+    if ( cfString != NULL )
+        CFRelease( cfString );

 }
 }

+
+#endif
+
+
+#endif // wxUSE_LISTBOX