removed some superfluous variables that duplicated widget->state.

updated ChangeLog.
-timj

3 files changed, 2 insertions, 14 deletions

diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 16d60b0ec5..fd05844f1a 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -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);
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 3a34ce806f..d3cba285e2 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -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);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index e1a1169b58..b7f8c8bea7 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -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;