summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo J. A. M. Carneiro <gcarneiro@src.gnome.org>2004-03-07 12:58:58 +0000
committerGustavo J. A. M. Carneiro <gcarneiro@src.gnome.org>2004-03-07 12:58:58 +0000
commit86b405ce743c5ed299887bf6a818175a05ea8f92 (patch)
treec6650ff0d314081bd65c9f0a0f4c5065c4271416
parent87dcb7c16b66ab5bd25b8f9a4b8cefb9d01867b6 (diff)
downloadpygtk-86b405ce743c5ed299887bf6a818175a05ea8f92.tar.gz
pygtk appwindow demo fix (stock item registration)
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am1
-rw-r--r--examples/pygtk-demo/demos/appwindow.py8
-rw-r--r--examples/pygtk-demo/gtk-logo-rgb.gifbin0 -> 6427 bytes
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f1d9506e..0579967b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-07 Gustavo J. A. M. Carneiro <gustavo@users.sourceforge.net>
+
+ * examples/pygtk-demo/gtk-logo-rgb.gif,
+ * Makefile.am (EXTRA_DIST): Add gtk-logo-rgb.gif, because of stock
+ icon registration example.
+
+ * examples/pygtk-demo/demos/appwindow.py: Fix stock icon
+ registration.
+
2004-03-06 John Ehresman <jpe@wingide.com>
* gtk/gtktreeview.override (map_expanded_rows_cb)
diff --git a/Makefile.am b/Makefile.am
index 00e166b0..34f2801e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,7 @@ EXTRA_DIST += \
examples/gobject/properties.py \
examples/pango/utf8-demo.py \
examples/pygtk-demo/pygtk-demo.py \
+ examples/pygtk-demo/gtk-logo-rgb.gif \
examples/pygtk-demo/demos/__init__.py \
examples/pygtk-demo/demos/appwindow.py \
examples/pygtk-demo/demos/buttonbox.py \
diff --git a/examples/pygtk-demo/demos/appwindow.py b/examples/pygtk-demo/demos/appwindow.py
index d96bd025..1054afa5 100644
--- a/examples/pygtk-demo/demos/appwindow.py
+++ b/examples/pygtk-demo/demos/appwindow.py
@@ -51,8 +51,6 @@ def toolbar_cb(button, window):
dialog.show()
def register_stock_icons ():
- # TODO: Fix this
-
items = [('demo-gtk-logo', '_GTK!', 0, 0, '')]
# Register our stock items
@@ -63,12 +61,12 @@ def register_stock_icons ():
factory.add_default ()
pixbuf = gtk.gdk.pixbuf_new_from_file ('gtk-logo-rgb.gif')
-
+ pixbuf.add_alpha(True, 0xff, 0xff, 0xff)
+
# Register icon to accompany stock item
if pixbuf:
icon_set = gtk.IconSet (pixbuf)
factory.add ('demo-gtk-logo', icon_set)
- icon_set.unref()
else:
print 'failed to load GTK logo for toolbar'
@@ -87,7 +85,7 @@ mark_set_callback = (lambda buffer, new_location, mark, statusbar:
def main():
- #register_stock_icons ()
+ register_stock_icons ()
# Create the toplevel window
window = gtk.Window()
diff --git a/examples/pygtk-demo/gtk-logo-rgb.gif b/examples/pygtk-demo/gtk-logo-rgb.gif
new file mode 100644
index 00000000..63c622b9
--- /dev/null
+++ b/examples/pygtk-demo/gtk-logo-rgb.gif
Binary files differ