Project: Editra

Revision: 56139

Author: CJP

Date: 07 Oct 2008 00:11:01

• /wxPython/3rdParty/Editra/src/ed_cmdbar.py

  ......	@@ -64,6 +64,7 @@
  64	64	ID_SEARCH_NEXT = wx.NewId()
  65	65	ID_SEARCH_PRE = wx.NewId()
  66	66	ID_MATCH_CASE = wx.NewId()
  	67	ID_REGEX = wx.NewId()
  67	68	ID_LINE_CTRL = wx.NewId()
  68	69	ID_CMD_CTRL = wx.NewId()
  69	70
  ......	@@ -223,15 +224,22 @@
  223	224
  224	225	match_case = wx.CheckBox(self, ID_MATCH_CASE, _("Match Case"))
  225	226	match_case.SetValue(search.IsMatchCase())
  	227
  	228	regex_cb = wx.CheckBox(self, ID_REGEX, _("Regex"))
  	229	regex_cb.SetValue(search.IsRegEx())
  	230
  	231	# Use the small size controls on osx
  226	232	if wx.Platform == '__WXMAC__':
  227	233	t_sizer.Add((5, 5))
  228		for win in [f_lbl, match_case, next_btn, pre_btn]:
  	234	for win in (f_lbl, match_case, next_btn, pre_btn, regex_cb):
  229	235	win.SetFont(wx.SMALL_FONT)
  230	236
  231	237	ctrl_sizer.AddMany([(10, 0), (next_btn, 0, wx.ALIGN_CENTER_VERTICAL),
  232	238	((5, 0)), (pre_btn, 0, wx.ALIGN_CENTER_VERTICAL),
  233	239	((8, 0)),
  234		(match_case, 0, wx.ALIGN_CENTER_VERTICAL)])
  	240	(match_case, 0, wx.ALIGN_CENTER_VERTICAL),
  	241	((5, 5), 0),
  	242	(regex_cb, 0, wx.ALIGN_CENTER_VERTICAL)])
  235	243
  236	244	t_sizer.Add(ctrl_sizer, 0, wx.ALIGN_CENTER_VERTICAL)
  237	245
  ......	@@ -250,15 +258,20 @@
  250	258
  251	259	"""
  252	260	e_id = evt.GetId()
  253		if e_id == ID_MATCH_CASE:
  	261	if e_id in (ID_MATCH_CASE, ID_REGEX):
  254	262	ctrl = self.FindWindowById(e_id)
  255	263	if ctrl != None:
  256	264	search = self.FindWindowById(ID_SEARCH_CTRL)
  	265	if e_id == ID_MATCH_CASE:
  	266	flag = finddlg.AFR_MATCHCASE
  	267	else:
  	268	flag = finddlg.AFR_REGEX
  	269
  257	270	if search != None:
  258	271	if ctrl.GetValue():
  259		search.SetSearchFlag(finddlg.AFR_MATCHCASE)
  	272	search.SetSearchFlag(flag)
  260	273	else:
  261		search.ClearSearchFlag(finddlg.AFR_MATCHCASE)
  	274	search.ClearSearchFlag(flag)
  262	275	else:
  263	276	evt.Skip()
  264	277