X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8584ae1cd63a315f30450ba8a0136f1470f025c3..48889bca6f8b2504f78c0f47b32f5e95c64d915d:/samples/event/event.cpp diff --git a/samples/event/event.cpp b/samples/event/event.cpp index 9c89885231..3cc8c01e55 100644 --- a/samples/event/event.cpp +++ b/samples/event/event.cpp @@ -77,9 +77,9 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); -#if !wxEVENTS_COMPATIBILITY_2_8 +#ifdef wxHAS_EVENT_BIND void OnBind(wxCommandEvent& event); -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND void OnConnect(wxCommandEvent& event); void OnDynamic(wxCommandEvent& event); void OnPushEventHandler(wxCommandEvent& event); @@ -177,9 +177,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Event_Quit, MyFrame::OnQuit) EVT_MENU(Event_About, MyFrame::OnAbout) -#if !wxEVENTS_COMPATIBILITY_2_8 +#ifdef wxHAS_EVENT_BIND EVT_MENU(Event_Bind, MyFrame::OnBind) -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND EVT_MENU(Event_Connect, MyFrame::OnConnect) EVT_MENU(Event_Custom, MyFrame::OnFireCustom) @@ -257,10 +257,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->Append(Event_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *menuEvent = new wxMenu; -#if !wxEVENTS_COMPATIBILITY_2_8 +#ifdef wxHAS_EVENT_BIND menuEvent->AppendCheckItem(Event_Bind, "&Bind\tCtrl-B", "Bind or unbind a dynamic event handler"); -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND menuEvent->AppendCheckItem(Event_Connect, _T("&Connect\tCtrl-C"), _T("Connect or disconnect the dynamic event handler")); menuEvent->Append(Event_Dynamic, _T("&Dynamic event\tCtrl-D"), @@ -352,7 +352,7 @@ void MyFrame::OnDynamic(wxCommandEvent& event) ); } -#if !wxEVENTS_COMPATIBILITY_2_8 +#ifdef wxHAS_EVENT_BIND void MyFrame::OnBind(wxCommandEvent& event) { @@ -379,7 +379,7 @@ void MyFrame::OnBind(wxCommandEvent& event) UpdateDynamicStatus(event.IsChecked()); } -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND void MyFrame::OnConnect(wxCommandEvent& event) {