/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/listbox.mm
+// Name: src/cocoa/listbox.mm
// Purpose: wxListBox
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
-// RCS-ID: $Id:
+// Id: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows license
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/app.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
#include "wx/listbox.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+#endif //WX_PRECOMP
#include "wx/cocoa/string.h"
+#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/NSTableDataSource.h"
#import <Foundation/NSArray.h>
#import <AppKit/NSTableView.h>
#import <AppKit/NSTableColumn.h>
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
END_EVENT_TABLE()
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,
const wxSize& size,
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;
[m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
}
// Remove everything
- m_clientData.Clear();
+ m_itemClientData.Clear();
// Initialize n elements to NULL
- m_clientData.SetCount(n,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];
+ 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];
-// [tableColumn release];
+ [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;
}
[GetNSTableView() setDataSource: nil];
[m_cocoaDataSource release];
[m_cocoaItems release];
- DisassociateNSTableView(m_cocoaNSView);
+ DisassociateNSTableView(GetNSTableView());
}
int wxListBox::CocoaDataSource_numberOfRows()
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];
return [GetNSTableView() numberOfSelectedRows];
}
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, wxClientDataType type)
{
- for(int i=int(items.GetCount())-1; i >= 0; i--)
+ wxAutoNSAutoreleasePool pool;
+
+ const unsigned int numItems = items.GetCount();
+ for ( unsigned int i = 0; i < numItems; ++i, ++pos )
{
[m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
atIndex: pos];
- m_clientData.Insert(NULL,pos);
+ m_itemClientData.Insert(NULL, pos);
+ AssignNewItemClientData(pos, clientData, i, type);
}
- [GetNSTableView() reloadData];
-}
-void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
-{
- // Remove everything
- [m_cocoaItems removeAllObjects];
- m_clientData.Clear();
- // Provide the data
- for(size_t i=0; i < items.GetCount(); i++)
- {
- [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
- m_clientData.Add(clientData[i]);
- }
[GetNSTableView() reloadData];
+ return pos - 1;
}
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];
}
// pure virtuals from wxItemContainer
// deleting items
-void wxListBox::Clear()
+void wxListBox::DoClear()
{
+ [m_cocoaItems removeAllObjects];
+ m_itemClientData.Clear();
+ [GetNSTableView() reloadData];
}
-void wxListBox::Delete(int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
+ [m_cocoaItems removeObjectAtIndex:n];
+ m_itemClientData.RemoveAt(n);
+ [GetNSTableView() reloadData];
}
// accessing strings
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
{
- return 0;
+ return (unsigned int)[m_cocoaItems count];
}
-wxString wxListBox::GetString(int n) const
+wxString wxListBox::GetString(unsigned int n) const
{
- return wxEmptyString;
+ return wxStringWithNSString([m_cocoaItems objectAtIndex:n]);
}
-void wxListBox::SetString(int n, const wxString& s)
+void wxListBox::SetString(unsigned 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
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
- return 0;
+ // FIXME: use wxItemContainerImmutable::FindString for bCase parameter
+ wxAutoNSAutoreleasePool pool;
+ return [m_cocoaItems indexOfObject:wxNSStringWithWxString(s)];
}
// selection
-void wxListBox::Select(int n)
-{
-}
-
int wxListBox::GetSelection() const
{
- return 0;
-}
-
-int wxListBox::DoAppend(const wxString& item)
-{
- return 0;
-}
-
-void wxListBox::DoSetItemClientData(int n, void* clientData)
-{
-}
-
-void* wxListBox::DoGetItemClientData(int n) const
-{
- return NULL;
+ return [GetNSTableView() selectedRow];
}
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
{
+ m_itemClientData[n] = clientData;
}
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const
{
- return NULL;
+ return m_itemClientData[n];
}
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff