X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/univ/choice.cpp diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index 9115f4de78..eb42fccad6 100644 --- 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: @@ -25,13 +25,12 @@ #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(wxID_ANY, wxChoice::OnComboBox) END_EVENT_TABLE() @@ -82,7 +81,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); }