X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcaadf7eaee19621c4fe283e23320f5239aa7f88..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/listbox.mm

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index 384e24b6b4..2da7df8afe 100644
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -6,14 +6,18 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/listbox.h"
-#include "wx/log.h"
+#include "wx/wxprec.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/NSTableDataSource.h"
 
 #import <Foundation/NSArray.h>
@@ -26,6 +30,20 @@ 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,
@@ -34,6 +52,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator,
             const wxString& name)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 
@@ -44,12 +63,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
         [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];
@@ -58,11 +78,15 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
     // 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);
 
     return true;
@@ -73,7 +97,7 @@ wxListBox::~wxListBox()
     [GetNSTableView() setDataSource: nil];
     [m_cocoaDataSource release];
     [m_cocoaItems release];
-    DisassociateNSTableView(m_cocoaNSView);
+    DisassociateNSTableView(GetNSTableView());
 }
 
 int wxListBox::CocoaDataSource_numberOfRows()
@@ -118,7 +142,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     {
         [m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
             atIndex: pos];
-        m_clientData.Insert(NULL,pos);
+        m_itemClientData.Insert(NULL,pos);
     }
     [GetNSTableView() reloadData];
 }
@@ -127,12 +151,12 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     // Remove everything
     [m_cocoaItems removeAllObjects];
-    m_clientData.Clear();
+    m_itemClientData.Clear();
     // Provide the data
     for(size_t i=0; i < items.GetCount(); i++)
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
-        m_clientData.Add(clientData[i]);
+        m_itemClientData.Add(clientData[i]);
     }
     [GetNSTableView() reloadData];
 }