/////////////////////////////////////////////////////////////////////////////
-// 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: wxWidgets licence
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
- #include "wx/listbox.h"
#endif //WX_PRECOMP
#include "wx/cocoa/string.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)
const wxString& name)
{
/*
-wxLB_SINGLE
-Single-selection list.
+wxLB_SINGLE
+Single-selection list.
-wxLB_MULTIPLE
-Multiple-selection list: the user can toggle multiple items on and off.
+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_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_HSCROLL
+Create horizontal scrollbar if contents are too wide (Windows only).
-wxLB_ALWAYS_SB
-Always show a vertical scrollbar.
+wxLB_ALWAYS_SB
+Always show a vertical scrollbar.
-wxLB_NEEDED_SB
-Only create a vertical scrollbar if needed.
+wxLB_NEEDED_SB
+Only create a vertical scrollbar if needed.
-wxLB_SORT
-The listbox contents are sorted in alphabetical order.
+wxLB_SORT
+The listbox contents are sorted in alphabetical order.
*/
wxAutoNSAutoreleasePool pool;
if(!CreateControl(parent,winid,pos,size,style,validator,name))
[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
// 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))
+ if ((style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE))
//diff is that mult requires shift down for multi selection
[GetNSTableView() setAllowsMultipleSelection:true];
return [GetNSTableView() numberOfSelectedRows];
}
-void wxListBox::DoInsertItems(const wxArrayString& items, 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(size_t i=0; i < items.GetCount(); i++)
- {
- [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
- m_itemClientData.Add(clientData[i]);
- }
[GetNSTableView() reloadData];
+ return pos - 1;
}
void wxListBox::DoSetFirstItem(int n)
// 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];
+ [GetNSTableView() reloadData];
}
// accessing strings
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
{
- return [m_cocoaItems count];
+ return (unsigned int)[m_cocoaItems count];
}
-wxString wxListBox::GetString(int n) const
+wxString wxListBox::GetString(unsigned int n) const
{
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];
+ [GetNSTableView() reloadData];
}
-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
+ // FIXME: use wxItemContainerImmutable::FindString for bCase parameter
wxAutoNSAutoreleasePool pool;
return [m_cocoaItems indexOfObject:wxNSStringWithWxString(s)];
}
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(int n, void* clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
{
m_itemClientData[n] = clientData;
}
-void* wxListBox::DoGetItemClientData(int n) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const
{
return m_itemClientData[n];
}
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
-{
- m_itemClientData[n] = (void*) clientData;
-}
-
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
-{
- return (wxClientData*) m_itemClientData[n];
-}
-
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff