Remove some deprecated stuff from GdkWindow

Also, substitute the deprecated functions with the correct ones

5 files changed, 2 insertions, 108 deletions

diff --git a/docs/faq/gtk-faq.sgml b/docs/faq/gtk-faq.sgml
index 481f17faec..0da5e48e65 100644
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
@@ -3102,7 +3102,7 @@ like this:</para>
   gc = gdk_gc_new(widget->window);
 
   /* find proper dimensions for rectangle */
-  gdk_window_get_size(widget->window, &amp;width, &amp;height);
+  gdk_drawable_get_size(widget->window, &amp;width, &amp;height);
 
   /* the color we want to use */
   color = (GdkColor *)malloc(sizeof(GdkColor));
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 065a670e4a..58d069a409 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -612,8 +612,6 @@ GdkWindowAttr
 GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
-gdk_window_ref
-gdk_window_unref
 gdk_window_get_window_type
 gdk_window_at_pointer
 gdk_window_show
@@ -647,7 +645,6 @@ gdk_window_reparent
 gdk_window_clear
 gdk_window_clear_area
 gdk_window_clear_area_e
-gdk_window_copy_area
 gdk_window_raise
 gdk_window_lower
 gdk_window_restack
@@ -696,14 +693,12 @@ gdk_window_input_shape_combine_region
 gdk_window_set_child_input_shapes
 gdk_window_merge_child_input_shapes
 gdk_window_set_static_gravities
-gdk_window_set_hints
 gdk_window_set_title
 gdk_window_set_background
 gdk_window_set_back_pixmap
 GDK_PARENT_RELATIVE
 gdk_window_set_cursor
 gdk_window_get_cursor
-gdk_window_set_colormap
 gdk_window_get_user_data
 gdk_window_get_geometry
 gdk_window_set_geometry_hints
@@ -717,10 +712,6 @@ gdk_window_set_urgency_hint
 gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
-gdk_window_get_size
-gdk_window_get_visual
-gdk_window_get_colormap
-gdk_window_get_type
 gdk_window_get_origin
 gdk_window_get_deskrelative_origin
 gdk_window_get_root_coords
@@ -1237,7 +1228,6 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_ROOT_PARENT
 GDK_DISPLAY
 GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml
index 42c54b06f2..2ba31393a4 100644
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -383,7 +383,7 @@ union, 16-bit data uses the s array, and 32-bit data uses the l array.
 <!-- ##### STRUCT GdkEventNoExpose ##### -->
 <para>
 Generated when the area of a #GdkDrawable being copied, with gdk_draw_drawable()
-or gdk_window_copy_area(), was completely available.
+, was completely available.
 </para>
 <para>
 FIXME: add more here.
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 0b2d714511..c2e725ed34 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -510,21 +510,6 @@ corresponding flag in #GdkWindowAttributesType.
 @window: 
 
 
-<!-- ##### MACRO gdk_window_ref ##### -->
-<para>
-Deprecated equivalent of g_object_ref()
-</para>
-
-@Returns: the window
-
-
-<!-- ##### MACRO gdk_window_unref ##### -->
-<para>
-Deprecated equivalent of g_object_unref()
-</para>
-
-
-
 <!-- ##### FUNCTION gdk_window_get_window_type ##### -->
 <para>
 
@@ -825,26 +810,6 @@ Deprecated equivalent of g_object_unref()
 @height: 
 
 
-<!-- ##### MACRO gdk_window_copy_area ##### -->
-<para>
-Deprecated equivalent to gdk_draw_drawable(), see that function for docs
-</para>
-
-@drawable: a #GdkDrawable
-@gc: a #GdkGC sharing the drawable's visual and colormap
-@x: X position in @drawable where the rectangle should be drawn
-@y: Y position in @drawable where the rectangle should be drawn
-@source_drawable: the source #GdkDrawable, which may be the same as @drawable
-@source_x: X position in @src of rectangle to draw
-@source_y: Y position in @src of rectangle to draw
-@width: width of rectangle to draw, or -1 for entire @src width
-@height: height of rectangle to draw, or -1 for entire @src height
-<!-- # Unused Parameters # -->
-@drawable: a #GdkDrawable
-@xdest: X position in @drawable where the rectangle should be drawn
-@ydest: Y position in @drawable where the rectangle should be drawn
-
-
 <!-- ##### FUNCTION gdk_window_raise ##### -->
 <para>
 
@@ -1248,21 +1213,6 @@ backend, <type>MSG</type>s for Win32).
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_window_set_hints ##### -->
-<para>
-
-</para>
-
-@window: 
-@x: 
-@y: 
-@min_width: 
-@min_height: 
-@max_width: 
-@max_height: 
-@flags: 
-
-
 <!-- ##### FUNCTION gdk_window_set_title ##### -->
 <para>
 
@@ -1318,13 +1268,6 @@ window.
 @Returns: 
 
 
-<!-- ##### MACRO gdk_window_set_colormap ##### -->
-<para>
-Deprecated equivalent to gdk_drawable_set_colormap()
-</para>
-
-
-
 <!-- ##### FUNCTION gdk_window_get_user_data ##### -->
 <para>
 
@@ -1449,37 +1392,6 @@ Deprecated equivalent to gdk_drawable_set_colormap()
 @rect: 
 
 
-<!-- ##### MACRO gdk_window_get_size ##### -->
-<para>
-Deprecated equivalent of gdk_drawable_get_size().
-</para>
-
-
-
-<!-- ##### MACRO gdk_window_get_visual ##### -->
-<para>
-Deprecated equivalent of gdk_drawable_get_visual().
-</para>
-
-@Returns: the #GdkVisual of the window
-
-
-<!-- ##### MACRO gdk_window_get_colormap ##### -->
-<para>
-Deprecated equivalent of gdk_drawable_get_colormap().
-</para>
-
-@Returns: colormap for the window
-
-
-<!-- ##### MACRO gdk_window_get_type ##### -->
-<para>
-Deprecated equivalent of gdk_drawable_get_type().
-</para>
-
-@Returns: type of drawable
-
-
 <!-- ##### FUNCTION gdk_window_get_origin ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 66a5a07172..350073ff1c 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -26,14 +26,6 @@ Obtains the Xlib window id of the root window of the current screen.
 </para>
 
 
-
-<!-- ##### MACRO GDK_ROOT_PARENT ##### -->
-<para>
-Obtains the Xlib window id of the root window of the default screen.
-</para>
-
-
-
 <!-- ##### MACRO GDK_DISPLAY ##### -->
 <para>
 The current display.