// 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"
#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"
#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/ObjcRef.h"
+#include "wx/cocoa/private/scrollview.h"
#include "wx/cocoa/NSTableDataSource.h"
#import <Foundation/NSArray.h>
#import <Foundation/NSEnumerator.h>
#import <AppKit/NSTableView.h>
#import <AppKit/NSTableColumn.h>
+#import <AppKit/NSScrollView.h>
+#import <AppKit/NSCell.h>
+
+
+// ============================================================================
+// 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)
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])];
[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];
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];
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];
+ _WxCocoa_SetNeedsUpdate(true);
+ return pos - 1;
}
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(int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
[m_cocoaItems removeObjectAtIndex:n];
m_itemClientData.RemoveAt(n);
- [GetNSTableView() reloadData];
+ _WxCocoa_SetNeedsUpdate(true);
}
// accessing strings
-size_t wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
{
- return (size_t)[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];
+ _WxCocoa_SetNeedsUpdate(true);
}
int wxListBox::FindString(const wxString& s, bool bCase) 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(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
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff