Version 1.3.11, interface, binary age 0.

Wed Nov 21 15:21:26 2001  Owen Taylor  <otaylor@redhat.com>

	* configure.in (GTK_MICRO_VERSION): Version 1.3.11,
	interface, binary age 0.

	* NEWS: Updates

	* gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
	fixes in docs.

	* gtk/gtkmain.h: Remove unused and misnamespaced
	get_gtk_win32_directory() prototype.

	* gdk/gdkimage.c (gdk_image_get): Fix parameter names
	to match header.

	* gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
	gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
	to match docs.

	* gdk/gdkevents.c (gdk_event_get_coords)
	  gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
	  gtk/gtkdnd.c (gtk_drag_set_icon_stock):
	Fix parameter names in docs.

	* docs/faq/Makefile.am (FAQ_FILES): Add missing files.
	(#64961, Akira Tagoh)

4 files changed, 12 insertions, 11 deletions

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index a7a4b81bd7..4b92195538 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -552,8 +552,8 @@ gdk_event_get_state (GdkEvent        *event,
 /**
  * gdk_event_get_coords:
  * @event: a #GdkEvent
- * @x_root: location to put event window x coordinate
- * @y_root: location to put event window y coordinate
+ * @x_win: location to put event window x coordinate
+ * @y_win: location to put event window y coordinate
  * 
  * Extract the event window relative x/y coordinates from an event.
  * 
diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 76ecc7eec4..71ae136e08 100644
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -61,7 +61,7 @@ gdk_image_unref (GdkImage *image)
 
 /**
  * gdk_image_get:
- * @window: a #GdkWindow 
+ * @drawable: a #GdkDrawable
  * @x: x coordinate in @window
  * @y: y coordinate in @window
  * @width: width of area in @window
@@ -75,19 +75,19 @@ gdk_image_unref (GdkImage *image)
  * Return value: a new #GdkImage or %NULL
  **/
 GdkImage*
-gdk_image_get (GdkWindow *window,
+gdk_image_get (GdkWindow *drawable,
 	       gint       x,
 	       gint       y,
 	       gint       width,
 	       gint       height)
 {
-  g_return_val_if_fail (GDK_IS_DRAWABLE (window), NULL);
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
   g_return_val_if_fail (x >= 0, NULL);
   g_return_val_if_fail (y >= 0, NULL);
   g_return_val_if_fail (width >= 0, NULL);
   g_return_val_if_fail (height >= 0, NULL);
   
-  return gdk_drawable_get_image (window, x, y, width, height);
+  return gdk_drawable_get_image (drawable, y, width, height);
 }
 
 /**
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index eae6d9baae..9383c7a255 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -333,9 +333,9 @@ void          gdk_window_scroll                (GdkWindow *window,
  *  from gdk_pixmap_create_from_xpm.   Stefan Wille
  */
 void gdk_window_shape_combine_mask  (GdkWindow	    *window,
-                                     GdkBitmap	    *shape_mask,
-                                     gint	     offset_x,
-                                     gint	     offset_y);
+                                     GdkBitmap	    *mask,
+                                     gint	     x,
+                                     gint	     y);
 void gdk_window_shape_combine_region (GdkWindow	    *window,
                                       GdkRegion     *shape_region,
                                       gint	     offset_x,
@@ -399,7 +399,7 @@ void          gdk_window_set_modal_hint  (GdkWindow       *window,
 					  gboolean         modal);
 void          gdk_window_set_geometry_hints (GdkWindow        *window,
 					     GdkGeometry      *geometry,
-					     GdkWindowHints    flags);
+					     GdkWindowHints    geom_mask);
 void          gdk_set_sm_client_id         (const gchar *sm_client_id);
 
 void	      gdk_window_begin_paint_rect   (GdkWindow    *window,
@@ -413,7 +413,7 @@ void	      gdk_window_set_title	   (GdkWindow	  *window,
 void          gdk_window_set_role          (GdkWindow       *window,
 					    const gchar     *role);
 void          gdk_window_set_transient_for (GdkWindow       *window, 
-					    GdkWindow       *leader);
+					    GdkWindow       *parent);
 void	      gdk_window_set_background	 (GdkWindow	  *window,
 					  GdkColor	  *color);
 void	      gdk_window_set_back_pixmap (GdkWindow	  *window,
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 265558bfb8..f7811d899e 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -4459,6 +4459,7 @@ emulate_move_drag (GdkWindow     *window,
 /**
  * gdk_window_begin_resize_drag:
  * @window: a #GdkWindow
+ * @edge: the edge or corner from which the drag is started
  * @button: the button being used to drag
  * @root_x: root window X coordinate of mouse click that began the drag
  * @root_y: root window Y coordinate of mouse click that began the drag