From 1b3eee762f47cc534ca25115d6f20274c6542d16 Mon Sep 17 00:00:00 2001 From: Timo Vanwynsberghe Date: Thu, 20 Feb 2014 20:58:56 +0100 Subject: [PATCH] GTK3 backend: Replaced deprecated GObject calls with GLib --- lib/matplotlib/backends/backend_gtk3.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py index 0caaa27d6013..4408a885eeb9 100644 --- a/lib/matplotlib/backends/backend_gtk3.py +++ b/lib/matplotlib/backends/backend_gtk3.py @@ -22,7 +22,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name "to be installed.") try: - from gi.repository import Gtk, Gdk, GObject + from gi.repository import Gtk, Gdk, GObject, GLib except ImportError: raise ImportError("Gtk3 backend requires pygobject to be installed.") @@ -92,11 +92,11 @@ def _timer_start(self): # Need to stop it, otherwise we potentially leak a timer id that will # never be stopped. self._timer_stop() - self._timer = GObject.timeout_add(self._interval, self._on_timer) + self._timer = GLib.timeout_add(self._interval, self._on_timer) def _timer_stop(self): if self._timer is not None: - GObject.source_remove(self._timer) + GLib.source_remove(self._timer) self._timer = None def _timer_set_interval(self): @@ -206,14 +206,14 @@ def __init__(self, figure): self.set_double_buffered(True) self.set_can_focus(True) self._renderer_init() - self._idle_event_id = GObject.idle_add(self.idle_event) + self._idle_event_id = GLib.idle_add(self.idle_event) def destroy(self): #Gtk.DrawingArea.destroy(self) self.close_event() - GObject.source_remove(self._idle_event_id) + GLib.source_remove(self._idle_event_id) if self._idle_draw_id != 0: - GObject.source_remove(self._idle_draw_id) + GLib.source_remove(self._idle_draw_id) def scroll_event(self, widget, event): if _debug: print('FigureCanvasGTK3.%s' % fn_name()) @@ -329,7 +329,7 @@ def idle_draw(*args): self._idle_draw_id = 0 return False if self._idle_draw_id == 0: - self._idle_draw_id = GObject.idle_add(idle_draw) + self._idle_draw_id = GLib.idle_add(idle_draw) def new_timer(self, *args, **kwargs): """