diff options
63 files changed, 439 insertions, 181 deletions
@@ -1,3 +1,40 @@ +Fri Nov 8 20:14:52 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gdk/tmpl/dnd.sgml + docs/reference/gdk/tmpl/drawing.sgml + docs/reference/gdk/tmpl/gdk-unused.sgml + docs/reference/gdk/tmpl/gdkdisplay.sgml + docs/reference/gdk/tmpl/general.sgml + docs/reference/gdk/tmpl/input_devices.sgml + docs/reference/gdk/tmpl/selections.sgml + docs/reference/gtk/tmpl/gtkcellrenderer.sgml + docs/reference/gtk/tmpl/gtkcurve.sgml + docs/reference/gtk/tmpl/gtkdnd.sgml + docs/reference/gtk/tmpl/gtkitemfactory.sgml + docs/reference/gtk/tmpl/gtkmenu.sgml + docs/reference/gtk/tmpl/gtkoldeditable.sgml + docs/reference/gtk/tmpl/gtkoptionmenu.sgml + docs/reference/gtk/tmpl/gtkpreview.sgml + docs/reference/gtk/tmpl/gtkselection.sgml + docs/reference/gtk/tmpl/gtksocket.sgml + docs/reference/gtk/tmpl/gtkstyle.sgml + docs/reference/gtk/tmpl/gtktextbuffer.sgml + docs/reference/gtk/tmpl/gtktreemodel.sgml + docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c + gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h + gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c + gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h + gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h + gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h + gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h + gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h + gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h + gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c + gtk/gtktreemodel.h gtk/gtkwidget.h + + Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow + without warnings. (#91680) + Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org> * gdk/linux-fb/gdkscreen-fb.c: fix compilation diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5374c82568..d430f92aa0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,40 @@ +Fri Nov 8 20:14:52 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gdk/tmpl/dnd.sgml + docs/reference/gdk/tmpl/drawing.sgml + docs/reference/gdk/tmpl/gdk-unused.sgml + docs/reference/gdk/tmpl/gdkdisplay.sgml + docs/reference/gdk/tmpl/general.sgml + docs/reference/gdk/tmpl/input_devices.sgml + docs/reference/gdk/tmpl/selections.sgml + docs/reference/gtk/tmpl/gtkcellrenderer.sgml + docs/reference/gtk/tmpl/gtkcurve.sgml + docs/reference/gtk/tmpl/gtkdnd.sgml + docs/reference/gtk/tmpl/gtkitemfactory.sgml + docs/reference/gtk/tmpl/gtkmenu.sgml + docs/reference/gtk/tmpl/gtkoldeditable.sgml + docs/reference/gtk/tmpl/gtkoptionmenu.sgml + docs/reference/gtk/tmpl/gtkpreview.sgml + docs/reference/gtk/tmpl/gtkselection.sgml + docs/reference/gtk/tmpl/gtksocket.sgml + docs/reference/gtk/tmpl/gtkstyle.sgml + docs/reference/gtk/tmpl/gtktextbuffer.sgml + docs/reference/gtk/tmpl/gtktreemodel.sgml + docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c + gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h + gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c + gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h + gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h + gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h + gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h + gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h + gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h + gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c + gtk/gtktreemodel.h gtk/gtkwidget.h + + Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow + without warnings. (#91680) + Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org> * gdk/linux-fb/gdkscreen-fb.c: fix compilation diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5374c82568..d430f92aa0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,40 @@ +Fri Nov 8 20:14:52 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gdk/tmpl/dnd.sgml + docs/reference/gdk/tmpl/drawing.sgml + docs/reference/gdk/tmpl/gdk-unused.sgml + docs/reference/gdk/tmpl/gdkdisplay.sgml + docs/reference/gdk/tmpl/general.sgml + docs/reference/gdk/tmpl/input_devices.sgml + docs/reference/gdk/tmpl/selections.sgml + docs/reference/gtk/tmpl/gtkcellrenderer.sgml + docs/reference/gtk/tmpl/gtkcurve.sgml + docs/reference/gtk/tmpl/gtkdnd.sgml + docs/reference/gtk/tmpl/gtkitemfactory.sgml + docs/reference/gtk/tmpl/gtkmenu.sgml + docs/reference/gtk/tmpl/gtkoldeditable.sgml + docs/reference/gtk/tmpl/gtkoptionmenu.sgml + docs/reference/gtk/tmpl/gtkpreview.sgml + docs/reference/gtk/tmpl/gtkselection.sgml + docs/reference/gtk/tmpl/gtksocket.sgml + docs/reference/gtk/tmpl/gtkstyle.sgml + docs/reference/gtk/tmpl/gtktextbuffer.sgml + docs/reference/gtk/tmpl/gtktreemodel.sgml + docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c + gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h + gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c + gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h + gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h + gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h + gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h + gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h + gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h + gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c + gtk/gtktreemodel.h gtk/gtkwidget.h + + Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow + without warnings. (#91680) + Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org> * gdk/linux-fb/gdkscreen-fb.c: fix compilation diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5374c82568..d430f92aa0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,40 @@ +Fri Nov 8 20:14:52 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gdk/tmpl/dnd.sgml + docs/reference/gdk/tmpl/drawing.sgml + docs/reference/gdk/tmpl/gdk-unused.sgml + docs/reference/gdk/tmpl/gdkdisplay.sgml + docs/reference/gdk/tmpl/general.sgml + docs/reference/gdk/tmpl/input_devices.sgml + docs/reference/gdk/tmpl/selections.sgml + docs/reference/gtk/tmpl/gtkcellrenderer.sgml + docs/reference/gtk/tmpl/gtkcurve.sgml + docs/reference/gtk/tmpl/gtkdnd.sgml + docs/reference/gtk/tmpl/gtkitemfactory.sgml + docs/reference/gtk/tmpl/gtkmenu.sgml + docs/reference/gtk/tmpl/gtkoldeditable.sgml + docs/reference/gtk/tmpl/gtkoptionmenu.sgml + docs/reference/gtk/tmpl/gtkpreview.sgml + docs/reference/gtk/tmpl/gtkselection.sgml + docs/reference/gtk/tmpl/gtksocket.sgml + docs/reference/gtk/tmpl/gtkstyle.sgml + docs/reference/gtk/tmpl/gtktextbuffer.sgml + docs/reference/gtk/tmpl/gtktreemodel.sgml + docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c + gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h + gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c + gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h + gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h + gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h + gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h + gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h + gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h + gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c + gtk/gtktreemodel.h gtk/gtkwidget.h + + Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow + without warnings. (#91680) + Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org> * gdk/linux-fb/gdkscreen-fb.c: fix compilation diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5374c82568..d430f92aa0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,40 @@ +Fri Nov 8 20:14:52 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gdk/tmpl/dnd.sgml + docs/reference/gdk/tmpl/drawing.sgml + docs/reference/gdk/tmpl/gdk-unused.sgml + docs/reference/gdk/tmpl/gdkdisplay.sgml + docs/reference/gdk/tmpl/general.sgml + docs/reference/gdk/tmpl/input_devices.sgml + docs/reference/gdk/tmpl/selections.sgml + docs/reference/gtk/tmpl/gtkcellrenderer.sgml + docs/reference/gtk/tmpl/gtkcurve.sgml + docs/reference/gtk/tmpl/gtkdnd.sgml + docs/reference/gtk/tmpl/gtkitemfactory.sgml + docs/reference/gtk/tmpl/gtkmenu.sgml + docs/reference/gtk/tmpl/gtkoldeditable.sgml + docs/reference/gtk/tmpl/gtkoptionmenu.sgml + docs/reference/gtk/tmpl/gtkpreview.sgml + docs/reference/gtk/tmpl/gtkselection.sgml + docs/reference/gtk/tmpl/gtksocket.sgml + docs/reference/gtk/tmpl/gtkstyle.sgml + docs/reference/gtk/tmpl/gtktextbuffer.sgml + docs/reference/gtk/tmpl/gtktreemodel.sgml + docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c + gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h + gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c + gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h + gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h + gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h + gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h + gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h + gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h + gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c + gtk/gtktreemodel.h gtk/gtkwidget.h + + Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow + without warnings. (#91680) + Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org> * gdk/linux-fb/gdkscreen-fb.c: fix compilation diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5374c82568..d430f92aa0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,40 @@ +Fri Nov 8 20:14:52 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gdk/tmpl/dnd.sgml + docs/reference/gdk/tmpl/drawing.sgml + docs/reference/gdk/tmpl/gdk-unused.sgml + docs/reference/gdk/tmpl/gdkdisplay.sgml + docs/reference/gdk/tmpl/general.sgml + docs/reference/gdk/tmpl/input_devices.sgml + docs/reference/gdk/tmpl/selections.sgml + docs/reference/gtk/tmpl/gtkcellrenderer.sgml + docs/reference/gtk/tmpl/gtkcurve.sgml + docs/reference/gtk/tmpl/gtkdnd.sgml + docs/reference/gtk/tmpl/gtkitemfactory.sgml + docs/reference/gtk/tmpl/gtkmenu.sgml + docs/reference/gtk/tmpl/gtkoldeditable.sgml + docs/reference/gtk/tmpl/gtkoptionmenu.sgml + docs/reference/gtk/tmpl/gtkpreview.sgml + docs/reference/gtk/tmpl/gtkselection.sgml + docs/reference/gtk/tmpl/gtksocket.sgml + docs/reference/gtk/tmpl/gtkstyle.sgml + docs/reference/gtk/tmpl/gtktextbuffer.sgml + docs/reference/gtk/tmpl/gtktreemodel.sgml + docs/reference/gtk/tmpl/gtkwidget.sgml gdk/gdk.h gdk/gdkdisplay.c + gdk/gdkdisplay.h gdk/gdkdnd.h gdk/gdkdraw.c gdk/gdkdrawable.h + gdk/gdkinput.h gdk/gdkselection.h gdk/x11/gdkdisplay-x11.c + gdk/x11/gdkdnd-x11.c gdk/x11/gdkselection-x11.c gtk/gtkcurve.h + gtk/gtkdnd.h gtk/gtkitemfactory.c gtk/gtkitemfactory.h + gtk/gtkmenu.h gtk/gtkoldeditable.c gtk/gtkoldeditable.h + gtk/gtkoptionmenu.h gtk/gtkplug.c gtk/gtkplug.h gtk/gtkpreview.h + gtk/gtkrange.h gtk/gtkselection.c gtk/gtkselection.h + gtk/gtksocket.c gtk/gtksocket.h gtk/gtkstyle.c gtk/gtkstyle.h + gtk/gtktextlayout.c gtk/gtktextlayout.h gtk/gtktreemodel.c + gtk/gtktreemodel.h gtk/gtkwidget.h + + Trivial s/foo/foo_/ fixes to make gtk.h includable with -Wshadow + without warnings. (#91680) + Thu Nov 7 16:13:41 2002 Eric Warmenhoven <eric@warmenhoven.org> * gdk/linux-fb/gdkscreen-fb.c: fix compilation diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml index b9ffc22e61..347f0ba9dc 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml @@ -69,6 +69,12 @@ Application-driven progressive image loading. gdk_pixbuf_new_from_file(), gdk_pixbuf_animation_new_from_file() </para> +<!-- ##### STRUCT GdkPixbufLoader ##### --> +<para> + +</para> + + <!-- ##### FUNCTION gdk_pixbuf_loader_new ##### --> <para> diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml index 12b3f0c7ac..9b59b4012e 100644 --- a/docs/reference/gdk/tmpl/dnd.sgml +++ b/docs/reference/gdk/tmpl/dnd.sgml @@ -35,7 +35,7 @@ the GTK+ documentation for more information. </para> @context: -@time: +@time_: <!-- ##### FUNCTION gdk_drop_reply ##### --> @@ -44,7 +44,7 @@ the GTK+ documentation for more information. @context: @ok: -@time: +@time_: <!-- ##### FUNCTION gdk_drag_context_new ##### --> @@ -59,7 +59,7 @@ the GTK+ documentation for more information. </para> @context: -@time: +@time_: <!-- ##### FUNCTION gdk_drag_find_window ##### --> @@ -115,7 +115,7 @@ the GTK+ documentation for more information. @y_root: @suggested_action: @possible_actions: -@time: +@time_: @Returns: @@ -125,7 +125,7 @@ the GTK+ documentation for more information. @context: @success: -@time: +@time_: <!-- ##### FUNCTION gdk_drag_get_protocol ##### --> @@ -210,6 +210,6 @@ should do with the dropped data. @context: @action: -@time: +@time_: diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml index 64a6680dac..c400f2e9b4 100644 --- a/docs/reference/gdk/tmpl/drawing.sgml +++ b/docs/reference/gdk/tmpl/drawing.sgml @@ -179,10 +179,10 @@ or a #GdkWindow. @drawable: @gc: -@x1: -@y1: -@x2: -@y2: +@x1_: +@y1_: +@x2_: +@y2_: <!-- ##### FUNCTION gdk_draw_lines ##### --> diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index 681fd6672e..114523e634 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -839,7 +839,7 @@ Sets the key event generated when a macro button is pressed. </para> @deviceid: the device to configure. -@index: the index of the macro button. +@index_: the index of the macro button. @keyval: the key value for the #GdkKeypressEvent to generate. (a value of 0 means no event will be generated.) @modifiers: the modifier field for the generated diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml index 0cf0de7e6f..5955baec9a 100644 --- a/docs/reference/gdk/tmpl/gdkdisplay.sgml +++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml @@ -95,7 +95,7 @@ of an X display. All its fields are private and should not be accessed directly. </para> @display: -@time: +@time_: <!-- ##### FUNCTION gdk_display_keyboard_ungrab ##### --> @@ -104,7 +104,7 @@ of an X display. All its fields are private and should not be accessed directly. </para> @display: -@time: +@time_: <!-- ##### FUNCTION gdk_display_pointer_is_grabbed ##### --> diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml index a277b19789..376a0b5ea9 100644 --- a/docs/reference/gdk/tmpl/general.sgml +++ b/docs/reference/gdk/tmpl/general.sgml @@ -221,7 +221,7 @@ and leave events will be generated as necessary. @cursor: the cursor to display while the grab is active. If this is %NULL then the normal cursors are used for @window and its descendants, and the cursor for @window is used for all other windows. -@time: the timestamp of the event which led to this pointer grab. This usually +@time_: the timestamp of the event which led to this pointer grab. This usually comes from a #GdkEventButton struct, though %GDK_CURRENT_TIME can be used if the time isn't known. @Returns: %GDK_GRAB_SUCCESS if the grab was successful. @@ -246,7 +246,7 @@ success or the reason for the failure of the grab attempt. </para> -@time: +@time_: <!-- ##### FUNCTION gdk_pointer_is_grabbed ##### --> @@ -279,7 +279,7 @@ This overrides any previous keyboard grab by this client. normal, but keyboard events outside this application are reported with respect to @window. Both key press and key release events are always reported, independant of the event mask set by the application. -@time: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is +@time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is available. @Returns: %GDK_GRAB_SUCCESS if the grab was successful. @@ -288,7 +288,7 @@ available. <para> </para> -@time: +@time_: <!-- ##### FUNCTION gdk_beep ##### --> diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml index d6eaf97f87..2d53223f8d 100644 --- a/docs/reference/gdk/tmpl/input_devices.sgml +++ b/docs/reference/gdk/tmpl/input_devices.sgml @@ -207,7 +207,7 @@ is pressed. </para> @device: a #GdkDevice. -@index: the index of the macro button to set. +@index_: the index of the macro button to set. @keyval: the keyval to generate. @modifiers: the modifiers to set. @@ -218,7 +218,7 @@ Specifies how an axis of a device is used. </para> @device: a #GdkDevice. -@index: the index of the axis. +@index_: the index of the axis. @use: specifies how the axis is used. diff --git a/docs/reference/gdk/tmpl/selections.sgml b/docs/reference/gdk/tmpl/selections.sgml index d1bade5404..9d616c3bd5 100644 --- a/docs/reference/gdk/tmpl/selections.sgml +++ b/docs/reference/gdk/tmpl/selections.sgml @@ -197,7 +197,7 @@ Sets the owner of the given selection. @owner: a #GdkWindow or %NULL to indicate that the the owner for the given should be unset. @selection: an atom identifying a selection. -@time: timestamp to use when setting the selection. +@time_: timestamp to use when setting the selection. If this is older than the timestamp given last time the owner was set for the given selection, the request will be ignored. @@ -216,7 +216,7 @@ Sets the owner of the given selection. @display: @owner: @selection: -@time: +@time_: @send_event: @Returns: @@ -257,7 +257,7 @@ form. @selection: an atom identifying the selection to get the contents of. @target: the form in which to retrieve the selection. -@time: the timestamp to use when retrieving the +@time_: the timestamp to use when retrieving the selection. The selection owner may refuse the request if it did not own the selection at the time indicated by the timestamp. @@ -285,7 +285,7 @@ Sends a response to SelectionRequest event. @property: property in which the selection owner stored the data, or %GDK_NONE to indicate that the request was rejected. -@time: timestamp. +@time_: timestamp. <!-- ##### FUNCTION gdk_selection_send_notify_for_display ##### --> @@ -298,6 +298,6 @@ Sends a response to SelectionRequest event. @selection: @target: @property: -@time: +@time_: diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml index b05f3de89f..f9daddfc63 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml @@ -30,6 +30,7 @@ of properties will always yield a cell renderer of the same size, barring a #GtkStyle change. The #GtkCellRenderer also has a number of generic properties that are expected to be honored by all children. </para> + <!-- ##### SECTION See_Also ##### --> <para> #GtkCellRendererText,#GtkCellRendererPixbuf,#GtkCellRendererToggle @@ -142,67 +143,67 @@ it cannot be individually modified. @height: -<!-- ##### ARG GtkCellRenderer:mode ##### --> +<!-- ##### ARG GtkCellRenderer:cell-background ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:visible ##### --> +<!-- ##### ARG GtkCellRenderer:cell-background-gdk ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:xalign ##### --> +<!-- ##### ARG GtkCellRenderer:cell-background-set ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:yalign ##### --> +<!-- ##### ARG GtkCellRenderer:height ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:xpad ##### --> +<!-- ##### ARG GtkCellRenderer:is-expanded ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:ypad ##### --> +<!-- ##### ARG GtkCellRenderer:is-expander ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:width ##### --> +<!-- ##### ARG GtkCellRenderer:mode ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:height ##### --> +<!-- ##### ARG GtkCellRenderer:visible ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:is-expander ##### --> +<!-- ##### ARG GtkCellRenderer:width ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:is-expanded ##### --> +<!-- ##### ARG GtkCellRenderer:xalign ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:cell-background ##### --> +<!-- ##### ARG GtkCellRenderer:xpad ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:cell-background-gdk ##### --> +<!-- ##### ARG GtkCellRenderer:yalign ##### --> <para> </para> -<!-- ##### ARG GtkCellRenderer:cell-background-set ##### --> +<!-- ##### ARG GtkCellRenderer:ypad ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml index e2aa3d701f..3f4337c5c0 100644 --- a/docs/reference/gtk/tmpl/gtkcurve.sgml +++ b/docs/reference/gtk/tmpl/gtkcurve.sgml @@ -74,7 +74,7 @@ FIXME: Needs a more precise definition of gamma. </para> @curve: a #GtkCurve. -@gamma: the gamma value. +@gamma_: the gamma value. <!-- ##### FUNCTION gtk_curve_set_range ##### --> diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml index 02527509d7..abab9afaf5 100644 --- a/docs/reference/gtk/tmpl/gtkdnd.sgml +++ b/docs/reference/gtk/tmpl/gtkdnd.sgml @@ -148,7 +148,7 @@ that the data of the drag will no longer be required. @success: a flag indicating whether the drop was successful @del: a flag indicating whether the source should delete the original data. (This should be %TRUE for a move) -@time: the timestamp from the "drag_data_drop" signal. +@time_: the timestamp from the "drag_data_drop" signal. <!-- ##### FUNCTION gtk_drag_get_data ##### --> @@ -167,7 +167,7 @@ drops. signal. @context: the drag context @target: the target (form of the data) to retrieve. -@time: a timestamp for retrieving the data. This will +@time_: a timestamp for retrieving the data. This will generally be the time received in a "drag_data_motion" or "drag_data_drop" signal. diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml index ea47a6365c..a00c8127ac 100644 --- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml +++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml @@ -197,3 +197,8 @@ handlebox are detached from the main window. </para> +<!-- ##### ARG GtkHandleBox:snap-edge-set ##### --> +<para> + +</para> + diff --git a/docs/reference/gtk/tmpl/gtkitemfactory.sgml b/docs/reference/gtk/tmpl/gtkitemfactory.sgml index 57c1fd8f71..f64ad3de0a 100644 --- a/docs/reference/gtk/tmpl/gtkitemfactory.sgml +++ b/docs/reference/gtk/tmpl/gtkitemfactory.sgml @@ -249,7 +249,7 @@ GtkItemFactory @x: @y: @mouse_button: -@time: +@time_: <!-- ##### FUNCTION gtk_item_factory_popup_with_data ##### --> @@ -263,7 +263,7 @@ GtkItemFactory @x: @y: @mouse_button: -@time: +@time_: <!-- ##### FUNCTION gtk_item_factory_popup_data ##### --> diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index 10d49af0c7..c480cc86a2 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -253,7 +253,7 @@ Selects the specified menu item within the menu. This is used by the </para> @menu: a #GtkMenu. -@index: the index of the menu item to select. Index values are from +@index_: the index of the menu item to select. Index values are from 0 to n-1. diff --git a/docs/reference/gtk/tmpl/gtkoldeditable.sgml b/docs/reference/gtk/tmpl/gtkoldeditable.sgml index 8089870dcd..da12d9e4e2 100644 --- a/docs/reference/gtk/tmpl/gtkoldeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkoldeditable.sgml @@ -30,7 +30,7 @@ GtkOldEditable </para> @editable: -@time: +@time_: <!-- ##### FUNCTION gtk_old_editable_claim_selection ##### --> @@ -40,7 +40,7 @@ GtkOldEditable @old_editable: @claim: -@time: +@time_: <!-- ##### FUNCTION gtk_old_editable_changed ##### --> diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 31debc57f8..f648d70a87 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -70,12 +70,12 @@ Removes the menu from the option menu. <!-- ##### FUNCTION gtk_option_menu_set_history ##### --> <para> -Selects the menu item specified by @index making it the newly +Selects the menu item specified by @index_ making it the newly selected value for the option menu. </para> @option_menu: a #GtkOptionMenu. -@index: the index of the menu item to select. Index values are from +@index_: the index of the menu item to select. Index values are from 0 to n-1. diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml index d657b82d66..e20db705bd 100644 --- a/docs/reference/gtk/tmpl/gtkpreview.sgml +++ b/docs/reference/gtk/tmpl/gtkpreview.sgml @@ -172,7 +172,7 @@ value will not affect existing data in preview widgets. </para> -@gamma: the new gamma value. +@gamma_: the new gamma value. <!-- ##### FUNCTION gtk_preview_set_color_cube ##### --> diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml index 05f91b89cf..4e007b0b81 100644 --- a/docs/reference/gtk/tmpl/gtkselection.sgml +++ b/docs/reference/gtk/tmpl/gtkselection.sgml @@ -154,7 +154,7 @@ Looks up a given target in a #GtkTargetList. @widget: @selection: -@time: +@time_: @Returns: @@ -166,7 +166,7 @@ Looks up a given target in a #GtkTargetList. @display: @widget: @selection: -@time: +@time_: @Returns: @@ -212,7 +212,7 @@ a "selection_received" signal will be generated. @widget: The widget which acts as requestor @selection: Which selection to get @target: Form of information desired (e.g., STRING) -@time: Time of request (usually of triggering event) +@time_: Time of request (usually of triggering event) In emergency, you could use #GDK_CURRENT_TIME @Returns: %TRUE if requested succeeded. %FALSE if we could not process request. (e.g., there was already a request in process for diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index b26742dce1..c887119982 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -111,7 +111,7 @@ never be set by an application.) <para> </para> -@socket: a #GtkSocket. +@socket_: a #GtkSocket. @wid: @@ -120,7 +120,7 @@ never be set by an application.) </para> -@socket: +@socket_: @window_id: <!-- # Unused Parameters # --> @id: @@ -131,7 +131,7 @@ never be set by an application.) </para> -@socket: +@socket_: @Returns: @@ -140,6 +140,8 @@ never be set by an application.) </para> +@socket_: the object which received the signal. +<!-- # Unused Parameters # --> @socket: the object which received the signal. <!-- ##### SIGNAL GtkSocket::plug-removed ##### --> @@ -147,6 +149,8 @@ never be set by an application.) </para> -@socket: the object which received the signal. +@socket_: the object which received the signal. @Returns: +<!-- # Unused Parameters # --> +@socket: the object which received the signal. diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index 2f2fb10f64..eb13410895 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -209,8 +209,8 @@ Returns whether the style is attached to a window. @style: @window: @state_type: -@y1: -@y2: +@y1_: +@y2_: @x: @@ -826,8 +826,8 @@ Returns whether the style is attached to a window. @area: @widget: @detail: -@y1: -@y2: +@y1_: +@y2_: @x: @@ -899,7 +899,7 @@ Returns whether the style is attached to a window. </para> -@border: +@border_: @Returns: @@ -908,7 +908,7 @@ Returns whether the style is attached to a window. </para> -@border: +@border_: <!-- ##### STRUCT GtkRcProperty ##### --> diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index 28e0afa3d6..645683606e 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -550,7 +550,7 @@ types related to the text widget and how they work together. @override_location: @default_editable: <!-- # Unused Parameters # --> -@time: +@time_: @interactive: diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 4ebe443567..e4ccfb4755 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -334,7 +334,7 @@ versions of GTK+. </para> @path: -@index: +@index_: <!-- ##### FUNCTION gtk_tree_path_prepend_index ##### --> @@ -343,7 +343,7 @@ versions of GTK+. </para> @path: -@index: +@index_: <!-- ##### FUNCTION gtk_tree_path_get_depth ##### --> @@ -571,7 +571,7 @@ versions of GTK+. </para> @tree_model: -@index: +@index_: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index a098de73fb..c9d8e85df6 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1703,6 +1703,8 @@ This function is deprecated; it does nothing. @data: @info: @time: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::drag-data-received ##### --> <para> @@ -1716,6 +1718,8 @@ This function is deprecated; it does nothing. @data: @info: @time: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::drag-drop ##### --> <para> @@ -1728,6 +1732,8 @@ This function is deprecated; it does nothing. @y: @time: @Returns: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::drag-end ##### --> <para> @@ -1745,6 +1751,8 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @drag_context: @time: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::drag-motion ##### --> <para> @@ -1757,6 +1765,8 @@ This function is deprecated; it does nothing. @y: @time: @Returns: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::enter-notify-event ##### --> <para> @@ -1853,8 +1863,6 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @widget2: -<!-- # Unused Parameters # --> -@widget: <!-- ##### SIGNAL GtkWidget::key-press-event ##### --> <para> @@ -1976,6 +1984,14 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. +<!-- ##### SIGNAL GtkWidget::screen-changed ##### --> +<para> + +</para> + +@widget: the object which received the signal. +@arg1: + <!-- ##### SIGNAL GtkWidget::scroll-event ##### --> <para> @@ -2003,6 +2019,8 @@ a widget changes from un-anchored to anchored or vice-versa. @data: @info: @time: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::selection-notify-event ##### --> <para> @@ -2021,6 +2039,8 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @data: @time: +<!-- # Unused Parameters # --> +@time_: <!-- ##### SIGNAL GtkWidget::selection-request-event ##### --> <para> @@ -106,14 +106,14 @@ GdkGrabStatus gdk_pointer_grab (GdkWindow *window, GdkEventMask event_mask, GdkWindow *confine_to, GdkCursor *cursor, - guint32 time); + guint32 time_); GdkGrabStatus gdk_keyboard_grab (GdkWindow *window, gboolean owner_events, - guint32 time); + guint32 time_); #ifndef GDK_MULTIHEAD_SAFE -void gdk_pointer_ungrab (guint32 time); -void gdk_keyboard_ungrab (guint32 time); +void gdk_pointer_ungrab (guint32 time_); +void gdk_keyboard_ungrab (guint32 time_); gboolean gdk_pointer_is_grabbed (void); gint gdk_screen_width (void) G_GNUC_CONST; diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 0adc0db661..e121e426dd 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -259,7 +259,7 @@ gdk_display_put_event (GdkDisplay *display, /** * gdk_pointer_ungrab: - * @time: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is + * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is * available. * * Ungrabs the pointer, if it is grabbed by this application. @@ -288,7 +288,7 @@ gdk_pointer_is_grabbed (void) /** * gdk_keyboard_ungrab: - * @time: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no + * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no * timestamp is available. * * Ungrabs the keyboard, if it is grabbed by this application. diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index 5e2485f5fa..4fa948e71e 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -107,9 +107,9 @@ GdkScreen * gdk_display_get_screen (GdkDisplay *display, gint screen_num); GdkScreen * gdk_display_get_default_screen (GdkDisplay *display); void gdk_display_pointer_ungrab (GdkDisplay *display, - guint32 time); + guint32 time_); void gdk_display_keyboard_ungrab (GdkDisplay *display, - guint32 time); + guint32 time_); gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display); void gdk_display_beep (GdkDisplay *display); void gdk_display_sync (GdkDisplay *display); diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index 177cd4bfb0..3954c0d130 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -88,13 +88,13 @@ void gdk_drag_context_unref (GdkDragContext *context); void gdk_drag_status (GdkDragContext *context, GdkDragAction action, - guint32 time); + guint32 time_); void gdk_drop_reply (GdkDragContext *context, gboolean ok, - guint32 time); + guint32 time_); void gdk_drop_finish (GdkDragContext *context, gboolean success, - guint32 time); + guint32 time_); GdkAtom gdk_drag_get_selection (GdkDragContext *context); /* Source side */ @@ -131,11 +131,11 @@ gboolean gdk_drag_motion (GdkDragContext *context, gint y_root, GdkDragAction suggested_action, GdkDragAction possible_actions, - guint32 time); + guint32 time_); void gdk_drag_drop (GdkDragContext *context, - guint32 time); + guint32 time_); void gdk_drag_abort (GdkDragContext *context, - guint32 time); + guint32 time_); #ifdef __cplusplus } diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 8e024fa76f..dfffb04212 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -343,10 +343,10 @@ gdk_draw_point (GdkDrawable *drawable, * gdk_draw_line: * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap). * @gc: a #GdkGC. - * @x1: the x coordinate of the start point. - * @y1: the y coordinate of the start point. - * @x2: the x coordinate of the end point. - * @y2: the y coordinate of the end point. + * @x1_: the x coordinate of the start point. + * @y1_: the y coordinate of the start point. + * @x2_: the x coordinate of the end point. + * @y2_: the y coordinate of the end point. * * Draws a line, using the foreground color and other attributes of * the #GdkGC. diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index 623ab46901..e81d3935d8 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -211,10 +211,10 @@ void gdk_draw_point (GdkDrawable *drawable, gint y); void gdk_draw_line (GdkDrawable *drawable, GdkGC *gc, - gint x1, - gint y1, - gint x2, - gint y2); + gint x1_, + gint y1_, + gint x2_, + gint y2_); void gdk_draw_rectangle (GdkDrawable *drawable, GdkGC *gc, gboolean filled, diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h index 430a17b001..fb96976c96 100644 --- a/gdk/gdkinput.h +++ b/gdk/gdkinput.h @@ -110,12 +110,12 @@ gboolean gdk_device_set_mode (GdkDevice *device, GdkInputMode mode); void gdk_device_set_key (GdkDevice *device, - guint index, + guint index_, guint keyval, GdkModifierType modifiers); void gdk_device_set_axis_use (GdkDevice *device, - guint index, + guint index_, GdkAxisUse use); void gdk_device_get_state (GdkDevice *device, GdkWindow *window, diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h index 109e3cd682..2013e28301 100644 --- a/gdk/gdkselection.h +++ b/gdk/gdkselection.h @@ -41,7 +41,7 @@ typedef GdkAtom GdkSelectionType; #ifndef GDK_MULTIHEAD_SAFE gboolean gdk_selection_owner_set (GdkWindow *owner, GdkAtom selection, - guint32 time, + guint32 time_, gboolean send_event); GdkWindow* gdk_selection_owner_get (GdkAtom selection); #endif/* GDK_MULTIHEAD_SAFE */ @@ -49,7 +49,7 @@ GdkWindow* gdk_selection_owner_get (GdkAtom selection); gboolean gdk_selection_owner_set_for_display (GdkDisplay *display, GdkWindow *owner, GdkAtom selection, - guint32 time, + guint32 time_, gboolean send_event); GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display, GdkAtom selection); @@ -57,7 +57,7 @@ GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display, void gdk_selection_convert (GdkWindow *requestor, GdkAtom selection, GdkAtom target, - guint32 time); + guint32 time_); gboolean gdk_selection_property_get (GdkWindow *requestor, guchar **data, GdkAtom *prop_type, @@ -68,7 +68,7 @@ void gdk_selection_send_notify (guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, - guint32 time); + guint32 time_); #endif /* GDK_MULTIHEAD_SAFE */ void gdk_selection_send_notify_for_display (GdkDisplay *display, @@ -76,7 +76,7 @@ void gdk_selection_send_notify_for_display (GdkDisplay *display, GdkAtom selection, GdkAtom target, GdkAtom property, - guint32 time); + guint32 time_); #ifdef __cplusplus } diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 964c83491c..62b80543f9 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -382,7 +382,7 @@ _gdk_x11_display_is_root_window (GdkDisplay *display, /** * gdk_display_pointer_ungrab: * @display : a #GdkDisplay. - * @time: a timestap (e.g. GDK_CURRENT_TIME). + * @time_: a timestap (e.g. GDK_CURRENT_TIME). * * Release any pointer grab. */ @@ -416,7 +416,7 @@ gdk_display_pointer_is_grabbed (GdkDisplay * display) /** * gdk_display_keyboard_ungrab: * @display : a #GdkDisplay. - * @time : a timestap (e.g #GDK_CURRENT_TIME). + * @time_ : a timestap (e.g #GDK_CURRENT_TIME). * * Release any keyboard grab */ diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index ab96e66901..500bcff3c3 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -2978,7 +2978,7 @@ gdk_drag_find_window_for_screen (GdkDragContext *context, * @y_root: the y position of the pointer in root coordinates. * @suggested_action: the suggested action. * @possible_actions: the possible actions. - * @time: the timestamp for this operation. + * @time_: the timestamp for this operation. * * Updates the drag context when the pointer moves or the * set of actions changes. @@ -3132,7 +3132,7 @@ gdk_drag_motion (GdkDragContext *context, /** * gdk_drag_drop: * @context: a #GdkDragContext. - * @time: the timestamp for this operation. + * @time_: the timestamp for this operation. * * Drops on the current destination. * @@ -3172,7 +3172,7 @@ gdk_drag_drop (GdkDragContext *context, /** * gdk_drag_abort: * @context: a #GdkDragContext. - * @time: the timestamp for this operation. + * @time_: the timestamp for this operation. * * Aborts a drag without dropping. * @@ -3194,7 +3194,7 @@ gdk_drag_abort (GdkDragContext *context, * @context: a #GdkDragContext. * @action: the selected action which will be taken when a drop happens, * or 0 to indicate that a drop will not be accepted. - * @time: the timestamp for this operation. + * @time_: the timestamp for this operation. * * Selects one of the actions offered by the drag source. * @@ -3304,7 +3304,7 @@ gdk_drag_status (GdkDragContext *context, * gdk_drop_reply: * @context: a #GdkDragContext. * @ok: %TRUE if the drop is accepted. - * @time: the timestamp for this operation. + * @time_: the timestamp for this operation. * * Accepts or rejects a drop. * @@ -3357,7 +3357,7 @@ gdk_drop_reply (GdkDragContext *context, * gdk_drop_finish: * @context: a #GtkDragContext. * @success: %TRUE if the data was successfully received. - * @time: the timestamp for this operation. + * @time_: the timestamp for this operation. * * Ends the drag operation after a drop. * diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index 7e87980b64..0f55b77f4b 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -105,7 +105,7 @@ _gdk_selection_filter_clear_event (XSelectionClearEvent *event) * @owner : a GdkWindow or NULL to indicate that the the owner for * the given should be unset. * @selection : an atom identifying a selection. - * @time : timestamp to use when setting the selection. + * @time_ : timestamp to use when setting the selection. * If this is older than the timestamp given last time the owner was * set for the given selection, the request will be ignored. * @send_event : if TRUE, and the new owner is different from the current @@ -370,7 +370,7 @@ gdk_selection_property_get (GdkWindow *requestor, * @target : target that was selected. * @property : property in which the selection owner stored the data, * or GDK_NONE to indicate that the request was rejected. - * @time : timestamp. + * @time_ : timestamp. * * Send a response to SelectionRequest event. **/ diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h index 0d0c94b363..efc28a4ba1 100644 --- a/gtk/gtkcurve.h +++ b/gtk/gtkcurve.h @@ -99,7 +99,7 @@ struct _GtkCurveClass GType gtk_curve_get_type (void) G_GNUC_CONST; GtkWidget* gtk_curve_new (void); void gtk_curve_reset (GtkCurve *curve); -void gtk_curve_set_gamma (GtkCurve *curve, gfloat gamma); +void gtk_curve_set_gamma (GtkCurve *curve, gfloat gamma_); void gtk_curve_set_range (GtkCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y); diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h index 8bb7aeb429..c392442a9e 100644 --- a/gtk/gtkdnd.h +++ b/gtk/gtkdnd.h @@ -55,11 +55,11 @@ typedef enum { void gtk_drag_get_data (GtkWidget *widget, GdkDragContext *context, GdkAtom target, - guint32 time); + guint32 time_); void gtk_drag_finish (GdkDragContext *context, gboolean success, gboolean del, - guint32 time); + guint32 time_); GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context); diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 23e344cf68..0992e3e7d3 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -1472,7 +1472,7 @@ ifactory_delete_popup_data (GtkObject *object, * @x: the x position * @y: the y position * @mouse_button: the mouse button which was pressed to initiate the popup - * @time: the time at which the activation event occurred + * @time_: the time at which the activation event occurred * * Pops up the menu constructed from the item factory at (@x, @y). * @@ -1481,11 +1481,11 @@ ifactory_delete_popup_data (GtkObject *object, * a mouse button press, such as a mouse button release or a keypress, * @mouse_button should be 0. * - * The @time parameter should be the time stamp of the event that + * The @time_ parameter should be the time stamp of the event that * initiated the popup. If such an event is not available, use * gtk_get_current_event_time() instead. * - * The operation of the @mouse_button and the @time parameter is the same + * The operation of the @mouse_button and the @time_ parameter is the same * as the @button and @activation_time parameters for gtk_menu_popup(). */ void @@ -1507,7 +1507,7 @@ gtk_item_factory_popup (GtkItemFactory *ifactory, * @x: the x position * @y: the y position * @mouse_button: the mouse button which was pressed to initiate the popup - * @time: the time at which the activation event occurred + * @time_: the time at which the activation event occurred * * Pops up the menu constructed from the item factory at (@x, @y). Callbacks * can access the @popup_data while the menu is posted via @@ -1518,11 +1518,11 @@ gtk_item_factory_popup (GtkItemFactory *ifactory, * a mouse button press, such as a mouse button release or a keypress, * @mouse_button should be 0. * - * The @time parameter should be the time stamp of the event that + * The @time_ parameter should be the time stamp of the event that * initiated the popup. If such an event is not available, use * gtk_get_current_event_time() instead. * - * The operation of the @mouse_button and the @time parameters is the same + * The operation of the @mouse_button and the @time_ parameters is the same * as the @button and @activation_time parameters for gtk_menu_popup(). */ void diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 7efaab2d38..230e46bc05 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -185,14 +185,14 @@ void gtk_item_factory_popup (GtkItemFactory *ifactory, guint x, guint y, guint mouse_button, - guint32 time); + guint32 time_); void gtk_item_factory_popup_with_data(GtkItemFactory *ifactory, gpointer popup_data, GtkDestroyNotify destroy, guint x, guint y, guint mouse_button, - guint32 time); + guint32 time_); gpointer gtk_item_factory_popup_data (GtkItemFactory *ifactory); gpointer gtk_item_factory_popup_data_from_widget (GtkWidget *widget); void gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index 1039069957..62d5ac3e29 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -145,7 +145,7 @@ void gtk_menu_popdown (GtkMenu *menu); */ GtkWidget* gtk_menu_get_active (GtkMenu *menu); void gtk_menu_set_active (GtkMenu *menu, - guint index); + guint index_); /* set/get the accelerator group that holds global accelerators (should * be added to the corresponding toplevel with gtk_window_add_accel_group(). diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c index f52332cdce..b4c79627e4 100644 --- a/gtk/gtkoldeditable.c +++ b/gtk/gtkoldeditable.c @@ -715,7 +715,7 @@ old_editable_text_received_cb (GtkClipboard *clipboard, * @old_editable: a #GtkOldEditable * @claim: if %TRUE, claim ownership of the selection, if %FALSE, give * up ownership - * @time: timestamp for this operation + * @time_: timestamp for this operation * * Claims or gives up ownership of the selection. */ diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h index f0d181352b..d5983d9e29 100644 --- a/gtk/gtkoldeditable.h +++ b/gtk/gtkoldeditable.h @@ -50,7 +50,7 @@ extern "C" { typedef struct _GtkOldEditable GtkOldEditable; typedef struct _GtkOldEditableClass GtkOldEditableClass; -typedef void (*GtkTextFunction) (GtkOldEditable *editable, guint32 time); +typedef void (*GtkTextFunction) (GtkOldEditable *editable, guint32 time_); struct _GtkOldEditable { @@ -121,7 +121,7 @@ struct _GtkOldEditableClass GtkType gtk_old_editable_get_type (void) G_GNUC_CONST; void gtk_old_editable_claim_selection (GtkOldEditable *old_editable, gboolean claim, - guint32 time); + guint32 time_); void gtk_old_editable_changed (GtkOldEditable *old_editable); #ifdef __cplusplus diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h index d72cd8c244..e692ca0882 100644 --- a/gtk/gtkoptionmenu.h +++ b/gtk/gtkoptionmenu.h @@ -81,7 +81,7 @@ void gtk_option_menu_set_menu (GtkOptionMenu *option_menu, void gtk_option_menu_remove_menu (GtkOptionMenu *option_menu); gint gtk_option_menu_get_history (GtkOptionMenu *option_menu); void gtk_option_menu_set_history (GtkOptionMenu *option_menu, - guint index); + guint index_); #ifdef __cplusplus diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 466423d714..fbf25e0f3a 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -213,7 +213,7 @@ gtk_plug_set_is_child (GtkPlug *plug, /** * _gtk_plug_add_to_socket: * @plug: a #GtkPlug - * @socket: a #GtkSocket + * @socket_: a #GtkSocket * * Adds a plug to a socket within the same application. **/ @@ -269,7 +269,7 @@ send_delete_event (GtkWidget *widget) /** * _gtk_plug_remove_from_socket: * @plug: a #GtkPlug - * @socket: a #GtkSocket + * @socket_: a #GtkSocket * * Removes a plug from a socket within the same application. **/ diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index cd46ea0ec7..20df3eaa30 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -92,9 +92,9 @@ GtkWidget* gtk_plug_new_for_display (GdkDisplay *display, GdkNativeWindow gtk_plug_get_id (GtkPlug *plug); void _gtk_plug_add_to_socket (GtkPlug *plug, - GtkSocket *socket); + GtkSocket *socket_); void _gtk_plug_remove_from_socket (GtkPlug *plug, - GtkSocket *socket); + GtkSocket *socket_); #ifdef __cplusplus } diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h index 032cc3c693..d8df2f42c6 100644 --- a/gtk/gtkpreview.h +++ b/gtk/gtkpreview.h @@ -113,7 +113,7 @@ void gtk_preview_draw_row (GtkPreview *preview, void gtk_preview_set_expand (GtkPreview *preview, gboolean expand); -void gtk_preview_set_gamma (double gamma); +void gtk_preview_set_gamma (double gamma_); void gtk_preview_set_color_cube (guint nred_shades, guint ngreen_shades, guint nblue_shades, diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index e62d4d2b18..02ffdad49c 100644 --- a/gtk/gtkrange.h +++ b/gtk/gtkrange.h @@ -118,7 +118,7 @@ struct _GtkRangeClass /* Virtual functions */ void (* get_range_border) (GtkRange *range, - GtkBorder *border); + GtkBorder *border_); /* Padding for future expansion */ void (*_gtk_reserved1) (void); diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 40ca5206f5..c8a9ec6f0c 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -300,7 +300,7 @@ gtk_target_list_find (GtkTargetList *list, * @display: the #Gdkdisplay where the selection is set * @widget: new selection owner (a #GdkWidget), or %NULL. * @selection: an interned atom representing the selection to claim. - * @time: timestamp with which to claim the selection + * @time_: timestamp with which to claim the selection * * Claim ownership of a given selection for a particular widget, or, * if @widget is %NULL, release ownership of the selection. @@ -399,7 +399,7 @@ gtk_selection_owner_set_for_display (GdkDisplay *display, * gtk_selection_owner_set: * @widget: a #GtkWidget, or %NULL. * @selection: an interned atom representing the selection to claim - * @time: timestamp with which to claim the selection + * @time_: timestamp with which to claim the selection * * Claims ownership of a given selection for a particular widget, * or, if @widget is %NULL, release ownership of the selection. diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index dc783ec6ad..ebaa22fb82 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -108,11 +108,11 @@ gboolean gtk_target_list_find (GtkTargetList *list, gboolean gtk_selection_owner_set (GtkWidget *widget, GdkAtom selection, - guint32 time); + guint32 time_); gboolean gtk_selection_owner_set_for_display (GdkDisplay *display, GtkWidget *widget, GdkAtom selection, - guint32 time); + guint32 time_); void gtk_selection_add_target (GtkWidget *widget, GdkAtom selection, @@ -127,7 +127,7 @@ void gtk_selection_clear_targets (GtkWidget *widget, gboolean gtk_selection_convert (GtkWidget *widget, GdkAtom selection, GdkAtom target, - guint32 time); + guint32 time_); void gtk_selection_data_set (GtkSelectionData *selection_data, GdkAtom type, gint format, diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 2fee53f671..e2b488df76 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -256,7 +256,7 @@ gtk_socket_new (void) /** * gtk_socket_steal: - * @socket: a #GtkSocket + * @socket_: a #GtkSocket * @wid: the window ID of an existing toplevel window. * * Reparents a pre-existing toplevel window into a #GtkSocket. This is @@ -281,7 +281,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid) /** * gtk_socket_add_id: - * @socket: a #GtkSocket + * @socket_: a #GtkSocket * @window_id: the window ID of a client participating in the XEMBED protocol. * * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The @@ -311,7 +311,7 @@ gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow window_id) /** * gtk_socket_get_id: - * @socket: a #GtkSocket. + * @socket_: a #GtkSocket. * * Gets the window ID of a #GtkSocket widget, which can then * be used to create a client embedded inside the socket, for diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index f47d79ec31..a3f4d489ad 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -72,8 +72,8 @@ struct _GtkSocketClass { GtkContainerClass parent_class; - void (*plug_added) (GtkSocket *socket); - gboolean (*plug_removed) (GtkSocket *socket); + void (*plug_added) (GtkSocket *socket_); + gboolean (*plug_removed) (GtkSocket *socket_); /* Padding for future expansion */ void (*_gtk_reserved1) (void); @@ -86,12 +86,12 @@ struct _GtkSocketClass GType gtk_socket_get_type (void) G_GNUC_CONST; GtkWidget* gtk_socket_new (void); -void gtk_socket_add_id (GtkSocket *socket, +void gtk_socket_add_id (GtkSocket *socket_, GdkNativeWindow window_id); -GdkNativeWindow gtk_socket_get_id (GtkSocket *socket); +GdkNativeWindow gtk_socket_get_id (GtkSocket *socket_); #ifndef GTK_DISABLE_DEPRECATED -void gtk_socket_steal (GtkSocket *socket, +void gtk_socket_steal (GtkSocket *socket_, GdkNativeWindow wid); #endif /* GTK_DISABLE_DEPRECATED */ diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index ec6e984baa..cb3c1020e1 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -952,11 +952,11 @@ gtk_draw_hline (GtkStyle *style, * @style: a #GtkStyle * @window: a #GdkWindow * @state_type: a state - * @y1: the starting y coordinate - * @y2: the ending y coordinate + * @y1_: the starting y coordinate + * @y2_: the ending y coordinate * @x: the x coordinate * - * Draws a vertical line from (@x, @y1) to (@x, @y2) in @window + * Draws a vertical line from (@x, @y1_) to (@x, @y2_) in @window * using the given style and state. * * This function is deprecated, use gtk_paint_vline() instead. @@ -5533,11 +5533,11 @@ gtk_paint_hline (GtkStyle *style, * @area: rectangle to which the output is clipped * @widget: * @detail: - * @y1: the starting y coordinate - * @y2: the ending y coordinate + * @y1_: the starting y coordinate + * @y2_: the ending y coordinate * @x: the x coordinate * - * Draws a vertical line from (@x, @y1) to (@x, @y1) in @window + * Draws a vertical line from (@x, @y1_) to (@x, @y2_) in @window * using the given style and state. */ void @@ -5946,8 +5946,8 @@ gtk_paint_resize_grip (GtkStyle *style, /** * gtk_border_copy: - * @border: a #GtkBorder. - * @returns: a copy of @border. + * @border_: a #GtkBorder. + * @returns: a copy of @border_. * * Copies a #GtkBorder structure. **/ @@ -5959,7 +5959,7 @@ gtk_border_copy (const GtkBorder *border) /** * gtk_border_free: - * @border: a #GtkBorder. + * @border_: a #GtkBorder. * * Frees a #GtkBorder structure. **/ diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 0fbdf06fdb..cc6ac74aa7 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -184,8 +184,8 @@ struct _GtkStyleClass GdkRectangle *area, GtkWidget *widget, const gchar *detail, - gint y1, - gint y2, + gint y1_, + gint y2_, gint x); void (*draw_shadow) (GtkStyle *style, GdkWindow *window, @@ -473,8 +473,8 @@ void gtk_draw_hline (GtkStyle *style, void gtk_draw_vline (GtkStyle *style, GdkWindow *window, GtkStateType state_type, - gint y1, - gint y2, + gint y1_, + gint y2_, gint x); void gtk_draw_shadow (GtkStyle *style, GdkWindow *window, @@ -642,8 +642,8 @@ void gtk_paint_vline (GtkStyle *style, GdkRectangle *area, GtkWidget *widget, const gchar *detail, - gint y1, - gint y2, + gint y1_, + gint y2_, gint x); void gtk_paint_shadow (GtkStyle *style, GdkWindow *window, @@ -853,8 +853,8 @@ void gtk_paint_resize_grip (GtkStyle *style, GType gtk_border_get_type (void); -GtkBorder *gtk_border_copy (const GtkBorder *border); -void gtk_border_free ( GtkBorder *border); +GtkBorder *gtk_border_copy (const GtkBorder *border_); +void gtk_border_free ( GtkBorder *border_); /* --- private API --- */ const GValue* _gtk_style_peek_property_value (GtkStyle *style, diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index fbff791534..70125e5227 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -778,12 +778,12 @@ update_layout_size (GtkTextLayout *layout) * @layout: a #GtkTextLayout * @anchor: iter pointing into a line that will be used as the * coordinate origin - * @y0: offset from the top of the line pointed to by @anchor at - * which to begin validation. (The offset here is in pixels - * after validation.) - * @y1: offset from the top of the line pointed to by @anchor at - * which to end validation. (The offset here is in pixels - * after validation.) + * @y0_: offset from the top of the line pointed to by @anchor at + * which to begin validation. (The offset here is in pixels + * after validation.) + * @y1_: offset from the top of the line pointed to by @anchor at + * which to end validation. (The offset here is in pixels + * after validation.) * * Ensure that a region of a #GtkTextLayout is valid. The ::changed * signal will be emitted if any lines are validated. diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index 42126ed73d..58e8e97c45 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -322,8 +322,8 @@ void gtk_text_layout_free_line_data (GtkTextLayout *layout, gboolean gtk_text_layout_is_valid (GtkTextLayout *layout); void gtk_text_layout_validate_yrange (GtkTextLayout *layout, GtkTextIter *anchor_line, - gint y0, - gint y1); + gint y0_, + gint y1_); void gtk_text_layout_validate (GtkTextLayout *layout, gint max_pixels); diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index c88373a936..5571e49528 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -307,7 +307,7 @@ gtk_tree_path_new_first (void) /** * gtk_tree_path_append_index: * @path: A #GtkTreePath. - * @index: The index. + * @index_: The index. * * Appends a new index to a path. As a result, the depth of the path is * increased. @@ -327,7 +327,7 @@ gtk_tree_path_append_index (GtkTreePath *path, /** * gtk_tree_path_prepend_index: * @path: A #GtkTreePath. - * @index: The index. + * @index_: The index. * * Prepends a new index to a path. As a result, the depth of the path is * increased. @@ -701,7 +701,7 @@ gtk_tree_model_get_n_columns (GtkTreeModel *tree_model) /** * gtk_tree_model_get_column_type: * @tree_model: A #GtkTreeModel. - * @index: The column index. + * @index_: The column index. * * Returns the type of the column. * @@ -978,7 +978,7 @@ gtk_tree_model_iter_n_children (GtkTreeModel *tree_model, * @n: Then index of the desired child. * * Sets @iter to be the child of @parent, using the given index. The first - * index is 0. If @index is too big, or @parent has no children, @iter is set + * index is 0. If @index_ is too big, or @parent has no children, @iter is set * to an invalid iterator and %FALSE is returned. @parent will remain a valid * node after this function has been called. As a special case, if @parent is * %NULL, then the @n<!-- -->th root node is set. diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index b611729ed1..f922bd7d9e 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -84,7 +84,7 @@ struct _GtkTreeModelIface gint (* get_n_columns) (GtkTreeModel *tree_model); GType (* get_column_type) (GtkTreeModel *tree_model, - gint index); + gint index_); gboolean (* get_iter) (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path); @@ -126,9 +126,9 @@ gchar *gtk_tree_path_to_string (GtkTreePath *path); #define gtk_tree_path_new_root() gtk_tree_path_new_first() GtkTreePath *gtk_tree_path_new_first (void); void gtk_tree_path_append_index (GtkTreePath *path, - gint index); + gint index_); void gtk_tree_path_prepend_index (GtkTreePath *path, - gint index); + gint index_); gint gtk_tree_path_get_depth (GtkTreePath *path); gint *gtk_tree_path_get_indices (GtkTreePath *path); void gtk_tree_path_free (GtkTreePath *path); @@ -180,7 +180,7 @@ GType gtk_tree_model_get_type (void) G_GNUC_CONST; GtkTreeModelFlags gtk_tree_model_get_flags (GtkTreeModel *tree_model); gint gtk_tree_model_get_n_columns (GtkTreeModel *tree_model); GType gtk_tree_model_get_column_type (GtkTreeModel *tree_model, - gint index); + gint index_); /* Iterator movement */ diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index fe624c2034..a16c36a999 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -343,10 +343,10 @@ struct _GtkWidgetClass void (* selection_get) (GtkWidget *widget, GtkSelectionData *selection_data, guint info, - guint time); + guint time_); void (* selection_received) (GtkWidget *widget, GtkSelectionData *selection_data, - guint time); + guint time_); /* Source side drag signals */ void (* drag_begin) (GtkWidget *widget, @@ -357,31 +357,31 @@ struct _GtkWidgetClass GdkDragContext *context, GtkSelectionData *selection_data, guint info, - guint time); + guint time_); void (* drag_data_delete) (GtkWidget *widget, GdkDragContext *context); /* Target side drag signals */ void (* drag_leave) (GtkWidget *widget, GdkDragContext *context, - guint time); + guint time_); gboolean (* drag_motion) (GtkWidget *widget, GdkDragContext *context, gint x, gint y, - guint time); + guint time_); gboolean (* drag_drop) (GtkWidget *widget, GdkDragContext *context, gint x, gint y, - guint time); + guint time_); void (* drag_data_received) (GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, guint info, - guint time); + guint time_); /* Signals used only for keybindings */ gboolean (* popup_menu) (GtkWidget *widget); |