X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51478cd68dc4b44b7ef0f497de81bff8601b6414..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 35a4521168..331103395a 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -14,9 +14,13 @@ #if wxUSE_COMBOBOX #include "wx/combobox.h" -#include "wx/button.h" -#include "wx/menu.h" -#include "wx/containr.h" + +#ifndef WX_PRECOMP + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/containr.h" +#endif + #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) @@ -161,7 +165,7 @@ BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) EVT_KEY_DOWN(wxComboBoxText::OnKeyDown) EVT_CHAR(wxComboBoxText::OnChar) EVT_KEY_UP(wxComboBoxText::OnKeyUp) - EVT_TEXT(-1, wxComboBoxText::OnText) + EVT_TEXT(wxID_ANY, wxComboBoxText::OnText) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice @@ -224,7 +228,7 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice) - EVT_CHOICE(-1, wxComboBoxChoice::OnChoice) + EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice) END_EVENT_TABLE() wxComboBox::~wxComboBox() @@ -672,4 +676,4 @@ wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT return noErr ; } -#endif +#endif // wxUSE_COMBOBOX