Modified form of Patch #1611222, adds wxSearchCtrl (generic & native carbon HISearchField)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-12-11 06:19:27 +00:00
parent 16ba9ea815
commit 3f7f284d55
62 changed files with 23198 additions and 11630 deletions

View File

@@ -75,6 +75,7 @@ _treeList = [
'BitmapComboBox',
'I18N',
'Img2PyArtProvider',
'SearchCtrl',
]),
# managed windows == things with a (optional) caption you can close
@@ -132,6 +133,7 @@ _treeList = [
'RadioButton',
'SashWindow',
'ScrolledWindow',
'SearchCtrl',
'Slider',
'SpinButton',
'SpinCtrl',

105
wxPython/demo/SearchCtrl.py Normal file
View File

@@ -0,0 +1,105 @@
import wx
#----------------------------------------------------------------------
class TestPanel(wx.Panel):
def __init__(self, parent, log):
self.log = log
wx.Panel.__init__(self, parent, -1, style=0)
# Create controls
sb = wx.StaticBox(self, -1, "Options")
searchBtnOpt = wx.CheckBox(self, -1, "Search button")
searchBtnOpt.SetValue(True)
cancelBtnOpt = wx.CheckBox(self, -1, "Cancel button")
menuBtnOpt = wx.CheckBox(self, -1, "Search menu")
self.search = wx.SearchCtrl(self, size=(200,-1), style=wx.TE_PROCESS_ENTER)
# Setup the layout
box = wx.StaticBoxSizer(sb, wx.VERTICAL)
box.Add(searchBtnOpt, 0, wx.ALL, 5)
box.Add(cancelBtnOpt, 0, wx.ALL, 5)
box.Add(menuBtnOpt, 0, wx.ALL, 5)
sizer = wx.BoxSizer(wx.HORIZONTAL)
sizer.Add(box, 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.SetSizer(sizer)
# Set event bindings
self.Bind(wx.EVT_CHECKBOX, self.OnToggleSearchButton, searchBtnOpt)
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)
def OnToggleSearchButton(self, evt):
self.search.SetSearchButtonVisible( evt.GetInt() )
def OnToggleCancelButton(self, evt):
self.search.SetCancelButtonVisible( evt.GetInt() )
def OnToggleSearchMenu(self, evt):
if evt.GetInt():
self.search.SetMenu( self.MakeMenu() )
else:
self.search.SetMenu(None)
def OnSearch(self, evt):
self.log.write("OnSearch")
def OnCancel(self, evt):
self.log.write("OnCancel")
def OnDoSearch(self, evt):
self.log.write("OnDoSearch: " + self.search.GetValue())
def MakeMenu(self):
menu = wx.Menu()
item = menu.Append(-1, "Recent Searches")
item.Enable(False)
for txt in [ "You can maintain",
"a list of old",
"search strings here",
"and bind EVT_MENU to",
"catch their selections" ]:
menu.Append(-1, txt)
return menu
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
#----------------------------------------------------------------------
overview = """<html><body>
<h2><center>wx.SearchCtrl</center></h2>
</body></html>
"""
if __name__ == '__main__':
import sys,os
import run
run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])

View File

@@ -12,9 +12,45 @@ TBFLAGS = ( wx.TB_HORIZONTAL
#---------------------------------------------------------------------------
class TestSearchCtrl(wx.SearchCtrl):
maxSearches = 5
def __init__(self, parent, id=-1, value="",
pos=wx.DefaultPosition, size=wx.DefaultSize, style=0,
doSearch=None):
style |= wx.TE_PROCESS_ENTER
wx.SearchCtrl.__init__(self, parent, id, value, pos, size, style)
self.Bind(wx.EVT_TEXT_ENTER, self.OnTextEntered)
self.Bind(wx.EVT_MENU_RANGE, self.OnMenuItem, id=1, id2=self.maxSearches)
self.doSearch = doSearch
self.searches = []
def OnTextEntered(self, evt):
text = self.GetValue()
if self.doSearch(text):
self.searches.append(text)
if len(self.searches) > self.maxSearches:
del self.searches[0]
self.SetMenu(self.MakeMenu())
self.SetValue("")
def OnMenuItem(self, evt):
text = self.searches[evt.GetId()-1]
self.doSearch(text)
def MakeMenu(self):
menu = wx.Menu()
item = menu.Append(-1, "Recent Searches")
item.Enable(False)
for idx, txt in enumerate(self.searches):
menu.Append(1+idx, txt)
return menu
class TestToolBar(wx.Frame):
def __init__(self, parent, log):
wx.Frame.__init__(self, parent, -1, 'Test ToolBar', size=(500, 300))
wx.Frame.__init__(self, parent, -1, 'Test ToolBar', size=(600, 400))
self.log = log
self.timer = None
self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
@@ -83,10 +119,6 @@ class TestToolBar(wx.Frame):
shortHelp="Toggle this")
self.Bind(wx.EVT_TOOL, self.OnToolClick, id=50)
## tb.AddCheckTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
## shortHelp="Toggle with 2 bitmaps")
## self.Bind(EVT_TOOL, self.OnToolClick, id=60)
self.Bind(wx.EVT_TOOL_ENTER, self.OnToolEnter)
self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick) # Match all
self.Bind(wx.EVT_TIMER, self.OnClearSB)
@@ -101,13 +133,22 @@ class TestToolBar(wx.Frame):
))
self.Bind(wx.EVT_COMBOBOX, self.OnCombo, id=cbID)
tb.AddControl(wx.TextCtrl(tb, -1, "Toolbar controls!!", size=(150, -1)))
search = TestSearchCtrl(tb, size=(150,-1), doSearch=self.DoSearch)
tb.AddControl(search)
# Final thing to do for a toolbar is call the Realize() method. This
# causes it to render (more or less, that is).
tb.Realize()
def DoSearch(self, text):
# called by TestSearchCtrl
self.log.WriteText("DoSearch: %s\n" % text)
# return true to tell the search ctrl to remember the text
return True
def OnToolClick(self, event):
self.log.WriteText("tool %s clicked\n" % event.GetId())
#tb = self.GetToolBar()