* parser/gapi_pp.pl: Don't strip out /*< public >*/ and

/*< private >*/ comments.

        * parser/gapi2xml.pl: Use those comments to determine the
        accessibility of struct/object fields, and set the "access"
        attribute on fields with non-default accessibiliy (private for
        structs, public for objects). Also, output a StudlyName for each
        field as well as a c_name.

        * */*-api.raw: Regen

        * generator/Field.cs (StudlyName): Use the parser-generated studly
        name rather than studlifying Name, which might have been mangled
        to avoid conflicts with an all-lowercase keyword.
        (Generate): Respect the access property on all field types rather
        than always making certain types public. Don't bother outputting
        wrapper properties for private fields, since the only code that
        could use them is the generated code, which won't.

        See doc/ChangeLog for the (very minimal) fallout from these
        changes.

        * en/Art/AlphaGamma.xml:
        * en/Gtk/TextAttributes.xml (Refcount):
        * en/Pango/GlyphString.xml (Space): these are now private

        * en/Gda/XqlItem.xml:
        * en/Glade/SignalInfo.xml:
        * en/Gnome.Vfs/ModuleCallbackSaveAuthenticationIn.xml: 
        * en/Gnome.Vfs/ModuleCallbackFullAuthenticationIn.xml: 
        * en/Gnome.Vfs/ModuleCallbackFillAuthenticationIn.xml: rename
        Objekt to Object.

        * en/Atk/KeyEventStruct.xml: rename Str1ng to String

svn path=/trunk/gtk-sharp/; revision=37853
This commit is contained in:
Dan Winship 2004-12-16 23:22:07 +00:00
parent 48358ccf22
commit 88cc4817f5
28 changed files with 2786 additions and 2828 deletions

View File

@ -1,3 +1,27 @@
2004-12-16 Dan Winship <danw@novell.com>
* parser/gapi_pp.pl: Don't strip out /*< public >*/ and
/*< private >*/ comments.
* parser/gapi2xml.pl: Use those comments to determine the
accessibility of struct/object fields, and set the "access"
attribute on fields with non-default accessibiliy (private for
structs, public for objects). Also, output a StudlyName for each
field as well as a c_name.
* */*-api.raw: Regen
* generator/Field.cs (StudlyName): Use the parser-generated studly
name rather than studlifying Name, which might have been mangled
to avoid conflicts with an all-lowercase keyword.
(Generate): Respect the access property on all field types rather
than always making certain types public. Don't bother outputting
wrapper properties for private fields, since the only code that
could use them is the generated code, which won't.
See doc/ChangeLog for the (very minimal) fallout from these
changes.
2004-12-16 Mike Kestner <mkestner@novell.com> 2004-12-16 Mike Kestner <mkestner@novell.com>
* sample/NodeViewDemo.cs : rework of TreeViewDemo to use NodeStore. * sample/NodeViewDemo.cs : rework of TreeViewDemo to use NodeStore.

View File

@ -66,10 +66,10 @@
</parameters> </parameters>
</callback> </callback>
<struct name="AlphaGamma" cname="ArtAlphaGamma"> <struct name="AlphaGamma" cname="ArtAlphaGamma">
<field cname="gamma" type="double"/> <field name="Gamma" cname="gamma" type="double" access="private"/>
<field cname="invtable_size" type="int"/> <field name="InvtableSize" cname="invtable_size" type="int" access="private"/>
<field cname="table" array_len="256" type="int"/> <field name="Table" cname="table" array_len="256" type="int" access="private"/>
<field cname="invtable" array_len="1" type="art_u8"/> <field name="Invtable" cname="invtable" array_len="1" type="art_u8" access="private"/>
<method name="Free" cname="art_alphagamma_free"> <method name="Free" cname="art_alphagamma_free">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -80,13 +80,13 @@
</constructor> </constructor>
</struct> </struct>
<struct name="Bpath" cname="ArtBpath"> <struct name="Bpath" cname="ArtBpath">
<field cname="code" type="ArtPathcode"/> <field name="Code" cname="code" type="ArtPathcode"/>
<field cname="x1" type="double"/> <field name="X1" cname="x1" type="double"/>
<field cname="y1" type="double"/> <field name="Y1" cname="y1" type="double"/>
<field cname="x2" type="double"/> <field name="X2" cname="x2" type="double"/>
<field cname="y2" type="double"/> <field name="Y2" cname="y2" type="double"/>
<field cname="x3" type="double"/> <field name="X3" cname="x3" type="double"/>
<field cname="y3" type="double"/> <field name="Y3" cname="y3" type="double"/>
<method name="AffineTransform" cname="art_bpath_affine_transform"> <method name="AffineTransform" cname="art_bpath_affine_transform">
<return-type type="ArtBpath*"/> <return-type type="ArtBpath*"/>
<parameters> <parameters>
@ -95,10 +95,10 @@
</method> </method>
</struct> </struct>
<struct name="DRect" cname="ArtDRect"> <struct name="DRect" cname="ArtDRect">
<field cname="x0" type="double"/> <field name="X0" cname="x0" type="double"/>
<field cname="y0" type="double"/> <field name="Y0" cname="y0" type="double"/>
<field cname="x1" type="double"/> <field name="X1" cname="x1" type="double"/>
<field cname="y1" type="double"/> <field name="Y1" cname="y1" type="double"/>
<method name="AffineTransform" cname="art_drect_affine_transform"> <method name="AffineTransform" cname="art_drect_affine_transform">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -150,29 +150,29 @@
</method> </method>
</struct> </struct>
<struct name="GradientLinear" cname="ArtGradientLinear"> <struct name="GradientLinear" cname="ArtGradientLinear">
<field cname="a" type="double"/> <field name="A" cname="a" type="double"/>
<field cname="b" type="double"/> <field name="B" cname="b" type="double"/>
<field cname="c" type="double"/> <field name="C" cname="c" type="double"/>
<field cname="spread" type="ArtGradientSpread"/> <field name="Spread" cname="spread" type="ArtGradientSpread"/>
<field cname="n_stops" type="int"/> <field name="NStops" cname="n_stops" type="int"/>
<field cname="stops" type="ArtGradientStop*"/> <field name="Stops" cname="stops" type="ArtGradientStop*"/>
</struct> </struct>
<struct name="GradientRadial" cname="ArtGradientRadial"> <struct name="GradientRadial" cname="ArtGradientRadial">
<field cname="affine" array_len="6" type="double"/> <field name="Affine" cname="affine" array_len="6" type="double"/>
<field cname="fx" type="double"/> <field name="Fx" cname="fx" type="double"/>
<field cname="fy" type="double"/> <field name="Fy" cname="fy" type="double"/>
<field cname="n_stops" type="int"/> <field name="NStops" cname="n_stops" type="int"/>
<field cname="stops" type="ArtGradientStop*"/> <field name="Stops" cname="stops" type="ArtGradientStop*"/>
</struct> </struct>
<struct name="GradientStop" cname="ArtGradientStop"> <struct name="GradientStop" cname="ArtGradientStop">
<field cname="offset" type="double"/> <field name="Offset" cname="offset" type="double"/>
<field cname="color" array_len="ART_MAX_CHAN + 1" type="ArtPixMaxDepth"/> <field name="Color" cname="color" array_len="ART_MAX_CHAN + 1" type="ArtPixMaxDepth"/>
</struct> </struct>
<struct name="IRect" cname="ArtIRect"> <struct name="IRect" cname="ArtIRect">
<field cname="x0" type="int"/> <field name="X0" cname="x0" type="int"/>
<field cname="y0" type="int"/> <field name="Y0" cname="y0" type="int"/>
<field cname="x1" type="int"/> <field name="X1" cname="x1" type="int"/>
<field cname="y1" type="int"/> <field name="Y1" cname="y1" type="int"/>
<method name="Copy" cname="art_irect_copy"> <method name="Copy" cname="art_irect_copy">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -198,7 +198,7 @@
</method> </method>
</struct> </struct>
<struct name="ImageSource" cname="ArtImageSource"> <struct name="ImageSource" cname="ArtImageSource">
<field cname="super" type="ArtRenderCallback"/> <field name="Super" cname="super" type="ArtRenderCallback"/>
<callback cname="negotiate"> <callback cname="negotiate">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -207,7 +207,7 @@
</callback> </callback>
</struct> </struct>
<struct name="MaskSource" cname="ArtMaskSource"> <struct name="MaskSource" cname="ArtMaskSource">
<field cname="super" type="ArtRenderCallback"/> <field name="Super" cname="super" type="ArtRenderCallback"/>
<callback cname="can_drive"> <callback cname="can_drive">
<return-type type="int"/> <return-type type="int"/>
<parameters> <parameters>
@ -228,16 +228,16 @@
</callback> </callback>
</struct> </struct>
<struct name="PixBuf" cname="ArtPixBuf"> <struct name="PixBuf" cname="ArtPixBuf">
<field cname="format" type="ArtPixFormat"/> <field name="Format" cname="format" type="ArtPixFormat"/>
<field cname="n_channels" type="int"/> <field name="NChannels" cname="n_channels" type="int"/>
<field cname="has_alpha" type="int"/> <field name="HasAlpha" cname="has_alpha" type="int"/>
<field cname="bits_per_sample" type="int"/> <field name="BitsPerSample" cname="bits_per_sample" type="int"/>
<field cname="pixels" type="art_u8*"/> <field name="Pixels" cname="pixels" type="art_u8*"/>
<field cname="width" type="int"/> <field name="Width" cname="width" type="int"/>
<field cname="height" type="int"/> <field name="Height" cname="height" type="int"/>
<field cname="rowstride" type="int"/> <field name="Rowstride" cname="rowstride" type="int"/>
<field cname="destroy_data" type="void*"/> <field name="DestroyData" cname="destroy_data" type="void*"/>
<field cname="destroy" type="ArtDestroyNotify"/> <field name="Destroy" cname="destroy" type="ArtDestroyNotify"/>
<method name="Duplicate" cname="art_pixbuf_duplicate"> <method name="Duplicate" cname="art_pixbuf_duplicate">
<return-type type="ArtPixBuf*"/> <return-type type="ArtPixBuf*"/>
</method> </method>
@ -302,33 +302,33 @@
</struct> </struct>
<alias name="PixMaxDepth" cname="ArtPixMaxDepth" type="unsigned char"/> <alias name="PixMaxDepth" cname="ArtPixMaxDepth" type="unsigned char"/>
<struct name="Point" cname="ArtPoint"> <struct name="Point" cname="ArtPoint">
<field cname="x" type="double"/> <field name="X" cname="x" type="double"/>
<field cname="y" type="double"/> <field name="Y" cname="y" type="double"/>
</struct> </struct>
<struct name="Render" cname="ArtRender"> <struct name="Render" cname="ArtRender">
<field cname="x0" type="int"/> <field name="X0" cname="x0" type="int"/>
<field cname="y0" type="int"/> <field name="Y0" cname="y0" type="int"/>
<field cname="x1" type="int"/> <field name="X1" cname="x1" type="int"/>
<field cname="y1" type="int"/> <field name="Y1" cname="y1" type="int"/>
<field cname="pixels" type="art_u8*"/> <field name="Pixels" cname="pixels" type="art_u8*"/>
<field cname="rowstride" type="int"/> <field name="Rowstride" cname="rowstride" type="int"/>
<field cname="n_chan" type="int"/> <field name="NChan" cname="n_chan" type="int"/>
<field cname="depth" type="int"/> <field name="Depth" cname="depth" type="int"/>
<field cname="alpha_type" type="ArtAlphaType"/> <field name="AlphaType" cname="alpha_type" type="ArtAlphaType"/>
<field cname="clear" type="art_boolean"/> <field name="Clear" cname="clear" type="art_boolean"/>
<field cname="clear_color" array_len="ART_MAX_CHAN + 1" type="ArtPixMaxDepth"/> <field name="ClearColor" cname="clear_color" array_len="ART_MAX_CHAN + 1" type="ArtPixMaxDepth"/>
<field cname="opacity" type="art_u32"/> <field name="Opacity" cname="opacity" type="art_u32"/>
<field cname="compositing_mode" type="ArtCompositingMode"/> <field name="CompositingMode" cname="compositing_mode" type="ArtCompositingMode"/>
<field cname="alphagamma" type="ArtAlphaGamma*"/> <field name="Alphagamma" cname="alphagamma" type="ArtAlphaGamma*"/>
<field cname="alpha_buf" type="art_u8*"/> <field name="AlphaBuf" cname="alpha_buf" type="art_u8*"/>
<field cname="buf_depth" type="int"/> <field name="BufDepth" cname="buf_depth" type="int"/>
<field cname="buf_alpha" type="ArtAlphaType"/> <field name="BufAlpha" cname="buf_alpha" type="ArtAlphaType"/>
<field cname="image_buf" type="art_u8*"/> <field name="ImageBuf" cname="image_buf" type="art_u8*"/>
<field cname="n_run" type="int"/> <field name="NRun" cname="n_run" type="int"/>
<field cname="run" type="ArtRenderMaskRun*"/> <field name="Run" cname="run" type="ArtRenderMaskRun*"/>
<field cname="n_span" type="int"/> <field name="NSpan" cname="n_span" type="int"/>
<field cname="span_x" type="int*"/> <field name="SpanX" cname="span_x" type="int*"/>
<field cname="need_span" type="art_boolean"/> <field name="NeedSpan" cname="need_span" type="art_boolean"/>
<method name="AddImageSource" cname="art_render_add_image_source"> <method name="AddImageSource" cname="art_render_add_image_source">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -436,12 +436,12 @@
</callback> </callback>
</struct> </struct>
<struct name="RenderMaskRun" cname="ArtRenderMaskRun"> <struct name="RenderMaskRun" cname="ArtRenderMaskRun">
<field cname="x" type="int"/> <field name="X" cname="x" type="int"/>
<field cname="alpha" type="int"/> <field name="Alpha" cname="alpha" type="int"/>
</struct> </struct>
<struct name="SVP" cname="ArtSVP"> <struct name="SVP" cname="ArtSVP">
<field cname="n_segs" type="int"/> <field name="NSegs" cname="n_segs" type="int"/>
<field cname="segs" array_len="1" type="ArtSVPSeg"/> <field name="Segs" cname="segs" array_len="1" type="ArtSVPSeg"/>
<method name="AddSegment" cname="art_svp_add_segment"> <method name="AddSegment" cname="art_svp_add_segment">
<return-type type="int"/> <return-type type="int"/>
<parameters> <parameters>
@ -581,14 +581,14 @@
</method> </method>
</struct> </struct>
<struct name="SVPRenderAAStep" cname="ArtSVPRenderAAStep"> <struct name="SVPRenderAAStep" cname="ArtSVPRenderAAStep">
<field cname="x" type="int"/> <field name="X" cname="x" type="int"/>
<field cname="delta" type="int"/> <field name="Delta" cname="delta" type="int"/>
</struct> </struct>
<struct name="SVPSeg" cname="ArtSVPSeg"> <struct name="SVPSeg" cname="ArtSVPSeg">
<field cname="n_points" type="int"/> <field name="NPoints" cname="n_points" type="int"/>
<field cname="dir" type="int"/> <field name="Dir" cname="dir" type="int"/>
<field cname="bbox" type="ArtDRect"/> <field name="Bbox" cname="bbox" type="ArtDRect"/>
<field cname="points" type="ArtPoint*"/> <field name="Points" cname="points" type="ArtPoint*"/>
<method name="Compare" cname="art_svp_seg_compare" shared="true"> <method name="Compare" cname="art_svp_seg_compare" shared="true">
<return-type type="int"/> <return-type type="int"/>
<parameters> <parameters>
@ -627,11 +627,11 @@
</method> </method>
</struct> </struct>
<struct name="Uta" cname="ArtUta"> <struct name="Uta" cname="ArtUta">
<field cname="x0" type="int"/> <field name="X0" cname="x0" type="int"/>
<field cname="y0" type="int"/> <field name="Y0" cname="y0" type="int"/>
<field cname="width" type="int"/> <field name="Width" cname="width" type="int"/>
<field cname="height" type="int"/> <field name="Height" cname="height" type="int"/>
<field cname="utiles" type="ArtUtaBbox*"/> <field name="Utiles" cname="utiles" type="ArtUtaBbox*"/>
<method name="AddLine" cname="art_uta_add_line"> <method name="AddLine" cname="art_uta_add_line">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -689,9 +689,9 @@
</struct> </struct>
<alias name="UtaBbox" cname="ArtUtaBbox" type="unsigned int"/> <alias name="UtaBbox" cname="ArtUtaBbox" type="unsigned int"/>
<struct name="Vpath" cname="ArtVpath"> <struct name="Vpath" cname="ArtVpath">
<field cname="code" type="ArtPathcode"/> <field name="Code" cname="code" type="ArtPathcode"/>
<field cname="x" type="double"/> <field name="X" cname="x" type="double"/>
<field cname="y" type="double"/> <field name="Y" cname="y" type="double"/>
<method name="AddPoint" cname="art_vpath_add_point"> <method name="AddPoint" cname="art_vpath_add_point">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -744,9 +744,9 @@
</method> </method>
</struct> </struct>
<struct name="VpathDash" cname="ArtVpathDash"> <struct name="VpathDash" cname="ArtVpathDash">
<field cname="offset" type="double"/> <field name="Offset" cname="offset" type="double"/>
<field cname="n_dash" type="int"/> <field name="NDash" cname="n_dash" type="int"/>
<field cname="dash" type="double*"/> <field name="Dash" cname="dash" type="double*"/>
</struct> </struct>
<alias name="ArtBoolean" cname="art_boolean" type="int"/> <alias name="ArtBoolean" cname="art_boolean" type="int"/>
<alias name="ArtU16" cname="art_u16" type="unsigned short"/> <alias name="ArtU16" cname="art_u16" type="unsigned short"/>

View File

@ -1858,12 +1858,12 @@
<constructor cname="atk_no_op_object_factory_new"/> <constructor cname="atk_no_op_object_factory_new"/>
</object> </object>
<object name="Object" cname="AtkObject" parent="GObject"> <object name="Object" cname="AtkObject" parent="GObject">
<field cname="description" type="gchar*"/> <field name="Description" cname="description" type="gchar*"/>
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="accessible_parent" type="AtkObject*"/> <field name="AccessibleParent" cname="accessible_parent" type="AtkObject*"/>
<field cname="role" type="AtkRole"/> <field name="Role" cname="role" type="AtkRole"/>
<field cname="relation_set" type="AtkRelationSet*"/> <field name="RelationSet" cname="relation_set" type="AtkRelationSet*"/>
<field cname="layer" type="AtkLayer"/> <field name="Layer" cname="layer" type="AtkLayer"/>
<property name="AtkObjectNamePropertyName" cname="atk_object_name_property_name" type="gchar*" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyName" cname="atk_object_name_property_name" type="gchar*" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyDescription" cname="atk_object_name_property_description" type="gchar*" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyDescription" cname="atk_object_name_property_description" type="gchar*" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyParent" cname="atk_object_name_property_parent" type="AtkObject" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyParent" cname="atk_object_name_property_parent" type="AtkObject" readable="true" writeable="true"/>
@ -2172,8 +2172,8 @@
</method> </method>
</object> </object>
<object name="Registry" cname="AtkRegistry" parent="GObject"> <object name="Registry" cname="AtkRegistry" parent="GObject">
<field cname="factory_type_registry" type="GHashTable*"/> <field name="FactoryTypeRegistry" cname="factory_type_registry" type="GHashTable*"/>
<field cname="factory_singleton_cache" type="GHashTable*"/> <field name="FactorySingletonCache" cname="factory_singleton_cache" type="GHashTable*"/>
<method name="GetFactory" cname="atk_registry_get_factory"> <method name="GetFactory" cname="atk_registry_get_factory">
<return-type type="AtkObjectFactory*"/> <return-type type="AtkObjectFactory*"/>
<parameters> <parameters>
@ -2198,8 +2198,8 @@
</method> </method>
</object> </object>
<object name="Relation" cname="AtkRelation" parent="GObject"> <object name="Relation" cname="AtkRelation" parent="GObject">
<field cname="target" type="GPtrArray*"/> <field name="Target" cname="target" type="GPtrArray*"/>
<field cname="relationship" type="AtkRelationType"/> <field name="Relationship" cname="relationship" type="AtkRelationType"/>
<property name="RelationType" cname="relation_type" type="AtkRelationType" readable="true" writeable="true"/> <property name="RelationType" cname="relation_type" type="AtkRelationType" readable="true" writeable="true"/>
<property name="Target" cname="target" type="value_array" readable="true" writeable="true"/> <property name="Target" cname="target" type="value_array" readable="true" writeable="true"/>
<method name="GetRelationType" cname="atk_relation_get_relation_type"> <method name="GetRelationType" cname="atk_relation_get_relation_type">
@ -2238,7 +2238,7 @@
</method> </method>
</object> </object>
<object name="RelationSet" cname="AtkRelationSet" parent="GObject"> <object name="RelationSet" cname="AtkRelationSet" parent="GObject">
<field cname="relations" type="GPtrArray*"/> <field name="Relations" cname="relations" type="GPtrArray*"/>
<method name="Add" cname="atk_relation_set_add"> <method name="Add" cname="atk_relation_set_add">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -2380,8 +2380,8 @@
</method> </method>
</object> </object>
<struct name="Attribute" cname="AtkAttribute"> <struct name="Attribute" cname="AtkAttribute">
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="value" type="gchar*"/> <field name="Value" cname="value" type="gchar*"/>
<method name="SetFree" cname="atk_attribute_set_free" shared="true"> <method name="SetFree" cname="atk_attribute_set_free" shared="true">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -2391,31 +2391,31 @@
</struct> </struct>
<alias name="AttributeSet" cname="AtkAttributeSet" type="GSList"/> <alias name="AttributeSet" cname="AtkAttributeSet" type="GSList"/>
<struct name="KeyEventStruct" cname="AtkKeyEventStruct"> <struct name="KeyEventStruct" cname="AtkKeyEventStruct">
<field cname="type" type="gint"/> <field name="Type" cname="type" type="gint"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
<field cname="keyval" type="guint"/> <field name="Keyval" cname="keyval" type="guint"/>
<field cname="length" type="gint"/> <field name="Length" cname="length" type="gint"/>
<field cname="string" type="gchar*"/> <field name="String" cname="string" type="gchar*"/>
<field cname="keycode" type="guint16"/> <field name="Keycode" cname="keycode" type="guint16"/>
<field cname="timestamp" type="guint32"/> <field name="Timestamp" cname="timestamp" type="guint32"/>
</struct> </struct>
<struct name="PropertyValues" cname="AtkPropertyValues"> <struct name="PropertyValues" cname="AtkPropertyValues">
<field cname="property_name" type="const-gchar*"/> <field name="PropertyName" cname="property_name" type="const-gchar*"/>
<field cname="old_value" type="GValue"/> <field name="OldValue" cname="old_value" type="GValue"/>
<field cname="new_value" type="GValue"/> <field name="NewValue" cname="new_value" type="GValue"/>
</struct> </struct>
<alias name="State" cname="AtkState" type="guint64"/> <alias name="State" cname="AtkState" type="guint64"/>
<struct name="TextRange" cname="AtkTextRange"> <struct name="TextRange" cname="AtkTextRange">
<field cname="bounds" type="AtkTextRectangle"/> <field name="Bounds" cname="bounds" type="AtkTextRectangle"/>
<field cname="start_offset" type="gint"/> <field name="StartOffset" cname="start_offset" type="gint"/>
<field cname="end_offset" type="gint"/> <field name="EndOffset" cname="end_offset" type="gint"/>
<field cname="content" type="gchar*"/> <field name="Content" cname="content" type="gchar*"/>
</struct> </struct>
<struct name="TextRectangle" cname="AtkTextRectangle"> <struct name="TextRectangle" cname="AtkTextRectangle">
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
<field cname="width" type="gint"/> <field name="Width" cname="width" type="gint"/>
<field cname="height" type="gint"/> <field name="Height" cname="height" type="gint"/>
</struct> </struct>
<class name="Global" cname="AtkGlobal"> <class name="Global" cname="AtkGlobal">
<method name="AddFocusTracker" cname="atk_add_focus_tracker" shared="true"> <method name="AddFocusTracker" cname="atk_add_focus_tracker" shared="true">

View File

@ -1,3 +1,18 @@
2004-12-16 Dan Winship <danw@novell.com>
* en/Art/AlphaGamma.xml:
* en/Gtk/TextAttributes.xml (Refcount):
* en/Pango/GlyphString.xml (Space): these are now private
* en/Gda/XqlItem.xml:
* en/Glade/SignalInfo.xml:
* en/Gnome.Vfs/ModuleCallbackSaveAuthenticationIn.xml:
* en/Gnome.Vfs/ModuleCallbackFullAuthenticationIn.xml:
* en/Gnome.Vfs/ModuleCallbackFillAuthenticationIn.xml: rename
Objekt to Object.
* en/Atk/KeyEventStruct.xml: rename Str1ng to String
2004-12-15 John Luke <john.luke@gmail.com> 2004-12-15 John Luke <john.luke@gmail.com>
* *.xml: run gen-vm-docs.exe and gen-handlerargs.exe * *.xml: run gen-vm-docs.exe and gen-handlerargs.exe

View File

@ -76,57 +76,5 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Gamma">
<MemberSignature Language="C#" Value="public double Gamma;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Double</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>To be added</summary>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="InvtableSize">
<MemberSignature Language="C#" Value="public int InvtableSize;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Int32</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>To be added</summary>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Table">
<MemberSignature Language="C#" Value="public int [] Table;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Int32[]</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>To be added</summary>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Invtable">
<MemberSignature Language="C#" Value="public byte [] Invtable;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Byte[]</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>To be added</summary>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members> </Members>
</Type> </Type>

View File

@ -99,8 +99,8 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Str1ng"> <Member MemberName="String">
<MemberSignature Language="C#" Value="public string Str1ng;" /> <MemberSignature Language="C#" Value="public string String;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.String</ReturnType> <ReturnType>System.String</ReturnType>

View File

@ -226,8 +226,8 @@
<remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlItem" />.</remarks> <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlItem" />.</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Objekt"> <Member MemberName="Object">
<MemberSignature Language="C#" Value="public GLib.Object Objekt;" /> <MemberSignature Language="C#" Value="public GLib.Object Object;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>GLib.Object</ReturnType> <ReturnType>GLib.Object</ReturnType>

View File

@ -73,8 +73,8 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Objekt"> <Member MemberName="Object">
<MemberSignature Language="C#" Value="public string Objekt;" /> <MemberSignature Language="C#" Value="public string Object;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.String</ReturnType> <ReturnType>System.String</ReturnType>

View File

@ -70,8 +70,8 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Objekt"> <Member MemberName="Object">
<MemberSignature Language="C#" Value="public string Objekt;" /> <MemberSignature Language="C#" Value="public string Object;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.String</ReturnType> <ReturnType>System.String</ReturnType>

View File

@ -83,8 +83,8 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Objekt"> <Member MemberName="Object">
<MemberSignature Language="C#" Value="public string Objekt;" /> <MemberSignature Language="C#" Value="public string Object;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.String</ReturnType> <ReturnType>System.String</ReturnType>

View File

@ -83,8 +83,8 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Objekt"> <Member MemberName="Object">
<MemberSignature Language="C#" Value="public string Objekt;" /> <MemberSignature Language="C#" Value="public string Object;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>
<ReturnValue> <ReturnValue>
<ReturnType>System.String</ReturnType> <ReturnType>System.String</ReturnType>

View File

@ -170,19 +170,6 @@
<remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gtk.TextAttributes" />.</remarks> <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gtk.TextAttributes" />.</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Refcount">
<MemberSignature Language="C#" Value="public uint Refcount;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.UInt32</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>The reference count for this object.</summary>
<remarks />
</Docs>
</Member>
<Member MemberName="Appearance"> <Member MemberName="Appearance">
<MemberSignature Language="C#" Value="public Gtk.TextAppearance Appearance;" /> <MemberSignature Language="C#" Value="public Gtk.TextAppearance Appearance;" />
<MemberType>Field</MemberType> <MemberType>Field</MemberType>

View File

@ -206,19 +206,6 @@
<remarks /> <remarks />
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Space">
<MemberSignature Language="C#" Value="public int Space;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.Int32</ReturnType>
</ReturnValue>
<Parameters>
</Parameters>
<Docs>
<summary>Represents how much space is left for other characters in the GlyphString.</summary>
<remarks />
</Docs>
</Member>
<Member MemberName="IndexToX"> <Member MemberName="IndexToX">
<MemberSignature Language="C#" Value="public int IndexToX (string text, Pango.Analysis analysis, int index_, bool trailing);" /> <MemberSignature Language="C#" Value="public int IndexToX (string text, Pango.Analysis analysis, int index_, bool trailing);" />
<MemberType>Method</MemberType> <MemberType>Method</MemberType>

View File

@ -128,7 +128,7 @@
</parameters> </parameters>
</callback> </callback>
<object name="Client" cname="GdaClient" parent="GObject"> <object name="Client" cname="GdaClient" parent="GObject">
<field cname="priv" type="GdaClientPrivate*"/> <field name="Priv" cname="priv" type="GdaClientPrivate*"/>
<signal name="EventNotification" cname="event_notification" when="LAST"> <signal name="EventNotification" cname="event_notification" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -235,7 +235,7 @@
</method> </method>
</object> </object>
<object name="Connection" cname="GdaConnection" parent="GObject"> <object name="Connection" cname="GdaConnection" parent="GObject">
<field cname="priv" type="GdaConnectionPrivate*"/> <field name="Priv" cname="priv" type="GdaConnectionPrivate*"/>
<signal name="Error" cname="error" when="LAST"> <signal name="Error" cname="error" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -395,7 +395,7 @@
</method> </method>
</object> </object>
<object name="DataModel" cname="GdaDataModel" parent="GObject"> <object name="DataModel" cname="GdaDataModel" parent="GObject">
<field cname="priv" type="GdaDataModelPrivate*"/> <field name="Priv" cname="priv" type="GdaDataModelPrivate*"/>
<signal name="Changed" cname="changed" when="LAST"> <signal name="Changed" cname="changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -638,7 +638,7 @@
</method> </method>
</object> </object>
<object name="DataModelArray" cname="GdaDataModelArray" parent="GdaDataModel"> <object name="DataModelArray" cname="GdaDataModelArray" parent="GdaDataModel">
<field cname="priv" type="GdaDataModelArrayPrivate*"/> <field name="Priv" cname="priv" type="GdaDataModelArrayPrivate*"/>
<method name="Clear" cname="gda_data_model_array_clear"> <method name="Clear" cname="gda_data_model_array_clear">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -658,7 +658,7 @@
</method> </method>
</object> </object>
<object name="DataModelHash" cname="GdaDataModelHash" parent="GdaDataModel"> <object name="DataModelHash" cname="GdaDataModelHash" parent="GdaDataModel">
<field cname="priv" type="GdaDataModelHashPrivate*"/> <field name="Priv" cname="priv" type="GdaDataModelHashPrivate*"/>
<method name="Clear" cname="gda_data_model_hash_clear"> <method name="Clear" cname="gda_data_model_hash_clear">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -700,7 +700,7 @@
</method> </method>
</object> </object>
<object name="DataModelList" cname="GdaDataModelList" parent="GdaDataModel"> <object name="DataModelList" cname="GdaDataModelList" parent="GdaDataModel">
<field cname="priv" type="GdaDataModelListPrivate*"/> <field name="Priv" cname="priv" type="GdaDataModelListPrivate*"/>
<method name="AppendValue" cname="gda_data_model_list_append_value"> <method name="AppendValue" cname="gda_data_model_list_append_value">
<return-type type="const-GdaRow*"/> <return-type type="const-GdaRow*"/>
<parameters> <parameters>
@ -718,7 +718,7 @@
</constructor> </constructor>
</object> </object>
<object name="Error" cname="GdaError" parent="GObject"> <object name="Error" cname="GdaError" parent="GObject">
<field cname="priv" type="GdaErrorPrivate*"/> <field name="Priv" cname="priv" type="GdaErrorPrivate*"/>
<method name="Free" cname="gda_error_free"> <method name="Free" cname="gda_error_free">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -776,7 +776,7 @@
</method> </method>
</object> </object>
<object name="Export" cname="GdaExport" parent="GObject"> <object name="Export" cname="GdaExport" parent="GObject">
<field cname="priv" type="GdaExportPrivate*"/> <field name="Priv" cname="priv" type="GdaExportPrivate*"/>
<signal name="ObjectSelected" cname="object_selected" when="LAST"> <signal name="ObjectSelected" cname="object_selected" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -858,7 +858,7 @@
</method> </method>
</object> </object>
<object name="Select" cname="GdaSelect" parent="GdaDataModelArray"> <object name="Select" cname="GdaSelect" parent="GdaDataModelArray">
<field cname="priv" type="GdaSelectPrivate*"/> <field name="Priv" cname="priv" type="GdaSelectPrivate*"/>
<method name="AddSource" cname="gda_select_add_source"> <method name="AddSource" cname="gda_select_add_source">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -881,7 +881,7 @@
</method> </method>
</object> </object>
<object name="ServerProvider" cname="GdaServerProvider" parent="GObject"> <object name="ServerProvider" cname="GdaServerProvider" parent="GObject">
<field cname="priv" type="GdaServerProviderPrivate*"/> <field name="Priv" cname="priv" type="GdaServerProviderPrivate*"/>
<virtual_method name="LastConnectionGone" cname="last_connection_gone"> <virtual_method name="LastConnectionGone" cname="last_connection_gone">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1094,7 +1094,7 @@
</method> </method>
</object> </object>
<object name="Table" cname="GdaTable" parent="GdaDataModelArray"> <object name="Table" cname="GdaTable" parent="GdaDataModelArray">
<field cname="priv" type="GdaTablePrivate*"/> <field name="Priv" cname="priv" type="GdaTablePrivate*"/>
<method name="AddDataFromModel" cname="gda_table_add_data_from_model"> <method name="AddDataFromModel" cname="gda_table_add_data_from_model">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1133,7 +1133,7 @@
</method> </method>
</object> </object>
<object name="Transaction" cname="GdaTransaction" parent="GObject"> <object name="Transaction" cname="GdaTransaction" parent="GObject">
<field cname="priv" type="GdaTransactionPrivate*"/> <field name="Priv" cname="priv" type="GdaTransactionPrivate*"/>
<method name="GetIsolationLevel" cname="gda_transaction_get_isolation_level"> <method name="GetIsolationLevel" cname="gda_transaction_get_isolation_level">
<return-type type="GdaTransactionIsolation"/> <return-type type="GdaTransactionIsolation"/>
</method> </method>
@ -1162,7 +1162,7 @@
</method> </method>
</object> </object>
<object name="XmlConnection" cname="GdaXmlConnection" parent="GObject"> <object name="XmlConnection" cname="GdaXmlConnection" parent="GObject">
<field cname="priv" type="GdaXmlConnectionPrivate*"/> <field name="Priv" cname="priv" type="GdaXmlConnectionPrivate*"/>
<method name="GetDsn" cname="gda_xml_connection_get_dsn"> <method name="GetDsn" cname="gda_xml_connection_get_dsn">
<return-type type="const-gchar*"/> <return-type type="const-gchar*"/>
</method> </method>
@ -1218,7 +1218,7 @@
</method> </method>
</object> </object>
<object name="XmlDatabase" cname="GdaXmlDatabase" parent="GObject"> <object name="XmlDatabase" cname="GdaXmlDatabase" parent="GObject">
<field cname="priv" type="GdaXmlDatabasePrivate*"/> <field name="Priv" cname="priv" type="GdaXmlDatabasePrivate*"/>
<signal name="Changed" cname="changed" when="LAST"> <signal name="Changed" cname="changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1316,10 +1316,10 @@
</method> </method>
</object> </object>
<object name="XmlDocument" cname="GdaXmlDocument" parent="GObject"> <object name="XmlDocument" cname="GdaXmlDocument" parent="GObject">
<field cname="doc" type="xmlDocPtr"/> <field name="Doc" cname="doc" type="xmlDocPtr"/>
<field cname="dtd" type="xmlDtdPtr"/> <field name="Dtd" cname="dtd" type="xmlDtdPtr"/>
<field cname="root" type="xmlNodePtr"/> <field name="Root" cname="root" type="xmlNodePtr"/>
<field cname="context" type="xmlValidCtxtPtr"/> <field name="Context" cname="context" type="xmlValidCtxtPtr"/>
<signal name="Warning" cname="warning" when="LAST"> <signal name="Warning" cname="warning" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1416,8 +1416,8 @@
<parameter type="GdaBlob*" name="blob"/> <parameter type="GdaBlob*" name="blob"/>
</parameters> </parameters>
</callback> </callback>
<field cname="priv_data" type="gpointer"/> <field name="PrivData" cname="priv_data" type="gpointer"/>
<field cname="user_data" type="gpointer"/> <field name="UserData" cname="user_data" type="gpointer"/>
<method name="Close" cname="gda_blob_close"> <method name="Close" cname="gda_blob_close">
<return-type type="gint"/> <return-type type="gint"/>
</method> </method>
@ -1458,10 +1458,10 @@
</method> </method>
</struct> </struct>
<struct name="Command" cname="GdaCommand"> <struct name="Command" cname="GdaCommand">
<field cname="text" type="gchar*"/> <field name="Text" cname="text" type="gchar*"/>
<field cname="type" type="GdaCommandType"/> <field name="Type" cname="type" type="GdaCommandType"/>
<field cname="options" type="GdaCommandOptions"/> <field name="Options" cname="options" type="GdaCommandOptions"/>
<field cname="xaction" type="GdaTransaction*"/> <field name="Xaction" cname="xaction" type="GdaTransaction*"/>
<method name="Free" cname="gda_command_free"> <method name="Free" cname="gda_command_free">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -1510,38 +1510,38 @@
</method> </method>
</struct> </struct>
<struct name="DataSourceInfo" cname="GdaDataSourceInfo"> <struct name="DataSourceInfo" cname="GdaDataSourceInfo">
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="provider" type="gchar*"/> <field name="Provider" cname="provider" type="gchar*"/>
<field cname="cnc_string" type="gchar*"/> <field name="CncString" cname="cnc_string" type="gchar*"/>
<field cname="description" type="gchar*"/> <field name="Description" cname="description" type="gchar*"/>
<field cname="username" type="gchar*"/> <field name="Username" cname="username" type="gchar*"/>
<field cname="password" type="gchar*"/> <field name="Password" cname="password" type="gchar*"/>
</struct> </struct>
<struct name="Date" cname="GdaDate"> <struct name="Date" cname="GdaDate">
<field cname="year" type="gshort"/> <field name="Year" cname="year" type="gshort"/>
<field cname="month" type="gushort"/> <field name="Month" cname="month" type="gushort"/>
<field cname="day" type="gushort"/> <field name="Day" cname="day" type="gushort"/>
</struct> </struct>
<struct name="Field" cname="GdaField"> <struct name="Field" cname="GdaField">
<field cname="actual_size" type="gint"/> <field name="ActualSize" cname="actual_size" type="gint"/>
<field cname="value" type="GdaValue*"/> <field name="Value" cname="value" type="GdaValue*"/>
<field cname="attributes" type="GdaFieldAttributes*"/> <field name="Attributes" cname="attributes" type="GdaFieldAttributes*"/>
</struct> </struct>
<struct name="FieldAttributes" cname="GdaFieldAttributes"> <struct name="FieldAttributes" cname="GdaFieldAttributes">
<field cname="defined_size" type="gint"/> <field name="DefinedSize" cname="defined_size" type="gint"/>
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="table" type="gchar*"/> <field name="Table" cname="table" type="gchar*"/>
<field cname="caption" type="gchar*"/> <field name="Caption" cname="caption" type="gchar*"/>
<field cname="scale" type="gint"/> <field name="Scale" cname="scale" type="gint"/>
<field cname="gda_type" type="GdaValueType"/> <field name="GdaType" cname="gda_type" type="GdaValueType"/>
<field cname="allow_null" type="gboolean"/> <field name="AllowNull" cname="allow_null" type="gboolean"/>
<field cname="primary_key" type="gboolean"/> <field name="PrimaryKey" cname="primary_key" type="gboolean"/>
<field cname="unique_key" type="gboolean"/> <field name="UniqueKey" cname="unique_key" type="gboolean"/>
<field cname="references" type="gchar*"/> <field name="References" cname="references" type="gchar*"/>
<field cname="auto_increment" type="gboolean"/> <field name="AutoIncrement" cname="auto_increment" type="gboolean"/>
<field cname="auto_increment_start" type="glong"/> <field name="AutoIncrementStart" cname="auto_increment_start" type="glong"/>
<field cname="auto_increment_step" type="glong"/> <field name="AutoIncrementStep" cname="auto_increment_step" type="glong"/>
<field cname="position" type="gint"/> <field name="Position" cname="position" type="gint"/>
<method name="Copy" cname="gda_field_attributes_copy"> <method name="Copy" cname="gda_field_attributes_copy">
<return-type type="GdaFieldAttributes*"/> <return-type type="GdaFieldAttributes*"/>
</method> </method>
@ -1659,21 +1659,21 @@
</method> </method>
</struct> </struct>
<struct name="GeometricPoint" cname="GdaGeometricPoint"> <struct name="GeometricPoint" cname="GdaGeometricPoint">
<field cname="x" type="gdouble"/> <field name="X" cname="x" type="gdouble"/>
<field cname="y" type="gdouble"/> <field name="Y" cname="y" type="gdouble"/>
</struct> </struct>
<struct name="Money" cname="GdaMoney"> <struct name="Money" cname="GdaMoney">
<field cname="currency" type="gchar*"/> <field name="Currency" cname="currency" type="gchar*"/>
<field cname="amount" type="gdouble"/> <field name="Amount" cname="amount" type="gdouble"/>
</struct> </struct>
<struct name="Numeric" cname="GdaNumeric"> <struct name="Numeric" cname="GdaNumeric">
<field cname="number" type="gchar*"/> <field name="Number" cname="number" type="gchar*"/>
<field cname="precision" type="glong"/> <field name="Precision" cname="precision" type="glong"/>
<field cname="width" type="glong"/> <field name="Width" cname="width" type="glong"/>
</struct> </struct>
<struct name="Parameter" cname="GdaParameter"> <struct name="Parameter" cname="GdaParameter">
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="value" type="GdaValue*"/> <field name="Value" cname="value" type="GdaValue*"/>
<method name="Free" cname="gda_parameter_free"> <method name="Free" cname="gda_parameter_free">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -1754,10 +1754,10 @@
<constructor cname="gda_parameter_list_new"/> <constructor cname="gda_parameter_list_new"/>
</struct> </struct>
<struct name="ProviderInfo" cname="GdaProviderInfo"> <struct name="ProviderInfo" cname="GdaProviderInfo">
<field cname="id" type="gchar*"/> <field name="Id" cname="id" type="gchar*"/>
<field cname="location" type="gchar*"/> <field name="Location" cname="location" type="gchar*"/>
<field cname="description" type="gchar*"/> <field name="Description" cname="description" type="gchar*"/>
<field cname="gda_params" type="GList*"/> <field name="GdaParams" cname="gda_params" type="GList*"/>
</struct> </struct>
<struct name="QuarkList" cname="GdaQuarkList" opaque="true"> <struct name="QuarkList" cname="GdaQuarkList" opaque="true">
<method name="AddFromString" cname="gda_quark_list_add_from_string"> <method name="AddFromString" cname="gda_quark_list_add_from_string">
@ -1837,48 +1837,48 @@
</method> </method>
</struct> </struct>
<struct name="Time" cname="GdaTime"> <struct name="Time" cname="GdaTime">
<field cname="hour" type="gushort"/> <field name="Hour" cname="hour" type="gushort"/>
<field cname="minute" type="gushort"/> <field name="Minute" cname="minute" type="gushort"/>
<field cname="second" type="gushort"/> <field name="Second" cname="second" type="gushort"/>
<field cname="timezone" type="glong"/> <field name="Timezone" cname="timezone" type="glong"/>
</struct> </struct>
<struct name="Timestamp" cname="GdaTimestamp"> <struct name="Timestamp" cname="GdaTimestamp">
<field cname="year" type="gshort"/> <field name="Year" cname="year" type="gshort"/>
<field cname="month" type="gushort"/> <field name="Month" cname="month" type="gushort"/>
<field cname="day" type="gushort"/> <field name="Day" cname="day" type="gushort"/>
<field cname="hour" type="gushort"/> <field name="Hour" cname="hour" type="gushort"/>
<field cname="minute" type="gushort"/> <field name="Minute" cname="minute" type="gushort"/>
<field cname="second" type="gushort"/> <field name="Second" cname="second" type="gushort"/>
<field cname="fraction" type="gulong"/> <field name="Fraction" cname="fraction" type="gulong"/>
<field cname="timezone" type="glong"/> <field name="Timezone" cname="timezone" type="glong"/>
</struct> </struct>
<struct name="Value" cname="GdaValue"> <struct name="Value" cname="GdaValue">
<field cname="type" type="GdaValueType"/> <field name="Type" cname="type" type="GdaValueType"/>
<field cname="v_bigint" type="gint64"/> <field name="VBigint" cname="v_bigint" type="gint64"/>
<field cname="v_biguint" type="guint64"/> <field name="VBiguint" cname="v_biguint" type="guint64"/>
<field cname="v_binary" type="gpointer"/> <field name="VBinary" cname="v_binary" type="gpointer"/>
<field cname="v_blob" type="GdaBlob"/> <field name="VBlob" cname="v_blob" type="GdaBlob"/>
<field cname="v_boolean" type="gboolean"/> <field name="VBoolean" cname="v_boolean" type="gboolean"/>
<field cname="v_date" type="GdaDate"/> <field name="VDate" cname="v_date" type="GdaDate"/>
<field cname="v_double" type="gdouble"/> <field name="VDouble" cname="v_double" type="gdouble"/>
<field cname="v_point" type="GdaGeometricPoint"/> <field name="VPoint" cname="v_point" type="GdaGeometricPoint"/>
<field cname="v_gobj" type="GObject*"/> <field name="VGobj" cname="v_gobj" type="GObject*"/>
<field cname="v_integer" type="gint"/> <field name="VInteger" cname="v_integer" type="gint"/>
<field cname="v_list" type="GdaValueList*"/> <field name="VList" cname="v_list" type="GdaValueList*"/>
<field cname="v_money" type="GdaMoney"/> <field name="VMoney" cname="v_money" type="GdaMoney"/>
<field cname="v_numeric" type="GdaNumeric"/> <field name="VNumeric" cname="v_numeric" type="GdaNumeric"/>
<field cname="v_single" type="gfloat"/> <field name="VSingle" cname="v_single" type="gfloat"/>
<field cname="v_smallint" type="gshort"/> <field name="VSmallint" cname="v_smallint" type="gshort"/>
<field cname="v_smalluint" type="gushort"/> <field name="VSmalluint" cname="v_smalluint" type="gushort"/>
<field cname="v_string" type="gchar*"/> <field name="VString" cname="v_string" type="gchar*"/>
<field cname="v_time" type="GdaTime"/> <field name="VTime" cname="v_time" type="GdaTime"/>
<field cname="v_timestamp" type="GdaTimestamp"/> <field name="VTimestamp" cname="v_timestamp" type="GdaTimestamp"/>
<field cname="v_tinyint" type="gchar"/> <field name="VTinyint" cname="v_tinyint" type="gchar"/>
<field cname="v_tinyuint" type="guchar"/> <field name="VTinyuint" cname="v_tinyuint" type="guchar"/>
<field cname="v_type" type="GdaValueType"/> <field name="VType" cname="v_type" type="GdaValueType"/>
<field cname="v_uinteger" type="guint"/> <field name="VUinteger" cname="v_uinteger" type="guint"/>
<field cname="value" type="}"/> <field name="Value" cname="value" type="}"/>
<field cname="binary_length" type="glong"/> <field name="BinaryLength" cname="binary_length" type="glong"/>
<method name="Compare" cname="gda_value_compare"> <method name="Compare" cname="gda_value_compare">
<return-type type="gint"/> <return-type type="gint"/>
<parameters> <parameters>
@ -2269,7 +2269,7 @@
</struct> </struct>
<alias name="ValueList" cname="GdaValueList" type="GList"/> <alias name="ValueList" cname="GdaValueList" type="GList"/>
<struct name="XqlAtom" cname="GdaXqlAtom"> <struct name="XqlAtom" cname="GdaXqlAtom">
<field cname="xqlitem" type="GdaXqlItem"/> <field name="Xqlitem" cname="xqlitem" type="GdaXqlItem"/>
<method name="GetType" cname="gda_xql_atom_get_type" shared="true"> <method name="GetType" cname="gda_xql_atom_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2280,11 +2280,11 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlAtomClass" cname="GdaXqlAtomClass"> <struct name="XqlAtomClass" cname="GdaXqlAtomClass">
<field cname="parent_class" type="GdaXqlItemClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
</struct> </struct>
<struct name="XqlBin" cname="GdaXqlBin"> <struct name="XqlBin" cname="GdaXqlBin">
<field cname="xqlitem" type="GdaXqlItem"/> <field name="Xqlitem" cname="xqlitem" type="GdaXqlItem"/>
<field cname="priv" type="GdaXqlBinPrivate*"/> <field name="Priv" cname="priv" type="GdaXqlBinPrivate*"/>
<method name="GetChild" cname="gda_xql_bin_get_child"> <method name="GetChild" cname="gda_xql_bin_get_child">
<return-type type="GdaXqlItem*"/> <return-type type="GdaXqlItem*"/>
</method> </method>
@ -2344,10 +2344,10 @@
</method> </method>
</struct> </struct>
<struct name="XqlBinClass" cname="GdaXqlBinClass"> <struct name="XqlBinClass" cname="GdaXqlBinClass">
<field cname="parent_class" type="GdaXqlItemClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
</struct> </struct>
<struct name="XqlColumn" cname="GdaXqlColumn"> <struct name="XqlColumn" cname="GdaXqlColumn">
<field cname="xqlatom" type="GdaXqlAtom"/> <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
<method name="GetType" cname="gda_xql_column_get_type" shared="true"> <method name="GetType" cname="gda_xql_column_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2360,10 +2360,10 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlColumnClass" cname="GdaXqlColumnClass"> <struct name="XqlColumnClass" cname="GdaXqlColumnClass">
<field cname="parent_class" type="GdaXqlAtomClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
</struct> </struct>
<struct name="XqlConst" cname="GdaXqlConst"> <struct name="XqlConst" cname="GdaXqlConst">
<field cname="xqlatom" type="GdaXqlAtom"/> <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
<method name="GetType" cname="gda_xql_const_get_type" shared="true"> <method name="GetType" cname="gda_xql_const_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2378,21 +2378,21 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlConstClass" cname="GdaXqlConstClass"> <struct name="XqlConstClass" cname="GdaXqlConstClass">
<field cname="parent_class" type="GdaXqlAtomClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
</struct> </struct>
<struct name="XqlDelete" cname="GdaXqlDelete"> <struct name="XqlDelete" cname="GdaXqlDelete">
<field cname="xqldml" type="GdaXqlDml"/> <field name="Xqldml" cname="xqldml" type="GdaXqlDml"/>
<method name="GetType" cname="gda_xql_delete_get_type" shared="true"> <method name="GetType" cname="gda_xql_delete_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gda_xql_delete_new"/> <constructor cname="gda_xql_delete_new"/>
</struct> </struct>
<struct name="XqlDeleteClass" cname="GdaXqlDeleteClass"> <struct name="XqlDeleteClass" cname="GdaXqlDeleteClass">
<field cname="parent_class" type="GdaXqlDmlClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
</struct> </struct>
<struct name="XqlDml" cname="GdaXqlDml"> <struct name="XqlDml" cname="GdaXqlDml">
<field cname="xqldml" type="GdaXqlItem"/> <field name="Xqldml" cname="xqldml" type="GdaXqlItem"/>
<field cname="priv" type="GdaXqlDmlPrivate*"/> <field name="Priv" cname="priv" type="GdaXqlDmlPrivate*" access="private"/>
<method name="AddConstFromText" cname="gda_xql_dml_add_const_from_text"> <method name="AddConstFromText" cname="gda_xql_dml_add_const_from_text">
<return-type type="GdaXqlItem*"/> <return-type type="GdaXqlItem*"/>
<parameters> <parameters>
@ -2470,7 +2470,7 @@
</method> </method>
</struct> </struct>
<struct name="XqlDmlClass" cname="GdaXqlDmlClass"> <struct name="XqlDmlClass" cname="GdaXqlDmlClass">
<field cname="parent_class" type="GdaXqlItemClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
<callback cname="add_target_from_text"> <callback cname="add_target_from_text">
<return-type type="gchar*"/> <return-type type="gchar*"/>
<parameters> <parameters>
@ -2533,8 +2533,8 @@
</callback> </callback>
</struct> </struct>
<struct name="XqlDual" cname="GdaXqlDual"> <struct name="XqlDual" cname="GdaXqlDual">
<field cname="xqldual" type="GdaXqlItem"/> <field name="Xqldual" cname="xqldual" type="GdaXqlItem"/>
<field cname="priv" type="GdaXqlDualPrivate*"/> <field name="Priv" cname="priv" type="GdaXqlDualPrivate*" access="private"/>
<method name="GetLeft" cname="gda_xql_dual_get_left"> <method name="GetLeft" cname="gda_xql_dual_get_left">
<return-type type="GdaXqlItem*"/> <return-type type="GdaXqlItem*"/>
</method> </method>
@ -2625,10 +2625,10 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlDualClass" cname="GdaXqlDualClass"> <struct name="XqlDualClass" cname="GdaXqlDualClass">
<field cname="parent_class" type="GdaXqlItemClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
</struct> </struct>
<struct name="XqlField" cname="GdaXqlField"> <struct name="XqlField" cname="GdaXqlField">
<field cname="xqlatom" type="GdaXqlAtom"/> <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
<method name="GetType" cname="gda_xql_field_get_type" shared="true"> <method name="GetType" cname="gda_xql_field_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2642,10 +2642,10 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlFieldClass" cname="GdaXqlFieldClass"> <struct name="XqlFieldClass" cname="GdaXqlFieldClass">
<field cname="parent_class" type="GdaXqlAtomClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
</struct> </struct>
<struct name="XqlFunc" cname="GdaXqlFunc"> <struct name="XqlFunc" cname="GdaXqlFunc">
<field cname="xqlbin" type="GdaXqlBin"/> <field name="Xqlbin" cname="xqlbin" type="GdaXqlBin"/>
<method name="AddConstFromText" cname="gda_xql_func_add_const_from_text"> <method name="AddConstFromText" cname="gda_xql_func_add_const_from_text">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -2675,21 +2675,21 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlFuncClass" cname="GdaXqlFuncClass"> <struct name="XqlFuncClass" cname="GdaXqlFuncClass">
<field cname="parent_class" type="GdaXqlBinClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
</struct> </struct>
<struct name="XqlInsert" cname="GdaXqlInsert"> <struct name="XqlInsert" cname="GdaXqlInsert">
<field cname="xqldml" type="GdaXqlDml"/> <field name="Xqldml" cname="xqldml" type="GdaXqlDml"/>
<method name="GetType" cname="gda_xql_insert_get_type" shared="true"> <method name="GetType" cname="gda_xql_insert_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gda_xql_insert_new"/> <constructor cname="gda_xql_insert_new"/>
</struct> </struct>
<struct name="XqlInsertClass" cname="GdaXqlInsertClass"> <struct name="XqlInsertClass" cname="GdaXqlInsertClass">
<field cname="parent_class" type="GdaXqlDmlClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
</struct> </struct>
<struct name="XqlItem" cname="GdaXqlItem"> <struct name="XqlItem" cname="GdaXqlItem">
<field cname="object" type="GObject"/> <field name="Object" cname="object" type="GObject"/>
<field cname="priv" type="GdaXqlItemPrivate*"/> <field name="Priv" cname="priv" type="GdaXqlItemPrivate*"/>
<method name="Add" cname="gda_xql_item_add"> <method name="Add" cname="gda_xql_item_add">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -2771,7 +2771,7 @@
</method> </method>
</struct> </struct>
<struct name="XqlItemClass" cname="GdaXqlItemClass"> <struct name="XqlItemClass" cname="GdaXqlItemClass">
<field cname="parent_class" type="GObjectClass"/> <field name="ParentClass" cname="parent_class" type="GObjectClass"/>
<callback cname="to_dom"> <callback cname="to_dom">
<return-type type="xmlNode*"/> <return-type type="xmlNode*"/>
<parameters> <parameters>
@ -2798,7 +2798,7 @@
</callback> </callback>
</struct> </struct>
<struct name="XqlJoin" cname="GdaXqlJoin"> <struct name="XqlJoin" cname="GdaXqlJoin">
<field cname="xqldual" type="GdaXqlDual"/> <field name="Xqldual" cname="xqldual" type="GdaXqlDual"/>
<method name="GetType" cname="gda_xql_join_get_type" shared="true"> <method name="GetType" cname="gda_xql_join_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2812,11 +2812,11 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlJoinClass" cname="GdaXqlJoinClass"> <struct name="XqlJoinClass" cname="GdaXqlJoinClass">
<field cname="parent_class" type="GdaXqlDualClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlDualClass"/>
</struct> </struct>
<struct name="XqlList" cname="GdaXqlList"> <struct name="XqlList" cname="GdaXqlList">
<field cname="xqlitem" type="GdaXqlItem"/> <field name="Xqlitem" cname="xqlitem" type="GdaXqlItem"/>
<field cname="priv" type="GdaXqlListPrivate*"/> <field name="Priv" cname="priv" type="GdaXqlListPrivate*" access="private"/>
<method name="GetType" cname="gda_xql_list_get_type" shared="true"> <method name="GetType" cname="gda_xql_list_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2844,10 +2844,10 @@
</method> </method>
</struct> </struct>
<struct name="XqlListClass" cname="GdaXqlListClass"> <struct name="XqlListClass" cname="GdaXqlListClass">
<field cname="parent_class" type="GdaXqlItemClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
</struct> </struct>
<struct name="XqlQuery" cname="GdaXqlQuery"> <struct name="XqlQuery" cname="GdaXqlQuery">
<field cname="xqlquery" type="GdaXqlBin"/> <field name="Xqlquery" cname="xqlquery" type="GdaXqlBin"/>
<method name="GetType" cname="gda_xql_query_get_type" shared="true"> <method name="GetType" cname="gda_xql_query_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2859,21 +2859,21 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlQueryClass" cname="GdaXqlQueryClass"> <struct name="XqlQueryClass" cname="GdaXqlQueryClass">
<field cname="parent_class" type="GdaXqlBinClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
</struct> </struct>
<struct name="XqlSelect" cname="GdaXqlSelect"> <struct name="XqlSelect" cname="GdaXqlSelect">
<field cname="xqldml" type="GdaXqlDml"/> <field name="Xqldml" cname="xqldml" type="GdaXqlDml"/>
<method name="GetType" cname="gda_xql_select_get_type" shared="true"> <method name="GetType" cname="gda_xql_select_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gda_xql_select_new"/> <constructor cname="gda_xql_select_new"/>
</struct> </struct>
<struct name="XqlSelectClass" cname="GdaXqlSelectClass"> <struct name="XqlSelectClass" cname="GdaXqlSelectClass">
<field cname="parent_class" type="GdaXqlDmlClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
</struct> </struct>
<struct name="XqlStack" cname="GdaXqlStack"> <struct name="XqlStack" cname="GdaXqlStack">
<field cname="gobject" type="GObject"/> <field name="Gobject" cname="gobject" type="GObject"/>
<field cname="priv" type="GdaXqlStackPrivate*"/> <field name="Priv" cname="priv" type="GdaXqlStackPrivate*" access="private"/>
<method name="Empty" cname="gda_xql_stack_empty"> <method name="Empty" cname="gda_xql_stack_empty">
<return-type type="gboolean"/> <return-type type="gboolean"/>
</method> </method>
@ -2892,10 +2892,10 @@
</method> </method>
</struct> </struct>
<struct name="XqlStackClass" cname="GdaXqlStackClass"> <struct name="XqlStackClass" cname="GdaXqlStackClass">
<field cname="parent_class" type="GObjectClass"/> <field name="ParentClass" cname="parent_class" type="GObjectClass"/>
</struct> </struct>
<struct name="XqlTarget" cname="GdaXqlTarget"> <struct name="XqlTarget" cname="GdaXqlTarget">
<field cname="xqlbin" type="GdaXqlBin"/> <field name="Xqlbin" cname="xqlbin" type="GdaXqlBin"/>
<method name="GetType" cname="gda_xql_target_get_type" shared="true"> <method name="GetType" cname="gda_xql_target_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2909,20 +2909,20 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlTargetClass" cname="GdaXqlTargetClass"> <struct name="XqlTargetClass" cname="GdaXqlTargetClass">
<field cname="parent_class" type="GdaXqlBinClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
</struct> </struct>
<struct name="XqlUpdate" cname="GdaXqlUpdate"> <struct name="XqlUpdate" cname="GdaXqlUpdate">
<field cname="xqldml" type="GdaXqlDml*"/> <field name="Xqldml" cname="xqldml" type="GdaXqlDml*"/>
<method name="GetType" cname="gda_xql_update_get_type" shared="true"> <method name="GetType" cname="gda_xql_update_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gda_xql_update_new"/> <constructor cname="gda_xql_update_new"/>
</struct> </struct>
<struct name="XqlUpdateClass" cname="GdaXqlUpdateClass"> <struct name="XqlUpdateClass" cname="GdaXqlUpdateClass">
<field cname="parent_class" type="GdaXqlDmlClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
</struct> </struct>
<struct name="XqlValue" cname="GdaXqlValue"> <struct name="XqlValue" cname="GdaXqlValue">
<field cname="xqlbin" type="GdaXqlBin"/> <field name="Xqlbin" cname="xqlbin" type="GdaXqlBin"/>
<method name="GetType" cname="gda_xql_value_get_type" shared="true"> <method name="GetType" cname="gda_xql_value_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2934,17 +2934,17 @@
</constructor> </constructor>
</struct> </struct>
<struct name="XqlValueClass" cname="GdaXqlValueClass"> <struct name="XqlValueClass" cname="GdaXqlValueClass">
<field cname="parent_class" type="GdaXqlBinClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
</struct> </struct>
<struct name="XqlValueRef" cname="GdaXqlValueRef"> <struct name="XqlValueRef" cname="GdaXqlValueRef">
<field cname="xqlatom" type="GdaXqlAtom"/> <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
<method name="GetType" cname="gda_xql_valueref_get_type" shared="true"> <method name="GetType" cname="gda_xql_valueref_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gda_xql_valueref_new"/> <constructor cname="gda_xql_valueref_new"/>
</struct> </struct>
<struct name="XqlValueRefClass" cname="GdaXqlValueRefClass"> <struct name="XqlValueRefClass" cname="GdaXqlValueRefClass">
<field cname="parent_class" type="GdaXqlAtomClass"/> <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
</struct> </struct>
<class name="Config" cname="GdaConfig_"> <class name="Config" cname="GdaConfig_">
<method name="AddListener" cname="gda_config_add_listener" shared="true"> <method name="AddListener" cname="gda_config_add_listener" shared="true">

View File

@ -498,10 +498,10 @@
</parameters> </parameters>
</callback> </callback>
<object name="Colormap" cname="GdkColormap" parent="GObject"> <object name="Colormap" cname="GdkColormap" parent="GObject">
<field cname="size" type="gint"/> <field name="Size" cname="size" type="gint" access="public"/>
<field cname="colors" type="GdkColor*"/> <field name="Colors" cname="colors" type="GdkColor*" access="public"/>
<field cname="visual" type="GdkVisual*"/> <field name="Visual" cname="visual" type="GdkVisual*"/>
<field cname="windowing_data" type="gpointer"/> <field name="WindowingData" cname="windowing_data" type="gpointer"/>
<method name="AllocColor" cname="gdk_colormap_alloc_color"> <method name="AllocColor" cname="gdk_colormap_alloc_color">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>
@ -569,14 +569,14 @@
</method> </method>
</object> </object>
<object name="Device" cname="GdkDevice" parent="GObject"> <object name="Device" cname="GdkDevice" parent="GObject">
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="source" type="GdkInputSource"/> <field name="Source" cname="source" type="GdkInputSource"/>
<field cname="mode" type="GdkInputMode"/> <field name="Mode" cname="mode" type="GdkInputMode"/>
<field cname="has_cursor" type="gboolean"/> <field name="HasCursor" cname="has_cursor" type="gboolean"/>
<field cname="num_axes" type="gint"/> <field name="NumAxes" cname="num_axes" type="gint"/>
<field cname="axes" type="GdkDeviceAxis*"/> <field name="Axes" cname="axes" type="GdkDeviceAxis*"/>
<field cname="num_keys" type="gint"/> <field name="NumKeys" cname="num_keys" type="gint"/>
<field cname="keys" type="GdkDeviceKey*"/> <field name="Keys" cname="keys" type="GdkDeviceKey*"/>
<method name="FreeHistory" cname="gdk_device_free_history" shared="true"> <method name="FreeHistory" cname="gdk_device_free_history" shared="true">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -645,18 +645,18 @@
</method> </method>
</object> </object>
<object name="Display" cname="GdkDisplay" parent="GObject"> <object name="Display" cname="GdkDisplay" parent="GObject">
<field cname="queued_events" type="GList*"/> <field name="QueuedEvents" cname="queued_events" type="GList*"/>
<field cname="queued_tail" type="GList*"/> <field name="QueuedTail" cname="queued_tail" type="GList*"/>
<field cname="button_click_time" array_len="2" type="guint32"/> <field name="ButtonClickTime" cname="button_click_time" array_len="2" type="guint32"/>
<field cname="button_window" array_len="2" type="GdkWindow*"/> <field name="ButtonWindow" cname="button_window" array_len="2" type="GdkWindow*"/>
<field cname="button_number" array_len="2" type="gint"/> <field name="ButtonNumber" cname="button_number" array_len="2" type="gint"/>
<field cname="double_click_time" type="guint"/> <field name="DoubleClickTime" cname="double_click_time" type="guint"/>
<field cname="core_pointer" type="GdkDevice*"/> <field name="CorePointer" cname="core_pointer" type="GdkDevice*"/>
<field cname="pointer_hooks" type="const-GdkDisplayPointerHooks*"/> <field name="PointerHooks" cname="pointer_hooks" type="const-GdkDisplayPointerHooks*"/>
<field cname="closed" bits="1" type="guint"/> <field name="Closed" cname="closed" bits="1" type="guint"/>
<field cname="double_click_distance" type="guint"/> <field name="DoubleClickDistance" cname="double_click_distance" type="guint"/>
<field cname="button_x" array_len="2" type="gint"/> <field name="ButtonX" cname="button_x" array_len="2" type="gint"/>
<field cname="button_y" array_len="2" type="gint"/> <field name="ButtonY" cname="button_y" array_len="2" type="gint"/>
<signal name="Closed" cname="closed" when="LAST"> <signal name="Closed" cname="closed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -855,16 +855,16 @@
</method> </method>
</object> </object>
<object name="DragContext" cname="GdkDragContext" parent="GObject"> <object name="DragContext" cname="GdkDragContext" parent="GObject">
<field cname="protocol" type="GdkDragProtocol"/> <field name="Protocol" cname="protocol" type="GdkDragProtocol" access="public"/>
<field cname="is_source" type="gboolean"/> <field name="IsSource" cname="is_source" type="gboolean" access="public"/>
<field cname="source_window" type="GdkWindow*"/> <field name="SourceWindow" cname="source_window" type="GdkWindow*" access="public"/>
<field cname="dest_window" type="GdkWindow*"/> <field name="DestWindow" cname="dest_window" type="GdkWindow*" access="public"/>
<field cname="targets" type="GList*"/> <field name="Targets" cname="targets" type="GList*" access="public"/>
<field cname="actions" type="GdkDragAction"/> <field name="Actions" cname="actions" type="GdkDragAction" access="public"/>
<field cname="suggested_action" type="GdkDragAction"/> <field name="SuggestedAction" cname="suggested_action" type="GdkDragAction" access="public"/>
<field cname="action" type="GdkDragAction"/> <field name="Action" cname="action" type="GdkDragAction" access="public"/>
<field cname="start_time" type="guint32"/> <field name="StartTime" cname="start_time" type="guint32" access="public"/>
<field cname="windowing_data" type="gpointer"/> <field name="WindowingData" cname="windowing_data" type="gpointer"/>
<method name="GetType" cname="gdk_drag_context_get_type" shared="true"> <method name="GetType" cname="gdk_drag_context_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -1476,11 +1476,11 @@
</method> </method>
</object> </object>
<object name="GC" cname="GdkGC" parent="GObject"> <object name="GC" cname="GdkGC" parent="GObject">
<field cname="clip_x_origin" type="gint"/> <field name="ClipXOrigin" cname="clip_x_origin" type="gint"/>
<field cname="clip_y_origin" type="gint"/> <field name="ClipYOrigin" cname="clip_y_origin" type="gint"/>
<field cname="ts_x_origin" type="gint"/> <field name="TsXOrigin" cname="ts_x_origin" type="gint"/>
<field cname="ts_y_origin" type="gint"/> <field name="TsYOrigin" cname="ts_y_origin" type="gint"/>
<field cname="colormap" type="GdkColormap*"/> <field name="Colormap" cname="colormap" type="GdkColormap*"/>
<virtual_method name="GetValues" cname="get_values"> <virtual_method name="GetValues" cname="get_values">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1681,18 +1681,18 @@
</method> </method>
</object> </object>
<object name="Image" cname="GdkImage" parent="GObject"> <object name="Image" cname="GdkImage" parent="GObject">
<field cname="type" type="GdkImageType"/> <field name="Type" cname="type" type="GdkImageType" access="public"/>
<field cname="visual" type="GdkVisual*"/> <field name="Visual" cname="visual" type="GdkVisual*" access="public"/>
<field cname="byte_order" type="GdkByteOrder"/> <field name="ByteOrder" cname="byte_order" type="GdkByteOrder" access="public"/>
<field cname="width" type="gint"/> <field name="Width" cname="width" type="gint" access="public"/>
<field cname="height" type="gint"/> <field name="Height" cname="height" type="gint" access="public"/>
<field cname="depth" type="guint16"/> <field name="Depth" cname="depth" type="guint16" access="public"/>
<field cname="bpp" type="guint16"/> <field name="Bpp" cname="bpp" type="guint16" access="public"/>
<field cname="bpl" type="guint16"/> <field name="Bpl" cname="bpl" type="guint16" access="public"/>
<field cname="bits_per_pixel" type="guint16"/> <field name="BitsPerPixel" cname="bits_per_pixel" type="guint16" access="public"/>
<field cname="mem" type="gpointer"/> <field name="Mem" cname="mem" type="gpointer" access="public"/>
<field cname="colormap" type="GdkColormap*"/> <field name="Colormap" cname="colormap" type="GdkColormap*" access="public"/>
<field cname="windowing_data" type="gpointer"/> <field name="WindowingData" cname="windowing_data" type="gpointer" access="public"/>
<method name="Get" cname="gdk_image_get" deprecated="1" shared="true"> <method name="Get" cname="gdk_image_get" deprecated="1" shared="true">
<return-type type="GdkImage*"/> <return-type type="GdkImage*"/>
<parameters> <parameters>
@ -1746,7 +1746,7 @@
</method> </method>
</object> </object>
<object name="Keymap" cname="GdkKeymap" parent="GObject"> <object name="Keymap" cname="GdkKeymap" parent="GObject">
<field cname="display" type="GdkDisplay*"/> <field name="Display" cname="display" type="GdkDisplay*"/>
<signal name="DirectionChanged" cname="direction_changed" when="LAST"> <signal name="DirectionChanged" cname="direction_changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1900,9 +1900,9 @@
</constructor> </constructor>
</object> </object>
<object name="Screen" cname="GdkScreen" parent="GObject"> <object name="Screen" cname="GdkScreen" parent="GObject">
<field cname="closed" bits="1" type="guint"/> <field name="Closed" cname="closed" bits="1" type="guint"/>
<field cname="normal_gcs" array_len="32" type="GdkGC*"/> <field name="NormalGcs" cname="normal_gcs" array_len="32" type="GdkGC*"/>
<field cname="exposure_gcs" array_len="32" type="GdkGC*"/> <field name="ExposureGcs" cname="exposure_gcs" array_len="32" type="GdkGC*"/>
<signal name="SizeChanged" cname="size_changed" when="LAST"> <signal name="SizeChanged" cname="size_changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -2016,20 +2016,20 @@
</method> </method>
</object> </object>
<object name="Visual" cname="GdkVisual" parent="GObject"> <object name="Visual" cname="GdkVisual" parent="GObject">
<field cname="type" type="GdkVisualType"/> <field name="Type" cname="type" type="GdkVisualType"/>
<field cname="depth" type="gint"/> <field name="Depth" cname="depth" type="gint"/>
<field cname="byte_order" type="GdkByteOrder"/> <field name="ByteOrder" cname="byte_order" type="GdkByteOrder"/>
<field cname="colormap_size" type="gint"/> <field name="ColormapSize" cname="colormap_size" type="gint"/>
<field cname="bits_per_rgb" type="gint"/> <field name="BitsPerRgb" cname="bits_per_rgb" type="gint"/>
<field cname="red_mask" type="guint32"/> <field name="RedMask" cname="red_mask" type="guint32"/>
<field cname="red_shift" type="gint"/> <field name="RedShift" cname="red_shift" type="gint"/>
<field cname="red_prec" type="gint"/> <field name="RedPrec" cname="red_prec" type="gint"/>
<field cname="green_mask" type="guint32"/> <field name="GreenMask" cname="green_mask" type="guint32"/>
<field cname="green_shift" type="gint"/> <field name="GreenShift" cname="green_shift" type="gint"/>
<field cname="green_prec" type="gint"/> <field name="GreenPrec" cname="green_prec" type="gint"/>
<field cname="blue_mask" type="guint32"/> <field name="BlueMask" cname="blue_mask" type="guint32"/>
<field cname="blue_shift" type="gint"/> <field name="BlueShift" cname="blue_shift" type="gint"/>
<field cname="blue_prec" type="gint"/> <field name="BluePrec" cname="blue_prec" type="gint"/>
<method name="GetBest" cname="gdk_visual_get_best" shared="true"> <method name="GetBest" cname="gdk_visual_get_best" shared="true">
<return-type type="GdkVisual*"/> <return-type type="GdkVisual*"/>
</method> </method>
@ -2622,21 +2622,21 @@
</method> </method>
</object> </object>
<struct name="BRESINFO" cname="BRESINFO"> <struct name="BRESINFO" cname="BRESINFO">
<field cname="minor_axis" type="int"/> <field name="MinorAxis" cname="minor_axis" type="int"/>
<field cname="d" type="int"/> <field name="D" cname="d" type="int"/>
<field cname="m" type="int"/> <field name="M" cname="m" type="int"/>
<field cname="m1" type="int"/> <field name="M1" cname="m1" type="int"/>
<field cname="incr1" type="int"/> <field name="Incr1" cname="incr1" type="int"/>
<field cname="incr2" type="int"/> <field name="Incr2" cname="incr2" type="int"/>
</struct> </struct>
<struct name="EdgeTable" cname="EdgeTable"> <struct name="EdgeTable" cname="EdgeTable">
<field cname="ymax" type="int"/> <field name="Ymax" cname="ymax" type="int"/>
<field cname="ymin" type="int"/> <field name="Ymin" cname="ymin" type="int"/>
<field cname="scanlines" type="ScanLineList"/> <field name="Scanlines" cname="scanlines" type="ScanLineList"/>
</struct> </struct>
<struct name="EdgeTableEntry" cname="EdgeTableEntry" opaque="true"/> <struct name="EdgeTableEntry" cname="EdgeTableEntry" opaque="true"/>
<object name="Bitmap" cname="GdkBitmap"> <object name="Bitmap" cname="GdkBitmap">
<field cname="parent_instance" type="GObject"/> <field name="ParentInstance" cname="parent_instance" type="GObject"/>
<method name="CreateFromData" cname="gdk_bitmap_create_from_data" shared="true"> <method name="CreateFromData" cname="gdk_bitmap_create_from_data" shared="true">
<return-type type="GdkBitmap*"/> <return-type type="GdkBitmap*"/>
<parameters> <parameters>
@ -2648,10 +2648,10 @@
</method> </method>
</object> </object>
<boxed name="Color" cname="GdkColor"> <boxed name="Color" cname="GdkColor">
<field cname="pixel" type="guint32"/> <field name="Pixel" cname="pixel" type="guint32"/>
<field cname="red" type="guint16"/> <field name="Red" cname="red" type="guint16"/>
<field cname="green" type="guint16"/> <field name="Green" cname="green" type="guint16"/>
<field cname="blue" type="guint16"/> <field name="Blue" cname="blue" type="guint16"/>
<method name="Alloc" cname="gdk_color_alloc" deprecated="1" shared="true"> <method name="Alloc" cname="gdk_color_alloc" deprecated="1" shared="true">
<return-type type="gint"/> <return-type type="gint"/>
<parameters> <parameters>
@ -2707,8 +2707,8 @@
</method> </method>
</boxed> </boxed>
<boxed name="Cursor" cname="GdkCursor"> <boxed name="Cursor" cname="GdkCursor">
<field cname="type" type="GdkCursorType"/> <field name="Type" cname="type" type="GdkCursorType"/>
<field cname="ref_count" type="guint"/> <field name="RefCount" cname="ref_count" type="guint"/>
<method name="GetDisplay" cname="gdk_cursor_get_display"> <method name="GetDisplay" cname="gdk_cursor_get_display">
<return-type type="GdkDisplay*"/> <return-type type="GdkDisplay*"/>
</method> </method>
@ -2752,13 +2752,13 @@
</method> </method>
</boxed> </boxed>
<struct name="DeviceAxis" cname="GdkDeviceAxis"> <struct name="DeviceAxis" cname="GdkDeviceAxis">
<field cname="use" type="GdkAxisUse"/> <field name="Use" cname="use" type="GdkAxisUse"/>
<field cname="min" type="gdouble"/> <field name="Min" cname="min" type="gdouble"/>
<field cname="max" type="gdouble"/> <field name="Max" cname="max" type="gdouble"/>
</struct> </struct>
<struct name="DeviceKey" cname="GdkDeviceKey"> <struct name="DeviceKey" cname="GdkDeviceKey">
<field cname="keyval" type="guint"/> <field name="Keyval" cname="keyval" type="guint"/>
<field cname="modifiers" type="GdkModifierType"/> <field name="Modifiers" cname="modifiers" type="GdkModifierType"/>
</struct> </struct>
<struct name="DisplayPointerHooks" cname="GdkDisplayPointerHooks"> <struct name="DisplayPointerHooks" cname="GdkDisplayPointerHooks">
<callback cname="get_pointer"> <callback cname="get_pointer">
@ -2781,172 +2781,172 @@
</callback> </callback>
</struct> </struct>
<struct name="EventAny" cname="GdkEventAny"> <struct name="EventAny" cname="GdkEventAny">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
</struct> </struct>
<struct name="EventButton" cname="GdkEventButton"> <struct name="EventButton" cname="GdkEventButton">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="x" type="gdouble"/> <field name="X" cname="x" type="gdouble"/>
<field cname="y" type="gdouble"/> <field name="Y" cname="y" type="gdouble"/>
<field cname="axes" type="gdouble*"/> <field name="Axes" cname="axes" type="gdouble*"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
<field cname="button" type="guint"/> <field name="Button" cname="button" type="guint"/>
<field cname="device" type="GdkDevice*"/> <field name="Device" cname="device" type="GdkDevice*"/>
<field cname="x_root" type="gdouble"/> <field name="XRoot" cname="x_root" type="gdouble"/>
<field cname="y_root" type="gdouble"/> <field name="YRoot" cname="y_root" type="gdouble"/>
</struct> </struct>
<struct name="EventClient" cname="GdkEventClient"> <struct name="EventClient" cname="GdkEventClient">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="message_type" type="GdkAtom"/> <field name="MessageType" cname="message_type" type="GdkAtom"/>
<field cname="data_format" type="gushort"/> <field name="DataFormat" cname="data_format" type="gushort"/>
<field cname="b" array_len="20" type="char"/> <field name="B" cname="b" array_len="20" type="char"/>
</struct> </struct>
<struct name="EventConfigure" cname="GdkEventConfigure"> <struct name="EventConfigure" cname="GdkEventConfigure">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
<field cname="width" type="gint"/> <field name="Width" cname="width" type="gint"/>
<field cname="height" type="gint"/> <field name="Height" cname="height" type="gint"/>
</struct> </struct>
<struct name="EventCrossing" cname="GdkEventCrossing"> <struct name="EventCrossing" cname="GdkEventCrossing">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="subwindow" type="GdkWindow*"/> <field name="Subwindow" cname="subwindow" type="GdkWindow*"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="x" type="gdouble"/> <field name="X" cname="x" type="gdouble"/>
<field cname="y" type="gdouble"/> <field name="Y" cname="y" type="gdouble"/>
<field cname="x_root" type="gdouble"/> <field name="XRoot" cname="x_root" type="gdouble"/>
<field cname="y_root" type="gdouble"/> <field name="YRoot" cname="y_root" type="gdouble"/>
<field cname="mode" type="GdkCrossingMode"/> <field name="Mode" cname="mode" type="GdkCrossingMode"/>
<field cname="detail" type="GdkNotifyType"/> <field name="Detail" cname="detail" type="GdkNotifyType"/>
<field cname="focus" type="gboolean"/> <field name="Focus" cname="focus" type="gboolean"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
</struct> </struct>
<struct name="EventDND" cname="GdkEventDND"> <struct name="EventDND" cname="GdkEventDND">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="context" type="GdkDragContext*"/> <field name="Context" cname="context" type="GdkDragContext*"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="x_root" type="gshort"/> <field name="XRoot" cname="x_root" type="gshort"/>
<field cname="y_root" type="gshort"/> <field name="YRoot" cname="y_root" type="gshort"/>
</struct> </struct>
<struct name="EventExpose" cname="GdkEventExpose"> <struct name="EventExpose" cname="GdkEventExpose">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="area" type="GdkRectangle"/> <field name="Area" cname="area" type="GdkRectangle"/>
<field cname="region" type="GdkRegion*"/> <field name="Region" cname="region" type="GdkRegion*"/>
<field cname="count" type="gint"/> <field name="Count" cname="count" type="gint"/>
</struct> </struct>
<struct name="EventFocus" cname="GdkEventFocus"> <struct name="EventFocus" cname="GdkEventFocus">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="in" type="gint16"/> <field name="In" cname="in" type="gint16"/>
</struct> </struct>
<struct name="EventKey" cname="GdkEventKey"> <struct name="EventKey" cname="GdkEventKey">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
<field cname="keyval" type="guint"/> <field name="Keyval" cname="keyval" type="guint"/>
<field cname="length" type="gint"/> <field name="Length" cname="length" type="gint"/>
<field cname="string" type="gchar*"/> <field name="String" cname="string" type="gchar*"/>
<field cname="hardware_keycode" type="guint16"/> <field name="HardwareKeycode" cname="hardware_keycode" type="guint16"/>
<field cname="group" type="guint8"/> <field name="Group" cname="group" type="guint8"/>
</struct> </struct>
<struct name="EventMotion" cname="GdkEventMotion"> <struct name="EventMotion" cname="GdkEventMotion">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="x" type="gdouble"/> <field name="X" cname="x" type="gdouble"/>
<field cname="y" type="gdouble"/> <field name="Y" cname="y" type="gdouble"/>
<field cname="axes" type="gdouble*"/> <field name="Axes" cname="axes" type="gdouble*"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
<field cname="is_hint" type="gint16"/> <field name="IsHint" cname="is_hint" type="gint16"/>
<field cname="device" type="GdkDevice*"/> <field name="Device" cname="device" type="GdkDevice*"/>
<field cname="x_root" type="gdouble"/> <field name="XRoot" cname="x_root" type="gdouble"/>
<field cname="y_root" type="gdouble"/> <field name="YRoot" cname="y_root" type="gdouble"/>
</struct> </struct>
<struct name="EventNoExpose" cname="GdkEventNoExpose"> <struct name="EventNoExpose" cname="GdkEventNoExpose">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
</struct> </struct>
<struct name="EventProperty" cname="GdkEventProperty"> <struct name="EventProperty" cname="GdkEventProperty">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="atom" type="GdkAtom"/> <field name="Atom" cname="atom" type="GdkAtom"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
</struct> </struct>
<struct name="EventProximity" cname="GdkEventProximity"> <struct name="EventProximity" cname="GdkEventProximity">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="device" type="GdkDevice*"/> <field name="Device" cname="device" type="GdkDevice*"/>
</struct> </struct>
<struct name="EventScroll" cname="GdkEventScroll"> <struct name="EventScroll" cname="GdkEventScroll">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="x" type="gdouble"/> <field name="X" cname="x" type="gdouble"/>
<field cname="y" type="gdouble"/> <field name="Y" cname="y" type="gdouble"/>
<field cname="state" type="guint"/> <field name="State" cname="state" type="guint"/>
<field cname="direction" type="GdkScrollDirection"/> <field name="Direction" cname="direction" type="GdkScrollDirection"/>
<field cname="device" type="GdkDevice*"/> <field name="Device" cname="device" type="GdkDevice*"/>
<field cname="x_root" type="gdouble"/> <field name="XRoot" cname="x_root" type="gdouble"/>
<field cname="y_root" type="gdouble"/> <field name="YRoot" cname="y_root" type="gdouble"/>
</struct> </struct>
<struct name="EventSelection" cname="GdkEventSelection"> <struct name="EventSelection" cname="GdkEventSelection">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="selection" type="GdkAtom"/> <field name="Selection" cname="selection" type="GdkAtom"/>
<field cname="target" type="GdkAtom"/> <field name="Target" cname="target" type="GdkAtom"/>
<field cname="property" type="GdkAtom"/> <field name="Property" cname="property" type="GdkAtom"/>
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="requestor" type="GdkNativeWindow"/> <field name="Requestor" cname="requestor" type="GdkNativeWindow"/>
</struct> </struct>
<struct name="EventSetting" cname="GdkEventSetting"> <struct name="EventSetting" cname="GdkEventSetting">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="action" type="GdkSettingAction"/> <field name="Action" cname="action" type="GdkSettingAction"/>
<field cname="name" type="char*"/> <field name="Name" cname="name" type="char*"/>
</struct> </struct>
<struct name="EventVisibility" cname="GdkEventVisibility"> <struct name="EventVisibility" cname="GdkEventVisibility">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="state" type="GdkVisibilityState"/> <field name="State" cname="state" type="GdkVisibilityState"/>
</struct> </struct>
<struct name="EventWindowState" cname="GdkEventWindowState"> <struct name="EventWindowState" cname="GdkEventWindowState">
<field cname="type" type="GdkEventType"/> <field name="Type" cname="type" type="GdkEventType"/>
<field cname="window" type="GdkWindow*"/> <field name="Window" cname="window" type="GdkWindow*"/>
<field cname="send_event" type="gint8"/> <field name="SendEvent" cname="send_event" type="gint8"/>
<field cname="changed_mask" type="GdkWindowState"/> <field name="ChangedMask" cname="changed_mask" type="GdkWindowState"/>
<field cname="new_window_state" type="GdkWindowState"/> <field name="NewWindowState" cname="new_window_state" type="GdkWindowState"/>
</struct> </struct>
<boxed name="Font" cname="GdkFont" deprecated="1"> <boxed name="Font" cname="GdkFont" deprecated="1">
<field cname="type" type="GdkFontType"/> <field name="Type" cname="type" type="GdkFontType"/>
<field cname="ascent" type="gint"/> <field name="Ascent" cname="ascent" type="gint"/>
<field cname="descent" type="gint"/> <field name="Descent" cname="descent" type="gint"/>
<method name="Equal" cname="gdk_font_equal" deprecated="1"> <method name="Equal" cname="gdk_font_equal" deprecated="1">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>
@ -2996,47 +2996,47 @@
</method> </method>
</boxed> </boxed>
<struct name="GCValues" cname="GdkGCValues"> <struct name="GCValues" cname="GdkGCValues">
<field cname="foreground" type="GdkColor"/> <field name="Foreground" cname="foreground" type="GdkColor"/>
<field cname="background" type="GdkColor"/> <field name="Background" cname="background" type="GdkColor"/>
<field cname="font" type="GdkFont*"/> <field name="Font" cname="font" type="GdkFont*"/>
<field cname="function" type="GdkFunction"/> <field name="Function" cname="function" type="GdkFunction"/>
<field cname="fill" type="GdkFill"/> <field name="Fill" cname="fill" type="GdkFill"/>
<field cname="tile" type="GdkPixmap*"/> <field name="Tile" cname="tile" type="GdkPixmap*"/>
<field cname="stipple" type="GdkPixmap*"/> <field name="Stipple" cname="stipple" type="GdkPixmap*"/>
<field cname="clip_mask" type="GdkPixmap*"/> <field name="ClipMask" cname="clip_mask" type="GdkPixmap*"/>
<field cname="subwindow_mode" type="GdkSubwindowMode"/> <field name="SubwindowMode" cname="subwindow_mode" type="GdkSubwindowMode"/>
<field cname="ts_x_origin" type="gint"/> <field name="TsXOrigin" cname="ts_x_origin" type="gint"/>
<field cname="ts_y_origin" type="gint"/> <field name="TsYOrigin" cname="ts_y_origin" type="gint"/>
<field cname="clip_x_origin" type="gint"/> <field name="ClipXOrigin" cname="clip_x_origin" type="gint"/>
<field cname="clip_y_origin" type="gint"/> <field name="ClipYOrigin" cname="clip_y_origin" type="gint"/>
<field cname="graphics_exposures" type="gint"/> <field name="GraphicsExposures" cname="graphics_exposures" type="gint"/>
<field cname="line_width" type="gint"/> <field name="LineWidth" cname="line_width" type="gint"/>
<field cname="line_style" type="GdkLineStyle"/> <field name="LineStyle" cname="line_style" type="GdkLineStyle"/>
<field cname="cap_style" type="GdkCapStyle"/> <field name="CapStyle" cname="cap_style" type="GdkCapStyle"/>
<field cname="join_style" type="GdkJoinStyle"/> <field name="JoinStyle" cname="join_style" type="GdkJoinStyle"/>
</struct> </struct>
<struct name="Geometry" cname="GdkGeometry"> <struct name="Geometry" cname="GdkGeometry">
<field cname="min_width" type="gint"/> <field name="MinWidth" cname="min_width" type="gint"/>
<field cname="min_height" type="gint"/> <field name="MinHeight" cname="min_height" type="gint"/>
<field cname="max_width" type="gint"/> <field name="MaxWidth" cname="max_width" type="gint"/>
<field cname="max_height" type="gint"/> <field name="MaxHeight" cname="max_height" type="gint"/>
<field cname="base_width" type="gint"/> <field name="BaseWidth" cname="base_width" type="gint"/>
<field cname="base_height" type="gint"/> <field name="BaseHeight" cname="base_height" type="gint"/>
<field cname="width_inc" type="gint"/> <field name="WidthInc" cname="width_inc" type="gint"/>
<field cname="height_inc" type="gint"/> <field name="HeightInc" cname="height_inc" type="gint"/>
<field cname="min_aspect" type="gdouble"/> <field name="MinAspect" cname="min_aspect" type="gdouble"/>
<field cname="max_aspect" type="gdouble"/> <field name="MaxAspect" cname="max_aspect" type="gdouble"/>
<field cname="win_gravity" type="GdkGravity"/> <field name="WinGravity" cname="win_gravity" type="GdkGravity"/>
</struct> </struct>
<struct name="KeymapKey" cname="GdkKeymapKey"> <struct name="KeymapKey" cname="GdkKeymapKey">
<field cname="keycode" type="guint"/> <field name="Keycode" cname="keycode" type="guint"/>
<field cname="group" type="gint"/> <field name="Group" cname="group" type="gint"/>
<field cname="level" type="gint"/> <field name="Level" cname="level" type="gint"/>
</struct> </struct>
<alias name="NativeWindow" cname="GdkNativeWindow" type="guint32"/> <alias name="NativeWindow" cname="GdkNativeWindow" type="guint32"/>
<struct name="PangoAttrEmbossed" cname="GdkPangoAttrEmbossed"> <struct name="PangoAttrEmbossed" cname="GdkPangoAttrEmbossed">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="embossed" type="gboolean"/> <field name="Embossed" cname="embossed" type="gboolean"/>
<constructor cname="gdk_pango_attr_embossed_new"> <constructor cname="gdk_pango_attr_embossed_new">
<parameters> <parameters>
<parameter type="gboolean" name="embossed"/> <parameter type="gboolean" name="embossed"/>
@ -3044,8 +3044,8 @@
</constructor> </constructor>
</struct> </struct>
<struct name="PangoAttrStipple" cname="GdkPangoAttrStipple"> <struct name="PangoAttrStipple" cname="GdkPangoAttrStipple">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="stipple" type="GdkBitmap*"/> <field name="Stipple" cname="stipple" type="GdkBitmap*"/>
<constructor cname="gdk_pango_attr_stipple_new"> <constructor cname="gdk_pango_attr_stipple_new">
<parameters> <parameters>
<parameter type="GdkBitmap*" name="stipple"/> <parameter type="GdkBitmap*" name="stipple"/>
@ -3053,13 +3053,13 @@
</constructor> </constructor>
</struct> </struct>
<struct name="PixmapObject" cname="GdkPixmapObject"> <struct name="PixmapObject" cname="GdkPixmapObject">
<field cname="parent_instance" type="GdkDrawable"/> <field name="ParentInstance" cname="parent_instance" type="GdkDrawable"/>
<field cname="impl" type="GdkDrawable*"/> <field name="Impl" cname="impl" type="GdkDrawable*"/>
<field cname="depth" type="gint"/> <field name="Depth" cname="depth" type="gint"/>
</struct> </struct>
<struct name="Point" cname="GdkPoint"> <struct name="Point" cname="GdkPoint">
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
</struct> </struct>
<struct name="PointerHooks" cname="GdkPointerHooks"> <struct name="PointerHooks" cname="GdkPointerHooks">
<callback cname="get_pointer"> <callback cname="get_pointer">
@ -3076,10 +3076,10 @@
</callback> </callback>
</struct> </struct>
<boxed name="Rectangle" cname="GdkRectangle"> <boxed name="Rectangle" cname="GdkRectangle">
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
<field cname="width" type="gint"/> <field name="Width" cname="width" type="gint"/>
<field cname="height" type="gint"/> <field name="Height" cname="height" type="gint"/>
<method name="GetType" cname="gdk_rectangle_get_type" shared="true"> <method name="GetType" cname="gdk_rectangle_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -3099,10 +3099,10 @@
</method> </method>
</boxed> </boxed>
<struct name="Region" cname="GdkRegion"> <struct name="Region" cname="GdkRegion">
<field cname="size" type="long"/> <field name="Size" cname="size" type="long"/>
<field cname="numRects" type="long"/> <field name="NumRects" cname="numRects" type="long"/>
<field cname="rects" type="GdkRegionBox*"/> <field name="Rects" cname="rects" type="GdkRegionBox*"/>
<field cname="extents" type="GdkRegionBox"/> <field name="Extents" cname="extents" type="GdkRegionBox"/>
<method name="Copy" cname="gdk_region_copy"> <method name="Copy" cname="gdk_region_copy">
<return-type type="GdkRegion*"/> <return-type type="GdkRegion*"/>
</method> </method>
@ -3215,15 +3215,15 @@
</method> </method>
</struct> </struct>
<struct name="RegionBox" cname="GdkRegionBox"> <struct name="RegionBox" cname="GdkRegionBox">
<field cname="x1" type="gint"/> <field name="X1" cname="x1" type="gint"/>
<field cname="y1" type="gint"/> <field name="Y1" cname="y1" type="gint"/>
<field cname="x2" type="gint"/> <field name="X2" cname="x2" type="gint"/>
<field cname="y2" type="gint"/> <field name="Y2" cname="y2" type="gint"/>
</struct> </struct>
<struct name="RgbCmap" cname="GdkRgbCmap"> <struct name="RgbCmap" cname="GdkRgbCmap">
<field cname="colors" array_len="256" type="guint32"/> <field name="Colors" cname="colors" array_len="256" type="guint32"/>
<field cname="n_colors" type="gint"/> <field name="NColors" cname="n_colors" type="gint"/>
<field cname="info_list" type="GSList*"/> <field name="InfoList" cname="info_list" type="GSList*" access="private"/>
<method name="Free" cname="gdk_rgb_cmap_free"> <method name="Free" cname="gdk_rgb_cmap_free">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -3235,65 +3235,65 @@
</constructor> </constructor>
</struct> </struct>
<struct name="Segment" cname="GdkSegment"> <struct name="Segment" cname="GdkSegment">
<field cname="x1" type="gint"/> <field name="X1" cname="x1" type="gint"/>
<field cname="y1" type="gint"/> <field name="Y1" cname="y1" type="gint"/>
<field cname="x2" type="gint"/> <field name="X2" cname="x2" type="gint"/>
<field cname="y2" type="gint"/> <field name="Y2" cname="y2" type="gint"/>
</struct> </struct>
<alias name="Selection" cname="GdkSelection" type="GdkAtom"/> <alias name="Selection" cname="GdkSelection" type="GdkAtom"/>
<alias name="SelectionType" cname="GdkSelectionType" type="GdkAtom"/> <alias name="SelectionType" cname="GdkSelectionType" type="GdkAtom"/>
<struct name="Span" cname="GdkSpan"> <struct name="Span" cname="GdkSpan">
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
<field cname="width" type="gint"/> <field name="Width" cname="width" type="gint"/>
</struct> </struct>
<alias name="Target" cname="GdkTarget" type="GdkAtom"/> <alias name="Target" cname="GdkTarget" type="GdkAtom"/>
<struct name="TimeCoord" cname="GdkTimeCoord"> <struct name="TimeCoord" cname="GdkTimeCoord">
<field cname="time" type="guint32"/> <field name="Time" cname="time" type="guint32"/>
<field cname="axes" array_len="GDK_MAX_TIMECOORD_AXES" type="gdouble"/> <field name="Axes" cname="axes" array_len="GDK_MAX_TIMECOORD_AXES" type="gdouble"/>
</struct> </struct>
<alias name="WChar" cname="GdkWChar" type="guint32"/> <alias name="WChar" cname="GdkWChar" type="guint32"/>
<struct name="WindowAttr" cname="GdkWindowAttr"> <struct name="WindowAttr" cname="GdkWindowAttr">
<field cname="title" type="gchar*"/> <field name="Title" cname="title" type="gchar*"/>
<field cname="event_mask" type="gint"/> <field name="EventMask" cname="event_mask" type="gint"/>
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
<field cname="width" type="gint"/> <field name="Width" cname="width" type="gint"/>
<field cname="height" type="gint"/> <field name="Height" cname="height" type="gint"/>
<field cname="wclass" type="GdkWindowClass"/> <field name="Wclass" cname="wclass" type="GdkWindowClass"/>
<field cname="visual" type="GdkVisual*"/> <field name="Visual" cname="visual" type="GdkVisual*"/>
<field cname="colormap" type="GdkColormap*"/> <field name="Colormap" cname="colormap" type="GdkColormap*"/>
<field cname="window_type" type="GdkWindowType"/> <field name="WindowType" cname="window_type" type="GdkWindowType"/>
<field cname="cursor" type="GdkCursor*"/> <field name="Cursor" cname="cursor" type="GdkCursor*"/>
<field cname="wmclass_name" type="gchar*"/> <field name="WmclassName" cname="wmclass_name" type="gchar*"/>
<field cname="wmclass_class" type="gchar*"/> <field name="WmclassClass" cname="wmclass_class" type="gchar*"/>
<field cname="override_redirect" type="gboolean"/> <field name="OverrideRedirect" cname="override_redirect" type="gboolean"/>
</struct> </struct>
<struct name="WindowObject" cname="GdkWindowObject"> <struct name="WindowObject" cname="GdkWindowObject">
<field cname="parent_instance" type="GdkDrawable"/> <field name="ParentInstance" cname="parent_instance" type="GdkDrawable"/>
<field cname="impl" type="GdkDrawable*"/> <field name="Impl" cname="impl" type="GdkDrawable*"/>
<field cname="parent" type="GdkWindowObject*"/> <field name="Parent" cname="parent" type="GdkWindowObject*"/>
<field cname="user_data" type="gpointer"/> <field name="UserData" cname="user_data" type="gpointer"/>
<field cname="x" type="gint"/> <field name="X" cname="x" type="gint"/>
<field cname="y" type="gint"/> <field name="Y" cname="y" type="gint"/>
<field cname="extension_events" type="gint"/> <field name="ExtensionEvents" cname="extension_events" type="gint"/>
<field cname="filters" type="GList*"/> <field name="Filters" cname="filters" type="GList*"/>
<field cname="children" type="GList*"/> <field name="Children" cname="children" type="GList*"/>
<field cname="bg_color" type="GdkColor"/> <field name="BgColor" cname="bg_color" type="GdkColor"/>
<field cname="bg_pixmap" type="GdkPixmap*"/> <field name="BgPixmap" cname="bg_pixmap" type="GdkPixmap*"/>
<field cname="paint_stack" type="GSList*"/> <field name="PaintStack" cname="paint_stack" type="GSList*"/>
<field cname="update_area" type="GdkRegion*"/> <field name="UpdateArea" cname="update_area" type="GdkRegion*"/>
<field cname="update_freeze_count" type="guint"/> <field name="UpdateFreezeCount" cname="update_freeze_count" type="guint"/>
<field cname="window_type" type="guint8"/> <field name="WindowType" cname="window_type" type="guint8"/>
<field cname="depth" type="guint8"/> <field name="Depth" cname="depth" type="guint8"/>
<field cname="resize_count" type="guint8"/> <field name="ResizeCount" cname="resize_count" type="guint8"/>
<field cname="state" type="GdkWindowState"/> <field name="State" cname="state" type="GdkWindowState"/>
<field cname="guffaw_gravity" bits="1" type="guint"/> <field name="GuffawGravity" cname="guffaw_gravity" bits="1" type="guint"/>
<field cname="input_only" bits="1" type="guint"/> <field name="InputOnly" cname="input_only" bits="1" type="guint"/>
<field cname="modal_hint" bits="1" type="guint"/> <field name="ModalHint" cname="modal_hint" bits="1" type="guint"/>
<field cname="destroyed" bits="2" type="guint"/> <field name="Destroyed" cname="destroyed" bits="2" type="guint"/>
<field cname="accept_focus" bits="1" type="guint"/> <field name="AcceptFocus" cname="accept_focus" bits="1" type="guint"/>
<field cname="event_mask" type="GdkEventMask"/> <field name="EventMask" cname="event_mask" type="GdkEventMask"/>
<method name="GetType" cname="gdk_window_object_get_type" shared="true"> <method name="GetType" cname="gdk_window_object_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -4821,40 +4821,40 @@
</method> </method>
</object> </object>
<object name="PixbufAniAnim" cname="GdkPixbufAniAnim" parent="GdkPixbufAnimation"> <object name="PixbufAniAnim" cname="GdkPixbufAniAnim" parent="GdkPixbufAnimation">
<field cname="total_time" type="int"/> <field name="TotalTime" cname="total_time" type="int"/>
<field cname="n_frames" type="int"/> <field name="NFrames" cname="n_frames" type="int"/>
<field cname="n_pixbufs" type="int"/> <field name="NPixbufs" cname="n_pixbufs" type="int"/>
<field cname="pixbufs" type="GdkPixbuf**"/> <field name="Pixbufs" cname="pixbufs" type="GdkPixbuf**"/>
<field cname="sequence" type="int*"/> <field name="Sequence" cname="sequence" type="int*"/>
<field cname="delay" type="int*"/> <field name="Delay" cname="delay" type="int*"/>
<field cname="width" type="int"/> <field name="Width" cname="width" type="int"/>
<field cname="height" type="int"/> <field name="Height" cname="height" type="int"/>
<method name="GetType" cname="gdk_pixbuf_ani_anim_get_type" shared="true"> <method name="GetType" cname="gdk_pixbuf_ani_anim_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
</object> </object>
<object name="PixbufAniAnimIter" cname="GdkPixbufAniAnimIter" parent="GdkPixbufAnimationIter"> <object name="PixbufAniAnimIter" cname="GdkPixbufAniAnimIter" parent="GdkPixbufAnimationIter">
<field cname="ani_anim" type="GdkPixbufAniAnim*"/> <field name="AniAnim" cname="ani_anim" type="GdkPixbufAniAnim*"/>
<field cname="start_time" type="GTimeVal"/> <field name="StartTime" cname="start_time" type="GTimeVal"/>
<field cname="current_time" type="GTimeVal"/> <field name="CurrentTime" cname="current_time" type="GTimeVal"/>
<field cname="position" type="gint"/> <field name="Position" cname="position" type="gint"/>
<field cname="current_frame" type="gint"/> <field name="CurrentFrame" cname="current_frame" type="gint"/>
<field cname="elapsed" type="gint"/> <field name="Elapsed" cname="elapsed" type="gint"/>
<method name="GetType" cname="gdk_pixbuf_ani_anim_iter_get_type" shared="true"> <method name="GetType" cname="gdk_pixbuf_ani_anim_iter_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
</object> </object>
<object name="PixbufGifAnim" cname="GdkPixbufGifAnim" parent="GdkPixbufAnimation"> <object name="PixbufGifAnim" cname="GdkPixbufGifAnim" parent="GdkPixbufAnimation">
<field cname="n_frames" type="int"/> <field name="NFrames" cname="n_frames" type="int"/>
<field cname="total_time" type="int"/> <field name="TotalTime" cname="total_time" type="int"/>
<field cname="frames" type="GList*"/> <field name="Frames" cname="frames" type="GList*"/>
<field cname="width" type="int"/> <field name="Width" cname="width" type="int"/>
<field cname="height" type="int"/> <field name="Height" cname="height" type="int"/>
<field cname="bg_red" type="guchar"/> <field name="BgRed" cname="bg_red" type="guchar"/>
<field cname="bg_green" type="guchar"/> <field name="BgGreen" cname="bg_green" type="guchar"/>
<field cname="bg_blue" type="guchar"/> <field name="BgBlue" cname="bg_blue" type="guchar"/>
<field cname="loop" type="int"/> <field name="Loop" cname="loop" type="int"/>
<field cname="loading" type="gboolean"/> <field name="Loading" cname="loading" type="gboolean"/>
<method name="FrameComposite" cname="gdk_pixbuf_gif_anim_frame_composite"> <method name="FrameComposite" cname="gdk_pixbuf_gif_anim_frame_composite">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -4866,18 +4866,18 @@
</method> </method>
</object> </object>
<object name="PixbufGifAnimIter" cname="GdkPixbufGifAnimIter" parent="GdkPixbufAnimationIter"> <object name="PixbufGifAnimIter" cname="GdkPixbufGifAnimIter" parent="GdkPixbufAnimationIter">
<field cname="gif_anim" type="GdkPixbufGifAnim*"/> <field name="GifAnim" cname="gif_anim" type="GdkPixbufGifAnim*"/>
<field cname="start_time" type="GTimeVal"/> <field name="StartTime" cname="start_time" type="GTimeVal"/>
<field cname="current_time" type="GTimeVal"/> <field name="CurrentTime" cname="current_time" type="GTimeVal"/>
<field cname="position" type="gint"/> <field name="Position" cname="position" type="gint"/>
<field cname="current_frame" type="GList*"/> <field name="CurrentFrame" cname="current_frame" type="GList*"/>
<field cname="first_loop_slowness" type="gint"/> <field name="FirstLoopSlowness" cname="first_loop_slowness" type="gint"/>
<method name="GetType" cname="gdk_pixbuf_gif_anim_iter_get_type" shared="true"> <method name="GetType" cname="gdk_pixbuf_gif_anim_iter_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
</object> </object>
<object name="PixbufLoader" cname="GdkPixbufLoader" parent="GObject"> <object name="PixbufLoader" cname="GdkPixbufLoader" parent="GObject">
<field cname="priv" type="gpointer"/> <field name="Priv" cname="priv" type="gpointer"/>
<signal name="SizePrepared" cname="size_prepared" when="LAST"> <signal name="SizePrepared" cname="size_prepared" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -4973,25 +4973,25 @@
</method> </method>
</struct> </struct>
<struct name="PixbufFrame" cname="GdkPixbufFrame"> <struct name="PixbufFrame" cname="GdkPixbufFrame">
<field cname="pixbuf" type="GdkPixbuf*"/> <field name="Pixbuf" cname="pixbuf" type="GdkPixbuf*"/>
<field cname="x_offset" type="int"/> <field name="XOffset" cname="x_offset" type="int"/>
<field cname="y_offset" type="int"/> <field name="YOffset" cname="y_offset" type="int"/>
<field cname="delay_time" type="int"/> <field name="DelayTime" cname="delay_time" type="int"/>
<field cname="elapsed" type="int"/> <field name="Elapsed" cname="elapsed" type="int"/>
<field cname="action" type="GdkPixbufFrameAction"/> <field name="Action" cname="action" type="GdkPixbufFrameAction"/>
<field cname="need_recomposite" type="gboolean"/> <field name="NeedRecomposite" cname="need_recomposite" type="gboolean"/>
<field cname="bg_transparent" type="gboolean"/> <field name="BgTransparent" cname="bg_transparent" type="gboolean"/>
<field cname="composited" type="GdkPixbuf*"/> <field name="Composited" cname="composited" type="GdkPixbuf*"/>
<field cname="revert" type="GdkPixbuf*"/> <field name="Revert" cname="revert" type="GdkPixbuf*"/>
</struct> </struct>
<struct name="Pixdata" cname="GdkPixdata"> <struct name="Pixdata" cname="GdkPixdata">
<field cname="magic" type="guint32"/> <field name="Magic" cname="magic" type="guint32"/>
<field cname="length" type="gint32"/> <field name="Length" cname="length" type="gint32"/>
<field cname="pixdata_type" type="guint32"/> <field name="PixdataType" cname="pixdata_type" type="guint32"/>
<field cname="rowstride" type="guint32"/> <field name="Rowstride" cname="rowstride" type="guint32"/>
<field cname="width" type="guint32"/> <field name="Width" cname="width" type="guint32"/>
<field cname="height" type="guint32"/> <field name="Height" cname="height" type="guint32"/>
<field cname="pixel_data" type="guint8*"/> <field name="PixelData" cname="pixel_data" type="guint8*"/>
<method name="Deserialize" cname="gdk_pixdata_deserialize"> <method name="Deserialize" cname="gdk_pixdata_deserialize">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>

View File

@ -129,15 +129,7 @@ namespace GtkSharp.Generation {
public string StudlyName { public string StudlyName {
get { get {
string name = Name; return elem.GetAttribute ("name");
string[] segs = name.Split('_');
string studly = "";
foreach (string s in segs) {
if (s.Trim () == "")
continue;
studly += (s.Substring(0,1).ToUpper() + s.Substring(1));
}
return studly;
} }
} }
@ -160,7 +152,7 @@ namespace GtkSharp.Generation {
string wrapped = table.GetCSType (CType); string wrapped = table.GetCSType (CType);
string wrapped_name = SymbolTable.Table.MangleName (elem.GetAttribute ("cname")); string wrapped_name = SymbolTable.Table.MangleName (elem.GetAttribute ("cname"));
if (IsArray) { if (IsArray) {
sw.WriteLine ("\t\tpublic {0} {1};", CSType, StudlyName); sw.WriteLine ("\t\t{0} {1} {2};", Access, CSType, StudlyName);
} else if (IsPadding) { } else if (IsPadding) {
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name); sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
} else if (IsBit) { } else if (IsBit) {
@ -169,34 +161,29 @@ namespace GtkSharp.Generation {
} else if (table.IsCallback (CType)) { } else if (table.IsCallback (CType)) {
// FIXME // FIXME
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name); sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
} else if (table.IsObject (CType)) { } else if (table.IsObject (CType) || table.IsOpaque (CType)) {
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name); sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
sw.WriteLine ();
sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
sw.WriteLine ("\t\t\tget { ");
sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(CType, Name) + ";");
sw.WriteLine ("\t\t\t\treturn ret;");
sw.WriteLine ("\t\t\t}");
sw.WriteLine ("\t\t\tset { " + Name + " = " + table.CallByName (CType, "value") + "; }");
sw.WriteLine ("\t\t}");
} else if (table.IsOpaque (CType)) {
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
sw.WriteLine ();
sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
sw.WriteLine ("\t\t\tget { ");
sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(CType, Name) + ";");
sw.WriteLine ("\t\t\t\tif (ret == null) ret = new " + wrapped + "(" + Name + ");");
sw.WriteLine ("\t\t\t\treturn ret;");
sw.WriteLine ("\t\t\t}");
sw.WriteLine ("\t\t\tset { " + Name + " = " + table.CallByName (CType, "value") + "; }"); if (Access != "private") {
sw.WriteLine ("\t\t}"); sw.WriteLine ("\t\t" + Access + " " + wrapped + " " + wrapped_name + " {");
sw.WriteLine ("\t\t\tget { ");
sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(CType, Name) + ";");
if (table.IsOpaque (CType))
sw.WriteLine ("\t\t\t\tif (ret == null) ret = new " + wrapped + "(" + Name + ");");
sw.WriteLine ("\t\t\t\treturn ret;");
sw.WriteLine ("\t\t\t}");
sw.WriteLine ("\t\t\tset { " + Name + " = " + table.CallByName (CType, "value") + "; }");
sw.WriteLine ("\t\t}");
}
} else if (IsPointer && (table.IsStruct (CType) || table.IsBoxed (CType))) { } else if (IsPointer && (table.IsStruct (CType) || table.IsBoxed (CType))) {
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name); sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {"); if (Access != "private") {
sw.WriteLine ("\t\t\tget { return " + table.FromNativeReturn (CType, Name) + "; }"); sw.WriteLine ("\t\t" + Access + " " + wrapped + " " + wrapped_name + " {");
sw.WriteLine ("\t\t}"); sw.WriteLine ("\t\t\tget { return " + table.FromNativeReturn (CType, Name) + "; }");
sw.WriteLine ("\t\t}");
}
} else if (IsPointer && CSType != "string") { } else if (IsPointer && CSType != "string") {
// FIXME: probably some fields here which should be visible. // FIXME: probably some fields here which should be visible.
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name); sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);

View File

@ -66,8 +66,8 @@
</parameters> </parameters>
</callback> </callback>
<object name="XML" cname="GladeXML" parent="GObject"> <object name="XML" cname="GladeXML" parent="GObject">
<field cname="filename" type="char*"/> <field name="Filename" cname="filename" type="char*"/>
<field cname="priv" type="GladeXMLPrivate*"/> <field name="Priv" cname="priv" type="GladeXMLPrivate*"/>
<virtual_method name="LookupType" cname="lookup_type"> <virtual_method name="LookupType" cname="lookup_type">
<return-type type="GType"/> <return-type type="GType"/>
<parameters> <parameters>
@ -208,31 +208,31 @@
</method> </method>
</object> </object>
<struct name="AccelInfo" cname="GladeAccelInfo"> <struct name="AccelInfo" cname="GladeAccelInfo">
<field cname="key" type="guint"/> <field name="Key" cname="key" type="guint"/>
<field cname="modifiers" type="GdkModifierType"/> <field name="Modifiers" cname="modifiers" type="GdkModifierType"/>
<field cname="signal" type="gchar*"/> <field name="Signal" cname="signal" type="gchar*"/>
</struct> </struct>
<struct name="AtkActionInfo" cname="GladeAtkActionInfo"> <struct name="AtkActionInfo" cname="GladeAtkActionInfo">
<field cname="action_name" type="gchar*"/> <field name="ActionName" cname="action_name" type="gchar*"/>
<field cname="description" type="gchar*"/> <field name="Description" cname="description" type="gchar*"/>
</struct> </struct>
<struct name="AtkRelationInfo" cname="GladeAtkRelationInfo"> <struct name="AtkRelationInfo" cname="GladeAtkRelationInfo">
<field cname="target" type="gchar*"/> <field name="Target" cname="target" type="gchar*"/>
<field cname="type" type="gchar*"/> <field name="Type" cname="type" type="gchar*"/>
</struct> </struct>
<struct name="ChildInfo" cname="GladeChildInfo"> <struct name="ChildInfo" cname="GladeChildInfo">
<field cname="properties" type="GladeProperty*"/> <field name="Properties" cname="properties" type="GladeProperty*"/>
<field cname="n_properties" type="guint"/> <field name="NProperties" cname="n_properties" type="guint"/>
<field cname="child" type="GladeWidgetInfo*"/> <field name="Child" cname="child" type="GladeWidgetInfo*"/>
<field cname="internal_child" type="gchar*"/> <field name="InternalChild" cname="internal_child" type="gchar*"/>
</struct> </struct>
<struct name="Interface" cname="GladeInterface"> <struct name="Interface" cname="GladeInterface">
<field cname="requires" type="gchar**"/> <field name="Requires" cname="requires" type="gchar**"/>
<field cname="n_requires" type="guint"/> <field name="NRequires" cname="n_requires" type="guint"/>
<field cname="toplevels" type="GladeWidgetInfo**"/> <field name="Toplevels" cname="toplevels" type="GladeWidgetInfo**"/>
<field cname="n_toplevels" type="guint"/> <field name="NToplevels" cname="n_toplevels" type="guint"/>
<field cname="names" type="GHashTable*"/> <field name="Names" cname="names" type="GHashTable*"/>
<field cname="strings" type="GHashTable*"/> <field name="Strings" cname="strings" type="GHashTable*"/>
<method name="Destroy" cname="glade_interface_destroy"> <method name="Destroy" cname="glade_interface_destroy">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -244,33 +244,33 @@
</method> </method>
</struct> </struct>
<struct name="Property" cname="GladeProperty"> <struct name="Property" cname="GladeProperty">
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="value" type="gchar*"/> <field name="Value" cname="value" type="gchar*"/>
</struct> </struct>
<struct name="SignalInfo" cname="GladeSignalInfo"> <struct name="SignalInfo" cname="GladeSignalInfo">
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="handler" type="gchar*"/> <field name="Handler" cname="handler" type="gchar*"/>
<field cname="object" type="gchar*"/> <field name="Object" cname="object" type="gchar*"/>
<field cname="after" bits="1" type="guint"/> <field name="After" cname="after" bits="1" type="guint"/>
</struct> </struct>
<struct name="WidgetInfo" cname="GladeWidgetInfo"> <struct name="WidgetInfo" cname="GladeWidgetInfo">
<field cname="parent" type="GladeWidgetInfo*"/> <field name="Parent" cname="parent" type="GladeWidgetInfo*"/>
<field cname="classname" type="gchar*"/> <field name="Classname" cname="classname" type="gchar*"/>
<field cname="name" type="gchar*"/> <field name="Name" cname="name" type="gchar*"/>
<field cname="properties" type="GladeProperty*"/> <field name="Properties" cname="properties" type="GladeProperty*"/>
<field cname="n_properties" type="guint"/> <field name="NProperties" cname="n_properties" type="guint"/>
<field cname="atk_props" type="GladeProperty*"/> <field name="AtkProps" cname="atk_props" type="GladeProperty*"/>
<field cname="n_atk_props" type="guint"/> <field name="NAtkProps" cname="n_atk_props" type="guint"/>
<field cname="signals" type="GladeSignalInfo*"/> <field name="Signals" cname="signals" type="GladeSignalInfo*"/>
<field cname="n_signals" type="guint"/> <field name="NSignals" cname="n_signals" type="guint"/>
<field cname="atk_actions" type="GladeAtkActionInfo*"/> <field name="AtkActions" cname="atk_actions" type="GladeAtkActionInfo*"/>
<field cname="n_atk_actions" type="guint"/> <field name="NAtkActions" cname="n_atk_actions" type="guint"/>
<field cname="relations" type="GladeAtkRelationInfo*"/> <field name="Relations" cname="relations" type="GladeAtkRelationInfo*"/>
<field cname="n_relations" type="guint"/> <field name="NRelations" cname="n_relations" type="guint"/>
<field cname="accels" type="GladeAccelInfo*"/> <field name="Accels" cname="accels" type="GladeAccelInfo*"/>
<field cname="n_accels" type="guint"/> <field name="NAccels" cname="n_accels" type="guint"/>
<field cname="children" type="GladeChildInfo*"/> <field name="Children" cname="children" type="GladeChildInfo*"/>
<field cname="n_children" type="guint"/> <field name="NChildren" cname="n_children" type="guint"/>
</struct> </struct>
<class name="Global" cname="GladeGlobal"> <class name="Global" cname="GladeGlobal">
<method name="EnumFromString" cname="glade_enum_from_string" shared="true"> <method name="EnumFromString" cname="glade_enum_from_string" shared="true">

File diff suppressed because it is too large Load Diff

View File

@ -26,7 +26,7 @@
</parameters> </parameters>
</callback> </callback>
<object name="Browser" cname="GnomeDbBrowser" parent="GtkVBox"> <object name="Browser" cname="GnomeDbBrowser" parent="GtkVBox">
<field cname="priv" type="GnomeDbBrowserPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbBrowserPrivate*"/>
<property name="Connection" cname="connection" type="GdaConnection" readable="true" writeable="true"/> <property name="Connection" cname="connection" type="GdaConnection" readable="true" writeable="true"/>
<signal name="ProgressMessage" cname="progress_message" when="LAST"> <signal name="ProgressMessage" cname="progress_message" when="LAST">
<return-type type="void"/> <return-type type="void"/>
@ -53,7 +53,7 @@
</method> </method>
</object> </object>
<object name="Combo" cname="GnomeDbCombo" parent="GtkCombo"> <object name="Combo" cname="GnomeDbCombo" parent="GtkCombo">
<field cname="priv" type="GnomeDbComboPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbComboPrivate*"/>
<property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/> <property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/>
<method name="GetType" cname="gnome_db_combo_get_type" shared="true"> <method name="GetType" cname="gnome_db_combo_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
@ -68,7 +68,7 @@
</method> </method>
</object> </object>
<object name="ConnectionProperties" cname="GnomeDbConnectionProperties" parent="GtkVBox"> <object name="ConnectionProperties" cname="GnomeDbConnectionProperties" parent="GtkVBox">
<field cname="priv" type="GnomeDbConnectionPropertiesPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbConnectionPropertiesPrivate*"/>
<method name="GetConnection" cname="gnome_db_connection_properties_get_connection"> <method name="GetConnection" cname="gnome_db_connection_properties_get_connection">
<return-type type="GdaConnection*"/> <return-type type="GdaConnection*"/>
</method> </method>
@ -88,14 +88,14 @@
</method> </method>
</object> </object>
<object name="ConnectionSelector" cname="GnomeDbConnectionSelector" parent="GtkOptionMenu"> <object name="ConnectionSelector" cname="GnomeDbConnectionSelector" parent="GtkOptionMenu">
<field cname="priv" type="GnomeDbConnectionSelectorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbConnectionSelectorPrivate*"/>
<method name="GetType" cname="gnome_db_connection_selector_get_type" shared="true"> <method name="GetType" cname="gnome_db_connection_selector_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gnome_db_connection_selector_new"/> <constructor cname="gnome_db_connection_selector_new"/>
</object> </object>
<object name="Control" cname="GnomeDbControl" parent="BonoboControl"> <object name="Control" cname="GnomeDbControl" parent="BonoboControl">
<field cname="priv" type="GnomeDbControlPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbControlPrivate*"/>
<signal name="Activated" cname="activated" when="LAST"> <signal name="Activated" cname="activated" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -155,7 +155,7 @@
</method> </method>
</object> </object>
<object name="ControlWidget" cname="GnomeDbControlWidget" parent="GtkVBox"> <object name="ControlWidget" cname="GnomeDbControlWidget" parent="GtkVBox">
<field cname="priv" type="GnomeDbControlWidgetPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbControlWidgetPrivate*"/>
<method name="Activate" cname="gnome_db_control_widget_activate"> <method name="Activate" cname="gnome_db_control_widget_activate">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -198,7 +198,7 @@
</constructor> </constructor>
</object> </object>
<object name="DataSourceSelector" cname="GnomeDbDataSourceSelector" parent="GtkOptionMenu"> <object name="DataSourceSelector" cname="GnomeDbDataSourceSelector" parent="GtkOptionMenu">
<field cname="priv" type="GnomeDbDataSourceSelectorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbDataSourceSelectorPrivate*"/>
<method name="GetType" cname="gnome_db_data_source_selector_get_type" shared="true"> <method name="GetType" cname="gnome_db_data_source_selector_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -209,7 +209,7 @@
</constructor> </constructor>
</object> </object>
<object name="DsnConfig" cname="GnomeDbDsnConfig" parent="GtkVBox"> <object name="DsnConfig" cname="GnomeDbDsnConfig" parent="GtkVBox">
<field cname="priv" type="GnomeDbDsnConfigPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbDsnConfigPrivate*"/>
<signal name="Changed" cname="changed" when="LAST"> <signal name="Changed" cname="changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -231,7 +231,7 @@
</method> </method>
</object> </object>
<object name="DsnConfigDruid" cname="GnomeDbDsnConfigDruid" parent="GnomeDruid"> <object name="DsnConfigDruid" cname="GnomeDbDsnConfigDruid" parent="GnomeDruid">
<field cname="priv" type="GnomeDbDsnConfigDruidPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbDsnConfigDruidPrivate*"/>
<signal name="Finished" cname="finished" when="LAST"> <signal name="Finished" cname="finished" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -248,7 +248,7 @@
<constructor cname="gnome_db_dsn_config_druid_new"/> <constructor cname="gnome_db_dsn_config_druid_new"/>
</object> </object>
<object name="Editor" cname="GnomeDbEditor" parent="GtkVBox"> <object name="Editor" cname="GnomeDbEditor" parent="GtkVBox">
<field cname="priv" type="GnomeDbEditorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbEditorPrivate*"/>
<method name="CopyClipboard" cname="gnome_db_editor_copy_clipboard"> <method name="CopyClipboard" cname="gnome_db_editor_copy_clipboard">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -304,7 +304,7 @@
</method> </method>
</object> </object>
<object name="Error" cname="GnomeDbError" parent="GtkVBox"> <object name="Error" cname="GnomeDbError" parent="GtkVBox">
<field cname="priv" type="GnomeDbErrorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbErrorPrivate*"/>
<method name="Clear" cname="gnome_db_error_clear"> <method name="Clear" cname="gnome_db_error_clear">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -329,7 +329,7 @@
</method> </method>
</object> </object>
<object name="ErrorDialog" cname="GnomeDbErrorDialog" parent="GtkDialog"> <object name="ErrorDialog" cname="GnomeDbErrorDialog" parent="GtkDialog">
<field cname="priv" type="GnomeDbErrorDialogPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbErrorDialogPrivate*"/>
<property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/> <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
<method name="GetTitle" cname="gnome_db_error_dialog_get_title"> <method name="GetTitle" cname="gnome_db_error_dialog_get_title">
<return-type type="const-gchar*"/> <return-type type="const-gchar*"/>
@ -356,7 +356,7 @@
</method> </method>
</object> </object>
<object name="Form" cname="GnomeDbForm" parent="GtkVBox"> <object name="Form" cname="GnomeDbForm" parent="GtkVBox">
<field cname="priv" type="GnomeDbFormPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbFormPrivate*"/>
<signal name="ModelChanged" cname="model_changed" when="LAST"> <signal name="ModelChanged" cname="model_changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -396,7 +396,7 @@
</method> </method>
</object> </object>
<object name="GrayBar" cname="GnomeDbGrayBar" parent="GtkBin"> <object name="GrayBar" cname="GnomeDbGrayBar" parent="GtkBin">
<field cname="priv" type="GnomeDbGrayBarPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbGrayBarPrivate*"/>
<property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/> <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
<property name="ShowIcon" cname="show_icon" type="gchar*" readable="true" writeable="true"/> <property name="ShowIcon" cname="show_icon" type="gchar*" readable="true" writeable="true"/>
<method name="GetShowIcon" cname="gnome_db_gray_bar_get_show_icon"> <method name="GetShowIcon" cname="gnome_db_gray_bar_get_show_icon">
@ -440,7 +440,7 @@
</method> </method>
</object> </object>
<object name="Grid" cname="GnomeDbGrid" parent="GtkVBox"> <object name="Grid" cname="GnomeDbGrid" parent="GtkVBox">
<field cname="priv" type="GnomeDbGridPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbGridPrivate*"/>
<property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/> <property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/>
<signal name="RowSelected" cname="row_selected" when="LAST"> <signal name="RowSelected" cname="row_selected" when="LAST">
<return-type type="void"/> <return-type type="void"/>
@ -579,7 +579,7 @@
</method> </method>
</object> </object>
<object name="IconList" cname="GnomeDbIconList" parent="GnomeIconList"> <object name="IconList" cname="GnomeDbIconList" parent="GnomeIconList">
<field cname="priv" type="GnomeDbIconListPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbIconListPrivate*"/>
<property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/> <property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/>
<method name="GetType" cname="gnome_db_icon_list_get_type" shared="true"> <method name="GetType" cname="gnome_db_icon_list_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
@ -597,7 +597,7 @@
</method> </method>
</object> </object>
<object name="List" cname="GnomeDbList" parent="GtkVBox"> <object name="List" cname="GnomeDbList" parent="GtkVBox">
<field cname="priv" type="GnomeDbListPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbListPrivate*"/>
<property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/> <property name="Model" cname="model" type="GdaDataModel" readable="true" writeable="true"/>
<signal name="RowSelected" cname="row_selected" when="LAST"> <signal name="RowSelected" cname="row_selected" when="LAST">
<return-type type="void"/> <return-type type="void"/>
@ -634,7 +634,7 @@
</method> </method>
</object> </object>
<object name="Login" cname="GnomeDbLogin" parent="GtkVBox"> <object name="Login" cname="GnomeDbLogin" parent="GtkVBox">
<field cname="priv" type="GnomeDbLoginPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbLoginPrivate*"/>
<property name="Dsn" cname="dsn" type="gchar*" readable="true"/> <property name="Dsn" cname="dsn" type="gchar*" readable="true"/>
<property name="Username" cname="username" type="gchar*" readable="true"/> <property name="Username" cname="username" type="gchar*" readable="true"/>
<property name="Password" cname="password" type="gchar*" readable="true"/> <property name="Password" cname="password" type="gchar*" readable="true"/>
@ -681,7 +681,7 @@
</method> </method>
</object> </object>
<object name="LoginDialog" cname="GnomeDbLoginDialog" parent="GtkDialog"> <object name="LoginDialog" cname="GnomeDbLoginDialog" parent="GtkDialog">
<field cname="priv" type="GnomeDbLoginDialogPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbLoginDialogPrivate*"/>
<property name="Dsn" cname="dsn" type="gchar*" readable="true"/> <property name="Dsn" cname="dsn" type="gchar*" readable="true"/>
<property name="Username" cname="username" type="gchar*" readable="true"/> <property name="Username" cname="username" type="gchar*" readable="true"/>
<property name="Password" cname="password" type="gchar*" readable="true"/> <property name="Password" cname="password" type="gchar*" readable="true"/>
@ -710,14 +710,14 @@
</method> </method>
</object> </object>
<object name="ProviderSelector" cname="GnomeDbProviderSelector" parent="GtkOptionMenu"> <object name="ProviderSelector" cname="GnomeDbProviderSelector" parent="GtkOptionMenu">
<field cname="priv" type="GnomeDbProviderSelectorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbProviderSelectorPrivate*"/>
<method name="GetType" cname="gnome_db_provider_selector_get_type" shared="true"> <method name="GetType" cname="gnome_db_provider_selector_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gnome_db_provider_selector_new"/> <constructor cname="gnome_db_provider_selector_new"/>
</object> </object>
<object name="QueryBuilder" cname="GnomeDbQueryBuilder" parent="GtkVBox"> <object name="QueryBuilder" cname="GnomeDbQueryBuilder" parent="GtkVBox">
<field cname="priv" type="GnomeDbQueryBuilderPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbQueryBuilderPrivate*"/>
<method name="GetConnection" cname="gnome_db_query_builder_get_connection"> <method name="GetConnection" cname="gnome_db_query_builder_get_connection">
<return-type type="GdaConnection*"/> <return-type type="GdaConnection*"/>
</method> </method>
@ -737,21 +737,21 @@
</method> </method>
</object> </object>
<object name="ReportEditor" cname="GnomeDbReportEditor" parent="GtkVBox"> <object name="ReportEditor" cname="GnomeDbReportEditor" parent="GtkVBox">
<field cname="priv" type="GnomeDbReportEditorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbReportEditorPrivate*"/>
<method name="GetType" cname="gnome_db_report_editor_get_type" shared="true"> <method name="GetType" cname="gnome_db_report_editor_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gnome_db_report_editor_new"/> <constructor cname="gnome_db_report_editor_new"/>
</object> </object>
<object name="TableEditor" cname="GnomeDbTableEditor" parent="GtkVBox"> <object name="TableEditor" cname="GnomeDbTableEditor" parent="GtkVBox">
<field cname="priv" type="GnomeDbTableEditorPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbTableEditorPrivate*"/>
<method name="GetType" cname="gnome_db_table_editor_get_type" shared="true"> <method name="GetType" cname="gnome_db_table_editor_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<constructor cname="gnome_db_table_editor_new"/> <constructor cname="gnome_db_table_editor_new"/>
</object> </object>
<object name="Window" cname="GnomeDbWindow" parent="BonoboWindow"> <object name="Window" cname="GnomeDbWindow" parent="BonoboWindow">
<field cname="priv" type="GnomeDbWindowPrivate*"/> <field name="Priv" cname="priv" type="GnomeDbWindowPrivate*"/>
<property name="Contents" cname="contents" type="GtkWidget" readable="true" writeable="true"/> <property name="Contents" cname="contents" type="GtkWidget" readable="true" writeable="true"/>
<property name="Status" cname="status" type="gchar*" writeable="true"/> <property name="Status" cname="status" type="gchar*" writeable="true"/>
<signal name="Close" cname="close" when="LAST"> <signal name="Close" cname="close" when="LAST">
@ -801,8 +801,8 @@
</method> </method>
</object> </object>
<object name="SqlViewer" cname="SqlViewer" parent="GtkVBox"> <object name="SqlViewer" cname="SqlViewer" parent="GtkVBox">
<field cname="sql_editor" type="GtkWidget*"/> <field name="SqlEditor" cname="sql_editor" type="GtkWidget*"/>
<field cname="grid" type="GtkWidget*"/> <field name="Grid" cname="grid" type="GtkWidget*"/>
<method name="GetType" cname="sql_viewer_get_type" shared="true"> <method name="GetType" cname="sql_viewer_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -814,18 +814,18 @@
</constructor> </constructor>
</object> </object>
<struct name="ComponentInfo" cname="GnomeDbComponentInfo"> <struct name="ComponentInfo" cname="GnomeDbComponentInfo">
<field cname="id" type="gchar*"/> <field name="Id" cname="id" type="gchar*"/>
<field cname="location" type="gchar*"/> <field name="Location" cname="location" type="gchar*"/>
<field cname="type" type="GnomeDbComponentType"/> <field name="Type" cname="type" type="GnomeDbComponentType"/>
<field cname="description" type="gchar*"/> <field name="Description" cname="description" type="gchar*"/>
<field cname="repo_ids" type="GList*"/> <field name="RepoIds" cname="repo_ids" type="GList*"/>
<field cname="username" type="gchar*"/> <field name="Username" cname="username" type="gchar*"/>
<field cname="hostname" type="gchar*"/> <field name="Hostname" cname="hostname" type="gchar*"/>
<field cname="domain" type="gchar*"/> <field name="Domain" cname="domain" type="gchar*"/>
<field cname="properties" type="GdaParameterList*"/> <field name="Properties" cname="properties" type="GdaParameterList*"/>
</struct> </struct>
<struct name="EditorClass" cname="GnomeDbEditorClass"> <struct name="EditorClass" cname="GnomeDbEditorClass">
<field cname="parent_class" type="GtkVBoxClass"/> <field name="ParentClass" cname="parent_class" type="GtkVBoxClass"/>
<callback cname="text_changed"> <callback cname="text_changed">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>

View File

@ -301,21 +301,21 @@
<member cname="XDG_GLOB_FULL" name="Full"/> <member cname="XDG_GLOB_FULL" name="Full"/>
</enum> </enum>
<object name="GnomeVFSClient" cname="GnomeVFSClient" parent="BonoboObject"> <object name="GnomeVFSClient" cname="GnomeVFSClient" parent="BonoboObject">
<field cname="priv" type="GnomeVFSClientPrivate*"/> <field name="Priv" cname="priv" type="GnomeVFSClientPrivate*"/>
<method name="GetType" cname="gnome_vfs_client_get_type" shared="true"> <method name="GetType" cname="gnome_vfs_client_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
</object> </object>
<object name="GnomeVFSClientCall" cname="GnomeVFSClientCall" parent="BonoboObject"> <object name="GnomeVFSClientCall" cname="GnomeVFSClientCall" parent="BonoboObject">
<field cname="delay_finish_mutex" type="GMutex*"/> <field name="DelayFinishMutex" cname="delay_finish_mutex" type="GMutex*"/>
<field cname="delay_finish_cond" type="GCond*"/> <field name="DelayFinishCond" cname="delay_finish_cond" type="GCond*"/>
<field cname="delay_finish" type="gboolean"/> <field name="DelayFinish" cname="delay_finish" type="gboolean"/>
<method name="GetType" cname="gnome_vfs_client_call_get_type" shared="true"> <method name="GetType" cname="gnome_vfs_client_call_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
</object> </object>
<object name="GnomeVFSMIMEMonitor" cname="GnomeVFSMIMEMonitor" parent="GObject"> <object name="GnomeVFSMIMEMonitor" cname="GnomeVFSMIMEMonitor" parent="GObject">
<field cname="priv" type="GnomeVFSMIMEMonitorPrivate*"/> <field name="Priv" cname="priv" type="GnomeVFSMIMEMonitorPrivate*"/>
<signal name="DataChanged" cname="data_changed" when="LAST"> <signal name="DataChanged" cname="data_changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -330,7 +330,7 @@
</method> </method>
</object> </object>
<object name="GnomeVFSDrive" cname="GnomeVFSDrive" parent="GObject"> <object name="GnomeVFSDrive" cname="GnomeVFSDrive" parent="GObject">
<field cname="priv" type="GnomeVFSDrivePrivate*"/> <field name="Priv" cname="priv" type="GnomeVFSDrivePrivate*"/>
<signal name="VolumeMounted" cname="volume_mounted" when="FIRST"> <signal name="VolumeMounted" cname="volume_mounted" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -420,7 +420,7 @@
</method> </method>
</object> </object>
<object name="GnomeVFSVolume" cname="GnomeVFSVolume" parent="GObject"> <object name="GnomeVFSVolume" cname="GnomeVFSVolume" parent="GObject">
<field cname="priv" type="GnomeVFSVolumePrivate*"/> <field name="Priv" cname="priv" type="GnomeVFSVolumePrivate*"/>
<method name="Compare" cname="gnome_vfs_volume_compare"> <method name="Compare" cname="gnome_vfs_volume_compare">
<return-type type="gint"/> <return-type type="gint"/>
<parameters> <parameters>
@ -491,7 +491,7 @@
</method> </method>
</object> </object>
<object name="GnomeVFSVolumeMonitor" cname="GnomeVFSVolumeMonitor" parent="GObject"> <object name="GnomeVFSVolumeMonitor" cname="GnomeVFSVolumeMonitor" parent="GObject">
<field cname="priv" type="GnomeVFSVolumeMonitorPrivate*"/> <field name="Priv" cname="priv" type="GnomeVFSVolumeMonitorPrivate*"/>
<signal name="VolumeMounted" cname="volume_mounted" when="FIRST"> <signal name="VolumeMounted" cname="volume_mounted" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -567,11 +567,11 @@
</method> </method>
</object> </object>
<object name="GnomeVFSVolumeMonitorDaemon" cname="GnomeVFSVolumeMonitorDaemon" parent="GnomeVFSVolumeMonitor"> <object name="GnomeVFSVolumeMonitorDaemon" cname="GnomeVFSVolumeMonitorDaemon" parent="GnomeVFSVolumeMonitor">
<field cname="last_fstab" type="GList*"/> <field name="LastFstab" cname="last_fstab" type="GList*"/>
<field cname="last_mtab" type="GList*"/> <field name="LastMtab" cname="last_mtab" type="GList*"/>
<field cname="last_connected_servers" type="GList*"/> <field name="LastConnectedServers" cname="last_connected_servers" type="GList*"/>
<field cname="gconf_client" type="GConfClient*"/> <field name="GconfClient" cname="gconf_client" type="GConfClient*"/>
<field cname="connected_id" type="guint"/> <field name="ConnectedId" cname="connected_id" type="guint"/>
<method name="ForceProbe" cname="gnome_vfs_volume_monitor_daemon_force_probe"> <method name="ForceProbe" cname="gnome_vfs_volume_monitor_daemon_force_probe">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -620,30 +620,30 @@
</struct> </struct>
<struct name="GnomeVFSDirectoryHandle" cname="GnomeVFSDirectoryHandle" opaque="true"/> <struct name="GnomeVFSDirectoryHandle" cname="GnomeVFSDirectoryHandle" opaque="true"/>
<struct name="GnomeVFSFileInfo" cname="GnomeVFSFileInfo"> <struct name="GnomeVFSFileInfo" cname="GnomeVFSFileInfo">
<field cname="name" type="char*"/> <field name="Name" cname="name" type="char*"/>
<field cname="valid_fields" type="GnomeVFSFileInfoFields"/> <field name="ValidFields" cname="valid_fields" type="GnomeVFSFileInfoFields"/>
<field cname="type" type="GnomeVFSFileType"/> <field name="Type" cname="type" type="GnomeVFSFileType"/>
<field cname="permissions" type="GnomeVFSFilePermissions"/> <field name="Permissions" cname="permissions" type="GnomeVFSFilePermissions"/>
<field cname="flags" type="GnomeVFSFileFlags"/> <field name="Flags" cname="flags" type="GnomeVFSFileFlags"/>
<field cname="device" type="dev_t"/> <field name="Device" cname="device" type="dev_t"/>
<field cname="inode" type="GnomeVFSInodeNumber"/> <field name="Inode" cname="inode" type="GnomeVFSInodeNumber"/>
<field cname="link_count" type="guint"/> <field name="LinkCount" cname="link_count" type="guint"/>
<field cname="uid" type="guint"/> <field name="Uid" cname="uid" type="guint"/>
<field cname="gid" type="guint"/> <field name="Gid" cname="gid" type="guint"/>
<field cname="size" type="GnomeVFSFileSize"/> <field name="Size" cname="size" type="GnomeVFSFileSize"/>
<field cname="block_count" type="GnomeVFSFileSize"/> <field name="BlockCount" cname="block_count" type="GnomeVFSFileSize"/>
<field cname="io_block_size" type="guint"/> <field name="IoBlockSize" cname="io_block_size" type="guint"/>
<field cname="atime" type="time_t"/> <field name="Atime" cname="atime" type="time_t"/>
<field cname="mtime" type="time_t"/> <field name="Mtime" cname="mtime" type="time_t"/>
<field cname="ctime" type="time_t"/> <field name="Ctime" cname="ctime" type="time_t"/>
<field cname="symlink_name" type="char*"/> <field name="SymlinkName" cname="symlink_name" type="char*"/>
<field cname="mime_type" type="char*"/> <field name="MimeType" cname="mime_type" type="char*"/>
<field cname="refcount" type="guint"/> <field name="Refcount" cname="refcount" type="guint"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
<field cname="reserved3" type="void*"/> <field name="Reserved3" cname="reserved3" type="void*"/>
<field cname="reserved4" type="void*"/> <field name="Reserved4" cname="reserved4" type="void*"/>
<field cname="reserved5" type="void*"/> <field name="Reserved5" cname="reserved5" type="void*"/>
<method name="Clear" cname="gnome_vfs_file_info_clear"> <method name="Clear" cname="gnome_vfs_file_info_clear">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -698,15 +698,15 @@
</method> </method>
</struct> </struct>
<struct name="GnomeVFSFindDirectoryResult" cname="GnomeVFSFindDirectoryResult"> <struct name="GnomeVFSFindDirectoryResult" cname="GnomeVFSFindDirectoryResult">
<field cname="uri" type="GnomeVFSURI*"/> <field name="Uri" cname="uri" type="GnomeVFSURI*"/>
<field cname="result" type="GnomeVFSResult"/> <field name="Result" cname="result" type="GnomeVFSResult"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSGetFileInfoResult" cname="GnomeVFSGetFileInfoResult"> <struct name="GnomeVFSGetFileInfoResult" cname="GnomeVFSGetFileInfoResult">
<field cname="uri" type="GnomeVFSURI*"/> <field name="Uri" cname="uri" type="GnomeVFSURI*"/>
<field cname="result" type="GnomeVFSResult"/> <field name="Result" cname="result" type="GnomeVFSResult"/>
<field cname="file_info" type="GnomeVFSFileInfo*"/> <field name="FileInfo" cname="file_info" type="GnomeVFSFileInfo*"/>
</struct> </struct>
<struct name="GnomeVFSHandle" cname="GnomeVFSHandle" opaque="true"/> <struct name="GnomeVFSHandle" cname="GnomeVFSHandle" opaque="true"/>
<struct name="GnomeVFSInetConnection" cname="GnomeVFSInetConnection" opaque="true"> <struct name="GnomeVFSInetConnection" cname="GnomeVFSInetConnection" opaque="true">
@ -742,33 +742,33 @@
</struct> </struct>
<alias name="GnomeVFSInodeNumber" cname="GnomeVFSInodeNumber" type="GnomeVFSFileSize"/> <alias name="GnomeVFSInodeNumber" cname="GnomeVFSInodeNumber" type="GnomeVFSFileSize"/>
<struct name="GnomeVFSMethod" cname="GnomeVFSMethod"> <struct name="GnomeVFSMethod" cname="GnomeVFSMethod">
<field cname="method_table_size" type="gsize"/> <field name="MethodTableSize" cname="method_table_size" type="gsize"/>
<field cname="open" type="GnomeVFSMethodOpenFunc"/> <field name="Open" cname="open" type="GnomeVFSMethodOpenFunc"/>
<field cname="create" type="GnomeVFSMethodCreateFunc"/> <field name="Create" cname="create" type="GnomeVFSMethodCreateFunc"/>
<field cname="close" type="GnomeVFSMethodCloseFunc"/> <field name="Close" cname="close" type="GnomeVFSMethodCloseFunc"/>
<field cname="read" type="GnomeVFSMethodReadFunc"/> <field name="Read" cname="read" type="GnomeVFSMethodReadFunc"/>
<field cname="write" type="GnomeVFSMethodWriteFunc"/> <field name="Write" cname="write" type="GnomeVFSMethodWriteFunc"/>
<field cname="seek" type="GnomeVFSMethodSeekFunc"/> <field name="Seek" cname="seek" type="GnomeVFSMethodSeekFunc"/>
<field cname="tell" type="GnomeVFSMethodTellFunc"/> <field name="Tell" cname="tell" type="GnomeVFSMethodTellFunc"/>
<field cname="truncate_handle" type="GnomeVFSMethodTruncateHandleFunc"/> <field name="TruncateHandle" cname="truncate_handle" type="GnomeVFSMethodTruncateHandleFunc"/>
<field cname="open_directory" type="GnomeVFSMethodOpenDirectoryFunc"/> <field name="OpenDirectory" cname="open_directory" type="GnomeVFSMethodOpenDirectoryFunc"/>
<field cname="close_directory" type="GnomeVFSMethodCloseDirectoryFunc"/> <field name="CloseDirectory" cname="close_directory" type="GnomeVFSMethodCloseDirectoryFunc"/>
<field cname="read_directory" type="GnomeVFSMethodReadDirectoryFunc"/> <field name="ReadDirectory" cname="read_directory" type="GnomeVFSMethodReadDirectoryFunc"/>
<field cname="get_file_info" type="GnomeVFSMethodGetFileInfoFunc"/> <field name="GetFileInfo" cname="get_file_info" type="GnomeVFSMethodGetFileInfoFunc"/>
<field cname="get_file_info_from_handle" type="GnomeVFSMethodGetFileInfoFromHandleFunc"/> <field name="GetFileInfoFromHandle" cname="get_file_info_from_handle" type="GnomeVFSMethodGetFileInfoFromHandleFunc"/>
<field cname="is_local" type="GnomeVFSMethodIsLocalFunc"/> <field name="IsLocal" cname="is_local" type="GnomeVFSMethodIsLocalFunc"/>
<field cname="make_directory" type="GnomeVFSMethodMakeDirectoryFunc"/> <field name="MakeDirectory" cname="make_directory" type="GnomeVFSMethodMakeDirectoryFunc"/>
<field cname="remove_directory" type="GnomeVFSMethodRemoveDirectoryFunc"/> <field name="RemoveDirectory" cname="remove_directory" type="GnomeVFSMethodRemoveDirectoryFunc"/>
<field cname="move" type="GnomeVFSMethodMoveFunc"/> <field name="Move" cname="move" type="GnomeVFSMethodMoveFunc"/>
<field cname="unlink" type="GnomeVFSMethodUnlinkFunc"/> <field name="Unlink" cname="unlink" type="GnomeVFSMethodUnlinkFunc"/>
<field cname="check_same_fs" type="GnomeVFSMethodCheckSameFSFunc"/> <field name="CheckSameFs" cname="check_same_fs" type="GnomeVFSMethodCheckSameFSFunc"/>
<field cname="set_file_info" type="GnomeVFSMethodSetFileInfo"/> <field name="SetFileInfo" cname="set_file_info" type="GnomeVFSMethodSetFileInfo"/>
<field cname="truncate" type="GnomeVFSMethodTruncateFunc"/> <field name="Truncate" cname="truncate" type="GnomeVFSMethodTruncateFunc"/>
<field cname="find_directory" type="GnomeVFSMethodFindDirectoryFunc"/> <field name="FindDirectory" cname="find_directory" type="GnomeVFSMethodFindDirectoryFunc"/>
<field cname="create_symbolic_link" type="GnomeVFSMethodCreateSymbolicLinkFunc"/> <field name="CreateSymbolicLink" cname="create_symbolic_link" type="GnomeVFSMethodCreateSymbolicLinkFunc"/>
<field cname="monitor_add" type="GnomeVFSMethodMonitorAddFunc"/> <field name="MonitorAdd" cname="monitor_add" type="GnomeVFSMethodMonitorAddFunc"/>
<field cname="monitor_cancel" type="GnomeVFSMethodMonitorCancelFunc"/> <field name="MonitorCancel" cname="monitor_cancel" type="GnomeVFSMethodMonitorCancelFunc"/>
<field cname="file_control" type="GnomeVFSMethodFileControlFunc"/> <field name="FileControl" cname="file_control" type="GnomeVFSMethodFileControlFunc"/>
<method name="Get" cname="gnome_vfs_method_get" shared="true"> <method name="Get" cname="gnome_vfs_method_get" shared="true">
<return-type type="GnomeVFSMethod*"/> <return-type type="GnomeVFSMethod*"/>
<parameters> <parameters>
@ -781,12 +781,12 @@
</struct> </struct>
<alias name="GnomeVFSMethodHandle" cname="GnomeVFSMethodHandle" type="gpointer"/> <alias name="GnomeVFSMethodHandle" cname="GnomeVFSMethodHandle" type="gpointer"/>
<struct name="GnomeVFSMimeAction" cname="GnomeVFSMimeAction"> <struct name="GnomeVFSMimeAction" cname="GnomeVFSMimeAction">
<field cname="action_type" type="GnomeVFSMimeActionType"/> <field name="ActionType" cname="action_type" type="GnomeVFSMimeActionType"/>
<field cname="component" type="Bonobo_ServerInfo*"/> <field name="Component" cname="component" type="Bonobo_ServerInfo*"/>
<field cname="dummy_component" type="void*"/> <field name="DummyComponent" cname="dummy_component" type="void*"/>
<field cname="application" type="GnomeVFSMimeApplication*"/> <field name="Application" cname="application" type="GnomeVFSMimeApplication*"/>
<field cname="action" type="}"/> <field name="Action" cname="action" type="}"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<method name="Free" cname="gnome_vfs_mime_action_free"> <method name="Free" cname="gnome_vfs_mime_action_free">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -805,15 +805,15 @@
</method> </method>
</struct> </struct>
<struct name="GnomeVFSMimeApplication" cname="GnomeVFSMimeApplication"> <struct name="GnomeVFSMimeApplication" cname="GnomeVFSMimeApplication">
<field cname="id" type="char*"/> <field name="Id" cname="id" type="char*"/>
<field cname="name" type="char*"/> <field name="Name" cname="name" type="char*"/>
<field cname="command" type="char*"/> <field name="Command" cname="command" type="char*"/>
<field cname="can_open_multiple_files" type="gboolean"/> <field name="CanOpenMultipleFiles" cname="can_open_multiple_files" type="gboolean"/>
<field cname="expects_uris" type="GnomeVFSMimeApplicationArgumentType"/> <field name="ExpectsUris" cname="expects_uris" type="GnomeVFSMimeApplicationArgumentType"/>
<field cname="supported_uri_schemes" type="GList*"/> <field name="SupportedUriSchemes" cname="supported_uri_schemes" type="GList*"/>
<field cname="requires_terminal" type="gboolean"/> <field name="RequiresTerminal" cname="requires_terminal" type="gboolean"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
<method name="Copy" cname="gnome_vfs_mime_application_copy"> <method name="Copy" cname="gnome_vfs_mime_application_copy">
<return-type type="GnomeVFSMimeApplication*"/> <return-type type="GnomeVFSMimeApplication*"/>
</method> </method>
@ -857,115 +857,115 @@
</constructor> </constructor>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackAdditionalHeadersIn" cname="GnomeVFSModuleCallbackAdditionalHeadersIn"> <struct name="GnomeVFSModuleCallbackAdditionalHeadersIn" cname="GnomeVFSModuleCallbackAdditionalHeadersIn">
<field cname="uri" type="GnomeVFSURI*"/> <field name="Uri" cname="uri" type="GnomeVFSURI*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackAdditionalHeadersOut" cname="GnomeVFSModuleCallbackAdditionalHeadersOut"> <struct name="GnomeVFSModuleCallbackAdditionalHeadersOut" cname="GnomeVFSModuleCallbackAdditionalHeadersOut">
<field cname="headers" type="GList*"/> <field name="Headers" cname="headers" type="GList*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackAuthenticationIn" cname="GnomeVFSModuleCallbackAuthenticationIn"> <struct name="GnomeVFSModuleCallbackAuthenticationIn" cname="GnomeVFSModuleCallbackAuthenticationIn">
<field cname="uri" type="char*"/> <field name="Uri" cname="uri" type="char*"/>
<field cname="realm" type="char*"/> <field name="Realm" cname="realm" type="char*"/>
<field cname="previous_attempt_failed" type="gboolean"/> <field name="PreviousAttemptFailed" cname="previous_attempt_failed" type="gboolean"/>
<field cname="auth_type" type="}"/> <field name="AuthType" cname="auth_type" type="}"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackAuthenticationOut" cname="GnomeVFSModuleCallbackAuthenticationOut"> <struct name="GnomeVFSModuleCallbackAuthenticationOut" cname="GnomeVFSModuleCallbackAuthenticationOut">
<field cname="username" type="char*"/> <field name="Username" cname="username" type="char*"/>
<field cname="NULL indicates no auth should be provided" type="*"/> <field name="NULL" cname="NULL indicates no auth should be provided" type="*"/>
<field cname="password" type="char*"/> <field name="Password" cname="password" type="char*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackFillAuthenticationIn" cname="GnomeVFSModuleCallbackFillAuthenticationIn"> <struct name="GnomeVFSModuleCallbackFillAuthenticationIn" cname="GnomeVFSModuleCallbackFillAuthenticationIn">
<field cname="uri" type="char*"/> <field name="Uri" cname="uri" type="char*"/>
<field cname="protocol" type="char*"/> <field name="Protocol" cname="protocol" type="char*"/>
<field cname="server" type="char*"/> <field name="Server" cname="server" type="char*"/>
<field cname="object" type="char*"/> <field name="Object" cname="object" type="char*"/>
<field cname="port" type="int"/> <field name="Port" cname="port" type="int"/>
<field cname="authtype" type="char*"/> <field name="Authtype" cname="authtype" type="char*"/>
<field cname="username" type="char*"/> <field name="Username" cname="username" type="char*"/>
<field cname="domain" type="char*"/> <field name="Domain" cname="domain" type="char*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackFillAuthenticationOut" cname="GnomeVFSModuleCallbackFillAuthenticationOut"> <struct name="GnomeVFSModuleCallbackFillAuthenticationOut" cname="GnomeVFSModuleCallbackFillAuthenticationOut">
<field cname="valid" type="gboolean"/> <field name="Valid" cname="valid" type="gboolean"/>
<field cname="username" type="char*"/> <field name="Username" cname="username" type="char*"/>
<field cname="domain" type="char*"/> <field name="Domain" cname="domain" type="char*"/>
<field cname="password" type="char*"/> <field name="Password" cname="password" type="char*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackFullAuthenticationIn" cname="GnomeVFSModuleCallbackFullAuthenticationIn"> <struct name="GnomeVFSModuleCallbackFullAuthenticationIn" cname="GnomeVFSModuleCallbackFullAuthenticationIn">
<field cname="flags" type="GnomeVFSModuleCallbackFullAuthenticationFlags"/> <field name="Flags" cname="flags" type="GnomeVFSModuleCallbackFullAuthenticationFlags"/>
<field cname="uri" type="char*"/> <field name="Uri" cname="uri" type="char*"/>
<field cname="protocol" type="char*"/> <field name="Protocol" cname="protocol" type="char*"/>
<field cname="server" type="char*"/> <field name="Server" cname="server" type="char*"/>
<field cname="object" type="char*"/> <field name="Object" cname="object" type="char*"/>
<field cname="port" type="int"/> <field name="Port" cname="port" type="int"/>
<field cname="authtype" type="char*"/> <field name="Authtype" cname="authtype" type="char*"/>
<field cname="username" type="char*"/> <field name="Username" cname="username" type="char*"/>
<field cname="domain" type="char*"/> <field name="Domain" cname="domain" type="char*"/>
<field cname="default_user" type="char*"/> <field name="DefaultUser" cname="default_user" type="char*"/>
<field cname="default_domain" type="char*"/> <field name="DefaultDomain" cname="default_domain" type="char*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackFullAuthenticationOut" cname="GnomeVFSModuleCallbackFullAuthenticationOut"> <struct name="GnomeVFSModuleCallbackFullAuthenticationOut" cname="GnomeVFSModuleCallbackFullAuthenticationOut">
<field cname="abort_auth" type="gboolean"/> <field name="AbortAuth" cname="abort_auth" type="gboolean"/>
<field cname="username" type="char*"/> <field name="Username" cname="username" type="char*"/>
<field cname="domain" type="char*"/> <field name="Domain" cname="domain" type="char*"/>
<field cname="password" type="char*"/> <field name="Password" cname="password" type="char*"/>
<field cname="save_password" type="gboolean"/> <field name="SavePassword" cname="save_password" type="gboolean"/>
<field cname="keyring" type="char*"/> <field name="Keyring" cname="keyring" type="char*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackReceivedHeadersIn" cname="GnomeVFSModuleCallbackReceivedHeadersIn"> <struct name="GnomeVFSModuleCallbackReceivedHeadersIn" cname="GnomeVFSModuleCallbackReceivedHeadersIn">
<field cname="uri" type="GnomeVFSURI*"/> <field name="Uri" cname="uri" type="GnomeVFSURI*"/>
<field cname="headers" type="GList*"/> <field name="Headers" cname="headers" type="GList*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackReceivedHeadersOut" cname="GnomeVFSModuleCallbackReceivedHeadersOut"> <struct name="GnomeVFSModuleCallbackReceivedHeadersOut" cname="GnomeVFSModuleCallbackReceivedHeadersOut">
<field cname="dummy" type="int"/> <field name="Dummy" cname="dummy" type="int"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackSaveAuthenticationIn" cname="GnomeVFSModuleCallbackSaveAuthenticationIn"> <struct name="GnomeVFSModuleCallbackSaveAuthenticationIn" cname="GnomeVFSModuleCallbackSaveAuthenticationIn">
<field cname="keyring" type="char*"/> <field name="Keyring" cname="keyring" type="char*"/>
<field cname="uri" type="char*"/> <field name="Uri" cname="uri" type="char*"/>
<field cname="protocol" type="char*"/> <field name="Protocol" cname="protocol" type="char*"/>
<field cname="server" type="char*"/> <field name="Server" cname="server" type="char*"/>
<field cname="object" type="char*"/> <field name="Object" cname="object" type="char*"/>
<field cname="port" type="int"/> <field name="Port" cname="port" type="int"/>
<field cname="authtype" type="char*"/> <field name="Authtype" cname="authtype" type="char*"/>
<field cname="username" type="char*"/> <field name="Username" cname="username" type="char*"/>
<field cname="domain" type="char*"/> <field name="Domain" cname="domain" type="char*"/>
<field cname="password" type="char*"/> <field name="Password" cname="password" type="char*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackSaveAuthenticationOut" cname="GnomeVFSModuleCallbackSaveAuthenticationOut"> <struct name="GnomeVFSModuleCallbackSaveAuthenticationOut" cname="GnomeVFSModuleCallbackSaveAuthenticationOut">
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackStatusMessageIn" cname="GnomeVFSModuleCallbackStatusMessageIn"> <struct name="GnomeVFSModuleCallbackStatusMessageIn" cname="GnomeVFSModuleCallbackStatusMessageIn">
<field cname="uri" type="char*"/> <field name="Uri" cname="uri" type="char*"/>
<field cname="message" type="char*"/> <field name="Message" cname="message" type="char*"/>
<field cname="percentage" type="int"/> <field name="Percentage" cname="percentage" type="int"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSModuleCallbackStatusMessageOut" cname="GnomeVFSModuleCallbackStatusMessageOut"> <struct name="GnomeVFSModuleCallbackStatusMessageOut" cname="GnomeVFSModuleCallbackStatusMessageOut">
<field cname="dummy" type="int"/> <field name="Dummy" cname="dummy" type="int"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSMonitorHandle" cname="GnomeVFSMonitorHandle" opaque="true"/> <struct name="GnomeVFSMonitorHandle" cname="GnomeVFSMonitorHandle" opaque="true"/>
<struct name="GnomeVFSProcess" cname="GnomeVFSProcess" opaque="true"/> <struct name="GnomeVFSProcess" cname="GnomeVFSProcess" opaque="true"/>
@ -1076,22 +1076,22 @@
</method> </method>
</struct> </struct>
<struct name="GnomeVFSSocketImpl" cname="GnomeVFSSocketImpl"> <struct name="GnomeVFSSocketImpl" cname="GnomeVFSSocketImpl">
<field cname="read" type="GnomeVFSSocketReadFunc"/> <field name="Read" cname="read" type="GnomeVFSSocketReadFunc"/>
<field cname="write" type="GnomeVFSSocketWriteFunc"/> <field name="Write" cname="write" type="GnomeVFSSocketWriteFunc"/>
<field cname="close" type="GnomeVFSSocketCloseFunc"/> <field name="Close" cname="close" type="GnomeVFSSocketCloseFunc"/>
</struct> </struct>
<struct name="GnomeVFSToplevelURI" cname="GnomeVFSToplevelURI"> <struct name="GnomeVFSToplevelURI" cname="GnomeVFSToplevelURI">
<field cname="uri" type="GnomeVFSURI"/> <field name="Uri" cname="uri" type="GnomeVFSURI"/>
<field cname="host_name" type="gchar*"/> <field name="HostName" cname="host_name" type="gchar*"/>
<field cname="host_port" type="guint"/> <field name="HostPort" cname="host_port" type="guint"/>
<field cname="user_name" type="gchar*"/> <field name="UserName" cname="user_name" type="gchar*"/>
<field cname="password" type="gchar*"/> <field name="Password" cname="password" type="gchar*"/>
<field cname="urn" type="gchar*"/> <field name="Urn" cname="urn" type="gchar*"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="GnomeVFSTransform" cname="GnomeVFSTransform"> <struct name="GnomeVFSTransform" cname="GnomeVFSTransform">
<field cname="transform" type="GnomeVFSTransformFunc"/> <field name="Transform" cname="transform" type="GnomeVFSTransformFunc"/>
<method name="Get" cname="gnome_vfs_transform_get" shared="true"> <method name="Get" cname="gnome_vfs_transform_get" shared="true">
<return-type type="GnomeVFSTransform*"/> <return-type type="GnomeVFSTransform*"/>
<parameters> <parameters>
@ -1278,37 +1278,37 @@
</method> </method>
</struct> </struct>
<struct name="GnomeVFSUnixMount" cname="GnomeVFSUnixMount"> <struct name="GnomeVFSUnixMount" cname="GnomeVFSUnixMount">
<field cname="mount_path" type="char*"/> <field name="MountPath" cname="mount_path" type="char*"/>
<field cname="device_path" type="char*"/> <field name="DevicePath" cname="device_path" type="char*"/>
<field cname="filesystem_type" type="char*"/> <field name="FilesystemType" cname="filesystem_type" type="char*"/>
<field cname="is_read_only" type="gboolean"/> <field name="IsReadOnly" cname="is_read_only" type="gboolean"/>
</struct> </struct>
<struct name="GnomeVFSUnixMountPoint" cname="GnomeVFSUnixMountPoint"> <struct name="GnomeVFSUnixMountPoint" cname="GnomeVFSUnixMountPoint">
<field cname="mount_path" type="char*"/> <field name="MountPath" cname="mount_path" type="char*"/>
<field cname="device_path" type="char*"/> <field name="DevicePath" cname="device_path" type="char*"/>
<field cname="filesystem_type" type="char*"/> <field name="FilesystemType" cname="filesystem_type" type="char*"/>
<field cname="dev_opt" type="char*"/> <field name="DevOpt" cname="dev_opt" type="char*"/>
<field cname="is_read_only" type="gboolean"/> <field name="IsReadOnly" cname="is_read_only" type="gboolean"/>
<field cname="is_user_mountable" type="gboolean"/> <field name="IsUserMountable" cname="is_user_mountable" type="gboolean"/>
<field cname="is_loopback" type="gboolean"/> <field name="IsLoopback" cname="is_loopback" type="gboolean"/>
</struct> </struct>
<struct name="GnomeVFSXferProgressInfo" cname="GnomeVFSXferProgressInfo"> <struct name="GnomeVFSXferProgressInfo" cname="GnomeVFSXferProgressInfo">
<field cname="status" type="GnomeVFSXferProgressStatus"/> <field name="Status" cname="status" type="GnomeVFSXferProgressStatus"/>
<field cname="vfs_status" type="GnomeVFSResult"/> <field name="VfsStatus" cname="vfs_status" type="GnomeVFSResult"/>
<field cname="phase" type="GnomeVFSXferPhase"/> <field name="Phase" cname="phase" type="GnomeVFSXferPhase"/>
<field cname="source_name" type="gchar*"/> <field name="SourceName" cname="source_name" type="gchar*"/>
<field cname="target_name" type="gchar*"/> <field name="TargetName" cname="target_name" type="gchar*"/>
<field cname="file_index" type="gulong"/> <field name="FileIndex" cname="file_index" type="gulong"/>
<field cname="files_total" type="gulong"/> <field name="FilesTotal" cname="files_total" type="gulong"/>
<field cname="bytes_total" type="GnomeVFSFileSize"/> <field name="BytesTotal" cname="bytes_total" type="GnomeVFSFileSize"/>
<field cname="file_size" type="GnomeVFSFileSize"/> <field name="FileSize" cname="file_size" type="GnomeVFSFileSize"/>
<field cname="bytes_copied" type="GnomeVFSFileSize"/> <field name="BytesCopied" cname="bytes_copied" type="GnomeVFSFileSize"/>
<field cname="total_bytes_copied" type="GnomeVFSFileSize"/> <field name="TotalBytesCopied" cname="total_bytes_copied" type="GnomeVFSFileSize"/>
<field cname="duplicate_name" type="gchar*"/> <field name="DuplicateName" cname="duplicate_name" type="gchar*"/>
<field cname="duplicate_count" type="int"/> <field name="DuplicateCount" cname="duplicate_count" type="int"/>
<field cname="top_level_item" type="gboolean"/> <field name="TopLevelItem" cname="top_level_item" type="gboolean"/>
<field cname="reserved1" type="void*"/> <field name="Reserved1" cname="reserved1" type="void*"/>
<field cname="reserved2" type="void*"/> <field name="Reserved2" cname="reserved2" type="void*"/>
</struct> </struct>
<struct name="XdgGlobHash" cname="XdgGlobHash" opaque="true"/> <struct name="XdgGlobHash" cname="XdgGlobHash" opaque="true"/>
<struct name="XdgMimeMagic" cname="XdgMimeMagic" opaque="true"/> <struct name="XdgMimeMagic" cname="XdgMimeMagic" opaque="true"/>

File diff suppressed because it is too large Load Diff

View File

@ -278,24 +278,24 @@
</parameters> </parameters>
</callback> </callback>
<object name="HTML" cname="GtkHTML" parent="GtkLayout"> <object name="HTML" cname="GtkHTML" parent="GtkLayout">
<field cname="iframe_parent" type="GtkWidget*"/> <field name="IframeParent" cname="iframe_parent" type="GtkWidget*"/>
<field cname="frame" type="HTMLObject*"/> <field name="Frame" cname="frame" type="HTMLObject*"/>
<field cname="editor_api" type="GtkHTMLEditorAPI*"/> <field name="EditorApi" cname="editor_api" type="GtkHTMLEditorAPI*"/>
<field cname="editor_data" type="gpointer"/> <field name="EditorData" cname="editor_data" type="gpointer"/>
<field cname="engine" type="HTMLEngine*"/> <field name="Engine" cname="engine" type="HTMLEngine*"/>
<field cname="pointer_url" type="gchar*"/> <field name="PointerUrl" cname="pointer_url" type="gchar*"/>
<field cname="hand_cursor" type="GdkCursor*"/> <field name="HandCursor" cname="hand_cursor" type="GdkCursor*"/>
<field cname="ibeam_cursor" type="GdkCursor*"/> <field name="IbeamCursor" cname="ibeam_cursor" type="GdkCursor*"/>
<field cname="selection_x1" type="gint"/> <field name="SelectionX1" cname="selection_x1" type="gint"/>
<field cname="selection_y1" type="gint"/> <field name="SelectionY1" cname="selection_y1" type="gint"/>
<field cname="in_selection" bits="1" type="guint"/> <field name="InSelection" cname="in_selection" bits="1" type="guint"/>
<field cname="in_selection_drag" bits="1" type="guint"/> <field name="InSelectionDrag" cname="in_selection_drag" bits="1" type="guint"/>
<field cname="debug" bits="1" type="guint"/> <field name="Debug" cname="debug" bits="1" type="guint"/>
<field cname="allow_selection" bits="1" type="guint"/> <field name="AllowSelection" cname="allow_selection" bits="1" type="guint"/>
<field cname="hadj_connection" type="guint"/> <field name="HadjConnection" cname="hadj_connection" type="guint"/>
<field cname="vadj_connection" type="guint"/> <field name="VadjConnection" cname="vadj_connection" type="guint"/>
<field cname="binding_handled" type="gboolean"/> <field name="BindingHandled" cname="binding_handled" type="gboolean"/>
<field cname="priv" type="GtkHTMLPrivate*"/> <field name="Priv" cname="priv" type="GtkHTMLPrivate*"/>
<signal name="TitleChanged" cname="title_changed" when="FIRST"> <signal name="TitleChanged" cname="title_changed" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -858,15 +858,15 @@
</method> </method>
</object> </object>
<object name="HTMLEmbedded" cname="GtkHTMLEmbedded" parent="GtkBin"> <object name="HTMLEmbedded" cname="GtkHTMLEmbedded" parent="GtkBin">
<field cname="classid" type="char*"/> <field name="Classid" cname="classid" type="char*"/>
<field cname="name" type="char*"/> <field name="Name" cname="name" type="char*"/>
<field cname="type" type="char*"/> <field name="Type" cname="type" type="char*"/>
<field cname="data" type="char*"/> <field name="Data" cname="data" type="char*"/>
<field cname="width" type="int"/> <field name="Width" cname="width" type="int"/>
<field cname="height" type="int"/> <field name="Height" cname="height" type="int"/>
<field cname="params" type="GHashTable*"/> <field name="Params" cname="params" type="GHashTable*"/>
<field cname="priv" type="GtkHTMLEmbeddedPrivate*"/> <field name="Priv" cname="priv" type="GtkHTMLEmbeddedPrivate*"/>
<field cname="descent" type="int"/> <field name="Descent" cname="descent" type="int"/>
<signal name="Changed" cname="changed" when="FIRST"> <signal name="Changed" cname="changed" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -975,10 +975,10 @@
</callback> </callback>
</struct> </struct>
<struct name="HTMLStream" cname="GtkHTMLStream"> <struct name="HTMLStream" cname="GtkHTMLStream">
<field cname="write_func" type="GtkHTMLStreamWriteFunc"/> <field name="WriteFunc" cname="write_func" type="GtkHTMLStreamWriteFunc"/>
<field cname="close_func" type="GtkHTMLStreamCloseFunc"/> <field name="CloseFunc" cname="close_func" type="GtkHTMLStreamCloseFunc"/>
<field cname="types_func" type="GtkHTMLStreamTypesFunc"/> <field name="TypesFunc" cname="types_func" type="GtkHTMLStreamTypesFunc"/>
<field cname="user_data" type="gpointer"/> <field name="UserData" cname="user_data" type="gpointer"/>
<method name="Close" cname="gtk_html_stream_close"> <method name="Close" cname="gtk_html_stream_close">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>

View File

@ -27,7 +27,7 @@
</parameters> </parameters>
</callback> </callback>
<object name="Shell" cname="PanelAppletShell" parent="BonoboObject"> <object name="Shell" cname="PanelAppletShell" parent="BonoboObject">
<field cname="priv" type="PanelAppletShellPrivate*"/> <field name="Priv" cname="priv" type="PanelAppletShellPrivate*"/>
<method name="Construct" cname="panel_applet_shell_construct"> <method name="Construct" cname="panel_applet_shell_construct">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -44,7 +44,7 @@
</constructor> </constructor>
</object> </object>
<object name="PanelApplet" cname="PanelApplet" parent="GtkEventBox"> <object name="PanelApplet" cname="PanelApplet" parent="GtkEventBox">
<field cname="priv" type="PanelAppletPrivate*"/> <field name="Priv" cname="priv" type="PanelAppletPrivate*"/>
<signal name="ChangeOrient" cname="change_orient" when="LAST"> <signal name="ChangeOrient" cname="change_orient" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>

View File

@ -689,15 +689,15 @@
</method> </method>
</object> </object>
<struct name="Analysis" cname="PangoAnalysis"> <struct name="Analysis" cname="PangoAnalysis">
<field cname="shape_engine" type="PangoEngineShape*"/> <field name="ShapeEngine" cname="shape_engine" type="PangoEngineShape*"/>
<field cname="lang_engine" type="PangoEngineLang*"/> <field name="LangEngine" cname="lang_engine" type="PangoEngineLang*"/>
<field cname="font" type="PangoFont*"/> <field name="Font" cname="font" type="PangoFont*"/>
<field cname="level" type="guint8"/> <field name="Level" cname="level" type="guint8"/>
<field cname="language" type="PangoLanguage*"/> <field name="Language" cname="language" type="PangoLanguage*"/>
<field cname="extra_attrs" type="GSList*"/> <field name="ExtraAttrs" cname="extra_attrs" type="GSList*"/>
</struct> </struct>
<struct name="AttrClass" cname="PangoAttrClass"> <struct name="AttrClass" cname="PangoAttrClass">
<field cname="type" type="PangoAttrType"/> <field name="Type" cname="type" type="PangoAttrType"/>
<callback cname="copy"> <callback cname="copy">
<return-type type="PangoAttribute*"/> <return-type type="PangoAttribute*"/>
<parameters> <parameters>
@ -718,16 +718,16 @@
</callback> </callback>
</struct> </struct>
<struct name="AttrColor" cname="PangoAttrColor"> <struct name="AttrColor" cname="PangoAttrColor">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="color" type="PangoColor"/> <field name="Color" cname="color" type="PangoColor"/>
</struct> </struct>
<struct name="AttrFloat" cname="PangoAttrFloat"> <struct name="AttrFloat" cname="PangoAttrFloat">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="value" type="double"/> <field name="Value" cname="value" type="double"/>
</struct> </struct>
<struct name="AttrFontDesc" cname="PangoAttrFontDesc"> <struct name="AttrFontDesc" cname="PangoAttrFontDesc">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="desc" type="PangoFontDescription*"/> <field name="Desc" cname="desc" type="PangoFontDescription*"/>
<constructor cname="pango_attr_font_desc_new"> <constructor cname="pango_attr_font_desc_new">
<parameters> <parameters>
<parameter type="const-PangoFontDescription*" name="desc"/> <parameter type="const-PangoFontDescription*" name="desc"/>
@ -735,8 +735,8 @@
</constructor> </constructor>
</struct> </struct>
<struct name="AttrInt" cname="PangoAttrInt"> <struct name="AttrInt" cname="PangoAttrInt">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="value" type="int"/> <field name="Value" cname="value" type="int"/>
</struct> </struct>
<struct name="AttrIterator" cname="PangoAttrIterator" opaque="true"> <struct name="AttrIterator" cname="PangoAttrIterator" opaque="true">
<method name="Copy" cname="pango_attr_iterator_copy"> <method name="Copy" cname="pango_attr_iterator_copy">
@ -774,8 +774,8 @@
</method> </method>
</struct> </struct>
<struct name="AttrLanguage" cname="PangoAttrLanguage"> <struct name="AttrLanguage" cname="PangoAttrLanguage">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="value" type="PangoLanguage*"/> <field name="Value" cname="value" type="PangoLanguage*"/>
<constructor cname="pango_attr_language_new"> <constructor cname="pango_attr_language_new">
<parameters> <parameters>
<parameter type="PangoLanguage*" name="language"/> <parameter type="PangoLanguage*" name="language"/>
@ -834,9 +834,9 @@
</method> </method>
</boxed> </boxed>
<struct name="AttrShape" cname="PangoAttrShape"> <struct name="AttrShape" cname="PangoAttrShape">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="ink_rect" type="PangoRectangle"/> <field name="InkRect" cname="ink_rect" type="PangoRectangle"/>
<field cname="logical_rect" type="PangoRectangle"/> <field name="LogicalRect" cname="logical_rect" type="PangoRectangle"/>
<constructor cname="pango_attr_shape_new"> <constructor cname="pango_attr_shape_new">
<parameters> <parameters>
<parameter type="const-PangoRectangle*" name="ink_rect"/> <parameter type="const-PangoRectangle*" name="ink_rect"/>
@ -845,13 +845,13 @@
</constructor> </constructor>
</struct> </struct>
<struct name="AttrString" cname="PangoAttrString"> <struct name="AttrString" cname="PangoAttrString">
<field cname="attr" type="PangoAttribute"/> <field name="Attr" cname="attr" type="PangoAttribute"/>
<field cname="value" type="char*"/> <field name="Value" cname="value" type="char*"/>
</struct> </struct>
<struct name="Attribute" cname="PangoAttribute"> <struct name="Attribute" cname="PangoAttribute">
<field cname="klass" type="const-PangoAttrClass*"/> <field name="Klass" cname="klass" type="const-PangoAttrClass*"/>
<field cname="start_index" type="guint"/> <field name="StartIndex" cname="start_index" type="guint"/>
<field cname="end_index" type="guint"/> <field name="EndIndex" cname="end_index" type="guint"/>
<method name="Copy" cname="pango_attribute_copy"> <method name="Copy" cname="pango_attribute_copy">
<return-type type="PangoAttribute*"/> <return-type type="PangoAttribute*"/>
</method> </method>
@ -866,9 +866,9 @@
</method> </method>
</struct> </struct>
<boxed name="Color" cname="PangoColor"> <boxed name="Color" cname="PangoColor">
<field cname="red" type="guint16"/> <field name="Red" cname="red" type="guint16"/>
<field cname="green" type="guint16"/> <field name="Green" cname="green" type="guint16"/>
<field cname="blue" type="guint16"/> <field name="Blue" cname="blue" type="guint16"/>
<method name="Copy" cname="pango_color_copy"> <method name="Copy" cname="pango_color_copy">
<return-type type="PangoColor*"/> <return-type type="PangoColor*"/>
</method> </method>
@ -1083,18 +1083,18 @@
</boxed> </boxed>
<alias name="Glyph" cname="PangoGlyph" type="guint32"/> <alias name="Glyph" cname="PangoGlyph" type="guint32"/>
<struct name="GlyphGeometry" cname="PangoGlyphGeometry"> <struct name="GlyphGeometry" cname="PangoGlyphGeometry">
<field cname="width" type="PangoGlyphUnit"/> <field name="Width" cname="width" type="PangoGlyphUnit"/>
<field cname="x_offset" type="PangoGlyphUnit"/> <field name="XOffset" cname="x_offset" type="PangoGlyphUnit"/>
<field cname="y_offset" type="PangoGlyphUnit"/> <field name="YOffset" cname="y_offset" type="PangoGlyphUnit"/>
</struct> </struct>
<struct name="GlyphInfo" cname="PangoGlyphInfo"> <struct name="GlyphInfo" cname="PangoGlyphInfo">
<field cname="glyph" type="PangoGlyph"/> <field name="Glyph" cname="glyph" type="PangoGlyph"/>
<field cname="geometry" type="PangoGlyphGeometry"/> <field name="Geometry" cname="geometry" type="PangoGlyphGeometry"/>
<field cname="attr" type="PangoGlyphVisAttr"/> <field name="Attr" cname="attr" type="PangoGlyphVisAttr"/>
</struct> </struct>
<struct name="GlyphItem" cname="PangoGlyphItem"> <struct name="GlyphItem" cname="PangoGlyphItem">
<field cname="item" type="PangoItem*"/> <field name="Item" cname="item" type="PangoItem*"/>
<field cname="glyphs" type="PangoGlyphString*"/> <field name="Glyphs" cname="glyphs" type="PangoGlyphString*"/>
<method name="ApplyAttrs" cname="pango_glyph_item_apply_attrs"> <method name="ApplyAttrs" cname="pango_glyph_item_apply_attrs">
<return-type type="GSList*"/> <return-type type="GSList*"/>
<parameters> <parameters>
@ -1111,10 +1111,10 @@
</method> </method>
</struct> </struct>
<boxed name="GlyphString" cname="PangoGlyphString"> <boxed name="GlyphString" cname="PangoGlyphString">
<field cname="num_glyphs" type="gint"/> <field name="NumGlyphs" cname="num_glyphs" type="gint"/>
<field cname="glyphs" type="PangoGlyphInfo*"/> <field name="Glyphs" cname="glyphs" type="PangoGlyphInfo*"/>
<field cname="log_clusters" type="gint*"/> <field name="LogClusters" cname="log_clusters" type="gint*"/>
<field cname="space" type="gint"/> <field name="Space" cname="space" type="gint" access="private"/>
<method name="Copy" cname="pango_glyph_string_copy"> <method name="Copy" cname="pango_glyph_string_copy">
<return-type type="PangoGlyphString*"/> <return-type type="PangoGlyphString*"/>
</method> </method>
@ -1183,13 +1183,13 @@
</boxed> </boxed>
<alias name="GlyphUnit" cname="PangoGlyphUnit" type="gint32"/> <alias name="GlyphUnit" cname="PangoGlyphUnit" type="gint32"/>
<struct name="GlyphVisAttr" cname="PangoGlyphVisAttr"> <struct name="GlyphVisAttr" cname="PangoGlyphVisAttr">
<field cname="is_cluster_start" bits="1" type="guint"/> <field name="IsClusterStart" cname="is_cluster_start" bits="1" type="guint"/>
</struct> </struct>
<struct name="Item" cname="PangoItem"> <struct name="Item" cname="PangoItem">
<field cname="offset" type="gint"/> <field name="Offset" cname="offset" type="gint"/>
<field cname="length" type="gint"/> <field name="Length" cname="length" type="gint"/>
<field cname="num_chars" type="gint"/> <field name="NumChars" cname="num_chars" type="gint"/>
<field cname="analysis" type="PangoAnalysis"/> <field name="Analysis" cname="analysis" type="PangoAnalysis"/>
<method name="Copy" cname="pango_item_copy"> <method name="Copy" cname="pango_item_copy">
<return-type type="PangoItem*"/> <return-type type="PangoItem*"/>
</method> </method>
@ -1305,12 +1305,12 @@
</method> </method>
</struct> </struct>
<struct name="LayoutLine" cname="PangoLayoutLine"> <struct name="LayoutLine" cname="PangoLayoutLine">
<field cname="layout" type="PangoLayout*"/> <field name="Layout" cname="layout" type="PangoLayout*"/>
<field cname="start_index" type="gint"/> <field name="StartIndex" cname="start_index" type="gint"/>
<field cname="length" type="gint"/> <field name="Length" cname="length" type="gint"/>
<field cname="runs" type="GSList*"/> <field name="Runs" cname="runs" type="GSList*"/>
<field cname="is_paragraph_start" bits="1" type="guint"/> <field name="IsParagraphStart" cname="is_paragraph_start" bits="1" type="guint"/>
<field cname="resolved_dir" bits="3" type="guint"/> <field name="ResolvedDir" cname="resolved_dir" bits="3" type="guint"/>
<method name="GetExtents" cname="pango_layout_line_get_extents"> <method name="GetExtents" cname="pango_layout_line_get_extents">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1358,27 +1358,27 @@
</method> </method>
</struct> </struct>
<struct name="LayoutRun" cname="PangoLayoutRun"> <struct name="LayoutRun" cname="PangoLayoutRun">
<field cname="item" type="PangoItem*"/> <field name="Item" cname="item" type="PangoItem*"/>
<field cname="glyphs" type="PangoGlyphString*"/> <field name="Glyphs" cname="glyphs" type="PangoGlyphString*"/>
</struct> </struct>
<struct name="LogAttr" cname="PangoLogAttr"> <struct name="LogAttr" cname="PangoLogAttr">
<field cname="is_line_break" bits="1" type="guint"/> <field name="IsLineBreak" cname="is_line_break" bits="1" type="guint"/>
<field cname="is_mandatory_break" bits="1" type="guint"/> <field name="IsMandatoryBreak" cname="is_mandatory_break" bits="1" type="guint"/>
<field cname="is_char_break" bits="1" type="guint"/> <field name="IsCharBreak" cname="is_char_break" bits="1" type="guint"/>
<field cname="is_white" bits="1" type="guint"/> <field name="IsWhite" cname="is_white" bits="1" type="guint"/>
<field cname="is_cursor_position" bits="1" type="guint"/> <field name="IsCursorPosition" cname="is_cursor_position" bits="1" type="guint"/>
<field cname="is_word_start" bits="1" type="guint"/> <field name="IsWordStart" cname="is_word_start" bits="1" type="guint"/>
<field cname="is_word_end" bits="1" type="guint"/> <field name="IsWordEnd" cname="is_word_end" bits="1" type="guint"/>
<field cname="is_sentence_boundary" bits="1" type="guint"/> <field name="IsSentenceBoundary" cname="is_sentence_boundary" bits="1" type="guint"/>
<field cname="is_sentence_start" bits="1" type="guint"/> <field name="IsSentenceStart" cname="is_sentence_start" bits="1" type="guint"/>
<field cname="is_sentence_end" bits="1" type="guint"/> <field name="IsSentenceEnd" cname="is_sentence_end" bits="1" type="guint"/>
<field cname="backspace_deletes_character" bits="1" type="guint"/> <field name="BackspaceDeletesCharacter" cname="backspace_deletes_character" bits="1" type="guint"/>
</struct> </struct>
<struct name="Rectangle" cname="PangoRectangle"> <struct name="Rectangle" cname="PangoRectangle">
<field cname="x" type="int"/> <field name="X" cname="x" type="int"/>
<field cname="y" type="int"/> <field name="Y" cname="y" type="int"/>
<field cname="width" type="int"/> <field name="Width" cname="width" type="int"/>
<field cname="height" type="int"/> <field name="Height" cname="height" type="int"/>
</struct> </struct>
<struct name="ScriptIter" cname="PangoScriptIter" opaque="true"> <struct name="ScriptIter" cname="PangoScriptIter" opaque="true">
<method name="Free" cname="pango_script_iter_free"> <method name="Free" cname="pango_script_iter_free">

View File

@ -119,7 +119,7 @@ while ($line = <STDIN>) {
$sdef .= $line; $sdef .= $line;
last if ($line =~ /^(deprecated)?}/); last if ($line =~ /^(deprecated)?}/);
} }
$sdef =~ s!/\*.*?(\*/|\n)!!g; $sdef =~ s!/\*[^<].*?(\*/|\n)!!g;
$sdef =~ s/\n\s*//g; $sdef =~ s/\n\s*//g;
$sdefs{$sname} = $sdef; $sdefs{$sname} = $sdef;
} elsif ($line =~ /^(\w+)_(class|base)_init\b/) { } elsif ($line =~ /^(\w+)_(class|base)_init\b/) {
@ -193,7 +193,7 @@ while ($line = <STDIN>) {
} elsif ($line =~ /\#define\s+(\w+)\s+\"(.*)\"/) { } elsif ($line =~ /\#define\s+(\w+)\s+\"(.*)\"/) {
$defines{$1} = $2; $defines{$1} = $2;
} }
} else { } elsif ($line !~ /\/\*/) {
print $line; print $line;
} }
} }
@ -320,7 +320,7 @@ foreach $type (sort(keys(%objects))) {
$instdef = $sdefs{$1} if ($insttype =~ /struct\s+(\w+)/); $instdef = $sdefs{$1} if ($insttype =~ /struct\s+(\w+)/);
$classdef = $sdefs{$1} if ($classtype =~ /struct\s+(\w+)/); $classdef = $sdefs{$1} if ($classtype =~ /struct\s+(\w+)/);
$classdef =~ s/deprecated//g; $classdef =~ s/deprecated//g;
$instdef =~ s/\s+(\*+)/\1 /g; $instdef =~ s/\s+(\*+)([^\/])/\1 \2/g;
warn "Strange Class $inst\n" if (!$instdef && $debug); warn "Strange Class $inst\n" if (!$instdef && $debug);
$classcnt++; $classcnt++;
@ -338,11 +338,11 @@ foreach $type (sort(keys(%objects))) {
if ($instdef =~ /^struct/) { if ($instdef =~ /^struct/) {
$instdef =~ /\{(.*)\}/; $instdef =~ /\{(.*)\}/;
$fieldstr = $1; $fieldstr = $1;
$fieldstr =~ s|/\*.*?\*/||g; $fieldstr =~ s|/\*[^<].*?\*/||g;
@fields = split(/;/, $fieldstr); @fields = split(/;/, $fieldstr);
$fields[0] =~ /(\w+)/; addFieldElems($obj_el, 'private', @fields);
$obj_el->setAttribute('parent', "$1"); $obj_el->setAttribute('parent', $obj_el->firstChild->getAttribute('type'));
addFieldElems($obj_el, @fields[1..$#fields]); $obj_el->removeChild($obj_el->firstChild);
} elsif ($instdef =~ /privatestruct/) { } elsif ($instdef =~ /privatestruct/) {
# just get the parent for private structs # just get the parent for private structs
$instdef =~ /\{\s*(\w+)/; $instdef =~ /\{\s*(\w+)/;
@ -414,7 +414,7 @@ foreach $key (sort (keys (%types))) {
$struct_el->setAttribute('opaque', 'true'); $struct_el->setAttribute('opaque', 'true');
} else { } else {
$def =~ /\{(.+)\}/; $def =~ /\{(.+)\}/;
addFieldElems($struct_el, split(/;/, $1)); addFieldElems($struct_el, 'public', split(/;/, $1));
} }
} }
@ -470,9 +470,14 @@ print "props: $propcnt childprops: $childpropcnt signals: $sigcnt\n\n";
sub addFieldElems sub addFieldElems
{ {
my ($parent, @fields) = @_; my ($parent, $defaultaccess, @fields) = @_;
my $access = $defaultaccess;
foreach $field (@fields) { foreach $field (@fields) {
if ($field =~ m!^/\*< (public|private) >.*\*/(.*)$!) {
$access = $1;
$field = $2;
}
next if ($field !~ /\S/); next if ($field !~ /\S/);
$field =~ s/\s+(\*+)/\1 /g; $field =~ s/\s+(\*+)/\1 /g;
$field =~ s/(\w+)\s+const /const \1 /g; $field =~ s/(\w+)\s+const /const \1 /g;
@ -489,15 +494,19 @@ sub addFieldElems
my $type = $1 . $2; $symb = $3; my $type = $1 . $2; $symb = $3;
foreach $tok (split (/,\s*/, $symb)) { foreach $tok (split (/,\s*/, $symb)) {
if ($tok =~ /(\w+)\s*\[(.*)\]/) { if ($tok =~ /(\w+)\s*\[(.*)\]/) {
$elem = addNameElem($parent, 'field', $1); $elem = addNameElem($parent, 'field', $1, "");
$elem->setAttribute('array_len', "$2"); $elem->setAttribute('array_len', "$2");
} elsif ($tok =~ /(\w+)\s*\:\s*(\d+)/) { } elsif ($tok =~ /(\w+)\s*\:\s*(\d+)/) {
$elem = addNameElem($parent, 'field', $1); $elem = addNameElem($parent, 'field', $1, "");
$elem->setAttribute('bits', "$2"); $elem->setAttribute('bits', "$2");
} else { } else {
$elem = addNameElem($parent, 'field', $tok); $elem = addNameElem($parent, 'field', $tok, "");
} }
$elem->setAttribute('type', "$type"); $elem->setAttribute('type', "$type");
if ($access ne $defaultaccess) {
$elem->setAttribute('access', "$access");
}
} }
} else { } else {
die "$field\n"; die "$field\n";
@ -695,7 +704,7 @@ sub addNameElem
my $elem = $doc->createElement($type); my $elem = $doc->createElement($type);
$node->appendChild($elem); $node->appendChild($elem);
if ($prefix) { if (defined $prefix) {
my $match; my $match;
if ($cname =~ /$prefix(\w+)/) { if ($cname =~ /$prefix(\w+)/) {
$match = $1; $match = $1;
@ -905,6 +914,7 @@ sub addVirtualMethods
{ {
my ($class, $node) = @_; my ($class, $node) = @_;
$class =~ s/\n\s*//g; $class =~ s/\n\s*//g;
$class =~ s/\/\*.*?\*\///g;
while ($class =~ /;\s*(G_CONST_RETURN\s+)?(\S+\s*\**)\s*\(\*\s*(\w+)\)\s*\((.*?)\);/) { while ($class =~ /;\s*(G_CONST_RETURN\s+)?(\S+\s*\**)\s*\(\*\s*(\w+)\)\s*\((.*?)\);/) {
$ret = $1 . $2; $cname = $3; $parms = $4; $ret = $1 . $2; $cname = $3; $parms = $4;

View File

@ -59,7 +59,7 @@ foreach $fname (@hdrs) {
next if ($line =~ /$ignoreit_regex/); next if ($line =~ /$ignoreit_regex/);
$line =~ s/\/\*.*?\*\///g; $line =~ s/\/\*[^<].*?\*\///g;
next if ($line !~ /\S/); next if ($line !~ /\S/);
@ -77,7 +77,7 @@ foreach $fname (@hdrs) {
$def =~ s/\\\n//g; $def =~ s/\\\n//g;
print $def; print $def;
} }
} elsif ($line =~ /^\s*\/\*/) { } elsif ($line =~ /^\s*\/\*[^<]/) {
while ($line !~ /\*\//) {$line = <INFILE>;} while ($line !~ /\*\//) {$line = <INFILE>;}
} elsif ($line =~ /^extern/) { } elsif ($line =~ /^extern/) {
while ($line !~ /;/) {$line = <INFILE>;} while ($line !~ /;/) {$line = <INFILE>;}
@ -158,7 +158,7 @@ foreach $fname (@hdrs) {
$do_print = 0; $do_print = 0;
} }
} else { } else {
if ($braces or $line =~ /;/) { if ($braces or $line =~ /;|\/\*/) {
if ($deprecated == -1) { if ($deprecated == -1) {
print $line; print $line;
} else { } else {

View File

@ -30,10 +30,10 @@
</parameters> </parameters>
</callback> </callback>
<struct name="BpathDef" cname="RsvgBpathDef"> <struct name="BpathDef" cname="RsvgBpathDef">
<field cname="bpath" type="ArtBpath*"/> <field name="Bpath" cname="bpath" type="ArtBpath*"/>
<field cname="n_bpath" type="int"/> <field name="NBpath" cname="n_bpath" type="int"/>
<field cname="n_bpath_max" type="int"/> <field name="NBpathMax" cname="n_bpath_max" type="int"/>
<field cname="moveto_idx" type="int"/> <field name="MovetoIdx" cname="moveto_idx" type="int"/>
<method name="ArtFinish" cname="rsvg_bpath_def_art_finish"> <method name="ArtFinish" cname="rsvg_bpath_def_art_finish">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
@ -76,7 +76,7 @@
</constructor> </constructor>
</struct> </struct>
<struct name="DefVal" cname="RsvgDefVal"> <struct name="DefVal" cname="RsvgDefVal">
<field cname="type" type="RsvgDefType"/> <field name="Type" cname="type" type="RsvgDefType"/>
<callback cname="free"> <callback cname="free">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -104,12 +104,12 @@
</method> </method>
</struct> </struct>
<struct name="GradientStop" cname="RsvgGradientStop"> <struct name="GradientStop" cname="RsvgGradientStop">
<field cname="offset" type="double"/> <field name="Offset" cname="offset" type="double"/>
<field cname="rgba" type="guint32"/> <field name="Rgba" cname="rgba" type="guint32"/>
</struct> </struct>
<struct name="GradientStops" cname="RsvgGradientStops"> <struct name="GradientStops" cname="RsvgGradientStops">
<field cname="n_stop" type="int"/> <field name="NStop" cname="n_stop" type="int"/>
<field cname="stop" type="RsvgGradientStop*"/> <field name="Stop" cname="stop" type="RsvgGradientStop*"/>
</struct> </struct>
<struct name="Handle" cname="RsvgHandle" opaque="true"> <struct name="Handle" cname="RsvgHandle" opaque="true">
<method name="Close" cname="rsvg_handle_close"> <method name="Close" cname="rsvg_handle_close">
@ -163,22 +163,22 @@
</method> </method>
</struct> </struct>
<struct name="LinearGradient" cname="RsvgLinearGradient"> <struct name="LinearGradient" cname="RsvgLinearGradient">
<field cname="super" type="RsvgDefVal"/> <field name="Super" cname="super" type="RsvgDefVal"/>
<field cname="obj_bbox" type="gboolean"/> <field name="ObjBbox" cname="obj_bbox" type="gboolean"/>
<field cname="affine" array_len="6" type="double"/> <field name="Affine" cname="affine" array_len="6" type="double"/>
<field cname="stops" type="RsvgGradientStops*"/> <field name="Stops" cname="stops" type="RsvgGradientStops*"/>
<field cname="spread" type="ArtGradientSpread"/> <field name="Spread" cname="spread" type="ArtGradientSpread"/>
<field cname="x1" type="double"/> <field name="X1" cname="x1" type="double"/>
<field cname="y1" type="double"/> <field name="Y1" cname="y1" type="double"/>
<field cname="x2" type="double"/> <field name="X2" cname="x2" type="double"/>
<field cname="y2" type="double"/> <field name="Y2" cname="y2" type="double"/>
</struct> </struct>
<struct name="PSCtx" cname="RsvgPSCtx"> <struct name="PSCtx" cname="RsvgPSCtx">
<field cname="x0" type="int"/> <field name="X0" cname="x0" type="int"/>
<field cname="y0" type="int"/> <field name="Y0" cname="y0" type="int"/>
<field cname="x1" type="int"/> <field name="X1" cname="x1" type="int"/>
<field cname="y1" type="int"/> <field name="Y1" cname="y1" type="int"/>
<field cname="affine" array_len="6" type="double"/> <field name="Affine" cname="affine" array_len="6" type="double"/>
</struct> </struct>
<struct name="PaintServer" cname="RsvgPaintServer" opaque="true"> <struct name="PaintServer" cname="RsvgPaintServer" opaque="true">
<method name="Parse" cname="rsvg_paint_server_parse" shared="true"> <method name="Parse" cname="rsvg_paint_server_parse" shared="true">
@ -196,45 +196,45 @@
</method> </method>
</struct> </struct>
<struct name="RadialGradient" cname="RsvgRadialGradient"> <struct name="RadialGradient" cname="RsvgRadialGradient">
<field cname="super" type="RsvgDefVal"/> <field name="Super" cname="super" type="RsvgDefVal"/>
<field cname="obj_bbox" type="gboolean"/> <field name="ObjBbox" cname="obj_bbox" type="gboolean"/>
<field cname="affine" array_len="6" type="double"/> <field name="Affine" cname="affine" array_len="6" type="double"/>
<field cname="stops" type="RsvgGradientStops*"/> <field name="Stops" cname="stops" type="RsvgGradientStops*"/>
<field cname="spread" type="ArtGradientSpread"/> <field name="Spread" cname="spread" type="ArtGradientSpread"/>
<field cname="cx" type="double"/> <field name="Cx" cname="cx" type="double"/>
<field cname="cy" type="double"/> <field name="Cy" cname="cy" type="double"/>
<field cname="r" type="double"/> <field name="R" cname="r" type="double"/>
<field cname="fx" type="double"/> <field name="Fx" cname="fx" type="double"/>
<field cname="fy" type="double"/> <field name="Fy" cname="fy" type="double"/>
</struct> </struct>
<struct name="State" cname="RsvgState"> <struct name="State" cname="RsvgState">
<field cname="affine" array_len="6" type="double"/> <field name="Affine" cname="affine" array_len="6" type="double"/>
<field cname="opacity" type="gint"/> <field name="Opacity" cname="opacity" type="gint"/>
<field cname="fill" type="RsvgPaintServer*"/> <field name="Fill" cname="fill" type="RsvgPaintServer*"/>
<field cname="fill_opacity" type="gint"/> <field name="FillOpacity" cname="fill_opacity" type="gint"/>
<field cname="fill_rule" type="gint"/> <field name="FillRule" cname="fill_rule" type="gint"/>
<field cname="stroke" type="RsvgPaintServer*"/> <field name="Stroke" cname="stroke" type="RsvgPaintServer*"/>
<field cname="stroke_opacity" type="gint"/> <field name="StrokeOpacity" cname="stroke_opacity" type="gint"/>
<field cname="stroke_width" type="double"/> <field name="StrokeWidth" cname="stroke_width" type="double"/>
<field cname="miter_limit" type="double"/> <field name="MiterLimit" cname="miter_limit" type="double"/>
<field cname="cap" type="ArtPathStrokeCapType"/> <field name="Cap" cname="cap" type="ArtPathStrokeCapType"/>
<field cname="join" type="ArtPathStrokeJoinType"/> <field name="Join" cname="join" type="ArtPathStrokeJoinType"/>
<field cname="font_size" type="double"/> <field name="FontSize" cname="font_size" type="double"/>
<field cname="font_family" type="char*"/> <field name="FontFamily" cname="font_family" type="char*"/>
<field cname="lang" type="char*"/> <field name="Lang" cname="lang" type="char*"/>
<field cname="font_style" type="PangoStyle"/> <field name="FontStyle" cname="font_style" type="PangoStyle"/>
<field cname="font_variant" type="PangoVariant"/> <field name="FontVariant" cname="font_variant" type="PangoVariant"/>
<field cname="font_weight" type="PangoWeight"/> <field name="FontWeight" cname="font_weight" type="PangoWeight"/>
<field cname="font_stretch" type="PangoStretch"/> <field name="FontStretch" cname="font_stretch" type="PangoStretch"/>
<field cname="font_decor" type="TextDecoration"/> <field name="FontDecor" cname="font_decor" type="TextDecoration"/>
<field cname="text_dir" type="PangoDirection"/> <field name="TextDir" cname="text_dir" type="PangoDirection"/>
<field cname="text_anchor" type="TextAnchor"/> <field name="TextAnchor" cname="text_anchor" type="TextAnchor"/>
<field cname="text_offset" type="guint"/> <field name="TextOffset" cname="text_offset" type="guint"/>
<field cname="stop_color" type="guint32"/> <field name="StopColor" cname="stop_color" type="guint32"/>
<field cname="stop_opacity" type="gint"/> <field name="StopOpacity" cname="stop_opacity" type="gint"/>
<field cname="visible" type="gboolean"/> <field name="Visible" cname="visible" type="gboolean"/>
<field cname="dash" type="ArtVpathDash"/> <field name="Dash" cname="dash" type="ArtVpathDash"/>
<field cname="save_pixbuf" type="GdkPixbuf*"/> <field name="SavePixbuf" cname="save_pixbuf" type="GdkPixbuf*"/>
<method name="Clone" cname="rsvg_state_clone"> <method name="Clone" cname="rsvg_state_clone">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>

View File

@ -50,9 +50,9 @@
</parameters> </parameters>
</callback> </callback>
<object name="Bg" cname="VteBg" parent="GObject"> <object name="Bg" cname="VteBg" parent="GObject">
<field cname="root_pixmap" type="GdkPixmap*"/> <field name="RootPixmap" cname="root_pixmap" type="GdkPixmap*"/>
<field cname="native" type="struct-VteBgNative*"/> <field name="Native" cname="native" type="struct-VteBgNative*"/>
<field cname="pvt" type="struct-VteBgPrivate*"/> <field name="Pvt" cname="pvt" type="struct-VteBgPrivate*"/>
<signal name="RootPixmapChanged" cname="root-pixmap-changed" when="LAST"> <signal name="RootPixmapChanged" cname="root-pixmap-changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -88,8 +88,8 @@
</method> </method>
</object> </object>
<object name="Reaper" cname="VteReaper" parent="GObject"> <object name="Reaper" cname="VteReaper" parent="GObject">
<field cname="channel" type="GIOChannel*"/> <field name="Channel" cname="channel" type="GIOChannel*"/>
<field cname="iopipe" array_len="2" type="int"/> <field name="Iopipe" cname="iopipe" array_len="2" type="int"/>
<signal name="ChildExited" cname="child-exited" when="LAST"> <signal name="ChildExited" cname="child-exited" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -106,16 +106,16 @@
</method> </method>
</object> </object>
<object name="Terminal" cname="VteTerminal" parent="GtkWidget"> <object name="Terminal" cname="VteTerminal" parent="GtkWidget">
<field cname="adjustment" type="GtkAdjustment*"/> <field name="Adjustment" cname="adjustment" type="GtkAdjustment*" access="public"/>
<field cname="char_width" type="glong"/> <field name="CharWidth" cname="char_width" type="glong" access="public"/>
<field cname="char_height" type="glong"/> <field name="CharHeight" cname="char_height" type="glong" access="public"/>
<field cname="char_ascent" type="glong"/> <field name="CharAscent" cname="char_ascent" type="glong" access="public"/>
<field cname="char_descent" type="glong"/> <field name="CharDescent" cname="char_descent" type="glong" access="public"/>
<field cname="row_count" type="glong"/> <field name="RowCount" cname="row_count" type="glong" access="public"/>
<field cname="column_count" type="glong"/> <field name="ColumnCount" cname="column_count" type="glong" access="public"/>
<field cname="window_title" type="char*"/> <field name="WindowTitle" cname="window_title" type="char*" access="public"/>
<field cname="icon_title" type="char*"/> <field name="IconTitle" cname="icon_title" type="char*" access="public"/>
<field cname="pvt" type="VteTerminalPrivate*"/> <field name="Pvt" cname="pvt" type="VteTerminalPrivate*"/>
<signal name="Eof" cname="eof" when="LAST"> <signal name="Eof" cname="eof" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -667,20 +667,20 @@
<constructor cname="vte_terminal_accessible_factory_new"/> <constructor cname="vte_terminal_accessible_factory_new"/>
</object> </object>
<struct name="CharAttributes" cname="VteCharAttributes"> <struct name="CharAttributes" cname="VteCharAttributes">
<field cname="row" type="long"/> <field name="Row" cname="row" type="long"/>
<field cname="column" type="long"/> <field name="Column" cname="column" type="long"/>
<field cname="fore" type="GdkColor"/> <field name="Fore" cname="fore" type="GdkColor"/>
<field cname="back" type="GdkColor"/> <field name="Back" cname="back" type="GdkColor"/>
<field cname="underline" bits="1" type="gboolean"/> <field name="Underline" cname="underline" bits="1" type="gboolean"/>
<field cname="strikethrough" bits="1" type="gboolean"/> <field name="Strikethrough" cname="strikethrough" bits="1" type="gboolean"/>
</struct> </struct>
<struct name="Ring" cname="VteRing"> <struct name="Ring" cname="VteRing">
<field cname="free" type="VteRingFreeFunc"/> <field name="Free" cname="free" type="VteRingFreeFunc"/>
<field cname="user_data" type="gpointer"/> <field name="UserData" cname="user_data" type="gpointer"/>
<field cname="array" type="gpointer*"/> <field name="Array" cname="array" type="gpointer*"/>
<field cname="delta" type="glong"/> <field name="Delta" cname="delta" type="glong"/>
<field cname="length" type="glong"/> <field name="Length" cname="length" type="glong"/>
<field cname="max" type="glong"/> <field name="Max" cname="max" type="glong"/>
</struct> </struct>
<struct name="Conv" cname="VteConv" opaque="true"/> <struct name="Conv" cname="VteConv" opaque="true"/>
</namespace> </namespace>