From 48f5913a4677aac173771735ef4ad7965fc0920f Mon Sep 17 00:00:00 2001
From: flavio <fdanesse@gmail.com>
Date: Tue, 10 Jul 2012 21:57:43 +0000
Subject: Correcciones en Eventos

---
diff --git a/olpcgames/gtkEvent.py b/olpcgames/gtkEvent.py
index 6be38ca..202b54c 100644
--- a/olpcgames/gtkEvent.py
+++ b/olpcgames/gtkEvent.py
@@ -63,15 +63,15 @@ class Translator(GObject.Object):
 
         # Need to set our X event masks so we see mouse motion and stuff --
         mainwindow.set_events(
-            Gdk.EventMask.KEY_PRESS_MASK | \
-            Gdk.EventMask.KEY_RELEASE_MASK \
+            Gdk.EventMask.KEY_PRESS_MASK |
+            Gdk.EventMask.KEY_RELEASE_MASK
         )
         
         self._inner_evb.set_events(
-            Gdk.EventMask.POINTER_MOTION_MASK | \
-            Gdk.EventMask.POINTER_MOTION_HINT_MASK | \
-            Gdk.EventMask.BUTTON_MOTION_MASK | \
-            Gdk.EventMask.BUTTON_PRESS_MASK | \
+            Gdk.EventMask.POINTER_MOTION_MASK |
+            Gdk.EventMask.POINTER_MOTION_HINT_MASK |
+            Gdk.EventMask.BUTTON_MOTION_MASK |
+            Gdk.EventMask.BUTTON_PRESS_MASK |
             Gdk.EventMask.BUTTON_RELEASE_MASK
         )
           
@@ -137,7 +137,7 @@ class Translator(GObject.Object):
         eventwrap.post(eventwrap.Event(pygame.QUIT))
 
     def _keydown(self, widget, event):
-        key = event.keyval
+        key = event.get_keyval()
         log.debug( 'key down: %s', key )
         if key in self.__held:
             return True
@@ -150,7 +150,7 @@ class Translator(GObject.Object):
         return self._keyevent(widget, event, pygame.KEYDOWN)
         
     def _keyup(self, widget, event):
-        key = event.keyval
+        key = event.get_keyval()
         if self.__repeat[0] is not None:
             if key in self.__held:
                 # This is possibly false if set_repeat() is called with a key held
@@ -219,9 +219,8 @@ class Translator(GObject.Object):
         
     def _mouseevent(self, widget, event, type):
 
-        evt = eventwrap.Event(type,
-                                             button=event.button,
-                                             pos=(event.x, event.y))
+        evt = eventwrap.Event(type, button=event.button,
+            pos=(event.x, event.y))
         self._post(evt)
         return True
         
@@ -280,6 +279,7 @@ class Translator(GObject.Object):
     def _post(self, evt):
         try:
             eventwrap.post(evt)
+            pass
         except pygame.error, e:
             if str(e) == 'Event queue full':
                 print "Event queue full!"
--
cgit v0.9.1