Somehow, setting a tint color makes gauge work :/.

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

diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index 81925542a1e7359efdb7f11dea25fb7f7a441ba3..1147aa4900542557e44e0a336f38f9e653d7b17c 100644 (file)
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/choice.cpp
+// Name:        src/univ/choice.cpp
 // Purpose:     wxChoice implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.12.00
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univchoice.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -29,16 +24,41 @@
 
 #if wxUSE_CHOICE
 
+#include "wx/choice.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/choice.h"
+    #include "wx/arrstr.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-
 BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
-    EVT_COMBOBOX(-1, wxChoice::OnComboBox)
+    EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)
 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,
+                      const wxArrayString& choices,
+                      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,
@@ -60,7 +80,7 @@ void wxChoice::OnComboBox(wxCommandEvent& event)
 {
     if ( event.GetId() == GetId() )
     {
-        event.SetEventType(wxEVT_COMMAND_CHOICE_SELECTED);
+        event.SetEventType(wxEVT_CHOICE);
         event.Skip();
         GetEventHandler()->ProcessEvent(event);
     }