Fix wx start/stop event loop

pkienzle · pkienzle · commit 67b612781d75 · 2008-07-24T14:54:22.000Z
svn path=/trunk/matplotlib/; revision=5839
diff --git a/examples/pylab_examples/ginput_demo.py b/examples/pylab_examples/ginput_demo.py
@@ -2,5 +2,6 @@
 t = arange(10)
 plot(t, sin(t))
 print "Please click"
-x = ginput(3, verbose=True)
+x = ginput(3)
+print "clicked",x
 show()
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -732,6 +732,8 @@ def do_nothing(*args, **kwargs):
             wx.EVT_IDLE(self, self._onIdle)
 
 
+        self._event_loop = wx.EventLoop()
+
         self.macros = {} # dict from wx id to seq of macros
 
         self.Printer_Init()
@@ -907,6 +909,44 @@ def draw(self, repaint=True):
     def flush_events(self):
         wx.Yield()
 
+    def start_event_loop(self, timeout=0):
+        """
+        Start an event loop.  This is used to start a blocking event
+        loop so that interactive functions, such as ginput and
+        waitforbuttonpress, can wait for events.  This should not be
+        confused with the main GUI event loop, which is always running
+        and has nothing to do with this.
+
+        Call signature::
+
+        start_event_loop(self,timeout=0)
+
+        This call blocks until a callback function triggers
+        stop_event_loop() or *timeout* is reached.  If *timeout* is
+        <=0, never timeout.
+        """
+        id = wx.NewId()
+        timer = wx.Timer(self, id=id)
+        if timeout > 0:
+            timer.Start(timeout*1000, oneShot=True)
+            bind(self, wx.EVT_TIMER, self.stop_event_loop, id=id)
+        self._event_loop.Run()
+        timer.Stop()
+
+    def stop_event_loop(self, event=None):
+        """
+        Stop an event loop.  This is used to stop a blocking event
+        loop so that interactive functions, such as ginput and
+        waitforbuttonpress, can wait for events.
+
+        Call signature::
+
+        stop_event_loop_default(self)
+        """
+        if self._event_loop.IsRunning():
+            self._event_loop.Exit()
+
+
     def _get_imagesave_wildcards(self):
         'return the wildcard string for the filesave dialog'
         default_filetype = self.get_default_filetype()
@@ -1185,46 +1225,6 @@ def draw_if_interactive():
         if figManager is not None:
             figManager.canvas.draw()
 
-    def start_event_loop(self, timeout=0):
-        """
-        Start an event loop.  This is used to start a blocking event
-        loop so that interactive functions, such as ginput and
-        waitforbuttonpress, can wait for events.  This should not be
-        confused with the main GUI event loop, which is always running
-        and has nothing to do with this.
-
-        Call signature::
-
-        start_event_loop(self,timeout=0)
-
-        This call blocks until a callback function triggers
-        stop_event_loop() or *timeout* is reached.  If *timeout* is
-        <=0, never timeout.
-        """
-        root = self.GetTopLevelParent()
-        bind(root, wx.EVT_CLOSE, self.stop_event_loop)
-
-        id = wx.NewId()
-        timer = wx.Timer(self, id=id)
-        if timeout > 0:
-            timer.Start(timeout*1000, oneShot=True)
-            bind(self, wx.EVT_TIMER, self.stop_event_loop, id=id)
-        self._event_loop.Run()
-        timer.Stop()
-
-    def stop_event_loop(self, event=None):
-        """
-        Stop an event loop.  This is used to stop a blocking event
-        loop so that interactive functions, such as ginput and
-        waitforbuttonpress, can wait for events.
-
-        Call signature::
-
-        stop_event_loop_default(self)
-        """
-        if self._event_loop.IsRunning():
-            self._event_loop.Exit()
-
 # Event binding code changed after version 2.5
 if wx.VERSION_STRING >= '2.5':
     def bind(actor,event,action,**kw):
@@ -1359,6 +1359,7 @@ def get_figure_manager(self):
 
     def _onClose(self, evt):
         DEBUG_MSG("onClose()", 1, self)
+        self.canvas.stop_event_loop()
         Gcf.destroy(self.num)
         #self.Destroy()
 
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -41,7 +41,7 @@ def _get_toolbar(self, statbar):
             toolbar = None
         return toolbar
 
-class FigureCanvasWxAgg(FigureCanvasAgg, FigureCanvasWx):
+class FigureCanvasWxAgg(FigureCanvasWx, FigureCanvasAgg):
     """
     The FigureCanvas contains the figure and does event handling.
 
