fix xscale and yscale behaviour which havoc broke. they have to default to

Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
        behaviour which havoc broke. they have to default to 1.0 for
        expand behaviour.

        * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
This commit is contained in:
Tim Janik
2001-09-10 14:59:49 +00:00
committed by Tim Janik
parent 57a49aae16
commit e083ca9e45
13 changed files with 75 additions and 22 deletions

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -1,3 +1,11 @@
Mon Sep 10 16:55:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
behaviour which havoc broke. they have to default to 1.0 for
expand behaviour.
* gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
2001-09-10 Padraig O'Briain <padraig.obriain@sun.com> 2001-09-10 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value) * gtk/gtkstyle.c (_gtk_style_peek_property_value)

View File

@ -225,6 +225,12 @@ has the focus.
@clist: The #GtkCList widget to check. @clist: The #GtkCList widget to check.
<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
<para>
</para>
<!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### --> <!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### -->
<para> <para>
@ -1785,6 +1791,13 @@ arrow.
@show_toggle_indicator: unused @show_toggle_indicator: unused
@show_submenu_indicator: whether to show the arrow or not @show_submenu_indicator: whether to show the arrow or not
<!-- ##### MACRO gtk_notebook_set_page ##### -->
<para>
</para>
@notebook:
@page_num:
<!-- ##### FUNCTION gtk_object_arg_get ##### --> <!-- ##### FUNCTION gtk_object_arg_get ##### -->
<para> <para>
Private function to get an argument and argument info from an object. Private function to get an argument and argument info from an object.

View File

@ -38,13 +38,6 @@ GtkContainer
@pspec: @pspec:
<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
<para>
</para>
<!-- ##### MACRO gtk_container_border_width ##### --> <!-- ##### MACRO gtk_container_border_width ##### -->
<para> <para>

View File

@ -132,15 +132,6 @@ Deprecated compatibility macro.
@Returns: @Returns:
<!-- ##### MACRO gtk_notebook_set_page ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@notebook:
@page_num:
<!-- ##### FUNCTION gtk_notebook_next_page ##### --> <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
<para> <para>
</para> </para>

View File

@ -495,6 +495,7 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle. #GtkRcStyle structures to form a #GtkStyle.
</para> </para>
@parent_instance:
@name: @name:
@bg_pixmap_name: @bg_pixmap_name:
@font_desc: @font_desc:

View File

@ -122,7 +122,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
_("Value between 0.0 and 1.0 to indicate X scale"), _("Value between 0.0 and 1.0 to indicate X scale"),
0.0, 0.0,
1.0, 1.0,
0.0, 1.0,
G_PARAM_READABLE | G_PARAM_WRITABLE)); G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_YSCALE, PROP_YSCALE,
@ -131,7 +131,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
_("Value between 0.0 and 1.0 to indicate Y scale"), _("Value between 0.0 and 1.0 to indicate Y scale"),
0.0, 0.0,
1.0, 1.0,
0.0, 1.0,
G_PARAM_READABLE | G_PARAM_WRITABLE)); G_PARAM_READABLE | G_PARAM_WRITABLE));
} }
@ -142,8 +142,8 @@ gtk_alignment_init (GtkAlignment *alignment)
alignment->xalign = 0.5; alignment->xalign = 0.5;
alignment->yalign = 0.5; alignment->yalign = 0.5;
alignment->xscale = 0.0; alignment->xscale = 1.0;
alignment->yscale = 0.0; alignment->yscale = 1.0;
} }
GtkWidget* GtkWidget*

View File

@ -742,8 +742,7 @@ gtk_window_get_property (GObject *object,
g_value_set_boolean (value, window->destroy_with_parent); g_value_set_boolean (value, window->destroy_with_parent);
break; break;
case PROP_ICON: case PROP_ICON:
g_value_set_object (value, g_value_set_object (value, gtk_window_get_icon (window));
G_OBJECT (gtk_window_get_icon (window)));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);