summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-2-08
-rw-r--r--ChangeLog.pre-2-108
-rw-r--r--ChangeLog.pre-2-28
-rw-r--r--ChangeLog.pre-2-48
-rw-r--r--ChangeLog.pre-2-68
-rw-r--r--ChangeLog.pre-2-88
-rw-r--r--docs/reference/gtk/tmpl/gtk-unused.sgml13
-rw-r--r--docs/reference/gtk/tmpl/gtkcontainer.sgml7
-rw-r--r--docs/reference/gtk/tmpl/gtknotebook.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtkrc.sgml1
-rw-r--r--gtk/gtkalignment.c8
-rw-r--r--gtk/gtkwindow.c3
13 files changed, 75 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 37dc477390..8455a418a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 37dc477390..8455a418a9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 37dc477390..8455a418a9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 37dc477390..8455a418a9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 37dc477390..8455a418a9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 37dc477390..8455a418a9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 37dc477390..8455a418a9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
* gtk/gtkstyle.c (_gtk_style_peek_property_value)
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 6d76016918..2a750ab6a0 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -225,6 +225,12 @@ has the focus.
@clist: The #GtkCList widget to check.
+<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
+<para>
+
+</para>
+
+
<!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### -->
<para>
@@ -1785,6 +1791,13 @@ arrow.
@show_toggle_indicator: unused
@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 ##### -->
<para>
Private function to get an argument and argument info from an object.
diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index 4fa9b0e086..8c7596d839 100644
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -38,13 +38,6 @@ GtkContainer
@pspec:
-<!-- ##### MACRO GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS ##### -->
-<para>
-
-</para>
-
-
-
<!-- ##### MACRO gtk_container_border_width ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index 04ce877083..6f9e96d0c8 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -132,15 +132,6 @@ Deprecated compatibility macro.
@Returns:
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-</para>
-
-<!-- # Unused Parameters # -->
-@notebook:
-@page_num:
-
-
<!-- ##### FUNCTION gtk_notebook_next_page ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235..cc0b23b6d2 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle.
</para>
+@parent_instance:
@name:
@bg_pixmap_name:
@font_desc:
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index f4eaa1c08a..44c759dab3 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -122,7 +122,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
_("Value between 0.0 and 1.0 to indicate X scale"),
0.0,
1.0,
- 0.0,
+ 1.0,
G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (gobject_class,
PROP_YSCALE,
@@ -131,7 +131,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
_("Value between 0.0 and 1.0 to indicate Y scale"),
0.0,
1.0,
- 0.0,
+ 1.0,
G_PARAM_READABLE | G_PARAM_WRITABLE));
}
@@ -142,8 +142,8 @@ gtk_alignment_init (GtkAlignment *alignment)
alignment->xalign = 0.5;
alignment->yalign = 0.5;
- alignment->xscale = 0.0;
- alignment->yscale = 0.0;
+ alignment->xscale = 1.0;
+ alignment->yscale = 1.0;
}
GtkWidget*
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3b9c68dc0e..cc5e87e13c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -742,8 +742,7 @@ gtk_window_get_property (GObject *object,
g_value_set_boolean (value, window->destroy_with_parent);
break;
case PROP_ICON:
- g_value_set_object (value,
- G_OBJECT (gtk_window_get_icon (window)));
+ g_value_set_object (value, gtk_window_get_icon (window));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
View Lorry Controller Status