X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a673eb1c9942cbdda6486bda330aeef0d43321a..bf2c43c76e2819be443ab1d830ab68d9569d66b1:/src/cocoa/listbox.mm diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm index c24e9b9439..f75f35c0ab 100644 --- a/src/cocoa/listbox.mm +++ b/src/cocoa/listbox.mm @@ -4,9 +4,8 @@ // Author: David Elliott // Modified by: // Created: 2003/03/18 -// Id: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -22,14 +21,52 @@ #include "wx/cocoa/string.h" #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/ObjcRef.h" +#include "wx/cocoa/private/scrollview.h" #include "wx/cocoa/NSTableDataSource.h" #import #import #import #import +#import +#import + + +// ============================================================================ +// helper functions +// ============================================================================ + +static CGFloat _TableColumnMaxWidthForItems(NSTableColumn *tableColumn, NSArray *items) +{ + wxAutoNSAutoreleasePool pool; + + NSCell *dataCell = [[[tableColumn dataCell] copy] autorelease]; + CGFloat width = 0.0f; + NSEnumerator *itemEnum = [items objectEnumerator]; + NSString *item; + while( (item = [itemEnum nextObject]) != nil ) + { + [dataCell setStringValue: item]; + NSSize itemSize = [dataCell cellSize]; + CGFloat itemWidth = itemSize.width; + if(itemWidth > width) + width = itemWidth; + } + return width; +} + +static void _SetWidthOfTableColumnToFitItems(NSTableColumn *tableColumn, NSArray *items) +{ + CGFloat width = _TableColumnMaxWidthForItems(tableColumn, items); + [tableColumn setWidth:width]; + [tableColumn setMinWidth:width]; +} + +// ============================================================================ +// class wxListBox +// ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView) @@ -83,7 +120,7 @@ The listbox contents are sorted in alphabetical order. return false; // Provide the data - m_cocoaItems = [[NSMutableArray arrayWithCapacity:n] retain]; + m_cocoaItems = wxGCSafeRetain([NSMutableArray arrayWithCapacity:n]); for(int i=0; i < n; i++) { [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])]; @@ -98,12 +135,14 @@ The listbox contents are sorted in alphabetical order. [GetNSTableView() setHeaderView: nil]; // Set up the data source - m_cocoaDataSource = [[wxCocoaNSTableDataSource alloc] init]; + m_cocoaDataSource = [[WX_GET_OBJC_CLASS(wxCocoaNSTableDataSource) alloc] init]; [GetNSTableView() setDataSource:m_cocoaDataSource]; // Add the single column NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:nil]; [GetNSTableView() addTableColumn: tableColumn]; + // By default, entries should not be editable + [tableColumn setEditable:NO]; [tableColumn release]; [GetNSTableView() sizeToFit]; @@ -115,24 +154,82 @@ The listbox contents are sorted in alphabetical order. CocoaCreateNSScrollView(); SetInitialFrameRect(pos,size); + if ((style & wxLB_NEEDED_SB) || (style & wxLB_ALWAYS_SB)) + { + [m_wxCocoaScrollView->GetNSScrollView() setHasVerticalScroller: YES]; + } + + if (style & wxLB_HSCROLL) + { + [m_wxCocoaScrollView->GetNSScrollView() setHasHorizontalScroller: YES]; + } + + // We can't set auto-hiding individually for horizontal/vertical scrollers, + // so we have settled on always allowing hiding for both unless the vertical + // setting is "always show". + if (((style & wxLB_NEEDED_SB) || (style & wxLB_HSCROLL)) && !(style & wxLB_ALWAYS_SB)) + { + if ([m_wxCocoaScrollView->GetNSScrollView() respondsToSelector:@selector(setAutohidesScrollers:)]) + { + [m_wxCocoaScrollView->GetNSScrollView() setAutohidesScrollers: YES]; + } + } + // Set up extended/multiple selection flags if ((style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE)) //diff is that mult requires shift down for multi selection [GetNSTableView() setAllowsMultipleSelection:true]; [GetNSTableView() setAllowsColumnSelection:false]; - + _SetWidthOfTableColumnToFitItems(tableColumn, m_cocoaItems); return true; } +wxSize wxListBox::DoGetBestSize() const +{ + wxSize size = wxControlWithItems::DoGetBestSize(); + // Limit best size to 100x100. It can be smaller if none of the items are very + // wide or if there aren't many items, but anything bigger than 100x100 ought + // to be asked for by the programmer. The 100x100 size is based on being barely + // enough for a scroller to be usable. + if(size.GetWidth() > 100) + size.SetWidth(100); + if(size.GetHeight() > 100) + size.SetHeight(100); + return size; +} + wxListBox::~wxListBox() { [GetNSTableView() setDataSource: nil]; [m_cocoaDataSource release]; - [m_cocoaItems release]; + wxGCSafeRelease(m_cocoaItems); + m_cocoaItems = nil; DisassociateNSTableView(GetNSTableView()); } +bool wxListBox::_WxCocoa_GetNeedsUpdate() +{ + return m_needsUpdate; +} + +void wxListBox::_WxCocoa_SetNeedsUpdate(bool needsUpdate) +{ + m_needsUpdate = needsUpdate; +} + +void wxListBox::OnInternalIdle() +{ + wxControlWithItems::OnInternalIdle(); + if(_WxCocoa_GetNeedsUpdate()) + { + _SetWidthOfTableColumnToFitItems([[GetNSTableView() tableColumns] objectAtIndex:0], m_cocoaItems); + [GetNSTableView() tile]; + [GetNSTableView() reloadData]; + _WxCocoa_SetNeedsUpdate(false); + } +} + int wxListBox::CocoaDataSource_numberOfRows() { return [m_cocoaItems count]; @@ -169,33 +266,21 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const return [GetNSTableView() numberOfSelectedRows]; } -void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) +int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, wxClientDataType type) { wxAutoNSAutoreleasePool pool; - for(int i=int(items.GetCount())-1; i >= 0; i--) + const unsigned int numItems = items.GetCount(); + for ( unsigned int i = 0; i < numItems; ++i, ++pos ) { [m_cocoaItems insertObject: wxNSStringWithWxString(items[i]) atIndex: pos]; - m_itemClientData.Insert(NULL,pos); + m_itemClientData.Insert(NULL, pos); + AssignNewItemClientData(pos, clientData, i, type); } - [GetNSTableView() reloadData]; -} - -void wxListBox::DoSetItems(const wxArrayString& items, void **clientData) -{ - wxAutoNSAutoreleasePool pool; - // Remove everything - [m_cocoaItems removeAllObjects]; - m_itemClientData.Clear(); - // Provide the data - for(unsigned int i=0; i < items.GetCount(); i++) - { - [m_cocoaItems addObject: wxNSStringWithWxString(items[i])]; - m_itemClientData.Add(clientData[i]); - } - [GetNSTableView() reloadData]; + _WxCocoa_SetNeedsUpdate(true); + return pos - 1; } void wxListBox::DoSetFirstItem(int n) @@ -204,24 +289,24 @@ void wxListBox::DoSetFirstItem(int n) void* pOld = m_itemClientData[n]; m_itemClientData[n] = m_itemClientData[0]; m_itemClientData[0] = pOld; - [GetNSTableView() reloadData]; + _WxCocoa_SetNeedsUpdate(true); } // pure virtuals from wxItemContainer // deleting items -void wxListBox::Clear() +void wxListBox::DoClear() { [m_cocoaItems removeAllObjects]; m_itemClientData.Clear(); - [GetNSTableView() reloadData]; + _WxCocoa_SetNeedsUpdate(true); } -void wxListBox::Delete(unsigned int n) +void wxListBox::DoDeleteOneItem(unsigned int n) { [m_cocoaItems removeObjectAtIndex:n]; m_itemClientData.RemoveAt(n); - [GetNSTableView() reloadData]; + _WxCocoa_SetNeedsUpdate(true); } // accessing strings @@ -240,7 +325,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s) wxAutoNSAutoreleasePool pool; [m_cocoaItems removeObjectAtIndex:n]; [m_cocoaItems insertObject: wxNSStringWithWxString(s) atIndex: n]; - [GetNSTableView() reloadData]; + _WxCocoa_SetNeedsUpdate(true); } int wxListBox::FindString(const wxString& s, bool bCase) const @@ -256,15 +341,6 @@ int wxListBox::GetSelection() const return [GetNSTableView() selectedRow]; } -int wxListBox::DoAppend(const wxString& item) -{ - wxAutoNSAutoreleasePool pool; - [m_cocoaItems addObject:wxNSStringWithWxString(item)]; - [GetNSTableView() reloadData]; - m_itemClientData.Add(NULL); - return [m_cocoaItems count]; -} - void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { m_itemClientData[n] = clientData; @@ -275,14 +351,4 @@ void* wxListBox::DoGetItemClientData(unsigned int n) const return m_itemClientData[n]; } -void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) -{ - m_itemClientData[n] = (void*) clientData; -} - -wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const -{ - return (wxClientData*) m_itemClientData[n]; -} - -#endif +#endif // wxUSE_LISTBOX