X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f081f02ead106131223cb8078713dbc7844e885..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/listbox.cpp diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 9a10e64d29..5a0858ee35 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -1,835 +1,959 @@ /////////////////////////////////////////////////////////////////////////////// -// 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/settings.h" -#include "wx/toplevel.h" -#include "wx/dynarray.h" -#include "wx/log.h" -#include "wx/utils.h" +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/log.h" + #include "wx/intl.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/button.h" + #include "wx/settings.h" + #include "wx/arrstr.h" + #include "wx/toplevel.h" +#endif -#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" +#include "wx/dynarray.h" -#if PRAGMA_STRUCT_ALIGN - #pragma options align=mac68k -#elif PRAGMA_STRUCT_PACKPUSH - #pragma pack(push, 2) -#elif PRAGMA_STRUCT_PACK - #pragma pack(2) -#endif +// ============================================================================ +// list box control implementation +// ============================================================================ -typedef struct { - unsigned short instruction; - void (*function)(); -} ldefRec, *ldefPtr, **ldefHandle; - -#if PRAGMA_STRUCT_ALIGN - #pragma options align=reset -#elif PRAGMA_STRUCT_PACKPUSH - #pragma pack(pop) -#elif PRAGMA_STRUCT_PACK - #pragma pack() -#endif +wxListBox::wxListBox() +{ +} -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 ) -{ - 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; +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); - case lCloseMsg: - break; + return Create( + parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name ); +} - case lDrawMsg: - { - 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 ); - } - - // Restore the saved clip region. - - SetClip( savedClipRegion ); - DisposeRgn( savedClipRegion ); - } - 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 ); - break; - default : - break ; - } - SetPort(savePort); +wxMacListControl* wxListBox::GetPeer() const +{ + return dynamic_cast(m_peer); } -extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; -const short kwxMacListWithVerticalScrollbar = 128 ; -const short kwxMacListItemHeight = 14 ; +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") ); -// ============================================================================ -// list box control implementation -// ============================================================================ + if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) ) + return false; -// Listbox item -wxListBox::wxListBox() + wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style ); + control->SetClientDataType( m_clientDataItemsType ); + m_peer = control; + + MacPostControlCreate( pos, size ); + + InsertItems( n, choices, 0 ); + + // Needed because it is a wxControlWithItems + SetBestSize( size ); + + return true; +} + +wxListBox::~wxListBox() { - m_noItems = 0; - m_selected = 0; - m_macList = NULL ; + FreeData(); + m_peer->SetReference( 0 ); } -static ListDefUPP macListDefUPP = NULL ; +void wxListBox::FreeData() +{ + GetPeer()->MacClear(); +} -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 wxListBox::DoSetFirstItem(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 ) ; + GetPeer()->MacScrollTo( n ); +} - ListDefSpec listDef; - listDef.defType = kListDefUserProcType; - if ( macListDefUPP == NULL ) - { - macListDefUPP = NewListDefUPP( wxMacListDefinition ); - } - listDef.u.userProc = macListDefUPP ; +void wxListBox::EnsureVisible(int n) +{ + GetPeer()->MacScrollTo( n ); +} -#if TARGET_CARBON - Size asize; +void wxListBox::Delete(unsigned int n) +{ + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") ); + GetPeer()->MacDelete( n ); +} - CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true, - kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl ); +int wxListBox::DoAppend(const wxString& item) +{ + InvalidateBestSize(); - GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag, - sizeof(ListHandle), (Ptr) &m_macList, &asize); + return GetPeer()->MacAppend( item ); +} - SetControlReference( (ControlHandle) m_macControl, (long) this); - SetControlVisibility( (ControlHandle) m_macControl, false, false); +void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) +{ + Clear(); -#else + unsigned int n = choices.GetCount(); - long result ; - wxStAppResource resload ; - 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 ) ; - - HLock( (Handle) m_macList ) ; - ldefHandle ldef ; - ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ; - if ( (**(ListHandle)m_macList).listDefProc != NULL ) - { - (**ldef).instruction = 0x4EF9; /* JMP instruction */ - (**ldef).function = (void(*)()) listDef.u.userProc; - (**(ListHandle)m_macList).listDefProc = (Handle) ldef ; - } - - 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 ) + for ( size_t i = 0; i < n; ++i ) { - options += lNoExtend ; - } - else if ( style & wxLB_EXTENDED ) - { - options += lExtendDrag ; - } - else - { - options = lOnlyOne ; - } - SetListSelectionFlags((ListHandle)m_macList, options); - - MacPostControlCreate() ; - - for ( int i = 0 ; i < n ; i++ ) - { - Append( choices[i] ) ; + if ( clientData ) + { + Append( choices[i], clientData[i] ); + } + else + Append( choices[i] ); } - - LSetDrawingMode( true , (ListHandle)m_macList ) ; - return TRUE; } -wxListBox::~wxListBox() +int wxListBox::FindString(const wxString& s, bool bCase) const { - Free() ; - if ( m_macList ) + for ( size_t i = 0; i < GetCount(); ++ i ) { -#if !TARGET_CARBON - DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ; - (**(ListHandle)m_macList).listDefProc = NULL ; -#endif - m_macList = NULL ; + if (s.IsSameAs( GetString( i ), bCase) ) + return (int)i; } + + return wxNOT_FOUND; } -void wxListBox::Free() +void wxListBox::Clear() { -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) - { - size_t uiCount = m_aItems.Count(); - while ( uiCount-- != 0 ) { - delete m_aItems[uiCount]; - } + FreeData(); +} - m_aItems.Clear(); - } +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 -#endif // wxUSE_OWNER_DRAWN - if ( HasClientObjectData() ) - { - for ( size_t n = 0; n < (size_t)m_noItems; n++ ) - { - delete GetClientObject(n); - } - } + GetPeer()->MacSetSelection( n, select ); } -void wxListBox::DoSetSize(int x, int y, - int width, int height, - int sizeFlags ) +bool wxListBox::IsSelected(int n) const { - wxControl::DoSetSize( x , y , width , height , sizeFlags ) ; -#if TARGET_CARBON - Rect bounds ; - GetControlBounds( (ControlHandle) m_macControl , &bounds ) ; - ControlRef control = GetListVerticalScrollBar( (ListHandle)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 + wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxListBox::Selected") ); + + return GetPeer()->MacIsSelected( n ); } -void wxListBox::DoSetFirstItem(int N) + +void *wxListBox::DoGetItemClientData(unsigned int n) const { - MacScrollTo( N ) ; + wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData")); + return GetPeer()->MacGetClientData( n ); } -void wxListBox::Delete(int N) +wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const { - wxCHECK_RET( N >= 0 && N < m_noItems, - wxT("invalid index in wxListBox::Delete") ); + return (wxClientData*)DoGetItemClientData( n ); +} -#if wxUSE_OWNER_DRAWN - delete m_aItems[N]; - m_aItems.RemoveAt(N); -#else // !wxUSE_OWNER_DRAWN - if ( HasClientObjectData() ) - { - delete GetClientObject(N); - } -#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN - m_stringArray.Remove( N ) ; - m_dataArray.RemoveAt( N ) ; - m_noItems --; - - MacDelete( N ) ; +void wxListBox::DoSetItemClientData(unsigned int n, void *clientData) +{ + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") ); + GetPeer()->MacSetClientData( n , clientData); } -int wxListBox::DoAppend(const wxString& item) +void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { - 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 ) ; + DoSetItemClientData(n, clientData); +} - return index ; +// Return number of selections and an array of selected integers +int wxListBox::GetSelections(wxArrayInt& aSelections) const +{ + return GetPeer()->MacGetSelections( aSelections ); } -void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) -{ - MacSetRedraw( false ) ; - Clear() ; - int n = choices.GetCount(); - - for( int i = 0 ; i < n ; ++i ) - { - if ( clientData ) +// Get single selection, for single choice list items +int wxListBox::GetSelection() const +{ + return GetPeer()->MacGetSelection(); +} + +// Find string for position +wxString wxListBox::GetString(unsigned int n) const +{ + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") ); + return GetPeer()->MacGetString(n); +} + +void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) +{ + wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") ); + + InvalidateBestSize(); + + GetPeer()->MacInsert( pos, items ); +} + +void wxListBox::SetString(unsigned int n, const wxString& s) +{ + GetPeer()->MacSetString( n, s ); +} + +wxSize wxListBox::DoGetBestSize() const +{ + int lbWidth = 100; // some defaults + int lbHeight = 110; + int wLine; + { -#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]; + 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 ); } - m_aItems.Empty(); - // 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); + // 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 ); } -#endif // wxUSE_OWNER_DRAWN - MacSetRedraw( true ) ; + + return wxSize( lbWidth, lbHeight ); } -bool wxListBox::HasMultipleSelection() const +unsigned int wxListBox::GetCount() const { - return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED); + return GetPeer()->MacGetCount(); } -int wxListBox::FindString(const wxString& st) const +void wxListBox::Refresh(bool eraseBack, const wxRect *rect) { - wxString s ; - if( wxApp::s_macDefaultEncodingIsPC ) - { - s = wxMacMakeMacStringFromPC( st ) ; - } - else - s = st ; - - if ( s.Right(1) == "*" ) + wxControl::Refresh( eraseBack, rect ); +} + +// Some custom controls depend on this +/* static */ wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + wxVisualAttributes attr; + + attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); + attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ); + attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + + return attr; +} + +int wxListBox::DoListHitTest(const wxPoint& inpoint) const +{ + 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 ) { - wxString search = s.Left( s.Length() - 1 ) ; - int len = search.Length() ; - Str255 s1 , s2 ; + Rect bounds; + err = GetDataBrowserItemPartBounds( + m_peer->GetControlRef(), low + 1, colId, + kDataBrowserPropertyEnclosingPart, + &bounds); // note +1 to translate to Mac ID + if ( err == noErr ) + break; -#if TARGET_CARBON - c2pstrcpy( (StringPtr) s2 , search.c_str() ) ; -#else - strcpy( (char *) s2 , search.c_str() ) ; - c2pstr( (char *) s2 ) ; -#endif + // 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") ); - for ( int i = 0 ; i < m_noItems ; ++ i ) + 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 ) { -#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 ; + // item not visible, attempt to find a visible one + // search lower + high = mid - 1; } - if ( s.Left(1) == "*" && s.Length() > 1 ) + else // visible item, do actual hitttest { - s.MakeLower() ; - for ( int i = 0 ; i < m_noItems ; ++i ) + // 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) ) { - if ( GetString(i).Lower().Matches(s) ) - return i ; + // 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; + } } - 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() +// ============================================================================ +// data browser based implementation +// ============================================================================ + +const short kTextColumnId = 1024; +const short kNumericOrderColumnId = 1025; + +wxMacListBoxItem::wxMacListBoxItem() { - Free(); - m_noItems = 0; - m_stringArray.Empty() ; - m_dataArray.Empty() ; - MacClear() ; + m_data = NULL; + m_order = 0; } -void wxListBox::SetSelection(int N, bool select) +wxMacListBoxItem::~wxMacListBoxItem() { - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetSelection" ); - MacSetSelection( N , select ) ; - GetSelections( m_selectionPreImage ) ; } -bool wxListBox::IsSelected(int N) const +void wxMacListBoxItem::SetOrder( SInt32 order ) { - wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, - "invalid index in wxListBox::Selected" ); - - return MacIsSelected( N ) ; + m_order = order; } -void *wxListBox::DoGetItemClientData(int N) const +SInt32 wxMacListBoxItem::GetOrder() const { - wxCHECK_MSG( N >= 0 && N < m_noItems, NULL, - wxT("invalid index in wxListBox::GetClientData")); - - return (void *)m_dataArray[N]; + return m_order; } -wxClientData *wxListBox::DoGetItemClientObject(int N) const +void wxMacListBoxItem::SetData( void* data) { - return (wxClientData *) DoGetItemClientData( N ) ; + m_data = data; } -void wxListBox::DoSetItemClientData(int N, void *Client_data) +void* wxMacListBoxItem::GetData() const { - wxCHECK_RET( N >= 0 && N < m_noItems, - "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 ; - } - else - { - m_dataArray.Add( (char*) Client_data ) ; - } + return m_data; } -void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) +void wxMacListBoxItem::SetLabel( const wxString& str) { - DoSetItemClientData(n, clientData); + m_label = str; + m_cfLabel.Assign( str , wxLocale::GetSystemEncoding()); } -// Return number of selections and an array of selected integers -int wxListBox::GetSelections(wxArrayInt& aSelections) const +const wxString& wxMacListBoxItem::GetLabel() const { - return MacGetSelections( aSelections ) ; + return m_label; } -// Get single selection, for single choice list items -int wxListBox::GetSelection() const +bool wxMacListBoxItem::IsLessThan(wxMacDataItemBrowserControl *owner , + const wxMacDataItem* rhs, + DataBrowserPropertyID sortProperty) const { - return MacGetSelection() ; + const wxMacListBoxItem* otherItem = dynamic_cast(rhs); + bool retval = false; + switch (sortProperty) + { + case kTextColumnId: + retval = m_label.CmpNoCase( otherItem->m_label) < 0; + break; + + case kNumericOrderColumnId: + retval = m_order < otherItem->m_order; + break; + + default: + break; + }; + + return retval; } -// Find string for position -wxString wxListBox::GetString(int N) const +OSStatus wxMacListBoxItem::GetSetData( wxMacDataItemBrowserControl *owner , + DataBrowserPropertyID property, + DataBrowserItemDataRef itemData, + bool changeValue ) { - if( wxApp::s_macDefaultEncodingIsPC ) + OSStatus err = errDataBrowserPropertyNotSupported; + wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox ); + wxCHECK_MSG( list != NULL , errDataBrowserPropertyNotSupported , wxT("Listbox expected")); + + if ( !changeValue ) { - return wxMacMakePCStringFromMac( m_stringArray[N] ) ; + switch (property) + { + case kTextColumnId: + err = ::SetDataBrowserItemDataText( itemData, m_cfLabel ); + err = noErr; + break; + + case kNumericOrderColumnId: + err = ::SetDataBrowserItemDataValue( itemData, m_order ); + err = noErr; + break; + + default: + break; + } } else - return m_stringArray[N] ; + { + switch (property) + { + // no editable props here + default: + break; + } + } + + return err; } -void wxListBox::DoInsertItems(const wxArrayString& items, int pos) +void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner , + DataBrowserItemNotification message, + DataBrowserItemDataRef itemData ) const { - wxCHECK_RET( pos >= 0 && pos <= m_noItems, - wxT("invalid index in wxListBox::InsertItems") ); + wxMacDataBrowserListControl *lb = dynamic_cast(owner); - int nItems = items.GetCount(); + // we want to depend on as little as possible to make sure tear-down of controls is safe - for ( int i = 0 ; i < nItems ; i++ ) + if ( message == kDataBrowserItemRemoved) { - m_stringArray.Insert( items[i] , pos + i ) ; - m_dataArray.Insert( NULL , pos + i ) ; - MacInsert( pos + i , items[i] ) ; + if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object ) + { + delete (wxClientData*) (m_data); + } + + delete this; + return; } - m_noItems += nItems; + wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox ); + wxCHECK_RET( list != NULL , wxT("Listbox expected")); + + 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; + } + + 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 ); + wxPostEvent( list->GetEventHandler(), event ); + + // direct notification is not always having the listbox GetSelection() having in synch with event + // list->GetEventHandler()->ProcessEvent(event); + } } -void wxListBox::SetString(int N, const wxString& s) +wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style) + : wxMacDataItemBrowserControl( peer, pos, size, style ) { - wxString str ; - if( wxApp::s_macDefaultEncodingIsPC ) + OSStatus err = noErr; + m_clientDataItemsType = wxClientData_None; + m_stringSorted = style & wxLB_SORT; + + 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 ); + + 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; + + 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( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ); + + columnDesc.headerBtnDesc.minimumWidth = 0; + columnDesc.headerBtnDesc.maximumWidth = 0; + columnDesc.propertyDesc.propertyID = kNumericOrderColumnId; + columnDesc.propertyDesc.propertyType = kDataBrowserPropertyRelevanceRankPart; + columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn; +#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn; +#endif + + verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ); + + SetDataBrowserSortProperty( m_controlRef , kTextColumnId); + if ( m_stringSorted ) { - str = wxMacMakeMacStringFromPC( s ) ; + SetDataBrowserSortProperty( m_controlRef , kTextColumnId); + SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing); } else - str = s ; - m_stringArray[N] = str ; - MacSet( N , s ) ; + { + 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 } -wxSize wxListBox::DoGetBestSize() const +wxMacDataBrowserListControl::~wxMacDataBrowserListControl() { - return wxSize(100, 100); } -int wxListBox::GetCount() const + +wxMacListBoxItem* wxMacDataBrowserListControl::CreateItem() { - return m_noItems; + return new wxMacListBoxItem(); } -void wxListBox::SetupColours() +wxListBox * wxMacDataBrowserListControl::GetPeer() const { - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(GetParent()->GetForegroundColour()); + return wxDynamicCast( wxMacControl::GetPeer() , wxListBox ); } -void wxListBox::Refresh(bool eraseBack, const wxRect *rect) +wxClientDataType wxMacDataBrowserListControl::GetClientDataType() const { - wxControl::Refresh( eraseBack , rect ) ; -// MacRedrawControl() ; + return m_clientDataItemsType; } - -#if wxUSE_OWNER_DRAWN - -class wxListBoxItem : public wxOwnerDrawn +void wxMacDataBrowserListControl::SetClientDataType(wxClientDataType clientDataItemsType) { -public: - wxListBoxItem(const wxString& str = ""); -}; + m_clientDataItemsType = clientDataItemsType; +} -wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE) +unsigned int wxMacDataBrowserListControl::MacGetCount() const { - // no bitmaps/checkmarks - SetMarginWidth(0); + return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState); } -wxOwnerDrawn *wxListBox::CreateItem(size_t n) +void wxMacDataBrowserListControl::MacDelete( unsigned int n ) { - return new wxListBoxItem(); + wxMacListBoxItem* item = (wxMacListBoxItem*)GetItemFromLine( n ); + RemoveItem( wxMacDataBrowserRootContainer, item ); } -#endif //USE_OWNER_DRAWN +void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxString& text) +{ + wxMacListBoxItem* newItem = CreateItem(); + newItem->SetLabel( text ); -// ============================================================================ -// list box control implementation -// ============================================================================ + if ( !m_stringSorted ) + { + // increase the order of the lines to be shifted + unsigned int lines = MacGetCount(); + for ( unsigned int i = n; i < lines; ++i) + { + wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(i); + iter->SetOrder( iter->GetOrder() + 1 ); + } -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()); - + SInt32 frontLineOrder = 0; + if ( n > 0 ) + { + wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(n-1); + frontLineOrder = iter->GetOrder(); + } + newItem->SetOrder( frontLineOrder + 1 ); + } + + AddItem( wxMacDataBrowserRootContainer, newItem ); } -void wxListBox::MacDelete( int N ) +void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxArrayString& items) { - LDelRow( 1 , N , (ListHandle)m_macList) ; - Refresh(); + size_t itemsCount = items.GetCount(); + if ( itemsCount == 0 ) + return; + + SInt32 frontLineOrder = 0; + + if ( !m_stringSorted ) + { + // increase the order of the lines to be shifted + unsigned int lines = MacGetCount(); + for ( unsigned int i = n; i < lines; ++i) + { + wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(i); + iter->SetOrder( iter->GetOrder() + itemsCount ); + } + if ( n > 0 ) + { + wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(n-1); + frontLineOrder = iter->GetOrder(); + } + } + + wxArrayMacDataItemPtr ids; + ids.SetCount( itemsCount ); + + for ( unsigned int i = 0; i < itemsCount; ++i ) + { + wxMacListBoxItem* item = CreateItem(); + item->SetLabel( items[i]); + if ( !m_stringSorted ) + item->SetOrder( frontLineOrder + 1 + i ); + + ids[i] = item; + } + + AddItems( wxMacDataBrowserRootContainer, ids ); } -void wxListBox::MacInsert( int n , const char * text) +int wxMacDataBrowserListControl::MacAppend( const wxString& text) { - Cell cell = { 0 , 0 } ; - cell.v = n ; - LAddRow( 1 , cell.v , (ListHandle)m_macList ) ; -// LSetCell(text, strlen(text), cell, m_macList); - Refresh(); + wxMacListBoxItem* item = CreateItem(); + item->SetLabel( text ); + if ( !m_stringSorted ) + { + unsigned int lines = MacGetCount(); + if ( lines == 0 ) + item->SetOrder( 1 ); + else + { + wxMacListBoxItem* frontItem = (wxMacListBoxItem*) GetItemFromLine(lines-1); + item->SetOrder( frontItem->GetOrder() + 1 ); + } + } + AddItem( wxMacDataBrowserRootContainer, item ); + + return GetLineFromItem(item); } -void wxListBox::MacAppend( const char * text) +void wxMacDataBrowserListControl::MacClear() { - 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(); + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + RemoveAllItems(wxMacDataBrowserRootContainer); } -void wxListBox::MacClear() +void wxMacDataBrowserListControl::MacDeselectAll() { - LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ; - Refresh(); + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + SetSelectedAllItems( kDataBrowserItemsRemove ); } -void wxListBox::MacSetSelection( int n , bool select ) +void wxMacDataBrowserListControl::MacSetSelection( unsigned int n, bool select ) { - Cell cell = { 0 , 0 } ; - if ( ! (m_windowStyle & wxLB_MULTIPLE) ) + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine(n); + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + + if ( IsItemSelected( item ) != select ) { - if ( LGetSelect( true , &cell , (ListHandle)m_macList ) ) - { - LSetSelect( false , cell , (ListHandle)m_macList ) ; - } + if ( select ) + SetSelectedItem( item, GetPeer()->HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ); + else + SetSelectedItem( item, kDataBrowserItemsRemove ); } - - cell.v = n ; - LSetSelect( select , cell , (ListHandle)m_macList ) ; - LAutoScroll( (ListHandle)m_macList ) ; - Refresh(); -} -bool wxListBox::MacIsSelected( int n ) const -{ - Cell cell = { 0 , 0 } ; - cell.v = n ; - return LGetSelect( false , &cell , (ListHandle)m_macList ) ; + MacScrollTo( n ); } -void wxListBox::MacDestroy() +bool wxMacDataBrowserListControl::MacIsSelected( unsigned int n ) const { -// DisposeExtLDEFInfo( m_macList ) ; + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine(n); + return IsItemSelected( item ); } -int wxListBox::MacGetSelection() const +int wxMacDataBrowserListControl::MacGetSelection() const { - Cell cell = { 0 , 0 } ; - if ( LGetSelect( true , &cell , (ListHandle)m_macList ) ) - return cell.v ; - else - return -1 ; + wxMacDataItemPtr first, last; + GetSelectionAnchor( &first, &last ); + + if ( first != NULL ) + { + return GetLineFromItem( first ); + } + + return -1; } -int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const +int wxMacDataBrowserListControl::MacGetSelections( wxArrayInt& aSelections ) const { - int no_sel = 0 ; - aSelections.Empty(); + wxArrayMacDataItemPtr selectedItems; + GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems); + + int count = selectedItems.GetCount(); - Cell cell = { 0 , 0 } ; - cell.v = 0 ; - - while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) ) + for ( int i = 0; i < count; ++i) { - aSelections.Add( cell.v ) ; - no_sel++ ; - cell.v++ ; + aSelections.Add(GetLineFromItem(selectedItems[i])); } - return no_sel ; + + return count; } -void wxListBox::MacSet( int n , const char * text ) +void wxMacDataBrowserListControl::MacSetString( unsigned int n, const wxString& 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(); + // as we don't store the strings we only have to issue a redraw + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine( n); + item->SetLabel( text ); + UpdateItem( wxMacDataBrowserRootContainer, item , kTextColumnId ); } -void wxListBox::MacScrollTo( int n ) +wxString wxMacDataBrowserListControl::MacGetString( unsigned int n ) const { - // TODO implement scrolling + wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n ); + return item->GetLabel(); } -void wxListBox::OnSize( const wxSizeEvent &event) +void wxMacDataBrowserListControl::MacSetClientData( unsigned int n, void * data) { - Point pt; - -#if TARGET_CARBON - GetListCellSize((ListHandle)m_macList, &pt); -#else - pt = (**(ListHandle)m_macList).cellSize ; -#endif - pt.h = m_width - 15 ; - LCellSize( pt , (ListHandle)m_macList ) ; + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine( n); + item->SetData( data ); + // not displayed, therefore no Update infos to DataBrowser } -void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +void * wxMacDataBrowserListControl::MacGetClientData( unsigned int n) const { - Boolean wasDoubleClick = false ; - long result ; - - ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ; - if ( !wasDoubleClick ) - { - MacDoClick() ; - } - else - { - MacDoDoubleClick() ; - } + wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n ); + return item->GetData(); } -void wxListBox::MacSetRedraw( bool doDraw ) +void wxMacDataBrowserListControl::MacScrollTo( unsigned int n ) { - LSetDrawingMode( doDraw , (ListHandle)m_macList ) ; - + RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting ); } -void wxListBox::MacDoClick() +#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 ) { - wxArrayInt aSelections; - int n, count = GetSelections(aSelections); - - if ( count == m_selectionPreImage.GetCount() ) - { - bool hasChanged = false ; - for ( int i = 0 ; i < count ; ++i ) - { - if ( aSelections[i] != m_selectionPreImage[i] ) - { - hasChanged = true ; - break ; - } - } - if ( !hasChanged ) - { - return ; - } - } - - m_selectionPreImage = aSelections; - - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); - event.SetEventObject( this ); + CFStringRef cfString; + ThemeDrawingState themeState; + long systemVersion; - if ( count > 0 ) - { - n = aSelections[0]; - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); - event.SetString( GetString(n) ); - } - else + 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 ) { - n = -1; + 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 ); } - - event.m_commandInt = n; - GetEventHandler()->ProcessEvent(event); -} + DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL ); + SetThemeDrawingState( themeState, true ); -void wxListBox::MacDoDoubleClick() -{ - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; + if ( cfString != NULL ) + CFRelease( cfString ); } + +#endif + + +#endif // wxUSE_LISTBOX