From a4940a07112b1fc917edd743b2b9b6cdc3ccbc09 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Wed, 22 May 2013 18:56:39 +0000
Subject: Replace MenuItem by PaletteMenuItem - SL #4500

PaletteMenuItem is the new widget we should use in gtk3

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
(limited to 'toolbox.py')

diff --git a/toolbox.py b/toolbox.py
index 2d3b554..60f0d3a 100644
--- a/toolbox.py
+++ b/toolbox.py
@@ -78,7 +78,8 @@ from sugar3.graphics.objectchooser import ObjectChooser
 from widgets import ButtonStrokeColor
 from sugar3.graphics.colorbutton import ColorToolButton
 from sugar3.graphics.radiopalette import RadioPalette
-from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.palettemenu import PaletteMenuBox
+from sugar3.graphics.palettemenu import PaletteMenuItem
 
 from sugar3.graphics import style
 
@@ -90,10 +91,10 @@ from fontcombobox import FontComboBox
 
 
 def add_menu(icon_name, tooltip, tool_name, button, activate_cb):
-    menu_item = MenuItem(icon_name=icon_name, text_label=tooltip)
+    menu_item = PaletteMenuItem(icon_name=icon_name, text_label=tooltip)
     menu_item.connect('activate', activate_cb, tool_name)
     menu_item.icon_name = icon_name
-    button.props.palette.menu.append(menu_item)
+    button.menu_box.append_item(menu_item)
     menu_item.show()
     return menu_item
 
@@ -262,6 +263,10 @@ class DrawToolButton(RadioToolButton):
         if self.props.palette:
             self.__palette_cb(None, None)
 
+        self.menu_box = PaletteMenuBox()
+        self.props.palette.set_content(self.menu_box)
+        self.menu_box.show()
+
         self.connect('notify::palette', self.__palette_cb)
 
     def __palette_cb(self, widget, pspec):
--
cgit v0.9.1