Commit 20fee708 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Fixed assignment of adjustment->value to negative values. Moved a few

Sun Apr  5 19:30:23 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkclist.c: Fixed assignment of adjustment->value
	to negative values. Moved a few other allocation type things
	around in ways that may or may matter. Fixed some allocation
	errors (scrollbars were overlapping main window).

	* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
	button labels from vanishing when the invoked operation blocks.

	* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
	to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
parent 1a099c2c
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value
to negative values. Moved a few other allocation type things
around in ways that may or may matter. Fixed some allocation
errors (scrollbars were overlapping main window).
* gtk/gtkbutton.c (gtk_real_button_released): Small hack to keep
button labels from vanishing when the invoked operation blocks.
* gtk/gtkbox.c (gtk_box_remove): Assigning GTK_WIDGET_VISIBLE (widget)
to a gboolean (char) is _bad_. GTK_VISIBLE == 256.
Sun Apr 5 15:08:25 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c: Reverted broken implementation of removing
......
......@@ -560,7 +560,7 @@ gtk_box_remove (GtkContainer *container,
if (child->widget == widget)
{
gboolean visible;
gint visible;
visible = GTK_WIDGET_VISIBLE (widget);
gtk_widget_unparent (widget);
......
......@@ -881,7 +881,10 @@ gtk_real_button_released (GtkButton *button)
if (GTK_WIDGET_STATE (button) != new_state)
{
gtk_widget_set_state (GTK_WIDGET (button), new_state);
gtk_widget_queue_draw (GTK_WIDGET (button));
/* We _draw () instead of queue_draw so that if the operation
* blocks, the label doesn't vanish.
*/
gtk_widget_draw (GTK_WIDGET (button), NULL);
}
}
}
......
......@@ -1738,6 +1738,8 @@ gtk_clist_realize (GtkWidget * widget)
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
add_style_data (clist);
border_width = GTK_CONTAINER (widget)->border_width;
attributes.window_type = GDK_WINDOW_CHILD;
......@@ -1786,8 +1788,8 @@ gtk_clist_realize (GtkWidget * widget)
attributes.x = clist->internal_allocation.x + widget->style->klass->xthickness;
attributes.y = clist->internal_allocation.y + widget->style->klass->ythickness +
clist->column_title_area.height;
attributes.width = clist->internal_allocation.width;
attributes.height = clist->internal_allocation.height;
attributes.width = clist->clist_window_width;
attributes.height = clist->clist_window_height;
clist->clist_window = gdk_window_new (widget->window, &attributes, attributes_mask);
gdk_window_set_user_data (clist->clist_window, clist);
......@@ -1832,8 +1834,6 @@ gtk_clist_realize (GtkWidget * widget)
GDK_GC_FOREGROUND |
GDK_GC_FUNCTION |
GDK_GC_SUBWINDOW);
add_style_data (clist);
}
static void
......@@ -2167,6 +2167,8 @@ gtk_clist_size_request (GtkWidget * widget,
clist = GTK_CLIST (widget);
add_style_data (clist);
requisition->width = 0;
requisition->height = 0;
......@@ -2275,9 +2277,9 @@ gtk_clist_size_allocate (GtkWidget * widget,
if (!vscrollbar_vis)
{
vscrollbar_vis = 1;
clist_allocation.width = MAX (0,
clist_allocation.width - clist->vscrollbar->requisition.width +
SCROLLBAR_SPACING (clist));
clist_allocation.width = MAX (0, clist_allocation.width -
(clist->vscrollbar->requisition.width +
SCROLLBAR_SPACING (clist)));
}
}
......@@ -2291,9 +2293,9 @@ gtk_clist_size_allocate (GtkWidget * widget,
if (!hscrollbar_vis)
{
hscrollbar_vis = 1;
clist_allocation.height = MAX (0,
clist_allocation.height - clist->hscrollbar->requisition.height +
SCROLLBAR_SPACING (clist));
clist_allocation.height = MAX (0, clist_allocation.height -
(clist->hscrollbar->requisition.height +
SCROLLBAR_SPACING (clist)));
}
}
}
......@@ -2852,9 +2854,6 @@ size_allocate_columns (GtkCList * clist)
{
gint i, xoffset = 0;
if (!GTK_WIDGET_REALIZED (clist))
return;
for (i = 0; i < clist->columns; i++)
{
clist->column[i].area.x = xoffset + CELL_SPACING + COLUMN_INSET;
......@@ -3308,8 +3307,8 @@ adjust_scrollbars (GtkCList * clist)
if (clist->clist_window_height - clist->voffset > LIST_HEIGHT (clist))
{
GTK_RANGE (clist->vscrollbar)->adjustment->value = LIST_HEIGHT (clist) -
clist->clist_window_height;
GTK_RANGE (clist->vscrollbar)->adjustment->value = MAX (0, LIST_HEIGHT (clist) -
clist->clist_window_height);
gtk_signal_emit_by_name (GTK_OBJECT (GTK_RANGE (clist->vscrollbar)->adjustment),
"value_changed");
}
......@@ -3322,8 +3321,8 @@ adjust_scrollbars (GtkCList * clist)
if (clist->clist_window_width - clist->hoffset > LIST_WIDTH (clist))
{
GTK_RANGE (clist->hscrollbar)->adjustment->value = LIST_WIDTH (clist) -
clist->clist_window_width;
GTK_RANGE (clist->hscrollbar)->adjustment->value = MAX (0, LIST_WIDTH (clist) -
clist->clist_window_width);
gtk_signal_emit_by_name (GTK_OBJECT (GTK_RANGE (clist->hscrollbar)->adjustment),
"value_changed");
}
......@@ -3803,7 +3802,7 @@ cell_set_pixtext (GtkCList * clist,
}
}
/* Fill in data after widget is realized and has style */
/* Fill in data after widget has correct style */
static void
add_style_data (GtkCList * clist)
......
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