GNOME.org
 

[gtk+] gtk: Remove GtkRuler

commit e0fb7a86e59278dccd7c276c754f9e8b7fdab0d5
Author: Benjamin Otte <otte redhat com>
Date:   Wed Nov 24 16:44:16 2010 +0100

    gtk: Remove GtkRuler
    
    It is really bad code, mostly unused and no one stepped up to fix it.
    
    Note that Gtk developers do not object to a ruler widget in priciple,
    just to the current implementation. If someone wants to propose a sane
    version, please don't hesitate.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=613942

 docs/reference/gtk/gtk3-sections.txt  |   55 --
 docs/reference/gtk/tmpl/gtkenums.sgml |    9 -
 gtk/Makefile.am                       |    6 -
 gtk/gtk.h                             |    3 -
 gtk/gtk.symbols                       |   10 -
 gtk/gtkenums.h                        |    7 -
 gtk/gtkhruler.c                       |   51 --
 gtk/gtkhruler.h                       |   80 ---
 gtk/gtkruler.c                        |  959 ---------------------------------
 gtk/gtkruler.h                        |  120 ----
 gtk/gtkvruler.c                       |   80 ---
 gtk/gtkvruler.h                       |   80 ---
 gtk/makefile.msc.in                   |    6 -
 gtk/tests/builder.c                   |    2 -
 tests/testgtk.c                       |   69 ---
 15 files changed, 0 insertions(+), 1537 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index b7e98ae..cd11a88 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1559,22 +1559,6 @@ gtk_hpaned_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkhruler</FILE>
-<TITLE>GtkHRuler</TITLE>
-GtkHRuler
-gtk_hruler_new
-<SUBSECTION Standard>
-GTK_HRULER
-GTK_IS_HRULER
-GTK_TYPE_HRULER
-GTK_HRULER_CLASS
-GTK_IS_HRULER_CLASS
-GTK_HRULER_GET_CLASS
-<SUBSECTION Private>
-gtk_hruler_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkhscale</FILE>
 <TITLE>GtkHScale</TITLE>
 GtkHScale
@@ -2712,28 +2696,6 @@ gtk_recent_action_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkruler</FILE>
-<TITLE>GtkRuler</TITLE>
-GtkRuler
-GtkRulerMetric
-gtk_ruler_new
-gtk_ruler_set_metric
-gtk_ruler_set_range
-gtk_ruler_get_metric
-gtk_ruler_get_range
-<SUBSECTION Standard>
-GTK_RULER
-GTK_IS_RULER
-GTK_TYPE_RULER
-GTK_RULER_CLASS
-GTK_IS_RULER_CLASS
-GTK_RULER_GET_CLASS
-<SUBSECTION Private>
-GtkRulerPrivate
-gtk_ruler_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkscale</FILE>
 <TITLE>GtkScale</TITLE>
 GtkScale
@@ -4747,22 +4709,6 @@ GtkPanedPrivate
 </SECTION>
 
 <SECTION>
-<FILE>gtkvruler</FILE>
-<TITLE>GtkVRuler</TITLE>
-GtkVRuler
-gtk_vruler_new
-<SUBSECTION Standard>
-GTK_VRULER
-GTK_IS_VRULER
-GTK_TYPE_VRULER
-GTK_VRULER_CLASS
-GTK_IS_VRULER_CLASS
-GTK_VRULER_GET_CLASS
-<SUBSECTION Private>
-gtk_vruler_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkvscale</FILE>
 <TITLE>GtkVScale</TITLE>
 GtkVScale
@@ -5589,7 +5535,6 @@ GtkExpanderStyle
 GtkIMPreeditStyle
 GtkIMStatusStyle
 GtkJustification
-GtkMetricType
 GtkMovementStep
 GtkOrientation
 GtkPackType
diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml
index e98cbaf..90c5817 100644
--- a/docs/reference/gtk/tmpl/gtkenums.sgml
+++ b/docs/reference/gtk/tmpl/gtkenums.sgml
@@ -155,15 +155,6 @@ Used for justifying the text inside a #GtkLabel widget. (See also
 @GTK_JUSTIFY_CENTER: The text is placed in the center of the label.
 @GTK_JUSTIFY_FILL: The text is placed is distributed across the label.
 
-<!-- ##### ENUM GtkMetricType ##### -->
-<para>
-Used to indicate which metric is used by a #GtkRuler.
-</para>
-
- GTK_PIXELS: Pixels.
- GTK_INCHES: Inches.
- GTK_CENTIMETERS: Centimeters.
-
 <!-- ##### ENUM GtkMovementStep ##### -->
 <para>
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 28ca552..b6a92a9 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -214,7 +214,6 @@ gtk_public_h_sources =          \
 	gtkhbbox.h		\
 	gtkhbox.h		\
 	gtkhpaned.h		\
-	gtkhruler.h		\
 	gtkhscale.h		\
 	gtkhscrollbar.h		\
 	gtkhseparator.h		\
@@ -269,7 +268,6 @@ gtk_public_h_sources =          \
 	gtkrecentchooserwidget.h \
 	gtkrecentfilter.h 	\
 	gtkrecentmanager.h 	\
-	gtkruler.h		\
 	gtkscale.h		\
 	gtkscalebutton.h	\
 	gtkscrollable.h         \
@@ -328,7 +326,6 @@ gtk_public_h_sources =          \
 	gtkviewport.h		\
 	gtkvolumebutton.h	\
 	gtkvpaned.h		\
-	gtkvruler.h		\
 	gtkvscale.h		\
 	gtkvscrollbar.h		\
 	gtkvseparator.h		\
@@ -479,7 +476,6 @@ gtk_base_c_sources =            \
 	gtkhbbox.c		\
 	gtkhbox.c		\
 	gtkhpaned.c		\
-	gtkhruler.c		\
 	gtkhscale.c		\
 	gtkhscrollbar.c		\
 	gtkhseparator.c		\
@@ -545,7 +541,6 @@ gtk_base_c_sources =            \
 	gtkrecentchooser.c 	\
 	gtkrecentfilter.c 	\
 	gtkrecentmanager.c 	\
-	gtkruler.c		\
 	gtkscale.c		\
 	gtkscalebutton.c	\
 	gtkscrollable.c         \
@@ -613,7 +608,6 @@ gtk_base_c_sources =            \
 	gtkvolumebutton.c	\
 	gtkviewport.c		\
 	gtkvpaned.c		\
-	gtkvruler.c		\
 	gtkvscale.c		\
 	gtkvscrollbar.c		\
 	gtkvseparator.c		\
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 6e99849..8a23f3b 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -98,7 +98,6 @@
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkhpaned.h>
-#include <gtk/gtkhruler.h>
 #include <gtk/gtkhscale.h>
 #include <gtk/gtkhscrollbar.h>
 #include <gtk/gtkhseparator.h>
@@ -152,7 +151,6 @@
 #include <gtk/gtkrecentchooserwidget.h>
 #include <gtk/gtkrecentfilter.h>
 #include <gtk/gtkrecentmanager.h>
-#include <gtk/gtkruler.h>
 #include <gtk/gtkscale.h>
 #include <gtk/gtkscalebutton.h>
 #include <gtk/gtkscrollable.h>
@@ -211,7 +209,6 @@
 #include <gtk/gtkviewport.h>
 #include <gtk/gtkvolumebutton.h>
 #include <gtk/gtkvpaned.h>
-#include <gtk/gtkvruler.h>
 #include <gtk/gtkvscale.h>
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkvseparator.h>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index d649119..8188e30 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -964,8 +964,6 @@ gtk_hbutton_box_get_type G_GNUC_CONST
 gtk_hbutton_box_new
 gtk_hpaned_get_type G_GNUC_CONST
 gtk_hpaned_new
-gtk_hruler_get_type G_GNUC_CONST
-gtk_hruler_new
 gtk_hscale_get_type G_GNUC_CONST
 gtk_hscale_new
 gtk_hscale_new_with_range
@@ -2029,12 +2027,6 @@ gtk_requisition_new G_GNUC_MALLOC
 gtk_resize_mode_get_type G_GNUC_CONST
 gtk_response_type_get_type G_GNUC_CONST
 gtk_rgb_to_hsv
-gtk_ruler_get_metric
-gtk_ruler_get_range
-gtk_ruler_get_type G_GNUC_CONST
-gtk_ruler_new
-gtk_ruler_set_metric
-gtk_ruler_set_range
 gtk_scale_add_mark
 gtk_scale_button_get_adjustment
 gtk_scale_button_get_minus_button
@@ -3113,8 +3105,6 @@ gtk_volume_button_get_type G_GNUC_CONST
 gtk_volume_button_new
 gtk_vpaned_get_type G_GNUC_CONST
 gtk_vpaned_new
-gtk_vruler_get_type G_GNUC_CONST
-gtk_vruler_new
 gtk_vscale_get_type G_GNUC_CONST
 gtk_vscale_new
 gtk_vscale_new_with_range
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 9fd47d7..9dbab6d 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -208,13 +208,6 @@ typedef enum
   GTK_MESSAGE_OTHER
 } GtkMessageType;
 
-typedef enum
-{
-  GTK_PIXELS,
-  GTK_INCHES,
-  GTK_CENTIMETERS
-} GtkMetricType;
-
 /**
  * GtkMovementStep:
  * @GTK_MOVEMENT_LOGICAL_POSITIONS: Move forward or back by graphemes
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index f68a887..bdb138a 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -248,7 +248,6 @@ gtk_OBJECTS = \
 	gtkhbbox.obj \
 	gtkhbox.obj \
 	gtkhpaned.obj \
-	gtkhruler.obj \
 	gtkhscale.obj \
 	gtkhscrollbar.obj \
 	gtkhseparator.obj \
@@ -305,7 +304,6 @@ gtk_OBJECTS = \
 	gtkrange.obj \
 	gtkrbtree.obj \
 	gtkrc.obj \
-	gtkruler.obj \
 	gtkscale.obj \
 	gtkscalebutton.obj \
 	gtkscrollbar.obj \
@@ -347,7 +345,6 @@ gtk_OBJECTS = \
 	gtkviewport.obj \
 	gtkvolumebutton.obj \
 	gtkvpaned.obj \
-	gtkvruler.obj \
 	gtkvscale.obj \
 	gtkvscrollbar.obj \
 	gtkvseparator.obj \
@@ -433,7 +430,6 @@ gtk_public_h_sources =		\
 	gtkhbbox.h		\
 	gtkhbox.h		\
 	gtkhpaned.h		\
-	gtkhruler.h		\
 	gtkhscale.h		\
 	gtkhscrollbar.h		\
 	gtkhseparator.h		\
@@ -496,7 +492,6 @@ gtk_public_h_sources =		\
 	gtkrecentchooserwidget.h \
 	gtkrecentfilter.h 	\
 	gtkrecentmanager.h 	\
-	gtkruler.h		\
 	gtkscale.h		\
 	gtkscalebutton.h	\
 	gtkscrollbar.h		\
@@ -555,7 +550,6 @@ gtk_public_h_sources =		\
 	gtkviewport.h		\
 	gtkvolumebutton.h	\
 	gtkvpaned.h		\
-	gtkvruler.h		\
 	gtkvscale.h		\
 	gtkvscrollbar.h		\
 	gtkvseparator.h		\
diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c
index 5c68525..00420af 100644
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@ -722,7 +722,6 @@ test_types (void)
     "  <object class=\"GtkHButtonBox\" id=\"hbuttonbox\"/>"
     "  <object class=\"GtkHBox\" id=\"hbox\"/>"
     "  <object class=\"GtkHPaned\" id=\"hpaned\"/>"
-    "  <object class=\"GtkHRuler\" id=\"hruler\"/>"
     "  <object class=\"GtkHScale\" id=\"hscale\"/>"
     "  <object class=\"GtkHScrollbar\" id=\"hscrollbar\"/>"
     "  <object class=\"GtkHSeparator\" id=\"hseparator\"/>"
@@ -749,7 +748,6 @@ test_types (void)
     "  <object class=\"GtkVScrollbar\" id=\"vscrollbar\"/>"
     "  <object class=\"GtkVSeparator\" id=\"vseparator\"/>"
     "  <object class=\"GtkViewport\" id=\"viewport\"/>"
-    "  <object class=\"GtkVRuler\" id=\"vruler\"/>"
     "  <object class=\"GtkVPaned\" id=\"vpaned\"/>"
     "  <object class=\"GtkVScale\" id=\"vscale\"/>"
     "  <object class=\"GtkWindow\" id=\"window\"/>"
diff --git a/tests/testgtk.c b/tests/testgtk.c
index dc50da0..7e0a7e7 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -5910,74 +5910,6 @@ create_range_controls (GtkWidget *widget)
     gtk_widget_destroy (window);
 }
 
-/*
- * GtkRulers
- */
-
-void
-create_rulers (GtkWidget *widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *table;
-  GtkWidget *ruler;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (widget));
-
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed),
-			&window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "rulers");
-      gtk_widget_set_size_request (window, 300, 300);
-      gtk_widget_set_events (window, 
-			     GDK_POINTER_MOTION_MASK 
-			     | GDK_POINTER_MOTION_HINT_MASK);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      table = gtk_table_new (2, 2, FALSE);
-      gtk_container_add (GTK_CONTAINER (window), table);
-      gtk_widget_show (table);
-
-      ruler = gtk_ruler_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_ruler_set_metric (GTK_RULER (ruler), GTK_CENTIMETERS);
-      gtk_ruler_set_range (GTK_RULER (ruler), 100, 0, 0, 20);
-
-      g_signal_connect_swapped (window, 
-			        "motion_notify_event",
-				G_CALLBACK (GTK_WIDGET_GET_CLASS (ruler)->motion_notify_event),
-			        ruler);
-      
-      gtk_table_attach (GTK_TABLE (table), ruler, 1, 2, 0, 1,
-			GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-      gtk_widget_show (ruler);
-
-
-      ruler = gtk_ruler_new (GTK_ORIENTATION_VERTICAL);
-      gtk_ruler_set_range (GTK_RULER (ruler), 5, 15, 0, 20);
-
-      g_signal_connect_swapped (window, 
-			        "motion_notify_event",
-			        G_CALLBACK (GTK_WIDGET_GET_CLASS (ruler)->motion_notify_event),
-			        ruler);
-      
-      gtk_table_attach (GTK_TABLE (table), ruler, 0, 1, 1, 2,
-			GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-      gtk_widget_show (ruler);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-}
-
 struct {
   GdkColor color;
   gchar *name;
@@ -10016,7 +9948,6 @@ struct {
   { "resize grips", create_resize_grips },
   { "rotated label", create_rotated_label },
   { "rotated text", create_rotated_text },
-  { "rulers", create_rulers },
   { "saved position", create_saved_position },
   { "scrolled windows", create_scrolled_windows },
   { "shapes", create_shapes },
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]