diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-11-09 16:38:09 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-11-09 16:38:09 (GMT) |
commit | d577566151c7dd7287d5609730861b006158b1e4 (patch) | |
tree | 99feac57c9b782657c1aef755e58939e26d93895 /lib | |
parent | bdfbe8d6731d2350bbfccbf24f7931ef2ce20660 (diff) | |
parent | 213259233d27d2b83747a42dfc9e2f3bfdbae07c (diff) |
Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sugar/graphics/menuitem.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sugar/graphics/menuitem.py b/lib/sugar/graphics/menuitem.py index 5b457a5..1b90843 100644 --- a/lib/sugar/graphics/menuitem.py +++ b/lib/sugar/graphics/menuitem.py @@ -19,7 +19,7 @@ import gtk from sugar.graphics.icon import Icon class MenuItem(gtk.ImageMenuItem): - def __init__(self, text_label, icon_name=None): + def __init__(self, text_label=None, icon_name=None): gtk.ImageMenuItem.__init__(self, text_label) if icon_name: icon = Icon(icon_name=icon_name, icon_size=gtk.ICON_SIZE_MENU) |