diff options
Diffstat (limited to 'sugargame')
-rw-r--r-- | sugargame/canvas.py | 4 | ||||
-rw-r--r-- | sugargame/event.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sugargame/canvas.py b/sugargame/canvas.py index d070a96..1ce0250 100644 --- a/sugargame/canvas.py +++ b/sugargame/canvas.py @@ -23,7 +23,7 @@ class PygameCanvas(Gtk.EventBox): self._mainwindow = mainwindow - self.set_flags(Gtk.CAN_FOCUS) + self.set_can_focus(True) self._socket = Gtk.Socket() self.add(self._socket) @@ -45,7 +45,7 @@ class PygameCanvas(Gtk.EventBox): pygame.init() # Restore the default cursor. - self._socket.window.set_cursor(None) + self._socket.props.window.set_cursor(None) # Initialize the Pygame window. r = self.get_allocation() diff --git a/sugargame/event.py b/sugargame/event.py index 0aeee50..19ecf5d 100644 --- a/sugargame/event.py +++ b/sugargame/event.py @@ -1,4 +1,5 @@ from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GObject import pygame import pygame.event @@ -58,8 +59,8 @@ class Translator(object): Gdk.EventMask.BUTTON_RELEASE_MASK ) - self._mainwindow.set_flags(Gtk.CAN_FOCUS) - self._inner_evb.set_flags(Gtk.CAN_FOCUS) + self._mainwindow.set_can_focus(True) + self._inner_evb.set_can_focus(True) # Callback functions to link the event systems self._mainwindow.connect('unrealize', self._quit_cb) @@ -68,7 +69,7 @@ class Translator(object): self._inner_evb.connect('button_press_event', self._mousedown_cb) self._inner_evb.connect('button_release_event', self._mouseup_cb) self._inner_evb.connect('motion-notify-event', self._mousemove_cb) - self._inner_evb.connect('expose-event', self._expose_cb) + self._inner_evb.connect('draw', self._expose_cb) self._inner_evb.connect('configure-event', self._resize_cb) # Internal data @@ -189,7 +190,7 @@ class Translator(object): # if this is a hint, then let's get all the necessary # information, if not it's all we need. if event.is_hint: - x, y, state = event.window.get_pointer() + win, x, y, state = event.window.get_device_position(event.device) else: x = event.x y = event.y |