Commit 23949776 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

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

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.
parent 5b9a4753
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):
......
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):
......
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):
......
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):
......
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):
......
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):
......
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):
......
......@@ -98,7 +98,7 @@ When using <link linkend="gdk-Input-Methods">Input Methods</link> to support
internationalized text input, the composed characters appear here after the
pre-editing has been completed.
@hardware_keycode: the raw code of the key that was pressed or released.
@group: the keyboard group.
@group: the keyboard group.
<!-- ##### STRUCT GdkEventButton ##### -->
<para>
......@@ -149,7 +149,7 @@ must also occur within 1/2 second of the first button press.
@x: the x coordinate of the pointer relative to the window.
@y: the y coordinate of the pointer relative to the window.
@axes: @x, @y translated to the axes of @device, or %NULL if @device is
the mouse.
the mouse.
@state: a bit-mask representing the state of the modifier keys (e.g. Control,
Shift and Alt) and the pointer buttons. See #GdkModifierType.
@button: the button which was pressed or released, numbered from 1 to 5.
......@@ -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,
......@@ -194,7 +195,7 @@ Generated when the pointer moves.
@x: the x coordinate of the pointer relative to the window.
@y: the y coordinate of the pointer relative to the window.
@axes: @x, @y translated to the axes of @device, or %NULL if @device is
the mouse.
the mouse.
@state: a bit-mask representing the state of the modifier keys (e.g. Control,
Shift and Alt) and the pointer buttons. See #GdkModifierType.
@is_hint:
......@@ -240,7 +241,7 @@ Generated when the pointer enters or leaves a window.
@window: the window which received the event.
@send_event: %TRUE if the event was sent explicitly (e.g. using
<function>XSendEvent</function>).
@subwindow: the window that was entered or left.
@subwindow: the window that was entered or left.
@time: the time of the event in milliseconds.
@x: the x coordinate of the pointer relative to the window.
@y: the y coordinate of the pointer relative to the window.
......@@ -303,7 +304,7 @@ is taken over by another client application.
@window: the window which received the event.
@send_event: %TRUE if the event was sent explicitly (e.g. using <function>XSendEvent</function>).
@selection: the selection.
@target: the target to which the selection should be converted.
@target: the target to which the selection should be converted.
@property: the property in which to place the result of the conversion.
@time: the time of the event in milliseconds.
@requestor: the native window on which to place @property.
......@@ -377,8 +378,8 @@ Generated when the state of a toplevel window changes.
@type: the type of the event (%GDK_WINDOW_STATE).
@window: the window which received the event.
@send_event: %TRUE if the event was sent explicitly (e.g. using <function>XSendEvent</function>).
@changed_mask: mask specifying what flags have changed.
@new_window_state: the new window state, a combination of #GdkWindowState bits.
@changed_mask: mask specifying what flags have changed.
@new_window_state: the new window state, a combination of #GdkWindowState bits.
<!-- ##### STRUCT GdkEventSetting ##### -->
<para>
......@@ -416,9 +417,9 @@ Specifies the visiblity status of a window for a #GdkEventVisibility.
Specifies the crossing mode for #GdkEventCrossing.
</para>
@GDK_CROSSING_NORMAL: crossing because of pointer motion.
@GDK_CROSSING_NORMAL: crossing because of pointer motion.
@GDK_CROSSING_GRAB: crossing because a grab is activated.
@GDK_CROSSING_UNGRAB: crossing because a grab is deactivated.
@GDK_CROSSING_UNGRAB: crossing because a grab is deactivated.
<!-- ##### ENUM GdkNotifyType ##### -->
<para>
......@@ -430,17 +431,17 @@ full details of crossing event generation.
</para>
@GDK_NOTIFY_ANCESTOR: the window is entered from an ancestor or
left towards an ancestor.
left towards an ancestor.
@GDK_NOTIFY_VIRTUAL: the pointer moves between an ancestor and an
inferior of the window.
inferior of the window.
@GDK_NOTIFY_INFERIOR: the window is entered from an inferior or
left towards an inferior.
left towards an inferior.
@GDK_NOTIFY_NONLINEAR: the window is entered from or left towards
a window which is neither an ancestor nor an inferior.
a window which is neither an ancestor nor an inferior.
@GDK_NOTIFY_NONLINEAR_VIRTUAL: the pointer moves between two windows
which are not ancestors of each other and the window is part of
the ancestor chain between one of these windows and their least
common ancestor.
common ancestor.
@GDK_NOTIFY_UNKNOWN:
<!-- ##### ENUM GdkPropertyState ##### -->
......@@ -456,7 +457,7 @@ Specifies the type of a property change for a #GdkEventProperty.
Specifies the state of a toplevel window.
</para>
@GDK_WINDOW_STATE_WITHDRAWN: the window is not shown.
@GDK_WINDOW_STATE_WITHDRAWN: the window is not shown.
@GDK_WINDOW_STATE_ICONIFIED: the window is minimized.
@GDK_WINDOW_STATE_MAXIMIZED: the window is maximized.
@GDK_WINDOW_STATE_STICKY: the window is sticky.
......@@ -466,7 +467,7 @@ Specifies the state of a toplevel window.
Specifies the kind of modification applied to a setting in a #GdkEventSetting.
</para>
@GDK_SETTING_ACTION_NEW: a setting was added.
@GDK_SETTING_ACTION_NEW: a setting was added.
@GDK_SETTING_ACTION_CHANGED: a setting was changed.
@GDK_SETTING_ACTION_DELETED: a setting was deleted.
......@@ -710,9 +710,8 @@ 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.
@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.
@Returns: a #GdkFilterReturn value.
......@@ -722,11 +721,10 @@ event or handle it without translation.
Specifies the result of applying a #GdkFilterFunc to a native event.
</para>
@GDK_FILTER_CONTINUE: event not handled, continue processing.
@GDK_FILTER_CONTINUE: event not handled, continue processing.
@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>
......
......@@ -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.
......
......@@ -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.
......
......@@ -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>
......
......@@ -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",
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment