From ee2aa6ae2beda3d4182470a3d6796d64e9bd791d Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Fri, 17 Jan 2014 23:10:47 +0000
Subject: merge ignacio's gtk3 branch

---
(limited to 'physics.py')

diff --git a/physics.py b/physics.py
index c44f5ea..19b0688 100644
--- a/physics.py
+++ b/physics.py
@@ -27,7 +27,9 @@
 
 import os
 import sys
-import gtk
+
+from gi.repository import Gtk
+from gi.repository import Gdk
 
 import pygame
 from pygame.locals import *
@@ -105,8 +107,8 @@ class PhysicsGame:
                                 self.switch_on_fake_pygame_cursor_cb)
             self.canvas.connect('leave_notify_event',
                                 self.switch_off_fake_pygame_cursor_cb)
-            self.canvas.add_events(gtk.gdk.ENTER_NOTIFY_MASK
-                                   | gtk.gdk.LEAVE_NOTIFY_MASK)
+            self.canvas.add_events(Gdk.EventMask.ENTER_NOTIFY_MASK
+                                   | Gdk.EventMask.LEAVE_NOTIFY_MASK)
 
         self.world = elements.Elements(self.screen.get_size())
         self.world.renderer.set_surface(self.screen)
@@ -126,8 +128,8 @@ class PhysicsGame:
                         self.world.additional_vars['tracked_bodies']
 
         while self.loop:
-            while gtk.events_pending():
-                gtk.main_iteration()
+            while Gtk.events_pending():
+                Gtk.main_iteration()
 
             if not self.loop:
                 pygame.quit()
--
cgit v0.9.1