diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-04-09 11:58:50 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-04-09 11:59:27 +0200 |
| commit | 496d3f15de295482e158194e1fe1dae3569f4524 (patch) | |
| tree | a845cc8473be0dcf2fed2a746b23d710ea410dcb | |
| parent | 305cf9768bd716ba9bbcd3e773511536243a9cc5 (diff) | |
| download | nautilus-496d3f15de295482e158194e1fe1dae3569f4524.tar.gz | |
Use gtk_widget_get_state() (#612423).
Instead of the deprecated GTK_WIDGET_STATE macro.
Patch by Dominique Leuenberger.
| -rw-r--r-- | eel/eel-editable-label.c | 8 | ||||
| -rw-r--r-- | eel/eel-gtk-extensions.c | 2 | ||||
| -rw-r--r-- | eel/eel-labeled-image.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 021fcee52..51ec872a7 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -1173,7 +1173,7 @@ eel_editable_label_style_set (GtkWidget *widget, */ if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]); + gdk_window_set_background (widget->window, &widget->style->base[gtk_widget_get_state (widget)]); if (label->primary_cursor_gc != NULL) { @@ -1625,7 +1625,7 @@ eel_editable_label_expose (GtkWidget *widget, gtk_paint_layout (widget->style, widget->window, - GTK_WIDGET_STATE (widget), + gtk_widget_get_state (widget), TRUE, &event->area, widget, @@ -1689,7 +1689,7 @@ eel_editable_label_expose (GtkWidget *widget, if (label->draw_outline) gdk_draw_rectangle (widget->window, - widget->style->text_gc [GTK_WIDGET_STATE (widget)], + widget->style->text_gc [gtk_widget_get_state (widget)], FALSE, 0, 0, widget->allocation.width - 1, @@ -1740,7 +1740,7 @@ eel_editable_label_realize (GtkWidget *widget) widget->style = gtk_style_attach (widget->style, widget->window); - gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]); + gdk_window_set_background (widget->window, &widget->style->base[gtk_widget_get_state (widget)]); gtk_im_context_set_client_window (label->im_context, widget->window); diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index 96453eec1..6f88f7216 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -886,7 +886,7 @@ eel_gtk_label_expose_event (GtkLabel *label, GdkEventExpose *event, gpointer use gtk_paint_layout (widget->style, widget->window, - GTK_WIDGET_STATE (widget), + gtk_widget_get_state (widget), FALSE, &event->area, widget, diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c index bae5e9d28..b3ea3499a 100644 --- a/eel/eel-labeled-image.c +++ b/eel/eel-labeled-image.c @@ -540,13 +540,13 @@ eel_labeled_image_expose_event (GtkWidget *widget, labeled_image = EEL_LABELED_IMAGE (widget); - if (GTK_WIDGET_STATE (widget) == GTK_STATE_SELECTED || - GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE) { + if (gtk_widget_get_state (widget) == GTK_STATE_SELECTED || + gtk_widget_get_state (widget) == GTK_STATE_ACTIVE) { label_bounds = eel_labeled_image_get_label_bounds (EEL_LABELED_IMAGE (widget)); gtk_paint_flat_box (widget->style, widget->window, - GTK_WIDGET_STATE (widget), + gtk_widget_get_state (widget), GTK_SHADOW_NONE, &event->area, widget, |