[gtk+/gtk-2-24] gtk: Deprecate GtkRuler and subclasses.

[Benjamin Otte <otte src gnome org>]

commit 07c00b996985886e1902d802353142a93a2b0d4b
Author: Benjamin Otte <otte redhat com>
Date:   Wed Nov 24 17:26:09 2010 +0100

    gtk: Deprecate GtkRuler and subclasses.
    
    They have been removed fom GTK 3.

 docs/reference/gtk/tmpl/gtkhruler.sgml |   13 +++++++------
 docs/reference/gtk/tmpl/gtkruler.sgml  |   17 +++++++++++------
 gtk/gtk.symbols                        |    6 ++++++
 gtk/gtkhruler.c                        |    2 ++
 gtk/gtkhruler.h                        |    4 ++++
 gtk/gtkruler.c                         |   30 ++++++++++--------------------
 gtk/gtkruler.h                         |    4 ++++
 gtk/gtkvruler.c                        |   15 +++++++++------
 gtk/gtkvruler.h                        |    4 ++++
 9 files changed, 57 insertions(+), 38 deletions(-)
---
diff --git a/docs/reference/gtk/tmpl/gtkhruler.sgml b/docs/reference/gtk/tmpl/gtkhruler.sgml
index 433dd16..30c99fa 100644
--- a/docs/reference/gtk/tmpl/gtkhruler.sgml
+++ b/docs/reference/gtk/tmpl/gtkhruler.sgml
@@ -8,12 +8,10 @@ A horizontal ruler
 <note>
 <para>
  This widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package.  If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
+ GTK+, and will be removed in GTK 3.  If your application needs this widget,
+ feel free to use it, as the widget is useful in some applications; it's just
+ not of general interest. However, we are not accepting new features for the
+ widget, and it will move out of the GTK+ distribution.
 </para>
 </note>
 <para>
@@ -51,4 +49,7 @@ Creates a new horizontal ruler.
 @void: 
 @Returns: a new #GtkHRuler.
 
+ Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+    unmaintained and too specialized. There is no replacement.
+
 
diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml
index 2dc9a89..363e359 100644
--- a/docs/reference/gtk/tmpl/gtkruler.sgml
+++ b/docs/reference/gtk/tmpl/gtkruler.sgml
@@ -8,12 +8,10 @@ Base class for horizontal or vertical rulers
 <note>
 <para>
  This widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package.  If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
+ GTK+, and will be removed in GTK 3.  If your application needs this widget,
+ feel free to use it, as the widget is useful in some applications; it's just
+ not of general interest. However, we are not accepting new features for the
+ widget, and it will move out of the GTK+ distribution.
 </para>
 </note>
 <para>
@@ -79,6 +77,10 @@ This should be points_per_unit. This is the size of the unit in 1/72nd's of an i
 @ruler_scale: 
 @subdivide: 
 
+ Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+    unmaintained and too specialized. There is no replacement.
+
+
 <!-- ##### FUNCTION gtk_ruler_set_metric ##### -->
 <para>
 This calls the #GTKMetricType to set the ruler to units defined. Available units
@@ -89,6 +91,9 @@ is GTK_PIXELS.
 @ruler: the gtkruler
 @metric: the unit of measurement
 
+ Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+    unmaintained and too specialized. There is no replacement.
+
 
 <!-- ##### FUNCTION gtk_ruler_set_range ##### -->
 <para>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index f7355a9..2cb713b 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1881,10 +1881,12 @@ gtk_hpaned_new
 
 #if IN_HEADER(__GTK_HRULER_H__)
 #if IN_FILE(__GTK_HRULER_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_hruler_get_type G_GNUC_CONST
 gtk_hruler_new
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GTK_HSCALE_H__)
 #if IN_FILE(__GTK_HSCALE_C__)
@@ -3662,6 +3664,7 @@ gtk_text_buffer_unregister_serialize_format
 
 #if IN_HEADER(__GTK_RULER_H__)
 #if IN_FILE(__GTK_RULER_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_ruler_draw_pos
 gtk_ruler_draw_ticks
 gtk_ruler_get_metric
@@ -3671,6 +3674,7 @@ gtk_ruler_set_metric
 gtk_ruler_set_range
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GTK_SCALE_H__)
 #if IN_FILE(__GTK_SCALE_C__)
@@ -5098,10 +5102,12 @@ gtk_vpaned_new
 
 #if IN_HEADER(__GTK_VRULER_H__)
 #if IN_FILE(__GTK_VRULER_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_vruler_get_type G_GNUC_CONST
 gtk_vruler_new
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GTK_VSCALE_H__)
 #if IN_FILE(__GTK_VSCALE_C__)
diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c
index 66e5a17..63e2d6c 100644
--- a/gtk/gtkhruler.c
+++ b/gtk/gtkhruler.c
@@ -26,6 +26,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkhruler.h"
 #include "gtkorientable.h"
 #include "gtkalias.h"
diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h
index 3c30917..c0e2118 100644
--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@@ -38,6 +38,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_HRULER_H__
 #define __GTK_HRULER_H__
 
@@ -78,3 +80,5 @@ G_END_DECLS
 
 
 #endif /* __GTK_HRULER_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index b34391b..d0da93e 100644
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #undef GDK_DISABLE_DEPRECATED /* We need gdk_drawable_get_size() */
+#undef GTK_DISABLE_DEPRECATED
 
 #include "gtkorientable.h"
 #include "gtkruler.h"
@@ -280,26 +281,6 @@ gtk_ruler_get_property (GObject      *object,
     }
 }
 
-#if 0
-/**
- * gtk_ruler_new:
- * @orientation: the ruler's orientation.
- *
- * Creates a new #GtkRuler with the given orientation.
- *
- * Return value: a new #GtkRuler.
- *
- * Since: 2.16
- **/
-GtkWidget *
-gtk_ruler_new (GtkOrientation orientation)
-{
-  return g_object_new (GTK_TYPE_RULER,
-                       "orientation", orientation,
-                       NULL);
-}
-#endif
-
 void
 gtk_ruler_set_metric (GtkRuler      *ruler,
 		      GtkMetricType  metric)
@@ -321,6 +302,9 @@ gtk_ruler_set_metric (GtkRuler      *ruler,
  * Gets the units used for a #GtkRuler. See gtk_ruler_set_metric().
  *
  * Return value: the units currently used for @ruler
+ *
+ * @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+ *              unmaintained and too specialized. There is no replacement.
  **/
 GtkMetricType
 gtk_ruler_get_metric (GtkRuler *ruler)
@@ -348,6 +332,9 @@ gtk_ruler_get_metric (GtkRuler *ruler)
  * leave for the text
  *
  * This sets the range of the ruler. 
+ *
+ * @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+ *              unmaintained and too specialized. There is no replacement.
  */
 void
 gtk_ruler_set_range (GtkRuler *ruler,
@@ -396,6 +383,9 @@ gtk_ruler_set_range (GtkRuler *ruler,
  *
  * Retrieves values indicating the range and current position of a #GtkRuler.
  * See gtk_ruler_set_range().
+ *
+ * @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+ *              unmaintained and too specialized. There is no replacement.
  **/
 void
 gtk_ruler_get_range (GtkRuler *ruler,
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index ed149e3..b226052 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -38,6 +38,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_RULER_H__
 #define __GTK_RULER_H__
 
@@ -130,3 +132,5 @@ void            gtk_ruler_draw_pos   (GtkRuler       *ruler);
 G_END_DECLS
 
 #endif /* __GTK_RULER_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c
index 5bff897..1cfeb15 100644
--- a/gtk/gtkvruler.c
+++ b/gtk/gtkvruler.c
@@ -26,6 +26,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkorientable.h"
 #include "gtkvruler.h"
 #include "gtkalias.h"
@@ -37,12 +39,10 @@
  *
  * <note>
  *  This widget is considered too specialized/little-used for
- *  GTK+, and will in the future be moved to some other package.  If
- *  your application needs this widget, feel free to use it, as the
- *  widget does work and is useful in some applications; it's just not
- *  of general interest. However, we are not accepting new features for
- *  the widget, and it will eventually move out of the GTK+
- *  distribution.
+ *  GTK+, and will be removed in GTK 3.  If your application needs this widget,
+ *  feel free to use it, as the widget is useful in some applications; it's just
+ *  not of general interest. However, we are not accepting new features for the
+ *  widget, and it will move out of the GTK+ distribution.
  * </note>
  *
  * The VRuler widget is a widget arranged vertically creating a ruler that is
@@ -72,6 +72,9 @@ gtk_vruler_init (GtkVRuler *vruler)
  * Creates a new vertical ruler
  *
  * Returns: a new #GtkVRuler.
+ *
+ * @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
+ *              unmaintained and too specialized. There is no replacement.
  */
 GtkWidget *
 gtk_vruler_new (void)
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index 4cade7b..9bff47c 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -38,6 +38,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_VRULER_H__
 #define __GTK_VRULER_H__
 
@@ -78,3 +80,5 @@ G_END_DECLS
 
 
 #endif /* __GTK_VRULER_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */