Skip to content

GTK3 backend: Replaced deprecated GObject calls with GLib #2826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2014
Merged

GTK3 backend: Replaced deprecated GObject calls with GLib #2826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/matplotlib/backends/backend_gtk3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")

Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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):
"""
Expand Down