Remove GtkCurve completely

docs/faq/gtk-faq.sgml

@@ -1159,7 +1159,6 @@ myapp --display=:1
      | +GtkToolbar
      | `GtkTree
      +GtkDrawingArea
-     | `GtkCurve
      +GtkEditable
      | +GtkEntry
      | | `GtkSpinButton

docs/reference/gtk/gtk-sections.txt

@@ -1127,28 +1127,6 @@ gtk_ctree_get_type
 gtk_ctree_node_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkcurve</FILE>
-<TITLE>GtkCurve</TITLE>
-GtkCurve
-gtk_curve_new
-gtk_curve_reset
-gtk_curve_set_gamma
-gtk_curve_set_range
-gtk_curve_get_vector
-gtk_curve_set_vector
-gtk_curve_set_curve_type
-<SUBSECTION Standard>
-GTK_CURVE
-GTK_IS_CURVE
-GTK_TYPE_CURVE
-GTK_CURVE_CLASS
-GTK_IS_CURVE_CLASS
-GTK_CURVE_GET_CLASS
-<SUBSECTION Private>
-gtk_curve_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkdialog</FILE>
 <TITLE>GtkDialog</TITLE>
@@ -6339,7 +6317,6 @@ GtkArrowType
 GtkAttachOptions
 GtkButtonBoxStyle
 GtkCornerType
-GtkCurveType
 GtkDeleteType
 GtkDirectionType
 GtkExpanderStyle

docs/reference/gtk/gtk.types

@@ -45,7 +45,6 @@ gtk_combo_box_get_type
 gtk_combo_get_type
 gtk_container_get_type
 gtk_ctree_get_type
-gtk_curve_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
 gtk_editable_get_type

docs/reference/gtk/objects_grouped.sgml

@@ -84,7 +84,6 @@
     <link linkend="GtkImage">GtkImage</link>
     <link linkend="GtkPixmap">GtkPixmap</link>
     <link linkend="GtkPreview">GtkPreview</link>
-    <link linkend="GtkCurve">GtkCurve</link>
 
 <emphasis>Misc. Widgets</emphasis>
     <link linkend="GtkArrow">GtkArrow</link>

docs/reference/gtk/tmpl/gtkcurve.sgml

@@ -1,153 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCurve
-
-<!-- ##### SECTION Short_Description ##### -->
-Allows direct editing of a curve
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkCurve widget allows the user to edit a curve covering a range of
-values. It is typically used to fine-tune color balances in graphics
-applications like the Gimp.
-</para>
-<para>
-The #GtkCurve widget has 3 modes of operation - spline, linear and free.
-In spline mode the user places points on the curve which are automatically
-connected together into a smooth curve. In linear mode the user places points
-on the curve which are connected by straight lines. In free mode the user can
-draw the points of the curve freely, and they are not connected at all.
-</para>
-<para>
-As of GTK+ 2.20, #GtkCurve has been deprecated since it is too specialized.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkCurve ##### -->
-<para>
-The #GtkCurve-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### SIGNAL GtkCurve::curve-type-changed ##### -->
-<para>
-Emitted when the curve type has been changed.
-The curve type can be changed explicitly with a call to
-gtk_curve_set_curve_type(). It is also changed as a side-effect of
-calling gtk_curve_reset() or gtk_curve_set_gamma().
-</para>
-
-@curve: the object which received the signal.
-
-<!-- ##### ARG GtkCurve:curve-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:max-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:max-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:min-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCurve:min-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_curve_new ##### -->
-<para>
-Creates a new #GtkCurve.
-</para>
-
-@Returns: a new #GtkCurve.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-
-<!-- ##### FUNCTION gtk_curve_reset ##### -->
-<para>
-Resets the curve to a straight line from the minimum x and y values to the
-maximum x and y values (i.e. from the bottom-left to the top-right corners).
-The curve type is not changed.
-</para>
-
-@curve: a #GtkCurve.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-
-<!-- ##### FUNCTION gtk_curve_set_gamma ##### -->
-<para>
-Recomputes the entire curve using the given gamma value.
-A gamma value of 1 results in a straight line. Values greater than 1 result
-in a curve above the straight line. Values less than 1 result in a curve
-below the straight line. The curve type is changed to %GTK_CURVE_TYPE_FREE.
-FIXME: Needs a more precise definition of gamma.
-</para>
-
-@curve: a #GtkCurve.
-@gamma_: the gamma value.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-
-<!-- ##### FUNCTION gtk_curve_set_range ##### -->
-<para>
-Sets the minimum and maximum x and y values of the curve.
-The curve is also reset with a call to gtk_curve_reset().
-</para>
-
-@curve: a #GtkCurve.
-@min_x: the minimum x value.
-@max_x: the maximum x value.
-@min_y: the minimum y value.
-@max_y: the maximum y value.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-
-<!-- ##### FUNCTION gtk_curve_get_vector ##### -->
-<para>
-Returns a vector of points representing the curve.
-</para>
-
-@curve: a #GtkCurve.
-@veclen: the number of points to calculate.
-@vector: returns the points.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-
-<!-- ##### FUNCTION gtk_curve_set_vector ##### -->
-<para>
-Sets the vector of points on the curve.
-The curve type is set to %GTK_CURVE_TYPE_FREE.
-</para>
-
-@curve: a #GtkCurve.
-@veclen: the number of points.
-@vector: the points on the curve.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-
-<!-- ##### FUNCTION gtk_curve_set_curve_type ##### -->
-<para>
-Sets the type of the curve. The curve will remain unchanged except when
-changing from a free curve to a linear or spline curve, in which case the
-curve will be changed as little as possible.
-</para>
-
-@curve: a #GtkCurve.
-@type: the type of the curve.
-@Deprecated: 2.20: Don't use this widget anymore.
-
-

docs/reference/gtk/tmpl/gtkenums.sgml

@@ -111,15 +111,6 @@ widget.
 @GTK_CORNER_BOTTOM_RIGHT: Place the scrollbars on the top and left of the
 widget.
 
-<!-- ##### ENUM GtkCurveType ##### -->
-<para>
-
-</para>
-
-@GTK_CURVE_TYPE_LINEAR: 
-@GTK_CURVE_TYPE_SPLINE: 
-@GTK_CURVE_TYPE_FREE: 
-
 <!-- ##### ENUM GtkDeleteType ##### -->
 <para>
 

docs/tutorial/gtk-tut.sgml

@@ -2021,7 +2021,6 @@ GObject
   | | `GtkTreeView
   | +GtkCalendar
   | +GtkDrawingArea
-  | | `GtkCurve
   | +GtkEditable
   | | +GtkEntry
   | |   `GtkSpinButton
@@ -13963,17 +13962,6 @@ void GtkStatusbar::text-popped	(GtkStatusbar *,
 
 </sect1>
 
-<!-- ----------------------------------------------------------------- -->
-<sect1 id="sec-GtkCurve">
-<title>GtkCurve</title>
-
-<programlisting role="C">
-void GtkCurve::curve-type-changed	(GtkCurve *,
-                                 	 gpointer);
-</programlisting>
-
-</sect1>
-
 <!-- ----------------------------------------------------------------- -->
 <sect1 id="sec-GtkAdjustment">
 <title>GtkAdjustment</title>

gtk/gtk.symbols

@@ -327,7 +327,6 @@ gtk_window_position_get_type G_GNUC_CONST
 gtk_tree_view_column_sizing_get_type G_GNUC_CONST
 gtk_tree_view_drop_position_get_type G_GNUC_CONST
 gtk_button_box_style_get_type G_GNUC_CONST
-gtk_curve_type_get_type G_GNUC_CONST
 gtk_icon_lookup_flags_get_type G_GNUC_CONST
 gtk_image_type_get_type G_GNUC_CONST
 gtk_im_preedit_style_get_type G_GNUC_CONST
@@ -892,21 +891,6 @@ gtk_container_unset_focus_chain
 #endif
 #endif
 
-#if IN_HEADER(__GTK_CURVE_H__)
-#if IN_FILE(__GTK_CURVE_C__)
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_curve_get_type G_GNUC_CONST
-gtk_curve_get_vector
-gtk_curve_new
-gtk_curve_reset
-gtk_curve_set_curve_type
-gtk_curve_set_gamma
-gtk_curve_set_range
-gtk_curve_set_vector
-#endif
-#endif
-#endif
-
 #if IN_HEADER(__GTK_WINDOW_DECORATE_H__)
 #if IN_FILE(__GTK_WINDOW_DECORATE_C__)
 gtk_decorated_window_calculate_frame_size

gtk/gtkcurve.h

@@ -1,106 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef GTK_DISABLE_DEPRECATED
-
-#ifndef __GTK_CURVE_H__
-#define __GTK_CURVE_H__
-
-
-#include <gtk/gtkdrawingarea.h>
-
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CURVE                  (gtk_curve_get_type ())
-#define GTK_CURVE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve))
-#define GTK_CURVE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CURVE, GtkCurveClass))
-#define GTK_IS_CURVE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CURVE))
-#define GTK_IS_CURVE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CURVE))
-#define GTK_CURVE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CURVE, GtkCurveClass))
-
-
-typedef struct _GtkCurve	GtkCurve;
-typedef struct _GtkCurveClass	GtkCurveClass;
-
-
-struct _GtkCurve
-{
-  GtkDrawingArea graph;
-
-  gint cursor_type;
-  gfloat min_x;
-  gfloat max_x;
-  gfloat min_y;
-  gfloat max_y;
-  GdkPixmap *pixmap;
-  GtkCurveType curve_type;
-  gint height;                  /* (cached) graph height in pixels */
-  gint grab_point;              /* point currently grabbed */
-  gint last;
-
-  /* (cached) curve points: */
-  gint num_points;
-  GdkPoint *point;
-
-  /* control points: */
-  gint num_ctlpoints;           /* number of control points */
-  gfloat (*ctlpoint)[2];        /* array of control points */
-};
-
-struct _GtkCurveClass
-{
-  GtkDrawingAreaClass parent_class;
-
-  void (* curve_type_changed) (GtkCurve *curve);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType		gtk_curve_get_type	(void) G_GNUC_CONST;
-GtkWidget*	gtk_curve_new		(void);
-void		gtk_curve_reset		(GtkCurve *curve);
-void		gtk_curve_set_gamma	(GtkCurve *curve, gfloat gamma_);
-void		gtk_curve_set_range	(GtkCurve *curve,
-					 gfloat min_x, gfloat max_x,
-					 gfloat min_y, gfloat max_y);
-void		gtk_curve_get_vector	(GtkCurve *curve,
-					 int veclen, gfloat vector[]);
-void		gtk_curve_set_vector	(GtkCurve *curve,
-					 int veclen, gfloat vector[]);
-void		gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CURVE_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */

gtk/gtkenums.h

@@ -94,16 +94,6 @@ typedef enum
   GTK_BUTTONBOX_CENTER
 } GtkButtonBoxStyle;
 
-#ifndef GTK_DISABLE_DEPRECATED
-/* Curve types */
-typedef enum
-{
-  GTK_CURVE_TYPE_LINEAR,       /* linear interpolation */
-  GTK_CURVE_TYPE_SPLINE,       /* spline interpolation */
-  GTK_CURVE_TYPE_FREE          /* free form curve */
-} GtkCurveType;
-#endif
-
 typedef enum
 {
   GTK_DELETE_CHARS,

gtk/tests/object.c

@@ -55,7 +55,6 @@ list_ignore_properties (gboolean buglist)
 {
   /* currently untestable properties */
   static const IgnoreProperty ignore_properties[] = {
-    { "GtkCurve",               "",                     NULL, },                        /* Just ignore it, not worth fixing */
     { "GtkContainer",           "child",                NULL, },                        /* needs working child widget */
     { "GtkRadioMenuItem",       "group",                NULL, },                        /* needs working sibling */
     { "GtkWidget",              "parent",               NULL, },                        /* needs working parent widget */

tests/testgtkrc

@@ -159,7 +159,6 @@ widget_class "*GtkRadioButton*" style "toggle_button"
 widget_class "*GtkButton*" style "button"
 widget_class "*Ruler" style "ruler"
 widget_class "*GtkText" style "text"
-widget "*GtkCurve" style "curve"
 
 binding "test1"
 {