2003-10-14 Mike Kestner <mkestner@ximian.com>

* gtk/gtk-api.xml : regenerated
	* gtk/Gtk.metadata : begin the port of the Gtk rules
	* gtk/Makefile.in : apply metadata in gen target
	* gtkhtml/gtkhtml-api.xml : regenerated
	* gtkhtml/Gtk.metadata : a couple rules ported
	* gtkhtml/Makefile.in : apply metadata in gen target
	* sources/Gtk.metadata : port first 350 lines of rules.

svn path=/trunk/gtk-sharp/; revision=19047
This commit is contained in:
Mike Kestner 2003-10-14 20:29:59 +00:00
parent 4877d314e9
commit 708906b081
8 changed files with 6997 additions and 7251 deletions

View file

@ -1,3 +1,13 @@
2003-10-14 Mike Kestner <mkestner@ximian.com>
* gtk/gtk-api.xml : regenerated
* gtk/Gtk.metadata : begin the port of the Gtk rules
* gtk/Makefile.in : apply metadata in gen target
* gtkhtml/gtkhtml-api.xml : regenerated
* gtkhtml/Gtk.metadata : a couple rules ported
* gtkhtml/Makefile.in : apply metadata in gen target
* sources/Gtk.metadata : port first 350 lines of rules.
2003-10-14 Mike Kestner <mkestner@ximian.com>
* gtk/gtk-api.xml : regenerated

65
gtk/Gtk.metadata Normal file
View file

@ -0,0 +1,65 @@
<?xml version="1.0"?>
<metadata>
<attr path="//interface[@cname='GtkEditable']/method[@name='InsertText']/*/*[@name='position']" name="pass_as">ref</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIter']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFirst']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFromString']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='IterChildren']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNext']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNthChild']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//interface[@cname='GtkTreeModel']/method[@name='IterParent']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkButton']/constructor[@cname='gtk_button_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkCheckButton']/constructor[@cname='gtk_check_button_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkLabel']/constructor[@cname='gtk_label_new']" name="preferred">1</attr>
<attr path="//object[@cname='GtkMenuItem']/constructor[@cname='gtk_menu_item_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkListStore']/constructor[@cname='gtk_list_store_newv']/parameters" name="va_type">length_param</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkListStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
<attr path="//object[@cname='GtkProgressBar']" name="parent">GtkWidget</attr>
<attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkRadioMenuItem']/constructor[@cname='gtk_radio_menu_item_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkScrolledWindow']/method[@name='GetPolicy']/*/*[@type='GtkPolicyType*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetEndIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtChildAnchor']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLineIndex']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLineOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtMark']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetSelectionBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextBuffer']/method[@name='GetStartIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextLayout']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextView']/method[@name='GetIterAtLocation']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTextView']/method[@name='GetLineAtY']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkToggleButton']/constructor[@cname='gtk_toggle_button_new_with_mnemonic']" name="preferred">1</attr>
<attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertChildIterToIter']/*/*[@name='sort_iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertIterToChildIter']/*/*[@name='child_iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/constructor[@cname='gtk_tree_store_newv']/parameters" name="va_type">length_param</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetCellArea']/*/*[@name='rect']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='focus_column']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='path']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='pos']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='path']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='pos']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='path']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkWidget']/method[@name='ClassPath']/*/*[@type='gchar**']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkWidget']/method[@name='Intersect']/*/*[@name='intersection']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkWidget']/method[@name='Path']/*/*[@type='gchar**']" name="pass_as">out</attr>
<attr path="//object[@cname='GtkWidget']/method[@name='SizeRequest']/*/*[@name='requisition']" name="pass_as">ref</attr>
</metadata>

View file

@ -11,7 +11,8 @@ ASSEMBLY=gtk-sharp.dll
all: $(ASSEMBLY)
generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe
generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gtk.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=gtk-api.xml --metadata=Gtk.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \
--include $(INCLUDE_APIS) --outdir=generated --customdir=. \
--assembly-name=gtk-sharp && touch generated-stamp

File diff suppressed because it is too large Load diff

7
gtkhtml/Gtk.metadata Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<metadata>
<attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="type">const-guchar*</attr>
<attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="array">1</attr>
</metadata>

View file

@ -14,7 +14,8 @@ ASSEMBLY=gtkhtml-sharp.dll
all: $(ASSEMBLY)
generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe
generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe Gtk.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=gtkhtml-api.xml --metadata=Gtk.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \
--include $(INCLUDE_APIS) --outdir=generated --customdir=. \
--assembly-name=gtkhtml-sharp && touch generated-stamp

File diff suppressed because it is too large Load diff

View file

@ -1,342 +1,6 @@
<?xml version="1.0"?>
<metadata>
<!-- out parameters -->
<rule>
<class name="GtkEditable">
<method>InsertText</method>
</class>
<data>
<attribute target="param">
<filter level="name">position</filter>
<name>pass_as</name>
<value>ref</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTextBuffer">
<method>GetIterAtLineOffset</method>
<method>GetIterAtLineIndex</method>
<method>GetIterAtOffset</method>
<method>GetIterAtLine</method>
<method>GetStartIter</method>
<method>GetEndIter</method>
<method>GetBounds</method>
<method>GetIterAtMark</method>
<method>GetIterAtChildAnchor</method>
<method>GetSelectionBounds</method>
</class>
<class name="GtkTextLayout">
<method>GetIterAtLine</method>
</class>
<class name="GtkTextView">
<method>GetIterAtLocation</method>
<method>GetLineAtY</method>
</class>
<data>
<attribute target="param">
<filter level="type">GtkTextIter*</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkListStore">
<method>Append</method>
<method>Insert</method>
<method>InsertAfter</method>
<method>InsertBefore</method>
<method>Prepend</method>
<method>Remove</method>
</class>
<data>
<attribute target="param">
<filter level="name">iter</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkListStore">
<method>SetColumnTypes</method>
</class>
<data>
<attribute target="param">
<filter level="name">types</filter>
<name>array</name>
<value>true</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeStore">
<method>SetColumnTypes</method>
</class>
<data>
<attribute target="param">
<filter level="name">types</filter>
<name>array</name>
<value>true</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeModelSort">
<method>ConvertChildIterToIter</method>
</class>
<data>
<attribute target="param">
<filter level="name">sort_iter</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeModel">
<method>GetIter</method>
<method>GetIterFirst</method>
<method>GetIterFromString</method>
<method>IterChildren</method>
<method>IterNext</method>
<method>IterNthChild</method>
<method>IterParent</method>
</class>
<data>
<attribute target="param">
<filter level="name">iter</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeModelSort">
<method>ConvertIterToChildIter</method>
</class>
<data>
<attribute target="param">
<filter level="name">child_iter</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeStore">
<method>Append</method>
<method>Insert</method>
<method>InsertAfter</method>
<method>InsertBefore</method>
<method>Prepend</method>
<method>Remove</method>
</class>
<data>
<attribute target="param">
<filter level="name">iter</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkScrolledWindow">
<method>GetPolicy</method>
</class>
<data>
<attribute target="param">
<filter level="type">GtkPolicyType*</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkWidget">
<method>Path</method>
<method>ClassPath</method>
</class>
<data>
<attribute target="param">
<filter name="type">gchar**</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkWidget">
<method>Intersect</method>
</class>
<data>
<attribute target="param">
<filter level="name">intersection</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkWidget">
<method>SizeRequest</method>
</class>
<data>
<attribute target="param">
<filter level="name">requisition</filter>
<name>pass_as</name>
<value>ref</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeView">
<method>GetCursor</method>
</class>
<data>
<attribute target="param">
<filter level="name">focus_column</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
<attribute target="param">
<filter level="name">path</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeView">
<method>GetDragDestRow</method>
<method>GetDestRowAtPos</method>
</class>
<data>
<attribute target="param">
<filter level="name">pos</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
<attribute target="param">
<filter level="name">path</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeView">
<method>GetCellArea</method>
</class>
<data>
<attribute target="param">
<filter level="name">rect</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<!-- variable arguments -->
<rule>
<class name="GtkTreeStore">
<constructor>gtk_tree_store_newv</constructor>
</class>
<data>
<attribute target="parameters">
<name>va_type</name>
<value>length_param</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkListStore">
<constructor>gtk_list_store_newv</constructor>
</class>
<data>
<attribute target="parameters">
<name>va_type</name>
<value>length_param</value>
</attribute>
</data>
</rule>
<!-- misc -->
<rule>
<class name="GtkHTMLStream">
<method>Write</method>
</class>
<data>
<attribute target="param">
<filter level="name">buffer</filter>
<name>type</name>
<value>const-guchar*</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkHTMLStream">
<method>Write</method>
</class>
<data>
<attribute target="param">
<filter level="name">buffer</filter>
<name>array</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- constructor collision hints -->
<rule>
<class name="GtkButton">
<constructor>gtk_button_new_with_mnemonic</constructor>
</class>
<class name="GtkCheckButton">
<constructor>gtk_check_button_new_with_mnemonic</constructor>
</class>
<class name="GtkRadioButton">
<constructor>gtk_radio_button_new_with_mnemonic</constructor>
</class>
<class name="GtkToggleButton">
<constructor>gtk_toggle_button_new_with_mnemonic</constructor>
</class>
<class name="GtkLabel">
<constructor>gtk_label_new</constructor>
</class>
<class name="GtkMenuItem">
<constructor>gtk_menu_item_new_with_mnemonic</constructor>
</class>
<class name="GtkCheckMenuItem">
<constructor>gtk_check_menu_item_new_with_mnemonic</constructor>
</class>
<class name="GtkRadioMenuItem">
<constructor>gtk_radio_menu_item_new_with_mnemonic</constructor>
</class>
<class name="GtkImageMenuItem">
<constructor>gtk_image_menu_item_new_with_mnemonic</constructor>
</class>
<data>
<attribute target="method">
<name>preferred</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkProgressBar"/>
<data>
<attribute target="class">
<name>parent</name>
<value>GtkWidget</value>
</attribute>
</data>
</rule>
<!-- renames -->
<rule>
<class name="GtkAccelerator_">