2002-07-17 Rachel Hestilow <hestilow@ximian.com>

* generator/Method.cs: Honor array in return type.

	* parser/Gtk.metadata: Tag FileSelection.GetSelections as array.
	* parser/Metadata.pm: Add "return" target.

	* parser/gtkhtml, parser/README: Add gtkhtml-stream.[ch].
	Needed for url-requested signal. The actual wrapper for this
	compiles but is badly borked, it will probably need a lot of love.

svn path=/trunk/gtk-sharp/; revision=5852
This commit is contained in:
Rachel Hestilow 2002-07-17 14:31:13 +00:00
parent ec3f7ead3e
commit faf9967df6
9 changed files with 76 additions and 5 deletions

View file

@ -1,3 +1,14 @@
2002-07-17 Rachel Hestilow <hestilow@ximian.com>
* generator/Method.cs: Honor array in return type.
* parser/Gtk.metadata: Tag FileSelection.GetSelections as array.
* parser/Metadata.pm: Add "return" target.
* parser/gtkhtml, parser/README: Add gtkhtml-stream.[ch].
Needed for url-requested signal. The actual wrapper for this
compiles but is badly borked, it will probably need a lot of love.
2002-07-16 Mike Kestner <mkestner@speakeasy.net> 2002-07-16 Mike Kestner <mkestner@speakeasy.net>
* generator/ClassBase.cs : make MarshalType virtual. * generator/ClassBase.cs : make MarshalType virtual.

View file

@ -121,6 +121,11 @@ namespace GtkSharp.Generation {
s_ret = SymbolTable.GetCSType(rettype); s_ret = SymbolTable.GetCSType(rettype);
cname = elem.GetAttribute("cname"); cname = elem.GetAttribute("cname");
if (ret_elem.HasAttribute("array")) {
s_ret += "[]";
m_ret += "[]";
}
if (parms != null && parms.ThrowsException) if (parms != null && parms.ThrowsException)
safety = "unsafe "; safety = "unsafe ";
else else

View file

@ -5211,6 +5211,12 @@
<method name="SelectParagraphExtended" cname="gtk_html_select_paragraph_extended"> <method name="SelectParagraphExtended" cname="gtk_html_select_paragraph_extended">
<return-type type="void"/> <return-type type="void"/>
</method> </method>
<method name="StreamLogNew" cname="gtk_html_stream_log_new">
<return-type type="GtkHTMLStream*"/>
<parameters>
<parameter type="GtkHTMLStream*" name="stream"/>
</parameters>
</method>
<constructor cname="gtk_html_new_from_string"> <constructor cname="gtk_html_new_from_string">
<parameters> <parameters>
<parameter type="const-gchar*" name="str"/> <parameter type="const-gchar*" name="str"/>
@ -5318,6 +5324,15 @@
<parameter type="GtkHTMLFontStyle" name="or_mask"/> <parameter type="GtkHTMLFontStyle" name="or_mask"/>
</parameters> </parameters>
</method> </method>
<method name="StreamNew" cname="gtk_html_stream_new">
<return-type type="GtkHTMLStream*"/>
<parameters>
<parameter type="GtkHTMLStreamTypesFunc" name="type_func"/>
<parameter type="GtkHTMLStreamWriteFunc" name="write_func"/>
<parameter type="GtkHTMLStreamCloseFunc" name="close_func"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</method>
<method name="GetUrlObjectRelative" cname="gtk_html_get_url_object_relative"> <method name="GetUrlObjectRelative" cname="gtk_html_get_url_object_relative">
<return-type type="char*"/> <return-type type="char*"/>
<parameters> <parameters>
@ -5558,6 +5573,12 @@
</parameters> </parameters>
</callback> </callback>
</struct> </struct>
<struct name="HTMLStream" cname="GtkHTMLStream">
<field cname="write_func" type="GtkHTMLStreamWriteFunc"/>
<field cname="close_func" type="GtkHTMLStreamCloseFunc"/>
<field cname="types_func" type="GtkHTMLStreamTypesFunc"/>
<field cname="user_data" type="gpointer"/>
</struct>
</namespace> </namespace>
<namespace name="Gdk" library="gdk-x11-2.0"> <namespace name="Gdk" library="gdk-x11-2.0">
<enum name="AxisUse" cname="GdkAxisUse" type="enum"> <enum name="AxisUse" cname="GdkAxisUse" type="enum">
@ -10689,7 +10710,7 @@
</parameters> </parameters>
</method> </method>
<method name="GetSelections" cname="gtk_file_selection_get_selections"> <method name="GetSelections" cname="gtk_file_selection_get_selections">
<return-type type="gchar**"/> <return-type type="gchar**" array="1"/>
</method> </method>
<method name="Complete" cname="gtk_file_selection_complete"> <method name="Complete" cname="gtk_file_selection_complete">
<return-type type="void"/> <return-type type="void"/>

View file

@ -99,6 +99,9 @@ sub fixupParams {
if ($node->nodeName eq "parameters") { if ($node->nodeName eq "parameters") {
$params_node = $node; $params_node = $node;
last; last;
} elsif ($node->nodeName eq "return-type" and $$data[1] eq "return") {
$node->setAttribute ($$data[5], $$data[6]);
last;
} }
} }
next if not $params_node; next if not $params_node;

View file

@ -56,6 +56,20 @@
</data> </data>
</rule> </rule>
<!-- misc -->
<rule>
<class name="GtkFileSelection">
<method>GetSelections</method>
</class>
<data>
<attribute target="return">
<name>array</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- constructor collision hints --> <!-- constructor collision hints -->
<rule> <rule>
<class name="GtkButton"> <class name="GtkButton">

View file

@ -99,6 +99,9 @@ sub fixupParams {
if ($node->nodeName eq "parameters") { if ($node->nodeName eq "parameters") {
$params_node = $node; $params_node = $node;
last; last;
} elsif ($node->nodeName eq "return-type" and $$data[1] eq "return") {
$node->setAttribute ($$data[5], $$data[6]);
last;
} }
} }
next if not $params_node; next if not $params_node;

View file

@ -9,5 +9,5 @@ gtk+-2.0.3
libgnome-2.0.1 libgnome-2.0.1
libgnomecanvas-2.0.1 libgnomecanvas-2.0.1
libgnomeui-2.0.1 libgnomeui-2.0.1
gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h and gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h,
gtkhtml-enums.h gtkhtml-enums.h, gtkhtml-stream.[ch]

View file

@ -56,6 +56,20 @@
</data> </data>
</rule> </rule>
<!-- misc -->
<rule>
<class name="GtkFileSelection">
<method>GetSelections</method>
</class>
<data>
<attribute target="return">
<name>array</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- constructor collision hints --> <!-- constructor collision hints -->
<rule> <rule>
<class name="GtkButton"> <class name="GtkButton">

View file

@ -9,5 +9,5 @@ gtk+-2.0.3
libgnome-2.0.1 libgnome-2.0.1
libgnomecanvas-2.0.1 libgnomecanvas-2.0.1
libgnomeui-2.0.1 libgnomeui-2.0.1
gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h and gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h,
gtkhtml-enums.h gtkhtml-enums.h, gtkhtml-stream.[ch]