1.99.5

2001-11-26  Matt Wilson  <msw@redhat.com>

	* configure.in: 1.99.5

2001-11-20  Matt Wilson  <msw@redhat.com>

	* gtk/gtk.defs (GtkStyle.render_icon): change size argument type
	to GtkIconSize.
	(gtk_image_new_from_stock): likewise, change from constructor to
	function, rename to image_new_from_stock.
	(gtk_image_new_from_icon_set): likewise.
	(gtk_image_new_from_animation): change from constructor to
	function, rename to image_new_from_animation.  Should these just
	go in as an overloaded constructor for GtkImage()?
	(icon_source_new): is-constructor-of GtkIconSource
	(icon_set_new): is-constructor-of GtkIconSet

4 files changed, 36 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 869e62b1..68bb9791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-11-26  Matt Wilson  <msw@redhat.com>
+
+	* configure.in: 1.99.5
+
+2001-11-20  Matt Wilson  <msw@redhat.com>
+
+	* gtk/gtk.defs (GtkStyle.render_icon): change size argument type
+	to GtkIconSize.
+	(gtk_image_new_from_stock): likewise, change from constructor to
+	function, rename to image_new_from_stock.
+	(gtk_image_new_from_icon_set): likewise.
+	(gtk_image_new_from_animation): change from constructor to
+	function, rename to image_new_from_animation.  Should these just
+	go in as an overloaded constructor for GtkImage()?
+	(icon_source_new): is-constructor-of GtkIconSource
+	(icon_set_new): is-constructor-of GtkIconSet
+
 2001-11-19  Matt Wilson  <msw@redhat.com>
 
 	* codegen/codegen.py (attrchecktmpl): fix indention.
diff --git a/configure.in b/configure.in
index 86d745ce..c644e173 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(pygtk, 1.99.4,
+AC_INIT(pygtk, 1.99.5,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python&component=pygtk])
 AC_CONFIG_SRCDIR([gtk/gtkmodule.c])
 AM_CONFIG_HEADER(config.h)
diff --git a/gtk/gtk-types.defs b/gtk/gtk-types.defs
index 2350d786..b96f2f57 100644
--- a/gtk/gtk-types.defs
+++ b/gtk/gtk-types.defs
@@ -937,6 +937,14 @@
   (gtype-id "GTK_TYPE_ICON_SET")
 )
 
+(define-boxed IconSource
+  (in-module "Gtk")
+  (c-name "GtkIconSource")
+  (gtype-id "GTK_TYPE_ICON_SOURCE")
+  (copy-func "gtk_icon_source_copy")
+  (release-func "gtk_icon_source_free")
+)
+
 (define-boxed SelectionData
   (in-module "Gtk")
   (c-name "GtkSelectionData")
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 528d98a5..910492da 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -4483,6 +4483,7 @@
 (define-function icon_set_new
   (c-name "gtk_icon_set_new")
   (return-type "GtkIconSet*")
+  (is-constructor-of GtkIconSet)
 )
 
 (define-function icon_set_new_from_pixbuf
@@ -4545,6 +4546,7 @@
 )
 
 (define-function icon_source_new
+  (is-constructor-of GtkIconSource)
   (c-name "gtk_icon_source_new")
   (return-type "GtkIconSource*")
 )
@@ -4733,30 +4735,27 @@
   )
 )
 
-(define-function gtk_image_new_from_stock
+(define-function image_new_from_stock
   (c-name "gtk_image_new_from_stock")
-  (is-constructor-of GtkImage)
-  (return-type "GtkWidget*")
+  (return-type "GtkImage*")
   (parameters
     '("const-gchar*" "stock_id")
-    '("const-gchar*" "size")
+    '("GtkIconSize" "size")
   )
 )
 
-(define-function gtk_image_new_from_icon_set
+(define-function image_new_from_icon_set
   (c-name "gtk_image_new_from_icon_set")
-  (is-constructor-of GtkImage)
-  (return-type "GtkWidget*")
+  (return-type "GtkImage*")
   (parameters
     '("GtkIconSet*" "icon_set")
     '("GtkIconSize" "size")
   )
 )
 
-(define-function gtk_image_new_from_animation
+(define-function image_new_from_animation
   (c-name "gtk_image_new_from_animation")
-  (is-constructor-of GtkImage)
-  (return-type "GtkWidget*")
+  (return-type "GtkImage*")
   (parameters
     '("GdkPixbufAnimation*" "animation")
   )
@@ -9272,7 +9271,7 @@
     '("const-GtkIconSource*" "source")
     '("GtkTextDirection" "direction")
     '("GtkStateType" "state")
-    '("const-gchar*" "size")
+    '("GtkIconSize" "size")
     '("GtkWidget*" "widget")
     '("const-gchar*" "detail")
   )