[Gtk-sharp-list] generation problem
Lee Mallabone
gnome@fonicmonkey.net
22 Mar 2003 19:29:39 +0000
--=-shll39eN99uQT3UrOlUL
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Hi,
I'm trying to regenerate the api/*api.xml files so I can make API
tweaks. I've grabbed the relevent perl tools, run 'make
get-source-code', made the tweaks to gtkprogress.h that Mike suggested
and ran 'make' in the 'sources' directory.
However, when generation has finished, these files are different to cvs:
api/gda-api.xml
api/gnomedb-api.xml
api/gdk-api.xml
api/gtk-api.xml
The first two are massively different, the second two only small
differences. Any clues as to what might cause these differences?
I've attached a diff for the gtk and gdk APIs, as they're the only ones
I'm really interested in changing at the moment...
Please let me know whether I need to worry about this - I was hoping to
submit some patches to the Gtk# API, but obviously want to make sure I'm
generating the binding correctly first!
Regards,
Lee.
--=-shll39eN99uQT3UrOlUL
Content-Disposition: attachment; filename=out-of-sync.diff
Content-Type: text/x-patch; name=out-of-sync.diff; charset=ANSI_X3.4-1968
Content-Transfer-Encoding: 7bit
Index: api/gdk-api.xml
===================================================================
RCS file: /cvs/public/gtk-sharp/api/gdk-api.xml,v
retrieving revision 1.15
diff -u -r1.15 gdk-api.xml
--- api/gdk-api.xml 14 Mar 2003 03:04:15 -0000 1.15
+++ api/gdk-api.xml 22 Mar 2003 19:28:40 -0000
@@ -1502,8 +1502,8 @@
<callback cname="child_func">
<return-type type="gboolean"/>
<parameters>
- <parameter type=" gboolean " name="child_func"/>
- <parameter type=" gboolean " name="child_func"/>
+ <parameter type="" name=""/>
+ <parameter type="" name=""/>
</parameters>
</callback>
<parameter type="gpointer" name="user_data"/>
Index: api/gtk-api.xml
===================================================================
RCS file: /cvs/public/gtk-sharp/api/gtk-api.xml,v
retrieving revision 1.26
diff -u -r1.26 gtk-api.xml
--- api/gtk-api.xml 22 Feb 2003 04:34:55 -0000 1.26
+++ api/gtk-api.xml 22 Mar 2003 19:29:20 -0000
@@ -5141,8 +5141,77 @@
<property name="ShowText" cname="show_text" type="gboolean" doc-string=" _(Whether the progress is shown as text)" readable="true" writeable="true"/>
<property name="TextXalign" cname="text_xalign" type="gfloat" doc-string=" _(A number between 0.0 and 1.0 specifying the horizontal alignment of the text in the progresswidget)" readable="true" writeable="true"/>
<property name="TextYalign" cname="text_yalign" type="gfloat" doc-string=" _(A number between 0.0 and 1.0 specifying the vertical alignment of the text in the progress widget)" readable="true" writeable="true"/>
- <method name="GetType" cname="gtk_progress_get_type" shared="true">
- <return-type type="GtkType"/>
+ <method name="Configure" cname="gtk_progress_configure">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="gdouble" name="value"/>
+ <parameter type="gdouble" name="min"/>
+ <parameter type="gdouble" name="max"/>
+ </parameters>
+ </method>
+ <method name="GetCurrentPercentage" cname="gtk_progress_get_current_percentage">
+ <return-type type="gdouble"/>
+ </method>
+ <method name="GetCurrentText" cname="gtk_progress_get_current_text">
+ <return-type type="gchar*"/>
+ </method>
+ <method name="GetPercentageFromValue" cname="gtk_progress_get_percentage_from_value">
+ <return-type type="gdouble"/>
+ <parameters>
+ <parameter type="gdouble" name="value"/>
+ </parameters>
+ </method>
+ <method name="GetTextFromValue" cname="gtk_progress_get_text_from_value">
+ <return-type type="gchar*"/>
+ <parameters>
+ <parameter type="gdouble" name="value"/>
+ </parameters>
+ </method>
+ <method name="GetValue" cname="gtk_progress_get_value">
+ <return-type type="gdouble"/>
+ </method>
+ <method name="SetActivityMode" cname="gtk_progress_set_activity_mode">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="gboolean" name="activity_mode"/>
+ </parameters>
+ </method>
+ <method name="SetAdjustment" cname="gtk_progress_set_adjustment">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="GtkAdjustment*" name="adjustment"/>
+ </parameters>
+ </method>
+ <method name="SetFormatString" cname="gtk_progress_set_format_string">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="const-gchar*" name="format"/>
+ </parameters>
+ </method>
+ <method name="SetPercentage" cname="gtk_progress_set_percentage">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="gdouble" name="percentage"/>
+ </parameters>
+ </method>
+ <method name="SetShowText" cname="gtk_progress_set_show_text">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="gboolean" name="show_text"/>
+ </parameters>
+ </method>
+ <method name="SetTextAlignment" cname="gtk_progress_set_text_alignment">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="gfloat" name="x_align"/>
+ <parameter type="gfloat" name="y_align"/>
+ </parameters>
+ </method>
+ <method name="SetValue" cname="gtk_progress_set_value">
+ <return-type type="void"/>
+ <parameters>
+ <parameter type="gdouble" name="value"/>
+ </parameters>
</method>
</object>
<object name="ProgressBar" cname="GtkProgressBar" parent="GtkProgress">
@@ -11765,7 +11834,7 @@
<member cname="GTK_HTML_ETCH_OUT" name="Out"/>
<member cname="GTK_HTML_ETCH_NONE" name="None"/>
</enum>
- <enum name="HTMLFontStyle" cname="GtkHTMLFontStyle" type="flags">
+ <enum name="HTMLFontStyle" cname="GtkHTMLFontStyle" type="enum">
<member cname="GTK_HTML_FONT_STYLE_DEFAULT" name="Default"/>
<member cname="GTK_HTML_FONT_STYLE_SIZE_1" name="Size1" value="1"/>
<member cname="GTK_HTML_FONT_STYLE_SIZE_2" name="Size2" value="2"/>
@@ -11775,22 +11844,24 @@
<member cname="GTK_HTML_FONT_STYLE_SIZE_6" name="Size6" value="6"/>
<member cname="GTK_HTML_FONT_STYLE_SIZE_7" name="Size7" value="7"/>
<member cname="GTK_HTML_FONT_STYLE_SIZE_MASK" name="SizeMask" value="0x7"/>
- <member cname="GTK_HTML_FONT_STYLE_BOLD" name="Bold" value="1 << 3"/>
- <member cname="GTK_HTML_FONT_STYLE_ITALIC" name="Italic" value="1 << 4"/>
- <member cname="GTK_HTML_FONT_STYLE_UNDERLINE" name="Underline" value="1 << 5"/>
- <member cname="GTK_HTML_FONT_STYLE_STRIKEOUT" name="Strikeout" value="1 << 6"/>
- <member cname="GTK_HTML_FONT_STYLE_FIXED" name="Fixed" value="1 << 7"/>
- <member cname="GTK_HTML_FONT_STYLE_SUBSCRIPT" name="Subscript" value="1 << 8"/>
- <member cname="GTK_HTML_FONT_STYLE_SUPERSCRIPT" name="Superscript" value="1 << 9"/>
+ <member cname="GTK_HTML_FONT_STYLE_BOLD" name="Bold" value="1 << GTK_HTML_FONT_STYLE_SHIFT_BOLD"/>
+ <member cname="GTK_HTML_FONT_STYLE_ITALIC" name="Italic" value="1 << GTK_HTML_FONT_STYLE_SHIFT_ITALIC"/>
+ <member cname="GTK_HTML_FONT_STYLE_UNDERLINE" name="Underline" value="1 << GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE"/>
+ <member cname="GTK_HTML_FONT_STYLE_STRIKEOUT" name="Strikeout" value="1 << GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT"/>
+ <member cname="GTK_HTML_FONT_STYLE_FIXED" name="Fixed" value="1 << GTK_HTML_FONT_STYLE_SHIFT_FIXED"/>
+ <member cname="GTK_HTML_FONT_STYLE_SUBSCRIPT" name="Subscript" value="1 << GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT"/>
+ <member cname="GTK_HTML_FONT_STYLE_SUPERSCRIPT" name="Superscript" value="1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT"/>
</enum>
<enum name="HTMLFontStyleShift" cname="GtkHTMLFontStyleShift" type="enum">
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_BOLD" name="Bold" value="3"/>
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_ITALIC" name="Italic" value="4"/>
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE" name="Underline" value="5"/>
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT" name="Strikeout" value="6"/>
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_FIXED" name="Fixed" value="7"/>
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT" name="Subscript" value="8"/>
- <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT" name="Superscript" value="9"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_FIRST" name="First" value="3"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_BOLD" name="Bold"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_ITALIC" name="Italic"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE" name="Underline"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT" name="Strikeout"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_FIXED" name="Fixed"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT" name="Subscript"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT" name="Superscript"/>
+ <member cname="GTK_HTML_FONT_STYLE_SHIFT_LAST" name="Last"/>
</enum>
<enum name="HTMLParagraphAlignment" cname="GtkHTMLParagraphAlignment" type="enum">
<member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_LEFT" name="Left"/>
@@ -11862,7 +11933,6 @@
</parameters>
</callback>
<object name="HTML" cname="GtkHTML" parent="GtkLayout">
- <field cname="editor_bindings" type="GtkBindingSet*"/>
<field cname="iframe_parent" type="GtkWidget*"/>
<field cname="frame" type="HTMLObject*"/>
<field cname="editor_api" type="GtkHTMLEditorAPI*"/>
@@ -12026,6 +12096,10 @@
<parameter type="GtkHTMLCommandType" name="com_type"/>
</parameters>
</signal>
+ <property name="Editable" cname="editable" type="gboolean" doc-string=" _(Whether the html can be edited)" readable="true" writeable="true"/>
+ <property name="Title" cname="title" type="gchar*" doc-string=" _(The title of the current document)" readable="true" writeable="true"/>
+ <property name="DocumentBase" cname="document_base" type="gchar*" doc-string=" _(The base URL for relative references)" readable="true" writeable="true"/>
+ <property name="TargetBase" cname="target_base" type="gchar*" doc-string=" _(The base URL of the targe frame)" readable="true" writeable="true"/>
<method name="AllowSelection" cname="gtk_html_allow_selection">
<return-type type="void"/>
<parameters>
--=-shll39eN99uQT3UrOlUL--