X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/listbox.cpp?ds=sidebyside diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index fc3319d92c..5a0858ee35 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/mac/carbon/listbox.cpp // Purpose: wxListBox // Author: Stefan Csomor // Modified by: @@ -13,478 +13,196 @@ #if wxUSE_LISTBOX -#include "wx/app.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" +#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 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl) -#ifndef __WXMAC_OSX__ -// EVT_SIZE( wxListBox::OnSize ) - EVT_CHAR( wxListBox::OnChar ) -#endif END_EVENT_TABLE() #include "wx/mac/uma.h" +#include "wx/dynarray.h" -const short kTextColumnId = 1024 ; - -// new databrowserbased version -// because of the limited insert -// functionality of DataBrowser, -// we just introduce id s corresponding -// to the line number - -DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ; -DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ; -DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ; +// ============================================================================ +// list box control implementation +// ============================================================================ -#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 +wxListBox::wxListBox() { - 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) +bool wxListBox::Create( + wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name ) { - 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; - long systemVersion; - - cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item ); - - ThemeDrawingState themeState ; - GetThemeDrawingState( &themeState ) ; - - if ( itemState == kDataBrowserItemIsSelected ) // In this sample we handle the "selected" state, all others fall through to our "active" state - { - Gestalt( gestaltSystemVersion, &systemVersion ); - if ( (systemVersion >= 0x00001030) && (IsControlActive( browser ) == false) ) // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting - SetThemePen( kThemeBrushSecondaryHighlightColor, 32, true ); - else - SetThemePen( kThemeBrushPrimaryHighlightColor, 32, true ); - - PaintRect( itemRect ); // First paint the hilite rect, then the text on top - SetThemeDrawingState( themeState , false ) ; - } - DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL ); - if ( cfString != NULL ) - CFRelease( cfString ); - SetThemeDrawingState( themeState , true ) ; -} + wxCArrayString chs(choices); -// Listbox item -wxListBox::wxListBox() -{ - m_noItems = 0; - m_selected = 0; - m_macList = NULL ; - m_suppressSelection = false ; + return Create( + parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name ); } -bool wxListBox::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) +wxMacListControl* wxListBox::GetPeer() const { - wxCArrayString chs(choices); - - return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), - style, validator, name); + return dynamic_cast(m_peer); } -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) +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 ; + m_macIsUserPane = false; 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; - 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) ; - - DataBrowserCallbacks callbacks ; - InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ; - - callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP; - callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP; - m_peer->SetCallbacks( &callbacks); - - 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; + wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style ); + control->SetClientDataType( m_clientDataItemsType ); + m_peer = control; - columnDesc.headerBtnDesc.btnFontStyle.flags = - kControlUseFontMask | kControlUseJustMask; - - columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent; - columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault; - columnDesc.headerBtnDesc.minimumWidth = 0; - columnDesc.headerBtnDesc.maximumWidth = 10000; + MacPostControlCreate( pos, size ); - 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 = -#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - kDataBrowserListViewTypeSelectColumn | -#endif - kDataBrowserTableViewSelectionColumn ; + InsertItems( n, choices, 0 ); - 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 ) ) ; + // Needed because it is a wxControlWithItems + SetBestSize( size ); -#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] ) ; - } - - SetBestSize(size); // Needed because it is a wxControlWithItems - - return TRUE; + 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() { - if ( HasClientObjectData() ) - { - for ( size_t n = 0; n < (size_t)m_noItems; n++ ) - { - delete GetClientObject(n); - } - } + GetPeer()->MacClear(); } -void wxListBox::DoSetSize(int x, int y, - int width, int height, - int sizeFlags ) +void wxListBox::DoSetFirstItem(int n) { - wxControl::DoSetSize( x , y , width , height , sizeFlags ) ; + GetPeer()->MacScrollTo( n ); } -void wxListBox::DoSetFirstItem(int N) +void wxListBox::EnsureVisible(int n) { - MacScrollTo( N ) ; + GetPeer()->MacScrollTo( n ); } -void wxListBox::Delete(int N) +void wxListBox::Delete(unsigned int n) { - wxCHECK_RET( N >= 0 && N < m_noItems, - wxT("invalid index in wxListBox::Delete") ); - - if ( HasClientObjectData() ) - { - delete GetClientObject(N); - } - m_stringArray.RemoveAt( N ) ; - m_dataArray.RemoveAt( N ) ; - m_noItems --; + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") ); - MacDelete( N ) ; + GetPeer()->MacDelete( n ); } int wxListBox::DoAppend(const wxString& item) { InvalidateBestSize(); - int index = m_noItems ; - m_stringArray.Add( item ) ; - m_dataArray.Add( NULL ); - m_noItems ++; - DoSetItemClientData( index , NULL ) ; - MacAppend( item ) ; - - return index ; + return GetPeer()->MacAppend( item ); } void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) { - Clear() ; - int n = choices.GetCount(); + Clear(); + + unsigned int n = choices.GetCount(); - for( int i = 0 ; i < n ; ++i ) + for ( size_t i = 0; i < n; ++i ) { if ( clientData ) { - Append( choices[i] , clientData[i] ) ; + Append( choices[i], clientData[i] ); } else - Append( choices[i] ) ; + Append( choices[i] ); } + } -int wxListBox::FindString(const wxString& s) const +int wxListBox::FindString(const wxString& s, bool bCase) const { - - if ( s.Right(1) == wxT("*") ) + for ( size_t i = 0; i < GetCount(); ++ i ) { - 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 , false , 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 ; - } - } - + if (s.IsSameAs( GetString( i ), bCase) ) + return (int)i; } - else - { - Str255 s1 , s2 ; - - wxMacStringToPascal( s , s2 ) ; - - for ( int i = 0 ; i < m_noItems ; ++ i ) - { - wxMacStringToPascal( m_stringArray[i] , s1 ) ; - if ( EqualString( s1 , s2 , false , false ) ) - return i ; - } - } - return -1; + return wxNOT_FOUND; } void wxListBox::Clear() { 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 ) - MacDeselectAll() ; + if ( n == wxNOT_FOUND ) + GetPeer()->MacDeselectAll(); else - MacSetSelection( N , select ) ; + GetPeer()->MacSetSelection( n, select ); } -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 +wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const { - return (wxClientData *) DoGetItemClientData( N ) ; + return (wxClientData*)DoGetItemClientData( n ); } -void wxListBox::DoSetItemClientData(int N, void *Client_data) +void wxListBox::DoSetItemClientData(unsigned int n, void *clientData) { - wxCHECK_RET( N >= 0 && N < m_noItems, - 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*) Client_data ; - } - else - { - m_dataArray.Add( (char*) Client_data ) ; - } + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") ); + GetPeer()->MacSetClientData( n , clientData); } -void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) +void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { DoSetItemClientData(n, clientData); } @@ -492,46 +210,34 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) // Return number of selections and an array of selected integers int wxListBox::GetSelections(wxArrayInt& aSelections) const { - return MacGetSelections( aSelections ) ; + return GetPeer()->MacGetSelections( aSelections ); } // Get single selection, for single choice list items int wxListBox::GetSelection() const { - return MacGetSelection() ; + return GetPeer()->MacGetSelection(); } // Find string for position -wxString wxListBox::GetString(int N) const +wxString wxListBox::GetString(unsigned int n) const { - 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::DoInsertItems(const wxArrayString& items, unsigned int pos) { - wxCHECK_RET( pos >= 0 && pos <= m_noItems, - wxT("invalid index in wxListBox::InsertItems") ); + wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") ); 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] ) ; - } + GetPeer()->MacInsert( pos, items ); } -void wxListBox::SetString(int N, const wxString& s) +void wxListBox::SetString(unsigned int n, const wxString& s) { - m_stringArray[N] = s ; - MacSet( N , s ) ; + GetPeer()->MacSetString( n, s ); } wxSize wxListBox::DoGetBestSize() const @@ -541,335 +247,713 @@ wxSize wxListBox::DoGetBestSize() const int wLine; { - wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; + 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() ) ; + ::TextFont( m_font.MacGetFontNum() ); + ::TextSize( m_font.MacGetFontSize() ); + ::TextFace( m_font.MacGetFontStyle() ); } else { - ::TextFont( kFontIDMonaco ) ; - ::TextSize( 9 ); - ::TextFace( 0 ) ; + ::TextFont( kFontIDMonaco ); + ::TextSize( 9 ); + ::TextFace( 0 ); } // Find the widest line - for(int i = 0; i < GetCount(); i++) { - wxString str(GetString(i)); - #if wxUSE_UNICODE - Point bounds={0,0} ; - SInt16 baseline ; - ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) , + 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); + 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); + lbWidth += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X ); // And just a bit more - int cy = 12 ; - int cx = ::TextWidth( "X" , 0 , 1 ) ; - lbWidth += cx ; + 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 = (cy+4) * wxMin(wxMax(GetCount(), 3), 10); + // 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); + 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) { - wxControl::Refresh( eraseBack , rect ) ; + 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); + + attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); + attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ); + attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + return attr; } -// ============================================================================ -// list box control implementation -// ============================================================================ +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 ) + { + Rect bounds; + err = GetDataBrowserItemPartBounds( + m_peer->GetControlRef(), low + 1, colId, + kDataBrowserPropertyEnclosingPart, + &bounds); // note +1 to translate to Mac ID + if ( err == noErr ) + break; -void wxListBox::MacDelete( int n ) -{ - wxArrayInt selectionBefore ; - MacGetSelections( selectionBefore ) ; + // 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++; + } - UInt32 id = m_noItems+1 ; - 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; } -void wxListBox::MacInsert( int n , const wxString& text) -{ - wxArrayInt selectionBefore ; - MacGetSelections( selectionBefore ) ; +// ============================================================================ +// data browser based implementation +// ============================================================================ - UInt32 id = m_noItems ; // this has already been increased - verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ; +const short kTextColumnId = 1024; +const short kNumericOrderColumnId = 1025; - for ( int i = selectionBefore.GetCount()-1 ; i >= 0 ; --i ) - { - int current = selectionBefore[i] ; - if ( current >= n ) - { - MacSetSelection( current + 1 , true ) ; - MacSetSelection( current , false ) ; - } - } +wxMacListBoxItem::wxMacListBoxItem() +{ + m_data = NULL; + m_order = 0; +} - // refresh all - verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; +wxMacListBoxItem::~wxMacListBoxItem() +{ } -void wxListBox::MacAppend( const wxString& text) +void wxMacListBoxItem::SetOrder( SInt32 order ) { - 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 + m_order = order; } -void wxListBox::MacClear() +SInt32 wxMacListBoxItem::GetOrder() const { - verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ; + return m_order; } -void wxListBox::MacDeselectAll() +void wxMacListBoxItem::SetData( void* data) { - bool former = MacSuppressSelection( true ) ; - verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ; - MacSuppressSelection( former ) ; + m_data = data; } -void wxListBox::MacSetSelection( int n , bool select ) +void* wxMacListBoxItem::GetData() const { - bool former = MacSuppressSelection( true ) ; - UInt32 id = n + 1 ; + return m_data; +} - if ( m_peer->IsItemSelected( id ) != select ) - { - if ( select ) - verify_noerr(m_peer->SetSelectedItems( 1 , & id , HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) ) ; - else - verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) ) ; - } - MacScrollTo( n ) ; - MacSuppressSelection( former ) ; +void wxMacListBoxItem::SetLabel( const wxString& str) +{ + m_label = str; + m_cfLabel.Assign( str , wxLocale::GetSystemEncoding()); } -bool wxListBox::MacSuppressSelection( bool suppress ) +const wxString& wxMacListBoxItem::GetLabel() const { - bool former = m_suppressSelection ; - m_suppressSelection = suppress ; - return former ; + return m_label; } -bool wxListBox::MacIsSelected( int n ) const +bool wxMacListBoxItem::IsLessThan(wxMacDataItemBrowserControl *owner , + const wxMacDataItem* rhs, + DataBrowserPropertyID sortProperty) const { - return m_peer->IsItemSelected( n + 1 ) ; + 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; } -int wxListBox::MacGetSelection() const +OSStatus wxMacListBoxItem::GetSetData( wxMacDataItemBrowserControl *owner , + DataBrowserPropertyID property, + DataBrowserItemDataRef itemData, + bool changeValue ) { - for ( int i = 0 ; i < GetCount() ; ++i ) + OSStatus err = errDataBrowserPropertyNotSupported; + wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox ); + wxCHECK_MSG( list != NULL , errDataBrowserPropertyNotSupported , wxT("Listbox expected")); + + if ( !changeValue ) + { + 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 { - if ( m_peer->IsItemSelected( i + 1 ) ) + switch (property) { - return i ; + // no editable props here + default: + break; } } - return -1 ; + + return err; } -int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const +void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner , + DataBrowserItemNotification message, + DataBrowserItemDataRef itemData ) const { - int no_sel = 0 ; + wxMacDataBrowserListControl *lb = dynamic_cast(owner); - aSelections.Empty(); + // we want to depend on as little as possible to make sure tear-down of controls is safe - UInt32 first , last ; - m_peer->GetSelectionAnchor( &first , &last ) ; - if ( first != kDataBrowserNoItem ) + if ( message == kDataBrowserItemRemoved) { - for ( size_t i = first ; i <= last ; ++i ) + if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object ) { - if ( m_peer->IsItemSelected( i ) ) - { - aSelections.Add( i - 1 ) ; - no_sel++ ; - } + delete (wxClientData*) (m_data); } + + delete this; + return; + } + + 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); } - return no_sel ; } -void wxListBox::MacSet( int n , const wxString& text ) +wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style) + : wxMacDataItemBrowserControl( peer, pos, size, style ) { - // 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 ) ) ; + 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 ) + { + 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 +} + +wxMacDataBrowserListControl::~wxMacDataBrowserListControl() +{ +} + + +wxMacListBoxItem* wxMacDataBrowserListControl::CreateItem() +{ + return new wxMacListBoxItem(); +} + +wxListBox * wxMacDataBrowserListControl::GetPeer() const +{ + return wxDynamicCast( wxMacControl::GetPeer() , wxListBox ); +} + +wxClientDataType wxMacDataBrowserListControl::GetClientDataType() const +{ + return m_clientDataItemsType; +} +void wxMacDataBrowserListControl::SetClientDataType(wxClientDataType clientDataItemsType) +{ + m_clientDataItemsType = clientDataItemsType; } -void wxListBox::MacScrollTo( int n ) +unsigned int wxMacDataBrowserListControl::MacGetCount() const { - UInt32 id = n + 1 ; - verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ; + return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState); } -#if !TARGET_API_MAC_OSX +void wxMacDataBrowserListControl::MacDelete( unsigned int n ) +{ + wxMacListBoxItem* item = (wxMacListBoxItem*)GetItemFromLine( n ); + RemoveItem( wxMacDataBrowserRootContainer, item ); +} -void wxListBox::OnChar(wxKeyEvent& event) +void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxString& text) { - // todo trigger proper events here - event.Skip() ; - return ; + wxMacListBoxItem* newItem = CreateItem(); + newItem->SetLabel( text ); - if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER) + if ( !m_stringSorted ) { - wxWindow* parent = GetParent() ; - while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) - parent = parent->GetParent() ; + // 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 ); + } - if ( parent && parent->GetDefaultItem() ) + SInt32 frontLineOrder = 0; + if ( n > 0 ) { - wxButton *def = wxDynamicCast(parent->GetDefaultItem(), - wxButton); - if ( def && def->IsEnabled() ) - { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); - return ; - } + wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(n-1); + frontLineOrder = iter->GetOrder(); } - event.Skip() ; + newItem->SetOrder( frontLineOrder + 1 ); } - /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ - else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) ) + + AddItem( wxMacDataBrowserRootContainer, newItem ); +} + +void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxArrayString& items) +{ + size_t itemsCount = items.GetCount(); + if ( itemsCount == 0 ) + return; + + SInt32 frontLineOrder = 0; + + if ( !m_stringSorted ) { - // FIXME: look in ancestors, not just parent. - wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ; - if (win) + // 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 ) { - wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); - new_event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( new_event ); - } + wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(n-1); + frontLineOrder = iter->GetOrder(); + } } - else if ( event.GetKeyCode() == WXK_TAB ) + + wxArrayMacDataItemPtr ids; + ids.SetCount( itemsCount ); + + for ( unsigned int i = 0; i < itemsCount; ++i ) { - 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() ; + wxMacListBoxItem* item = CreateItem(); + item->SetLabel( items[i]); + if ( !m_stringSorted ) + item->SetOrder( frontLineOrder + 1 + i ); + + ids[i] = item; } - else if ( event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_UP ) - { - // perform the default key handling first - wxControl::OnKeyDown( event ) ; - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); - event.SetEventObject( this ); + AddItems( wxMacDataBrowserRootContainer, ids ); +} - 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) ); - } +int wxMacDataBrowserListControl::MacAppend( const wxString& text) +{ + wxMacListBoxItem* item = CreateItem(); + item->SetLabel( text ); + if ( !m_stringSorted ) + { + unsigned int lines = MacGetCount(); + if ( lines == 0 ) + item->SetOrder( 1 ); else { - n = -1; + wxMacListBoxItem* frontItem = (wxMacListBoxItem*) GetItemFromLine(lines-1); + item->SetOrder( frontItem->GetOrder() + 1 ); } + } + AddItem( wxMacDataBrowserRootContainer, item ); + + return GetLineFromItem(item); +} + +void wxMacDataBrowserListControl::MacClear() +{ + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + RemoveAllItems(wxMacDataBrowserRootContainer); +} + +void wxMacDataBrowserListControl::MacDeselectAll() +{ + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + SetSelectedAllItems( kDataBrowserItemsRemove ); +} - event.SetInt(n); +void wxMacDataBrowserListControl::MacSetSelection( unsigned int n, bool select ) +{ + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine(n); + wxMacDataItemBrowserSelectionSuppressor suppressor(this); - GetEventHandler()->ProcessEvent(event); + if ( IsItemSelected( item ) != select ) + { + if ( select ) + SetSelectedItem( item, GetPeer()->HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ); + else + SetSelectedItem( item, kDataBrowserItemsRemove ); } - else + + MacScrollTo( n ); +} + +bool wxMacDataBrowserListControl::MacIsSelected( unsigned int n ) const +{ + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine(n); + return IsItemSelected( item ); +} + +int wxMacDataBrowserListControl::MacGetSelection() const +{ + wxMacDataItemPtr first, last; + GetSelectionAnchor( &first, &last ); + + if ( first != NULL ) { - 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 ); + return GetLineFromItem( first ); + } - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject( line ) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(line) ); - event.SetString( GetString(line) ); + return -1; +} - event.SetInt(line); +int wxMacDataBrowserListControl::MacGetSelections( wxArrayInt& aSelections ) const +{ + aSelections.Empty(); + wxArrayMacDataItemPtr selectedItems; + GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems); - GetEventHandler()->ProcessEvent(event); - } - } + int count = selectedItems.GetCount(); + + for ( int i = 0; i < count; ++i) + { + aSelections.Add(GetLineFromItem(selectedItems[i])); } + + return count; +} + +void wxMacDataBrowserListControl::MacSetString( unsigned int n, const wxString& text ) +{ + // 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 ); +} + +wxString wxMacDataBrowserListControl::MacGetString( unsigned int n ) const +{ + wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n ); + return item->GetLabel(); +} + +void wxMacDataBrowserListControl::MacSetClientData( unsigned int n, void * data) +{ + wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine( n); + item->SetData( data ); + // not displayed, therefore no Update infos to DataBrowser +} + +void * wxMacDataBrowserListControl::MacGetClientData( unsigned int n) const +{ + wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n ); + return item->GetData(); +} + +void wxMacDataBrowserListControl::MacScrollTo( unsigned int n ) +{ + RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting ); } -#endif // !TARGET_API_MAC_OSX +#if 0 + +// in case we need that one day + +// ============================================================================ +// HIView owner-draw-based implementation +// ============================================================================ + +static pascal void ListBoxDrawProc( + ControlRef browser, DataBrowserItemID item, DataBrowserPropertyID property, + DataBrowserItemState itemState, const Rect *itemRect, SInt16 depth, Boolean isColorDevice ) +{ + CFStringRef cfString; + ThemeDrawingState themeState; + long systemVersion; + + GetThemeDrawingState( &themeState ); + cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item ); + + // In this sample we handle the "selected" state; all others fall through to our "active" state + if ( itemState == kDataBrowserItemIsSelected ) + { + 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 ); + } + + DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL ); + SetThemeDrawingState( themeState, true ); + + if ( cfString != NULL ) + CFRelease( cfString ); +} #endif + +#endif // wxUSE_LISTBOX