X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a818b15a1887257cc9f7bca82ae69c7ab014fbc..4df123bce5ee66ac3aa2985a752b1ddd26725e84:/samples/event/event.cpp diff --git a/samples/event/event.cpp b/samples/event/event.cpp index 4fd024abb8..5f1426e4ef 100644 --- a/samples/event/event.cpp +++ b/samples/event/event.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: event.cpp -// Purpose: wxWindows sample demonstrating different event usage +// Purpose: wxWidgets sample demonstrating different event usage // Author: Vadim Zeitlin // Modified by: // Created: 31.01.01 @@ -32,7 +32,7 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers) +// need because it includes almost all "standard" wxWidgets headers) #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -59,7 +59,7 @@ DEFINE_EVENT_TYPE(wxEVT_MY_CUSTOM_COMMAND) // it may also be convenient to define an event table macro for this event type #define EVT_MY_CUSTOM_COMMAND(id, fn) \ DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_MY_CUSTOM_COMMAND, id, -1, \ + wxEVT_MY_CUSTOM_COMMAND, id, wxID_ANY, \ (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxCommandEventFunction, &fn ), \ (wxObject *) NULL \ ), @@ -107,7 +107,7 @@ protected: size_t m_nPush; private: - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -159,10 +159,10 @@ enum }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -178,17 +178,18 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(Event_Pop, MyFrame::OnUpdateUIPop) - EVT_MY_CUSTOM_COMMAND(-1, MyFrame::OnProcessCustom) + EVT_MY_CUSTOM_COMMAND(wxID_ANY, MyFrame::OnProcessCustom) - // this would also work: - //EVT_CUSTOM(wxEVT_MY_CUSTOM_COMMAND, -1, MyFrame::OnProcessCustom) + // the line below would also work if OnProcessCustom() were defined as + // taking a wxEvent (as required by EVT_CUSTOM) and not wxCommandEvent + //EVT_CUSTOM(wxEVT_MY_CUSTOM_COMMAND, wxID_ANY, MyFrame::OnProcessCustom) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler) EVT_MENU(Event_Test, MyEvtHandler::OnTest) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -207,17 +208,17 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // create the main application window - MyFrame *frame = new MyFrame(_T("Event wxWindows Sample"), + MyFrame *frame = new MyFrame(_T("Event wxWidgets Sample"), wxPoint(50, 50), wxSize(600, 340)); // and show it (the frames, unlike simple controls, are not shown when // created initially) - frame->Show(TRUE); + frame->Show(true); // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the + // loop and the application will run. If we returned false here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -226,7 +227,7 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // init members m_nPush = 0; @@ -241,7 +242,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxMenu *menuEvent = new wxMenu; menuEvent->Append(Event_Connect, _T("&Connect\tCtrl-C"), _T("Connect or disconnect the dynamic event handler"), - TRUE /* checkable */); + true /* checkable */); menuEvent->Append(Event_Dynamic, _T("&Dynamic event\tCtrl-D"), _T("Dynamic event sample - only works after Connect")); menuEvent->AppendSeparator(); @@ -265,7 +266,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_STATUSBAR CreateStatusBar(3); - SetStatusText(_T("Welcome to wxWindows event sample")); + SetStatusText(_T("Welcome to wxWidgets event sample")); SetStatusText(_T("Dynamic: off"), Status_Dynamic); SetStatusText(_T("Push count: 0"), Status_Push); #endif // wxUSE_STATUSBAR @@ -277,7 +278,7 @@ MyFrame::~MyFrame() // crashes! while ( m_nPush-- != 0 ) { - PopEventHandler(TRUE /* delete handler */); + PopEventHandler(true /* delete handler */); } } @@ -287,14 +288,14 @@ MyFrame::~MyFrame() void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxMessageBox( wxT("Event sample shows different ways of using events\n") - wxT("© 2001 Vadim Zeitlin"), + wxT("(c) 2001 Vadim Zeitlin"), wxT("About Event Sample"), wxOK | wxICON_INFORMATION, this ); } @@ -317,20 +318,24 @@ void MyFrame::OnConnect(wxCommandEvent& event) if ( event.IsChecked() ) { // disconnect - Connect(Event_Dynamic, -1, wxEVT_COMMAND_MENU_SELECTED, + Connect(Event_Dynamic, wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)&MyFrame::OnDynamic); +#if wxUSE_STATUSBAR SetStatusText(_T("You can now use \"Dynamic\" item in the menu")); SetStatusText(_T("Dynamic: on"), Status_Dynamic); +#endif // wxUSE_STATUSBAR } else // connect { - Disconnect(Event_Dynamic, -1, wxEVT_COMMAND_MENU_SELECTED); + Disconnect(Event_Dynamic, wxID_ANY, wxEVT_COMMAND_MENU_SELECTED); +#if wxUSE_STATUSBAR SetStatusText(_T("You can no more use \"Dynamic\" item in the menu")); SetStatusText(_T("Dynamic: off"), Status_Dynamic); +#endif // wxUSE_STATUSBAR } } @@ -342,17 +347,21 @@ void MyFrame::OnPushEventHandler(wxCommandEvent& WXUNUSED(event)) { PushEventHandler(new MyEvtHandler(++m_nPush)); +#if wxUSE_STATUSBAR SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push); +#endif // wxUSE_STATUSBAR } void MyFrame::OnPopEventHandler(wxCommandEvent& WXUNUSED(event)) { wxCHECK_RET( m_nPush, _T("this command should be disabled!") ); - PopEventHandler(TRUE /* delete handler */); + PopEventHandler(true /* delete handler */); m_nPush--; +#if wxUSE_STATUSBAR SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push); +#endif // wxUSE_STATUSBAR } void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))