Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--EdSexual.activity/activity.py5
-rwxr-xr-xsrc/Main.py4
2 files changed, 4 insertions, 5 deletions
diff --git a/EdSexual.activity/activity.py b/EdSexual.activity/activity.py
index 2217c52..f5878cb 100644
--- a/EdSexual.activity/activity.py
+++ b/EdSexual.activity/activity.py
@@ -5,7 +5,7 @@ import sugargame
import sugargame.canvas
from sugar.activity import activity
-import Main
+from Main import EdSexualGame
class Activity(activity.Activity):
@@ -13,12 +13,11 @@ class Activity(activity.Activity):
activity.Activity.__init__(self, handle)
self.max_participants = 1
- self.actividad = Main.EdSexualGame()
+ self.actividad = EdSexualGame(self)
self._pygamecanvas = sugargame.canvas.PygameCanvas(self)
self.set_canvas(self._pygamecanvas)
self._pygamecanvas.grab_focus()
self._pygamecanvas.run_pygame(self.actividad.main)
- print 'saliendo'
def read_file(self, file_path):
pass
diff --git a/src/Main.py b/src/Main.py
index 4308f93..c01f150 100755
--- a/src/Main.py
+++ b/src/Main.py
@@ -5,8 +5,8 @@ from game.MenuState import CMenuState
class EdSexualGame():
- def __init__(self):
- pass
+ def __init__(self, parent=None):
+ self.aParent = parent
def main(self):