From 53f12652527f3e5249e6fb867e2a65f6406dc82b Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Tue, 18 Sep 2007 12:24:16 +0000
Subject: Handle the passing of the child of the toolitem to the WidgetInvoker in ToolInvoker, FrameWidgetInvoker

---
(limited to 'sugar/graphics')

diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py
index acc14f7..3873d38 100644
--- a/sugar/graphics/palette.py
+++ b/sugar/graphics/palette.py
@@ -668,6 +668,9 @@ class CanvasInvoker(Invoker):
         return hippo.get_canvas_for_item(self._item).get_toplevel()
 
 class ToolInvoker(WidgetInvoker):
+    def __init__(self, widget):
+        WidgetInvoker.__init__(self, widget.child)
+
     def _get_alignments(self):
         parent = self._widget.get_parent()
         if parent is None:
diff --git a/sugar/graphics/radiotoolbutton.py b/sugar/graphics/radiotoolbutton.py
index 8a1399a..cb4ae25 100644
--- a/sugar/graphics/radiotoolbutton.py
+++ b/sugar/graphics/radiotoolbutton.py
@@ -44,7 +44,7 @@ class RadioToolButton(gtk.RadioToolButton):
         if self._palette is not None:        
             self._palette.props.invoker = None
         self._palette = palette
-        self._palette.props.invoker = ToolInvoker(self.child)
+        self._palette.props.invoker = ToolInvoker(self)
 
     def set_tooltip(self, text):
         self.set_palette(Palette(text))
diff --git a/sugar/graphics/toggletoolbutton.py b/sugar/graphics/toggletoolbutton.py
index 2c97fa3..3d05cc0 100644
--- a/sugar/graphics/toggletoolbutton.py
+++ b/sugar/graphics/toggletoolbutton.py
@@ -40,7 +40,7 @@ class ToggleToolButton(gtk.ToggleToolButton):
         if self._palette is not None:        
             self._palette.props.invoker = None
         self._palette = palette
-        self._palette.props.invoker = ToolInvoker(self.child)
+        self._palette.props.invoker = ToolInvoker(self)
 
     def set_tooltip(self, text):
         self.set_palette(Palette(text))
diff --git a/sugar/graphics/toolbutton.py b/sugar/graphics/toolbutton.py
index 8a0005e..b4c8eb3 100644
--- a/sugar/graphics/toolbutton.py
+++ b/sugar/graphics/toolbutton.py
@@ -44,7 +44,7 @@ class ToolButton(gtk.ToolButton):
         if self._palette is not None:        
             self._palette.props.invoker = None
         self._palette = palette
-        self._palette.props.invoker = ToolInvoker(self.child)
+        self._palette.props.invoker = ToolInvoker(self)
 
     def set_tooltip(self, text):
         self.set_palette(Palette(text))
--
cgit v0.9.1