Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / univ / choice.cpp

diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index 7af8af88e41d7f16cbedf8fedcaa2341aa8eb0e4..5bb5b0020b2db5d86d30f87c3e4a68616d91c88b 100644 (file)
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/choice.cpp
+// Name:        src/univ/choice.cpp

 // Purpose:     wxChoice implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxChoice implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univchoice.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,23 +25,48 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"
+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-

 BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
 BEGIN_EVENT_TABLE(wxChoice, wxComboBox)

-    EVT_COMBOBOX(-1, wxChoice::OnComboBox)
+    EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+wxChoice::wxChoice(wxWindow *parent, wxWindowID id,
+                   const wxPoint& pos,
+                   const wxSize& size,
+                   const wxArrayString& choices,
+                   long style,
+                   const wxValidator& validator,
+                   const wxString& name)
+{
+    Create(parent, id, pos, size, choices, style, validator, name);
+}
+

 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxPoint& pos,
                       const wxSize& size,
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxPoint& pos,
                       const wxSize& size,

-                      int n, const wxString choices[],
+                      const wxArrayString& choices,

                       long style,
                       const wxValidator& validator,
                       const wxString& name)
                       long style,
                       const wxValidator& validator,
                       const wxString& name)

+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}
+
+bool wxChoice::Create(wxWindow *parent, wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      int n, const wxString choices[],
+                      long WXUNUSED(style),
+                      const wxValidator& validator,
+                      const wxString& name)

 {
     wxString value;
     if ( n )
 {
     wxString value;
     if ( n )