X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a393573c347d44aac5ca999ed52ff7bf435999f..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/cocoa/listbox.mm

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index f0a3a0c195..f75f35c0ab 100644
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -4,9 +4,8 @@
 // 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"
@@ -23,14 +22,51 @@
 #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, wxControlWithItems)
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
@@ -105,6 +141,8 @@ The listbox contents are sorted in alphabetical order.
     // 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];
@@ -116,16 +154,51 @@ The listbox contents are sorted in alphabetical order.
     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];
@@ -135,6 +208,28 @@ wxListBox::~wxListBox()
     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];
@@ -184,7 +279,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, unsigned int p
         AssignNewItemClientData(pos, clientData, i, type);
     }
 
-    [GetNSTableView() reloadData];
+    _WxCocoa_SetNeedsUpdate(true);
     return pos - 1;
 }
 
@@ -194,7 +289,7 @@ 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);
 }
 
 
@@ -204,14 +299,14 @@ void wxListBox::DoClear()
 {
     [m_cocoaItems removeAllObjects];
     m_itemClientData.Clear();
-    [GetNSTableView() reloadData];
+    _WxCocoa_SetNeedsUpdate(true);
 }
 
 void wxListBox::DoDeleteOneItem(unsigned int n)
 {
     [m_cocoaItems removeObjectAtIndex:n];
     m_itemClientData.RemoveAt(n);
-    [GetNSTableView() reloadData];
+    _WxCocoa_SetNeedsUpdate(true);
 }
 
     // accessing strings
@@ -230,7 +325,7 @@ 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