diff options
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.h | 8 | ||||
| -rw-r--r-- | gdk/gdkdisplay.c | 4 | ||||
| -rw-r--r-- | gdk/gdkdisplay.h | 4 | ||||
| -rw-r--r-- | gdk/gdkdnd.h | 12 | ||||
| -rw-r--r-- | gdk/gdkdraw.c | 8 | ||||
| -rw-r--r-- | gdk/gdkdrawable.h | 8 | ||||
| -rw-r--r-- | gdk/gdkinput.h | 4 | ||||
| -rw-r--r-- | gdk/gdkselection.h | 10 | ||||
| -rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 4 | ||||
| -rw-r--r-- | gdk/x11/gdkdnd-x11.c | 12 | ||||
| -rw-r--r-- | gdk/x11/gdkselection-x11.c | 4 |
11 files changed, 39 insertions, 39 deletions
@@ -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. **/ |