Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Connect() with Bind() in all samples and utils too

Browse Source 
Still use Connect() in unit tests which were written explicitly for it
and in EventConnector, which can't use Bind() as it uses a variable for
the event type.

No real changes, just use the newer and more convenient function.
This commit is contained in:
Vadim Zeitlin
2018-05-29 17:32:07 +02:00
parent d4f380e16e
commit 5f7a6bd15b
32 changed files with 291 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/doxygen/mainpages/samples.h
View File

@@ -274,7 +274,7 @@ wxDataObject to achieve this.
This sample demonstrates various features of the wxWidgets events. It This sample demonstrates various features of the wxWidgets events. It
shows how to dynamic events and connecting/disconnecting the event handlers shows how to dynamic events and connecting/disconnecting the event handlers
during run time by using wxEvtHandler::Connect() and wxEvtHandler::Disconnect(), during run time by using wxEvtHandler::Bind() and wxEvtHandler::Unbind(),
and also how to use wxWindow::PushEventHandler() and wxWindow::PopEventHandler(). and also how to use wxWindow::PushEventHandler() and wxWindow::PopEventHandler().
@sampledir{event} @sampledir{event}

5
samples/calendar/calendar.cpp
View File

@@ -809,9 +809,8 @@ wxCalendarCtrlBase *MyPanel::DoCreateCalendar(const wxDateTime& dt, long style)
wxDefaultSize, wxDefaultSize,
style); style);
calendar->Connect(wxEVT_RIGHT_DOWN, calendar->Bind(wxEVT_RIGHT_DOWN,
wxMouseEventHandler(MyFrame::OnCalRClick), &MyFrame::OnCalRClick,
NULL,
( MyFrame * )wxGetTopLevelParent(this)); ( MyFrame * )wxGetTopLevelParent(this));
return calendar; return calendar;

4
samples/dataview/dataview.cpp
View File

@@ -622,9 +622,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
m_ctrl[0] = m_ctrl[0] =
new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition, new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition,
wxDefaultSize, style ); wxDefaultSize, style );
m_ctrl[0]->Connect(wxEVT_CHAR, m_ctrl[0]->Bind(wxEVT_CHAR, &MyFrame::OnDataViewChar, this);
wxKeyEventHandler(MyFrame::OnDataViewChar),
NULL, this);
m_music_model = new MyMusicTreeModel; m_music_model = new MyMusicTreeModel;
m_ctrl[0]->AssociateModel( m_music_model.get() ); m_ctrl[0]->AssociateModel( m_music_model.get() );

51
samples/dialogs/dialogs.cpp
View File

@@ -676,10 +676,8 @@ MyFrame::MyFrame(const wxString& title)
m_infoBarAdvanced->AddButton(wxID_UNDO); m_infoBarAdvanced->AddButton(wxID_UNDO);
m_infoBarAdvanced->AddButton(wxID_REDO); m_infoBarAdvanced->AddButton(wxID_REDO);
m_infoBarAdvanced->Connect(wxID_REDO, wxEVT_BUTTON, m_infoBarAdvanced->Bind(wxEVT_BUTTON, &MyFrame::OnInfoBarRedo, this,
wxCommandEventHandler(MyFrame::OnInfoBarRedo), wxID_REDO);
NULL,
this);
// adding and removing a button immediately doesn't make sense here, of // adding and removing a button immediately doesn't make sense here, of
// course, it's done just to show that it is possible // course, it's done just to show that it is possible
@@ -723,8 +721,8 @@ MyFrame::MyFrame(const wxString& title)
static const int DIALOGS_SYSTEM_ABOUT = 0x4010; static const int DIALOGS_SYSTEM_ABOUT = 0x4010;
menu->Append(DIALOGS_SYSTEM_ABOUT, "&About"); menu->Append(DIALOGS_SYSTEM_ABOUT, "&About");
Connect(DIALOGS_SYSTEM_ABOUT, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::ShowSimpleAboutDialog, this,
wxCommandEventHandler(MyFrame::ShowSimpleAboutDialog)); DIALOGS_SYSTEM_ABOUT);
} }
#endif // __WXMSW__ #endif // __WXMSW__
} }
@@ -966,7 +964,8 @@ void MyFrame::MessageBoxWindowModal(wxCommandEvent& WXUNUSED(event))
"so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used."; "so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
} }
dialog->SetExtendedMessage(extmsg); dialog->SetExtendedMessage(extmsg);
dialog->Connect( wxEVT_WINDOW_MODAL_DIALOG_CLOSED, wxWindowModalDialogEventHandler(MyFrame::MessageBoxWindowModalClosed), NULL, this ); dialog->Bind(wxEVT_WINDOW_MODAL_DIALOG_CLOSED,
&MyFrame::MessageBoxWindowModalClosed, this);
dialog->ShowWindowModal(); dialog->ShowWindowModal();
} }
@@ -1513,12 +1512,9 @@ MyExtraPanel::MyExtraPanel(wxWindow *parent)
m_btn = new wxButton(this, -1, wxT("Custom Button")); m_btn = new wxButton(this, -1, wxT("Custom Button"));
m_btn->Enable(false); m_btn->Enable(false);
m_cb = new wxCheckBox(this, -1, wxT("Enable Custom Button")); m_cb = new wxCheckBox(this, -1, wxT("Enable Custom Button"));
m_cb->Connect(wxEVT_CHECKBOX, m_cb->Bind(wxEVT_CHECKBOX, &MyExtraPanel::OnCheckBox, this);
wxCommandEventHandler(MyExtraPanel::OnCheckBox), NULL, this);
m_label = new wxStaticText(this, wxID_ANY, "Nothing selected"); m_label = new wxStaticText(this, wxID_ANY, "Nothing selected");
m_label->Connect(wxEVT_UPDATE_UI, m_label->Bind(wxEVT_UPDATE_UI, &MyExtraPanel::OnUpdateLabelUI, this);
wxUpdateUIEventHandler(MyExtraPanel::OnUpdateLabelUI),
NULL, this);
m_text = new wxTextCtrl(this, -1, m_str, m_text = new wxTextCtrl(this, -1, m_str,
wxDefaultPosition, wxSize(40*GetCharWidth(), -1)); wxDefaultPosition, wxSize(40*GetCharWidth(), -1));
@@ -2416,21 +2412,8 @@ public:
// And connect the event handlers. // And connect the event handlers.
btnShowText->Connect btnShowText->Bind(wxEVT_BUTTON, &RichTipDialog::OnShowTipForText, this);
( btnShowBtn->Bind(wxEVT_BUTTON, &RichTipDialog::OnShowTipForBtn, this);
wxEVT_BUTTON,
wxCommandEventHandler(RichTipDialog::OnShowTipForText),
NULL,
this
);
btnShowBtn->Connect
(
wxEVT_BUTTON,
wxCommandEventHandler(RichTipDialog::OnShowTipForBtn),
NULL,
this
);
} }
private: private:
@@ -3624,11 +3607,8 @@ bool TestMessageBoxDialog::Create()
m_labels[n] = new wxTextCtrl(this, wxID_ANY); m_labels[n] = new wxTextCtrl(this, wxID_ANY);
sizerBtns->Add(m_labels[n], wxSizerFlags().Expand()); sizerBtns->Add(m_labels[n], wxSizerFlags().Expand());
m_labels[n]->Connect(wxEVT_UPDATE_UI, m_labels[n]->Bind(wxEVT_UPDATE_UI,
wxUpdateUIEventHandler( &TestMessageBoxDialog::OnUpdateLabelUI, this);
TestMessageBoxDialog::OnUpdateLabelUI),
NULL,
this);
} }
sizerBtnsBox->Add(sizerBtns, wxSizerFlags().Expand()); sizerBtnsBox->Add(sizerBtns, wxSizerFlags().Expand());
@@ -3663,11 +3643,8 @@ bool TestMessageBoxDialog::Create()
sizerFlags = new wxStaticBoxSizer(wxHORIZONTAL, this, "&Other flags"); sizerFlags = new wxStaticBoxSizer(wxHORIZONTAL, this, "&Other flags");
m_chkNoDefault = new wxCheckBox(this, wxID_ANY, "Make \"No\" &default"); m_chkNoDefault = new wxCheckBox(this, wxID_ANY, "Make \"No\" &default");
m_chkNoDefault->Connect(wxEVT_UPDATE_UI, m_chkNoDefault->Bind(wxEVT_UPDATE_UI,
wxUpdateUIEventHandler( &TestMessageBoxDialog::OnUpdateNoDefaultUI, this);
TestMessageBoxDialog::OnUpdateNoDefaultUI),
NULL,
this);
sizerFlags->Add(m_chkNoDefault, wxSizerFlags().Border()); sizerFlags->Add(m_chkNoDefault, wxSizerFlags().Border());
m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent"); m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent");

8
samples/dll/my_dll.cpp
View File

@@ -147,12 +147,8 @@ MyDllApp::MyDllApp()
// by shutting the thread down when it's no longer needed, though. // by shutting the thread down when it's no longer needed, though.
SetExitOnFrameDelete(false); SetExitOnFrameDelete(false);
Connect(CMD_SHOW_WINDOW, Bind(wxEVT_THREAD, &MyDllApp::OnShowWindow, this, CMD_SHOW_WINDOW);
wxEVT_THREAD, Bind(wxEVT_THREAD, &MyDllApp::OnTerminate, this, CMD_TERMINATE);
wxThreadEventHandler(MyDllApp::OnShowWindow));
Connect(CMD_TERMINATE,
wxEVT_THREAD,
wxThreadEventHandler(MyDllApp::OnTerminate));
} }
void MyDllApp::OnShowWindow(wxThreadEvent& event) void MyDllApp::OnShowWindow(wxThreadEvent& event)

9
samples/dnd/dnd.cpp
View File

@@ -1018,14 +1018,7 @@ DnDFrame::DnDFrame()
m_ctrlText->SetDropTarget(new DnDText(m_ctrlText)); m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_ctrlDir->Connect m_ctrlDir->Bind(wxEVT_TREE_BEGIN_DRAG, &DnDFrame::OnBeginDrag, this);
(
wxID_ANY,
wxEVT_TREE_BEGIN_DRAG,
wxTreeEventHandler(DnDFrame::OnBeginDrag),
NULL,
this
);
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
#if wxUSE_LOG #if wxUSE_LOG

8
samples/docview/doc.cpp
View File

@@ -193,13 +193,7 @@ bool wxTextDocument::OnCreate(const wxString& path, long flags)
// subscribe to changes in the text control to update the document state // subscribe to changes in the text control to update the document state
// when it's modified // when it's modified
GetTextCtrl()->Connect GetTextCtrl()->Bind(wxEVT_TEXT, &wxTextDocument::OnTextChange, this);
(
wxEVT_TEXT,
wxCommandEventHandler(wxTextDocument::OnTextChange),
NULL,
this
);
return true; return true;
} }

3
samples/erase/erase.cpp
View File

@@ -159,8 +159,7 @@ public:
} }
Create (parent, wxID_ANY, pos, size, wxBORDER_NONE); Create (parent, wxID_ANY, pos, size, wxBORDER_NONE);
Connect(wxEVT_PAINT, Bind(wxEVT_PAINT, &ControlWithTransparency::OnPaint, this);
wxPaintEventHandler(ControlWithTransparency::OnPaint));
if ( !reason.empty() ) if ( !reason.empty() )
{ {

30
samples/event/event.cpp
View File

@@ -92,8 +92,7 @@ public:
: wxButton(parent, BUTTON_ID, label) : wxButton(parent, BUTTON_ID, label)
{ {
// Add a dynamic handler for this button event to button itself // Add a dynamic handler for this button event to button itself
Connect(wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MyEvtTestButton::OnClickDynamicHandler, this);
wxCommandEventHandler(MyEvtTestButton::OnClickDynamicHandler));
} }
private: private:
@@ -307,8 +306,8 @@ bool MyApp::OnInit()
frame->Show(true); frame->Show(true);
// Add a dynamic handler at the application level for the test button // Add a dynamic handler at the application level for the test button
Connect(MyEvtTestButton::BUTTON_ID, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MyApp::OnClickDynamicHandlerApp, this,
wxCommandEventHandler(MyApp::OnClickDynamicHandlerApp)); MyEvtTestButton::BUTTON_ID);
// success: wxApp::OnRun() will be called which will enter the main message // 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
@@ -427,15 +426,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// event handlers (see class definition); // event handlers (see class definition);
// Add a dynamic handler for this button event in the parent frame // Add a dynamic handler for this button event in the parent frame
Connect(m_testBtn->GetId(), wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MyFrame::OnClickDynamicHandlerFrame, this,
wxCommandEventHandler(MyFrame::OnClickDynamicHandlerFrame)); m_testBtn->GetId());
// Bind a method of this frame (notice "this" argument!) to the button // Bind a method of this frame (notice "this" argument!) to the button
// itself // itself
m_testBtn->Connect(wxEVT_BUTTON, m_testBtn->Bind(wxEVT_BUTTON, &MyFrame::OnClickDynamicHandlerButton, this);
wxCommandEventHandler(MyFrame::OnClickDynamicHandlerButton),
NULL,
this);
mainSizer->Add(m_testBtn); mainSizer->Add(m_testBtn);
panel->SetSizer(mainSizer); panel->SetSizer(mainSizer);
@@ -545,19 +541,13 @@ void MyFrame::OnConnect(wxCommandEvent& event)
{ {
if ( event.IsChecked() ) if ( event.IsChecked() )
{ {
m_btnDynamic->Connect(wxID_ANY, wxEVT_BUTTON, m_btnDynamic->Bind(wxEVT_BUTTON, &MyFrame::OnDynamic, this);
wxCommandEventHandler(MyFrame::OnDynamic), Bind(wxEVT_MENU, &MyFrame::OnDynamic, this, Event_Dynamic);
NULL, this);
Connect(Event_Dynamic, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnDynamic));
} }
else // disconnect else // disconnect
{ {
m_btnDynamic->Disconnect(wxID_ANY, wxEVT_BUTTON, m_btnDynamic->Unbind(wxEVT_BUTTON, &MyFrame::OnDynamic, this);
wxCommandEventHandler(MyFrame::OnDynamic), Unbind(wxEVT_MENU, &MyFrame::OnDynamic, this, Event_Dynamic);
NULL, this);
Disconnect(Event_Dynamic, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnDynamic));
} }
UpdateDynamicStatus(event.IsChecked()); UpdateDynamicStatus(event.IsChecked());

36
samples/fswatcher/fswatcher.cpp
View File

@@ -180,8 +180,7 @@ MyFrame::MyFrame(const wxString& title)
_("If checked, dereference symlinks") _("If checked, dereference symlinks")
); );
it->Check(false); it->Check(false);
Connect(MENU_ID_DEREFERENCE, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::OnFollowLinks, this, MENU_ID_DEREFERENCE);
wxCommandEventHandler(MyFrame::OnFollowLinks));
#endif // __UNIX__ #endif // __UNIX__
// the "About" item should be in the help menu // the "About" item should be in the help menu
@@ -267,28 +266,18 @@ MyFrame::MyFrame(const wxString& title)
// event handlers & show // event handlers & show
// menu // menu
Connect(MENU_ID_CLEAR, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::OnClear, this, MENU_ID_CLEAR);
wxCommandEventHandler(MyFrame::OnClear)); Bind(wxEVT_MENU, &MyFrame::OnQuit, this, MENU_ID_QUIT);
Connect(MENU_ID_QUIT, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::OnWatch, this, MENU_ID_WATCH);
wxCommandEventHandler(MyFrame::OnQuit)); Bind(wxEVT_MENU, &MyFrame::OnAbout, this, wxID_ABOUT);
Connect(MENU_ID_WATCH, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnWatch));
Connect(wxID_ABOUT, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnAbout));
// buttons // buttons
Connect(BTN_ID_ADD, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MyFrame::OnAdd, this, BTN_ID_ADD);
wxCommandEventHandler(MyFrame::OnAdd)); Bind(wxEVT_BUTTON, &MyFrame::OnAddTree, this, BTN_ID_ADD_TREE);
Connect(BTN_ID_ADD_TREE, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MyFrame::OnRemove, this, BTN_ID_REMOVE);
wxCommandEventHandler(MyFrame::OnAddTree)); Bind(wxEVT_UPDATE_UI, &MyFrame::OnRemoveUpdateUI, this, BTN_ID_REMOVE);
Connect(BTN_ID_REMOVE, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MyFrame::OnRemoveAll, this, BTN_ID_REMOVE_ALL);
wxCommandEventHandler(MyFrame::OnRemove)); Bind(wxEVT_UPDATE_UI, &MyFrame::OnRemoveAllUpdateUI, this, BTN_ID_REMOVE_ALL);
Connect(BTN_ID_REMOVE, wxEVT_UPDATE_UI,
wxUpdateUIEventHandler(MyFrame::OnRemoveUpdateUI));
Connect(BTN_ID_REMOVE_ALL, wxEVT_BUTTON,
wxCommandEventHandler(MyFrame::OnRemoveAll));
Connect(BTN_ID_REMOVE_ALL, wxEVT_UPDATE_UI,
wxUpdateUIEventHandler(MyFrame::OnRemoveAllUpdateUI));
// and show itself (the frames, unlike simple controls, are not shown when // and show itself (the frames, unlike simple controls, are not shown when
// created initially) // created initially)
@@ -306,8 +295,7 @@ bool MyFrame::CreateWatcherIfNecessary()
return false; return false;
CreateWatcher(); CreateWatcher();
Connect(wxEVT_FSWATCHER, Bind(wxEVT_FSWATCHER, &MyFrame::OnFileSystemEvent, this);
wxFileSystemWatcherEventHandler(MyFrame::OnFileSystemEvent));
return true; return true;
} }

12
samples/grid/griddemo.cpp
View File

@@ -719,8 +719,7 @@ void GridFrame::SetTabBehaviour(wxCommandEvent& event)
{ {
// To make any built-in behaviour work, we need to disable the custom TAB // To make any built-in behaviour work, we need to disable the custom TAB
// handler, otherwise it would be overriding them. // handler, otherwise it would be overriding them.
grid->Disconnect(wxEVT_GRID_TABBING, grid->Unbind(wxEVT_GRID_TABBING, &GridFrame::OnGridCustomTab, this);
wxGridEventHandler(GridFrame::OnGridCustomTab));
grid->SetTabBehaviour( grid->SetTabBehaviour(
static_cast<wxGrid::TabBehaviour>(event.GetId() - ID_TAB_STOP) static_cast<wxGrid::TabBehaviour>(event.GetId() - ID_TAB_STOP)
@@ -729,9 +728,7 @@ void GridFrame::SetTabBehaviour(wxCommandEvent& event)
void GridFrame::SetTabCustomHandler(wxCommandEvent&) void GridFrame::SetTabCustomHandler(wxCommandEvent&)
{ {
grid->Connect(wxEVT_GRID_TABBING, grid->Bind(wxEVT_GRID_TABBING, &GridFrame::OnGridCustomTab, this);
wxGridEventHandler(GridFrame::OnGridCustomTab),
NULL, this);
} }
@@ -2349,10 +2346,7 @@ void GridFrame::OnGridRender( wxCommandEvent& event )
m_gridBitmap = bmp; m_gridBitmap = bmp;
canvas->Connect( wxEVT_PAINT, canvas->Bind( wxEVT_PAINT, &GridFrame::OnRenderPaint, this );
wxPaintEventHandler(GridFrame::OnRenderPaint),
NULL,
this );
frame->Show(); frame->Show();
} }

2
samples/image/image.cpp
View File

@@ -875,7 +875,7 @@ public:
m_bitmap = wxBitmap(m_image); m_bitmap = wxBitmap(m_image);
Connect(wxEVT_PAINT, wxPaintEventHandler(MyGraphicsFrame::OnPaint)); Bind(wxEVT_PAINT, &MyGraphicsFrame::OnPaint, this);
Show(); Show();
} }

2
samples/ipc/baseclient.cpp
View File

@@ -47,7 +47,7 @@ class MyClient;
class MyApp : public wxApp class MyApp : public wxApp
{ {
public: public:
MyApp() { Connect(wxEVT_IDLE, wxIdleEventHandler(MyApp::OnIdle)); } MyApp() { Bind(wxEVT_IDLE, &MyApp::OnIdle, this); }
virtual bool OnInit() wxOVERRIDE; virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE; virtual int OnExit() wxOVERRIDE;

49
samples/keyboard/keyboard.cpp
View File

@@ -224,35 +224,19 @@ MyFrame::MyFrame(const wxString& title)
// connect menu event handlers // connect menu event handlers
Connect(QuitID, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::OnQuit, this, QuitID);
wxCommandEventHandler(MyFrame::OnQuit)); Bind(wxEVT_MENU, &MyFrame::OnAbout, this, wxID_ABOUT);
Bind(wxEVT_MENU, &MyFrame::OnClear, this, ClearID);
Connect(wxID_ABOUT, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::OnSkipHook, this, SkipHook);
wxCommandEventHandler(MyFrame::OnAbout)); Bind(wxEVT_MENU, &MyFrame::OnSkipDown, this, SkipDown);
Bind(wxEVT_MENU, &MyFrame::OnInputWindowKind, this, IDInputCustom, IDInputText);
Connect(ClearID, wxEVT_MENU, Bind(wxEVT_MENU, &MyFrame::OnTestAccelA, this, TestAccelA);
wxCommandEventHandler(MyFrame::OnClear)); Bind(wxEVT_MENU, &MyFrame::OnTestAccelCtrlA, this, TestAccelCtrlA);
Bind(wxEVT_MENU, &MyFrame::OnTestAccelEsc, this, TestAccelEsc);
Connect(SkipHook, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnSkipHook));
Connect(SkipDown, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnSkipDown));
Connect(IDInputCustom, IDInputText, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnInputWindowKind));
Connect(TestAccelA, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnTestAccelA));
Connect(TestAccelCtrlA, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnTestAccelCtrlA));
Connect(TestAccelEsc, wxEVT_MENU,
wxCommandEventHandler(MyFrame::OnTestAccelEsc));
// notice that we don't connect OnCharHook() to the input window, unlike // notice that we don't connect OnCharHook() to the input window, unlike
// the usual key events this one is propagated upwards // the usual key events this one is propagated upwards
Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MyFrame::OnCharHook)); Bind(wxEVT_CHAR_HOOK, &MyFrame::OnCharHook, this);
// status bar is useful for showing the menu items help strings // status bar is useful for showing the menu items help strings
CreateStatusBar(); CreateStatusBar();
@@ -300,18 +284,13 @@ void MyFrame::DoCreateInputWindow(InputKind inputKind)
m_inputWin->SetForegroundColour(*wxWHITE); m_inputWin->SetForegroundColour(*wxWHITE);
// connect event handlers for the blue input window // connect event handlers for the blue input window
m_inputWin->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyFrame::OnKeyDown), m_inputWin->Bind(wxEVT_KEY_DOWN, &MyFrame::OnKeyDown, this);
NULL, this); m_inputWin->Bind(wxEVT_KEY_UP, &MyFrame::OnKeyUp, this);
m_inputWin->Connect(wxEVT_KEY_UP, wxKeyEventHandler(MyFrame::OnKeyUp), m_inputWin->Bind(wxEVT_CHAR, &MyFrame::OnChar, this);
NULL, this);
m_inputWin->Connect(wxEVT_CHAR, wxKeyEventHandler(MyFrame::OnChar),
NULL, this);
if ( inputKind == Input_Custom ) if ( inputKind == Input_Custom )
{ {
m_inputWin->Connect(wxEVT_PAINT, m_inputWin->Bind(wxEVT_PAINT, &MyFrame::OnPaintInputWin, this);
wxPaintEventHandler(MyFrame::OnPaintInputWin),
NULL, this);
} }
if ( oldWin ) if ( oldWin )

6
samples/layout/layout.cpp
View File

@@ -270,10 +270,8 @@ MyProportionsFrame::MyProportionsFrame(wxFrame *parent)
SetSizerAndFit(sizerTop); SetSizerAndFit(sizerTop);
// and connect the events // and connect the events
Connect(wxEVT_TEXT, Bind(wxEVT_TEXT, &MyProportionsFrame::OnProportionUpdated, this);
wxCommandEventHandler(MyProportionsFrame::OnProportionUpdated)); Bind(wxEVT_SPINCTRL, &MyProportionsFrame::OnProportionChanged, this);
Connect(wxEVT_SPINCTRL,
wxSpinEventHandler(MyProportionsFrame::OnProportionChanged));
} }
void MyProportionsFrame::UpdateProportions() void MyProportionsFrame::UpdateProportions()

4
samples/mdi/mdi.cpp
View File

@@ -220,14 +220,14 @@ MyFrame::MyFrame()
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
// connect it only now, after creating m_textWindow // connect it only now, after creating m_textWindow
Connect(wxEVT_SIZE, wxSizeEventHandler(MyFrame::OnSize)); Bind(wxEVT_SIZE, &MyFrame::OnSize, this);
} }
MyFrame::~MyFrame() MyFrame::~MyFrame()
{ {
// and disconnect it to prevent accessing already deleted m_textWindow in // and disconnect it to prevent accessing already deleted m_textWindow in
// the size event handler if it's called during destruction // the size event handler if it's called during destruction
Disconnect(wxEVT_SIZE, wxSizeEventHandler(MyFrame::OnSize)); Unbind(wxEVT_SIZE, &MyFrame::OnSize, this);
// also prevent its use as log target // also prevent its use as log target
delete wxLog::SetActiveTarget(NULL); delete wxLog::SetActiveTarget(NULL);

213
samples/mediaplayer/mediaplayer.cpp
View File

@@ -579,129 +579,48 @@ wxMediaPlayerFrame::wxMediaPlayerFrame(const wxString& title)
// //
// Connect events. // Connect events.
// //
// There are two ways in wxWidgets to use events -
// Message Maps and Connections.
//
// Message Maps are implemented by putting
// DECLARE_MESSAGE_MAP in your wxEvtHandler-derived
// class you want to use for events, such as wxMediaPlayerFrame.
//
// Then after your class declaration you put
// wxBEGIN_EVENT_TABLE(wxMediaPlayerFrame, wxFrame)
// EVT_XXX(XXX)...
// wxEND_EVENT_TABLE()
//
// Where wxMediaPlayerFrame is the class with the DECLARE_MESSAGE_MAP
// in it. EVT_XXX(XXX) are each of your handlers, such
// as EVT_MENU for menu events and the XXX inside
// is the parameters to the event macro - in the case
// of EVT_MENU the menu id and then the function to call.
//
// However, with wxEvtHandler::Connect you can avoid a
// global message map for your class and those annoying
// macros. You can also change the context in which
// the call the handler (more later).
//
// The downside is that due to the limitation that
// wxWidgets doesn't use templates in certain areas,
// You have to triple-cast the event function.
//
// There are five parameters to wxEvtHandler::Connect -
//
// The first is the id of the instance whose events
// you want to handle - i.e. a menu id for menus,
// a control id for controls (wxControl::GetId())
// and so on.
//
// The second is the event id. This is the same
// as the message maps (EVT_MENU) except prefixed
// with "wx" (wxEVT_MENU).
//
// The third is the function handler for the event -
// You need to cast it to the specific event handler
// type, then to a wxEventFunction, then to a
// wxObjectEventFunction - I.E.
// (wxObjectEventFunction)(wxEventFunction)
// (wxCommandEventFunction) &wxMediaPlayerFrame::MyHandler
//
// Or, you can use the new (2.5.5+) event handler
// conversion macros - for instance the above could
// be done as
// wxCommandEventHandler(wxMediaPlayerFrame::MyHandler)
// pretty simple, eh?
//
// The fourth is an optional userdata param -
// this is of historical relevance only and is
// there only for backwards compatibility.
//
// The fifth is the context in which to call the
// handler - by default (this param is optional)
// this. For example in your event handler
// if you were to call "this->MyFunc()"
// it would literally do this->MyFunc. However,
// if you were to pass myHandler as the fifth
// parameter, for instance, you would _really_
// be calling myHandler->MyFunc, even though
// the compiler doesn't really know it.
//
// //
// Menu events // Menu events
// //
this->Connect(wxID_EXIT, wxEVT_MENU, Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnQuit, this,
wxCommandEventHandler(wxMediaPlayerFrame::OnQuit)); wxID_EXIT);
Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnAbout, this,
this->Connect(wxID_ABOUT, wxEVT_MENU, wxID_ABOUT);
wxCommandEventHandler(wxMediaPlayerFrame::OnAbout)); Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnLoop, this,
wxID_LOOP);
this->Connect(wxID_LOOP, wxEVT_MENU, Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnShowInterface, this,
wxCommandEventHandler(wxMediaPlayerFrame::OnLoop)); wxID_SHOWINTERFACE);
Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenFileNewPage, this,
this->Connect(wxID_SHOWINTERFACE, wxEVT_MENU, wxID_OPENFILENEWPAGE);
wxCommandEventHandler(wxMediaPlayerFrame::OnShowInterface)); Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenFileSamePage, this,
wxID_OPENFILESAMEPAGE);
this->Connect(wxID_OPENFILENEWPAGE, wxEVT_MENU, Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenURLNewPage, this,
wxCommandEventHandler(wxMediaPlayerFrame::OnOpenFileNewPage)); wxID_OPENURLNEWPAGE);
Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenURLSamePage, this,
this->Connect(wxID_OPENFILESAMEPAGE, wxEVT_MENU, wxID_OPENURLSAMEPAGE);
wxCommandEventHandler(wxMediaPlayerFrame::OnOpenFileSamePage)); Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnCloseCurrentPage, this,
wxID_CLOSECURRENTPAGE);
this->Connect(wxID_OPENURLNEWPAGE, wxEVT_MENU, Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnPlay, this,
wxCommandEventHandler(wxMediaPlayerFrame::OnOpenURLNewPage)); wxID_PLAY);
Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnStop, this,
this->Connect(wxID_OPENURLSAMEPAGE, wxEVT_MENU, wxID_STOP);
wxCommandEventHandler(wxMediaPlayerFrame::OnOpenURLSamePage)); Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnNext, this,
wxID_NEXT);
this->Connect(wxID_CLOSECURRENTPAGE, wxEVT_MENU, Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnPrev, this,
wxCommandEventHandler(wxMediaPlayerFrame::OnCloseCurrentPage)); wxID_PREV);
Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnSelectBackend, this,
this->Connect(wxID_PLAY, wxEVT_MENU, wxID_SELECTBACKEND);
wxCommandEventHandler(wxMediaPlayerFrame::OnPlay));
this->Connect(wxID_STOP, wxEVT_MENU,
wxCommandEventHandler(wxMediaPlayerFrame::OnStop));
this->Connect(wxID_NEXT, wxEVT_MENU,
wxCommandEventHandler(wxMediaPlayerFrame::OnNext));
this->Connect(wxID_PREV, wxEVT_MENU,
wxCommandEventHandler(wxMediaPlayerFrame::OnPrev));
this->Connect(wxID_SELECTBACKEND, wxEVT_MENU,
wxCommandEventHandler(wxMediaPlayerFrame::OnSelectBackend));
// //
// Key events // Key events
// //
wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, wxTheApp->Bind(wxEVT_KEY_DOWN, &wxMediaPlayerFrame::OnKeyDown, this);
wxKeyEventHandler(wxMediaPlayerFrame::OnKeyDown),
(wxObject*)0, this);
// //
// Close events // Close events
// //
this->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, Bind(wxEVT_CLOSE_WINDOW, &wxMediaPlayerFrame::OnClose, this);
wxCloseEventHandler(wxMediaPlayerFrame::OnClose));
// //
// End of Events // End of Events
@@ -1710,58 +1629,50 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
// //
// ListCtrl events // ListCtrl events
// //
this->Connect( wxID_LISTCTRL, wxEVT_LIST_ITEM_ACTIVATED, Bind(wxEVT_LIST_ITEM_ACTIVATED, &wxMediaPlayerFrame::OnChangeSong, parentFrame,
wxListEventHandler(wxMediaPlayerFrame::OnChangeSong), wxID_LISTCTRL);
(wxObject*)0, parentFrame);
// //
// Slider events // Slider events
// //
this->Connect(wxID_SLIDER, wxEVT_SCROLL_THUMBTRACK, Bind(wxEVT_SCROLL_THUMBTRACK, &wxMediaPlayerNotebookPage::OnBeginSeek, this,
wxScrollEventHandler(wxMediaPlayerNotebookPage::OnBeginSeek)); wxID_SLIDER);
this->Connect(wxID_SLIDER, wxEVT_SCROLL_THUMBRELEASE, Bind(wxEVT_SCROLL_THUMBRELEASE, &wxMediaPlayerNotebookPage::OnEndSeek, this,
wxScrollEventHandler(wxMediaPlayerNotebookPage::OnEndSeek)); wxID_SLIDER);
this->Connect(wxID_PBSLIDER, wxEVT_SCROLL_THUMBRELEASE, Bind(wxEVT_SCROLL_THUMBRELEASE, &wxMediaPlayerNotebookPage::OnPBChange, this,
wxScrollEventHandler(wxMediaPlayerNotebookPage::OnPBChange)); wxID_PBSLIDER);
this->Connect(wxID_VOLSLIDER, wxEVT_SCROLL_THUMBRELEASE, Bind(wxEVT_SCROLL_THUMBRELEASE, &wxMediaPlayerNotebookPage::OnVolChange, this,
wxScrollEventHandler(wxMediaPlayerNotebookPage::OnVolChange)); wxID_VOLSLIDER);
// //
// Media Control events // Media Control events
// //
this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_PLAY, Bind(wxEVT_MEDIA_PLAY, &wxMediaPlayerNotebookPage::OnMediaPlay, this,
wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaPlay)); wxID_MEDIACTRL);
this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_PAUSE, Bind(wxEVT_MEDIA_PAUSE, &wxMediaPlayerNotebookPage::OnMediaPause, this,
wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaPause)); wxID_MEDIACTRL);
this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_STOP, Bind(wxEVT_MEDIA_STOP, &wxMediaPlayerNotebookPage::OnMediaStop, this,
wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaStop)); wxID_MEDIACTRL);
this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_FINISHED, Bind(wxEVT_MEDIA_FINISHED, &wxMediaPlayerNotebookPage::OnMediaFinished, this,
wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaFinished)); wxID_MEDIACTRL);
this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_LOADED, Bind(wxEVT_MEDIA_LOADED, &wxMediaPlayerFrame::OnMediaLoaded, parentFrame,
wxMediaEventHandler(wxMediaPlayerFrame::OnMediaLoaded), wxID_MEDIACTRL);
(wxObject*)0, parentFrame);
// //
// Button events // Button events
// //
this->Connect( wxID_BUTTONPREV, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnPrev, parentFrame,
wxCommandEventHandler(wxMediaPlayerFrame::OnPrev), wxID_BUTTONPREV);
(wxObject*)0, parentFrame); Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnPlay, parentFrame,
this->Connect( wxID_BUTTONPLAY, wxEVT_BUTTON, wxID_BUTTONPLAY);
wxCommandEventHandler(wxMediaPlayerFrame::OnPlay), Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnStop, parentFrame,
(wxObject*)0, parentFrame); wxID_BUTTONSTOP);
this->Connect( wxID_BUTTONSTOP, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnNext, parentFrame,
wxCommandEventHandler(wxMediaPlayerFrame::OnStop), wxID_BUTTONNEXT);
(wxObject*)0, parentFrame); Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnVolumeDown, parentFrame,
this->Connect( wxID_BUTTONNEXT, wxEVT_BUTTON, wxID_BUTTONVD);
wxCommandEventHandler(wxMediaPlayerFrame::OnNext), Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnVolumeUp, parentFrame,
(wxObject*)0, parentFrame); wxID_BUTTONVU);
this->Connect( wxID_BUTTONVD, wxEVT_BUTTON,
wxCommandEventHandler(wxMediaPlayerFrame::OnVolumeDown),
(wxObject*)0, parentFrame);
this->Connect( wxID_BUTTONVU, wxEVT_BUTTON,
wxCommandEventHandler(wxMediaPlayerFrame::OnVolumeUp),
(wxObject*)0, parentFrame);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
samples/popup/popup.cpp
View File

@@ -116,9 +116,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent, bool scrolled )
// Keep this code to verify if mouse events work, they're required if // Keep this code to verify if mouse events work, they're required if
// you're making a control like a combobox where the items are highlighted // you're making a control like a combobox where the items are highlighted
// under the cursor, the m_panel is set focus in the Popup() function // under the cursor, the m_panel is set focus in the Popup() function
m_panel->Connect(wxEVT_MOTION, m_panel->Bind(wxEVT_MOTION, &SimpleTransientPopup::OnMouse, this);
wxMouseEventHandler(SimpleTransientPopup::OnMouse),
NULL, this);
wxStaticText *text = new wxStaticText( m_panel, wxID_ANY, wxStaticText *text = new wxStaticText( m_panel, wxID_ANY,
wxT("wxPopupTransientWindow is a\n") wxT("wxPopupTransientWindow is a\n")

8
samples/propgrid/propgrid.cpp
View File

@@ -1969,14 +1969,6 @@ void FormMain::CreateGrid( int style, int extraStyle )
//m_pPropGridManager->SetSplitterLeft(true); //m_pPropGridManager->SetSplitterLeft(true);
//m_pPropGridManager->SetSplitterPosition(137); //m_pPropGridManager->SetSplitterPosition(137);
/*
// This would setup event handling without event table entries
Connect(m_pPropGridManager->GetId(), wxEVT_PG_SELECTED,
wxPropertyGridEventHandler(FormMain::OnPropertyGridSelect) );
Connect(m_pPropGridManager->GetId(), wxEVT_PG_CHANGED,
wxPropertyGridEventHandler(FormMain::OnPropertyGridChange) );
*/
m_topSizer->Add( m_pPropGridManager, wxSizerFlags(1).Expand()); m_topSizer->Add( m_pPropGridManager, wxSizerFlags(1).Expand());
FinalizePanel(wasCreated); FinalizePanel(wasCreated);

20
samples/scroll/scroll.cpp
View File

@@ -49,7 +49,7 @@ public:
SetVirtualSize( WIDTH, HEIGHT ); SetVirtualSize( WIDTH, HEIGHT );
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( *wxWHITE );
Connect(wxEVT_PAINT, wxPaintEventHandler(MySimpleCanvas::OnPaint)); Bind(wxEVT_PAINT, &MySimpleCanvas::OnPaint, this);
} }
private: private:
@@ -125,10 +125,8 @@ public:
mbar->Append(menuFile, "&File"); mbar->Append(menuFile, "&File");
SetMenuBar( mbar ); SetMenuBar( mbar );
Connect(wxID_DELETE, wxEVT_MENU, Bind(wxEVT_MENU, &MyCanvasFrame::OnDeleteAll, this, wxID_DELETE);
wxCommandEventHandler(MyCanvasFrame::OnDeleteAll)); Bind(wxEVT_MENU, &MyCanvasFrame::OnInsertNew, this, wxID_NEW);
Connect(wxID_NEW, wxEVT_MENU,
wxCommandEventHandler(MyCanvasFrame::OnInsertNew));
Show(); Show();
} }
@@ -197,7 +195,7 @@ public:
{ {
m_owner = parent; m_owner = parent;
Connect(wxEVT_PAINT, wxPaintEventHandler(MySubColLabels::OnPaint)); Bind(wxEVT_PAINT, &MySubColLabels::OnPaint, this);
} }
private: private:
@@ -232,7 +230,7 @@ public:
{ {
m_owner = parent; m_owner = parent;
Connect(wxEVT_PAINT, wxPaintEventHandler(MySubRowLabels::OnPaint)); Bind(wxEVT_PAINT, &MySubRowLabels::OnPaint, this);
} }
private: private:
@@ -289,7 +287,7 @@ public:
SetBackgroundColour("WHEAT"); SetBackgroundColour("WHEAT");
Connect(wxEVT_PAINT, wxPaintEventHandler(MySubCanvas::OnPaint)); Bind(wxEVT_PAINT, &MySubCanvas::OnPaint, this);
} }
// override the base class function so that when this window is scrolled, // override the base class function so that when this window is scrolled,
@@ -396,7 +394,7 @@ public:
SetScrollbars(10, 10, 50, 50); SetScrollbars(10, 10, 50, 50);
Connect(wxEVT_SIZE, wxSizeEventHandler(MySubScrolledWindow::OnSize)); Bind(wxEVT_SIZE, &MySubScrolledWindow::OnSize, this);
} }
protected: protected:
@@ -808,8 +806,8 @@ MySizerScrolledWindow::MySizerScrolledWindow(wxWindow *parent)
SetSizer( sizer ); SetSizer( sizer );
Connect(wxID_RESIZE_FRAME, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &MySizerScrolledWindow::OnResizeClick, this,
wxCommandEventHandler(MySizerScrolledWindow::OnResizeClick)); wxID_RESIZE_FRAME);
} }
void MySizerScrolledWindow::OnResizeClick(wxCommandEvent &WXUNUSED(event)) void MySizerScrolledWindow::OnResizeClick(wxCommandEvent &WXUNUSED(event))

2
samples/shaped/shaped.cpp
View File

@@ -172,7 +172,7 @@ public:
ShowWithEffect(m_effect, m_timeout); ShowWithEffect(m_effect, m_timeout);
Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(EffectFrame::OnClose)); Bind(wxEVT_CLOSE_WINDOW, &EffectFrame::OnClose, this);
} }
private: private:

2
samples/taborder/taborder.cpp
View File

@@ -134,7 +134,7 @@ public:
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
flags) flags)
{ {
Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyTabTextCtrl::OnKeyDown)); Bind(wxEVT_KEY_DOWN, &MyTabTextCtrl::OnKeyDown, this);
} }
private: private:

188
samples/webview/webview.cpp
View File

@@ -474,140 +474,80 @@ WebFrame::WebFrame(const wxString& url) :
// Connect the toolbar events // Connect the toolbar events
Connect(m_toolbar_back->GetId(), wxEVT_TOOL, Bind(wxEVT_TOOL, &WebFrame::OnBack, this, m_toolbar_back->GetId());
wxCommandEventHandler(WebFrame::OnBack), NULL, this ); Bind(wxEVT_TOOL, &WebFrame::OnForward, this, m_toolbar_forward->GetId());
Connect(m_toolbar_forward->GetId(), wxEVT_TOOL, Bind(wxEVT_TOOL, &WebFrame::OnStop, this, m_toolbar_stop->GetId());
wxCommandEventHandler(WebFrame::OnForward), NULL, this ); Bind(wxEVT_TOOL, &WebFrame::OnReload, this, m_toolbar_reload->GetId());
Connect(m_toolbar_stop->GetId(), wxEVT_TOOL, Bind(wxEVT_TOOL, &WebFrame::OnToolsClicked, this, m_toolbar_tools->GetId());
wxCommandEventHandler(WebFrame::OnStop), NULL, this );
Connect(m_toolbar_reload->GetId(), wxEVT_TOOL,
wxCommandEventHandler(WebFrame::OnReload),NULL, this );
Connect(m_toolbar_tools->GetId(), wxEVT_TOOL,
wxCommandEventHandler(WebFrame::OnToolsClicked), NULL, this );
Connect(m_url->GetId(), wxEVT_TEXT_ENTER, Bind(wxEVT_TEXT_ENTER, &WebFrame::OnUrl, this, m_url->GetId());
wxCommandEventHandler(WebFrame::OnUrl), NULL, this );
// Connect find toolbar events. // Connect find toolbar events.
Connect(m_find_toolbar_done->GetId(), wxEVT_TOOL, Bind(wxEVT_TOOL, &WebFrame::OnFindDone, this, m_find_toolbar_done->GetId());
wxCommandEventHandler(WebFrame::OnFindDone), NULL, this ); Bind(wxEVT_TOOL, &WebFrame::OnFindText, this, m_find_toolbar_next->GetId());
Connect(m_find_toolbar_next->GetId(), wxEVT_TOOL, Bind(wxEVT_TOOL, &WebFrame::OnFindText, this, m_find_toolbar_previous->GetId());
wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
Connect(m_find_toolbar_previous->GetId(), wxEVT_TOOL,
wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
// Connect find control events. // Connect find control events.
Connect(m_find_ctrl->GetId(), wxEVT_TEXT, Bind(wxEVT_TEXT, &WebFrame::OnFindText, this, m_find_ctrl->GetId());
wxCommandEventHandler(WebFrame::OnFindText), NULL, this ); Bind(wxEVT_TEXT_ENTER, &WebFrame::OnFindText, this, m_find_ctrl->GetId());
Connect(m_find_ctrl->GetId(), wxEVT_TEXT_ENTER,
wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
// Connect the webview events // Connect the webview events
Connect(m_browser->GetId(), wxEVT_WEBVIEW_NAVIGATING, Bind(wxEVT_WEBVIEW_NAVIGATING, &WebFrame::OnNavigationRequest, this, m_browser->GetId());
wxWebViewEventHandler(WebFrame::OnNavigationRequest), NULL, this); Bind(wxEVT_WEBVIEW_NAVIGATED, &WebFrame::OnNavigationComplete, this, m_browser->GetId());
Connect(m_browser->GetId(), wxEVT_WEBVIEW_NAVIGATED, Bind(wxEVT_WEBVIEW_LOADED, &WebFrame::OnDocumentLoaded, this, m_browser->GetId());
wxWebViewEventHandler(WebFrame::OnNavigationComplete), NULL, this); Bind(wxEVT_WEBVIEW_ERROR, &WebFrame::OnError, this, m_browser->GetId());
Connect(m_browser->GetId(), wxEVT_WEBVIEW_LOADED, Bind(wxEVT_WEBVIEW_NEWWINDOW, &WebFrame::OnNewWindow, this, m_browser->GetId());
wxWebViewEventHandler(WebFrame::OnDocumentLoaded), NULL, this); Bind(wxEVT_WEBVIEW_TITLE_CHANGED, &WebFrame::OnTitleChanged, this, m_browser->GetId());
Connect(m_browser->GetId(), wxEVT_WEBVIEW_ERROR,
wxWebViewEventHandler(WebFrame::OnError), NULL, this);
Connect(m_browser->GetId(), wxEVT_WEBVIEW_NEWWINDOW,
wxWebViewEventHandler(WebFrame::OnNewWindow), NULL, this);
Connect(m_browser->GetId(), wxEVT_WEBVIEW_TITLE_CHANGED,
wxWebViewEventHandler(WebFrame::OnTitleChanged), NULL, this);
// Connect the menu events // Connect the menu events
Connect(setPage->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnSetPage, this, setPage->GetId());
wxCommandEventHandler(WebFrame::OnSetPage), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnViewSourceRequest, this, viewSource->GetId());
Connect(viewSource->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnViewTextRequest, this, viewText->GetId());
wxCommandEventHandler(WebFrame::OnViewSourceRequest), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnPrint, this, print->GetId());
Connect(viewText->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnZoomLayout, this, m_tools_layout->GetId());
wxCommandEventHandler(WebFrame::OnViewTextRequest), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_tiny->GetId());
Connect(print->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_small->GetId());
wxCommandEventHandler(WebFrame::OnPrint), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_medium->GetId());
Connect(m_tools_layout->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_large->GetId());
wxCommandEventHandler(WebFrame::OnZoomLayout), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_largest->GetId());
Connect(m_tools_tiny->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnClearHistory, this, clearhist->GetId());
wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnEnableHistory, this, m_tools_enable_history->GetId());
Connect(m_tools_small->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnCut, this, m_edit_cut->GetId());
wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnCopy, this, m_edit_copy->GetId());
Connect(m_tools_medium->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnPaste, this, m_edit_paste->GetId());
wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnUndo, this, m_edit_undo->GetId());
Connect(m_tools_large->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRedo, this, m_edit_redo->GetId());
wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnMode, this, m_edit_mode->GetId());
Connect(m_tools_largest->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnScrollLineUp, this, m_scroll_line_up->GetId());
wxCommandEventHandler(WebFrame::OnSetZoom), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnScrollLineDown, this, m_scroll_line_down->GetId());
Connect(clearhist->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnScrollPageUp, this, m_scroll_page_up->GetId());
wxCommandEventHandler(WebFrame::OnClearHistory), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnScrollPageDown, this, m_scroll_page_down->GetId());
Connect(m_tools_enable_history->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptString, this, m_script_string->GetId());
wxCommandEventHandler(WebFrame::OnEnableHistory), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnRunScriptInteger, this, m_script_integer->GetId());
Connect(m_edit_cut->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptDouble, this, m_script_double->GetId());
wxCommandEventHandler(WebFrame::OnCut), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnRunScriptBool, this, m_script_bool->GetId());
Connect(m_edit_copy->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptObject, this, m_script_object->GetId());
wxCommandEventHandler(WebFrame::OnCopy), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnRunScriptArray, this, m_script_array->GetId());
Connect(m_edit_paste->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptDOM, this, m_script_dom->GetId());
wxCommandEventHandler(WebFrame::OnPaste), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnRunScriptUndefined, this, m_script_undefined->GetId());
Connect(m_edit_undo->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptNull, this, m_script_null->GetId());
wxCommandEventHandler(WebFrame::OnUndo), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnRunScriptDate, this, m_script_date->GetId());
Connect(m_edit_redo->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRedo), NULL, this );
Connect(m_edit_mode->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnMode), NULL, this );
Connect(m_scroll_line_up->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnScrollLineUp), NULL, this );
Connect(m_scroll_line_down->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnScrollLineDown), NULL, this );
Connect(m_scroll_page_up->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnScrollPageUp), NULL, this );
Connect(m_scroll_page_down->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnScrollPageDown), NULL, this );
Connect(m_script_string->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptString), NULL, this );
Connect(m_script_integer->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptInteger), NULL, this );
Connect(m_script_double->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptDouble), NULL, this );
Connect(m_script_bool->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptBool), NULL, this );
Connect(m_script_object->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptObject), NULL, this );
Connect(m_script_array->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptArray), NULL, this );
Connect(m_script_dom->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptDOM), NULL, this );
Connect(m_script_undefined->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptUndefined), NULL, this );
Connect(m_script_null->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptNull), NULL, this );
Connect(m_script_date->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptDate), NULL, this );
#if wxUSE_WEBVIEW_IE #if wxUSE_WEBVIEW_IE
Connect(m_script_object_el->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptObjectWithEmulationLevel, this, m_script_object_el->GetId());
wxCommandEventHandler(WebFrame::OnRunScriptObjectWithEmulationLevel), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnRunScriptDateWithEmulationLevel, this, m_script_date_el->GetId());
Connect(m_script_date_el->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptArrayWithEmulationLevel, this, m_script_array_el->GetId());
wxCommandEventHandler(WebFrame::OnRunScriptDateWithEmulationLevel), NULL, this );
Connect(m_script_array_el->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnRunScriptArrayWithEmulationLevel), NULL, this );
#endif #endif
Connect(m_script_custom->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnRunScriptCustom, this, m_script_custom->GetId());
wxCommandEventHandler(WebFrame::OnRunScriptCustom), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnClearSelection, this, m_selection_clear->GetId());
Connect(m_selection_clear->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnDeleteSelection, this, m_selection_delete->GetId());
wxCommandEventHandler(WebFrame::OnClearSelection), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnSelectAll, this, selectall->GetId());
Connect(m_selection_delete->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnLoadScheme, this, loadscheme->GetId());
wxCommandEventHandler(WebFrame::OnDeleteSelection), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnUseMemoryFS, this, usememoryfs->GetId());
Connect(selectall->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnFind, this, m_find->GetId());
wxCommandEventHandler(WebFrame::OnSelectAll), NULL, this ); Bind(wxEVT_MENU, &WebFrame::OnEnableContextMenu, this, m_context_menu->GetId());
Connect(loadscheme->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnLoadScheme), NULL, this );
Connect(usememoryfs->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnUseMemoryFS), NULL, this );
Connect(m_find->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnFind), NULL, this );
Connect(m_context_menu->GetId(), wxEVT_MENU,
wxCommandEventHandler(WebFrame::OnEnableContextMenu), NULL, this );
//Connect the idle events //Connect the idle events
Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(WebFrame::OnIdle), NULL, this); Bind(wxEVT_IDLE, &WebFrame::OnIdle, this);
} }
WebFrame::~WebFrame() WebFrame::~WebFrame()
@@ -1011,8 +951,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
{ {
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, back[i]->GetTitle()); item = m_tools_history_menu->AppendRadioItem(wxID_ANY, back[i]->GetTitle());
m_histMenuItems[item->GetId()] = back[i]; m_histMenuItems[item->GetId()] = back[i];
Connect(item->GetId(), wxEVT_MENU, Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId());
wxCommandEventHandler(WebFrame::OnHistory), NULL, this );
} }
wxString title = m_browser->GetCurrentTitle(); wxString title = m_browser->GetCurrentTitle();
@@ -1028,8 +967,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
{ {
item = m_tools_history_menu->AppendRadioItem(wxID_ANY, forward[i]->GetTitle()); item = m_tools_history_menu->AppendRadioItem(wxID_ANY, forward[i]->GetTitle());
m_histMenuItems[item->GetId()] = forward[i]; m_histMenuItems[item->GetId()] = forward[i];
Connect(item->GetId(), wxEVT_TOOL, Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId());
wxCommandEventHandler(WebFrame::OnHistory), NULL, this );
} }
wxPoint position = ScreenToClient( wxGetMousePosition() ); wxPoint position = ScreenToClient( wxGetMousePosition() );

6
samples/widgets/searchctrl.cpp
View File

@@ -205,12 +205,6 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
wxString tipText = wxString::Format(wxT("tip %i"),i); wxString tipText = wxString::Format(wxT("tip %i"),i);
menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL); menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL);
} }
// target->Connect(
// ID_SEARCHMENU,
// ID_SEARCHMENU+SEARCH_MENU_SIZE,
// wxEVT_MENU,
// wxCommandEventHandler(MySearchCtrl::OnSearchMenu)
// );
return menu; return menu;
} }

11
samples/widgets/statbmp.cpp
View File

@@ -115,10 +115,8 @@ void StatBmpWidgetsPage::CreateContent()
wxInitAllImageHandlers(); wxInitAllImageHandlers();
Connect(wxEVT_FILEPICKER_CHANGED, Bind(wxEVT_FILEPICKER_CHANGED, &StatBmpWidgetsPage::OnFileChange, this);
wxFileDirPickerEventHandler(StatBmpWidgetsPage::OnFileChange)); Bind(wxEVT_RADIOBOX, &StatBmpWidgetsPage::OnRadioChange, this);
Connect(wxEVT_RADIOBOX,
wxCommandEventHandler(StatBmpWidgetsPage::OnRadioChange));
m_statbmp = NULL; m_statbmp = NULL;
RecreateWidget(); RecreateWidget();
@@ -171,9 +169,8 @@ void StatBmpWidgetsPage::RecreateWidget()
} }
m_sbsizer->Add(m_statbmp, wxSizerFlags(1).Expand()); m_sbsizer->Add(m_statbmp, wxSizerFlags(1).Expand());
GetSizer()->Layout(); GetSizer()->Layout();
m_statbmp->Connect(wxEVT_LEFT_DOWN, m_statbmp->Bind(wxEVT_LEFT_DOWN, &StatBmpWidgetsPage::OnMouseEvent, this);
wxMouseEventHandler(StatBmpWidgetsPage::OnMouseEvent),
NULL, this);
// When switching from generic to native control on wxMSW under Wine, // When switching from generic to native control on wxMSW under Wine,
// the explicit Refresh() is necessary // the explicit Refresh() is necessary
m_statbmp->Refresh(); m_statbmp->Refresh();

20
samples/widgets/static.cpp
View File

@@ -310,9 +310,7 @@ void StaticWidgetsPage::CreateContent()
m_textBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString); m_textBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
wxButton *b1 = new wxButton(this, wxID_ANY, "Change &box label"); wxButton *b1 = new wxButton(this, wxID_ANY, "Change &box label");
b1->Connect(wxEVT_BUTTON, b1->Bind(wxEVT_BUTTON, &StaticWidgetsPage::OnButtonBoxText, this);
wxCommandEventHandler(StaticWidgetsPage::OnButtonBoxText),
NULL, this);
sizerMiddle->Add(m_textBox, 0, wxEXPAND|wxALL, 5); sizerMiddle->Add(m_textBox, 0, wxEXPAND|wxALL, 5);
sizerMiddle->Add(b1, 0, wxLEFT|wxBOTTOM, 5); sizerMiddle->Add(b1, 0, wxLEFT|wxBOTTOM, 5);
@@ -320,9 +318,7 @@ void StaticWidgetsPage::CreateContent()
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE|wxHSCROLL); wxTE_MULTILINE|wxHSCROLL);
wxButton *b2 = new wxButton(this, wxID_ANY, "Change &text label"); wxButton *b2 = new wxButton(this, wxID_ANY, "Change &text label");
b2->Connect(wxEVT_BUTTON, b2->Bind(wxEVT_BUTTON, &StaticWidgetsPage::OnButtonLabelText, this);
wxCommandEventHandler(StaticWidgetsPage::OnButtonLabelText),
NULL, this);
sizerMiddle->Add(m_textLabel, 0, wxEXPAND|wxALL, 5); sizerMiddle->Add(m_textLabel, 0, wxEXPAND|wxALL, 5);
sizerMiddle->Add(b2, 0, wxLEFT|wxBOTTOM, 5); sizerMiddle->Add(b2, 0, wxLEFT|wxBOTTOM, 5);
@@ -332,9 +328,7 @@ void StaticWidgetsPage::CreateContent()
wxTE_MULTILINE|wxHSCROLL); wxTE_MULTILINE|wxHSCROLL);
wxButton *b3 = new wxButton(this, wxID_ANY, "Change decorated text label"); wxButton *b3 = new wxButton(this, wxID_ANY, "Change decorated text label");
b3->Connect(wxEVT_BUTTON, b3->Bind(wxEVT_BUTTON, &StaticWidgetsPage::OnButtonLabelWithMarkupText, this);
wxCommandEventHandler(StaticWidgetsPage::OnButtonLabelWithMarkupText),
NULL, this);
sizerMiddle->Add(m_textLabelWithMarkup, 0, wxEXPAND|wxALL, 5); sizerMiddle->Add(m_textLabelWithMarkup, 0, wxEXPAND|wxALL, 5);
sizerMiddle->Add(b3, 0, wxLEFT|wxBOTTOM, 5); sizerMiddle->Add(b3, 0, wxLEFT|wxBOTTOM, 5);
@@ -562,12 +556,8 @@ void StaticWidgetsPage::CreateStatic()
m_sizerStatic->Layout(); m_sizerStatic->Layout();
m_statText->Connect(wxEVT_LEFT_UP, m_statText->Bind(wxEVT_LEFT_UP, &StaticWidgetsPage::OnMouseEvent, this);
wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent), staticBox->Bind(wxEVT_LEFT_UP, &StaticWidgetsPage::OnMouseEvent, this);
NULL, this);
staticBox->Connect(wxEVT_LEFT_UP,
wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent),
NULL, this);
SetUpWidget(); SetUpWidget();
} }

4
samples/widgets/widgets.cpp
View File

@@ -628,9 +628,7 @@ void WidgetsFrame::InitBook()
} }
} }
Connect( wxID_ANY, Bind(wxEVT_COMMAND_WIDGETS_PAGE_CHANGED, &WidgetsFrame::OnPageChanged, this);
wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
const bool pageSet = wxPersistentRegisterAndRestore(m_book); const bool pageSet = wxPersistentRegisterAndRestore(m_book);

3
samples/wrapsizer/wrapsizer.cpp
View File

@@ -144,8 +144,7 @@ WrapSizerFrame::WrapSizerFrame()
// OK Button // OK Button
sizerRoot->Add(new wxButton(m_panel, wxID_OK), sizerRoot->Add(new wxButton(m_panel, wxID_OK),
wxSizerFlags().Centre().DoubleBorder()); wxSizerFlags().Centre().DoubleBorder());
Connect(wxID_OK, wxEVT_BUTTON, Bind(wxEVT_BUTTON, &WrapSizerFrame::OnButton, this, wxID_OK);
wxCommandEventHandler(WrapSizerFrame::OnButton));
// Set sizer for the panel // Set sizer for the panel
m_panel->SetSizer(sizerRoot); m_panel->SetSizer(sizerRoot);

4
samples/xrc/myframe.cpp
View File

@@ -261,8 +261,8 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
#if wxUSE_ANIMATIONCTRL #if wxUSE_ANIMATIONCTRL
// dynamically connect our event handler for the "clicked" event of the "play" button // dynamically connect our event handler for the "clicked" event of the "play" button
// in the animation ctrl page of our dialog // in the animation ctrl page of our dialog
dlg.Connect(XRCID("controls_animation_button_play"), wxEVT_BUTTON, dlg.Bind(wxEVT_BUTTON, &MyFrame::OnAnimationCtrlPlay, this,
wxCommandEventHandler(MyFrame::OnAnimationCtrlPlay)); XRCID("controls_animation_button_play"));
#endif #endif
// All done. Show the dialog. // All done. Show the dialog.

34
samples/xrc/objrefdlg.cpp
View File

@@ -48,38 +48,26 @@ ObjrefDialog::ObjrefDialog(wxWindow* parent)
wxCHECK_RET(nb, "failed to find objref_notebook"); wxCHECK_RET(nb, "failed to find objref_notebook");
// Connect different event handlers. // Connect different event handlers.
nb->Connect(wxEVT_NOTEBOOK_PAGE_CHANGED, nb->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &ObjrefDialog::OnNotebookPageChanged, this);
wxNotebookEventHandler(ObjrefDialog::OnNotebookPageChanged),
NULL, this);
// We want to direct UpdateUI events for the ID range 'first_row' to // We want to direct UpdateUI events for the ID range 'first_row' to
// OnUpdateUIFirst(). We could achieve this using first_row[0] and // OnUpdateUIFirst(). We could achieve this using first_row[0] and
// first_row[2], but what if a fourth column were added? It's safer to use // first_row[2], but what if a fourth column were added? It's safer to use
// the 'typedefs' for the two ends of the range: // the 'typedefs' for the two ends of the range:
wxNotebookPage *page = nb->GetPage(icons_page); wxNotebookPage *page = nb->GetPage(icons_page);
page->Connect(XRCID("first_row[start]"), XRCID("first_row[end]"), page->Bind(wxEVT_UPDATE_UI, &ObjrefDialog::OnUpdateUIFirst, this,
wxEVT_UPDATE_UI, XRCID("first_row[start]"), XRCID("first_row[end]"));
wxUpdateUIEventHandler(ObjrefDialog::OnUpdateUIFirst), page->Bind(wxEVT_UPDATE_UI, &ObjrefDialog::OnUpdateUISecond, this,
NULL, this); XRCID("second_row[start]"), XRCID("second_row[end]"));
page->Connect(XRCID("second_row[start]"), XRCID("second_row[end]"), page->Bind(wxEVT_UPDATE_UI, &ObjrefDialog::OnUpdateUIThird, this,
wxEVT_UPDATE_UI, XRCID("third_row[start]"), XRCID("third_row[end]"));
wxUpdateUIEventHandler(ObjrefDialog::OnUpdateUISecond),
NULL, this);
page->Connect(XRCID("third_row[start]"), XRCID("third_row[end]"),
wxEVT_UPDATE_UI,
wxUpdateUIEventHandler(ObjrefDialog::OnUpdateUIThird),
NULL, this);
// Connect the id ranges, using the [start] and [end] 'typedefs' // Connect the id ranges, using the [start] and [end] 'typedefs'
page = nb->GetPage(calc_page); page = nb->GetPage(calc_page);
page->Connect(XRCID("digits[start]"), XRCID("digits[end]"), page->Bind(wxEVT_BUTTON, &ObjrefDialog::OnNumeralClick, this,
wxEVT_BUTTON, XRCID("digits[start]"), XRCID("digits[end]"));
wxCommandEventHandler(ObjrefDialog::OnNumeralClick), page->Bind(wxEVT_BUTTON, &ObjrefDialog::OnOperatorClick, this,
NULL, this); XRCID("operators[start]"), XRCID("operators[end]"));
page->Connect(XRCID("operators[start]"), XRCID("operators[end]"),
wxEVT_BUTTON,
wxCommandEventHandler(ObjrefDialog::OnOperatorClick),
NULL, this);
} }

42
tests/menu/menu.cpp
View File

@@ -488,30 +488,17 @@ void MenuTestCase::ChangeBitmap()
wxDELETE(menu); wxDELETE(menu);
} }
void MenuTestCase::Events()
{
#ifdef __WXGTK__
// FIXME: For some reason, we sporadically fail to get the event in
// buildbot slave builds even though the test always passes locally.
// There is undoubtedly something wrong here but without being able
// to debug it, I have no idea what is it, so let's just disable
// this test when running under buildbot to let the entire test
// suite pass.
if ( IsAutomaticTest() )
return;
#endif // __WXGTK__
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
// In C++98 this class can't be defined inside Events() method, unfortunately,
// as its OnMenu() method wouldn't be usable with template Bind() then.
class MenuEventHandler : public wxEvtHandler class MenuEventHandler : public wxEvtHandler
{ {
public: public:
MenuEventHandler(wxWindow* win) MenuEventHandler(wxWindow* win)
: m_win(win) : m_win(win)
{ {
m_win->Connect(wxEVT_MENU, m_win->Bind(wxEVT_MENU, &MenuEventHandler::OnMenu, this);
wxCommandEventHandler(MenuEventHandler::OnMenu),
NULL,
this);
m_gotEvent = false; m_gotEvent = false;
m_event = NULL; m_event = NULL;
@@ -519,10 +506,7 @@ void MenuTestCase::Events()
virtual ~MenuEventHandler() virtual ~MenuEventHandler()
{ {
m_win->Disconnect(wxEVT_MENU, m_win->Unbind(wxEVT_MENU, &MenuEventHandler::OnMenu, this);
wxCommandEventHandler(MenuEventHandler::OnMenu),
NULL,
this);
delete m_event; delete m_event;
} }
@@ -551,6 +535,22 @@ void MenuTestCase::Events()
bool m_gotEvent; bool m_gotEvent;
}; };
#endif // wxUSE_UIACTIONSIMULATOR
void MenuTestCase::Events()
{
#ifdef __WXGTK__
// FIXME: For some reason, we sporadically fail to get the event in
// buildbot slave builds even though the test always passes locally.
// There is undoubtedly something wrong here but without being able
// to debug it, I have no idea what is it, so let's just disable
// this test when running under buildbot to let the entire test
// suite pass.
if ( IsAutomaticTest() )
return;
#endif // __WXGTK__
#if wxUSE_UIACTIONSIMULATOR
MenuEventHandler handler(m_frame); MenuEventHandler handler(m_frame);
// Invoke the accelerator. // Invoke the accelerator.

24
utils/screenshotgen/src/guiframe.cpp
View File

@@ -56,7 +56,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
// Connect Events // Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GUIFrame::OnClose ) ); Bind(wxEVT_CLOSE_WINDOW, &GUIFrame::OnClose, this);
} }
void GUIFrame::AddMenuBar() void GUIFrame::AddMenuBar()
@@ -102,11 +102,11 @@ void GUIFrame::AddMenuBar()
this->SetMenuBar( mbar ); this->SetMenuBar( mbar );
// Connect Events // Connect Events
this->Connect( m_menuSeeScr->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnSeeScreenshots ) ); Bind(wxEVT_MENU, &GUIFrame::OnSeeScreenshots, this, m_menuSeeScr->GetId());
this->Connect( m_menuFileQuit->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnQuit ) ); Bind(wxEVT_MENU, &GUIFrame::OnQuit, this, m_menuFileQuit->GetId());
this->Connect( m_menuCapFullScreen->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureFullScreen ) ); Bind(wxEVT_MENU, &GUIFrame::OnCaptureFullScreen, this, m_menuCapFullScreen->GetId());
this->Connect( m_menuCapAll->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureAllControls ) ); Bind(wxEVT_MENU, &GUIFrame::OnCaptureAllControls, this, m_menuCapAll->GetId());
this->Connect( m_menuHelpAbout->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnAbout ) ); Bind(wxEVT_MENU, &GUIFrame::OnAbout, this, m_menuHelpAbout->GetId());
} }
void GUIFrame::AddPanel_1() void GUIFrame::AddPanel_1()
@@ -493,10 +493,10 @@ void GUIFrame::AddPanel_5()
GUIFrame::~GUIFrame() GUIFrame::~GUIFrame()
{ {
// Disconnect Events // Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GUIFrame::OnClose ) ); Unbind(wxEVT_CLOSE_WINDOW, &GUIFrame::OnClose, this);
this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnSeeScreenshots ) ); Unbind(wxEVT_MENU, &GUIFrame::OnSeeScreenshots, this);
this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnQuit ) ); Unbind(wxEVT_MENU, &GUIFrame::OnQuit, this);
this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureFullScreen ) ); Unbind(wxEVT_MENU, &GUIFrame::OnCaptureFullScreen, this);
this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureAllControls ) ); Unbind(wxEVT_MENU, &GUIFrame::OnCaptureAllControls, this);
this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnAbout ) ); Unbind(wxEVT_MENU, &GUIFrame::OnAbout, this);
} }