From 622c360576f29f1bab5a478765fef193cf2a40a9 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 15 Aug 2005 15:15:57 +0000 Subject: [PATCH] * parser/gapi2xml.pl (addFuncElems): if a struct or boxed type has a constructor or a ref, unref, or destroy method, then it must be a reference type, so mark it "opaque" but then also mark all of its fields public and writable. * */*-api*.raw: Regen * generator/Parser.cs (ParseNamespace): make the opaque attribute check actually look at the value of the attribute rather than just checking if it's there, so that you can change a struct's opaque attribute from "true" to "false" via metadata and have that work. * generator/BoxedGen.cs (Generate): do not generate the boxed's "Free" method (since it's guaranteed to crash when we pass it a stack pointer). If "Copy" is marked deprecated, create a deprecated no-op for it, otherwise just skip it (since otherwise it will just leak memory when we copy its result onto the stack). * pango/Pango.metadata: deprecate Pango.Color.Copy and Pango.Matrix.Copy. Hide some array fields in Pango.GlyphString that we've never generated correctly. Tweak Pango.LayoutLine fields to be the same as they used to be. * pango/GlyphItem.custom (glyphs, item): * pango/GlyphString.custom (Zero, New): * pango/Item.custom (Zero, New): * pango/LayoutRun.custom (glyphs, item): add deprecated API compat * gdk/Gdk.metadata: undo the parser's new opaquification of Gdk.Font; it's been deprecated since pre-gtk# times, and no one should be using it, so there's no point in fixing it now. Fix up a few other things to match how they used to be. Fix RgbCmap's constructor args. * gdk/RgbCmap.custom (Zero, New): deprecated API compat * gdk/PangoAttrEmbossed.custom: * gdk/PangoAttrStipple.custom (Zero, New, Attr): deprecated API compat (explicit operator ...): allow casting back and forth between Pango.Attribute. (We can't usefully make them real subclasses of Pango.Attribute, because there's no way for Pango.Attribute.GetAttribute() to be able to dtrt with them.) * gtk/Gtk.metadata: deprecate Gtk.Requisition.Copy, Gtk.TextIter.Copy, and Gtk.TreeIter.Copy. Mark the return value of TextView.DefaultAttributes as "owned". Mark TargetList's fields private so it stays how it used to be. * gtk/TextAttributes.custom (Zero, New): deprecated API compat * gnomevfs/Gnomevfs.metadata: remove a bunch of opaque declarations that the parser figures out on its own now. * art/Art.metadata: * glade/Glade.metadata: * rsvg/Rsvg.metadata: un-mark everything the parser marked opaque in these libraries, because all of the structs in question would still be unusably broken, so the API churn would be pointless. svn path=/trunk/gtk-sharp/; revision=48387 --- ChangeLog | 62 ++++++++ art/Art.metadata | 2 + art/art-api.raw | 92 ++++++------ doc/en/Gdk/Cursor.xml | 12 ++ doc/en/Gdk/PangoAttrEmbossed.xml | 96 ++++++++++-- doc/en/Gdk/PangoAttrStipple.xml | 97 ++++++++++-- doc/en/Gdk/RgbCmap.xml | 89 +++++------ doc/en/Gtk/Requisition.xml | 12 -- doc/en/Gtk/TextAttributes.xml | 246 +++++++++++++------------------ doc/en/Gtk/TextIter.xml | 12 -- doc/en/Gtk/TreeIter.xml | 14 -- doc/en/Pango/Color.xml | 12 -- doc/en/Pango/GlyphItem.xml | 42 +++++- doc/en/Pango/GlyphString.xml | 102 +++++-------- doc/en/Pango/Item.xml | 74 ++++++---- doc/en/Pango/LayoutLine.xml | 24 +++ doc/en/Pango/LayoutRun.xml | 42 +++++- doc/en/Pango/Matrix.xml | 12 -- gdk/Gdk.metadata | 9 +- gdk/Makefile.am | 2 + gdk/PangoAttrEmbossed.custom | 51 +++++++ gdk/PangoAttrStipple.custom | 37 ++++- gdk/RgbCmap.custom | 28 ++++ gdk/gdk-api-2.4.raw | 42 +++--- gdk/gdk-api-2.6.raw | 42 +++--- gdk/gdk-api-2.8.raw | 53 +++---- generator/BoxedGen.cs | 12 ++ generator/Parser.cs | 3 +- glade/Glade.metadata | 3 +- glade/glade-api.raw | 14 +- gnome/Gnome.metadata | 2 +- gnome/gnome-api-2.10.raw | 8 +- gnome/gnome-api-2.6.raw | 8 +- gnomevfs/Gnomevfs.metadata | 5 +- gnomevfs/gnome-vfs-api-2.10.raw | 78 +++++----- gnomevfs/gnome-vfs-api-2.6.raw | 70 ++++----- gtk/Gtk.metadata | 6 +- gtk/TextAttributes.custom | 39 ++--- gtk/gtk-api-2.4.raw | 62 ++++---- gtk/gtk-api-2.6.raw | 62 ++++---- gtk/gtk-api-2.8.raw | 62 ++++---- gtkhtml/Gtk.metadata | 2 +- gtkhtml/gtkhtml-api.raw | 10 +- pango/GlyphItem.custom | 9 ++ pango/GlyphString.custom | 34 +++++ pango/Item.custom | 34 +++++ pango/LayoutRun.custom | 29 ++++ pango/Makefile.am | 3 + pango/Pango.metadata | 10 +- pango/pango-api-2.4.raw | 60 ++++---- pango/pango-api-2.6.raw | 74 +++++----- pango/pango-api-2.8.raw | 74 +++++----- parser/gapi2xml.pl | 12 ++ rsvg/Rsvg.metadata | 1 + rsvg/rsvg-api.raw | 10 +- 55 files changed, 1263 insertions(+), 839 deletions(-) create mode 100644 gdk/PangoAttrEmbossed.custom create mode 100644 gdk/RgbCmap.custom create mode 100644 pango/GlyphString.custom create mode 100644 pango/Item.custom create mode 100644 pango/LayoutRun.custom diff --git a/ChangeLog b/ChangeLog index 7c7f0ac10..720d06a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,65 @@ +2005-08-11 Dan Winship + + * parser/gapi2xml.pl (addFuncElems): if a struct or boxed type has + a constructor or a ref, unref, or destroy method, then it must be + a reference type, so mark it "opaque" but then also mark all of + its fields public and writable. + + * */*-api*.raw: Regen + + * generator/Parser.cs (ParseNamespace): make the opaque attribute + check actually look at the value of the attribute rather than just + checking if it's there, so that you can change a struct's opaque + attribute from "true" to "false" via metadata and have that work. + + * generator/BoxedGen.cs (Generate): do not generate the boxed's + "Free" method (since it's guaranteed to crash when we pass it a + stack pointer). If "Copy" is marked deprecated, create a + deprecated no-op for it, otherwise just skip it (since otherwise + it will just leak memory when we copy its result onto the stack). + + * pango/Pango.metadata: deprecate Pango.Color.Copy and + Pango.Matrix.Copy. Hide some array fields in Pango.GlyphString + that we've never generated correctly. Tweak Pango.LayoutLine + fields to be the same as they used to be. + + * pango/GlyphItem.custom (glyphs, item): + * pango/GlyphString.custom (Zero, New): + * pango/Item.custom (Zero, New): + * pango/LayoutRun.custom (glyphs, item): add deprecated API compat + + * gdk/Gdk.metadata: undo the parser's new opaquification of + Gdk.Font; it's been deprecated since pre-gtk# times, and no one + should be using it, so there's no point in fixing it now. Fix up a + few other things to match how they used to be. Fix RgbCmap's + constructor args. + + * gdk/RgbCmap.custom (Zero, New): deprecated API compat + + * gdk/PangoAttrEmbossed.custom: + * gdk/PangoAttrStipple.custom (Zero, New, Attr): deprecated API + compat + (explicit operator ...): allow casting back and forth between + Pango.Attribute. (We can't usefully make them real subclasses of + Pango.Attribute, because there's no way for + Pango.Attribute.GetAttribute() to be able to dtrt with them.) + + * gtk/Gtk.metadata: deprecate Gtk.Requisition.Copy, + Gtk.TextIter.Copy, and Gtk.TreeIter.Copy. Mark the return value of + TextView.DefaultAttributes as "owned". Mark TargetList's fields + private so it stays how it used to be. + + * gtk/TextAttributes.custom (Zero, New): deprecated API compat + + * gnomevfs/Gnomevfs.metadata: remove a bunch of opaque + declarations that the parser figures out on its own now. + + * art/Art.metadata: + * glade/Glade.metadata: + * rsvg/Rsvg.metadata: un-mark everything the parser marked opaque + in these libraries, because all of the structs in question would + still be unusably broken, so the API churn would be pointless. + 2005-08-11 Dan Winship * generator/OpaqueGen.cs (Generate): diff --git a/art/Art.metadata b/art/Art.metadata index de0e1ddbd..945f2ef4a 100644 --- a/art/Art.metadata +++ b/art/Art.metadata @@ -5,8 +5,10 @@ out gboolean ToStringArray + false 17 17 private + 1 1 diff --git a/art/art-api.raw b/art/art-api.raw index a89570dc6..a74305d1a 100644 --- a/art/art-api.raw +++ b/art/art-api.raw @@ -65,7 +65,7 @@ - + @@ -227,17 +227,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -305,30 +305,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -617,12 +617,12 @@ - - - - - - + + + + + + @@ -679,10 +679,10 @@ - - - - + + + + diff --git a/doc/en/Gdk/Cursor.xml b/doc/en/Gdk/Cursor.xml index 2c8d5acbb..138b6967f 100644 --- a/doc/en/Gdk/Cursor.xml +++ b/doc/en/Gdk/Cursor.xml @@ -162,5 +162,17 @@ Gdk.Cursor cursor = new Gdk.Cursor (pixmap, mask); + + + Property + + Gdk.CursorType + + + To be added. + To be added. + To be added. + + diff --git a/doc/en/Gdk/PangoAttrEmbossed.xml b/doc/en/Gdk/PangoAttrEmbossed.xml index f08225f12..d3e55dd7f 100644 --- a/doc/en/Gdk/PangoAttrEmbossed.xml +++ b/doc/en/Gdk/PangoAttrEmbossed.xml @@ -1,5 +1,5 @@ - + gdk-sharp @@ -12,7 +12,7 @@ To be added - System.ValueType + GLib.Opaque @@ -24,8 +24,25 @@ - To be added - To be added + Obsolete: use + + + + + System.Obsolete(Message="Gdk.PangoAttrEmbossed is a reference type now, use null", IsError=False) + + + + + + Constructor + + + + + To be added. + To be added. + To be added. @@ -38,12 +55,24 @@ - To be added + Obsolete: replaced by normal constructor To be added: an object of type 'bool' To be added: an object of type 'Gdk.PangoAttrEmbossed' To be added + + + Constructor + + + + + To be added. + To be added. + To be added. + + Method @@ -54,7 +83,7 @@ - To be added + Obsolete internal constructor To be added: an object of type 'IntPtr' To be added: an object of type 'Gdk.PangoAttrEmbossed' To be added @@ -73,17 +102,60 @@ To be added + + + Method + + Pango.Attribute + + + + + + To be added. + To be added. + To be added. + To be added. + + + + + Method + + Gdk.PangoAttrEmbossed + + + + + + To be added. + To be added. + To be added. + To be added. + + - - Field + + Property System.Boolean - - - To be added - To be added + To be added. + To be added. + To be added. + + + + + Property + + Pango.Attribute + + + To be added. + To be added. + To be added. diff --git a/doc/en/Gdk/PangoAttrStipple.xml b/doc/en/Gdk/PangoAttrStipple.xml index 3d7e16d55..9ef5ca698 100644 --- a/doc/en/Gdk/PangoAttrStipple.xml +++ b/doc/en/Gdk/PangoAttrStipple.xml @@ -1,5 +1,5 @@ - + gdk-sharp @@ -12,7 +12,7 @@ To be added - System.ValueType + GLib.Opaque @@ -27,6 +27,24 @@ To be added To be added + + + System.Obsolete(Message="Gdk.PangoAttrStipple is a reference type now, use null", IsError=False) + + + + + + Constructor + + + + + To be added + To be added: an object of type 'Gdk.Pixmap' + To be added + + @@ -38,13 +56,25 @@ - To be added + Obsolete: replaced by normal constructor To be added: an object of type 'Gdk.Pixmap' To be added: an object of type 'Gdk.PangoAttrStipple' - To be added + + + + Constructor + + + + + To be added + To be added: an object of type 'IntPtr' + To be added + + Method @@ -55,12 +85,24 @@ - To be added + Obsolete internal constructor To be added: an object of type 'IntPtr' To be added: an object of type 'Gdk.PangoAttrStipple' To be added + + + Property + + Gdk.Pixmap + + + To be added. + To be added. + To be added. + + Property @@ -70,16 +112,17 @@ - To be added + Obsolete alias for the property To be added: an object of type 'Gdk.Pixmap' To be added - + System.Obsolete(Message="Replaced by Stipple property.", IsError=False) - + + Field @@ -93,11 +136,43 @@ To be added - - + + + Method + + Pango.Attribute + + + + + + To be added. + To be added. + To be added. + To be added. + + + + + Method + + Gdk.PangoAttrStipple + + + + + + To be added. + To be added. + To be added. + To be added. + + + + Property - Gdk.Pixmap + Pango.Attribute To be added. diff --git a/doc/en/Gdk/RgbCmap.xml b/doc/en/Gdk/RgbCmap.xml index cc4e4feb3..fd339e052 100644 --- a/doc/en/Gdk/RgbCmap.xml +++ b/doc/en/Gdk/RgbCmap.xml @@ -1,5 +1,5 @@ - + gdk-sharp @@ -12,7 +12,7 @@ - System.ValueType + GLib.Opaque @@ -24,7 +24,36 @@ - Returns an empty + Obsolete: use + + + + + System.Obsolete(Message="Gdk.RgbCmap is a reference type now, use null", IsError=False) + + + + + + Constructor + + + + + Constructs a new with the given colors. + An array of colors in the form 0xRRGGBB. + + + + + + Constructor + + + + + Internal constructor. + a @@ -38,65 +67,21 @@ - Constructor. + Obsolete internal constructor. a a - - - Method - - System.Void - - - - Do not use. For internal use only. - - - - - - Method - - Gdk.RgbCmap - - - - - - - To be added - a - a - a - - - - - - Field - - System.UInt32[] - - - - - To be added - - - - - Field + + Property System.Int32 - - - To be added + The number of colors in the colormap. + The number of colors in the colormap. diff --git a/doc/en/Gtk/Requisition.xml b/doc/en/Gtk/Requisition.xml index 165db5517..7743c46b0 100644 --- a/doc/en/Gtk/Requisition.xml +++ b/doc/en/Gtk/Requisition.xml @@ -49,18 +49,6 @@ The size requisition phase of the widget layout process operates top-down. It st Not for general developer use. - - - Method - - System.Void - - - - Frees the memory used by this requisition. - - - Method diff --git a/doc/en/Gtk/TextAttributes.xml b/doc/en/Gtk/TextAttributes.xml index 414b2b919..de0c447eb 100644 --- a/doc/en/Gtk/TextAttributes.xml +++ b/doc/en/Gtk/TextAttributes.xml @@ -1,5 +1,5 @@ - + gtk-sharp @@ -12,7 +12,7 @@ - System.ValueType + GLib.Opaque @@ -24,7 +24,21 @@ - No attributes at all. + Obsolete: use . + + + + + System.Obsolete(Message="Gtk.TextAttributes is a reference type now, use null", IsError=False) + + + + + + Constructor + + + Public constructor. @@ -36,11 +50,23 @@ - Public constructor. + Obsolete, replaced by normal constructor A new + + + Constructor + + + + + Constructor for internal use only. + An , a pointer to the C object. + + + Method @@ -51,24 +77,13 @@ - Constructor for internal use only. + Obsolete constructor for internal use only. An , a pointer to the C object. a new - - - Method - - System.Void - - - - Increments the reference count. - - - + Method @@ -97,16 +112,17 @@ FIXME: elaborate the difference between this and Copy, and see if the differences in the underlying C library carry over to the C# library - - - Method + + + + Property - System.Void + Pango.Language - - Decrements the reference count for this object, freeing the underlying C data structure if the refcount reaches 0. + The language of this text. + To be added. @@ -122,11 +138,24 @@ a - + System.Obsolete(Message="Replaced by Language property.", IsError=False) - + + + + + Property + + Pango.TabArray + + + The tab stops for this text. + + To be added. + + Property @@ -140,11 +169,24 @@ a - + System.Obsolete(Message="Replaced by Tabs property.", IsError=False) - + + + + + Property + + Pango.FontDescription + + + The font for this text. + + To be added. + + Property @@ -158,11 +200,12 @@ a - + System.Obsolete(Message="Replaced by Font property.", IsError=False) - + + Property @@ -177,146 +220,135 @@ - - Field + + Property Gtk.TextAppearance - - The appearance of this text: colors, underlining, etc. See for more details. + To be added. - - Field + + Property Gtk.Justification - - The justification of this text. + To be added. - - Field + + Property Gtk.TextDirection - - Whether this text runs right-to-left or left-to-right. + To be added. - - Field + + Property System.Double - - The scale of this text. For more information about font scaling, see + To be added. - - Field + + Property System.Int32 - - The size of the left margin. + To be added. - - Field + + Property System.Int32 - - The size of the indent. + To be added. - - Field + + Property System.Int32 - - The size of the right margin. + To be added. - - Field + + Property System.Int32 - - The number of blank pixels above a line of text. + To be added. - - Field + + Property System.Int32 - - The number of blank pixels below a line of text. + To be added. - - Field + + Property System.Int32 - - The number of pixels between wrapped lines. + To be added. - - Field + + Property Gtk.WrapMode - - The line-wrapping style for this text. + To be added. @@ -375,73 +407,5 @@ - - - Method - - GLib.Value - - - - - - To be added. - To be added. - To be added. - To be added. - - - - - Method - - Gtk.TextAttributes - - - - - - To be added. - To be added. - To be added. - To be added. - - - - - Property - - Pango.FontDescription - - - To be added. - To be added. - To be added. - - - - - Property - - Pango.TabArray - - - To be added. - To be added. - To be added. - - - - - Property - - Pango.Language - - - To be added. - To be added. - To be added. - - diff --git a/doc/en/Gtk/TextIter.xml b/doc/en/Gtk/TextIter.xml index f93b3ed6f..ae0862d85 100644 --- a/doc/en/Gtk/TextIter.xml +++ b/doc/en/Gtk/TextIter.xml @@ -310,18 +310,6 @@ You do not want to use this function to decide whether text can be inserted at i Returns if iter points to the start of the paragraph delimiter characters for a line (delimiters will be either a newline, a carriage return, a carriage return followed by a newline, or a Unicode paragraph separator character). Note that an iterator pointing to the \n of a \r\n pair will not be counted as the end of a line, the line ends before the \r. The end iterator is considered to be at the end of a line, even though there are no paragraph delimiter chars there. - - - Method - - System.Void - - - - Disposes of resources held by the iter. - - - Method diff --git a/doc/en/Gtk/TreeIter.xml b/doc/en/Gtk/TreeIter.xml index 1fae378d1..892481566 100644 --- a/doc/en/Gtk/TreeIter.xml +++ b/doc/en/Gtk/TreeIter.xml @@ -44,18 +44,6 @@ This is usually called indirectly by other methods. Not for use by application developers. - - - Method - - System.Void - - - - Disposes of memory used by this TreeIter object. - - - Method @@ -69,8 +57,6 @@ - - Property diff --git a/doc/en/Pango/Color.xml b/doc/en/Pango/Color.xml index 040265841..5c87de4c0 100644 --- a/doc/en/Pango/Color.xml +++ b/doc/en/Pango/Color.xml @@ -61,18 +61,6 @@ The string can either one of a large set of standard names. (Taken from the X11 rgb.txt file), or it can be a hex value in the form '#rgb' '#rrggbb' '#rrrgggbbb' or '#rrrrggggbbbb' where 'r', 'g' and 'b' are hex digits of the red, green, and blue components of the color, respectively. (White in the four forms is '#fff' '#ffffff' '#fffffffff' and '#ffffffffffff') - - - Method - - System.Void - - - - Frees a color allocated by . - - - Method diff --git a/doc/en/Pango/GlyphItem.xml b/doc/en/Pango/GlyphItem.xml index 3e192b782..69d4bb4a7 100644 --- a/doc/en/Pango/GlyphItem.xml +++ b/doc/en/Pango/GlyphItem.xml @@ -66,8 +66,8 @@ Modifies orig to cover only the text after , and This function is similar in function to (and uses it internally) - - + + Property Pango.GlyphString @@ -78,8 +78,25 @@ This function is similar in function to (and - - + + + Property + + Pango.GlyphString + + + Obsolete alias for + a + + + + + System.Obsolete(Message="Replaced by Glyphs property", IsError=False) + + + + + Property Pango.Item @@ -90,6 +107,23 @@ This function is similar in function to (and + + + Property + + Pango.Item + + + Obsolete alias for + a + + + + + System.Obsolete(Message="Replaced by Item property", IsError=False) + + + Method diff --git a/doc/en/Pango/GlyphString.xml b/doc/en/Pango/GlyphString.xml index 93f176b3c..c3a81a732 100644 --- a/doc/en/Pango/GlyphString.xml +++ b/doc/en/Pango/GlyphString.xml @@ -1,5 +1,5 @@ - + pango-sharp @@ -12,19 +12,32 @@ - System.ValueType + GLib.Opaque Field + + + System.Obsolete(Message="Pango.GlyphString is a reference type now, use null", IsError=False) + + Pango.GlyphString + + Obsolete: just use now. + + + + + + Constructor - Returns an empty + Creates a new object. @@ -36,11 +49,23 @@ - Generates a new object. + Obsolete. Replaced by an ordinary constructor a object. + + + Constructor + + + + + Internal method + an object of type + This is an internal method, and should not be used by user code. + + Method @@ -51,10 +76,10 @@ - Internal method + Obsolete internal constructor an object of type - an object of type - This is an internal method, and should not be used by user code. + a object. + @@ -89,18 +114,6 @@ The coordinate system for each rectangle has its origin at the base line and horizontal origin of the character with increasing coordinates extending to the right and down. The units of the rectangles are in 1 / of a device unit. - - - Method - - System.Void - - - - Frees this object's memory. - - - Method @@ -138,18 +151,6 @@ To be added. - - - Property - - Pango.GlyphInfo - - - an array of - an object of type - - - Method @@ -192,15 +193,14 @@ - - Field + + Property System.Int32 - - the number of glyphs in the string. + the number of glyphs in the string. @@ -250,37 +250,5 @@ - - - Method - - GLib.Value - - - - - - To be added. - To be added. - To be added. - To be added. - - - - - Method - - Pango.GlyphString - - - - - - To be added. - To be added. - To be added. - To be added. - - diff --git a/doc/en/Pango/Item.xml b/doc/en/Pango/Item.xml index b672b423d..31fd05475 100644 --- a/doc/en/Pango/Item.xml +++ b/doc/en/Pango/Item.xml @@ -1,5 +1,5 @@ - + pango-sharp @@ -12,7 +12,7 @@ - System.ValueType + GLib.Opaque @@ -27,6 +27,20 @@ Returns an empty + + + System.Obsolete(Message="Pango.Item is a reference type now, use null", IsError=False) + + + + + + Constructor + + + Creates a new Item + + @@ -36,11 +50,23 @@ - Creates a new Item + Obsolete: replaced by ordinary constructor a new + + + Constructor + + + + + Internal method. + an object of type + This is an internal method, and should not be used by user code. + + Method @@ -51,24 +77,12 @@ - Internal method + Obsolete internal constructor an object of type an object of type This is an internal method, and should not be used by user code. - - - Method - - System.Void - - - - Free a and all associated memory. - - - Method @@ -101,54 +115,50 @@ - - Field + + Property System.Int32 - - the offset of the segment from the beginning of the string in bytes. + the offset of the segment from the beginning of the string in bytes. - - Field + + Property System.Int32 - - the length of the segment in bytes. + the length of the segment in bytes. - - Field + + Property System.Int32 - - the length of the segment in characters. + the length of the segment in characters. - - Field + + Property Pango.Analysis - - the properties of the segment. + the properties of the segment. diff --git a/doc/en/Pango/LayoutLine.xml b/doc/en/Pango/LayoutLine.xml index 64733ef13..a67b9e637 100644 --- a/doc/en/Pango/LayoutLine.xml +++ b/doc/en/Pango/LayoutLine.xml @@ -185,5 +185,29 @@ This list is not necessarily minimal - there may be consecutive ranges which are adjacent. The ranges will be sorted from left to right. The ranges are with respect to the left edge of the entire layout, not with respect to the line. + + + Property + + System.Boolean + + + To be added. + To be added. + To be added. + + + + + Property + + System.UInt32 + + + To be added. + To be added. + To be added. + + diff --git a/doc/en/Pango/LayoutRun.xml b/doc/en/Pango/LayoutRun.xml index aad746622..5a8584586 100644 --- a/doc/en/Pango/LayoutRun.xml +++ b/doc/en/Pango/LayoutRun.xml @@ -44,8 +44,8 @@ This is an internal method, and should not be used by user code. - - + + Property Pango.GlyphString @@ -56,8 +56,25 @@ - - + + + Property + + Pango.GlyphString + + + Obsolete alias for + an object of type + + + + + System.Obsolete(Message="Replaced by Glyphs property", IsError=False) + + + + + Property Pango.Item @@ -68,5 +85,22 @@ + + + Property + + Pango.Item + + + Obsolete alias for + a + + + + + System.Obsolete(Message="Replaced by Item property", IsError=False) + + + diff --git a/doc/en/Pango/Matrix.xml b/doc/en/Pango/Matrix.xml index 365132b2c..d2f9100fd 100644 --- a/doc/en/Pango/Matrix.xml +++ b/doc/en/Pango/Matrix.xml @@ -153,18 +153,6 @@ - - - Method - - System.Void - - - - Free a created by , - - - Method diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata index b94ad32c5..7c8a18686 100644 --- a/gdk/Gdk.metadata +++ b/gdk/Gdk.metadata @@ -5,9 +5,10 @@ 1 gboolean ref - 1 + 1 1 1 + false out out 1 @@ -166,13 +167,17 @@ 1 1 1 - 1 + 1 + 1 + private 1 out 1 1 n_points call + 1 + false 128 1 diff --git a/gdk/Makefile.am b/gdk/Makefile.am index f1d37ac36..3f5918414 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -43,6 +43,7 @@ customs = \ Global.custom \ Input.custom \ Keymap.custom \ + PangoAttrEmbossed.custom\ PangoAttrStipple.custom \ Pixmap.custom \ Pixbuf.custom \ @@ -53,6 +54,7 @@ customs = \ Point.custom \ Rectangle.custom \ Region.custom \ + RgbCmap.custom \ Screen.custom \ Selection.custom \ WindowAttr.custom \ diff --git a/gdk/PangoAttrEmbossed.custom b/gdk/PangoAttrEmbossed.custom new file mode 100644 index 000000000..e5a8a56f2 --- /dev/null +++ b/gdk/PangoAttrEmbossed.custom @@ -0,0 +1,51 @@ +// Gdk.PangoAttrEmbossed.custom - Gdk PangoAttrEmbossed class customizations +// +// Copyright (c) 2005 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [Obsolete("Gdk.PangoAttrEmbossed is a reference type now, use null")] + public static PangoAttrEmbossed Zero = null; + + [Obsolete("Replaced by PangoAttrEmbossed(IntPtr) constructor")] + public static PangoAttrEmbossed New (IntPtr raw) + { + return new PangoAttrEmbossed (raw); + } + + [Obsolete("Replaced by PangoAttrEmbossed(bool) constructor")] + public static PangoAttrEmbossed New (bool embossed) + { + return new PangoAttrEmbossed (embossed); + } + + [Obsolete("Replaced by explicit Pango.Attribute cast")] + public Pango.Attribute Attr { + get { + return (Pango.Attribute)this; + } + } + + public static explicit operator Pango.Attribute (PangoAttrEmbossed attr_embossed) + { + return Pango.Attribute.GetAttribute (attr_embossed.Handle); + } + + public static explicit operator PangoAttrEmbossed (Pango.Attribute attr) + { + return new PangoAttrEmbossed (attr.Handle); + } diff --git a/gdk/PangoAttrStipple.custom b/gdk/PangoAttrStipple.custom index 4577e91c2..9c21c8ba2 100644 --- a/gdk/PangoAttrStipple.custom +++ b/gdk/PangoAttrStipple.custom @@ -20,13 +20,40 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. + [Obsolete("Gdk.PangoAttrStipple is a reference type now, use null")] + public static PangoAttrStipple Zero = null; + + [Obsolete("Replaced by PangoAttrStipple(IntPtr) constructor")] + public static PangoAttrStipple New (IntPtr raw) + { + return new PangoAttrStipple (raw); + } + + [Obsolete("Replaced by PangoAttrStipple(Gdk.Pixmap) constructor")] + public static PangoAttrStipple New (Gdk.Pixmap stipple) + { + return new PangoAttrStipple (stipple); + } + + [Obsolete("Replaced by explicit Pango.Attribute cast")] + public Pango.Attribute Attr { + get { + return (Pango.Attribute)this; + } + } [Obsolete ("Replaced by Stipple property.")] public Gdk.Pixmap stipple { - get { - Gdk.Pixmap ret = GLib.Object.GetObject(_stipple) as Gdk.Pixmap; - return ret; - } - set { _stipple = value.Handle; } + get { return Stipple; } + set { Stipple = value; } } + public static explicit operator Pango.Attribute (PangoAttrStipple attr_stipple) + { + return Pango.Attribute.GetAttribute (attr_stipple.Handle); + } + + public static explicit operator PangoAttrStipple (Pango.Attribute attr) + { + return new PangoAttrStipple (attr.Handle); + } diff --git a/gdk/RgbCmap.custom b/gdk/RgbCmap.custom new file mode 100644 index 000000000..184c40e5c --- /dev/null +++ b/gdk/RgbCmap.custom @@ -0,0 +1,28 @@ +// Gdk.RgbCmap.custom - Gdk RgbCmap class customizations +// +// Copyright (c) 2005 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [Obsolete("Gdk.RgbCmap is a reference type now, use null")] + public static RgbCmap Zero = null; + + [Obsolete("Replaced by RgbCmap(IntPtr) constructor")] + public static RgbCmap New (IntPtr raw) + { + return new RgbCmap (raw); + } diff --git a/gdk/gdk-api-2.4.raw b/gdk/gdk-api-2.4.raw index 88d7ca81b..65ecf26b2 100644 --- a/gdk/gdk-api-2.4.raw +++ b/gdk/gdk-api-2.4.raw @@ -2700,9 +2700,9 @@ - - - + + + @@ -2937,10 +2937,10 @@ - - - - + + + + @@ -3028,18 +3028,18 @@ - - - + + + - - - + + + @@ -3092,11 +3092,11 @@ - - - - - + + + + + @@ -3214,9 +3214,9 @@ - - - + + + diff --git a/gdk/gdk-api-2.6.raw b/gdk/gdk-api-2.6.raw index 3ba2a477e..642953d9c 100644 --- a/gdk/gdk-api-2.6.raw +++ b/gdk/gdk-api-2.6.raw @@ -2834,9 +2834,9 @@ - - - + + + @@ -3081,10 +3081,10 @@ - - - - + + + + @@ -3172,18 +3172,18 @@ - - - + + + - - - + + + @@ -3236,11 +3236,11 @@ - - - - - + + + + + @@ -3358,9 +3358,9 @@ - - - + + + diff --git a/gdk/gdk-api-2.8.raw b/gdk/gdk-api-2.8.raw index f9682b09b..3884c66c8 100644 --- a/gdk/gdk-api-2.8.raw +++ b/gdk/gdk-api-2.8.raw @@ -2858,8 +2858,8 @@ - - + + @@ -3122,10 +3122,10 @@ - - - - + + + + @@ -3213,18 +3213,18 @@ - - - + + + - - - + + + @@ -3277,11 +3277,11 @@ - - - - - + + + + + @@ -3399,9 +3399,9 @@ - - - + + + @@ -5305,18 +5305,7 @@ - - - - - - - - - - - - + diff --git a/generator/BoxedGen.cs b/generator/BoxedGen.cs index 3d95c375d..759868c84 100644 --- a/generator/BoxedGen.cs +++ b/generator/BoxedGen.cs @@ -31,6 +31,10 @@ namespace GtkSharp.Generation { public override void Generate (GenerationInfo gen_info) { + Method copy = methods["Copy"] as Method; + methods.Remove ("Copy"); + methods.Remove ("Free"); + gen_info.CurrentType = Name; StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name); @@ -57,6 +61,14 @@ namespace GtkSharp.Generation { sw.WriteLine ("\t\t\treturn New (boxed_ptr);"); sw.WriteLine ("\t\t}"); + if (copy != null && copy.IsDeprecated) { + sw.WriteLine (); + sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]"); + sw.WriteLine ("\t\tpublic " + QualifiedName + " Copy() {"); + sw.WriteLine ("\t\t\treturn this;"); + sw.WriteLine ("\t\t}"); + } + sw.WriteLine ("#endregion"); AppendCustom(sw, gen_info.CustomDir); sw.WriteLine ("\t}"); diff --git a/generator/Parser.cs b/generator/Parser.cs index 72b785139..4fcce6ae7 100644 --- a/generator/Parser.cs +++ b/generator/Parser.cs @@ -96,7 +96,8 @@ namespace GtkSharp.Generation { continue; bool is_opaque = false; - if (elem.HasAttribute ("opaque")) + if (elem.GetAttribute ("opaque") == "true" || + elem.GetAttribute ("opaque") == "1") is_opaque = true; switch (def.Name) { diff --git a/glade/Glade.metadata b/glade/Glade.metadata index ec99f7877..f029d9ff6 100644 --- a/glade/Glade.metadata +++ b/glade/Glade.metadata @@ -1,7 +1,8 @@ const-gchar* - 1 const-gchar* 1 + 1 + false diff --git a/glade/glade-api.raw b/glade/glade-api.raw index 813816755..33bebed23 100644 --- a/glade/glade-api.raw +++ b/glade/glade-api.raw @@ -226,13 +226,13 @@ - - - - - - - + + + + + + + diff --git a/gnome/Gnome.metadata b/gnome/Gnome.metadata index d698db332..826ca45da 100644 --- a/gnome/Gnome.metadata +++ b/gnome/Gnome.metadata @@ -17,7 +17,7 @@ time 1 1 - 1 + private 1 1 const-gchar* diff --git a/gnome/gnome-api-2.10.raw b/gnome/gnome-api-2.10.raw index 973b3f18e..a095bc213 100644 --- a/gnome/gnome-api-2.10.raw +++ b/gnome/gnome-api-2.10.raw @@ -1748,10 +1748,10 @@ - - - - + + + + diff --git a/gnome/gnome-api-2.6.raw b/gnome/gnome-api-2.6.raw index c467813f3..376378883 100644 --- a/gnome/gnome-api-2.6.raw +++ b/gnome/gnome-api-2.6.raw @@ -1735,10 +1735,10 @@ - - - - + + + + diff --git a/gnomevfs/Gnomevfs.metadata b/gnomevfs/Gnomevfs.metadata index 079d56892..8e26de2f4 100644 --- a/gnomevfs/Gnomevfs.metadata +++ b/gnomevfs/Gnomevfs.metadata @@ -73,18 +73,15 @@ 1 1 1 - 1 1 - 1 1 1 1 1 - 1 1 1 - 1 + private 1 1 1 diff --git a/gnomevfs/gnome-vfs-api-2.10.raw b/gnomevfs/gnome-vfs-api-2.10.raw index b660d3ab4..d2a3c7405 100644 --- a/gnomevfs/gnome-vfs-api-2.10.raw +++ b/gnomevfs/gnome-vfs-api-2.10.raw @@ -954,31 +954,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1115,20 +1115,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gnomevfs/gnome-vfs-api-2.6.raw b/gnomevfs/gnome-vfs-api-2.6.raw index 2eee8337d..7e1ea6c25 100644 --- a/gnomevfs/gnome-vfs-api-2.6.raw +++ b/gnomevfs/gnome-vfs-api-2.6.raw @@ -827,31 +827,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -974,16 +974,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index 053cd17b4..7324929c4 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -15,6 +15,7 @@ 1 1 1 + 1 1 public public @@ -29,12 +30,14 @@ 1 call out + 1 call out 1 1 1 1 + 1 1 1 1 @@ -489,6 +492,7 @@ ref ref ref + true out out out @@ -658,8 +662,8 @@ 1 1 GtkTargetFlags - 1 1 + private 1 n_targets PangoUnderline diff --git a/gtk/TextAttributes.custom b/gtk/TextAttributes.custom index cbd0be187..790302b4a 100644 --- a/gtk/TextAttributes.custom +++ b/gtk/TextAttributes.custom @@ -21,33 +21,36 @@ // Boston, MA 02111-1307, USA. + [Obsolete("Gtk.TextAttributes is a reference type now, use null")] + public static TextAttributes Zero = null; + + [Obsolete("Replaced by TextAttributes(IntPtr) constructor")] + public static TextAttributes New (IntPtr raw) + { + return new TextAttributes (raw); + } + + [Obsolete("Replaced by TextAttributes() constructor")] + public static TextAttributes New () + { + return new TextAttributes (); + } + [Obsolete ("Replaced by Font property.")] public Pango.FontDescription font { - get { - Pango.FontDescription ret = new Pango.FontDescription(_font); - if (ret == null) ret = new Pango.FontDescription(_font); - return ret; - } - set { _font = value.Handle; } + get { return Font; } + set { Font = value; } } [Obsolete ("Replaced by Tabs property.")] public Pango.TabArray tabs { - get { - Pango.TabArray ret = new Pango.TabArray(_tabs); - if (ret == null) ret = new Pango.TabArray(_tabs); - return ret; - } - set { _tabs = value.Handle; } + get { return Tabs; } + set { Tabs = value; } } [Obsolete ("Replaced by Language property.")] public Pango.Language language { - get { - Pango.Language ret = new Pango.Language(_language); - if (ret == null) ret = new Pango.Language(_language); - return ret; - } - set { _language = value.Handle; } + get { return Language; } + set { Language = value; } } diff --git a/gtk/gtk-api-2.4.raw b/gtk/gtk-api-2.4.raw index fee3d3e5d..7934ba3c3 100644 --- a/gtk/gtk-api-2.4.raw +++ b/gtk/gtk-api-2.4.raw @@ -14835,15 +14835,15 @@ - - - - - - - - - + + + + + + + + + @@ -15339,9 +15339,9 @@ - - - + + + @@ -15405,27 +15405,27 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + diff --git a/gtk/gtk-api-2.6.raw b/gtk/gtk-api-2.6.raw index 6f9cb7222..7e232577b 100644 --- a/gtk/gtk-api-2.6.raw +++ b/gtk/gtk-api-2.6.raw @@ -15810,15 +15810,15 @@ - - - - - - - - - + + + + + + + + + @@ -16344,9 +16344,9 @@ - - - + + + @@ -16429,27 +16429,27 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + diff --git a/gtk/gtk-api-2.8.raw b/gtk/gtk-api-2.8.raw index a1373b1c5..934781de9 100644 --- a/gtk/gtk-api-2.8.raw +++ b/gtk/gtk-api-2.8.raw @@ -16096,15 +16096,15 @@ - - - - - - - - - + + + + + + + + + @@ -16630,9 +16630,9 @@ - - - + + + @@ -16715,27 +16715,27 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + diff --git a/gtkhtml/Gtk.metadata b/gtkhtml/Gtk.metadata index 8df5a8954..418bb9ac2 100644 --- a/gtkhtml/Gtk.metadata +++ b/gtkhtml/Gtk.metadata @@ -6,7 +6,7 @@ OnCommand Begin Begin - 1 + private 1 const-guchar* 1 diff --git a/gtkhtml/gtkhtml-api.raw b/gtkhtml/gtkhtml-api.raw index 453fb08b6..a045c5c38 100644 --- a/gtkhtml/gtkhtml-api.raw +++ b/gtkhtml/gtkhtml-api.raw @@ -974,11 +974,11 @@ - - - - - + + + + + diff --git a/pango/GlyphItem.custom b/pango/GlyphItem.custom index c8af5f5a2..f2aff26fc 100644 --- a/pango/GlyphItem.custom +++ b/pango/GlyphItem.custom @@ -39,3 +39,12 @@ return result; } + [Obsolete ("Replaced by Glyphs property")] + public Pango.GlyphString glyphs { + get { return Glyphs; } + } + + [Obsolete ("Replaced by Item property")] + public Pango.Item item { + get { return Item; } + } diff --git a/pango/GlyphString.custom b/pango/GlyphString.custom new file mode 100644 index 000000000..c2545165e --- /dev/null +++ b/pango/GlyphString.custom @@ -0,0 +1,34 @@ +// Pango.GlyphString.custom - Pango GlyphString class customizations +// +// Copyright (c) 2005 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [Obsolete("Pango.GlyphString is a reference type now, use null")] + public static GlyphString Zero = null; + + [Obsolete("Replaced by GlyphString(IntPtr) constructor")] + public static GlyphString New (IntPtr raw) + { + return new GlyphString (raw); + } + + [Obsolete("Replaced by GlyphString() constructor")] + public static GlyphString New () + { + return new GlyphString (); + } diff --git a/pango/Item.custom b/pango/Item.custom new file mode 100644 index 000000000..983f488ce --- /dev/null +++ b/pango/Item.custom @@ -0,0 +1,34 @@ +// Pango.Item.custom - Pango Item class customizations +// +// Copyright (c) 2005 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [Obsolete("Pango.Item is a reference type now, use null")] + public static Item Zero = null; + + [Obsolete("Replaced by Item(IntPtr) constructor")] + public static Item New (IntPtr raw) + { + return new Item (raw); + } + + [Obsolete("Replaced by Item() constructor")] + public static Item New () + { + return new Item (); + } diff --git a/pango/LayoutRun.custom b/pango/LayoutRun.custom new file mode 100644 index 000000000..787d118bf --- /dev/null +++ b/pango/LayoutRun.custom @@ -0,0 +1,29 @@ +// Pango.LayoutRun.custom - Pango.LayoutRun class customizations +// +// Copyright (c) 2005 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [Obsolete ("Replaced by Glyphs property")] + public Pango.GlyphString glyphs { + get { return Glyphs; } + } + + [Obsolete ("Replaced by Item property")] + public Pango.Item item { + get { return Item; } + } diff --git a/pango/Makefile.am b/pango/Makefile.am index 2e7537a52..b0950fea1 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -40,8 +40,11 @@ customs = \ FontMap.custom \ Global.custom \ GlyphItem.custom \ + GlyphString.custom \ + Item.custom \ Layout.custom \ LayoutLine.custom \ + LayoutRun.custom \ Matrix.custom \ TabArray.custom diff --git a/pango/Pango.metadata b/pango/Pango.metadata index 02da54201..270ca098f 100644 --- a/pango/Pango.metadata +++ b/pango/Pango.metadata @@ -4,12 +4,16 @@ true 1 1 + 1 true 1 true 1 1 + 1 + 1 1 + 1 1 1 1 @@ -61,10 +65,8 @@ 1 1 1 - 1 - public - public - public + false + private ref ref 1 diff --git a/pango/pango-api-2.4.raw b/pango/pango-api-2.4.raw index 5b15007dc..5682ee3b4 100644 --- a/pango/pango-api-2.4.raw +++ b/pango/pango-api-2.4.raw @@ -654,9 +654,9 @@ - - - + + + @@ -702,9 +702,9 @@ - - - + + + @@ -762,10 +762,10 @@ - - - - + + + + @@ -777,10 +777,10 @@ - - - - + + + + @@ -1039,10 +1039,10 @@ - - - - + + + + @@ -1114,11 +1114,11 @@ - - - - - + + + + + @@ -1233,13 +1233,13 @@ - - - - - - - + + + + + + + diff --git a/pango/pango-api-2.6.raw b/pango/pango-api-2.6.raw index 1d21c4259..5611d536f 100644 --- a/pango/pango-api-2.6.raw +++ b/pango/pango-api-2.6.raw @@ -898,9 +898,9 @@ - - - + + + @@ -946,9 +946,9 @@ - - - + + + @@ -1006,13 +1006,13 @@ - - - - - - - + + + + + + + @@ -1029,10 +1029,10 @@ - - - - + + + + @@ -1048,10 +1048,10 @@ - - - - + + + + @@ -1342,10 +1342,10 @@ - - - - + + + + @@ -1417,11 +1417,11 @@ - - - - - + + + + + @@ -1539,13 +1539,13 @@ - - - - - - - + + + + + + + diff --git a/pango/pango-api-2.8.raw b/pango/pango-api-2.8.raw index 169740ea8..edf291bcf 100644 --- a/pango/pango-api-2.8.raw +++ b/pango/pango-api-2.8.raw @@ -902,9 +902,9 @@ - - - + + + @@ -950,9 +950,9 @@ - - - + + + @@ -1010,13 +1010,13 @@ - - - - - - - + + + + + + + @@ -1033,10 +1033,10 @@ - - - - + + + + @@ -1052,10 +1052,10 @@ - - - - + + + + @@ -1346,10 +1346,10 @@ - - - - + + + + @@ -1421,11 +1421,11 @@ - - - - - + + + + + @@ -1546,13 +1546,13 @@ - - - - - - - + + + + + + + diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 242bc2209..de74c0f42 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -596,6 +596,18 @@ sub addFuncElems parseParms ($el, $mdef, $drop_1st); + # Don't add "free" to this regexp; that will wrongly catch all boxed types + if ($mname =~ /$prefix(new|destroy|ref|unref)/ && + ($obj_el->nodeName eq "boxed" || $obj_el->nodeName eq "struct") && + $obj_el->getAttribute("opaque") ne "true") { + $obj_el->setAttribute("opaque", "true"); + for my $field ($obj_el->getElementsByTagName("field")) { + if (!$field->getAttribute("access")) { + $field->setAttribute("access", "public"); + $field->setAttribute("writeable", "true"); + } + } + } } } diff --git a/rsvg/Rsvg.metadata b/rsvg/Rsvg.metadata index d893cd434..18aecc4dc 100644 --- a/rsvg/Rsvg.metadata +++ b/rsvg/Rsvg.metadata @@ -1,6 +1,7 @@ 1 + false 1 1 1 diff --git a/rsvg/rsvg-api.raw b/rsvg/rsvg-api.raw index f17a595b7..d591ee591 100644 --- a/rsvg/rsvg-api.raw +++ b/rsvg/rsvg-api.raw @@ -29,11 +29,11 @@ - - - - - + + + + +