Commit 79c202b5 authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

Fix sizing bug.

Fri Jun  7 23:11:42 2002  Jonathan Blandford  <jrb@gnome.org>

	* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
	bug.

	* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.

Not sure why all the docs updated.
parent a68df0b2
Fri Jun 7 23:11:42 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
bug.
* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.
2002-06-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c
......
Fri Jun 7 23:11:42 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
bug.
* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.
2002-06-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c
......
Fri Jun 7 23:11:42 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
bug.
* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.
2002-06-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c
......
Fri Jun 7 23:11:42 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
bug.
* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.
2002-06-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c
......
Fri Jun 7 23:11:42 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
bug.
* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.
2002-06-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c
......
Fri Jun 7 23:11:42 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_real_expand_row): Fix sizing
bug.
* docs/reference/gtk/tmpl/gtkbutton.sgml: Remove ^M's.
2002-06-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c
......
......@@ -158,28 +158,28 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_screen_height ##### -->
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_screen_width_mm ##### -->
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_screen_height_mm ##### -->
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_pointer_grab ##### -->
......@@ -255,7 +255,7 @@ success or the reason for the failure of the grab attempt.
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_set_double_click_time ##### -->
......@@ -288,7 +288,7 @@ available.
<para>
</para>
@time:
@time:
<!-- ##### FUNCTION gdk_beep ##### -->
......
......@@ -108,7 +108,6 @@ pixel_from_rgb (GdkVisual *visual,
<structfield>blue_prec</structfield> give an alternate presentation
of the information in <structfield>blue_mask</structfield>.
@blue_prec: See above.
@screen:
<!-- ##### ENUM GdkVisualType ##### -->
<para>
......
......@@ -162,22 +162,22 @@ box.
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
<para>
</para>
......
......@@ -5,40 +5,40 @@ GtkButton
A widget that creates a signal when clicked on.
<!-- ##### SECTION Long_Description ##### -->
<para>
The #GtkButton widget is generally used to attach a function to that
is called when the button is pressed. The various signals and how to use
them are outlined below.
</para>
<para>
The #GtkButton widget can hold any valid child widget. That is it can
hold most any other standard #GtkWidget. The most commonly used child is
the #GtkLabel.
<para>
The #GtkButton widget is generally used to attach a function to that
is called when the button is pressed. The various signals and how to use
them are outlined below.
</para>
<para>
The #GtkButton widget can hold any valid child widget. That is it can
hold most any other standard #GtkWidget. The most commonly used child is
the #GtkLabel.
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
<para>
</para>
<!-- ##### STRUCT GtkButton ##### -->
<para>
This should not be accessed directly. Use the accessor functions below.
<para>
This should not be accessed directly. Use the accessor functions below.
</para>
<!-- ##### FUNCTION gtk_button_new ##### -->
<para>
Creates a new #GtkButton widget.
<para>
Creates a new #GtkButton widget.
</para>
@Returns: The newly created #GtkButton widget.
<!-- ##### FUNCTION gtk_button_new_with_label ##### -->
<para>
Creates a #GtkButton widget with a #GtkLabel child containing the given
text.
<para>
Creates a #GtkButton widget with a #GtkLabel child containing the given
text.
</para>
@label: The text you want the #GtkLabel to hold.
......@@ -64,52 +64,52 @@ text.
<!-- ##### FUNCTION gtk_button_pressed ##### -->
<para>
Emits a #GtkButton::pressed signal to the given #GtkButton.
<para>
Emits a #GtkButton::pressed signal to the given #GtkButton.
</para>
@button: The #GtkButton you want to send the signal to.
<!-- ##### FUNCTION gtk_button_released ##### -->
<para>
Emits a #GtkButton::released signal to the given #GtkButton.
<para>
Emits a #GtkButton::released signal to the given #GtkButton.
</para>
@button: The #GtkButton you want to send the signal to.
<!-- ##### FUNCTION gtk_button_clicked ##### -->
<para>
Emits a #GtkButton::clicked signal to the given #GtkButton.
<para>
Emits a #GtkButton::clicked signal to the given #GtkButton.
</para>
@button: The #GtkButton you want to send the signal to.
<!-- ##### FUNCTION gtk_button_enter ##### -->
<para>
Emits a #GtkButton::enter signal to the given #GtkButton.
<para>
Emits a #GtkButton::enter signal to the given #GtkButton.
</para>
@button: The #GtkButton you want to send the signal to.
<!-- ##### FUNCTION gtk_button_leave ##### -->
<para>
Emits a #GtkButton::leave signal to the given #GtkButton.
<para>
Emits a #GtkButton::leave signal to the given #GtkButton.
</para>
@button: The #GtkButton you want to send the signal to.
<!-- ##### FUNCTION gtk_button_set_relief ##### -->
<para>
Sets the relief style of the edges of the given #GtkButton widget.
Three styles exist, GTK_RELIEF_NORMAL, GTK_RELIEF_HALF, GTK_RELIEF_NONE.
The default style is, as one can guess, GTK_RELIEF_NORMAL.
<!-- FIXME: put pictures of each style -->
<para>
Sets the relief style of the edges of the given #GtkButton widget.
Three styles exist, GTK_RELIEF_NORMAL, GTK_RELIEF_HALF, GTK_RELIEF_NONE.
The default style is, as one can guess, GTK_RELIEF_NORMAL.
<!-- FIXME: put pictures of each style -->
</para>
@button: The #GtkButton you want to set relief styles of.
......@@ -117,8 +117,8 @@ The default style is, as one can guess, GTK_RELIEF_NORMAL.
<!-- ##### FUNCTION gtk_button_get_relief ##### -->
<para>
Returns the current relief style of the given #GtkButton.
<para>
Returns the current relief style of the given #GtkButton.
</para>
@button: The #GtkButton you want the #GtkReliefStyle from.
......@@ -191,39 +191,39 @@ Returns the current relief style of the given #GtkButton.
@button: the object which received the signal.
<!-- ##### SIGNAL GtkButton::clicked ##### -->
<para>
Emitted when a button clicked on by the mouse and the cursor stays on the
button. If the cursor is not on the button when the mouse button is released,
the signal is not emitted.
<para>
Emitted when a button clicked on by the mouse and the cursor stays on the
button. If the cursor is not on the button when the mouse button is released,
the signal is not emitted.
</para>
@button: the object which received the signal.
<!-- ##### SIGNAL GtkButton::enter ##### -->
<para>
Emitted when the mouse cursor enters the region of the button.
<para>
Emitted when the mouse cursor enters the region of the button.
</para>
@button: the object which received the signal.
<!-- ##### SIGNAL GtkButton::leave ##### -->
<para>
Emitted when the mouse cursor leaves the region of the button.
<para>
Emitted when the mouse cursor leaves the region of the button.
</para>
@button: the object which received the signal.
<!-- ##### SIGNAL GtkButton::pressed ##### -->
<para>
Emitted when the button is initially pressed.
<para>
Emitted when the button is initially pressed.
</para>
@button: the object which received the signal.
<!-- ##### SIGNAL GtkButton::released ##### -->
<para>
Emitted when a button which is pressed is released, no matter where the
mouse cursor is.
<para>
Emitted when a button which is pressed is released, no matter where the
mouse cursor is.
</para>
@button: the object which received the signal.
......@@ -248,12 +248,12 @@ mouse cursor is.
</para>
<!-- ##### ARG GtkButton:default-border ##### -->
<!-- ##### ARG GtkButton:default-outside-border ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:default-outside-border ##### -->
<!-- ##### ARG GtkButton:default-border ##### -->
<para>
</para>
......
......@@ -66,12 +66,12 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
@Returns:
<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
<para>
</para>
......
......@@ -298,7 +298,7 @@ was clicked.
</para>
<!-- ##### ARG GtkDialog:content-area-border ##### -->
<!-- ##### ARG GtkDialog:action-area-border ##### -->
<para>
</para>
......@@ -308,7 +308,7 @@ was clicked.
</para>
<!-- ##### ARG GtkDialog:action-area-border ##### -->
<!-- ##### ARG GtkDialog:content-area-border ##### -->
<para>
</para>
......
......@@ -96,6 +96,7 @@ drop</link> interfaces.
@list_store:
@iter:
@Returns:
<!-- # Unused Parameters # -->
@store:
......
......@@ -64,12 +64,12 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
@position: the position in the item list where the @child is added.
<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
<para>
</para>
<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
<para>
</para>
......
......@@ -153,17 +153,17 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:stepper-size ##### -->
<!-- ##### ARG GtkRange:trough-border ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:slider-width ##### -->
<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<!-- ##### ARG GtkRange:stepper-size ##### -->
<para>
</para>
......@@ -178,7 +178,7 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:trough-border ##### -->
<!-- ##### ARG GtkRange:slider-width ##### -->
<para>
</para>
......
......@@ -54,32 +54,32 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>
......
......@@ -386,27 +386,27 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:space-style ##### -->
<!-- ##### ARG GtkToolbar:space-size ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:internal-padding ##### -->
<!-- ##### ARG GtkToolbar:space-style ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:space-size ##### -->
<!-- ##### ARG GtkToolbar:internal-padding ##### -->
<para>
</para>
......
......@@ -88,6 +88,7 @@ GtkTreeStore
@tree_store:
@iter:
@Returns:
<!-- ##### FUNCTION gtk_tree_store_insert ##### -->
......
......@@ -901,27 +901,27 @@ Function used for #gtk_tree_view_map_expanded_rows.
</para>
<!-- ##### ARG GtkTreeView:expander-size ##### -->
<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:allow-rules ##### -->
<!-- ##### ARG GtkTreeView:expander-size ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
<!-- ##### ARG GtkTreeView:allow-rules ##### -->
<para>
</para>
......
......@@ -2152,6 +2152,11 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:is-focus ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:can-default ##### -->
<para>
......@@ -2187,7 +2192,7 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<para>
</para>
......@@ -2197,27 +2202,27 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:focus-padding ##### -->
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<!-- ##### ARG GtkWidget:cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-color ##### -->
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<!-- ##### ARG GtkWidget:focus-padding ##### -->
<para>
</para>
......
......@@ -844,3 +844,13 @@ Deprecated alias for gtk_window_set_position().
</para>
<!-- ##### ARG GtkWindow:is-active ##### -->
<para>
</para>
<!-- ##### ARG GtkWindow:has-toplevel-focus ##### -->
<para>
</para>
......@@ -8852,9 +8852,9 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
GtkTreeIter temp;
gboolean expand;
if (node->children && !open_all)
return TRUE;
return FALSE;
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
return FALSE;
......@@ -8862,6 +8862,36 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter))
return FALSE;
if (node->children && open_all)
{
gboolean retval = FALSE;
GtkTreePath *tmp_path = gtk_tree_path_copy (path);
gtk_tree_path_append_index (tmp_path, 0);
tree = node->children;
node = tree->root;
while (node->left != tree->nil)
node = node->left;
/* try to expand the children */
do
{
gboolean t;
t = gtk_tree_view_real_expand_row (tree_view, tmp_path, tree, node,
TRUE, animate);
if (t)
retval = TRUE;
gtk_tree_path_next (tmp_path);
node = _gtk_rbtree_next (tree, node);
}
while (node != NULL);
gtk_tree_path_free (tmp_path);
return retval;
}
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_EXPAND_ROW], 0, &iter, path, &expand);
if (expand)
......
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