Updating with Vadim's API changes.

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

diff --git a/wxPython/demo/SearchCtrl.py b/wxPython/demo/SearchCtrl.py
index 612b08ad50f0259b6c64979f453a4cf25ade4986..53d600c907f51a31b07ce39d8e3db336c761606d 100644 (file)
--- a/wxPython/demo/SearchCtrl.py
+++ b/wxPython/demo/SearchCtrl.py
@@ -45,10 +45,10 @@ class TestPanel(wx.Panel):
         
 
     def OnToggleSearchButton(self, evt):
         
 
     def OnToggleSearchButton(self, evt):

-        self.search.SetSearchButtonVisible( evt.GetInt() )
+        self.search.ShowSearchButton( evt.GetInt() )

             
     def OnToggleCancelButton(self, evt):
             
     def OnToggleCancelButton(self, evt):

-        self.search.SetCancelButtonVisible( evt.GetInt() )
+        self.search.ShowCancelButton( evt.GetInt() )

         
     def OnToggleSearchMenu(self, evt):
         if evt.GetInt():
         
     def OnToggleSearchMenu(self, evt):
         if evt.GetInt():

diff --git a/wxPython/src/_srchctrl.i b/wxPython/src/_srchctrl.i
index 6e9bc69703030919cd418649e77084dc0c0daf1e..9f32a68e20efa8283e5e0409e364fd545dc3bd41 100644 (file)
--- a/wxPython/src/_srchctrl.i
+++ b/wxPython/src/_srchctrl.i
@@ -56,11 +56,11 @@ public:
     
     // get/set search options
     // ----------------------
     
     // get/set search options
     // ----------------------

-    virtual void SetSearchButtonVisible( bool show );
-    virtual bool GetSearchButtonVisible() const;
+    virtual void ShowSearchButton( bool show );
+    virtual bool IsSearchButtonVisible() const;

 
 

-    virtual void SetCancelButtonVisible( bool show );
-    virtual bool GetCancelButtonVisible() const;
+    virtual void ShowCancelButton( bool show );
+    virtual bool IsCancelButtonVisible() const;

 
 #ifdef __WXMAC__
     %extend {
 
 #ifdef __WXMAC__
     %extend {


@@ -76,8 +76,8 @@ public:
     
     
     %property(Menu, GetMenu, SetMenu);
     
     
     %property(Menu, GetMenu, SetMenu);

-    %property(SearchButtonVisible, GetSearchButtonVisible, SetSearchButtonVisible);
-    %property(CancelButtonVisible, GetCancelButtonVisible, SetCancelButtonVisible);
+    %property(SearchButtonVisible, IsSearchButtonVisible, ShowSearchButton);
+    %property(CancelButtonVisible, IsCancelButtonVisible, ShowCancelButton);

 };
      
 
 };