Improve validation of wxCheckBox styles.

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

diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index fdd855df673a5ea6b0d9dc563b7ff8a3afcbae71..d1d5312f36b6e21fe0cd68105ee4d095e1fc0658 100644 (file)
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univchoice.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -29,15 +25,16 @@
 
 #if wxUSE_CHOICE
 
+#include "wx/choice.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/choice.h"
     #include "wx/arrstr.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
 
 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,