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

fix allocation to be relative to paned->allocation, now that this is a

Browse Source 
Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
        allocation to be relative to paned->allocation, now
        that this is a NO_WINDOW widget.
        * gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.

        * gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
        needs to be a boxed property.
This commit is contained in:
Tim Janik 2001-11-20 13:55:08 +00:00 committed by Tim Janik
parent 5b9a4753c9
commit 2394977634
15 changed files with 123 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

10
ChangeLog.pre-2-0
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix
allocation to be relative to paned->allocation, now
that this is a NO_WINDOW widget.
* gtk/gtkhpaned.c (gtk_hpaned_size_allocate): same here.
* gtk/gtkaccellabel.c (gtk_accel_label_class_init): ::closure
needs to be a boxed property.
Mon Nov 19 17:34:40 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator):

1
docs/reference/gdk/tmpl/event_structs.sgml
View File

@ -171,6 +171,7 @@ when the wheel is turned.
@window: the window which received the event.
@send_event: %TRUE if the event was sent explicitly (e.g. using
<function>XSendEvent</function>).
@time:
@x: the x coordinate of the pointer relative to the window.
@y: the y coordinate of the pointer relative to the window.
@state: a bit-mask representing the state of the modifier keys (e.g. Control,

3
docs/reference/gdk/tmpl/windows.sgml
View File

@ -710,7 +710,6 @@ converted to GDK events. A filter may translate the native event to a GDK
event or handle it without translation.
</para>
@xevent: the native event to filter.
@event: the GDK event to which the X event will be translated.
@data: user data set when the filter was installed.
@ -726,7 +725,6 @@ Specifies the result of applying a #GdkFilterFunc to a native event.
@GDK_FILTER_TRANSLATE: translated event stored.
@GDK_FILTER_REMOVE: event handled, terminate processing.
<!-- ##### TYPEDEF GdkXEvent ##### -->
<para>
Used to represent native events (<type>XEvent</type>s for the X11
@ -847,6 +845,7 @@ Deprecated equivalent to gdk_drawable_set_colormap()
</para>
<!-- ##### FUNCTION gdk_window_get_user_data ##### -->
<para>

7
docs/reference/gtk/tmpl/gtk-unused.sgml
View File

@ -292,6 +292,13 @@ Test whether a GtkObject's arguments have been prepared.
@obj: the object to examine.
<!-- ##### MACRO GTK_OBJECT_DESTROYED ##### -->
<para>
Test whether a GtkObject has had gtk_object_destroy() invoked on it.
</para>
@obj: the object to examine.
<!-- ##### MACRO GTK_OBJECT_NSIGNALS ##### -->
<para>
Get the number of signals defined by this object.

11
docs/reference/gtk/tmpl/gtkobject.sgml
View File

@ -121,8 +121,7 @@ Get the type of an object.
Tells about the state of the object.
</para>
@GTK_DESTROYED: the GtkObject has had gtk_object_destroyed() invoked on it
and is processing the shutdown callback.
@GTK_IN_DESTRUCTION:
@GTK_FLOATING: whether the object is orphaned. Objects that take
strong hold of an object may gtk_object_sink() it, after obtaining
there own references, if they believe they are nearly primary
@ -141,14 +140,6 @@ accessing its members.
@obj: the object whose flags are returned.
<!-- ##### MACRO GTK_OBJECT_DESTROYED ##### -->
<para>
Test whether a GtkObject has had gtk_object_destroy() invoked on it.
</para>
@obj: the object to examine.
<!-- ##### MACRO GTK_OBJECT_FLOATING ##### -->
<para>
Evaluates to %TRUE if the object still has its floating reference count.

6
docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
View File

@ -20,7 +20,6 @@ GtkTreeViewColumn
</para>
@GTK_TREE_VIEW_COLUMN_GROW_ONLY:
@GTK_TREE_VIEW_COLUMN_RESIZABLE:
@GTK_TREE_VIEW_COLUMN_AUTOSIZE:
@GTK_TREE_VIEW_COLUMN_FIXED:
@ -501,6 +500,11 @@ GtkTreeViewColumn
</para>
<!-- ##### ARG GtkTreeViewColumn:resizable ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeViewColumn:width ##### -->
<para>

10
gtk/gtkaccellabel.c
View File

@ -118,11 +118,11 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
g_object_class_install_property (G_OBJECT_CLASS (object_class),
PROP_ACCEL_CLOSURE,
g_param_spec_object ("accel_closure",
_("Accelerator Closure"),
_("The closure to be monitored for accelerator changes"),
GTK_TYPE_WIDGET,
G_PARAM_READABLE | G_PARAM_WRITABLE));
g_param_spec_boxed ("accel_closure",
_("Accelerator Closure"),
_("The closure to be monitored for accelerator changes"),
G_TYPE_CLOSURE,
G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (object_class),
PROP_ACCEL_WIDGET,
g_param_spec_object ("accel_widget",

7
gtk/gtkhpaned.c
View File

@ -199,7 +199,8 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
child2_allocation.width = MAX (1, (gint) allocation->width - child2_allocation.x - border_width);
/* Now allocate the childen, making sure, when resizing not to
* overlap the windows */
* overlap the windows
*/
if (GTK_WIDGET_MAPPED (widget) &&
paned->child1->allocation.width < child1_allocation.width)
{
@ -219,8 +220,8 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
if (GTK_WIDGET_REALIZED (widget))
gdk_window_hide (paned->handle);
child_allocation.x = border_width;
child_allocation.y = border_width;
child_allocation.x = widget->allocation.x + border_width;
child_allocation.y = widget->allocation.y + border_width;
child_allocation.width = MAX (1, allocation->width - 2 * border_width);
child_allocation.height = MAX (1, allocation->height - 2 * border_width);

19
gtk/gtkvpaned.c
View File

@ -193,23 +193,24 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
child1_allocation.width = child2_allocation.width = MAX (1, (gint) allocation->width - border_width * 2);
child1_allocation.height = paned->child1_size;
child1_allocation.x = child2_allocation.x = widget->allocation.x + border_width;
child1_allocation.y = border_width;
child1_allocation.y = widget->allocation.y + border_width;
child2_allocation.y = child1_allocation.y + child1_allocation.height + paned->handle_pos.height;
child2_allocation.height = MAX(1, (gint) allocation->height - child2_allocation.y - border_width);
child2_allocation.height = MAX (1, (gint) allocation->height - child2_allocation.y - border_width);
/* Now allocate the childen, making sure, when resizing not to
* overlap the windows */
* overlap the windows
*/
if (GTK_WIDGET_MAPPED (widget) &&
paned->child1->allocation.height < child1_allocation.height)
{
gtk_widget_size_allocate(paned->child2, &child2_allocation);
gtk_widget_size_allocate(paned->child1, &child1_allocation);
gtk_widget_size_allocate (paned->child2, &child2_allocation);
gtk_widget_size_allocate (paned->child1, &child1_allocation);
}
else
{
gtk_widget_size_allocate(paned->child1, &child1_allocation);
gtk_widget_size_allocate(paned->child2, &child2_allocation);
gtk_widget_size_allocate (paned->child1, &child1_allocation);
gtk_widget_size_allocate (paned->child2, &child2_allocation);
}
}
else
@ -219,8 +220,8 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
if (GTK_WIDGET_REALIZED (widget))
gdk_window_hide (paned->handle);
child_allocation.x = border_width;
child_allocation.y = border_width;
child_allocation.x = widget->allocation.x + border_width;
child_allocation.y = widget->allocation.y + border_width;
child_allocation.width = MAX (1, allocation->width - 2 * border_width);
child_allocation.height = MAX (1, allocation->height - 2 * border_width);