From eb2f4991ee52ba11ce1c9e3f0d825dad4c87fe67 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 4 Jun 2015 22:48:46 -0500 Subject: [PATCH] Fix search in wx3 (and remove some needless crap... seriously, why was all that there?) --- gui/PFSearchBox.py | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/gui/PFSearchBox.py b/gui/PFSearchBox.py index 262d957c5..c09d7b9d2 100644 --- a/gui/PFSearchBox.py +++ b/gui/PFSearchBox.py @@ -49,10 +49,6 @@ class PFSearchBox(wx.Window): self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp) - self.Bind(wx.EVT_MOTION, self.OnMouseMove) - - self.Bind(wx.EVT_ENTER_WINDOW, self.OnEnterLeaveWindow) - self.Bind(wx.EVT_LEAVE_WINDOW, self.OnEnterLeaveWindow) # self.EditBox.ChangeValue(self.descriptiveText) @@ -64,25 +60,26 @@ class PFSearchBox(wx.Window): self.SetMinSize(size) - def OnEnterLeaveWindow(self, event): - self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) - self._hl = False - def OnText(self, event): wx.PostEvent(self, TextTyped()) + event.Skip() def OnTextEnter(self, event): wx.PostEvent(self, TextEnter()) + event.Skip() + def OnEditSetFocus(self, event): # value = self.EditBox.GetValue() # if value == self.descriptiveText: # self.EditBox.ChangeValue("") - pass + event.Skip() def OnEditKillFocus(self, event): if self.EditBox.GetValue() == "": self.Clear() + event.Skip() + def Clear(self): self.EditBox.Clear() @@ -138,20 +135,6 @@ class PFSearchBox(wx.Window): btnsize.append( (cw,ch)) return btnsize - def OnMouseMove(self, event): - btnpos = self.GetButtonsPos() - btnsize = self.GetButtonsSize() - for btn in xrange(2): - if self.HitTest(btnpos[btn], event.GetPosition(), btnsize[btn]): - if not self._hl: - self.SetCursor(wx.StockCursor(wx.CURSOR_HAND)) - self._hl = True - break - else: - if self._hl: - self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) - self._hl = False - def OnLeftDown(self, event): btnpos = self.GetButtonsPos() btnsize = self.GetButtonsSize()