#if wxUSE_LISTBOX
-#include "wx/app.h"
#include "wx/listbox.h"
-#include "wx/checklst.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)
END_EVENT_TABLE()
#include "wx/mac/uma.h"
-
-// common interface for all implementations
-class wxMacListControl : public wxMacControl
-{
-public :
- wxMacListControl( wxListBox *peer ) :
- wxMacControl( peer )
- {
- }
- ~wxMacListControl()
- {
-
- }
-
- virtual void UpdateLine( int n ) = 0;
-
- virtual void MacDelete( int n ) = 0;
- virtual void MacInsert( int n , const wxString& item)= 0;
- virtual void MacInsert( int n , const wxArrayString& items)= 0;
- virtual void MacAppend( const wxString& item)= 0;
- virtual void MacSet( int n , const wxString& item )= 0;
- virtual void MacClear()= 0;
- virtual void MacDeselectAll()= 0;
- virtual void MacSetSelection( int n , bool select )= 0;
- virtual int MacGetSelection() const= 0;
- virtual int MacGetSelections(wxArrayInt& aSelections) const= 0;
- virtual bool MacIsSelected( int n ) const= 0;
- virtual void MacScrollTo( int n )= 0;
-
- wxListBox* GetPeer() const
- {
- return (wxListBox*) m_peer;
- }
-};
-
-#if 0
-// In case we have to replace data browser ...
-// custom HIView based implementation
-
-class wxMacCustomHIViewListControl : public wxMacListControl
-{
-public :
- wxMacCustomHIViewListControl( wxListBox *peer , const wxPoint& pos, const wxSize& size, long style );
- ~wxMacCustomHIViewListControl();
-
- void MacDelete( int n );
- void MacInsert( int n , const wxString& item);
- void MacInsert( int n , const wxArrayString& items);
- void MacAppend( const wxString& item);
- void MacSet( int n , const wxString& item );
- void MacClear();
- void MacDeselectAll();
- void MacSetSelection( int n , bool select );
- int MacGetSelection() const;
- int MacGetSelections(wxArrayInt& aSelections) const;
- bool MacIsSelected( int n ) const;
- void MacScrollTo( int n );
-};
-#endif
-
-// data browser based implementation
-
-class wxMacDataBrowserListControl : public wxMacListControl
-{
-public :
- wxMacDataBrowserListControl( wxListBox *peer , const wxPoint& pos, const wxSize& size, long style );
- ~wxMacDataBrowserListControl();
-
- void UpdateLine( int n );
-
- void MacDelete( int n );
- void MacInsert( int n , const wxString& item);
- void MacInsert( int n , const wxArrayString& items);
- void MacAppend( const wxString& item);
- void MacSet( int n , const wxString& item );
- void MacClear();
- void MacDeselectAll();
- void MacSetSelection( int n , bool select );
- int MacGetSelection() const;
- int MacGetSelections(wxArrayInt& aSelections) const;
- bool MacIsSelected( int n ) const;
- void MacScrollTo( int n );
-
- virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags );
- virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
- DataBrowserTableViewColumnIndex position );
- virtual OSStatus AutoSizeListViewColumns();
- virtual OSStatus SetHasScrollBars( bool horiz , bool vert );
- virtual OSStatus SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );
- virtual OSStatus SetListViewHeaderBtnHeight(UInt16 height);
- virtual OSStatus SetCallbacks(const DataBrowserCallbacks * callbacks);
- virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty,
- DataBrowserPropertyID propertyID );
- virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty );
- virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty );
- virtual OSStatus RevealItem( DataBrowserItemID item,
- DataBrowserPropertyID propertyID,
- DataBrowserRevealOptions options );
- virtual OSStatus GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last ) const;
- virtual bool IsItemSelected( DataBrowserItemID item ) const;
- virtual OSStatus SetSelectedItems(UInt32 numItems,
- const DataBrowserItemID * items,
- DataBrowserSetOption operation );
-
-private :
- // as we are getting the same events for human and API selection we have to suppress
- // events in the latter case
- bool MacSuppressSelection( bool suppress );
- bool MacIsSelectionSuppressed() const { return m_suppressSelection; }
- bool m_suppressSelection;
-
-#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
-};
+#include "wx/dynarray.h"
// ============================================================================
-// data browser based implementation
+// list box control implementation
// ============================================================================
-const short kTextColumnId = 1024;
-const short kCheckboxColumnId = 1025;
-
-// 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;
-
-#if TARGET_API_MAC_OSX
-pascal void wxMacDataBrowserListControl::DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
- DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
-#else
-pascal void wxMacDataBrowserListControl::DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
- DataBrowserItemNotification message)
-#endif
+wxListBox::wxListBox()
{
- long ref = GetControlReference( browser );
- if ( ref )
- {
- wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox );
- wxMacDataBrowserListControl* peer = (wxMacDataBrowserListControl*) list->GetPeer();
-
- int i = itemID - 1;
- if (i >= 0 && i < (int)list->GetCount() )
- {
- bool trigger = false;
- wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
- switch ( message )
- {
- case kDataBrowserItemDeselected :
- if ( list->HasMultipleSelection() )
- trigger = !peer->MacIsSelectionSuppressed();
- break;
-
- case kDataBrowserItemSelected :
- trigger = !peer->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;
-
- long ref = GetControlReference( browser );
-
- if ( ! changeValue )
- {
- wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox );
- bool isCheckList = false;
- if ( list)
- isCheckList = list->IsKindOf( CLASSINFO(wxCheckListBox));
-
- switch (property)
- {
- case kTextColumnId:
- {
- if ( ref )
- {
- int i = itemID - 1;
- if (i >= 0 && i < (int)list->GetCount() )
- {
- wxMacCFStringHolder cf( list->GetString( i ) , list->GetFont().GetEncoding() );
- verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) );
- err = noErr;
- }
- }
- }
- break;
-
- case kCheckboxColumnId :
- {
- if ( ref )
- {
- wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox );
- int i = itemID - 1;
- if (i >= 0 && (unsigned int) i < list->GetCount() )
- {
- verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) );
- err = noErr;
- }
- }
- }
- break;
- case kDataBrowserItemIsEditableProperty:
- {
- if ( isCheckList )
- err = ::SetDataBrowserItemDataBooleanValue(itemData, true);
- }
- break;
-
- default:
- break;
- }
- }
- else
- {
- switch( property )
- {
- case kCheckboxColumnId :
- {
- if ( ref )
- {
- wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox );
- int i = itemID - 1;
- if (i >= 0 && (unsigned int)i < list->GetCount() )
- {
- // we have to change this behind the back, since Check() would be triggering another update round
- bool newVal = !list->IsChecked( i );
- verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , newVal ? kThemeButtonOn : kThemeButtonOff ) );
- err = noErr;
- list->m_checks[ i ] = newVal;
-
- wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
- event.SetInt(i);
- event.SetEventObject(list);
- list->GetEventHandler()->ProcessEvent(event);
- }
- }
-
- }
- break;
-
- default :
- break;
- }
- }
+ wxCArrayString chs(choices);
- return err;
+ return Create(
+ parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name );
}
-wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer , const wxPoint& pos, const wxSize& size, long style) :
- wxMacListControl( peer )
+wxMacListControl* wxListBox::GetPeer() const
{
- bool isCheckList = peer->IsKindOf( CLASSINFO(wxCheckListBox));
-
- m_suppressSelection = false;
- Rect bounds = wxMacGetBoundsForControl( peer , pos , size );
- verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(peer->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , &m_controlRef ) );
-
- DataBrowserSelectionFlags options = kDataBrowserDragSelect;
- if ( style & wxLB_MULTIPLE )
- {
- options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ;
- }
- else if ( style & wxLB_EXTENDED )
- {
- // default behaviour
- }
- else
- {
- options += kDataBrowserSelectOnlyOne;
- }
- verify_noerr(SetSelectionFlags( options ) );
-
- if ( gDataBrowserItemDataUPP == NULL ) gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
- if ( gDataBrowserItemNotificationUPP == NULL )
- {
- gDataBrowserItemNotificationUPP =
-#if TARGET_API_MAC_OSX
- (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);
-#else
- NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc);
-#endif
- }
-
- DataBrowserCallbacks callbacks;
- InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks );
+ return dynamic_cast<wxMacListControl*>(m_peer);
+}
- callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
- callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
- SetCallbacks( &callbacks);
-
- DataBrowserListViewColumnDesc columnDesc;
- columnDesc.headerBtnDesc.titleOffset = 0;
- columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+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;
- columnDesc.headerBtnDesc.btnFontStyle.flags =
- kControlUseFontMask | kControlUseJustMask;
+ wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+ wxT("only a single listbox selection mode can be specified") );
- columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
- columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
- columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
- columnDesc.headerBtnDesc.btnFontStyle.style = normal;
- columnDesc.headerBtnDesc.titleString = NULL;
+ if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+ return false;
- if( isCheckList )
- {
- columnDesc.headerBtnDesc.minimumWidth = 30;
- columnDesc.headerBtnDesc.maximumWidth = 30;
-
- columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
- columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
- columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
- kDataBrowserDefaultPropertyFlags;
- verify_noerr(AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) );
- }
-
- columnDesc.headerBtnDesc.minimumWidth = 0;
- columnDesc.headerBtnDesc.maximumWidth = 10000;
+ wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style );
+ control->SetClientDataType( m_clientDataItemsType );
+ m_peer = control;
+ MacPostControlCreate( pos, size );
- columnDesc.propertyDesc.propertyID = kTextColumnId;
- columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
- 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(AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) );
- verify_noerr(AutoSizeListViewColumns() );
- verify_noerr(SetHasScrollBars(false , true ) );
- verify_noerr(SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) );
- verify_noerr(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
-}
-wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
-{
-
+ return true;
}
-void wxMacDataBrowserListControl::MacDelete( int n )
+wxListBox::~wxListBox()
{
- wxArrayInt selectionBefore;
- MacGetSelections( selectionBefore );
-
- UInt32 id = GetPeer()->GetCount()+1;
- verify_noerr( RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) );
- for ( size_t i = 0; i < selectionBefore.GetCount(); ++i )
- {
- int current = selectionBefore[i];
- if ( current == n )
- {
- // selection was deleted
- MacSetSelection( current , false );
- }
- else if ( current > n )
- {
- // something behind the deleted item was selected -> move up
- MacSetSelection( current - 1 , true );
- MacSetSelection( current , false );
- }
- }
- // refresh all
- verify_noerr( UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) );
+ FreeData();
+ m_peer->SetReference( 0 );
}
-void wxMacDataBrowserListControl::MacInsert( int n , const wxString& text)
+void wxListBox::FreeData()
{
- wxArrayInt selectionBefore;
- MacGetSelections( selectionBefore );
-
- UInt32 id = GetPeer()->GetCount(); // this has already been increased
- verify_noerr( AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) );
-
- for ( int i = selectionBefore.GetCount()-1; i >= 0; --i )
- {
- int current = selectionBefore[i];
- if ( current >= n )
- {
- MacSetSelection( current + 1 , true );
- MacSetSelection( current , false );
- }
- }
-
- // refresh all
- verify_noerr( UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) );
+ GetPeer()->MacClear();
}
-void wxMacDataBrowserListControl::MacInsert( int n , const wxArrayString& items)
+void wxListBox::DoSetFirstItem(int n)
{
- wxArrayInt selectionBefore;
- MacGetSelections( selectionBefore );
- size_t itemsCount = items.GetCount();
-
- UInt32 *ids = new UInt32[itemsCount];
- for ( unsigned int i = 0; i < itemsCount;++i )
- ids[i] = GetPeer()->GetCount() - itemsCount + i + 1;
-
- verify_noerr( AddItems( kDataBrowserNoItem , itemsCount , ids , kDataBrowserItemNoProperty ) );
- delete[] ids;
-
- for ( int i = selectionBefore.GetCount()-1; i >= 0; --i )
- {
- int current = selectionBefore[i];
- if ( current >= n )
- {
- MacSetSelection( current + 1 , true );
- MacSetSelection( current , false );
- }
- }
-
- // refresh all
- verify_noerr( UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) );
+ GetPeer()->MacScrollTo( n );
}
-void wxMacDataBrowserListControl::MacAppend( const wxString& text)
+void wxListBox::EnsureVisible(int n)
{
- UInt32 id = GetPeer()->GetCount(); // this has already been increased
- verify_noerr( AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) );
- // no need to deal with selections nor refreshed, as we have appended
+ GetPeer()->MacScrollTo( n );
}
-void wxMacDataBrowserListControl::MacClear()
+void wxListBox::Delete(unsigned int n)
{
- verify_noerr( RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) );
-}
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") );
-void wxMacDataBrowserListControl::MacDeselectAll()
-{
- bool former = MacSuppressSelection( true );
- verify_noerr(SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) );
- MacSuppressSelection( former );
+ GetPeer()->MacDelete( n );
}
-void wxMacDataBrowserListControl::MacSetSelection( int n , bool select )
+int wxListBox::DoAppend(const wxString& item)
{
- bool former = MacSuppressSelection( true );
- UInt32 id = n + 1;
+ InvalidateBestSize();
- if ( IsItemSelected( id ) != select )
- {
- if ( select )
- verify_noerr(SetSelectedItems( 1 , & id , GetPeer()->HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) );
- else
- verify_noerr(SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) );
- }
- MacScrollTo( n );
- MacSuppressSelection( former );
+ return GetPeer()->MacAppend( item );
}
-bool wxMacDataBrowserListControl::MacSuppressSelection( bool suppress )
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
{
- bool former = m_suppressSelection;
- m_suppressSelection = suppress;
- return former;
-}
+ Clear();
-bool wxMacDataBrowserListControl::MacIsSelected( int n ) const
-{
- return IsItemSelected( n + 1 );
-}
+ unsigned int n = choices.GetCount();
-int wxMacDataBrowserListControl::MacGetSelection() const
-{
- for ( unsigned int i = 0; i < GetPeer()->GetCount(); ++i )
+ for ( size_t i = 0; i < n; ++i )
{
- if ( IsItemSelected( i + 1 ) )
+ if ( clientData )
{
- return i;
+ Append( choices[i], clientData[i] );
}
+ else
+ Append( choices[i] );
}
- return -1;
+
}
-int wxMacDataBrowserListControl::MacGetSelections( wxArrayInt& aSelections ) const
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
- int no_sel = 0;
-
- aSelections.Empty();
-
- UInt32 first , last;
- GetSelectionAnchor( &first , &last );
- if ( first != kDataBrowserNoItem )
+ for ( size_t i = 0; i < GetCount(); ++ i )
{
- for ( size_t i = first; i <= last; ++i )
- {
- if ( IsItemSelected( i ) )
- {
- aSelections.Add( i - 1 );
- no_sel++;
- }
- }
+ if (s.IsSameAs( GetString( i ), bCase) )
+ return (int)i;
}
- return no_sel;
-}
-void wxMacDataBrowserListControl::MacSet( int n , const wxString& text )
-{
- // as we don't store the strings we only have to issue a redraw
- UInt32 id = n + 1;
- verify_noerr( UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) );
+ return wxNOT_FOUND;
}
-void wxMacDataBrowserListControl::MacScrollTo( int n )
+void wxListBox::Clear()
{
- UInt32 id = n + 1;
- verify_noerr( RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) );
+ FreeData();
}
-void wxMacDataBrowserListControl::UpdateLine( int n )
+void wxListBox::DoSetSelection(int n, bool select)
{
- UInt32 id = n + 1;
- verify_noerr( UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) );
-}
-
-//
-// Databrowser
-//
+ wxCHECK_RET( n == wxNOT_FOUND || IsValid(n),
+ wxT("invalid index in wxListBox::SetSelection") );
-OSStatus wxMacDataBrowserListControl::SetSelectionFlags( DataBrowserSelectionFlags options )
-{
- return SetDataBrowserSelectionFlags( m_controlRef , options );
+ if ( n == wxNOT_FOUND )
+ GetPeer()->MacDeselectAll();
+ else
+ GetPeer()->MacSetSelection( n, select );
}
-OSStatus wxMacDataBrowserListControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
- DataBrowserTableViewColumnIndex position )
+bool wxListBox::IsSelected(int n) const
{
- return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position );
-}
+ wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxListBox::Selected") );
-OSStatus wxMacDataBrowserListControl::AutoSizeListViewColumns()
-{
- return AutoSizeDataBrowserListViewColumns(m_controlRef);
+ return GetPeer()->MacIsSelected( n );
}
-OSStatus wxMacDataBrowserListControl::SetHasScrollBars( bool horiz , bool vert )
+void *wxListBox::DoGetItemClientData(unsigned int n) const
{
- return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert );
+ wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+ return GetPeer()->MacGetClientData( n );
}
-OSStatus wxMacDataBrowserListControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const
{
- return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle );
+ return (wxClientData*)DoGetItemClientData( n );
}
-OSStatus wxMacDataBrowserListControl::SetListViewHeaderBtnHeight(UInt16 height)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
{
- return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height );
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
+ GetPeer()->MacSetClientData( n , clientData);
}
-OSStatus wxMacDataBrowserListControl::SetCallbacks(const DataBrowserCallbacks * callbacks)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
- return SetDataBrowserCallbacks( m_controlRef , callbacks );
+ DoSetItemClientData(n, clientData);
}
-OSStatus wxMacDataBrowserListControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty,
- DataBrowserPropertyID propertyID )
+// Return number of selections and an array of selected integers
+int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
- return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID );
+ return GetPeer()->MacGetSelections( aSelections );
}
-bool wxMacDataBrowserListControl::IsItemSelected( DataBrowserItemID item ) const
+// Get single selection, for single choice list items
+int wxListBox::GetSelection() const
{
- return IsDataBrowserItemSelected( m_controlRef , item );
+ return GetPeer()->MacGetSelection();
}
-OSStatus wxMacDataBrowserListControl::AddItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty )
+// Find string for position
+wxString wxListBox::GetString(unsigned int n) const
{
- return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty );
+ wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") );
+ return GetPeer()->MacGetString(n);
}
-OSStatus wxMacDataBrowserListControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
- const DataBrowserItemID* items,
- DataBrowserPropertyID preSortProperty )
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
{
- return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty );
-}
+ wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") );
-OSStatus wxMacDataBrowserListControl::RevealItem( DataBrowserItemID item,
- DataBrowserPropertyID propertyID,
- DataBrowserRevealOptions options )
-{
- return RevealDataBrowserItem( m_controlRef , item , propertyID , options );
-}
+ InvalidateBestSize();
-OSStatus wxMacDataBrowserListControl::SetSelectedItems(UInt32 numItems,
- const DataBrowserItemID * items,
- DataBrowserSetOption operation )
-{
- return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation );
+ GetPeer()->MacInsert( pos, items );
}
-OSStatus wxMacDataBrowserListControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last ) const
+void wxListBox::SetString(unsigned int n, const wxString& s)
{
- return GetDataBrowserSelectionAnchor( m_controlRef , first , last );
+ GetPeer()->MacSetString( n, s );
}
-#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 )
+wxSize wxListBox::DoGetBestSize() const
{
- CFStringRef cfString;
- ThemeDrawingState themeState;
- long systemVersion;
-
- GetThemeDrawingState( &themeState );
- cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
+ int lbWidth = 100; // some defaults
+ int lbHeight = 110;
+ int wLine;
- // In this sample we handle the "selected" state; all others fall through to our "active" state
- if ( itemState == kDataBrowserItemIsSelected )
{
- ThemeBrush colorBrushID;
-
- Gestalt( gestaltSystemVersion, &systemVersion );
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
- // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor is incorporated
- // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting
- if ( (systemVersion >= 0x00001030) && !IsControlActive( browser ) )
- colorBrushID = kThemeBrushSecondaryHighlightColor;
+ // TODO: clean this up
+ if ( m_font.Ok() )
+ {
+ ::TextFont( m_font.MacGetFontNum() );
+ ::TextSize( m_font.MacGetFontSize() );
+ ::TextFace( m_font.MacGetFontStyle() );
+ }
else
- colorBrushID = kThemeBrushPrimaryHighlightColor;
+ {
+ ::TextFont( kFontIDMonaco );
+ ::TextSize( 9 );
+ ::TextFace( 0 );
+ }
- // First paint the hilite rect, then the text on top
- SetThemePen( colorBrushID, 32, true );
- PaintRect( itemRect );
- SetThemeDrawingState( themeState , false );
- }
+ // Find the widest line
+ for (unsigned int i = 0; i < GetCount(); i++)
+ {
+ wxString str( GetString( i ) );
- DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
- SetThemeDrawingState( themeState , true );
+#if wxUSE_UNICODE
+ Point bounds = {0, 0};
+ SInt16 baseline;
- if ( cfString != NULL )
- CFRelease( cfString );
-}
+ // 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 );
+ }
-// ============================================================================
-// list box control implementation
-// ============================================================================
+ // Add room for the scrollbar
+ lbWidth += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X );
-wxListBox::wxListBox()
+ // 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 );
+ }
+
+ return wxSize( lbWidth, lbHeight );
+}
+
+unsigned int wxListBox::GetCount() const
{
- m_noItems = 0;
+ return GetPeer()->MacGetCount();
}
-bool wxListBox::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- const wxArrayString& choices,
- long style,
- const wxValidator& validator,
- const wxString& name)
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
- wxCArrayString chs(choices);
+ 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 Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
- style, validator, name);
+ return attr;
}
-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)
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
{
- m_macIsUserPane = false;
+ OSStatus err;
- wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
- _T("only one of listbox selection modes can be specified") );
+ // 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
- if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
- return false;
+ 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"));
- m_noItems = 0; // this will be increased by our append command
+ // these indices are 0-based, as usual, so we need to add 1 to them when
+ // passing them to data browser functions which use 1-based indices
+ int low = scrolly / height,
+ high = GetCount() - 1;
+
+ // search for the first visible item (note that the scroll guess above
+ // is the low bounds of where the item might lie so we only use that as a
+ // starting point - we should reach it within 1 or 2 iterations of the loop)
+ while ( low <= high )
+ {
+ Rect bounds;
+ err = GetDataBrowserItemPartBounds(
+ m_peer->GetControlRef(), low + 1, colId,
+ kDataBrowserPropertyEnclosingPart,
+ &bounds); // note +1 to translate to Mac ID
+ if ( err == noErr )
+ break;
+
+ // errDataBrowserItemNotFound is expected as it simply means that the
+ // item is not currently visible -- but other errors are not
+ wxCHECK_MSG( err == errDataBrowserItemNotFound, wxNOT_FOUND,
+ wxT("Unexpected error from GetDataBrowserItemPartBounds") );
- m_peer = CreateMacListControl(pos , size , style );
+ low++;
+ }
- MacPostControlCreate(pos,size);
+ // 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") );
- InsertItems( n , choices , 0 );
+ 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;
+ }
- SetBestSize(size); // Needed because it is a wxControlWithItems
+ if ( point.y < bounds.top )
+ // index(bounds) greater then key(point)
+ high = mid - 1;
+ else
+ // index(bounds) less then key(point)
+ low = mid + 1;
+ }
+ }
- return TRUE;
+ return wxNOT_FOUND;
}
-wxListBox::~wxListBox()
+// ============================================================================
+// data browser based implementation
+// ============================================================================
+
+const short kTextColumnId = 1024;
+const short kNumericOrderColumnId = 1025;
+
+wxMacListBoxItem::wxMacListBoxItem()
{
- m_peer->SetReference( 0 );
- FreeData();
+ m_data = NULL;
+ m_order = 0;
}
-wxMacListControl* wxListBox::CreateMacListControl(const wxPoint& pos, const wxSize& size, long style)
+wxMacListBoxItem::~wxMacListBoxItem()
{
- return new wxMacDataBrowserListControl(this , pos , size , style );
}
-void wxListBox::FreeData()
+void wxMacListBoxItem::SetOrder( SInt32 order )
{
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
- {
- size_t uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
- m_aItems[uiCount] = NULL;
- }
+ m_order = order;
+}
- m_aItems.Clear();
- }
- else
-#endif // wxUSE_OWNER_DRAWN
- if ( HasClientObjectData() )
- {
- for ( unsigned int n = 0; n < m_noItems; n++ )
- {
- delete GetClientObject( n );
- }
- }
+SInt32 wxMacListBoxItem::GetOrder() const
+{
+ return m_order;
}
-void wxListBox::DoSetSize(int x, int y,
- int width, int height,
- int sizeFlags )
+void wxMacListBoxItem::SetData( void* data)
{
- wxControl::DoSetSize( x , y , width , height , sizeFlags );
+ m_data = data;
}
-void wxListBox::DoSetFirstItem(int n)
+void* wxMacListBoxItem::GetData() const
{
- GetPeer()->MacScrollTo( n );
+ return m_data;
}
-void wxListBox::Delete(unsigned int n)
+void wxMacListBoxItem::SetLabel( const wxString& str)
{
- wxCHECK_RET( IsValid(n),
- wxT("invalid index in wxListBox::Delete") );
-
-#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.RemoveAt( n );
- m_dataArray.RemoveAt( n );
- m_noItems --;
+ m_label = str;
+ m_cfLabel.Assign( str , wxLocale::GetSystemEncoding());
+}
- GetPeer()->MacDelete( n );
+const wxString& wxMacListBoxItem::GetLabel() const
+{
+ return m_label;
}
-int wxListBox::DoAppend(const wxString& item)
+bool wxMacListBoxItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
+ const wxMacDataItem* rhs,
+ DataBrowserPropertyID sortProperty) const
{
- InvalidateBestSize();
+ const wxMacListBoxItem* otherItem = dynamic_cast<const wxMacListBoxItem*>(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;
- unsigned int index = m_noItems;
- m_stringArray.Add( item );
- m_dataArray.Add( NULL );
- m_noItems++;
- DoSetItemClientData( index , NULL );
- GetPeer()->MacAppend( item );
+ default:
+ break;
+ };
- return index;
+ return retval;
}
-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+OSStatus wxMacListBoxItem::GetSetData( wxMacDataItemBrowserControl *owner ,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ bool changeValue )
{
- Clear();
- unsigned int n = choices.GetCount();
+ OSStatus err = errDataBrowserPropertyNotSupported;
+ wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
+ wxCHECK_MSG( list != NULL , errDataBrowserPropertyNotSupported , wxT("Listbox expected"));
- for ( size_t i = 0; i < n; ++i )
+ if ( !changeValue )
{
- if ( clientData )
+ switch (property)
{
-#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] );
- }
+ case kTextColumnId:
+ err = ::SetDataBrowserItemDataText( itemData, m_cfLabel );
+ err = noErr;
+ break;
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- // first delete old items
- size_t ui = m_aItems.Count();
- while ( ui-- != 0 ) {
- delete m_aItems[ui];
- m_aItems[ui] = NULL;
- }
- m_aItems.Empty();
+ case kNumericOrderColumnId:
+ err = ::SetDataBrowserItemDataValue( itemData, m_order );
+ err = noErr;
+ break;
- // 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);
+ default:
+ break;
+ }
+ }
+ else
+ {
+ switch (property)
+ {
+ // no editable props here
+ default:
+ break;
}
}
-#endif // wxUSE_OWNER_DRAWN
+
+ return err;
}
-int wxListBox::FindString(const wxString& s, bool bCase) const
+void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData ) const
{
- for ( size_t i = 0; i < m_noItems; ++ i )
+ wxMacDataBrowserListControl *lb = dynamic_cast<wxMacDataBrowserListControl*>(owner);
+
+ // we want to depend on as little as possible to make sure tear-down of controls is safe
+
+ if ( message == kDataBrowserItemRemoved)
{
- if (s.IsSameAs(GetString(i), bCase))
- return (int)i;
+ if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )
+ {
+ delete (wxClientData*) (m_data);
+ }
+
+ delete this;
+ return;
}
- return wxNOT_FOUND;
-}
+ wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
+ wxCHECK_RET( list != NULL , wxT("Listbox expected"));
-void wxListBox::Clear()
-{
- FreeData();
- m_noItems = 0;
- m_stringArray.Empty();
- m_dataArray.Empty();
- GetPeer()->MacClear();
+ 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::DoSetSelection(int n, bool select)
+wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style)
+ : wxMacDataItemBrowserControl( peer, pos, size, style )
{
- wxCHECK_RET( n == wxNOT_FOUND || IsValid(n) ,
- wxT("invalid index in wxListBox::SetSelection") );
+ OSStatus err = noErr;
+ m_clientDataItemsType = wxClientData_None;
+ m_stringSorted = style & wxLB_SORT;
- if ( n == wxNOT_FOUND )
- GetPeer()->MacDeselectAll();
+ DataBrowserSelectionFlags options = kDataBrowserDragSelect;
+ if ( style & wxLB_MULTIPLE )
+ {
+ options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
+ }
+ else if ( style & wxLB_EXTENDED )
+ {
+ // default behaviour
+ }
else
- GetPeer()->MacSetSelection( n , select );
-}
+ {
+ options |= kDataBrowserSelectOnlyOne;
+ }
+ err = SetSelectionFlags( options );
+ verify_noerr( err );
-bool wxListBox::IsSelected(int n) const
-{
- wxCHECK_MSG( IsValid(n), false,
- wxT("invalid index in wxListBox::Selected") );
+ DataBrowserListViewColumnDesc columnDesc;
+ columnDesc.headerBtnDesc.titleOffset = 0;
+ columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
- return GetPeer()->MacIsSelected( n );
-}
+ columnDesc.headerBtnDesc.btnFontStyle.flags =
+ kControlUseFontMask | kControlUseJustMask;
-void *wxListBox::DoGetItemClientData(unsigned int n) const
-{
- wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+ columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+ columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+ columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+ columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+ columnDesc.headerBtnDesc.titleString = NULL;
- wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int) n , wxT("invalid client_data array") );
+ columnDesc.headerBtnDesc.minimumWidth = 0;
+ columnDesc.headerBtnDesc.maximumWidth = 10000;
- return (void *)m_dataArray[n];
-}
+ 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
-wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const
-{
- return (wxClientData *) DoGetItemClientData( n );
-}
+ verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
-void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
-{
- wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
+ 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 ) );
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
+ SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+ if ( m_stringSorted )
{
- // 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"));
+ SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+ SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
}
-#endif // wxUSE_OWNER_DRAWN
- wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int) n , wxT("invalid client_data array") );
-
- if ( m_dataArray.GetCount() > (unsigned int) n )
- m_dataArray[n] = (char*)clientData;
else
- m_dataArray.Add( (char*)clientData );
+ {
+ 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::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
+wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
{
- DoSetItemClientData(n, clientData);
}
-// Return number of selections and an array of selected integers
-int wxListBox::GetSelections(wxArrayInt& aSelections) const
+
+wxMacListBoxItem* wxMacDataBrowserListControl::CreateItem()
{
- return GetPeer()->MacGetSelections( aSelections );
+ return new wxMacListBoxItem();
}
-// Get single selection, for single choice list items
-int wxListBox::GetSelection() const
+wxListBox * wxMacDataBrowserListControl::GetPeer() const
{
- return GetPeer()->MacGetSelection();
+ return wxDynamicCast( wxMacControl::GetPeer() , wxListBox );
}
-// Find string for position
-wxString wxListBox::GetString(unsigned int n) const
+wxClientDataType wxMacDataBrowserListControl::GetClientDataType() const
{
- wxCHECK_MSG( IsValid(n), wxEmptyString,
- wxT("invalid index in wxListBox::GetString") );
-
- return m_stringArray[n] ;
+ return m_clientDataItemsType;
}
-
-void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+void wxMacDataBrowserListControl::SetClientDataType(wxClientDataType clientDataItemsType)
{
- wxCHECK_RET( IsValidInsert(pos),
- wxT("invalid index in wxListBox::InsertItems") );
-
- InvalidateBestSize();
-
- unsigned int nItems = items.GetCount();
+ m_clientDataItemsType = clientDataItemsType;
+}
- for ( unsigned int i = 0; i < nItems; i++ )
- m_stringArray.Insert( items[i] , pos+i );
- m_dataArray.Insert( NULL , pos , nItems );
- m_noItems += nItems;
- GetPeer()->MacInsert( pos , items );
+unsigned int wxMacDataBrowserListControl::MacGetCount() const
+{
+ return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState);
}
-void wxListBox::SetString(unsigned int n, const wxString& s)
+void wxMacDataBrowserListControl::MacDelete( unsigned int n )
{
- m_stringArray[n] = s;
- GetPeer()->MacSet( n , s );
+ wxMacListBoxItem* item = (wxMacListBoxItem*)GetItemFromLine( n );
+ RemoveItem( wxMacDataBrowserRootContainer, item );
}
-wxSize wxListBox::DoGetBestSize() const
+void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxString& text)
{
- int lbWidth = 100; // some defaults
- int lbHeight = 110;
- int wLine;
+ wxMacListBoxItem* newItem = CreateItem();
+ newItem->SetLabel( text );
+ if ( !m_stringSorted )
{
- wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
-
- // TODO: clean this up
- if ( m_font.Ok() )
+ // increase the order of the lines to be shifted
+ unsigned int lines = MacGetCount();
+ for ( unsigned int i = n; i < lines; ++i)
{
- ::TextFont( m_font.MacGetFontNum() );
- ::TextSize( m_font.MacGetFontSize() );
- ::TextFace( m_font.MacGetFontStyle() );
+ wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(i);
+ iter->SetOrder( iter->GetOrder() + 1 );
}
- else
+
+ SInt32 frontLineOrder = 0;
+ if ( n > 0 )
{
- ::TextFont( kFontIDMonaco );
- ::TextSize( 9 );
- ::TextFace( 0 );
+ wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(n-1);
+ frontLineOrder = iter->GetOrder();
}
+ newItem->SetOrder( frontLineOrder + 1 );
+ }
- // Find the widest line
- for (unsigned int i = 0; i < GetCount(); i++)
- {
- wxString str(GetString(i));
+ AddItem( wxMacDataBrowserRootContainer, newItem );
+}
-#if wxUSE_UNICODE
- Point bounds = {0, 0};
- SInt16 baseline;
+void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxArrayString& items)
+{
+ size_t itemsCount = items.GetCount();
+ if ( itemsCount == 0 )
+ return;
- // 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
+ SInt32 frontLineOrder = 0;
- lbWidth = wxMax( lbWidth, wLine );
+ 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();
}
+ }
- // Add room for the scrollbar
- lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+ wxArrayMacDataItemPtr ids;
+ ids.SetCount( itemsCount );
- // And just a bit more
- int cy = 12;
- int cx = ::TextWidth( "X" , 0 , 1 );
- lbWidth += cx;
+ for ( unsigned int i = 0; i < itemsCount; ++i )
+ {
+ wxMacListBoxItem* item = CreateItem();
+ item->SetLabel( items[i]);
+ if ( !m_stringSorted )
+ item->SetOrder( frontLineOrder + 1 + i );
- // 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 );
+ ids[i] = item;
}
- return wxSize( lbWidth, lbHeight );
+ AddItems( wxMacDataBrowserRootContainer, ids );
}
-unsigned int wxListBox::GetCount() const
+int wxMacDataBrowserListControl::MacAppend( const wxString& text)
{
- return m_noItems;
+ 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::Refresh(bool eraseBack, const wxRect *rect)
+void wxMacDataBrowserListControl::MacClear()
{
- wxControl::Refresh( eraseBack , rect );
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+ RemoveAllItems(wxMacDataBrowserRootContainer);
}
-void wxListBox::MacUpdateLine( int n)
+void wxMacDataBrowserListControl::MacDeselectAll()
{
- GetPeer()->UpdateLine(n);
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+ SetSelectedAllItems( kDataBrowserItemsRemove );
}
-#if wxUSE_OWNER_DRAWN
-
-class wxListBoxItem : public wxOwnerDrawn
+void wxMacDataBrowserListControl::MacSetSelection( unsigned int n, bool select )
{
-public:
- wxListBoxItem(const wxString& str = "");
-};
+ wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine(n);
+ wxMacDataItemBrowserSelectionSuppressor suppressor(this);
-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
-{
- // no bitmaps/checkmarks
- SetMarginWidth(0);
+ if ( IsItemSelected( item ) != select )
+ {
+ if ( select )
+ SetSelectedItem( item, GetPeer()->HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign );
+ else
+ SetSelectedItem( item, kDataBrowserItemsRemove );
+ }
+
+ MacScrollTo( n );
}
-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+bool wxMacDataBrowserListControl::MacIsSelected( unsigned int n ) const
{
- return new wxListBoxItem();
+ wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine(n);
+ return IsItemSelected( item );
}
-#endif //USE_OWNER_DRAWN
+int wxMacDataBrowserListControl::MacGetSelection() const
+{
+ wxMacDataItemPtr first, last;
+ GetSelectionAnchor( &first, &last );
+ if ( first != NULL )
+ {
+ return GetLineFromItem( first );
+ }
-// Some custom controls depend on this
-/* static */ wxVisualAttributes
-wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+ return -1;
+}
+
+int wxMacDataBrowserListControl::MacGetSelections( wxArrayInt& aSelections ) const
{
- wxVisualAttributes attr;
+ aSelections.Empty();
+ wxArrayMacDataItemPtr selectedItems;
+ GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems);
- attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
- attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
- attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+ int count = selectedItems.GetCount();
- return attr;
+ for ( int i = 0; i < count; ++i)
+ {
+ aSelections.Add(GetLineFromItem(selectedItems[i]));
+ }
+
+ return count;
}
-int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+void wxMacDataBrowserListControl::MacSetString( unsigned int n, const wxString& text )
{
- OSErr 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
+ // 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 );
+}
- 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);
+wxString wxMacDataBrowserListControl::MacGetString( unsigned int n ) const
+{
+ wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n );
+ return item->GetLabel();
+}
- // 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"));
+void wxMacDataBrowserListControl::MacSetClientData( unsigned int n, void * data)
+{
+ wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine( n);
+ item->SetData( data );
+ // not displayed, therefore no Update infos to DataBrowser
+}
- // 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"));
+void * wxMacDataBrowserListControl::MacGetClientData( unsigned int n) const
+{
+ wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n );
+ return item->GetData();
+}
- UInt16 height;
- err = GetDataBrowserTableViewRowHeight(m_peer->GetControlRef(), &height);
- wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewRowHeight"));
+void wxMacDataBrowserListControl::MacScrollTo( unsigned int n )
+{
+ RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting );
+}
- // 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;
+#if 0
+// in case we need that one day
- // 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 trans to mac id
- if ( err == noErr )
- break;
+// ============================================================================
+// HIView owner-draw-based implementation
+// ============================================================================
- // 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") );
+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;
- low++;
- }
+ GetThemeDrawingState( &themeState );
+ cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
- // 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 )
+ // In this sample we handle the "selected" state; all others fall through to our "active" state
+ if ( itemState == kDataBrowserItemIsSelected )
{
- 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") );
+ ThemeBrush colorBrushID;
- if ( err == errDataBrowserItemNotFound )
- {
- // item not visible, attempt to find a visible one
- high = mid - 1; // search lower
- }
- 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) )
- {
- return mid; // found!
- }
+ // 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;
- if ( point.y < bounds.top )
- high = mid - 1; // index(bounds) greater then key(point)
- else
- low = mid + 1; // index(bounds) less then key(point)
- }
+ // First paint the hilite rect, then the text on top
+ SetThemePen( colorBrushID, 32, true );
+ PaintRect( itemRect );
+ SetThemeDrawingState( themeState, false );
}
- return wxNOT_FOUND;
+ DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+ SetThemeDrawingState( themeState, true );
+
+ if ( cfString != NULL )
+ CFRelease( cfString );
}
#endif
+
+
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff