diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h index c9a339ac44..8483414686 100644 --- a/include/wx/compositewin.h +++ b/include/wx/compositewin.h @@ -172,11 +172,7 @@ protected: // Default ctor sets things up for handling children events correctly. wxCompositeWindow() { - this->Connect - ( - wxEVT_CREATE, - wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate) - ); + this->Bind(wxEVT_CREATE, &wxCompositeWindow::OnWindowCreate, this); } private: @@ -191,15 +187,11 @@ private: wxWindow *child = event.GetWindow(); if ( child == this ) - return; // not a child, we don't want to Connect() to ourselves + return; // not a child, we don't want to bind to ourselves - child->Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxCompositeWindow::OnSetFocus), - NULL, this); + child->Bind(wxEVT_SET_FOCUS, &wxCompositeWindow::OnSetFocus, this); - child->Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxCompositeWindow::OnKillFocus), - NULL, this); + child->Bind(wxEVT_KILL_FOCUS, &wxCompositeWindow::OnKillFocus, this); // Some events should be only handled for non-toplevel children. For // example, we want to close the control in wxDataViewCtrl when Enter @@ -213,9 +205,7 @@ private: win = win->GetParent(); } - child->Connect(wxEVT_CHAR, - wxKeyEventHandler(wxCompositeWindow::OnChar), - NULL, this); + child->Bind(wxEVT_CHAR, &wxCompositeWindow::OnChar, this); } void OnChar(wxKeyEvent& event) diff --git a/include/wx/containr.h b/include/wx/containr.h index 2251a7cd75..4c0d9d5de8 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -199,14 +199,13 @@ public: m_container.SetContainerWindow(this); #ifndef wxHAS_NATIVE_TAB_TRAVERSAL - BaseWindowClass::Connect(wxEVT_NAVIGATION_KEY, - wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey)); + BaseWindowClass::Bind(wxEVT_NAVIGATION_KEY, + &wxNavigationEnabled::OnNavigationKey, this); - BaseWindowClass::Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxNavigationEnabled::OnFocus)); - - BaseWindowClass::Connect(wxEVT_CHILD_FOCUS, - wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus)); + BaseWindowClass::Bind(wxEVT_SET_FOCUS, + &wxNavigationEnabled::OnFocus, this); + BaseWindowClass::Bind(wxEVT_CHILD_FOCUS, + &wxNavigationEnabled::OnChildFocus, this); #endif // !wxHAS_NATIVE_TAB_TRAVERSAL } diff --git a/include/wx/docview.h b/include/wx/docview.h index 3fb726cada..64378d574f 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -712,10 +712,8 @@ public: if ( !BaseClass::Create(parent, id, title, pos, size, style, name) ) return false; - this->Connect(wxEVT_ACTIVATE, - wxActivateEventHandler(wxDocChildFrameAny::OnActivate)); - this->Connect(wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxDocChildFrameAny::OnCloseWindow)); + this->Bind(wxEVT_ACTIVATE, &wxDocChildFrameAny::OnActivate, this); + this->Bind(wxEVT_CLOSE_WINDOW, &wxDocChildFrameAny::OnCloseWindow, this); return true; } @@ -867,10 +865,8 @@ public: if ( !BaseFrame::Create(frame, id, title, pos, size, style, name) ) return false; - this->Connect(wxID_EXIT, wxEVT_MENU, - wxCommandEventHandler(wxDocParentFrameAny::OnExit)); - this->Connect(wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxDocParentFrameAny::OnCloseWindow)); + this->Bind(wxEVT_MENU, &wxDocParentFrameAny::OnExit, this, wxID_EXIT); + this->Bind(wxEVT_CLOSE_WINDOW, &wxDocParentFrameAny::OnCloseWindow, this); return true; } diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index 6c9b3f85a7..c17e820bf2 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -277,9 +277,8 @@ public: // overrides virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE { - sender->Connect( wxEVT_FILEPICKER_CHANGED, - wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ), - NULL, eventSink ); + sender->Bind(wxEVT_FILEPICKER_CHANGED, + &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink ); } @@ -377,9 +376,8 @@ public: // overrides virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE { - sender->Connect( wxEVT_DIRPICKER_CHANGED, - wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ), - NULL, eventSink ); + sender->Bind( wxEVT_DIRPICKER_CHANGED, + &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink ); } diff --git a/include/wx/generic/custombgwin.h b/include/wx/generic/custombgwin.h index 633dbd5bc9..c646b700c8 100644 --- a/include/wx/generic/custombgwin.h +++ b/include/wx/generic/custombgwin.h @@ -67,18 +67,18 @@ protected: if ( m_bitmapBg.IsOk() ) { - BaseWindowClass::Connect + BaseWindowClass::Bind ( wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground) + &wxCustomBackgroundWindow::OnEraseBackground, this ); } else { - BaseWindowClass::Disconnect + BaseWindowClass::Unbind ( wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground) + &wxCustomBackgroundWindow::OnEraseBackground, this ); } } diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 87c4c37542..9456f2b7ae 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -859,8 +859,7 @@ void wxAuiManager::UpdateHintWindowConfig() wxDefaultPosition, wxSize(1,1), wxFRAME_FLOAT_ON_PARENT | wxFRAME_TOOL_WINDOW ); - m_hintWnd->Connect(wxEVT_ACTIVATE, - wxActivateEventHandler(wxAuiManager::OnHintActivate), NULL, this); + m_hintWnd->Bind(wxEVT_ACTIVATE, &wxAuiManager::OnHintActivate, this); // Can't set the bg colour of a Frame in wxMac wxPanel* p = new wxPanel(m_hintWnd); @@ -3285,8 +3284,8 @@ void wxAuiManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event)) if (!m_hintWnd || m_hintFadeAmt >= m_hintFadeMax) { m_hintFadeTimer.Stop(); - Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER, - wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); + Unbind(wxEVT_TIMER, &wxAuiManager::OnHintFadeTimer, this, + m_hintFadeTimer.GetId()); return; } @@ -3330,8 +3329,8 @@ void wxAuiManager::ShowHint(const wxRect& rect) // start fade in timer m_hintFadeTimer.SetOwner(this); m_hintFadeTimer.Start(5); - Connect(m_hintFadeTimer.GetId(), wxEVT_TIMER, - wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); + Bind(wxEVT_TIMER, &wxAuiManager::OnHintFadeTimer, this, + m_hintFadeTimer.GetId()); } } else // Not using a transparent hint window... @@ -3402,8 +3401,8 @@ void wxAuiManager::HideHint() m_hintFadeTimer.Stop(); // In case this is called while a hint fade is going, we need to // disconnect the event handler. - Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER, - wxTimerEventHandler(wxAuiManager::OnHintFadeTimer)); + Unbind(wxEVT_TIMER, &wxAuiManager::OnHintFadeTimer, this, + m_hintFadeTimer.GetId()); m_lastHint = wxRect(); return; } diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp index 6f5f118c93..f22482a2cd 100644 --- a/src/common/clrpickercmn.cpp +++ b/src/common/clrpickercmn.cpp @@ -67,9 +67,8 @@ bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id, // complete sizer creation wxPickerBase::PostCreation(); - m_picker->Connect(wxEVT_COLOURPICKER_CHANGED, - wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange), - NULL, this); + m_picker->Bind(wxEVT_COLOURPICKER_CHANGED, + &wxColourPickerCtrl::OnColourChange, this); return true; } diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index e3bab06d47..b1e0645abd 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -1094,15 +1094,10 @@ wxComboCtrlBase::CreateTextCtrl(int style) style); // Connecting the events is currently the most reliable way - wxWindowID id = m_text->GetId(); - m_text->Connect(id, wxEVT_TEXT, - wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent), - NULL, this); + m_text->Bind(wxEVT_TEXT, &wxComboCtrlBase::OnTextCtrlEvent, this); if ( style & wxTE_PROCESS_ENTER ) { - m_text->Connect(id, wxEVT_TEXT_ENTER, - wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent), - NULL, this); + m_text->Bind(wxEVT_TEXT_ENTER, &wxComboCtrlBase::OnTextCtrlEvent, this); } m_text->SetHint(m_hintText); diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp index 40b96f9432..5c958fcc93 100644 --- a/src/common/fontpickercmn.cpp +++ b/src/common/fontpickercmn.cpp @@ -74,9 +74,7 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id, // complete sizer creation wxPickerBase::PostCreation(); - m_picker->Connect(wxEVT_FONTPICKER_CHANGED, - wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange), - NULL, this); + m_picker->Bind(wxEVT_FONTPICKER_CHANGED, &wxFontPickerCtrl::OnFontChange, this); return true; } diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp index 306166686d..d8d793e0f6 100644 --- a/src/common/pickerbase.cpp +++ b/src/common/pickerbase.cpp @@ -91,16 +91,9 @@ bool wxPickerBase::CreateBase(wxWindow *parent, // set the initial contents of the textctrl m_text->SetValue(text); - m_text->Connect(m_text->GetId(), wxEVT_TEXT, - wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate), - NULL, this); - m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus), - NULL, this); - - m_text->Connect(m_text->GetId(), wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete), - NULL, this); + m_text->Bind(wxEVT_TEXT, &wxPickerBase::OnTextCtrlUpdate, this); + m_text->Bind(wxEVT_KILL_FOCUS, &wxPickerBase::OnTextCtrlKillFocus, this); + m_text->Bind(wxEVT_DESTROY, &wxPickerBase::OnTextCtrlDelete, this); m_sizer->Add(m_text, wxSizerFlags(1).CentreVertical().Border(wxRIGHT)); diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index eb2d92ecdb..6eb4f9a396 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -1139,10 +1139,8 @@ public: m_maxPage = m_page = 1; - Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxPrintPageTextCtrl::OnKillFocus)); - Connect(wxEVT_TEXT_ENTER, - wxCommandEventHandler(wxPrintPageTextCtrl::OnTextEnter)); + Bind(wxEVT_KILL_FOCUS, &wxPrintPageTextCtrl::OnKillFocus, this); + Bind(wxEVT_TEXT_ENTER, &wxPrintPageTextCtrl::OnTextEnter, this); } // Update the pages range, must be called after OnPreparePrinting() as diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp index 50359c40f4..b71e2d07a0 100644 --- a/src/common/treebase.cpp +++ b/src/common/treebase.cpp @@ -179,7 +179,7 @@ wxTreeCtrlBase::wxTreeCtrlBase() // quick DoGetBestSize calculation m_quickBestSize = true; - Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(wxTreeCtrlBase::OnCharHook)); + Bind(wxEVT_CHAR_HOOK, &wxTreeCtrlBase::OnCharHook, this); } wxTreeCtrlBase::~wxTreeCtrlBase() diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 497c075bce..82f3340f0f 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -3022,10 +3022,7 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) { gs_popupMenuSelection = wxID_NONE; - Connect(wxEVT_MENU, - wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu), - NULL, - this); + Bind(wxEVT_MENU, &wxWindowBase::InternalOnPopupMenu, this); // it is common to construct the menu passed to this function dynamically // using some fixed range of ids which could clash with the ids used @@ -3034,21 +3031,12 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) // elsewhere in the program code and this is difficult to avoid in the // program itself, so instead we just temporarily suspend UI updating while // this menu is shown - Connect(wxEVT_UPDATE_UI, - wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate), - NULL, - this); + Bind(wxEVT_UPDATE_UI, &wxWindowBase::InternalOnPopupMenuUpdate, this); PopupMenu(&menu, x, y); - Disconnect(wxEVT_UPDATE_UI, - wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate), - NULL, - this); - Disconnect(wxEVT_MENU, - wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu), - NULL, - this); + Unbind(wxEVT_UPDATE_UI, &wxWindowBase::InternalOnPopupMenuUpdate, this); + Unbind(wxEVT_MENU, &wxWindowBase::InternalOnPopupMenu, this); return gs_popupMenuSelection; } diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp index 9cb175334d..4340dabce1 100644 --- a/src/generic/aboutdlgg.cpp +++ b/src/generic/aboutdlgg.cpp @@ -220,10 +220,8 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren CentreOnParent(); #if !wxUSE_MODAL_ABOUT_DIALOG - Connect(wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow)); - Connect(wxID_OK, wxEVT_BUTTON, - wxCommandEventHandler(wxGenericAboutDialog::OnOK)); + Bind(wxEVT_CLOSE_WINDOW, &wxGenericAboutDialog::OnCloseWindow, this); + Bind(wxEVT_BUTTON, &wxGenericAboutDialog::OnOK, this, wxID_OK); #endif // !wxUSE_MODAL_ABOUT_DIALOG return true; diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp index a3b396221f..58875a3066 100644 --- a/src/generic/calctrlg.cpp +++ b/src/generic/calctrlg.cpp @@ -278,9 +278,7 @@ void wxGenericCalendarCtrl::CreateMonthComboBox() wxDefaultCoord, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT); - m_comboMonth->Connect(m_comboMonth->GetId(), wxEVT_COMBOBOX, - wxCommandEventHandler(wxGenericCalendarCtrl::OnMonthChange), - NULL, this); + m_comboMonth->Bind(wxEVT_COMBOBOX, &wxGenericCalendarCtrl::OnMonthChange, this); } void wxGenericCalendarCtrl::CreateYearSpinCtrl() @@ -292,13 +290,8 @@ void wxGenericCalendarCtrl::CreateYearSpinCtrl() wxSP_ARROW_KEYS | wxCLIP_SIBLINGS, -4300, 10000, GetDate().GetYear()); - m_spinYear->Connect(m_spinYear->GetId(), wxEVT_TEXT, - wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange), - NULL, this); - - m_spinYear->Connect(m_spinYear->GetId(), wxEVT_SPINCTRL, - wxSpinEventHandler(wxGenericCalendarCtrl::OnYearChange), - NULL, this); + m_spinYear->Bind(wxEVT_TEXT, &wxGenericCalendarCtrl::OnYearTextChange, this); + m_spinYear->Bind(wxEVT_SPINCTRL, &wxGenericCalendarCtrl::OnYearChange, this); } // ---------------------------------------------------------------------------- diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp index 6cd4055e16..5bb576a3c2 100644 --- a/src/generic/clrpickerg.cpp +++ b/src/generic/clrpickerg.cpp @@ -57,9 +57,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id, } // and handle user clicks on it - Connect(GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxGenericColourButton::OnButtonClick), - NULL, this); + Bind(wxEVT_BUTTON, &wxGenericColourButton::OnButtonClick, this, GetId()); m_colour = col; UpdateColour(); diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index bc4ed646ef..982947dedf 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -1514,7 +1514,7 @@ public: wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) { m_bitmap = bitmap; - Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) ); + Bind(wxEVT_PAINT, &wxBitmapCanvas::OnPaint, this); } void OnPaint( wxPaintEvent &WXUNUSED(event) ) diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 4a89d31d57..767a7454df 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -86,9 +86,7 @@ public: if ( !tx ) tx = m_combo; - tx->Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxCalendarComboPopup::OnKillTextFocus), - NULL, this); + tx->Bind(wxEVT_KILL_FOCUS, &wxCalendarComboPopup::OnKillTextFocus, this); return true; } diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp index 20f6f77e82..9beebb1636 100644 --- a/src/generic/filepickerg.cpp +++ b/src/generic/filepickerg.cpp @@ -80,9 +80,7 @@ bool wxGenericFileDirButton::Create(wxWindow *parent, } // and handle user clicks on it - Connect(GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick), - NULL, this); + Bind(wxEVT_BUTTON, &wxGenericFileDirButton::OnButtonClick, this, GetId()); // create the dialog associated with this button m_path = path; diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp index 6c74756fd8..481ff030ab 100644 --- a/src/generic/fontpickerg.cpp +++ b/src/generic/fontpickerg.cpp @@ -58,9 +58,7 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id, } // and handle user clicks on it - Connect(GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxGenericFontButton::OnButtonClick), - NULL, this); + Bind(wxEVT_BUTTON, &wxGenericFontButton::OnButtonClick, this, GetId()); InitFontData(); diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp index 1d0bb412d7..bc5239ce52 100644 --- a/src/generic/hyperlinkg.cpp +++ b/src/generic/hyperlinkg.cpp @@ -88,15 +88,15 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, // behave correctly (as we intercept events doing things which interfere // with GTK+'s native handling): - Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) ); - Connect( wxEVT_SET_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); - Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); - Connect( wxEVT_CHAR, wxKeyEventHandler(wxGenericHyperlinkCtrl::OnChar) ); - Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) ); + Bind( wxEVT_PAINT, &wxGenericHyperlinkCtrl::OnPaint, this); + Bind( wxEVT_SET_FOCUS, &wxGenericHyperlinkCtrl::OnFocus, this); + Bind( wxEVT_KILL_FOCUS, &wxGenericHyperlinkCtrl::OnFocus, this); + Bind( wxEVT_CHAR, &wxGenericHyperlinkCtrl::OnChar, this); + Bind( wxEVT_LEAVE_WINDOW, &wxGenericHyperlinkCtrl::OnLeaveWindow, this); - Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) ); - Connect( wxEVT_LEFT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftUp) ); - Connect( wxEVT_MOTION, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnMotion) ); + Bind( wxEVT_LEFT_DOWN, &wxGenericHyperlinkCtrl::OnLeftDown, this); + Bind( wxEVT_LEFT_UP, &wxGenericHyperlinkCtrl::OnLeftUp, this); + Bind( wxEVT_MOTION, &wxGenericHyperlinkCtrl::OnMotion, this); ConnectMenuHandlers(); @@ -118,9 +118,9 @@ void wxGenericHyperlinkCtrl::Init() void wxGenericHyperlinkCtrl::ConnectMenuHandlers() { // Connect the event handlers for the context menu. - Connect( wxEVT_RIGHT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnRightUp) ); - Connect( wxHYPERLINK_POPUP_COPY_ID, wxEVT_MENU, - wxCommandEventHandler(wxGenericHyperlinkCtrl::OnPopUpCopy) ); + Bind( wxEVT_RIGHT_UP, &wxGenericHyperlinkCtrl::OnRightUp, this); + Bind( wxEVT_MENU, &wxGenericHyperlinkCtrl::OnPopUpCopy, this, + wxHYPERLINK_POPUP_COPY_ID); } wxSize wxGenericHyperlinkCtrl::DoGetBestClientSize() const diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index a4f2117104..e2d01d4585 100644 --- a/src/generic/mdig.cpp +++ b/src/generic/mdig.cpp @@ -534,17 +534,15 @@ wxGenericMDIClientWindow::CreateGenericClient(wxWindow *parent) return false; m_notebook = new wxNotebook(this, wxID_ANY); - m_notebook->Connect + m_notebook->Bind ( wxEVT_NOTEBOOK_PAGE_CHANGED, - wxNotebookEventHandler( - wxGenericMDIClientWindow::OnPageChanged), - NULL, + &wxGenericMDIClientWindow::OnPageChanged, this ); // now that we have a notebook to resize, hook up OnSize() too - Connect(wxEVT_SIZE, wxSizeEventHandler(wxGenericMDIClientWindow::OnSize)); + Bind(wxEVT_SIZE, &wxGenericMDIClientWindow::OnSize, this); return true; } diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp index d9dd480d96..574f36b672 100644 --- a/src/generic/richtooltipg.cpp +++ b/src/generic/richtooltipg.cpp @@ -252,7 +252,7 @@ public: return; } - Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer)); + Bind(wxEVT_TIMER, &wxRichToolTipPopup::OnTimer, this); m_timeout = timeout; // set for use in OnTimer if we have a delay m_delayShow = delay != 0; diff --git a/src/generic/statbmpg.cpp b/src/generic/statbmpg.cpp index 285c86d798..d355fe7181 100644 --- a/src/generic/statbmpg.cpp +++ b/src/generic/statbmpg.cpp @@ -35,7 +35,7 @@ bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id, return false; m_scaleMode = Scale_None; SetBitmap(bitmap); - Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticBitmap::OnPaint)); + Bind(wxEVT_PAINT, &wxGenericStaticBitmap::OnPaint, this); return true; } diff --git a/src/generic/stattextg.cpp b/src/generic/stattextg.cpp index fa1db47c4a..fe2f13759c 100644 --- a/src/generic/stattextg.cpp +++ b/src/generic/stattextg.cpp @@ -44,7 +44,7 @@ bool wxGenericStaticText::Create(wxWindow *parent, SetLabel(label); SetInitialSize(size); - Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticText::OnPaint)); + Bind(wxEVT_PAINT, &wxGenericStaticText::OnPaint, this); return true; } diff --git a/src/generic/timectrlg.cpp b/src/generic/timectrlg.cpp index 6a3033cd0c..4037d6f56d 100644 --- a/src/generic/timectrlg.cpp +++ b/src/generic/timectrlg.cpp @@ -92,42 +92,12 @@ public: m_useAMPM = false; #endif - m_text->Connect - ( - wxEVT_SET_FOCUS, - wxFocusEventHandler(wxTimePickerGenericImpl::OnTextSetFocus), - NULL, - this - ); - m_text->Connect - ( - wxEVT_KEY_DOWN, - wxKeyEventHandler(wxTimePickerGenericImpl::OnTextKeyDown), - NULL, - this - ); - m_text->Connect - ( - wxEVT_LEFT_DOWN, - wxMouseEventHandler(wxTimePickerGenericImpl::OnTextClick), - NULL, - this - ); + m_text->Bind(wxEVT_SET_FOCUS, &wxTimePickerGenericImpl::OnTextSetFocus, this); + m_text->Bind(wxEVT_KEY_DOWN, &wxTimePickerGenericImpl::OnTextKeyDown, this); + m_text->Bind(wxEVT_LEFT_DOWN, &wxTimePickerGenericImpl::OnTextClick, this); - m_btn->Connect - ( - wxEVT_SPIN_UP, - wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowUp), - NULL, - this - ); - m_btn->Connect - ( - wxEVT_SPIN_DOWN, - wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowDown), - NULL, - this - ); + m_btn->Bind(wxEVT_SPIN_UP, &wxTimePickerGenericImpl::OnArrowUp, this); + m_btn->Bind(wxEVT_SPIN_DOWN, &wxTimePickerGenericImpl::OnArrowDown, this); } // Set the new value. diff --git a/src/gtk/anybutton.cpp b/src/gtk/anybutton.cpp index d58e318af2..05f80f3ac0 100644 --- a/src/gtk/anybutton.cpp +++ b/src/gtk/anybutton.cpp @@ -356,17 +356,13 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) case State_Focused: if ( bitmap.IsOk() ) { - Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); - Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + Bind(wxEVT_SET_FOCUS, &wxAnyButton::GTKOnFocus, this); + Bind(wxEVT_KILL_FOCUS, &wxAnyButton::GTKOnFocus, this); } else // no valid focused bitmap { - Disconnect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); - Disconnect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + Unbind(wxEVT_SET_FOCUS, &wxAnyButton::GTKOnFocus, this); + Unbind(wxEVT_KILL_FOCUS, &wxAnyButton::GTKOnFocus, this); } break; diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index 8ee67cb02b..ed04cb5d74 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -89,9 +89,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, // we need to know when the dialog has been dismissed clicking OK... // NOTE: the "clicked" signal is not available for a GtkFileChooserButton // thus we are forced to use wxFileDialog's event - m_dialog->Connect(wxEVT_BUTTON, - wxCommandEventHandler(wxFileButton::OnDialogOK), - NULL, this); + m_dialog->Bind(wxEVT_BUTTON, &wxFileButton::OnDialogOK, this); m_parent->DoAddChild( this ); diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp index b23a76a0a1..9f9d489dd6 100644 --- a/src/gtk/nonownedwnd.cpp +++ b/src/gtk/nonownedwnd.cpp @@ -135,24 +135,12 @@ public: m_mask(CreateShapeBitmap(path), *wxBLACK) { - m_win->Connect - ( - wxEVT_PAINT, - wxPaintEventHandler(wxNonOwnedWindowShapeImplPath::OnPaint), - NULL, - this - ); + m_win->Bind(wxEVT_PAINT, &wxNonOwnedWindowShapeImplPath::OnPaint, this); } virtual ~wxNonOwnedWindowShapeImplPath() { - m_win->Disconnect - ( - wxEVT_PAINT, - wxPaintEventHandler(wxNonOwnedWindowShapeImplPath::OnPaint), - NULL, - this - ); + m_win->Unbind(wxEVT_PAINT, &wxNonOwnedWindowShapeImplPath::OnPaint, this); } // Currently we always return false from here, if drawing the border diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp index 86b320bd02..a538ff60f1 100644 --- a/src/msw/calctrl.cpp +++ b/src/msw/calctrl.cpp @@ -122,10 +122,8 @@ wxCalendarCtrl::Create(wxWindow *parent, SetHolidayAttrs(); UpdateMarks(); - Connect(wxEVT_LEFT_DOWN, - wxMouseEventHandler(wxCalendarCtrl::MSWOnClick)); - Connect(wxEVT_LEFT_DCLICK, - wxMouseEventHandler(wxCalendarCtrl::MSWOnDoubleClick)); + Bind(wxEVT_LEFT_DOWN, &wxCalendarCtrl::MSWOnClick, this); + Bind(wxEVT_LEFT_DCLICK, &wxCalendarCtrl::MSWOnDoubleClick, this); return true; } diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 803853d8c4..45478e34a3 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -111,8 +111,7 @@ bool wxDialog::Create(wxWindow *parent, { CreateGripper(); - Connect(wxEVT_CREATE, - wxWindowCreateEventHandler(wxDialog::OnWindowCreate)); + Bind(wxEVT_CREATE, &wxDialog::OnWindowCreate, this); } return true; diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 806b6c61ef..1b8c9e6bd7 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -892,10 +892,10 @@ public: wxAMMediaEvtHandler(wxAMMediaBackend *amb) : m_amb(amb), m_bLoadEventSent(false) { - m_amb->m_pAX->Connect(m_amb->m_pAX->GetId(), + m_amb->m_pAX->Bind( wxEVT_ACTIVEX, - wxActiveXEventHandler(wxAMMediaEvtHandler::OnActiveX), - NULL, this + &wxAMMediaEvtHandler::OnActiveX, this, + m_amb->m_pAX->GetId() ); } diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 5bc3e37c4a..063abb1bd6 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -416,10 +416,9 @@ public: m_qtb = qtb; m_hwnd = hwnd; - m_qtb->m_ctrl->Connect(m_qtb->m_ctrl->GetId(), + m_qtb->m_ctrl->Bind( wxEVT_ERASE_BACKGROUND, - wxEraseEventHandler(wxQTMediaEvtHandler::OnEraseBackground), - NULL, this); + &wxQTMediaEvtHandler::OnEraseBackground, this); } void OnEraseBackground(wxEraseEvent& event); diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index 581d7076de..d6a80fbacf 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -681,11 +681,9 @@ public: wxWMP10MediaEvtHandler(wxWMP10MediaBackend *amb) : m_amb(amb) { - m_amb->m_pAX->Connect(m_amb->m_pAX->GetId(), - wxEVT_ACTIVEX, - wxActiveXEventHandler(wxWMP10MediaEvtHandler::OnActiveX), - NULL, this - ); + m_amb->m_pAX->Bind(wxEVT_ACTIVEX, + &wxWMP10MediaEvtHandler::OnActiveX, this, + m_amb->m_pAX->GetId()); } void OnActiveX(wxActiveXEvent& event); diff --git a/src/msw/nonownedwnd.cpp b/src/msw/nonownedwnd.cpp index ce0449e6cc..3876870071 100644 --- a/src/msw/nonownedwnd.cpp +++ b/src/msw/nonownedwnd.cpp @@ -82,11 +82,7 @@ bool wxNonOwnedWindow::DoSetRegionShape(const wxRegion& region) #include "wx/msw/wrapgdip.h" // This class contains data used only when SetPath(wxGraphicsPath) is called. -// -// Notice that it derives from wxEvtHandler solely to allow Connect()-ing its -// OnPaint() method to the window, we could get rid of this inheritance once -// Bind() can be used in wx sources. -class wxNonOwnedWindowShapeImpl : public wxEvtHandler +class wxNonOwnedWindowShapeImpl { public: wxNonOwnedWindowShapeImpl(wxNonOwnedWindow* win, const wxGraphicsPath& path) : @@ -107,24 +103,12 @@ public: // Connect to the paint event to draw the border. // // TODO: Do this only optionally? - m_win->Connect - ( - wxEVT_PAINT, - wxPaintEventHandler(wxNonOwnedWindowShapeImpl::OnPaint), - NULL, - this - ); + m_win->Bind(wxEVT_PAINT, &wxNonOwnedWindowShapeImpl::OnPaint, this); } virtual ~wxNonOwnedWindowShapeImpl() { - m_win->Disconnect - ( - wxEVT_PAINT, - wxPaintEventHandler(wxNonOwnedWindowShapeImpl::OnPaint), - NULL, - this - ); + m_win->Unbind(wxEVT_PAINT, &wxNonOwnedWindowShapeImpl::OnPaint, this); } private: diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 83bcc429ad..b2f65a6b3c 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -1131,14 +1131,9 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) wxWindow* pWnd = m_realparent; int id = m_realparent->GetId(); - pWnd->Connect(id, wxEVT_SIZE, - wxSizeEventHandler(wxActiveXContainer::OnSize), 0, this); -// this->Connect(GetId(), wxEVT_PAINT, -// wxPaintEventHandler(wxActiveXContainer::OnPaint), 0, this); - pWnd->Connect(id, wxEVT_SET_FOCUS, - wxFocusEventHandler(wxActiveXContainer::OnSetFocus), 0, this); - pWnd->Connect(id, wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxActiveXContainer::OnKillFocus), 0, this); + pWnd->Bind(wxEVT_SIZE, &wxActiveXContainer::OnSize, this, id); + pWnd->Bind(wxEVT_SET_FOCUS, &wxActiveXContainer::OnSetFocus, this, id); + pWnd->Bind(wxEVT_KILL_FOCUS, &wxActiveXContainer::OnKillFocus, this, id); } } diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 66d2f37e02..c574663f6c 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -128,7 +128,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, // check if we have an image with alpha or not if ( wxTheApp->GetComCtl32Version() < 600 ) { - Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually)); + Bind(wxEVT_PAINT, &wxStaticBitmap::DoPaintManually, this); } return true; diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index fe7bd79546..7fb1ad9b1e 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -90,7 +90,7 @@ bool wxStaticBox::Create(wxWindow *parent, if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) { - Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); + Bind(wxEVT_PAINT, &wxStaticBox::OnPaint, this); // Our OnPaint() completely erases our background, so don't do it in // WM_ERASEBKGND too to avoid flicker. diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 686435b620..51127c7d15 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -584,7 +584,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, } #endif if ( !contextMenuConnected ) - Connect(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(wxTextCtrl::OnContextMenu)); + Bind(wxEVT_CONTEXT_MENU, &wxTextCtrl::OnContextMenu, this); } else #endif // wxUSE_RICHEDIT diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm index d6635e6137..fe69dfbd56 100644 --- a/src/osx/cocoa/filedlg.mm +++ b/src/osx/cocoa/filedlg.mm @@ -390,7 +390,7 @@ wxWindow* wxFileDialog::CreateFilterPanel(wxWindow *extracontrol) if ( m_firstFileTypeFilter >= 0 ) m_filterChoice->SetSelection(m_firstFileTypeFilter); } - m_filterChoice->Connect(wxEVT_CHOICE, wxCommandEventHandler(wxFileDialog::OnFilterSelected), NULL, this); + m_filterChoice->Bind(wxEVT_CHOICE, &wxFileDialog::OnFilterSelected, this); } if(extracontrol) diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 1896c4284c..0aa2e03cc8 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -146,14 +146,10 @@ public: m_hasCapture = false; m_spins = 1; - Connect( wxEVT_LEFT_DOWN, - wxMouseEventHandler(wxPGSpinButton::OnMouseEvent) ); - Connect( wxEVT_LEFT_UP, - wxMouseEventHandler(wxPGSpinButton::OnMouseEvent) ); - Connect( wxEVT_MOTION, - wxMouseEventHandler(wxPGSpinButton::OnMouseEvent) ); - Connect( wxEVT_MOUSE_CAPTURE_LOST, - wxMouseCaptureLostEventHandler(wxPGSpinButton::OnMouseCaptureLost) ); + Bind(wxEVT_LEFT_DOWN, &wxPGSpinButton::OnMouseEvent, this); + Bind(wxEVT_LEFT_UP, &wxPGSpinButton::OnMouseEvent, this); + Bind(wxEVT_MOTION, &wxPGSpinButton::OnMouseEvent, this); + Bind(wxEVT_MOUSE_CAPTURE_LOST, &wxPGSpinButton::OnMouseCaptureLost, this); } int GetSpins() const diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index 75acf2c64e..40e5ca82cb 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -1048,10 +1048,8 @@ wxPropertyGridPage* wxPropertyGridManager::InsertPage( int index, pageObj->m_toolId = tool->GetId(); // Connect to toolbar button events. - Connect(pageObj->GetToolId(), - wxEVT_TOOL, - wxCommandEventHandler( - wxPropertyGridManager::OnToolbarClick)); + Bind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this, + pageObj->GetToolId()); m_pToolbar->Realize(); } @@ -1541,10 +1539,8 @@ void wxPropertyGridManager::RecreateControls() m_categorizedModeToolId = tool->GetId(); tbModified = true; - Connect(m_categorizedModeToolId, - wxEVT_TOOL, - wxCommandEventHandler( - wxPropertyGridManager::OnToolbarClick)); + Bind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this, + m_categorizedModeToolId); } if (m_alphabeticModeToolId == -1) @@ -1560,10 +1556,8 @@ void wxPropertyGridManager::RecreateControls() m_alphabeticModeToolId = tool->GetId(); tbModified = true; - Connect(m_alphabeticModeToolId, - wxEVT_TOOL, - wxCommandEventHandler( - wxPropertyGridManager::OnToolbarClick)); + Bind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this, + m_alphabeticModeToolId); } // Both buttons should exist here. @@ -1574,10 +1568,8 @@ void wxPropertyGridManager::RecreateControls() // Remove buttons if they exist. if (m_categorizedModeToolId != -1) { - Disconnect(m_categorizedModeToolId, - wxEVT_TOOL, - wxCommandEventHandler( - wxPropertyGridManager::OnToolbarClick)); + Unbind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this, + m_categorizedModeToolId); m_pToolbar->DeleteTool(m_categorizedModeToolId); m_categorizedModeToolId = -1; @@ -1586,10 +1578,8 @@ void wxPropertyGridManager::RecreateControls() if (m_alphabeticModeToolId != -1) { - Disconnect(m_alphabeticModeToolId, - wxEVT_TOOL, - wxCommandEventHandler( - wxPropertyGridManager::OnToolbarClick)); + Unbind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this, + m_alphabeticModeToolId); m_pToolbar->DeleteTool(m_alphabeticModeToolId); m_alphabeticModeToolId = -1; @@ -1943,18 +1933,18 @@ void wxPropertyGridManager::ReconnectEventHandlers(wxWindowID oldId, wxWindowID if (oldId != wxID_NONE) { - Disconnect(oldId, wxEVT_PG_SELECTED, - wxPropertyGridEventHandler(wxPropertyGridManager::OnPropertyGridSelect)); - Disconnect(oldId, wxEVT_PG_COL_DRAGGING, - wxPropertyGridEventHandler(wxPropertyGridManager::OnPGColDrag)); + Unbind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this, + oldId); + Unbind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this, + oldId); } if (newId != wxID_NONE) { - Connect(newId, wxEVT_PG_SELECTED, - wxPropertyGridEventHandler(wxPropertyGridManager::OnPropertyGridSelect)); - Connect(newId, wxEVT_PG_COL_DRAGGING, - wxPropertyGridEventHandler(wxPropertyGridManager::OnPGColDrag)); + Bind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this, + newId); + Bind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this, + newId); } } diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 3bc9611f1a..b08d74fabb 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -1039,13 +1039,8 @@ void wxPropertyGrid::DoBeginLabelEdit( unsigned int colIndex, 0, colIndex); - wxWindowID id = tc->GetId(); - tc->Connect(id, wxEVT_TEXT_ENTER, - wxCommandEventHandler(wxPropertyGrid::OnLabelEditorEnterPress), - NULL, this); - tc->Connect(id, wxEVT_KEY_DOWN, - wxKeyEventHandler(wxPropertyGrid::OnLabelEditorKeyPress), - NULL, this); + tc->Bind(wxEVT_TEXT_ENTER, &wxPropertyGrid::OnLabelEditorEnterPress, this); + tc->Bind(wxEVT_KEY_DOWN, &wxPropertyGrid::OnLabelEditorKeyPress, this); tc->SetFocus(); @@ -1227,9 +1222,7 @@ void wxPropertyGrid::OnTLPChanging( wxWindow* newTLP ) // correct top-level window. if ( m_tlp ) { - m_tlp->Disconnect( wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxPropertyGrid::OnTLPClose), - NULL, this ); + m_tlp->Unbind(wxEVT_CLOSE_WINDOW, &wxPropertyGrid::OnTLPClose, this); m_tlpClosed = m_tlp; m_tlpClosedTime = currentTime; } @@ -1240,9 +1233,7 @@ void wxPropertyGrid::OnTLPChanging( wxWindow* newTLP ) if ( newTLP != m_tlpClosed || m_tlpClosedTime+250 < currentTime ) { - newTLP->Connect( wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(wxPropertyGrid::OnTLPClose), - NULL, this ); + newTLP->Bind(wxEVT_CLOSE_WINDOW, &wxPropertyGrid::OnTLPClose, this); m_tlpClosed = NULL; } else @@ -3928,33 +3919,19 @@ void wxPropertyGrid::SetupChildEventHandling( wxWindow* argWnd ) if ( argWnd == m_wndEditor ) { - argWnd->Connect(id, wxEVT_MOTION, - wxMouseEventHandler(wxPropertyGrid::OnMouseMoveChild), - NULL, this); - argWnd->Connect(id, wxEVT_LEFT_UP, - wxMouseEventHandler(wxPropertyGrid::OnMouseUpChild), - NULL, this); - argWnd->Connect(id, wxEVT_LEFT_DOWN, - wxMouseEventHandler(wxPropertyGrid::OnMouseClickChild), - NULL, this); - argWnd->Connect(id, wxEVT_RIGHT_UP, - wxMouseEventHandler(wxPropertyGrid::OnMouseRightClickChild), - NULL, this); - argWnd->Connect(id, wxEVT_ENTER_WINDOW, - wxMouseEventHandler(wxPropertyGrid::OnMouseEntry), - NULL, this); - argWnd->Connect(id, wxEVT_LEAVE_WINDOW, - wxMouseEventHandler(wxPropertyGrid::OnMouseEntry), - NULL, this); + argWnd->Bind(wxEVT_MOTION, &wxPropertyGrid::OnMouseMoveChild, this, id); + argWnd->Bind(wxEVT_LEFT_UP, &wxPropertyGrid::OnMouseUpChild, this, id); + argWnd->Bind(wxEVT_LEFT_DOWN, &wxPropertyGrid::OnMouseClickChild, this, id); + argWnd->Bind(wxEVT_RIGHT_UP, &wxPropertyGrid::OnMouseRightClickChild, this, id); + argWnd->Bind(wxEVT_ENTER_WINDOW, &wxPropertyGrid::OnMouseEntry, this, id); + argWnd->Bind(wxEVT_LEAVE_WINDOW, &wxPropertyGrid::OnMouseEntry, this, id); } wxPropertyGridEditorEventForwarder* forwarder; forwarder = new wxPropertyGridEditorEventForwarder(this); argWnd->PushEventHandler(forwarder); - argWnd->Connect(id, wxEVT_KEY_DOWN, - wxCharEventHandler(wxPropertyGrid::OnChildKeyDown), - NULL, this); + argWnd->Bind(wxEVT_KEY_DOWN, &wxPropertyGrid::OnChildKeyDown, this, id); } void wxPropertyGrid::DeletePendingObjects() diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 3caf24177a..4fbd16c3d1 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -2471,38 +2471,25 @@ bool wxPGArrayEditorDialog::Create( wxWindow *parent, arr.push_back(ArrayGet(i)); m_elb->SetStrings(arr); + m_elbSubPanel = m_elb->GetNewButton()->GetParent(); + // Connect event handlers - wxButton* but; wxListCtrl* lc = m_elb->GetListCtrl(); - but = m_elb->GetNewButton(); - m_elbSubPanel = but->GetParent(); - but->Connect(but->GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxPGArrayEditorDialog::OnAddClick), - NULL, this); + m_elb->GetNewButton()->Bind(wxEVT_BUTTON, + &wxPGArrayEditorDialog::OnAddClick, this); + m_elb->GetDelButton()->Bind(wxEVT_BUTTON, + &wxPGArrayEditorDialog::OnDeleteClick, this); + m_elb->GetUpButton()->Bind(wxEVT_BUTTON, + &wxPGArrayEditorDialog::OnUpClick, this); + m_elb->GetDownButton()->Bind(wxEVT_BUTTON, + &wxPGArrayEditorDialog::OnDownClick, this); - but = m_elb->GetDelButton(); - but->Connect(but->GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxPGArrayEditorDialog::OnDeleteClick), - NULL, this); + lc->Bind(wxEVT_LIST_BEGIN_LABEL_EDIT, + &wxPGArrayEditorDialog::OnBeginLabelEdit, this); - but = m_elb->GetUpButton(); - but->Connect(but->GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxPGArrayEditorDialog::OnUpClick), - NULL, this); - - but = m_elb->GetDownButton(); - but->Connect(but->GetId(), wxEVT_BUTTON, - wxCommandEventHandler(wxPGArrayEditorDialog::OnDownClick), - NULL, this); - - lc->Connect(lc->GetId(), wxEVT_LIST_BEGIN_LABEL_EDIT, - wxListEventHandler(wxPGArrayEditorDialog::OnBeginLabelEdit), - NULL, this); - - lc->Connect(lc->GetId(), wxEVT_LIST_END_LABEL_EDIT, - wxListEventHandler(wxPGArrayEditorDialog::OnEndLabelEdit), - NULL, this); + lc->Bind(wxEVT_LIST_END_LABEL_EDIT, + &wxPGArrayEditorDialog::OnEndLabelEdit, this); topsizer->Add(m_elb, wxSizerFlags(1).Expand().Border(0, spacing)); diff --git a/src/ribbon/panel.cpp b/src/ribbon/panel.cpp index 82ac8ce39c..99f69bcd1d 100644 --- a/src/ribbon/panel.cpp +++ b/src/ribbon/panel.cpp @@ -227,14 +227,14 @@ void wxRibbonPanel::AddChild(wxWindowBase *child) // for children of the window. The panel wants to be in the hovered state // whenever the mouse cursor is within its boundary, so the events need to // be attached to children too. - child->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this); - child->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this); + child->Bind(wxEVT_ENTER_WINDOW, &wxRibbonPanel::OnMouseEnterChild, this); + child->Bind(wxEVT_LEAVE_WINDOW, &wxRibbonPanel::OnMouseLeaveChild, this); } void wxRibbonPanel::RemoveChild(wxWindowBase *child) { - child->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this); - child->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this); + child->Unbind(wxEVT_ENTER_WINDOW, &wxRibbonPanel::OnMouseEnterChild, this); + child->Unbind(wxEVT_LEAVE_WINDOW, &wxRibbonPanel::OnMouseLeaveChild, this); wxRibbonControl::RemoveChild(child); } @@ -906,9 +906,8 @@ void wxRibbonPanel::OnKillFocus(wxFocusEvent& evt) if(IsAncestorOf(this, receiver)) { m_child_with_focus = receiver; - receiver->Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), - NULL, this); + receiver->Bind(wxEVT_KILL_FOCUS, + &wxRibbonPanel::OnChildKillFocus, this); } else if(receiver == NULL || receiver != m_expanded_dummy) { @@ -922,16 +921,16 @@ void wxRibbonPanel::OnChildKillFocus(wxFocusEvent& evt) if(m_child_with_focus == NULL) return; // Should never happen, but a check can't hurt - m_child_with_focus->Disconnect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), NULL, this); + m_child_with_focus->Unbind(wxEVT_KILL_FOCUS, + &wxRibbonPanel::OnChildKillFocus, this); m_child_with_focus = NULL; wxWindow *receiver = evt.GetWindow(); if(receiver == this || IsAncestorOf(this, receiver)) { m_child_with_focus = receiver; - receiver->Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), NULL, this); + receiver->Bind(wxEVT_KILL_FOCUS, + &wxRibbonPanel::OnChildKillFocus, this); evt.Skip(); } else if(receiver == NULL || receiver != m_expanded_dummy) diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 3a9f543220..ad5f506c35 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -366,9 +366,9 @@ bool ScintillaWX::SetIdle(bool on) { if (idler.state != on) { // connect or disconnect the EVT_IDLE handler if (on) - stc->Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle)); + stc->Bind(wxEVT_IDLE, &wxStyledTextCtrl::OnIdle, stc); else - stc->Disconnect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle)); + stc->Unbind(wxEVT_IDLE, &wxStyledTextCtrl::OnIdle, stc); idler.state = on; } return idler.state; diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index bdcb909b4b..c59a4c62b0 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -205,8 +205,8 @@ class wxGStreamerMediaEventHandler : public wxEvtHandler public: wxGStreamerMediaEventHandler(wxGStreamerMediaBackend* be) : m_be(be) { - this->Connect(wxID_ANY, wxEVT_MEDIA_FINISHED, - wxMediaEventHandler(wxGStreamerMediaEventHandler::OnMediaFinish)); + this->Bind(wxEVT_MEDIA_FINISHED, + &wxGStreamerMediaEventHandler::OnMediaFinish, this); } void OnMediaFinish(wxMediaEvent& event); diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 5633edbbde..ab45c6cb8d 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -256,8 +256,7 @@ wxTaskBarIcon::~wxTaskBarIcon() { if (m_iconWnd) { - m_iconWnd->Disconnect(wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy), NULL, this); + m_iconWnd->Unbind(wxEVT_DESTROY, &wxTaskBarIcon::OnDestroy, this); RemoveIcon(); } } @@ -290,9 +289,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) m_iconWnd = new wxTaskBarIconArea(this, bmp); if (m_iconWnd->IsOk()) { - m_iconWnd->Connect(wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy), - NULL, this); + m_iconWnd->Bind(wxEVT_DESTROY, &wxTaskBarIcon::OnDestroy, this); m_iconWnd->Show(); } else