remove streams tests: they're very basic and already-existing CppUnit stream tests...

[wxWidgets.git] / src / cocoa / listbox.mm

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index fe928079ffeae034ed70427e72b2627e6051f0e5..fc4a522813ae77e7bc38dbbf1c5f9863533b514b 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -1,34 +1,92 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/listbox.mm
+// Name:        src/cocoa/listbox.mm

 // Purpose:     wxListBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
 // Purpose:     wxListBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18

-// RCS-ID:      $Id: 
+// Id:          $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

-    #include "wx/listbox.h"

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.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>
 #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;
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+static void _SetWidthOfTableColumnToFitItems(NSTableColumn *tableColumn, NSArray *items)
+{
+    CGFloat width = _TableColumnMaxWidthForItems(tableColumn, items);
+    [tableColumn setWidth:width];
+    [tableColumn setMinWidth:width];
+}
+
+// ============================================================================
+// class wxListBox
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)

 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
 
 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,
 bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
             const wxSize& size,


@@ -37,31 +95,56 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator,
             const wxString& name)
 {
             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;
 
     // Provide the data
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         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])];
     }
     // Remove everything
     for(int i=0; i < n; i++)
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
     }
     // Remove everything

-    m_clientData.Clear();
+    m_itemClientData.Clear();

     // Initialize n elements to NULL
     // 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
 
     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];
     [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];
     [tableColumn release];
 
     [GetNSTableView() sizeToFit];


@@ -73,15 +156,80 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
     CocoaCreateNSScrollView();
     SetInitialFrameRect(pos,size);
 
     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;
 }
 
     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];
 wxListBox::~wxListBox()
 {
     [GetNSTableView() setDataSource: nil];
     [m_cocoaDataSource release];

-    [m_cocoaItems release];
-    DisassociateNSTableView(m_cocoaNSView);
+    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()
 }
 
 int wxListBox::CocoaDataSource_numberOfRows()


@@ -101,7 +249,7 @@ bool wxListBox::IsSelected(int n) const
     return [GetNSTableView() isRowSelected: n];
 }
 
     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];
 {
     if(select)
         [GetNSTableView() selectRow: n byExtendingSelection:NO];


@@ -120,96 +268,89 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
     return [GetNSTableView() numberOfSelectedRows];
 }
 
     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_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];
+    _WxCocoa_SetNeedsUpdate(true);
+    return pos - 1;

 }
 
 void wxListBox::DoSetFirstItem(int n)
 {
 }
 
 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;
+    _WxCocoa_SetNeedsUpdate(true);

 }
 
 
 // pure virtuals from wxItemContainer
     // deleting items
 }
 
 
 // pure virtuals from wxItemContainer
     // deleting items

-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
 {

+    [m_cocoaItems removeAllObjects];
+    m_itemClientData.Clear();
+    _WxCocoa_SetNeedsUpdate(true);

 }
 
 }
 

-void wxListBox::Delete(int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
 {

+    [m_cocoaItems removeObjectAtIndex:n];
+    m_itemClientData.RemoveAt(n);
+    _WxCocoa_SetNeedsUpdate(true);

 }
 
     // accessing strings
 }
 
     // 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];
+    _WxCocoa_SetNeedsUpdate(true);

 }
 
 }
 

-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
 }
 
     // selection

-void wxListBox::Select(int n)
-{
-}
-

 int wxListBox::GetSelection() const
 {
 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