[pygobject] Fix Gtk.Button constructor to accept use_stock parameter



commit f7db4eaf8148f2dd8bf1718152a1dcae509470c7
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Sun Mar 18 16:07:26 2012 +0100

    Fix Gtk.Button constructor to accept use_stock parameter
    
    Thanks to kalanzun googlemail com!
    
    https://bugzilla.gnome.org/show_bug.cgi?id=672318
    
    Signed-off-by: Martin Pitt <martin pitt ubuntu com>

 gi/overrides/Gtk.py     |    4 +---
 tests/test_overrides.py |    6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
index e556ee8..c2fd233 100644
--- a/gi/overrides/Gtk.py
+++ b/gi/overrides/Gtk.py
@@ -1318,13 +1318,11 @@ TreeSelection = override(TreeSelection)
 __all__.append('TreeSelection')
 
 class Button(Gtk.Button, Container):
-    def __init__(self, label=None, stock=None, use_underline=False, **kwds):
+    def __init__(self, label=None, stock=None, use_stock=False, use_underline=False, **kwds):
         if stock:
             label = stock
             use_stock = True
             use_underline = True
-        else:
-            use_stock = False
         Gtk.Button.__init__(self, label=label, use_stock=use_stock,
                             use_underline=use_underline, **kwds)
 Button = override(Button)
diff --git a/tests/test_overrides.py b/tests/test_overrides.py
index 75e0b5e..1613c6d 100644
--- a/tests/test_overrides.py
+++ b/tests/test_overrides.py
@@ -1564,6 +1564,12 @@ class TestGtk(unittest.TestCase):
         self.assertTrue(button.get_use_stock())
         self.assertTrue(button.get_use_underline())
 
+        # test Gtk.Button use_stock
+        button = Gtk.Button(label=Gtk.STOCK_CLOSE, use_stock=True, use_underline=True)
+        self.assertEquals(Gtk.STOCK_CLOSE, button.get_label())
+        self.assertTrue(button.get_use_stock())
+        self.assertTrue(button.get_use_underline())
+
         # test Gtk.LinkButton
         self.assertRaises(TypeError, Gtk.LinkButton)
         button = Gtk.LinkButton('http://www.Gtk.org', 'Gtk')



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]