X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..400a9e419b229cd511d73922bd5506aaab3b120e:/include/wx/univ/combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 44323ba9ee..52fa4b46b8 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -99,7 +99,10 @@ class WXDLLEXPORT wxComboControl : public wxControl
 {
 public:
     // construction
-    wxComboControl();
+    wxComboControl()
+    {
+        Init();
+    }
 
     wxComboControl(wxWindow *parent,
                    wxWindowID id,
@@ -108,7 +111,12 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxComboBoxNameStr);
+                   const wxString& name = wxComboBoxNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, value, pos, size, style, validator, name);
+    }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -205,7 +213,7 @@ class WXDLLEXPORT wxComboBox : public wxComboControl, public wxComboBoxBase
 {
 public:
     // ctors and such
-    wxComboBox();
+    wxComboBox() { Init(); }
 
     wxComboBox(wxWindow *parent,
                wxWindowID id,
@@ -213,7 +221,22 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                int n = 0,
-               const wxString *choices = (const wxString *) NULL,
+               const wxString choices[] = (const wxString *) NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, value, pos, size, n, choices,
+                     style, validator, name);
+    }
+    wxComboBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& value,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr);
@@ -228,7 +251,15 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
-
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
 
     virtual ~wxComboBox();