#include "wx/app.h"
#include "wx/listbox.h"
+#include "wx/checklst.h"
#include "wx/button.h"
#include "wx/settings.h"
#include "wx/toplevel.h"
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"
-const short kTextColumnId = 1024 ;
+// 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
+
+// DataBrowser-based implementation
-// new databrowserbased version
+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
+};
+
+// ============================================================================
+// data browser based implementation
+// ============================================================================
+
+const short kTextColumnId = 1024;
+const short kCheckboxColumnId = 1025;
+
+// new DataBrowser-based version
// because of the limited insert
// functionality of DataBrowser,
-// we just introduce id s corresponding
+// we just introduce IDs corresponding
// to the line number
-DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ;
-DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ;
-DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ;
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL;
#if TARGET_API_MAC_OSX
-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
- DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
+pascal void wxMacDataBrowserListControl::DataBrowserItemNotificationProc(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef itemData )
#else
-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
- DataBrowserItemNotification message)
+pascal void wxMacDataBrowserListControl::DataBrowserItemNotificationProc(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserItemNotification message )
#endif
{
- long ref = GetControlReference( browser ) ;
- if ( ref )
+ long ref = GetControlReference( browser );
+ if ( ref != 0 )
{
- wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
- int i = itemID - 1 ;
- if (i >= 0 && i < list->GetCount() )
+ 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 )
+ bool trigger = false;
+ wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+ switch (message)
{
- case kDataBrowserItemDeselected :
+ 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 ;
+ 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) );
+ 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 ) ;
+ 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) ;
+ // list->GetEventHandler()->ProcessEvent(event);
}
}
}
}
-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
- DataBrowserItemID itemID, DataBrowserPropertyID property,
- DataBrowserItemDataRef itemData, Boolean changeValue)
+static pascal OSStatus ListBoxGetSetItemData(
+ ControlRef browser,
+ DataBrowserItemID itemID,
+ DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData,
+ Boolean changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported;
- if ( ! changeValue )
+ 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:
- {
- long ref = GetControlReference( browser ) ;
- if ( ref )
+ if ( ref != 0 )
{
- wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
- int i = itemID - 1 ;
- if (i >= 0 && i < list->GetCount() )
+ 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 ;
+ wxMacCFStringHolder cf( list->GetString( i ), list->GetFont().GetEncoding() );
+ err = ::SetDataBrowserItemDataText( itemData, cf );
+ verify_noerr( err );
+ err = noErr;
}
}
- }
- break;
+ break;
- default:
+ case kCheckboxColumnId:
+ if ( ref != 0 )
+ {
+ wxCheckListBox *list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
+ int i = itemID - 1;
+ if (i >= 0 && (unsigned int) i < list->GetCount())
+ {
+ err = ::SetDataBrowserItemDataButtonValue( itemData, list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff );
+ verify_noerr( err );
+ err = noErr;
+ }
+ }
+ break;
- break;
+ case kDataBrowserItemIsEditableProperty:
+ if ( isCheckList )
+ err = ::SetDataBrowserItemDataBooleanValue( itemData, true );
+ 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
+ else
{
- 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 );
+ switch (property)
+ {
+ case kCheckboxColumnId:
+ if ( ref != 0 )
+ {
+ 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 );
+ err = ::SetDataBrowserItemDataButtonValue( itemData, newVal ? kThemeButtonOn : kThemeButtonOff );
+ verify_noerr( err );
+ 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;
- PaintRect( itemRect ); // First paint the hilite rect, then the text on top
- SetThemeDrawingState( themeState , false ) ;
+ default:
+ break;
+ }
}
- DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
- if ( cfString != NULL )
- CFRelease( cfString );
- SetThemeDrawingState( themeState , true ) ;
-}
-
-// Listbox item
-wxListBox::wxListBox()
-{
- m_noItems = 0;
- m_selected = 0;
- m_macList = NULL ;
- m_suppressSelection = false ;
-}
-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);
+ return err;
}
-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)
+wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style)
+ : wxMacListControl( peer )
{
- m_macIsUserPane = FALSE ;
+ bool isCheckList = peer->IsKindOf( CLASSINFO(wxCheckListBox));
- wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
- _T("only one of listbox selection modes can be specified") );
-
- 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;
+ m_suppressSelection = false;
+ Rect bounds = wxMacGetBoundsForControl( peer, pos, size );
+ OSStatus err = ::CreateDataBrowserControl(
+ MAC_WXHWND(peer->MacGetTopLevelWindowRef()),
+ &bounds, kDataBrowserListView, &m_controlRef );
+ verify_noerr( err );
- 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 ;
+ DataBrowserSelectionFlags options = kDataBrowserDragSelect;
if ( style & wxLB_MULTIPLE )
{
- options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ;
+ options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
}
else if ( style & wxLB_EXTENDED )
{
}
else
{
- options += kDataBrowserSelectOnlyOne ;
+ options |= kDataBrowserSelectOnlyOne;
}
- verify_noerr(m_peer->SetSelectionFlags( options ) );
+ err = SetSelectionFlags( options );
+ verify_noerr( err );
- if ( gDataBrowserItemDataUPP == NULL ) gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
+ if ( gDataBrowserItemDataUPP == NULL )
+ gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
if ( gDataBrowserItemNotificationUPP == NULL )
{
gDataBrowserItemNotificationUPP =
#if TARGET_API_MAC_OSX
- (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+ (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);
#else
- NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+ NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc);
#endif
}
- if ( gDataBrowserDrawItemUPP == NULL ) gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;
- DataBrowserCallbacks callbacks ;
- InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;
+ DataBrowserCallbacks callbacks;
+ InitializeDataBrowserCallbacks( &callbacks, kDataBrowserLatestCallbacks );
callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
- m_peer->SetCallbacks( &callbacks);
-
- DataBrowserCustomCallbacks customCallbacks ;
- InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ;
+ SetCallbacks( &callbacks );
- customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;
-
- SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;
-
- DataBrowserListViewColumnDesc columnDesc ;
+ DataBrowserListViewColumnDesc columnDesc;
columnDesc.headerBtnDesc.titleOffset = 0;
columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
- columnDesc.headerBtnDesc.btnFontStyle.flags =
+ columnDesc.headerBtnDesc.btnFontStyle.flags =
kControlUseFontMask | kControlUseJustMask;
columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
- columnDesc.headerBtnDesc.minimumWidth = 0;
- columnDesc.headerBtnDesc.maximumWidth = 10000;
-
columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
columnDesc.headerBtnDesc.btnFontStyle.style = normal;
- columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
+ columnDesc.headerBtnDesc.titleString = NULL;
+
+ if ( isCheckList )
+ {
+ columnDesc.headerBtnDesc.minimumWidth = 30;
+ columnDesc.headerBtnDesc.maximumWidth = 30;
+
+ columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
+ columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
+ columnDesc.propertyDesc.propertyFlags =
+ kDataBrowserPropertyIsMutable
+ | kDataBrowserTableViewSelectionColumn
+ | kDataBrowserDefaultPropertyFlags;
+ err = AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn );
+ verify_noerr( err );
+ }
+
+ columnDesc.headerBtnDesc.minimumWidth = 0;
+ columnDesc.headerBtnDesc.maximumWidth = 10000;
columnDesc.propertyDesc.propertyID = kTextColumnId;
- columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;
- columnDesc.propertyDesc.propertyFlags =
+ columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
- kDataBrowserListViewTypeSelectColumn |
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
#endif
- kDataBrowserTableViewSelectionColumn ;
- 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 ) ) ;
+ verify_noerr( AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+ verify_noerr( AutoSizeListViewColumns() );
+ verify_noerr( SetHasScrollBars( false, true ) );
+ verify_noerr( SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) );
+ verify_noerr( SetListViewHeaderBtnHeight( 0 ) );
#if 0
// shouldn't be necessary anymore under 10.2
- m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
- m_peer->SetNeedsFocusRect( true ) ;
+ m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+ m_peer->SetNeedsFocusRect( true );
#endif
+}
+
+wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
+{
+}
+
+void wxMacDataBrowserListControl::MacDelete( int n )
+{
+ wxArrayInt selectionBefore;
+ MacGetSelections( selectionBefore );
+
+ UInt32 id = GetPeer()->GetCount() + 1;
- MacPostControlCreate(pos,size) ;
+ OSStatus err = RemoveItems( kDataBrowserNoItem, 1, (UInt32*) &id, kDataBrowserItemNoProperty );
+ verify_noerr( err );
- for ( int i = 0 ; i < n ; i++ )
+ for ( size_t i = 0; i < selectionBefore.GetCount(); ++i )
{
- Append( choices[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 );
+ }
}
- SetBestSize(size); // Needed because it is a wxControlWithItems
+ // refresh all
+ err = UpdateItems(
+ kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+ kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+ verify_noerr( err );
+}
- return TRUE;
+void wxMacDataBrowserListControl::MacInsert( int n, const wxString& text)
+{
+ wxArrayInt selectionBefore;
+ MacGetSelections( selectionBefore );
+
+ UInt32 id = GetPeer()->GetCount(); // this has already been increased
+ OSStatus err = AddItems( kDataBrowserNoItem, 1, (UInt32*) &id, kDataBrowserItemNoProperty );
+ verify_noerr( err );
+
+ 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
+ err = UpdateItems(
+ kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+ kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+ verify_noerr( err );
}
-wxListBox::~wxListBox()
+void wxMacDataBrowserListControl::MacInsert( int n, const wxArrayString& items)
+{
+ 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;
+
+ OSStatus err = AddItems( kDataBrowserNoItem, itemsCount, ids, kDataBrowserItemNoProperty );
+ verify_noerr( err );
+ 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
+ err = UpdateItems(
+ kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+ kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+ verify_noerr( err );
+}
+
+void wxMacDataBrowserListControl::MacAppend( const wxString& text)
+{
+ 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
+}
+
+void wxMacDataBrowserListControl::MacClear()
+{
+ verify_noerr( RemoveItems( kDataBrowserNoItem, 0, NULL, kDataBrowserItemNoProperty ) );
+}
+
+void wxMacDataBrowserListControl::MacDeselectAll()
+{
+ bool former = MacSuppressSelection( true );
+ verify_noerr(SetSelectedItems( 0, NULL, kDataBrowserItemsRemove ) );
+ MacSuppressSelection( former );
+}
+
+void wxMacDataBrowserListControl::MacSetSelection( int n, bool select )
+{
+ UInt32 id = n + 1;
+ bool former = MacSuppressSelection( true );
+
+ if ( IsItemSelected( id ) != select )
+ {
+ OSStatus err;
+
+ if ( select )
+ err = SetSelectedItems( 1, &id, GetPeer()->HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign );
+ else
+ err = SetSelectedItems( 1, &id, kDataBrowserItemsRemove );
+
+ verify_noerr( err );
+ }
+
+ MacScrollTo( n );
+ MacSuppressSelection( former );
+}
+
+bool wxMacDataBrowserListControl::MacSuppressSelection( bool suppress )
+{
+ bool former = m_suppressSelection;
+ m_suppressSelection = suppress;
+
+ return former;
+}
+
+bool wxMacDataBrowserListControl::MacIsSelected( int n ) const
+{
+ return IsItemSelected( n + 1 );
+}
+
+int wxMacDataBrowserListControl::MacGetSelection() const
+{
+ for ( unsigned int i = 0; i < GetPeer()->GetCount(); ++i )
+ {
+ if ( IsItemSelected( i + 1 ) )
+ {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
+int wxMacDataBrowserListControl::MacGetSelections( wxArrayInt& aSelections ) const
+{
+ int no_sel = 0;
+
+ aSelections.Empty();
+
+ UInt32 first, last;
+ GetSelectionAnchor( &first, &last );
+ if ( first != kDataBrowserNoItem )
+ {
+ for ( size_t i = first; i <= last; ++i )
+ {
+ if ( IsItemSelected( i ) )
+ {
+ aSelections.Add( i - 1 );
+ no_sel++;
+ }
+ }
+ }
+
+ 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 ) );
+}
+
+void wxMacDataBrowserListControl::MacScrollTo( int n )
+{
+ UInt32 id = n + 1;
+ verify_noerr( RevealItem( id, kTextColumnId, kDataBrowserRevealWithoutSelecting ) );
+}
+
+void wxMacDataBrowserListControl::UpdateLine( int n )
+{
+ UInt32 id = n + 1;
+ verify_noerr( UpdateItems(kDataBrowserNoItem, 1, &id, kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) );
+}
+
+//
+// Databrowser
+//
+
+OSStatus wxMacDataBrowserListControl::SetSelectionFlags( DataBrowserSelectionFlags options )
+{
+ return SetDataBrowserSelectionFlags( m_controlRef, options );
+}
+
+OSStatus wxMacDataBrowserListControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+ DataBrowserTableViewColumnIndex position )
+{
+ return AddDataBrowserListViewColumn( m_controlRef, columnDesc, position );
+}
+
+OSStatus wxMacDataBrowserListControl::AutoSizeListViewColumns()
+{
+ return AutoSizeDataBrowserListViewColumns(m_controlRef);
+}
+
+OSStatus wxMacDataBrowserListControl::SetHasScrollBars( bool horiz, bool vert )
+{
+ return SetDataBrowserHasScrollBars( m_controlRef, horiz, vert );
+}
+
+OSStatus wxMacDataBrowserListControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+{
+ return SetDataBrowserTableViewHiliteStyle( m_controlRef, hiliteStyle );
+}
+
+OSStatus wxMacDataBrowserListControl::SetListViewHeaderBtnHeight(UInt16 height)
+{
+ return SetDataBrowserListViewHeaderBtnHeight( m_controlRef, height );
+}
+
+OSStatus wxMacDataBrowserListControl::SetCallbacks(const DataBrowserCallbacks *callbacks)
+{
+ return SetDataBrowserCallbacks( m_controlRef, callbacks );
+}
+
+OSStatus wxMacDataBrowserListControl::UpdateItems(
+ DataBrowserItemID container,
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserPropertyID preSortProperty,
+ DataBrowserPropertyID propertyID )
+{
+ return UpdateDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty, propertyID );
+}
+
+bool wxMacDataBrowserListControl::IsItemSelected( DataBrowserItemID item ) const
+{
+ return IsDataBrowserItemSelected( m_controlRef, item );
+}
+
+OSStatus wxMacDataBrowserListControl::AddItems(
+ DataBrowserItemID container,
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserPropertyID preSortProperty )
+{
+ return AddDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}
+
+OSStatus wxMacDataBrowserListControl::RemoveItems(
+ DataBrowserItemID container,
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserPropertyID preSortProperty )
+{
+ return RemoveDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}
+
+OSStatus wxMacDataBrowserListControl::RevealItem(
+ DataBrowserItemID item,
+ DataBrowserPropertyID propertyID,
+ DataBrowserRevealOptions options )
+{
+ return RevealDataBrowserItem( m_controlRef, item, propertyID, options );
+}
+
+OSStatus wxMacDataBrowserListControl::SetSelectedItems(
+ UInt32 numItems,
+ const DataBrowserItemID *items,
+ DataBrowserSetOption operation )
+{
+ return SetDataBrowserSelectedItems( m_controlRef, numItems, items, operation );
+}
+
+OSStatus wxMacDataBrowserListControl::GetSelectionAnchor( DataBrowserItemID *first, DataBrowserItemID *last ) const
+{
+ return GetDataBrowserSelectionAnchor( m_controlRef, first, last );
+}
+
+#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 )
{
- m_peer->SetReference( 0 ) ;
- FreeData() ;
- // avoid access during destruction
- if ( m_macList )
+ 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 )
{
- m_macList = NULL ;
+ 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
+
+// ============================================================================
+// list box control implementation
+// ============================================================================
+
+wxListBox::wxListBox()
+{
+ m_noItems = 0;
+}
+
+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 );
+}
+
+bool wxListBox::Create(
+ wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ int n,
+ const wxString choices[],
+ long style,
+ const wxValidator& validator,
+ const wxString& name )
+{
+ m_macIsUserPane = false;
+
+ wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+ wxT("only a single listbox selection mode can be specified") );
+
+ if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+ return false;
+
+ // this will be increased by our append command
+ m_noItems = 0;
+
+ m_peer = CreateMacListControl( pos, size, style );
+
+ MacPostControlCreate( pos, size );
+
+ InsertItems( n, choices, 0 );
+
+ // Needed because it is a wxControlWithItems
+ SetBestSize( size );
+
+ return true;
+}
+
+wxListBox::~wxListBox()
+{
+ m_peer->SetReference( 0 );
+ FreeData();
+}
+
+wxMacListControl * wxListBox::CreateMacListControl(const wxPoint& pos, const wxSize& size, long style)
+{
+ return new wxMacDataBrowserListControl( this, pos, size, style );
}
void wxListBox::FreeData()
{
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ size_t uiCount = m_aItems.Count();
+ while ( uiCount != 0 )
+ {
+ uiCount--;
+ delete m_aItems[uiCount];
+ m_aItems[uiCount] = NULL;
+ }
+
+ m_aItems.Clear();
+ }
+ else
+#endif
if ( HasClientObjectData() )
{
- for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+ for ( unsigned int n = 0; n < m_noItems; n++ )
{
- delete GetClientObject(n);
+ delete GetClientObject( n );
}
}
}
int width, int height,
int sizeFlags )
{
- wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
+ wxControl::DoSetSize( x, y, width, height, sizeFlags );
}
-void wxListBox::DoSetFirstItem(int N)
+void wxListBox::DoSetFirstItem(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") );
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") );
+#if wxUSE_OWNER_DRAWN
+ delete m_aItems[n];
+ m_aItems.RemoveAt(n);
+#else
if ( HasClientObjectData() )
{
- delete GetClientObject(N);
+ delete GetClientObject(n);
}
- m_stringArray.RemoveAt( N ) ;
- m_dataArray.RemoveAt( N ) ;
- m_noItems --;
+#endif
- MacDelete( N ) ;
+ m_stringArray.RemoveAt( n );
+ m_dataArray.RemoveAt( n );
+ m_noItems--;
+
+ GetPeer()->MacDelete( n );
}
int wxListBox::DoAppend(const wxString& item)
{
InvalidateBestSize();
- int index = m_noItems ;
- m_stringArray.Add( item ) ;
+ unsigned int index = m_noItems;
+ m_stringArray.Add( item );
m_dataArray.Add( NULL );
- m_noItems ++;
- DoSetItemClientData( index , NULL ) ;
- MacAppend( item ) ;
+ m_noItems++;
+ DoSetItemClientData( index, NULL );
+ GetPeer()->MacAppend( item );
- return index ;
+ return index;
}
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] ) ;
+#if wxUSE_OWNER_DRAWN
+ wxASSERT_MSG(clientData[i] == NULL,
+ wxT("Cannot use client data with owner-drawn listboxes"));
+#else
+ Append( choices[i], clientData[i] );
+#endif
}
else
- Append( choices[i] ) ;
+ Append( choices[i] );
}
-}
-int wxListBox::FindString(const wxString& s, bool bCase) const
-{
- if ( s.Right(1) == wxT("*") )
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
{
- 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 )
+ // first delete old items
+ size_t ui = m_aItems.Count();
+ while ( ui != 0 )
{
- wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
-
- if ( EqualString( s1 , s2 , bCase , 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 ;
- }
+ ui--;
+ delete m_aItems[ui];
+ m_aItems[ui] = NULL;
}
- }
- else
- {
- Str255 s1 , s2 ;
-
- wxMacStringToPascal( s , s2 ) ;
+ m_aItems.Empty();
- for ( int i = 0 ; i < m_noItems ; ++ i )
+ // then create new ones
+ for ( ui = 0; ui < (size_t)m_noItems; ui++ )
{
- wxMacStringToPascal( m_stringArray[i] , s1 ) ;
-
- if ( EqualString( s1 , s2 , bCase , false ) )
- return i ;
+ wxOwnerDrawn *pNewItem = CreateItem(ui);
+ pNewItem->SetName(choices[ui]);
+ m_aItems.Add(pNewItem);
}
}
+#endif
+}
+
+int wxListBox::FindString(const wxString& s, bool bCase) const
+{
+ for ( size_t i = 0; i < m_noItems; ++ i )
+ {
+ if (s.IsSameAs( GetString( i ), bCase) )
+ return (int)i;
+ }
+
return wxNOT_FOUND;
}
{
FreeData();
m_noItems = 0;
- m_stringArray.Empty() ;
- m_dataArray.Empty() ;
- MacClear() ;
+ m_stringArray.Empty();
+ m_dataArray.Empty();
+ GetPeer()->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"));
+ wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+
+ wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int)n, wxT("invalid client_data array") );
- return (void *)m_dataArray[N];
+ return (void*)m_dataArray[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") );
+ wxCHECK_RET( IsValid(n), 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 )
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
{
- m_dataArray[N] = (char*) Client_data ;
+ // client data must be pointer to wxOwnerDrawn, otherwise we would crash
+ // in OnMeasure/OnDraw.
+ wxFAIL_MSG(wxT("Cannot use client data with owner-drawn listboxes"));
}
+#endif
+
+ 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*) Client_data ) ;
- }
+ m_dataArray.Add( (char*)clientData );
}
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
DoSetItemClientData(n, 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") );
+ wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") );
- return m_stringArray[N] ;
+ return m_stringArray[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();
+ unsigned 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] ) ;
- }
+ 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 );
}
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)
{
- m_stringArray[N] = s ;
- MacSet( N , s ) ;
+ m_stringArray[n] = s;
+ GetPeer()->MacSet( n, s );
}
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;
}
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))
+void wxListBox::MacUpdateLine(int n)
{
- 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;
+ GetPeer()->UpdateLine(n);
}
-// ============================================================================
-// list box control implementation
-// ============================================================================
+#if wxUSE_OWNER_DRAWN
-void wxListBox::MacDelete( int n )
+class wxListBoxItem : public wxOwnerDrawn
{
- wxArrayInt selectionBefore ;
- MacGetSelections( selectionBefore ) ;
-
- UInt32 id = m_noItems+1 ;
- verify_noerr( m_peer->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( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
-}
+public:
+ wxListBoxItem(const wxString& str = "");
+};
-void wxListBox::MacInsert( int n , const wxString& text)
+wxListBoxItem::wxListBoxItem(const wxString& str)
+ : wxOwnerDrawn(str, false)
{
- wxArrayInt selectionBefore ;
- MacGetSelections( selectionBefore ) ;
-
- UInt32 id = m_noItems ; // this has already been increased
- verify_noerr( m_peer->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( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
+ // no bitmaps/checkmarks
+ SetMarginWidth( 0 );
}
-void wxListBox::MacAppend( const wxString& text)
+wxOwnerDrawn *wxListBox::CreateItem(size_t n)
{
- 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
+ return new wxListBoxItem();
}
-void wxListBox::MacClear()
-{
- verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
-}
+#endif // USE_OWNER_DRAWN
-void wxListBox::MacDeselectAll()
-{
- bool former = MacSuppressSelection( true ) ;
- verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;
- MacSuppressSelection( former ) ;
-}
-void wxListBox::MacSetSelection( int n , bool select )
+// Some custom controls depend on this
+/* static */ wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
- bool former = MacSuppressSelection( true ) ;
- UInt32 id = n + 1 ;
-
- 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 ) ;
-}
+ wxVisualAttributes attr;
-bool wxListBox::MacSuppressSelection( bool suppress )
-{
- bool former = m_suppressSelection ;
- m_suppressSelection = suppress ;
- return former ;
-}
+ attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+ attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
+ attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
-bool wxListBox::MacIsSelected( int n ) const
-{
- return m_peer->IsItemSelected( n + 1 ) ;
+ return attr;
}
-int wxListBox::MacGetSelection() const
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
{
- for ( int i = 0 ; i < GetCount() ; ++i )
+ 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 )
{
- if ( m_peer->IsItemSelected( i + 1 ) )
- {
- return i ;
- }
- }
- return -1 ;
-}
+ Rect bounds;
+ err = GetDataBrowserItemPartBounds(
+ m_peer->GetControlRef(), low + 1, colId,
+ kDataBrowserPropertyEnclosingPart,
+ &bounds); // note +1 to translate to Mac ID
+ if ( err == noErr )
+ break;
-int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
-{
- int no_sel = 0 ;
+ // 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") );
- aSelections.Empty();
+ low++;
+ }
- UInt32 first , last ;
- m_peer->GetSelectionAnchor( &first , &last ) ;
- if ( first != kDataBrowserNoItem )
+ // 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 )
{
- for ( size_t i = first ; i <= last ; ++i )
+ int mid = (low + high) / 2;
+
+ Rect bounds;
+ err = GetDataBrowserItemPartBounds(
+ m_peer->GetControlRef(), mid + 1, colId,
+ kDataBrowserPropertyEnclosingPart,
+ &bounds); //note +1 to trans to mac id
+ wxCHECK_MSG( err == noErr || err == errDataBrowserItemNotFound,
+ wxNOT_FOUND,
+ wxT("Unexpected error from GetDataBrowserItemPartBounds") );
+
+ if ( err == errDataBrowserItemNotFound )
{
- if ( m_peer->IsItemSelected( i ) )
- {
- aSelections.Add( i - 1 ) ;
- no_sel++ ;
- }
+ // item not visible, attempt to find a visible one
+ // search lower
+ high = mid - 1;
}
- }
- return no_sel ;
-}
-
-void wxListBox::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( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
-}
-
-void wxListBox::MacScrollTo( int n )
-{
- UInt32 id = n + 1 ;
- verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
-}
-
-#if !TARGET_API_MAC_OSX
-
-void wxListBox::OnChar(wxKeyEvent& event)
-{
- // todo trigger proper events here
- event.Skip() ;
- return ;
-
- if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
- {
- wxWindow* parent = GetParent() ;
- while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
- parent = parent->GetParent() ;
-
- if ( parent && parent->GetDefaultItem() )
+ else // visible item, do actual hitttest
{
- wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
- wxButton);
- if ( def && def->IsEnabled() )
+ // 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) )
{
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
- event.SetEventObject(def);
- def->Command(event);
- return ;
+ // found!
+ return mid;
}
- }
- event.Skip() ;
- }
- /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
- else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
- {
- // FIXME: look in ancestors, not just parent.
- wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
- if (win)
- {
- wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
- new_event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( new_event );
- }
- }
- else if ( event.GetKeyCode() == WXK_TAB )
- {
- 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() ;
- }
- 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 );
-
- 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) );
+ if ( point.y < bounds.top )
+ // index(bounds) greater then key(point)
+ high = mid - 1;
+ else
+ // index(bounds) less then key(point)
+ low = mid + 1;
}
- else
- {
- n = -1;
- }
-
- event.SetInt(n);
-
- GetEventHandler()->ProcessEvent(event);
}
- else
- {
- 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 );
-
- if ( HasClientObjectData() )
- event.SetClientObject( GetClientObject( line ) );
- else if ( HasClientUntypedData() )
- event.SetClientData( GetClientData(line) );
- event.SetString( GetString(line) );
- event.SetInt(line);
-
- GetEventHandler()->ProcessEvent(event);
- }
- }
- }
+ return wxNOT_FOUND;
}
-#endif // !TARGET_API_MAC_OSX
-
#endif
projects / wxWidgets.git / blobdiff