derive wxConfig classes from wxObject and add wxRTTI macros to them (patch 1587607)

[wxWidgets.git] / include / wx / univ / choice.h

diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index 3fff15eb4fe37c82af76e3f8eee7e0e5055778b3..f56590f372d583538b591bbc2d2315a9a3b09cb4 100644 (file)
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_CHOICE_H_
 #define _WX_UNIV_CHOICE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univchoice.h"
-#endif
-
 #include "wx/combobox.h"
 
 // VS: This is only a *temporary* implementation, real wxChoice should not
@@ -23,13 +19,23 @@
 class WXDLLEXPORT wxChoice : public wxComboBox
 {
 public:
-    wxChoice();
+    wxChoice() {}
     wxChoice(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    wxChoice(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr);
 
     bool Create(wxWindow *parent, wxWindowID id,
@@ -39,6 +45,13 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxChoiceNameStr);
     
 private:
     void OnComboBox(wxCommandEvent &event);