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

label_xalign and label_yalign need to be float properties to correspond to

Browse Source 
Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>

	* 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  <otaylor@redhat.com>

	* gtk/gtksocket.h (struct _GtkSocketClass): Fix return
	of plug_added vfunc. (#64408, Jeff Franks)
This commit is contained in:
Owen Taylor 2001-11-19 17:32:54 +00:00 committed by Owen Taylor
parent 3a6bf7b6cc
commit 9915762836
9 changed files with 77 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Mon Nov 19 12:28:02 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Nov 19 12:24:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.h (struct _GtkSocketClass): Fix return * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

12
gtk/gtkframe.c
View File

@ -129,7 +129,7 @@ gtk_frame_class_init (GtkFrameClass *class)
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_LABEL_XALIGN, PROP_LABEL_XALIGN,
g_param_spec_double ("label_xalign", g_param_spec_float ("label_xalign",
_("Label xalign"), _("Label xalign"),
_("The horizontal alignment of the label."), _("The horizontal alignment of the label."),
0.0, 0.0,
@ -139,7 +139,7 @@ gtk_frame_class_init (GtkFrameClass *class)
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_LABEL_YALIGN, PROP_LABEL_YALIGN,
g_param_spec_double ("label_yalign", g_param_spec_float ("label_yalign",
_("Label yalign"), _("Label yalign"),
_("The vertical alignment of the label."), _("The vertical alignment of the label."),
0.0, 0.0,
@ -206,12 +206,12 @@ gtk_frame_set_property (GObject *object,
gtk_frame_set_label (frame, g_value_get_string (value)); gtk_frame_set_label (frame, g_value_get_string (value));
break; break;
case PROP_LABEL_XALIGN: 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); frame->label_yalign);
break; break;
case PROP_LABEL_YALIGN: case PROP_LABEL_YALIGN:
gtk_frame_set_label_align (frame, frame->label_xalign, gtk_frame_set_label_align (frame, frame->label_xalign,
g_value_get_double (value)); g_value_get_float (value));
break; break;
case PROP_SHADOW: case PROP_SHADOW:
case PROP_SHADOW_TYPE: case PROP_SHADOW_TYPE:
@ -242,10 +242,10 @@ gtk_frame_get_property (GObject *object,
g_value_set_string (value, gtk_frame_get_label (frame)); g_value_set_string (value, gtk_frame_get_label (frame));
break; break;
case PROP_LABEL_XALIGN: case PROP_LABEL_XALIGN:
g_value_set_double (value, frame->label_xalign); g_value_set_float (value, frame->label_xalign);
break; break;
case PROP_LABEL_YALIGN: case PROP_LABEL_YALIGN:
g_value_set_double (value, frame->label_yalign); g_value_set_float (value, frame->label_yalign);
break; break;
case PROP_SHADOW: case PROP_SHADOW:
case PROP_SHADOW_TYPE: case PROP_SHADOW_TYPE:

2
gtk/gtksocket.h
View File

@ -71,7 +71,7 @@ struct _GtkSocketClass
{ {
GtkContainerClass parent_class; GtkContainerClass parent_class;
gboolean (*plug_added) (GtkSocket *socket); void (*plug_added) (GtkSocket *socket);
gboolean (*plug_removed) (GtkSocket *socket); gboolean (*plug_removed) (GtkSocket *socket);
}; };