diff --git a/ChangeLog b/ChangeLog index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 54c8703097..da4c6f46eb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Nov 19 12:28:02 2001 Owen Taylor + + * gtk/gtkframe.c (gtk_frame_class_init): label_xalign + and label_yalign need to be float properties to + correspond to GTK+-1.2, to gtk_frame_set_label_align, + and to the types of the xalign and yalign properties of GtkMisc. + (#63484, Vitaly Tishkov) + Mon Nov 19 12:24:30 2001 Owen Taylor * gtk/gtksocket.h (struct _GtkSocketClass): Fix return diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 95287ae2dd..c2b0b6cc86 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -129,24 +129,24 @@ gtk_frame_class_init (GtkFrameClass *class) G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_LABEL_XALIGN, - g_param_spec_double ("label_xalign", - _("Label xalign"), - _("The horizontal alignment of the label."), - 0.0, - 1.0, - 0.5, - G_PARAM_READABLE | - G_PARAM_WRITABLE)); + g_param_spec_float ("label_xalign", + _("Label xalign"), + _("The horizontal alignment of the label."), + 0.0, + 1.0, + 0.5, + G_PARAM_READABLE | + G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_LABEL_YALIGN, - g_param_spec_double ("label_yalign", - _("Label yalign"), - _("The vertical alignment of the label."), - 0.0, - 1.0, - 0.5, - G_PARAM_READABLE | - G_PARAM_WRITABLE)); + g_param_spec_float ("label_yalign", + _("Label yalign"), + _("The vertical alignment of the label."), + 0.0, + 1.0, + 0.5, + G_PARAM_READABLE | + G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_SHADOW, g_param_spec_enum ("shadow", NULL, @@ -206,12 +206,12 @@ gtk_frame_set_property (GObject *object, gtk_frame_set_label (frame, g_value_get_string (value)); break; case PROP_LABEL_XALIGN: - gtk_frame_set_label_align (frame, g_value_get_double (value), + gtk_frame_set_label_align (frame, g_value_get_float (value), frame->label_yalign); break; case PROP_LABEL_YALIGN: gtk_frame_set_label_align (frame, frame->label_xalign, - g_value_get_double (value)); + g_value_get_float (value)); break; case PROP_SHADOW: case PROP_SHADOW_TYPE: @@ -242,10 +242,10 @@ gtk_frame_get_property (GObject *object, g_value_set_string (value, gtk_frame_get_label (frame)); break; case PROP_LABEL_XALIGN: - g_value_set_double (value, frame->label_xalign); + g_value_set_float (value, frame->label_xalign); break; case PROP_LABEL_YALIGN: - g_value_set_double (value, frame->label_yalign); + g_value_set_float (value, frame->label_yalign); break; case PROP_SHADOW: case PROP_SHADOW_TYPE: diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index 14ee4165a1..842acb605d 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -71,7 +71,7 @@ struct _GtkSocketClass { GtkContainerClass parent_class; - gboolean (*plug_added) (GtkSocket *socket); + void (*plug_added) (GtkSocket *socket); gboolean (*plug_removed) (GtkSocket *socket); };