Some more _BTN changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_srchctrl.i b/wxPython/src/_srchctrl.i
index 83a244b345cfcc088a7f2d9bd30876c1717d0427..39871ab4d60a1399828fe436f9f5df7a15cb73db 100644 (file)
--- 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 7374f40d1383a1a8130c13aac3c31065d753192c..506de97ab8aebdc1f776a17ab42cc8fd76bcb472 100644 (file)
--- 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 87bd03385a051ddd6ee5a3b12b805d6fa6778164..c5533bdb1b35b7391a675b039229e226c3aedd8e 100644 (file)
--- 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 988d2161113f8fc6d65171ad13eaeba2b2990819..e3eab970ec396e171cf1d2b0f99bc2e57da68801 100644 (file)
--- 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 8e1353ca66cf4533bbd4eb705b5b12ccdb1f1928..a9754f1170839182b0e720d53dbd80abab900ac7 100644 (file)
--- 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 98a522b20f53823e8b906d9b14ae9c0299bdc9f8..c1f1b0b41e55eb8820091af0a6143ddea874cd3d 100644 (file)
--- 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 45e78605ff9e679ddeb5e752da074af0e89678d6..3f2c1d706a60d9d43759919edaecce317dded53a 100644 (file)
--- 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));
 }