X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..3863c5ebd92650ba88f29db4f5f8d794ec11bf80:/src/mac/carbon/listbox.cpp diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index e17f1b8213..ee803cb958 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -1,517 +1,599 @@ /////////////////////////////////////////////////////////////////////////////// -// 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/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) - EVT_SIZE( wxListBox::OnSize ) END_EVENT_TABLE() -#endif -#include - -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 // ============================================================================ -// Listbox item wxListBox::wxListBox() { - m_noItems = 0; - m_selected = 0; -} - -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 ; - m_macHorizontalBorder = 5 ; // additional pixels around the real control - m_macVerticalBorder = 5 ; - - 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 ) ; - - NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ; - (**m_macList).selFlags = lOnlyOne ; - if ( style & wxLB_MULTIPLE ) - { - (**m_macList).selFlags += lNoExtend ; - } - else if ( style & wxLB_EXTENDED ) - { - (**m_macList).selFlags += lExtendDrag ; - } - 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 ) +{ + wxCArrayString chs(choices); + + return Create( + parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name ); +} + +wxMacListControl* wxListBox::GetPeer() const { -// DisposeExtLDEFInfo( m_macList ) ; + wxMacDataBrowserListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListControl); + return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ; } -void wxListBox::SetFirstItem(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 ) { - MacScrollTo( N ) ; + m_macIsUserPane = false; + + wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED), + wxT("only a single listbox selection mode can be specified") ); + + if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) ) + return false; + + 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; } -void wxListBox::SetFirstItem(const wxString& s) +wxListBox::~wxListBox() { - MacScrollTo( FindString( s ) ) ; + FreeData(); + m_peer->SetReference( 0 ); } -void wxListBox::Delete(int N) +void wxListBox::FreeData() { - m_dataArray.Remove( N ) ; - m_stringArray.Remove( N ) ; - m_noItems --; - - MacDelete( N ) ; + GetPeer()->MacClear(); } -void wxListBox::Append(const wxString& item) +void wxListBox::DoSetFirstItem(int n) { - Append( item , NULL ) ; + GetPeer()->MacScrollTo( n ); } -void wxListBox::Append(const wxString& item, char *Client_data) +void wxListBox::EnsureVisible(int n) { - if( wxApp::s_macDefaultEncodingIsPC ) - { - m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ; - } - else - m_stringArray.Add( item ) ; - m_dataArray.Add( Client_data ) ; - m_noItems ++; - - MacAppend( item ) ; + GetPeer()->MacScrollTo( n ); } -void wxListBox::Set(int n, const wxString *choices, char** clientData) +void wxListBox::DoDeleteOneItem(unsigned int n) { - Clear() ; - for( int i = 0 ; i < n ; ++i ) - { - if ( clientData ) - Append( choices[i] , clientData[0] ) ; - else - Append( choices[i] ) ; - } + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") ); + + GetPeer()->MacDelete( n ); } -int wxListBox::FindString(const wxString& st) const +int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - 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() ; - for ( int i = 0 ; i < m_noItems ; ++ i ) - { - if ( equalstring( m_stringArray[i].Left( len ) , search , false , false ) ) - return i ; - } - } - else - { - for ( int i = 0 ; i < m_noItems ; ++ i ) + InvalidateBestSize(); + + GetPeer()->MacInsert( pos, items ); + const unsigned int count = items.GetCount(); + if ( clientData ) { - if ( equalstring( m_stringArray[i] , s , false , false ) ) - return i ; + for (unsigned int i = 0; i < count; ++i) + AssignNewItemClientData( pos + i, clientData, i, type ); } - } - return -1; + + return pos + count - 1; } -void wxListBox::Clear() +int wxListBox::FindString(const wxString& s, bool bCase) const { - m_noItems = 0; - m_stringArray.Empty() ; - m_dataArray.Empty() ; - MacClear() ; + for ( size_t i = 0; i < GetCount(); ++ i ) + { + if (s.IsSameAs( GetString( i ), bCase) ) + return (int)i; + } + + return wxNOT_FOUND; } -void wxListBox::SetSelection(int N, bool select) +void wxListBox::DoClear() { - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetSelection" ); - MacSetSelection( N , select ) ; + FreeData(); } -bool wxListBox::Selected(int N) const +void wxListBox::DoSetSelection(int n, bool select) { - wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, - "invalid index in wxListBox::Selected" ); + wxCHECK_RET( n == wxNOT_FOUND || IsValid(n), + wxT("invalid index in wxListBox::SetSelection") ); - return MacIsSelected( N ) ; + if ( n == wxNOT_FOUND ) + GetPeer()->MacDeselectAll(); + else + GetPeer()->MacSetSelection( n, select, HasMultipleSelection() ); } -void wxListBox::Deselect(int N) +bool wxListBox::IsSelected(int n) const { - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::Deselect" ); + wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxListBox::Selected") ); - SetSelection( N , false ) ; + return GetPeer()->MacIsSelected( n ); } -char *wxListBox::GetClientData(int N) const +void *wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( N >= 0 && N < m_noItems, NULL, - "invalid index in wxListBox::GetClientData" ); - - return m_dataArray[N]; + wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData")); + return GetPeer()->MacGetClientData( n ); } -void wxListBox::SetClientData(int N, char *Client_data) +void wxListBox::DoSetItemClientData(unsigned int n, void *clientData) { - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetClientData" ); - - m_dataArray[N] = Client_data ; + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") ); + GetPeer()->MacSetClientData( n , clientData); } // Return number of selections and an array of selected integers int wxListBox::GetSelections(wxArrayInt& aSelections) const { - return 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(??); - - return no_sel; - } - else // single-selection listbox - { - aSelections.Add(??); - - return 1; - } -*/ + return GetPeer()->MacGetSelections( aSelections ); } // Get single selection, for single choice list items int wxListBox::GetSelection() const { - return MacGetSelection() ; + return GetPeer()->MacGetSelection(); } // Find string for position -wxString wxListBox::GetString(int N) const +wxString wxListBox::GetString(unsigned int n) const { - if( wxApp::s_macDefaultEncodingIsPC ) - { - return wxMacMakePCStringFromMac( m_stringArray[N] ) ; - } - else - return m_stringArray[N] ; + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") ); + return GetPeer()->MacGetString(n); } -void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +void wxListBox::SetString(unsigned int n, const wxString& s) { - 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] ) ; - } + GetPeer()->MacSetString( n, s ); +} + +wxSize wxListBox::DoGetBestSize() const +{ + int lbWidth = 100; // some defaults + int lbHeight = 110; + int wLine; - m_noItems += nItems; + { + wxClientDC dc(const_cast(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 ); + + // And just a bit more + int cy = 12; + + wxCoord width, height ; + dc.GetTextExtent( wxT("XX") , &width, &height); + int cx = width ; + lbWidth += cx; + + // don't make the listbox too tall (limit height to around 10 items) + // but don't make it too small neither + 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 { - m_stringArray[N] = s ; - MacSet( N , s ) ; + return GetPeer()->MacGetCount(); } -int wxListBox::Number () const +void wxListBox::Refresh(bool eraseBack, const wxRect *rect) { - return m_noItems; + wxControl::Refresh( eraseBack, rect ); } -// For single selection items only -wxString wxListBox::GetStringSelection () const +// Some custom controls depend on this +/* static */ wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - int sel = GetSelection (); - if (sel > -1) - { - return GetString (sel); - } - else - return wxString(""); + 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; } -bool wxListBox::SetStringSelection (const wxString& s, bool flag) +int wxListBox::DoListHitTest(const wxPoint& inpoint) const { - int sel = FindString (s); - if (sel > -1) + 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; + + // 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 ) { - SetSelection (sel, flag); - return TRUE; + 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++; } - else - return FALSE; -} -void wxListBox::Command (wxCommandEvent & event) -{ - if (event.m_extraLong) - SetSelection (event.m_commandInt); - else + // 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 ) { - Deselect (event.m_commandInt); - return; + 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; + } } - ProcessCommand (event); + + 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; + + columnDesc.headerBtnDesc.minimumWidth = 0; + columnDesc.headerBtnDesc.maximumWidth = 10000; - 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.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 /* scrollbar */ - m_macHorizontalBorder * 2 ; - 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); - wxArrayInt aSelections; - int count = GetSelections(aSelections); - if ( count > 0 ) - { - event.m_commandInt = aSelections[0] ; - event.m_clientData = GetClientData(event.m_commandInt); - wxString str(GetString(event.m_commandInt)); - if (str != "") - event.m_commandString = copystring((char *)(const char *)str); - } - else - { - return ; - /* - event.m_commandInt = -1 ; - event.m_commandString = copystring("") ; - */ - } - - event.SetEventObject( this ); - ProcessCommand(event); - if (event.m_commandString) - delete[] event.m_commandString ; -} + CFStringRef cfString; + ThemeDrawingState themeState; + long systemVersion; -void wxListBox::MacDoDoubleClick() -{ - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; + 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 + 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 ); + } + + DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL ); + SetThemeDrawingState( themeState, true ); + + if ( cfString != NULL ) + CFRelease( cfString ); } + +#endif + + +#endif // wxUSE_LISTBOX