X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b030203c5926bd6af8bc310469c911f2143f7e1..efe66bbc0e9f463a6dd3ad49717474dd801bebf3:/src/cocoa/choice.mm

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index 3127f87a8c..91ca7a94b9 100644
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -14,6 +14,7 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/choice.h"
+    #include "wx/arrstr.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
@@ -33,6 +34,20 @@ void wxChoice::Init()
     m_sortedStrings = NULL;
 }
 
+bool wxChoice::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 wxChoice::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
             const wxSize& size,
@@ -145,7 +160,7 @@ int wxChoice::GetCount() const
 
 wxString wxChoice::GetString(int n) const
 {
-    return wxString([[(NSPopUpButton*)m_cocoaNSView itemTitleAtIndex:n] lossyCString]);
+    return wxStringWithNSString([(NSPopUpButton*)m_cocoaNSView itemTitleAtIndex:n]);
 }
 
 void wxChoice::SetString(int n, const wxString& title)