X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/981af57ccf9f4aa527a8718bed0862c4cfbc37b9..9c112555198f51fcec71106530cddba95a17f3dc:/src/cocoa/listbox.mm diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm index 4a00720bcc..e17fc1cfc2 100644 --- a/src/cocoa/listbox.mm +++ b/src/cocoa/listbox.mm @@ -6,19 +6,46 @@ // Created: 2003/03/18 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" -#include "wx/listbox.h" -#include "wx/log.h" +#include "wx/wxprec.h" -#import +#if wxUSE_LISTBOX + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/listbox.h" +#endif //WX_PRECOMP + +#include "wx/cocoa/string.h" +#include "wx/cocoa/autorelease.h" +#include "wx/cocoa/NSTableDataSource.h" + +#import +#import +#import +#import IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) END_EVENT_TABLE() -// WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSButton,NSControl,NSView) +WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView) + +bool wxListBox::Create(wxWindow *parent, wxWindowID winid, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + wxCArrayString chs(choices); + + return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name); +} bool wxListBox::Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos, @@ -28,48 +55,155 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid, const wxValidator& validator, const wxString& name) { +/* +wxLB_SINGLE +Single-selection list. + +wxLB_MULTIPLE +Multiple-selection list: the user can toggle multiple items on and off. + +wxLB_EXTENDED +Extended-selection list: the user can select multiple items using the SHIFT key and the mouse or special key combinations. + +wxLB_HSCROLL +Create horizontal scrollbar if contents are too wide (Windows only). + +wxLB_ALWAYS_SB +Always show a vertical scrollbar. + +wxLB_NEEDED_SB +Only create a vertical scrollbar if needed. + +wxLB_SORT +The listbox contents are sorted in alphabetical order. +*/ + wxAutoNSAutoreleasePool pool; if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; - SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]); + // Provide the data + m_cocoaItems = [[NSMutableArray arrayWithCapacity:n] retain]; + for(int i=0; i < n; i++) + { + [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])]; + } + // Remove everything + m_itemClientData.Clear(); + // Initialize n elements to NULL + m_itemClientData.SetCount(n,NULL); + + SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; + [GetNSTableView() setHeaderView: nil]; + + // Set up the data source + m_cocoaDataSource = [[wxCocoaNSTableDataSource alloc] init]; + [GetNSTableView() setDataSource:m_cocoaDataSource]; + + // Add the single column + NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:nil]; + [GetNSTableView() addTableColumn: tableColumn]; + [tableColumn release]; + [GetNSTableView() sizeToFit]; + // Finish if(m_parent) m_parent->CocoaAddChild(this); + // NSTableView does WEIRD things with sizes. Wrapping it in an + // NSScrollView seems to be the only reasonable solution. + CocoaCreateNSScrollView(); + SetInitialFrameRect(pos,size); + + // 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]; + return true; } wxListBox::~wxListBox() { - CocoaRemoveFromParent(); - SetNSView(NULL); + [GetNSTableView() setDataSource: nil]; + [m_cocoaDataSource release]; + [m_cocoaItems release]; + DisassociateNSTableView(GetNSTableView()); +} + +int wxListBox::CocoaDataSource_numberOfRows() +{ + return [m_cocoaItems count]; +} + +struct objc_object* wxListBox::CocoaDataSource_objectForTableColumn( + WX_NSTableColumn tableColumn, int rowIndex) +{ + return [m_cocoaItems objectAtIndex:rowIndex]; } // pure virtuals from wxListBoxBase bool wxListBox::IsSelected(int n) const { - return false; + return [GetNSTableView() isRowSelected: n]; } -void wxListBox::SetSelection(int n, bool select) +void wxListBox::DoSetSelection(int n, bool select) { + if(select) + [GetNSTableView() selectRow: n byExtendingSelection:NO]; + else + [GetNSTableView() deselectRow: n]; } int wxListBox::GetSelections(wxArrayInt& aSelections) const { - return 0; + aSelections.Clear(); + NSEnumerator *enumerator = [GetNSTableView() selectedRowEnumerator]; + while(NSNumber *num = [enumerator nextObject]) + { + aSelections.Add([num intValue]); + } + return [GetNSTableView() numberOfSelectedRows]; } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { + wxAutoNSAutoreleasePool pool; + + for(int i=int(items.GetCount())-1; i >= 0; i--) + { + [m_cocoaItems insertObject: wxNSStringWithWxString(items[i]) + atIndex: pos]; + m_itemClientData.Insert(NULL,pos); + } + [GetNSTableView() reloadData]; } void wxListBox::DoSetItems(const wxArrayString& items, void **clientData) { + wxAutoNSAutoreleasePool pool; + + // Remove everything + [m_cocoaItems removeAllObjects]; + m_itemClientData.Clear(); + // Provide the data + for(size_t i=0; i < items.GetCount(); i++) + { + [m_cocoaItems addObject: wxNSStringWithWxString(items[i])]; + m_itemClientData.Add(clientData[i]); + } + [GetNSTableView() reloadData]; } void wxListBox::DoSetFirstItem(int n) { + [m_cocoaItems exchangeObjectAtIndex:0 withObjectAtIndex:n]; + void* pOld = m_itemClientData[n]; + m_itemClientData[n] = m_itemClientData[0]; + m_itemClientData[0] = pOld; + [GetNSTableView() reloadData]; } @@ -77,62 +211,76 @@ void wxListBox::DoSetFirstItem(int n) // deleting items void wxListBox::Clear() { + [m_cocoaItems removeAllObjects]; + m_itemClientData.Clear(); + [GetNSTableView() reloadData]; } void wxListBox::Delete(int n) { + [m_cocoaItems removeObjectAtIndex:n]; + m_itemClientData.RemoveAt(n); + [GetNSTableView() reloadData]; } // accessing strings int wxListBox::GetCount() const { - return 0; + return [m_cocoaItems count]; } wxString wxListBox::GetString(int n) const { - return wxEmptyString; + return wxStringWithNSString([m_cocoaItems objectAtIndex:n]); } void wxListBox::SetString(int n, const wxString& s) { + wxAutoNSAutoreleasePool pool; + [m_cocoaItems removeObjectAtIndex:n]; + [m_cocoaItems insertObject: wxNSStringWithWxString(s) atIndex: n]; + [GetNSTableView() reloadData]; } int wxListBox::FindString(const wxString& s) const { - return 0; + wxAutoNSAutoreleasePool pool; + return [m_cocoaItems indexOfObject:wxNSStringWithWxString(s)]; } // selection -void wxListBox::Select(int n) -{ -} - int wxListBox::GetSelection() const { - return 0; + return [GetNSTableView() selectedRow]; } int wxListBox::DoAppend(const wxString& item) { - return 0; + wxAutoNSAutoreleasePool pool; + [m_cocoaItems addObject:wxNSStringWithWxString(item)]; + [GetNSTableView() reloadData]; + m_itemClientData.Add(NULL); + return [m_cocoaItems count]; } void wxListBox::DoSetItemClientData(int n, void* clientData) { + m_itemClientData[n] = clientData; } void* wxListBox::DoGetItemClientData(int n) const { - return NULL; + return m_itemClientData[n]; } void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) { + m_itemClientData[n] = (void*) clientData; } wxClientData* wxListBox::DoGetItemClientObject(int n) const { - return NULL; + return (wxClientData*) m_itemClientData[n]; } +#endif