2004-03-18 Mike Kestner <mkestner@ximian.com>

* parser/gapi2xml.pl : fix passbyvalue bug in vm parsing.
	* */*.raw : regen

svn path=/trunk/gtk-sharp/; revision=24290
This commit is contained in:
Mike Kestner 2004-03-18 20:25:07 +00:00
parent 4616bb2fb2
commit 37a37adf53
7 changed files with 29 additions and 1126 deletions

View file

@ -1,3 +1,8 @@
2004-03-18 Mike Kestner <mkestner@ximian.com>
* parser/gapi2xml.pl : fix passbyvalue bug in vm parsing.
* */*.raw : regen
2004-03-17 Mike Kestner <mkestner@ximian.com>
* sample/rsvg/Makefile.am : make conditional on ENABLE_RSVG

View file

@ -1193,27 +1193,6 @@
<parameter type="AtkObjectguinthandler_id" name="arg1"/>
</parameters>
</virtual_method>
<virtual_method name="ChildrenChanged" cname="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>
</virtual_method>
<virtual_method name="PropertyChange" cname="property_change">
<return-type type="void"/>
<parameters>
<parameter type="AtkObject*" name="accessible"/>
<parameter type="AtkPropertyValues*" name="values"/>
</parameters>
</virtual_method>
<virtual_method name="VisibleDataChanged" cname="visible_data_changed">
<return-type type="void"/>
<parameters>
<parameter type="AtkObject*" name="accessible"/>
</parameters>
</virtual_method>
<method name="AddRelationship" cname="atk_object_add_relationship">
<return-type type="gboolean"/>
<parameters>

View file

@ -770,13 +770,6 @@
</parameters>
</signal>
<property name="DefaultDisplay" cname="default-display" type="GdkDisplay" readable="true" writeable="true"/>
<virtual_method name="DisplayOpened" cname="display_opened">
<return-type type="void"/>
<parameters>
<parameter type="GdkDisplayManager*" name="display_manager"/>
<parameter type="GdkDisplay*" name="display"/>
</parameters>
</virtual_method>
<method name="Get" cname="gdk_display_manager_get" shared="true">
<return-type type="GdkDisplayManager*"/>
</method>
@ -1478,12 +1471,6 @@
<parameter type="GdkKeymap*" name="keymap"/>
</parameters>
</signal>
<virtual_method name="DirectionChanged" cname="direction_changed">
<return-type type="void"/>
<parameters>
<parameter type="GdkKeymap*" name="keymap"/>
</parameters>
</virtual_method>
<method name="GetDefault" cname="gdk_keymap_get_default" shared="true">
<return-type type="GdkKeymap*"/>
</method>
@ -1632,12 +1619,6 @@
<parameter type="GdkScreen*" name="screen"/>
</parameters>
</signal>
<virtual_method name="SizeChanged" cname="size_changed">
<return-type type="void"/>
<parameters>
<parameter type="GdkScreen*" name="screen"/>
</parameters>
</virtual_method>
<method name="BroadcastClientMessage" cname="gdk_screen_broadcast_client_message">
<return-type type="void"/>
<parameters>
@ -4239,24 +4220,6 @@
<parameter type="GdkPixbufLoader*" name="loader"/>
</parameters>
</signal>
<virtual_method name="SizePrepared" cname="size_prepared">
<return-type type="void"/>
<parameters>
<parameter type="GdkPixbufLoader*" name="loader"/>
<parameter type="int" name="width"/>
<parameter type="int" name="height"/>
</parameters>
</virtual_method>
<virtual_method name="AreaUpdated" cname="area_updated">
<return-type type="void"/>
<parameters>
<parameter type="GdkPixbufLoader*" name="loader"/>
<parameter type="int" name="x"/>
<parameter type="int" name="y"/>
<parameter type="int" name="width"/>
<parameter type="int" name="height"/>
</parameters>
</virtual_method>
<method name="Close" cname="gdk_pixbuf_loader_close">
<return-type type="gboolean"/>
<parameters>

View file

@ -757,17 +757,6 @@
<parameter type="GnomeCanvasBuf*" name="buf"/>
</parameters>
</signal>
<virtual_method name="DrawBackground" cname="draw_background">
<return-type type="void"/>
<parameters>
<parameter type="GnomeCanvas*" name="canvas"/>
<parameter type="GdkDrawable*" name="drawable"/>
<parameter type="int" name="x"/>
<parameter type="int" name="y"/>
<parameter type="int" name="width"/>
<parameter type="int" name="height"/>
</parameters>
</virtual_method>
<virtual_method name="RequestUpdate" cname="request_update">
<return-type type="void"/>
<parameters>
@ -1099,13 +1088,6 @@
<parameter type="GnomeCanvasItem**" name="actual_item"/>
</parameters>
</virtual_method>
<virtual_method name="Event" cname="event">
<return-type type="gboolean"/>
<parameters>
<parameter type="GnomeCanvasItem*" name="item"/>
<parameter type="GdkEvent*" name="event"/>
</parameters>
</virtual_method>
<method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute">
<return-type type="void"/>
<parameters>
@ -1396,13 +1378,6 @@
<parameter type="GtkTextTag*" name="tag"/>
</parameters>
</signal>
<virtual_method name="TagChanged" cname="tag_changed">
<return-type type="void"/>
<parameters>
<parameter type="GnomeCanvasRichText*" name="text"/>
<parameter type="GtkTextTag*" name="tag"/>
</parameters>
</virtual_method>
<method name="CopyClipboard" cname="gnome_canvas_rich_text_copy_clipboard">
<return-type type="void"/>
</method>
@ -2316,12 +2291,6 @@
<property name="HasProgress" cname="has_progress" type="gboolean" readable="true" writeable="true" construct-only="true"/>
<property name="HasStatus" cname="has_status" type="gboolean" readable="true" writeable="true" construct-only="true"/>
<property name="Interactivity" cname="interactivity" type="GnomePreferencesType" readable="true" writeable="true" construct-only="true"/>
<virtual_method name="UserResponse" cname="user_response">
<return-type type="void"/>
<parameters>
<parameter type="GnomeAppBar*" name="ab"/>
</parameters>
</virtual_method>
<method name="ClearPrompt" cname="gnome_appbar_clear_prompt">
<return-type type="void"/>
</method>
@ -2456,30 +2425,6 @@
<parameter type="GnomeClient*" name="client"/>
</parameters>
</signal>
<virtual_method name="SaveYourself" cname="save_yourself">
<return-type type="gboolean"/>
<parameters>
<parameter type="GnomeClient*" name="client"/>
<parameter type="gint" name="phase"/>
<parameter type="GnomeSaveStyle" name="save_style"/>
<parameter type="gboolean" name="shutdown"/>
<parameter type="GnomeInteractStyle" name="interact_style"/>
<parameter type="gboolean" name="fast"/>
</parameters>
</virtual_method>
<virtual_method name="SaveComplete" cname="save_complete">
<return-type type="void"/>
<parameters>
<parameter type="GnomeClient*" name="client"/>
</parameters>
</virtual_method>
<virtual_method name="Connect" cname="connect">
<return-type type="void"/>
<parameters>
<parameter type="GnomeClient*" name="client"/>
<parameter type="gboolean" name="restarted"/>
</parameters>
</virtual_method>
<method name="AddStaticArg" cname="gnome_client_add_static_arg">
<return-type type="void"/>
<parameters>
@ -2673,16 +2618,6 @@
<property name="Green" cname="green" type="guint" readable="true" writeable="true"/>
<property name="Blue" cname="blue" type="guint" readable="true" writeable="true"/>
<property name="Alpha" cname="alpha" type="guint" readable="true" writeable="true"/>
<virtual_method name="ColorSet" cname="color_set">
<return-type type="void"/>
<parameters>
<parameter type="GnomeColorPicker*" name="cp"/>
<parameter type="guint" name="r"/>
<parameter type="guint" name="g"/>
<parameter type="guint" name="b"/>
<parameter type="guint" name="a"/>
</parameters>
</virtual_method>
<method name="GetD" cname="gnome_color_picker_get_d">
<return-type type="void"/>
<parameters>
@ -2788,12 +2723,6 @@
<parameter type="GnomeDateEdit*" name="gde"/>
</parameters>
</signal>
<virtual_method name="DateChanged" cname="date_changed">
<return-type type="void"/>
<parameters>
<parameter type="GnomeDateEdit*" name="gde"/>
</parameters>
</virtual_method>
<method name="Construct" cname="gnome_date_edit_construct">
<return-type type="void"/>
<parameters>
@ -2867,12 +2796,6 @@
</signal>
<property name="ShowFinish" cname="show_finish" type="gboolean" readable="true" writeable="true"/>
<property name="ShowHelp" cname="show_help" type="gboolean" readable="true" writeable="true"/>
<virtual_method name="Cancel" cname="cancel">
<return-type type="void"/>
<parameters>
<parameter type="GnomeDruid*" name="druid"/>
</parameters>
</virtual_method>
<method name="AppendPage" cname="gnome_druid_append_page">
<return-type type="void"/>
<parameters>
@ -2978,32 +2901,10 @@
<parameter type="GtkWidget*" name="druid"/>
</parameters>
</signal>
<virtual_method name="Next" cname="next">
<return-type type="gboolean"/>
<parameters>
<parameter type="GnomeDruidPage*" name="druid_page"/>
<parameter type="GtkWidget*" name="druid"/>
</parameters>
</virtual_method>
<virtual_method name="Back" cname="back">
<return-type type="gboolean"/>
<parameters>
<parameter type="GnomeDruidPage*" name="druid_page"/>
<parameter type="GtkWidget*" name="druid"/>
</parameters>
</virtual_method>
<virtual_method name="Cancel" cname="cancel">
<return-type type="gboolean"/>
<parameters>
<parameter type="GnomeDruidPage*" name="druid_page"/>
<parameter type="GtkWidget*" name="druid"/>
</parameters>
</virtual_method>
<virtual_method name="SetSidebarShown" cname="set_sidebar_shown">
<virtual_method name="ConfigureCanvas" cname="configure_canvas">
<return-type type="void"/>
<parameters>
<parameter type="GnomeDruidPage*" name="druid_page"/>
<parameter type="gboolean" name="sidebar_shown"/>
</parameters>
</virtual_method>
<method name="Back" cname="gnome_druid_page_back">
@ -3230,12 +3131,6 @@
</signal>
<property name="HistoryId" cname="history_id" type="gchar*" readable="true" writeable="true"/>
<property name="GtkEntry" cname="gtk_entry" type="GtkEntry" readable="true"/>
<virtual_method name="Activate" cname="activate">
<return-type type="void"/>
<parameters>
<parameter type="GnomeEntry*" name="entry"/>
</parameters>
</virtual_method>
<implements>
<interface cname="GtkEditable"/>
</implements>
@ -3316,12 +3211,6 @@
<property name="DefaultPath" cname="default_path" type="gchar*" readable="true" writeable="true"/>
<property name="GnomeEntry" cname="gnome_entry" type="GnomeEntry" readable="true"/>
<property name="GtkEntry" cname="gtk_entry" type="GtkEntry" readable="true"/>
<virtual_method name="BrowseClicked" cname="browse_clicked">
<return-type type="void"/>
<parameters>
<parameter type="GnomeFileEntry*" name="fentry"/>
</parameters>
</virtual_method>
<implements>
<interface cname="GtkEditable"/>
</implements>
@ -3407,13 +3296,6 @@
<parameter type="const-gchar*" name="font_name"/>
</parameters>
</signal>
<virtual_method name="FontSet" cname="font_set">
<return-type type="void"/>
<parameters>
<parameter type="GnomeFontPicker*" name="gfp"/>
<parameter type="const-gchar*" name="font_name"/>
</parameters>
</virtual_method>
<method name="FiSetShowSize" cname="gnome_font_picker_fi_set_show_size">
<return-type type="void"/>
<parameters>
@ -3535,12 +3417,6 @@
<property name="PixmapSubdir" cname="pixmap_subdir" type="gchar*" readable="true" writeable="true"/>
<property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true"/>
<property name="PickDialog" cname="pick_dialog" type="GtkDialog" readable="true"/>
<virtual_method name="Changed" cname="changed">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconEntry*" name="ientry"/>
</parameters>
</virtual_method>
<method name="Construct" cname="gnome_icon_entry_construct">
<return-type type="void"/>
<parameters>
@ -3652,29 +3528,6 @@
<parameter type="GnomeIconList*" name="gil"/>
</parameters>
</signal>
<virtual_method name="SelectIcon" cname="select_icon">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconList*" name="gil"/>
<parameter type="gint" name="num"/>
<parameter type="GdkEvent*" name="event"/>
</parameters>
</virtual_method>
<virtual_method name="FocusIcon" cname="focus_icon">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconList*" name="gil"/>
<parameter type="gint" name="num"/>
</parameters>
</virtual_method>
<virtual_method name="MoveCursor" cname="move_cursor">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconList*" name="gil"/>
<parameter type="GtkDirectionType" name="dir"/>
<parameter type="gboolean" name="clear_selection"/>
</parameters>
</virtual_method>
<virtual_method name="Unused" cname="unused">
<return-type type="void"/>
<parameters>
@ -4005,26 +3858,8 @@
<parameter type="GnomeIconTextItem*" name="iti"/>
</parameters>
</signal>
<virtual_method name="TextChanged" cname="text_changed">
<return-type type="gboolean"/>
<parameters>
<parameter type="GnomeIconTextItem*" name="iti"/>
</parameters>
</virtual_method>
<virtual_method name="WidthChanged" cname="width_changed">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconTextItem*" name="iti"/>
</parameters>
</virtual_method>
<virtual_method name="EditingStopped" cname="editing_stopped">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconTextItem*" name="iti"/>
</parameters>
</virtual_method>
<virtual_method name="SelectionStopped" cname="selection_stopped">
<return-type type="void"/>
<virtual_method name="CreateEntry" cname="create_entry">
<return-type type="GtkEntry*"/>
<parameters>
<parameter type="GnomeIconTextItem*" name="iti"/>
</parameters>
@ -4087,12 +3922,6 @@
<parameter type="GnomeIconTheme*" name="icon_theme"/>
</parameters>
</signal>
<virtual_method name="Changed" cname="changed">
<return-type type="void"/>
<parameters>
<parameter type="GnomeIconTheme*" name="icon_theme"/>
</parameters>
</virtual_method>
<method name="AppendSearchPath" cname="gnome_icon_theme_append_search_path">
<return-type type="void"/>
<parameters>
@ -6618,13 +6447,6 @@
<parameter type="GnomeFont*" name="font"/>
</parameters>
</signal>
<virtual_method name="FontSet" cname="font_set">
<return-type type="void"/>
<parameters>
<parameter type="GnomeFontSelection*" name="fontsel"/>
<parameter type="GnomeFont*" name="font"/>
</parameters>
</virtual_method>
<method name="GetFace" cname="gnome_font_selection_get_face">
<return-type type="GnomeFontFace*"/>
</method>
@ -6705,14 +6527,6 @@
<parameter type="gboolean" name="collate"/>
</parameters>
</signal>
<virtual_method name="CopiesSet" cname="copies_set">
<return-type type="void"/>
<parameters>
<parameter type="GnomePrintCopiesSelector*" name="gpc"/>
<parameter type="gint" name="copies"/>
<parameter type="gboolean" name="collate"/>
</parameters>
</virtual_method>
<method name="GetCollate" cname="gnome_print_copies_selector_get_collate">
<return-type type="gboolean"/>
</method>
@ -6840,12 +6654,6 @@
<parameter type="GnomePrintUnitSelector*" name="selector"/>
</parameters>
</signal>
<virtual_method name="Modified" cname="modified">
<return-type type="void"/>
<parameters>
<parameter type="GnomePrintUnitSelector*" name="selector"/>
</parameters>
</virtual_method>
<method name="AddAdjustment" cname="gnome_print_unit_selector_add_adjustment">
<return-type type="void"/>
<parameters>

File diff suppressed because it is too large Load diff

View file

@ -445,78 +445,6 @@
<property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
<property name="DocumentBase" cname="document_base" type="gchar*" readable="true" writeable="true"/>
<property name="TargetBase" cname="target_base" type="gchar*" readable="true" writeable="true"/>
<virtual_method name="TitleChanged" cname="title_changed">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="const-gchar*" name="new_title"/>
</parameters>
</virtual_method>
<virtual_method name="LoadDone" cname="load_done">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
</parameters>
</virtual_method>
<virtual_method name="SetBase" cname="set_base">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="const-gchar*" name="base_url"/>
</parameters>
</virtual_method>
<virtual_method name="OnUrl" cname="on_url">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="const-gchar*" name="url"/>
</parameters>
</virtual_method>
<virtual_method name="Submit" cname="submit">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="const-gchar*" name="method"/>
<parameter type="const-gchar*" name="url"/>
<parameter type="const-gchar*" name="encoding"/>
</parameters>
</virtual_method>
<virtual_method name="CurrentParagraphStyleChanged" cname="current_paragraph_style_changed">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="GtkHTMLParagraphStyle" name="new_style"/>
</parameters>
</virtual_method>
<virtual_method name="CurrentParagraphIndentationChanged" cname="current_paragraph_indentation_changed">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="guint" name="new_indentation"/>
</parameters>
</virtual_method>
<virtual_method name="InsertionColorChanged" cname="insertion_color_changed">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="GdkColor*" name="color"/>
</parameters>
</virtual_method>
<virtual_method name="IframeCreated" cname="iframe_created">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="GtkHTML*" name="iframe"/>
</parameters>
</virtual_method>
<virtual_method name="CursorMove" cname="cursor_move">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTML*" name="html"/>
<parameter type="GtkDirectionType" name="dir_type"/>
<parameter type="GtkHTMLCursorSkipType" name="skip"/>
</parameters>
</virtual_method>
<method name="AllowSelection" cname="gtk_html_allow_selection">
<return-type type="void"/>
<parameters>
@ -962,19 +890,6 @@
<parameter type="GnomePrintContext*" name="arg2"/>
</parameters>
</signal>
<virtual_method name="Changed" cname="changed">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTMLEmbedded*" name="arg1"/>
</parameters>
</virtual_method>
<virtual_method name="DrawPrint" cname="draw_print">
<return-type type="void"/>
<parameters>
<parameter type="GtkHTMLEmbedded*" name="arg1"/>
<parameter type="GnomePrintContext*" name="arg2"/>
</parameters>
</virtual_method>
<method name="GetParameter" cname="gtk_html_embedded_get_parameter">
<return-type type="char*"/>
<parameters>

View file

@ -838,19 +838,21 @@ sub addSignalElem
$parm_elem->setAttribute('name', "p$idx");
$parm_elem->setAttribute('type', $argtype);
}
return;
return $class;
}
if ($class =~ /;\s*(\S+\s*\**)\s*\(\*\s*$method\)\s*\((.*?)\);/) {
$ret = $1; $parms = $2;
if ($class =~ /;\s*(G_CONST_RETURN)?\s*(\S+\s*\**)\s*\(\*\s*$method\)\s*\((.*?)\);/) {
$ret = $2; $parms = $3;
addReturnElem($sig_elem, $ret);
if ($parms && ($parms ne "void")) {
addParamsElem($sig_elem, split(/,/, $parms));
}
$class =~ s/;\s*\S+\s*\**\s*\(\*\s*$method\)\s*\(.*?\);//;
$class =~ s/;\s*(G_CONST_RETURN)?\s*\S+\s*\**\s*\(\*\s*$method\)\s*\(.*?\);/;/;
} else {
die "$method $class";
}
return $class;
}
sub addVirtualMethods
@ -912,7 +914,7 @@ sub parseInitFunc
do {
$sig .= $init_lines[++$linenum];
} until ($init_lines[$linenum] =~ /;/);
addSignalElem ($sig, $classdef, $obj_el);
$classdef = addSignalElem ($sig, $classdef, $obj_el);
$sigcnt++;
}
$linenum++;