[Gtk-sharp-list] Some null_ok additions

Larry Ewing lewing@ximian.com
Thu, 12 Aug 2004 10:59:00 -0500


--=-OCw3A15ySdSsCJ0XbqLs
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

These two were missing null_ok.  

Gtk.Image appears to be a bit of a mess with respect to setting Pixbufs
in general, the Pixbuf prop should allow nulls too but I can't tag it
that way because the generator can't find the setter.  Instead because
of name changes and ends up creating two differnt properties one write
only.  I didn't fix that, I just made the write only one take null.

--Larry

--=-OCw3A15ySdSsCJ0XbqLs
Content-Disposition: attachment; filename=null_ok.diff
Content-Type: text/x-patch; name=null_ok.diff; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvs/public/gtk-sharp/ChangeLog,v
retrieving revision 1.883
diff -u -p -r1.883 ChangeLog
--- ChangeLog	4 Aug 2004 08:36:37 -0000	1.883
+++ ChangeLog	12 Aug 2004 14:48:24 -0000
@@ -1,3 +1,8 @@
+2004-08-12  Larry Ewing  <lewing@novell.com>
+
+	* gtk/Gtk.metadata: mark Image.FromPixbuf null_ok.
+	* gdk/Gdk.metadata: mark cmap in GetFromDrawable null_ok.
+
 2004-08-04  Raja R Harinath  <rharinath@novell.com>
 
 	* configure.in (GTKHTML): Use SOVERSION=11 for GtkHTML 3.1.18.
Index: gdk/Gdk.metadata
===================================================================
RCS file: /cvs/public/gtk-sharp/gdk/Gdk.metadata,v
retrieving revision 1.33
diff -u -p -r1.33 Gdk.metadata
--- gdk/Gdk.metadata	24 Jul 2004 23:36:39 -0000	1.33
+++ gdk/Gdk.metadata	12 Aug 2004 14:48:24 -0000
@@ -47,6 +47,7 @@
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='AddAlpha']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='CompositeColorSimple']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='GetFromDrawable']" name="library">libgdk-win32-2.0-0.dll</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='GetFromDrawable']/*/*[@name='cmap']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='GetFormats']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='GetFromImage']" name="library">libgdk-win32-2.0-0.dll</attr>
   <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='GetPixels']" name="hidden">1</attr>
Index: gtk/Gtk.metadata
===================================================================
RCS file: /cvs/public/gtk-sharp/gtk/Gtk.metadata,v
retrieving revision 1.65
diff -u -p -r1.65 Gtk.metadata
--- gtk/Gtk.metadata	16 Jul 2004 19:24:58 -0000	1.65
+++ gtk/Gtk.metadata	12 Aug 2004 14:48:24 -0000
@@ -126,6 +126,7 @@
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_icon_set']/*/*[@name='size']" name="property_name">icon_size</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_stock']/*/*[@name='stock_id']" name="property_name">stock</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_stock']/*/*[@name='size']" name="property_name">icon_size</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromPixbuf']/*/*[@type='GdkPixbuf*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromPixmap']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkIMContext']/signal[@name='DeleteSurrounding']" name="name">SurroundingDeleted</attr>
   <attr path="/api/namespace/object[@cname='GtkInvisible']/property[@name='Screen']" name="new_flag">1</attr>

--=-OCw3A15ySdSsCJ0XbqLs--