GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 4c2931aa authored by Tim Janik's avatar Tim Janik

removed some superfluous variables that duplicated widget->state.

updated ChangeLog.
-timj
parent 3ae8c300
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
Wed Jan 21 01:32:21 1998 Tim Janik <timj@psynet.net>
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed the state_changed signal to take an
extra argument `old_state'.
removed `gtk_widget_restore_state'.
changed `gtk_widget_set_state' and `gtk_widget_set_sensitive' to use
only one function `gtk_widget_propagate_state' to iterate down the
tree. this causes GtkWidget::state_changed to be invoked on state
changes and on sensitivity changes. some comment cleanups.
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
......
......@@ -148,7 +148,6 @@ gtk_aspect_frame_paint (GtkWidget *widget,
GdkRectangle *area)
{
GtkFrame *frame;
GtkStateType state;
gint height_extra;
gint label_area_width;
gint x, y;
......@@ -163,10 +162,6 @@ gtk_aspect_frame_paint (GtkWidget *widget,
frame = GTK_FRAME (widget);
allocation = &GTK_ASPECT_FRAME(widget)->center_allocation;
state = widget->state;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
state = GTK_STATE_INSENSITIVE;
height_extra = frame->label_height - widget->style->klass->xthickness;
height_extra = MAX (height_extra, 0);
......@@ -194,7 +189,7 @@ gtk_aspect_frame_paint (GtkWidget *widget,
allocation->x + x + 2,
allocation->y + GTK_CONTAINER (frame)->border_width,
frame->label_width - 4, frame->label_height);
gtk_draw_string (widget->style, widget->window, state,
gtk_draw_string (widget->style, widget->window, GTK_WIDGET_STATE (widget),
allocation->x + x + 3,
allocation->y + y,
frame->label);
......
......@@ -297,7 +297,6 @@ gtk_frame_paint (GtkWidget *widget,
GdkRectangle *area)
{
GtkFrame *frame;
GtkStateType state;
gint height_extra;
gint label_area_width;
gint x, y;
......@@ -310,10 +309,6 @@ gtk_frame_paint (GtkWidget *widget,
{
frame = GTK_FRAME (widget);
state = widget->state;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
state = GTK_STATE_INSENSITIVE;
height_extra = frame->label_height - widget->style->klass->xthickness;
height_extra = MAX (height_extra, 0);
......@@ -342,7 +337,7 @@ gtk_frame_paint (GtkWidget *widget,
widget->allocation.y + GTK_CONTAINER (frame)->border_width,
frame->label_width - 4,
frame->label_height);
gtk_draw_string (widget->style, widget->window, state,
gtk_draw_string (widget->style, widget->window, GTK_WIDGET_STATE (widget),
widget->allocation.x + x + 3,
widget->allocation.y + y,
frame->label);
......
......@@ -293,8 +293,6 @@ gtk_label_expose (GtkWidget *widget,
misc = GTK_MISC (widget);
state = widget->state;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
state = GTK_STATE_INSENSITIVE;
maxl = widget->requisition.width - misc->xpad * 2;
......
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