2008-05-08 Mike Kestner <mkestner@novell.com>

* atk/atk-api-2.12.raw: reparsed.
	* gdk/gdk-api-2.12.raw: reparsed.
	* gtk/gtk-api-2.12.raw: reparsed.
	* parser/gapi2xml.pl: fixes for signal and vm order needed for 
	proper interface struct layout. [Fixes #386802]

svn path=/trunk/gtk-sharp/; revision=102848
This commit is contained in:
Mike Kestner 2008-05-08 23:23:49 +00:00
parent d7586a9e15
commit d1dbdf0316
5 changed files with 353 additions and 328 deletions

View File

@ -1,3 +1,11 @@
2008-05-08 Mike Kestner <mkestner@novell.com>
* atk/atk-api-2.12.raw: reparsed.
* gdk/gdk-api-2.12.raw: reparsed.
* gtk/gtk-api-2.12.raw: reparsed.
* parser/gapi2xml.pl: fixes for signal and vm order needed for
proper interface struct layout. [Fixes #386802]
2008-05-07 Stephane Delcroix <sdelcroix@novell.com>
* gtk/Object.custom: swap the event removing and destroy calls.

View File

@ -358,13 +358,6 @@
</method>
</interface>
<interface name="Component" cname="AtkComponent">
<signal name="BoundsChanged" cname="bounds_changed" when="LAST" field_name="bounds_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkComponent*" name="component" />
<parameter type="AtkRectangle*" name="bounds" />
</parameters>
</signal>
<virtual_method name="AddFocusHandler" cname="add_focus_handler">
<return-type type="guint" />
<parameters>
@ -471,6 +464,13 @@
<parameter type="AtkComponent*" name="component" />
</parameters>
</virtual_method>
<signal name="BoundsChanged" cname="bounds_changed" when="LAST" field_name="bounds_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkComponent*" name="component" />
<parameter type="AtkRectangle*" name="bounds" />
</parameters>
</signal>
<virtual_method name="GetAlpha" cname="get_alpha">
<return-type type="gdouble" />
<parameters>
@ -572,24 +572,6 @@
</method>
</interface>
<interface name="Document" cname="AtkDocument">
<signal name="LoadComplete" cname="load_complete" when="LAST">
<return-type type="void" />
<parameters>
<parameter name="inst" type="AtkDocument*" />
</parameters>
</signal>
<signal name="Reload" cname="reload" when="LAST">
<return-type type="void" />
<parameters>
<parameter name="inst" type="AtkDocument*" />
</parameters>
</signal>
<signal name="LoadStopped" cname="load_stopped" when="LAST">
<return-type type="void" />
<parameters>
<parameter name="inst" type="AtkDocument*" />
</parameters>
</signal>
<virtual_method name="GetDocumentType" cname="get_document_type">
<return-type type="const-gchar*" />
<parameters>
@ -629,6 +611,24 @@
<parameter type="const-gchar*" name="attribute_value" />
</parameters>
</virtual_method>
<signal name="LoadComplete" cname="load_complete" when="LAST">
<return-type type="void" />
<parameters>
<parameter name="inst" type="AtkDocument*" />
</parameters>
</signal>
<signal name="Reload" cname="reload" when="LAST">
<return-type type="void" />
<parameters>
<parameter name="inst" type="AtkDocument*" />
</parameters>
</signal>
<signal name="LoadStopped" cname="load_stopped" when="LAST">
<return-type type="void" />
<parameters>
<parameter name="inst" type="AtkDocument*" />
</parameters>
</signal>
<method name="GetAttributeValue" cname="atk_document_get_attribute_value">
<return-type type="const-gchar*" />
<parameters>
@ -783,13 +783,6 @@
</method>
</interface>
<interface name="Hypertext" cname="AtkHypertext">
<signal name="LinkSelected" cname="link_selected" when="LAST" field_name="link_selected">
<return-type type="void" />
<parameters>
<parameter type="AtkHypertext*" name="hypertext" />
<parameter type="gint" name="link_index" />
</parameters>
</signal>
<virtual_method name="GetLink" cname="get_link">
<return-type type="AtkHyperlink*" />
<parameters>
@ -810,6 +803,13 @@
<parameter type="gint" name="char_index" />
</parameters>
</virtual_method>
<signal name="LinkSelected" cname="link_selected" when="LAST" field_name="link_selected">
<return-type type="void" />
<parameters>
<parameter type="AtkHypertext*" name="hypertext" />
<parameter type="gint" name="link_index" />
</parameters>
</signal>
<method name="GetLink" cname="atk_hypertext_get_link">
<return-type type="AtkHyperlink*" />
<parameters>
@ -912,12 +912,6 @@
</method>
</interface>
<interface name="Selection" cname="AtkSelection">
<signal name="SelectionChanged" cname="selection_changed" when="LAST" field_name="selection_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkSelection*" name="selection" />
</parameters>
</signal>
<virtual_method name="AddSelection" cname="add_selection">
<return-type type="gboolean" />
<parameters>
@ -964,6 +958,12 @@
<parameter type="AtkSelection*" name="selection" />
</parameters>
</virtual_method>
<signal name="SelectionChanged" cname="selection_changed" when="LAST" field_name="selection_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkSelection*" name="selection" />
</parameters>
</signal>
<method name="AddSelection" cname="atk_selection_add_selection">
<return-type type="gboolean" />
<parameters>
@ -1055,56 +1055,6 @@
</method>
</interface>
<interface name="Table" cname="AtkTable">
<signal name="RowInserted" cname="row_inserted" when="LAST" field_name="row_inserted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="row" />
<parameter type="gint" name="num_inserted" />
</parameters>
</signal>
<signal name="ColumnInserted" cname="column_inserted" when="LAST" field_name="column_inserted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="column" />
<parameter type="gint" name="num_inserted" />
</parameters>
</signal>
<signal name="RowDeleted" cname="row_deleted" when="LAST" field_name="row_deleted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="row" />
<parameter type="gint" name="num_deleted" />
</parameters>
</signal>
<signal name="ColumnDeleted" cname="column_deleted" when="LAST" field_name="column_deleted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="column" />
<parameter type="gint" name="num_deleted" />
</parameters>
</signal>
<signal name="RowReordered" cname="row_reordered" when="LAST" field_name="row_reordered">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
</parameters>
</signal>
<signal name="ColumnReordered" cname="column_reordered" when="LAST" field_name="column_reordered">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
</parameters>
</signal>
<signal name="ModelChanged" cname="model_changed" when="LAST" field_name="model_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
</parameters>
</signal>
<virtual_method name="RefAt" cname="ref_at">
<return-type type="AtkObject*" />
<parameters>
@ -1313,6 +1263,56 @@
<parameter type="gint" name="column" />
</parameters>
</virtual_method>
<signal name="RowInserted" cname="row_inserted" when="LAST" field_name="row_inserted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="row" />
<parameter type="gint" name="num_inserted" />
</parameters>
</signal>
<signal name="ColumnInserted" cname="column_inserted" when="LAST" field_name="column_inserted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="column" />
<parameter type="gint" name="num_inserted" />
</parameters>
</signal>
<signal name="RowDeleted" cname="row_deleted" when="LAST" field_name="row_deleted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="row" />
<parameter type="gint" name="num_deleted" />
</parameters>
</signal>
<signal name="ColumnDeleted" cname="column_deleted" when="LAST" field_name="column_deleted">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
<parameter type="gint" name="column" />
<parameter type="gint" name="num_deleted" />
</parameters>
</signal>
<signal name="RowReordered" cname="row_reordered" when="LAST" field_name="row_reordered">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
</parameters>
</signal>
<signal name="ColumnReordered" cname="column_reordered" when="LAST" field_name="column_reordered">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
</parameters>
</signal>
<signal name="ModelChanged" cname="model_changed" when="LAST" field_name="model_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkTable*" name="table" />
</parameters>
</signal>
<method name="AddColumnSelection" cname="atk_table_add_column_selection">
<return-type type="gboolean" />
<parameters>
@ -1489,33 +1489,6 @@
</method>
</interface>
<interface name="Text" cname="AtkText">
<signal name="TextChanged" cname="text_changed" when="LAST" field_name="text_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
<parameter type="gint" name="position" />
<parameter type="gint" name="length" />
</parameters>
</signal>
<signal name="TextCaretMoved" cname="text_caret_moved" when="LAST" field_name="text_caret_moved">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
<parameter type="gint" name="location" />
</parameters>
</signal>
<signal name="TextSelectionChanged" cname="text_selection_changed" when="LAST" field_name="text_selection_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
</parameters>
</signal>
<signal name="TextAttributesChanged" cname="text_attributes_changed" when="LAST" field_name="text_attributes_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
</parameters>
</signal>
<virtual_method name="GetText" cname="get_text">
<return-type type="gchar*" />
<parameters>
@ -1655,6 +1628,33 @@
<parameter type="gint" name="offset" />
</parameters>
</virtual_method>
<signal name="TextChanged" cname="text_changed" when="LAST" field_name="text_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
<parameter type="gint" name="position" />
<parameter type="gint" name="length" />
</parameters>
</signal>
<signal name="TextCaretMoved" cname="text_caret_moved" when="LAST" field_name="text_caret_moved">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
<parameter type="gint" name="location" />
</parameters>
</signal>
<signal name="TextSelectionChanged" cname="text_selection_changed" when="LAST" field_name="text_selection_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
</parameters>
</signal>
<signal name="TextAttributesChanged" cname="text_attributes_changed" when="LAST" field_name="text_attributes_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkText*" name="text" />
</parameters>
</signal>
<virtual_method name="GetRangeExtents" cname="get_range_extents">
<return-type type="void" />
<parameters>
@ -1931,12 +1931,6 @@
<property name="NumberOfAnchors" cname="number-of-anchors" type="gint" readable="true" />
<property name="EndIndex" cname="end-index" type="gint" readable="true" />
<property name="StartIndex" cname="start-index" type="gint" readable="true" />
<signal name="LinkActivated" cname="link_activated" when="LAST" field_name="link_activated">
<return-type type="void" />
<parameters>
<parameter type="AtkHyperlink*" name="link_" />
</parameters>
</signal>
<virtual_method name="GetUri" cname="get_uri">
<return-type type="gchar*" />
<parameters>
@ -1987,6 +1981,12 @@
<parameter type="AtkHyperlink*" name="link_" />
</parameters>
</virtual_method>
<signal name="LinkActivated" cname="link_activated" when="LAST" field_name="link_activated">
<return-type type="void" />
<parameters>
<parameter type="AtkHyperlink*" name="link_" />
</parameters>
</signal>
<implements>
<interface cname="AtkAction" />
</implements>
@ -2100,49 +2100,6 @@
<property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" readable="true" writeable="true" />
<property name="AtkObjectNamePropertyTableCaptionObject" cname="atk_object_name_property_table_caption_object" type="AtkObject" readable="true" writeable="true" />
<property name="AtkObjectNamePropertyHypertextNumLinks" cname="atk_object_name_property_hypertext_num_links" type="gint" readable="true" />
<signal name="ChildrenChanged" cname="children_changed" when="LAST" field_name="children_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="guint" name="change_index" />
<parameter type="gpointer" name="changed_child" />
</parameters>
</signal>
<signal name="FocusEvent" cname="focus_event" when="LAST" field_name="focus_event">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="gboolean" name="focus_in" />
</parameters>
</signal>
<signal name="PropertyChange" cname="property_change" when="LAST" field_name="property_change">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="AtkPropertyValues*" name="values" />
</parameters>
</signal>
<signal name="StateChange" cname="state_change" when="LAST" field_name="state_change">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="const-gchar*" name="name" />
<parameter type="gboolean" name="state_set" />
</parameters>
</signal>
<signal name="VisibleDataChanged" cname="visible_data_changed" when="LAST" field_name="visible_data_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
</parameters>
</signal>
<signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST" field_name="active_descendant_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="gpointer*" name="child" />
</parameters>
</signal>
<virtual_method name="GetName" cname="get_name">
<return-type type="const-gchar*" />
<parameters>
@ -2257,6 +2214,49 @@
<parameter type="gpointer" name="data" />
</parameters>
</virtual_method>
<signal name="ChildrenChanged" cname="children_changed" when="LAST" field_name="children_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="guint" name="change_index" />
<parameter type="gpointer" name="changed_child" />
</parameters>
</signal>
<signal name="FocusEvent" cname="focus_event" when="LAST" field_name="focus_event">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="gboolean" name="focus_in" />
</parameters>
</signal>
<signal name="PropertyChange" cname="property_change" when="LAST" field_name="property_change">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="AtkPropertyValues*" name="values" />
</parameters>
</signal>
<signal name="StateChange" cname="state_change" when="LAST" field_name="state_change">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="const-gchar*" name="name" />
<parameter type="gboolean" name="state_set" />
</parameters>
</signal>
<signal name="VisibleDataChanged" cname="visible_data_changed" when="LAST" field_name="visible_data_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
</parameters>
</signal>
<signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST" field_name="active_descendant_changed">
<return-type type="void" />
<parameters>
<parameter type="AtkObject*" name="accessible" />
<parameter type="gpointer*" name="child" />
</parameters>
</signal>
<virtual_method name="GetAttributes" cname="get_attributes">
<return-type type="AtkAttributeSet*" />
<parameters>

View File

@ -674,13 +674,6 @@
<field name="DoubleClickDistance" cname="double_click_distance" type="guint" />
<field name="ButtonX" cname="button_x" array_len="2" type="gint" />
<field name="ButtonY" cname="button_y" array_len="2" type="gint" />
<signal name="Closed" cname="closed" when="LAST" field_name="closed">
<return-type type="void" />
<parameters>
<parameter type="GdkDisplay*" name="display" />
<parameter type="gboolean" name="is_error" />
</parameters>
</signal>
<virtual_method name="GetDisplayName" cname="get_display_name">
<return-type type="const-gchar*" />
<parameters>
@ -706,6 +699,13 @@
<parameter type="GdkDisplay*" name="display" />
</parameters>
</virtual_method>
<signal name="Closed" cname="closed" when="LAST" field_name="closed">
<return-type type="void" />
<parameters>
<parameter type="GdkDisplay*" name="display" />
<parameter type="gboolean" name="is_error" />
</parameters>
</signal>
<method name="AddClientMessageFilter" cname="gdk_display_add_client_message_filter">
<return-type type="void" />
<parameters>

View File

@ -1775,47 +1775,6 @@
</method>
</interface>
<interface name="FileChooser" cname="GtkFileChooser">
<signal name="CurrentFolderChanged" cname="current-folder-changed" when="LAST" field_name="current_folder_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="SelectionChanged" cname="selection-changed" when="LAST" field_name="selection_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="UpdatePreview" cname="update-preview" when="LAST" field_name="update_preview">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="FileActivated" cname="file-activated" when="LAST" field_name="file_activated">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="ConfirmOverwrite" cname="confirm-overwrite" when="LAST" field_name="confirm_overwrite">
<return-type type="GtkFileChooserConfirmation" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<property name="Action" cname="action" type="GtkFileChooserAction" readable="true" writeable="true" />
<property name="FileSystemBackend" cname="file-system-backend" type="gchar*" writeable="true" construct-only="true" />
<property name="Filter" cname="filter" type="GtkFileFilter" readable="true" writeable="true" />
<property name="LocalOnly" cname="local-only" type="gboolean" readable="true" writeable="true" />
<property name="PreviewWidget" cname="preview-widget" type="GtkWidget" readable="true" writeable="true" />
<property name="PreviewWidgetActive" cname="preview-widget-active" type="gboolean" readable="true" writeable="true" />
<property name="UsePreviewLabel" cname="use-preview-label" type="gboolean" readable="true" writeable="true" />
<property name="ExtraWidget" cname="extra-widget" type="GtkWidget" readable="true" writeable="true" />
<property name="SelectMultiple" cname="select-multiple" type="gboolean" readable="true" writeable="true" />
<property name="ShowHidden" cname="show-hidden" type="gboolean" readable="true" writeable="true" />
<property name="DoOverwriteConfirmation" cname="do-overwrite-confirmation" type="gboolean" readable="true" writeable="true" />
<virtual_method name="SetCurrentFolder" cname="set_current_folder">
<return-type type="gboolean" />
<parameters>
@ -1924,6 +1883,47 @@
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</virtual_method>
<signal name="CurrentFolderChanged" cname="current-folder-changed" when="LAST" field_name="current_folder_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="SelectionChanged" cname="selection-changed" when="LAST" field_name="selection_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="UpdatePreview" cname="update-preview" when="LAST" field_name="update_preview">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="FileActivated" cname="file-activated" when="LAST" field_name="file_activated">
<return-type type="void" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<signal name="ConfirmOverwrite" cname="confirm-overwrite" when="LAST" field_name="confirm_overwrite">
<return-type type="GtkFileChooserConfirmation" />
<parameters>
<parameter type="GtkFileChooser*" name="chooser" />
</parameters>
</signal>
<property name="Action" cname="action" type="GtkFileChooserAction" readable="true" writeable="true" />
<property name="FileSystemBackend" cname="file-system-backend" type="gchar*" writeable="true" construct-only="true" />
<property name="Filter" cname="filter" type="GtkFileFilter" readable="true" writeable="true" />
<property name="LocalOnly" cname="local-only" type="gboolean" readable="true" writeable="true" />
<property name="PreviewWidget" cname="preview-widget" type="GtkWidget" readable="true" writeable="true" />
<property name="PreviewWidgetActive" cname="preview-widget-active" type="gboolean" readable="true" writeable="true" />
<property name="UsePreviewLabel" cname="use-preview-label" type="gboolean" readable="true" writeable="true" />
<property name="ExtraWidget" cname="extra-widget" type="GtkWidget" readable="true" writeable="true" />
<property name="SelectMultiple" cname="select-multiple" type="gboolean" readable="true" writeable="true" />
<property name="ShowHidden" cname="show-hidden" type="gboolean" readable="true" writeable="true" />
<property name="DoOverwriteConfirmation" cname="do-overwrite-confirmation" type="gboolean" readable="true" writeable="true" />
<method name="AddFilter" cname="gtk_file_chooser_add_filter">
<return-type type="void" />
<parameters>
@ -2210,28 +2210,6 @@
</method>
</interface>
<interface name="RecentChooser" cname="GtkRecentChooser">
<signal name="SelectionChanged" cname="selection-changed" when="LAST" field_name="selection_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkRecentChooser*" name="chooser" />
</parameters>
</signal>
<signal name="ItemActivated" cname="item-activated" when="LAST" field_name="item_activated">
<return-type type="void" />
<parameters>
<parameter type="GtkRecentChooser*" name="chooser" />
</parameters>
</signal>
<property name="RecentManager" cname="recent-manager" type="GtkRecentManager" writeable="true" construct-only="true" />
<property name="ShowPrivate" cname="show-private" type="gboolean" readable="true" writeable="true" />
<property name="ShowTips" cname="show-tips" type="gboolean" readable="true" writeable="true" />
<property name="ShowIcons" cname="show-icons" type="gboolean" readable="true" writeable="true" />
<property name="ShowNotFound" cname="show-not-found" type="gboolean" readable="true" writeable="true" />
<property name="SelectMultiple" cname="select-multiple" type="gboolean" readable="true" writeable="true" />
<property name="LocalOnly" cname="local-only" type="gboolean" readable="true" writeable="true" />
<property name="Limit" cname="limit" type="gint" readable="true" writeable="true" />
<property name="SortType" cname="sort-type" type="GtkRecentSortType" readable="true" writeable="true" />
<property name="Filter" cname="filter" type="GtkRecentFilter" readable="true" writeable="true" />
<virtual_method name="SetCurrentUri" cname="set_current_uri">
<return-type type="gboolean" />
<parameters>
@ -2314,6 +2292,28 @@
<parameter type="GDestroyNotify" name="destroy" />
</parameters>
</virtual_method>
<signal name="SelectionChanged" cname="selection-changed" when="LAST" field_name="selection_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkRecentChooser*" name="chooser" />
</parameters>
</signal>
<signal name="ItemActivated" cname="item-activated" when="LAST" field_name="item_activated">
<return-type type="void" />
<parameters>
<parameter type="GtkRecentChooser*" name="chooser" />
</parameters>
</signal>
<property name="RecentManager" cname="recent-manager" type="GtkRecentManager" writeable="true" construct-only="true" />
<property name="ShowPrivate" cname="show-private" type="gboolean" readable="true" writeable="true" />
<property name="ShowTips" cname="show-tips" type="gboolean" readable="true" writeable="true" />
<property name="ShowIcons" cname="show-icons" type="gboolean" readable="true" writeable="true" />
<property name="ShowNotFound" cname="show-not-found" type="gboolean" readable="true" writeable="true" />
<property name="SelectMultiple" cname="select-multiple" type="gboolean" readable="true" writeable="true" />
<property name="LocalOnly" cname="local-only" type="gboolean" readable="true" writeable="true" />
<property name="Limit" cname="limit" type="gint" readable="true" writeable="true" />
<property name="SortType" cname="sort-type" type="GtkRecentSortType" readable="true" writeable="true" />
<property name="Filter" cname="filter" type="GtkRecentFilter" readable="true" writeable="true" />
<method name="AddFilter" cname="gtk_recent_chooser_add_filter">
<return-type type="void" />
<parameters>
@ -3547,6 +3547,13 @@
<property name="Name" cname="name" type="gchar*" readable="true" writeable="true" construct-only="true" />
<property name="Sensitive" cname="sensitive" type="gboolean" readable="true" writeable="true" />
<property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
<virtual_method name="GetAction" cname="get_action">
<return-type type="GtkAction*" />
<parameters>
<parameter type="GtkActionGroup*" name="action_group" />
<parameter type="const-gchar*" name="action_name" />
</parameters>
</virtual_method>
<signal name="ConnectProxy" cname="connect_proxy">
<return-type type="void" />
<parameters>
@ -3577,13 +3584,6 @@
<parameter name="p0" type="GtkAction" />
</parameters>
</signal>
<virtual_method name="GetAction" cname="get_action">
<return-type type="GtkAction*" />
<parameters>
<parameter type="GtkActionGroup*" name="action_group" />
<parameter type="const-gchar*" name="action_name" />
</parameters>
</virtual_method>
<implements>
<interface cname="GtkBuildable" />
</implements>
@ -4646,33 +4646,6 @@
<field name="CellBackgroundSet" cname="cell_background_set" bits="1" type="guint" />
<field name="Sensitive" cname="sensitive" bits="1" type="guint" />
<field name="Editing" cname="editing" bits="1" type="guint" />
<signal name="EditingCanceled" cname="editing-canceled" when="FIRST" field_name="editing_canceled">
<return-type type="void" />
<parameters>
<parameter type="GtkCellRenderer*" name="cell" />
</parameters>
</signal>
<signal name="EditingStarted" cname="editing-started" when="FIRST" field_name="editing_started">
<return-type type="void" />
<parameters>
<parameter type="GtkCellRenderer*" name="cell" />
<parameter type="GtkCellEditable*" name="editable" />
<parameter type="const-gchar*" name="path" />
</parameters>
</signal>
<property name="Mode" cname="mode" type="GtkCellRendererMode" readable="true" writeable="true" />
<property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
<property name="Sensitive" cname="sensitive" type="gboolean" readable="true" writeable="true" />
<property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
<property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
<property name="Xpad" cname="xpad" type="guint" readable="true" writeable="true" />
<property name="Ypad" cname="ypad" type="guint" readable="true" writeable="true" />
<property name="Width" cname="width" type="gint" readable="true" writeable="true" />
<property name="Height" cname="height" type="gint" readable="true" writeable="true" />
<property name="IsExpander" cname="is-expander" type="gboolean" readable="true" writeable="true" />
<property name="IsExpanded" cname="is-expanded" type="gboolean" readable="true" writeable="true" />
<property name="CellBackground" cname="cell-background" type="gchar*" writeable="true" />
<property name="CellBackgroundGdk" cname="cell-background-gdk" type="GdkColor" readable="true" writeable="true" />
<virtual_method name="GetSize" cname="get_size">
<return-type type="void" />
<parameters>
@ -4721,6 +4694,33 @@
<parameter type="GtkCellRendererState" name="flags" />
</parameters>
</virtual_method>
<signal name="EditingCanceled" cname="editing-canceled" when="FIRST" field_name="editing_canceled">
<return-type type="void" />
<parameters>
<parameter type="GtkCellRenderer*" name="cell" />
</parameters>
</signal>
<signal name="EditingStarted" cname="editing-started" when="FIRST" field_name="editing_started">
<return-type type="void" />
<parameters>
<parameter type="GtkCellRenderer*" name="cell" />
<parameter type="GtkCellEditable*" name="editable" />
<parameter type="const-gchar*" name="path" />
</parameters>
</signal>
<property name="Mode" cname="mode" type="GtkCellRendererMode" readable="true" writeable="true" />
<property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
<property name="Sensitive" cname="sensitive" type="gboolean" readable="true" writeable="true" />
<property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
<property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
<property name="Xpad" cname="xpad" type="guint" readable="true" writeable="true" />
<property name="Ypad" cname="ypad" type="guint" readable="true" writeable="true" />
<property name="Width" cname="width" type="gint" readable="true" writeable="true" />
<property name="Height" cname="height" type="gint" readable="true" writeable="true" />
<property name="IsExpander" cname="is-expander" type="gboolean" readable="true" writeable="true" />
<property name="IsExpanded" cname="is-expanded" type="gboolean" readable="true" writeable="true" />
<property name="CellBackground" cname="cell-background" type="gchar*" writeable="true" />
<property name="CellBackgroundGdk" cname="cell-background-gdk" type="GdkColor" readable="true" writeable="true" />
<method name="Activate" cname="gtk_cell_renderer_activate">
<return-type type="gboolean" />
<parameters>
@ -5575,6 +5575,12 @@
<parameter type="GtkComboBox*" name="combo_box" />
</parameters>
</signal>
<virtual_method name="GetActiveText" cname="get_active_text">
<return-type type="gchar*" />
<parameters>
<parameter type="GtkComboBox*" name="combo_box" />
</parameters>
</virtual_method>
<property name="Model" cname="model" type="GtkTreeModel" readable="true" writeable="true" />
<property name="WrapWidth" cname="wrap-width" type="gint" readable="true" writeable="true" />
<property name="RowSpanColumn" cname="row-span-column" type="gint" readable="true" writeable="true" />
@ -5585,12 +5591,6 @@
<property name="FocusOnClick" cname="focus-on-click" type="gboolean" readable="true" writeable="true" />
<property name="TearoffTitle" cname="tearoff-title" type="gchar*" readable="true" writeable="true" />
<property name="PopupShown" cname="popup-shown" type="gboolean" readable="true" />
<virtual_method name="GetActiveText" cname="get_active_text">
<return-type type="gchar*" />
<parameters>
<parameter type="GtkComboBox*" name="combo_box" />
</parameters>
</virtual_method>
<implements>
<interface cname="GtkCellLayout" />
<interface cname="GtkCellEditable" />
@ -5796,13 +5796,6 @@
<parameter type="GtkContainer*" name="container" />
</parameters>
</signal>
<signal name="SetFocusChild" cname="set-focus-child" when="FIRST" field_name="set_focus_child">
<return-type type="void" />
<parameters>
<parameter type="GtkContainer*" name="container" />
<parameter type="GtkWidget*" name="widget" />
</parameters>
</signal>
<virtual_method name="Forall" cname="forall">
<return-type type="void" />
<parameters>
@ -5812,6 +5805,13 @@
<parameter type="gpointer" name="callback_data" />
</parameters>
</virtual_method>
<signal name="SetFocusChild" cname="set-focus-child" when="FIRST" field_name="set_focus_child">
<return-type type="void" />
<parameters>
<parameter type="GtkContainer*" name="container" />
<parameter type="GtkWidget*" name="widget" />
</parameters>
</signal>
<virtual_method name="ChildType" cname="child_type">
<return-type type="GType" />
<parameters>
@ -9661,14 +9661,6 @@
<parameter type="GtkMenuShell*" name="menu_shell" />
</parameters>
</signal>
<signal name="MoveSelected" cname="move_selected" when="LAST" field_name="move_selected">
<return-type type="gboolean" />
<parameters>
<parameter type="GtkMenuShell*" name="menu_shell" />
<parameter type="gint" name="distance" />
</parameters>
</signal>
<property name="TakeFocus" cname="take-focus" type="gboolean" readable="true" writeable="true" />
<virtual_method name="SelectItem" cname="select_item">
<return-type type="void" />
<parameters>
@ -9690,6 +9682,14 @@
<parameter type="GtkMenuShell*" name="menu_shell" />
</parameters>
</virtual_method>
<signal name="MoveSelected" cname="move_selected" when="LAST" field_name="move_selected">
<return-type type="gboolean" />
<parameters>
<parameter type="GtkMenuShell*" name="menu_shell" />
<parameter type="gint" name="distance" />
</parameters>
</signal>
<property name="TakeFocus" cname="take-focus" type="gboolean" readable="true" writeable="true" />
<method name="ActivateItem" cname="gtk_menu_shell_activate_item">
<return-type type="void" />
<parameters>
@ -9948,6 +9948,16 @@
<childprop name="TabExpand" cname="tab-expand" type="gboolean" readable="true" writeable="true" />
<childprop name="TabFill" cname="tab-fill" type="gboolean" readable="true" writeable="true" />
<childprop name="TabPack" cname="tab-pack" type="GtkPackType" readable="true" writeable="true" />
<virtual_method name="InsertPage" cname="insert_page">
<return-type type="gint" />
<parameters>
<parameter type="GtkNotebook*" name="notebook" />
<parameter type="GtkWidget*" name="child" />
<parameter type="GtkWidget*" name="tab_label" />
<parameter type="GtkWidget*" name="menu_label" />
<parameter type="gint" name="position" />
</parameters>
</virtual_method>
<childprop name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true" />
<childprop name="Detachable" cname="detachable" type="gboolean" readable="true" writeable="true" />
<signal name="SwitchPage" cname="switch_page" when="LAST" field_name="switch_page">
@ -10027,16 +10037,6 @@
<parameter type="gint" name="y" />
</parameters>
</signal>
<virtual_method name="InsertPage" cname="insert_page">
<return-type type="gint" />
<parameters>
<parameter type="GtkNotebook*" name="notebook" />
<parameter type="GtkWidget*" name="child" />
<parameter type="GtkWidget*" name="tab_label" />
<parameter type="GtkWidget*" name="menu_label" />
<parameter type="gint" name="position" />
</parameters>
</virtual_method>
<implements>
<interface cname="GtkBuildable" />
</implements>
@ -10320,12 +10320,6 @@
<object name="Object" cname="GtkObject" parent="GInitiallyUnowned">
<field name="Flags" cname="flags" type="guint32" />
<property name="UserData" cname="user-data" type="gpointer" readable="true" writeable="true" />
<signal name="Destroy" cname="destroy" when="CLEANUP" field_name="destroy">
<return-type type="void" />
<parameters>
<parameter type="GtkObject*" name="object" />
</parameters>
</signal>
<virtual_method name="SetArg" cname="set_arg">
<return-type type="void" />
<parameters>
@ -10342,6 +10336,12 @@
<parameter type="guint" name="arg_id" />
</parameters>
</virtual_method>
<signal name="Destroy" cname="destroy" when="CLEANUP" field_name="destroy">
<return-type type="void" />
<parameters>
<parameter type="GtkObject*" name="object" />
</parameters>
</signal>
<method name="AddArgType" cname="gtk_object_add_arg_type" deprecated="1" shared="true">
<return-type type="void" />
<parameters>
@ -12005,6 +12005,13 @@
<parameter type="GtkScrollType" name="scroll" />
</parameters>
</signal>
<virtual_method name="GetRangeBorder" cname="get_range_border">
<return-type type="void" />
<parameters>
<parameter type="GtkRange*" name="range" />
<parameter type="GtkBorder*" name="border_" />
</parameters>
</virtual_method>
<signal name="ChangeValue" cname="change_value" when="LAST" field_name="change_value">
<return-type type="gboolean" />
<parameters>
@ -12021,13 +12028,6 @@
<property name="ShowFillLevel" cname="show-fill-level" type="gboolean" readable="true" writeable="true" />
<property name="RestrictToFillLevel" cname="restrict-to-fill-level" type="gboolean" readable="true" writeable="true" />
<property name="FillLevel" cname="fill-level" type="gdouble" readable="true" writeable="true" />
<virtual_method name="GetRangeBorder" cname="get_range_border">
<return-type type="void" />
<parameters>
<parameter type="GtkRange*" name="range" />
<parameter type="GtkBorder*" name="border_" />
</parameters>
</virtual_method>
<method name="GetAdjustment" cname="gtk_range_get_adjustment">
<return-type type="GtkAdjustment*" />
</method>
@ -12549,9 +12549,6 @@
<parameter type="gdouble" name="value" />
</parameters>
</signal>
<property name="Digits" cname="digits" type="gint" readable="true" writeable="true" />
<property name="DrawValue" cname="draw-value" type="gboolean" readable="true" writeable="true" />
<property name="ValuePos" cname="value-pos" type="GtkPositionType" readable="true" writeable="true" />
<virtual_method name="DrawValue" cname="draw_value">
<return-type type="void" />
<parameters>
@ -12566,6 +12563,9 @@
<parameter type="gint*" name="y" />
</parameters>
</virtual_method>
<property name="Digits" cname="digits" type="gint" readable="true" writeable="true" />
<property name="DrawValue" cname="draw-value" type="gboolean" readable="true" writeable="true" />
<property name="ValuePos" cname="value-pos" type="GtkPositionType" readable="true" writeable="true" />
<method name="GetDigits" cname="gtk_scale_get_digits">
<return-type type="gint" />
</method>
@ -19131,12 +19131,6 @@
<parameter type="GtkWindow*" name="window" />
</parameters>
</signal>
<signal name="KeysChanged" cname="keys_changed" when="FIRST" field_name="keys_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkWindow*" name="window" />
</parameters>
</signal>
<virtual_method name="MoveFocus" cname="move_focus">
<return-type type="void" />
<parameters>
@ -19144,6 +19138,12 @@
<parameter type="GtkDirectionType" name="direction" />
</parameters>
</virtual_method>
<signal name="KeysChanged" cname="keys_changed" when="FIRST" field_name="keys_changed">
<return-type type="void" />
<parameters>
<parameter type="GtkWindow*" name="window" />
</parameters>
</signal>
<implements>
<interface cname="GtkBuildable" />
</implements>

View File

@ -316,10 +316,10 @@ foreach $type (sort(keys(%ifaces))) {
$classdef = $sdefs{$1} if ($ifacetype =~ /struct\s+(\w+)/);
if ($initfunc) {
parseInitFunc($iface_el, $initfunc);
parseInitFunc($iface_el, $initfunc, $classdef);
} else {
warn "Don't have an init func for $inst.\n" if $debug;
addVirtualMethods ($classdef, $iface_el);
addVirtualMethods ($classdef, $classdef, $iface_el);
}
}
@ -371,7 +371,7 @@ foreach $type (sort(keys(%objects))) {
# Get the props from the class_init func.
if ($initfunc) {
parseInitFunc($obj_el, $initfunc);
parseInitFunc($obj_el, $initfunc, $classdef);
} else {
warn "Don't have an init func for $inst.\n" if $debug;
}
@ -988,15 +988,30 @@ sub addSignalElem
sub addVirtualMethods
{
my ($class, $node) = @_;
my ($class, $orig_class, $node) = @_;
$class =~ s/\n\s*//g;
$class =~ s/\/\*.*?\*\///g;
my $idx = 0;
my $ins_sibling = $node->firstChild;
while ($ins_sibling && ($ins_sibling->nodeName eq "field" || $ins_sibling->nodeName eq "property")) {
$ins_sibling = $ins_sibling->nextSibling ();
}
while ($class =~ /;\s*(G_CONST_RETURN\s+)?(\S+\s*\**)\s*\(\s*\*\s*(\w+)\)\s*\((.*?)\);/) {
$ret = $1 . $2; $cname = $3; $parms = $4;
$orig_class =~ /;\s*(G_CONST_RETURN\s+)?(\S+\s*\**)\s*\(\s*\*\s*(\w+)\)\s*\((.*?)\);/;
while ($ins_sibling && $3 ne $cname) {
$ins_sibling = $ins_sibling->nextSibling ();
$orig_class =~ s/;(.*?\));/;/;
$orig_class =~ /;\s*(G_CONST_RETURN\s+)?(\S+\s*\**)\s*\(\s*\*\s*(\w+)\)\s*\((.*?)\);/;
}
if ($cname !~ /reserved/) {
$vm_elem = $doc->createElement('virtual_method');
$node->appendChild($vm_elem);
if ($ins_sibling) {
$node->insertBefore($vm_elem, $ins_sibling);
} else {
$node->appendChild($vm_elem);
}
$vm_elem->setAttribute('name', StudlyCaps($cname));
$vm_elem->setAttribute('cname', $cname);
addReturnElem($vm_elem, $ret);
@ -1005,6 +1020,7 @@ sub addVirtualMethods
}
}
$class =~ s/;\s*(G_CONST_RETURN\s+)?\S+\s*\**\s*\(\s*\*\s*\w+\)\s*\(.*?\);/;/;
$orig_class =~ s/;.*?\);/;/;
}
}
@ -1023,7 +1039,8 @@ sub addImplementsElem
sub parseInitFunc
{
my ($obj_el, $initfunc) = @_;
my ($obj_el, $initfunc, $classdef) = @_;
my $orig_classdef = $classdef;
my @init_lines = split (/\n/, $initfunc);
@ -1059,7 +1076,7 @@ sub parseInitFunc
$linenum++;
}
addVirtualMethods ($classdef, $obj_el);
addVirtualMethods ($classdef, $orig_classdef, $obj_el);
}
sub parseTypeFuncMacro