Silently return NULL if the widget is not realized. (#316023, Guillaume

[~andy/gtk] / gtk / gtkcurve.c

diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 3a059245a0da0725596a0aba4940607ba947aa35..c96c3658d9a70268a51b0f5357e93a9e0ba418ee 100644 (file)
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -24,6 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -34,7 +35,9 @@
 #include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
 #include "gtktable.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define RADIUS         3       /* radius of the control points */
 #define MIN_DISTANCE   8       /* min distance between control points */
@@ -97,7 +100,7 @@ gtk_curve_get_type (void)
        (GInstanceInitFunc) gtk_curve_init,
       };
 
-      curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, "GtkCurve",
+      curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, I_("GtkCurve"),
                                           &curve_info, 0);
     }
   return curve_type;
@@ -117,56 +120,51 @@ gtk_curve_class_init (GtkCurveClass *class)
   
   g_object_class_install_property (gobject_class,
                                   PROP_CURVE_TYPE,
-                                  g_param_spec_enum ("curve_type",
-                                                     _("Curve type"),
-                                                     _("Is this curve linear, spline interpolated, or free-form"),
+                                  g_param_spec_enum ("curve-type",
+                                                     P_("Curve type"),
+                                                     P_("Is this curve linear, spline interpolated, or free-form"),
                                                      GTK_TYPE_CURVE_TYPE,
                                                      GTK_CURVE_TYPE_LINEAR,
-                                                     G_PARAM_READABLE |
-                                                     G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_MIN_X,
-                                  g_param_spec_float ("min_x",
-                                                      _("Minimum X"),
-                                                      _("Minimum possible value for X"),
+                                  g_param_spec_float ("min-x",
+                                                      P_("Minimum X"),
+                                                      P_("Minimum possible value for X"),
                                                       -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                       0.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_MAX_X,
-                                  g_param_spec_float ("max_x",
-                                                      _("Maximum X"),
-                                                      _("Maximum possible X value"),
+                                  g_param_spec_float ("max-x",
+                                                      P_("Maximum X"),
+                                                      P_("Maximum possible X value"),
                                                       -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                        1.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_MIN_Y,
-                                  g_param_spec_float ("min_y",
-                                                      _("Minimum Y"),
-                                                      _("Minimum possible value for Y"),
+                                  g_param_spec_float ("min-y",
+                                                      P_("Minimum Y"),
+                                                      P_("Minimum possible value for Y"),
                                                        -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                       0.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));  
+                                                      GTK_PARAM_READWRITE));  
   g_object_class_install_property (gobject_class,
                                   PROP_MAX_Y,
-                                  g_param_spec_float ("max_y",
-                                                      _("Maximum Y"),
-                                                      _("Maximum possible value for Y"),
+                                  g_param_spec_float ("max-y",
+                                                      P_("Maximum Y"),
+                                                      P_("Maximum possible value for Y"),
                                                       -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                       1.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   curve_type_changed_signal =
-    g_signal_new ("curve_type_changed",
+    g_signal_new (I_("curve_type_changed"),
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkCurveClass, curve_type_changed),
@@ -187,7 +185,7 @@ gtk_curve_init (GtkCurve *curve)
   curve->grab_point = -1;
 
   curve->num_points = 0;
-  curve->point = 0;
+  curve->point = NULL;
 
   curve->num_ctlpoints = 0;
   curve->ctlpoint = NULL;
@@ -1042,3 +1040,6 @@ gtk_curve_finalize (GObject *object)
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
+
+#define __GTK_CURVE_C__
+#include "gtkaliasdef.c"