load wsock32.dll dynamically, so that wxCore has no dependency on it

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

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index fe928079ffeae034ed70427e72b2627e6051f0e5..a379cdd02ea217fc88e5927f488df7a51a7e798f 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -17,6 +17,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"

+#include "wx/cocoa/autorelease.h"

 #include "wx/cocoa/NSTableDataSource.h"
 
 #import <Foundation/NSArray.h>
 #include "wx/cocoa/NSTableDataSource.h"
 
 #import <Foundation/NSArray.h>


@@ -29,6 +30,20 @@ BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
 
 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,6 +52,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator,
             const wxString& name)
 {
             const wxValidator& validator,
             const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 


@@ -81,7 +97,7 @@ wxListBox::~wxListBox()
     [GetNSTableView() setDataSource: nil];
     [m_cocoaDataSource release];
     [m_cocoaItems release];
     [GetNSTableView() setDataSource: nil];
     [m_cocoaDataSource release];
     [m_cocoaItems release];

-    DisassociateNSTableView(m_cocoaNSView);
+    DisassociateNSTableView(GetNSTableView());

 }
 
 int wxListBox::CocoaDataSource_numberOfRows()
 }
 
 int wxListBox::CocoaDataSource_numberOfRows()