From b1165617b79f589695172db638bd101c44c74ea6 Mon Sep 17 00:00:00 2001
From: Soeren Sandmann <sandmann@daimi.au.dk>
Date: Fri, 8 Nov 2002 19:41:50 +0000
Subject: docs/reference/gdk/tmpl/dnd.sgml docs/reference/gdk/tmpl/drawing.sgml

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)
---
 gtk/gtkstyle.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gtk/gtkstyle.c')

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.
  **/
-- 
cgit v1.2.1