AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: Deprecate GtkRuler and subclasses.

Browse Source 
They have been removed fom GTK 3.
This commit is contained in:
Benjamin Otte 2010-11-24 17:26:09 +01:00
parent 058ff14ac8
commit 07c00b9969
9 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/reference/gtk/tmpl/gtkhruler.sgml
View File

@ -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.

17
docs/reference/gtk/tmpl/gtkruler.sgml
View File

@ -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>

6
gtk/gtk.symbols
View File

@ -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__)

2
gtk/gtkhruler.c
View File

@ -26,6 +26,8 @@
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhruler.h"
#include "gtkorientable.h"
#include "gtkalias.h"

4
gtk/gtkhruler.h
View File

@ -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 */

30
gtk/gtkruler.c
View File

@ -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,

4
gtk/gtkruler.h
View File

@ -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 */

15
gtk/gtkvruler.c
View File

@ -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)

4
gtk/gtkvruler.h
View File

@ -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 */