r26292 - /trunk/gui/controller.py -- October 15, 2014 - 18:23

Author: bugman
Date: Wed Oct 15 18:23:29 2014
New Revision: 26292

URL: http://svn.gna.org/viewcvs/relax?rev=26292&view=rev
Log:
Fix for find dialog in the relax controller window.

This is for bug #22816 (https://gna.org/bugs/?22816), the find functionality 
of the relax controller
window does not find text when using wxPython >= 2.9.

The find wxPython events are now bound to the find dialog rather than the 
relax controller window
LogCtrl element for displaying the relax messages.  This works on all 
wxPython versions.


Modified:
    trunk/gui/controller.py

Modified: trunk/gui/controller.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/controller.py?rev=26292&r1=26291&r2=26292&view=diff
==============================================================================
--- trunk/gui/controller.py     (original)
+++ trunk/gui/controller.py     Wed Oct 15 18:23:29 2014
@@ -651,9 +651,6 @@
         self.orig_zoom = self.GetZoom()
 
         # Bind events.
-        self.Bind(wx.EVT_FIND, self.find)
-        self.Bind(wx.EVT_FIND_NEXT, self.find)
-        self.Bind(wx.EVT_FIND_CLOSE, self.find_close)
         self.Bind(wx.EVT_KEY_DOWN, self.capture_keys)
         self.Bind(wx.EVT_MOUSE_EVENTS, self.capture_mouse)
         self.Bind(wx.EVT_MOUSEWHEEL, self.capture_mouse_wheel)
@@ -865,7 +862,15 @@
 
         # Initialise the dialog if it doesn't exist.
         if self.find_dlg == None:
+            # Initalise.
             self.find_dlg = wx.FindReplaceDialog(self, self.find_data, 
"Find")
+
+            # Bind the find events to this dialog.
+            self.find_dlg.Bind(wx.EVT_FIND, self.find)
+            self.find_dlg.Bind(wx.EVT_FIND_NEXT, self.find)
+            self.find_dlg.Bind(wx.EVT_FIND_CLOSE, self.find_close)
+
+            # Show the dialog.
             if status.show_gui:
                 self.find_dlg.Show(True)