removed unused APPEND_STR macro

[wxWidgets.git] / wxPython / demo / SearchCtrl.py

diff --git a/wxPython/demo/SearchCtrl.py b/wxPython/demo/SearchCtrl.py
index 612b08ad50f0259b6c64979f453a4cf25ade4986..c43a31c95549162e0fef01b71a274d742a4fe66c 100644 (file)
--- a/wxPython/demo/SearchCtrl.py
+++ b/wxPython/demo/SearchCtrl.py
@@ -28,8 +28,8 @@ class TestPanel(wx.Panel):
         sizer.Add((15,15))
         sizer.Add(self.search, 0, wx.ALL, 15)
 
         sizer.Add((15,15))
         sizer.Add(self.search, 0, wx.ALL, 15)
 

-        self.tc = wx.TextCtrl(self)  # just for testing that heights match...
-        sizer.Add(self.tc, 0, wx.TOP, 15)
+##         self.tc = wx.TextCtrl(self)  # just for testing that heights match...
+##         sizer.Add(self.tc, 0, wx.TOP, 15)

 
         self.SetSizer(sizer)
 
 
         self.SetSizer(sizer)
 


@@ -39,16 +39,17 @@ class TestPanel(wx.Panel):
         self.Bind(wx.EVT_CHECKBOX, self.OnToggleCancelButton, cancelBtnOpt)
         self.Bind(wx.EVT_CHECKBOX, self.OnToggleSearchMenu,   menuBtnOpt)
 
         self.Bind(wx.EVT_CHECKBOX, self.OnToggleCancelButton, cancelBtnOpt)
         self.Bind(wx.EVT_CHECKBOX, self.OnToggleSearchMenu,   menuBtnOpt)
 

-        self.Bind(wx.EVT_SEARCHCTRL_SEARCH, self.OnSearch, self.search)
-        self.Bind(wx.EVT_SEARCHCTRL_CANCEL, self.OnCancel, self.search)
-        self.search.Bind(wx.EVT_TEXT_ENTER,        self.OnDoSearch) #, self.search)
-        
+        self.Bind(wx.EVT_SEARCHCTRL_SEARCH_BTN, self.OnSearch, self.search)
+        self.Bind(wx.EVT_SEARCHCTRL_CANCEL_BTN, self.OnCancel, self.search)
+        self.Bind(wx.EVT_TEXT_ENTER, self.OnDoSearch, self.search)
+        ##self.Bind(wx.EVT_TEXT, self.OnDoSearch, self.search)        
+

 
     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():