X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/421a84317fc3d53ac4fd64613f1af2d19018efc5..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/combobox.mm

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index 3d6564ad8a..e016e89205 100644
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -3,12 +3,16 @@
 // Purpose:     wxComboBox
 // Author:      David Elliott
 // Modified by:
-// Created:     2003/03/16
-// RCS-ID:      $Id: 
+// Created:     2003/07/14
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
+
 #include "wx/app.h"
 #include "wx/combobox.h"
 #include "wx/log.h"
@@ -23,6 +27,21 @@ BEGIN_EVENT_TABLE(wxComboBox, wxTextCtrl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView)
 
+bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
+            const wxString& value,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, winid, value, pos, size, chs.GetCount(),
+                  chs.GetStrings(), style, validator, name);
+}
+
 bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
             const wxString& value,
             const wxPoint& pos,
@@ -37,12 +56,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
         return false;
 
     m_cocoaNSView = NULL;
-    SetNSTextField([[NSComboBox alloc] initWithFrame:NSMakeRect(0,0,30,30)]);
+    SetNSTextField([[NSComboBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSTextField() setStringValue:wxNSStringWithWxString(value.c_str())];
     [GetNSControl() sizeToFit];
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
@@ -59,7 +80,7 @@ wxString wxComboBox::GetStringSelection()
     return wxEmptyString;
 }
 
-void wxComboBox::SetStringSelection(wxString& selection)
+void wxComboBox::SetStringSelection(const wxString& selection)
 {
 }
 
@@ -123,3 +144,4 @@ wxClientData* wxComboBox::DoGetItemClientObject(int) const
     return NULL;
 }
 
+#endif //wxUSE_COMBOBOX