From 4ed51f4d1c02f01489df35b25a96a1d5b25c1478 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 11 Dec 2006 21:32:09 +0000 Subject: [PATCH] Some more _BTN changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_srchctrl.i | 20 ++++++++++---------- wxPython/src/gtk/_controls.py | 8 ++++---- wxPython/src/gtk/_controls_wrap.cpp | 8 ++++---- wxPython/src/mac/_controls.py | 8 ++++---- wxPython/src/mac/_controls_wrap.cpp | 8 ++++---- wxPython/src/msw/_controls.py | 8 ++++---- wxPython/src/msw/_controls_wrap.cpp | 8 ++++---- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/wxPython/src/_srchctrl.i b/wxPython/src/_srchctrl.i index 83a244b345..39871ab4d6 100644 --- a/wxPython/src/_srchctrl.i +++ b/wxPython/src/_srchctrl.i @@ -23,8 +23,8 @@ MAKE_CONST_WXSTRING(SearchCtrlNameStr); // define a dummy class for builds that don't have wxSearchCtrl enum { - wxEVT_COMMAND_SEARCHCTRL_CANCEL, - wxEVT_COMMAND_SEARCHCTRL_SEARCH + wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, + wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN }; class wxSearchCtrl : public wxTextCtrl @@ -94,14 +94,14 @@ Enter key in the control and wishes to start a search. Events ------- - ====================== ========================================= - EVT_SEARCHCTRL_SEARCH Sent when the search icon is clicked - EVT_SEARCHCTRL_CANCEL Sent when the cancel icon is clicked - EVT_TEXT Sent when the text changes - EVT_TEXT_ENTER Sent when the RETURN/ENTER key is pressed - in the search control and the control has - the wx.TE_PROCESS_ENTER style flag set. - ====================== ========================================= + ========================= ========================================= + EVT_SEARCHCTRL_SEARCH_BTN Sent when the search icon is clicked + EVT_SEARCHCTRL_CANCEL_BTN Sent when the cancel icon is clicked + EVT_TEXT Sent when the text changes + EVT_TEXT_ENTER Sent when the RETURN/ENTER key is pressed + in the search control and the control has + the wx.TE_PROCESS_ENTER style flag set. + ========================= ========================================= "); diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 7374f40d13..506de97ab8 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -7300,10 +7300,10 @@ def PreSearchCtrl(*args, **kwargs): val = _controls_.new_PreSearchCtrl(*args, **kwargs) return val -wxEVT_COMMAND_SEARCHCTRL_CANCEL = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL -wxEVT_COMMAND_SEARCHCTRL_SEARCH = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH -EVT_SEARCHCTRL_CANCEL = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1) -EVT_SEARCHCTRL_SEARCH = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1) +wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN +wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN +EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1) +EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1) diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 87bd03385a..c5533bdb1b 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -3384,8 +3384,8 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){ // define a dummy class for builds that don't have wxSearchCtrl enum { - wxEVT_COMMAND_SEARCHCTRL_CANCEL, - wxEVT_COMMAND_SEARCHCTRL_SEARCH + wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, + wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN }; class wxSearchCtrl : public wxTextCtrl @@ -50616,7 +50616,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "CP_NO_TLW_RESIZE",SWIG_From_int(static_cast< int >(wxCP_NO_TLW_RESIZE))); PyDict_SetItemString(d, "wxEVT_COMMAND_COLLPANE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_COLLPANE_CHANGED)); SWIG_addvarlink(SWIG_globals(),(char*)"SearchCtrlNameStr",SearchCtrlNameStr_get, SearchCtrlNameStr_set); - PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_CANCEL", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_CANCEL)); - PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_SEARCH", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_SEARCH)); + PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN)); + PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN)); } diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 988d216111..e3eab970ec 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -7293,10 +7293,10 @@ def PreSearchCtrl(*args, **kwargs): val = _controls_.new_PreSearchCtrl(*args, **kwargs) return val -wxEVT_COMMAND_SEARCHCTRL_CANCEL = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL -wxEVT_COMMAND_SEARCHCTRL_SEARCH = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH -EVT_SEARCHCTRL_CANCEL = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1) -EVT_SEARCHCTRL_SEARCH = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1) +wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN +wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN +EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1) +EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1) diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 8e1353ca66..a9754f1170 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -3383,8 +3383,8 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){ // define a dummy class for builds that don't have wxSearchCtrl enum { - wxEVT_COMMAND_SEARCHCTRL_CANCEL, - wxEVT_COMMAND_SEARCHCTRL_SEARCH + wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, + wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN }; class wxSearchCtrl : public wxTextCtrl @@ -50541,7 +50541,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "CP_NO_TLW_RESIZE",SWIG_From_int(static_cast< int >(wxCP_NO_TLW_RESIZE))); PyDict_SetItemString(d, "wxEVT_COMMAND_COLLPANE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_COLLPANE_CHANGED)); SWIG_addvarlink(SWIG_globals(),(char*)"SearchCtrlNameStr",SearchCtrlNameStr_get, SearchCtrlNameStr_set); - PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_CANCEL", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_CANCEL)); - PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_SEARCH", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_SEARCH)); + PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN)); + PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN)); } diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 98a522b20f..c1f1b0b41e 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -7319,10 +7319,10 @@ def PreSearchCtrl(*args, **kwargs): val = _controls_.new_PreSearchCtrl(*args, **kwargs) return val -wxEVT_COMMAND_SEARCHCTRL_CANCEL = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL -wxEVT_COMMAND_SEARCHCTRL_SEARCH = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH -EVT_SEARCHCTRL_CANCEL = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1) -EVT_SEARCHCTRL_SEARCH = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1) +wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN +wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN +EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1) +EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1) diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 45e78605ff..3f2c1d706a 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -3384,8 +3384,8 @@ SWIGINTERN wxDateTime wxDatePickerCtrl_GetUpperLimit(wxDatePickerCtrl *self){ // define a dummy class for builds that don't have wxSearchCtrl enum { - wxEVT_COMMAND_SEARCHCTRL_CANCEL, - wxEVT_COMMAND_SEARCHCTRL_SEARCH + wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, + wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN }; class wxSearchCtrl : public wxTextCtrl @@ -50839,7 +50839,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "CP_NO_TLW_RESIZE",SWIG_From_int(static_cast< int >(wxCP_NO_TLW_RESIZE))); PyDict_SetItemString(d, "wxEVT_COMMAND_COLLPANE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_COLLPANE_CHANGED)); SWIG_addvarlink(SWIG_globals(),(char*)"SearchCtrlNameStr",SearchCtrlNameStr_get, SearchCtrlNameStr_set); - PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_CANCEL", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_CANCEL)); - PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_SEARCH", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_SEARCH)); + PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN)); + PyDict_SetItemString(d, "wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN", PyInt_FromLong(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN)); } -- 2.47.2