AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate widget flag: GTK_WIDGET_IS_SENSITIVE

Browse Source 
Use gtk_widget_is_sensitive() instead

https://bugzilla.gnome.org/show_bug.cgi?id=69872
This commit is contained in:
Javier Jardón 2010-02-27 05:24:24 +01:00
parent 4f78f70b15
commit a27d5a2c9e
37 changed files with 101 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkbutton.c
View File

@ -2180,7 +2180,7 @@ gtk_button_state_changed (GtkWidget *widget,
{
GtkButton *button = GTK_BUTTON (widget);
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
{
button->in_button = FALSE;
gtk_real_button_released (button);

6
gtk/gtkcalendar.c
View File

@ -1433,7 +1433,7 @@ calendar_realize_arrows (GtkCalendar *calendar)
priv->arrow_win[i] = gdk_window_new (priv->header_win,
&attributes,
attributes_mask);
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
priv->arrow_state[i] = GTK_STATE_NORMAL;
else
priv->arrow_state[i] = GTK_STATE_INSENSITIVE;
@ -3261,14 +3261,14 @@ gtk_calendar_state_changed (GtkWidget *widget,
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
int i;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
{
priv->in_drag = 0;
calendar_stop_spinning (calendar);
}
for (i = 0; i < 4; i++)
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
priv->arrow_state[i] = GTK_STATE_NORMAL;
else
priv->arrow_state[i] = GTK_STATE_INSENSITIVE;

2
gtk/gtkcheckbutton.c
View File

@ -390,7 +390,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
state_type = GTK_STATE_ACTIVE;
else if (button->in_button)
state_type = GTK_STATE_PRELIGHT;
else if (!GTK_WIDGET_IS_SENSITIVE (widget))
else if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
else
state_type = GTK_STATE_NORMAL;

2
gtk/gtkcheckmenuitem.c
View File

@ -488,7 +488,7 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
else
shadow_type = GTK_SHADOW_OUT;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
if (check_menu_item->draw_as_radio)

2
gtk/gtkclist.c
View File

@ -6447,7 +6447,7 @@ gtk_clist_focus (GtkWidget *widget,
GtkWidget *focus_child;
gboolean is_current_focus;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
return FALSE;
focus_child = GTK_CONTAINER (widget)->focus_child;

2
gtk/gtkcolorbutton.c
View File

@ -319,7 +319,7 @@ render (GtkColorButton *color_button)
for (i = 0; i < width; i++)
{
if (!GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (color_button)) && (i+j)%2)
if (!gtk_widget_is_sensitive (GTK_WIDGET (color_button)) && (i+j)%2)
{
*(pixels + j * rowstride + i * 3) = insensitive_r;
*(pixels + j * rowstride + i * 3 + 1) = insensitive_g;

2
gtk/gtkcurve.c
View File

@ -380,7 +380,7 @@ gtk_curve_draw (GtkCurve *c, gint width, gint height)
gtk_curve_interpolate (c, width, height);
state = GTK_STATE_NORMAL;
if (!GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (c)))
if (!gtk_widget_is_sensitive (GTK_WIDGET (c)))
state = GTK_STATE_INSENSITIVE;
style = GTK_WIDGET (c)->style;

10
gtk/gtkentry.c
View File

@ -2619,7 +2619,7 @@ update_cursors (GtkWidget *widget)
* here is that for the entry, insensitive => arrow cursor, but for
* an icon in a sensitive entry, insensitive => xterm cursor.
*/
if (GTK_WIDGET_IS_SENSITIVE (widget) &&
if (gtk_widget_is_sensitive (widget) &&
(icon_info->insensitive ||
(icon_info->nonactivatable && icon_info->target_list == NULL)))
{
@ -2779,7 +2779,7 @@ gtk_entry_realize (GtkWidget *widget)
get_text_area_size (entry, &attributes.x, &attributes.y, &attributes.width, &attributes.height);
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
attributes_mask |= GDK_WA_CURSOR;
@ -3236,7 +3236,7 @@ draw_icon (GtkWidget *widget,
x = (width - gdk_pixbuf_get_width (pixbuf)) / 2;
y = (height - gdk_pixbuf_get_height (pixbuf)) / 2;
if (!GTK_WIDGET_IS_SENSITIVE (widget) ||
if (!gtk_widget_is_sensitive (widget) ||
icon_info->insensitive)
{
GdkPixbuf *temp_pixbuf;
@ -4250,7 +4250,7 @@ gtk_entry_state_changed (GtkWidget *widget,
gdk_window_set_background (icon_info->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
}
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
else
cursor = NULL;
@ -4265,7 +4265,7 @@ gtk_entry_state_changed (GtkWidget *widget,
update_cursors (widget);
}
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
{
/* Clear any selection */
gtk_editable_select_region (GTK_EDITABLE (entry), entry->current_pos, entry->current_pos);

2
gtk/gtkexpander.c
View File

@ -955,7 +955,7 @@ static void
gtk_expander_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
GTK_EXPANDER (widget)->priv->button_down = FALSE;
}

14
gtk/gtklabel.c
View File

@ -2339,9 +2339,9 @@ gtk_label_set_markup_internal (GtkLabel *label,
if (!(enable_mnemonics && priv->mnemonics_visible &&
(!auto_mnemonics ||
(GTK_WIDGET_IS_SENSITIVE (label) &&
(gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
(!label->mnemonic_widget ||
GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget))))))
gtk_widget_is_sensitive (label->mnemonic_widget))))))
{
gchar *tmp;
gchar *pattern;
@ -2537,9 +2537,9 @@ gtk_label_set_pattern_internal (GtkLabel *label,
if (enable_mnemonics && priv->mnemonics_visible && pattern &&
(!auto_mnemonics ||
(GTK_WIDGET_IS_SENSITIVE (label) &&
(gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
(!label->mnemonic_widget ||
GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget)))))
gtk_widget_is_sensitive (label->mnemonic_widget)))))
attrs = gtk_label_pattern_to_attrs (label, pattern);
else
attrs = NULL;
@ -3265,7 +3265,7 @@ gtk_label_update_cursor (GtkLabel *label)
GdkDisplay *display;
GdkCursor *cursor;
if (GTK_WIDGET_IS_SENSITIVE (label))
if (gtk_widget_is_sensitive (GTK_WIDGET (label)))
{
display = gtk_widget_get_display (GTK_WIDGET (label));
@ -4568,7 +4568,7 @@ gtk_label_create_window (GtkLabel *label)
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
GDK_XTERM);
@ -5862,7 +5862,7 @@ gtk_label_activate_current_link (GtkLabel *label)
if (window &&
window->default_widget != widget &&
!(widget == window->focus_widget &&
(!window->default_widget || !GTK_WIDGET_IS_SENSITIVE (window->default_widget))))
(!window->default_widget || !gtk_widget_is_sensitive (window->default_widget))))
gtk_window_activate_default (window);
}
}

16
gtk/gtkmain.c
View File

@ -1519,7 +1519,7 @@ gtk_main_do_event (GdkEvent *event)
* then we send the event to the original event widget.
* This is the key to implementing modality.
*/
if (GTK_WIDGET_IS_SENSITIVE (event_widget) &&
if (gtk_widget_is_sensitive (event_widget) &&
gtk_widget_is_ancestor (event_widget, grab_widget))
grab_widget = event_widget;
}
@ -1650,13 +1650,13 @@ gtk_main_do_event (GdkEvent *event)
case GDK_ENTER_NOTIFY:
GTK_PRIVATE_SET_FLAG (event_widget, GTK_HAS_POINTER);
_gtk_widget_set_pointer_window (event_widget, event->any.window);
if (GTK_WIDGET_IS_SENSITIVE (grab_widget))
if (gtk_widget_is_sensitive (grab_widget))
gtk_widget_event (grab_widget, event);
break;
case GDK_LEAVE_NOTIFY:
GTK_PRIVATE_UNSET_FLAG (event_widget, GTK_HAS_POINTER);
if (GTK_WIDGET_IS_SENSITIVE (grab_widget))
if (gtk_widget_is_sensitive (grab_widget))
gtk_widget_event (grab_widget, event);
break;
@ -1759,7 +1759,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
{
GTK_PRIVATE_SET_FLAG (child, GTK_SHADOWED);
if (!was_shadowed && GTK_WIDGET_HAS_POINTER (child)
&& GTK_WIDGET_IS_SENSITIVE (child))
&& gtk_widget_is_sensitive (child))
_gtk_widget_synthesize_crossing (child, info->new_grab_widget,
GDK_CROSSING_GTK_GRAB);
}
@ -1767,7 +1767,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
{
GTK_PRIVATE_UNSET_FLAG (child, GTK_SHADOWED);
if (was_shadowed && GTK_WIDGET_HAS_POINTER (child)
&& GTK_WIDGET_IS_SENSITIVE (child))
&& gtk_widget_is_sensitive (child))
_gtk_widget_synthesize_crossing (info->old_grab_widget, child,
info->from_grab ? GDK_CROSSING_GTK_GRAB
: GDK_CROSSING_GTK_UNGRAB);
@ -1827,7 +1827,7 @@ gtk_grab_add (GtkWidget *widget)
g_return_if_fail (widget != NULL);
if (!gtk_widget_has_grab (widget) && GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_has_grab (widget) && gtk_widget_is_sensitive (widget))
{
GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB);
@ -2412,7 +2412,7 @@ gtk_propagate_event (GtkWidget *widget,
window = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (window))
{
if (GTK_WIDGET_IS_SENSITIVE (window))
if (gtk_widget_is_sensitive (window))
gtk_widget_event (window, event);
}
}
@ -2436,7 +2436,7 @@ gtk_propagate_event (GtkWidget *widget,
* to have children of the viewport eat the scroll
* event
*/
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
handled_event = event->type != GDK_SCROLL;
else
handled_event = gtk_widget_event (widget, event);

2
gtk/gtkmenu.c
View File

@ -1804,7 +1804,7 @@ gtk_menu_real_can_activate_accel (GtkWidget *widget,
if (awidget)
return gtk_widget_can_activate_accel (awidget, signal_id);
else
return GTK_WIDGET_IS_SENSITIVE (widget);
return gtk_widget_is_sensitive (widget);
}
/**

6
gtk/gtkmenuitem.c
View File

@ -1489,7 +1489,7 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget,
{
GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu) && widget->parent)
if (gtk_widget_is_sensitive (menu_item->submenu) && widget->parent)
{
gboolean take_focus;
GtkMenuPositionFunc menu_position_func;
@ -1912,7 +1912,7 @@ gtk_menu_item_can_activate_accel (GtkWidget *widget,
guint signal_id)
{
/* Chain to the parent GtkMenu for further checks */
return (GTK_WIDGET_IS_SENSITIVE (widget) && GTK_WIDGET_VISIBLE (widget) &&
return (gtk_widget_is_sensitive (widget) && GTK_WIDGET_VISIBLE (widget) &&
widget->parent && gtk_widget_can_activate_accel (widget->parent, signal_id));
}
@ -2101,7 +2101,7 @@ _gtk_menu_item_is_selectable (GtkWidget *menu_item)
if ((!GTK_BIN (menu_item)->child &&
G_OBJECT_TYPE (menu_item) == GTK_TYPE_MENU_ITEM) ||
GTK_IS_SEPARATOR_MENU_ITEM (menu_item) ||
!GTK_WIDGET_IS_SENSITIVE (menu_item) ||
!gtk_widget_is_sensitive (menu_item) ||
!GTK_WIDGET_VISIBLE (menu_item))
return FALSE;

2
gtk/gtkmenutoolbutton.c
View File

@ -152,7 +152,7 @@ gtk_menu_tool_button_state_changed (GtkWidget *widget,
GtkMenuToolButton *button = GTK_MENU_TOOL_BUTTON (widget);
GtkMenuToolButtonPrivate *priv = button->priv;
if (!GTK_WIDGET_IS_SENSITIVE (widget) && priv->menu)
if (!gtk_widget_is_sensitive (widget) && priv->menu)
{
gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
}

2
gtk/gtkmnemonichash.c
View File

@ -127,7 +127,7 @@ _gtk_mnemonic_hash_activate (GtkMnemonicHash *mnemonic_hash,
{
widget = GTK_WIDGET (list->data);
if (GTK_WIDGET_IS_SENSITIVE (widget) &&
if (gtk_widget_is_sensitive (widget) &&
GTK_WIDGET_MAPPED (widget) &&
widget->window &&
gdk_window_is_viewable (widget->window))

2
gtk/gtknotebook.c
View File

@ -3244,7 +3244,7 @@ static void
gtk_notebook_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
stop_scrolling (GTK_NOTEBOOK (widget));
}

8
gtk/gtkoptionmenu.c
View File

@ -729,8 +729,8 @@ gtk_option_menu_item_state_changed_cb (GtkWidget *widget,
{
GtkWidget *child = GTK_BIN (option_menu)->child;
if (child && GTK_WIDGET_SENSITIVE (child) != GTK_WIDGET_IS_SENSITIVE (widget))
gtk_widget_set_sensitive (child, GTK_WIDGET_IS_SENSITIVE (widget));
if (child && GTK_WIDGET_SENSITIVE (child) != gtk_widget_is_sensitive (widget))
gtk_widget_set_sensitive (child, gtk_widget_is_sensitive (widget));
}
static void
@ -771,7 +771,7 @@ gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
child = GTK_BIN (option_menu->menu_item)->child;
if (child)
{
if (!GTK_WIDGET_IS_SENSITIVE (option_menu->menu_item))
if (!gtk_widget_is_sensitive (option_menu->menu_item))
gtk_widget_set_sensitive (child, FALSE);
gtk_widget_reparent (child, GTK_WIDGET (option_menu));
}
@ -1014,7 +1014,7 @@ gtk_option_menu_scroll_event (GtkWidget *widget,
l = g_list_nth (GTK_MENU_SHELL (option_menu->menu)->children, index);
item = GTK_MENU_ITEM (l->data);
if (GTK_WIDGET_VISIBLE (item) && GTK_WIDGET_IS_SENSITIVE (item))
if (GTK_WIDGET_VISIBLE (item) && gtk_widget_is_sensitive (GTK_WIDGET (item)))
{
gtk_option_menu_set_history (option_menu, index);
gtk_menu_item_activate (GTK_MENU_ITEM (item));

4
gtk/gtkpaned.c
View File

@ -997,7 +997,7 @@ gtk_paned_realize (GtkWidget *widget)
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK);
attributes_mask = GDK_WA_X | GDK_WA_Y;
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
paned->cursor_type);
@ -1280,7 +1280,7 @@ gtk_paned_state_changed (GtkWidget *widget,
if (GTK_WIDGET_REALIZED (paned))
{
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
paned->cursor_type);
else

6
gtk/gtkpathbar.c
View File

@ -936,7 +936,7 @@ gtk_path_bar_slider_up_defocus (GtkWidget *widget,
}
/* don't let the focus vanish */
if ((!GTK_WIDGET_IS_SENSITIVE (path_bar->up_slider_button)) ||
if ((!gtk_widget_is_sensitive (path_bar->up_slider_button)) ||
(!gtk_widget_get_child_visible (path_bar->up_slider_button)))
gtk_widget_grab_focus (BUTTON_DATA (up_button->data)->button);
@ -964,7 +964,7 @@ gtk_path_bar_slider_down_defocus (GtkWidget *widget,
}
/* don't let the focus vanish */
if ((!GTK_WIDGET_IS_SENSITIVE (path_bar->down_slider_button)) ||
if ((!gtk_widget_is_sensitive (path_bar->down_slider_button)) ||
(!gtk_widget_get_child_visible (path_bar->down_slider_button)))
gtk_widget_grab_focus (BUTTON_DATA (down_button->data)->button);
@ -1036,7 +1036,7 @@ static void
gtk_path_bar_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
}

10
gtk/gtkprintunixdialog.c
View File

@ -2434,7 +2434,7 @@ dialog_set_print_pages (GtkPrintUnixDialog *dialog,
static gdouble
dialog_get_scale (GtkPrintUnixDialog *dialog)
{
if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->scale_spin))
if (gtk_widget_is_sensitive (dialog->priv->scale_spin))
return gtk_spin_button_get_value (GTK_SPIN_BUTTON (dialog->priv->scale_spin));
else
return 100.0;
@ -2450,7 +2450,7 @@ dialog_set_scale (GtkPrintUnixDialog *dialog,
static GtkPageSet
dialog_get_page_set (GtkPrintUnixDialog *dialog)
{
if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->page_set_combo))
if (gtk_widget_is_sensitive (dialog->priv->page_set_combo))
return (GtkPageSet)gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->page_set_combo));
else
return GTK_PAGE_SET_ALL;
@ -2467,7 +2467,7 @@ dialog_set_page_set (GtkPrintUnixDialog *dialog,
static gint
dialog_get_n_copies (GtkPrintUnixDialog *dialog)
{
if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->copies_spin))
if (gtk_widget_is_sensitive (dialog->priv->copies_spin))
return gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dialog->priv->copies_spin));
return 1;
}
@ -2483,7 +2483,7 @@ dialog_set_n_copies (GtkPrintUnixDialog *dialog,
static gboolean
dialog_get_collate (GtkPrintUnixDialog *dialog)
{
if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->collate_check))
if (gtk_widget_is_sensitive (dialog->priv->collate_check))
return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->collate_check));
return FALSE;
}
@ -2499,7 +2499,7 @@ dialog_set_collate (GtkPrintUnixDialog *dialog,
static gboolean
dialog_get_reverse (GtkPrintUnixDialog *dialog)
{
if (GTK_WIDGET_IS_SENSITIVE (dialog->priv->reverse_check))
if (gtk_widget_is_sensitive (dialog->priv->reverse_check))
return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->reverse_check));
return FALSE;
}

6
gtk/gtkradiobutton.c
View File

@ -498,7 +498,7 @@ gtk_radio_button_focus (GtkWidget *widget,
{
GtkWidget *child = tmp_list->data;
if (GTK_WIDGET_MAPPED (child) && GTK_WIDGET_IS_SENSITIVE (child))
if (GTK_WIDGET_MAPPED (child) && gtk_widget_is_sensitive (child))
{
new_focus = child;
break;
@ -534,7 +534,7 @@ gtk_radio_button_focus (GtkWidget *widget,
{
GtkWidget *child = tmp_list->data;
if (GTK_WIDGET_MAPPED (child) && GTK_WIDGET_IS_SENSITIVE (child))
if (GTK_WIDGET_MAPPED (child) && gtk_widget_is_sensitive (child))
{
new_focus = child;
break;
@ -719,7 +719,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
state_type = GTK_STATE_ACTIVE;
else if (button->in_button)
state_type = GTK_STATE_PRELIGHT;
else if (!GTK_WIDGET_IS_SENSITIVE (widget))
else if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
else
state_type = GTK_STATE_NORMAL;

6
gtk/gtkrange.c
View File

@ -1652,7 +1652,7 @@ draw_stepper (GtkRange *range,
arrow_sensitive = range->layout->lower_sensitive;
}
if (!GTK_WIDGET_IS_SENSITIVE (range) || !arrow_sensitive)
if (!gtk_widget_is_sensitive (GTK_WIDGET (range)) || !arrow_sensitive)
state_type = GTK_STATE_INSENSITIVE;
else if (clicked)
state_type = GTK_STATE_ACTIVE;
@ -1741,7 +1741,7 @@ gtk_range_expose (GtkWidget *widget,
gtk_range_calc_marks (range);
gtk_range_calc_layout (range, range->adjustment->value);
sensitive = GTK_WIDGET_IS_SENSITIVE (widget);
sensitive = gtk_widget_is_sensitive (widget);
/* Just to be confusing, we draw the trough for the whole
* range rectangle, not the trough rectangle (the trough
@ -2541,7 +2541,7 @@ static void
gtk_range_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
stop_scrolling (GTK_RANGE (widget));
}

2
gtk/gtkscale.c
View File

@ -973,7 +973,7 @@ gtk_scale_expose (GtkWidget *widget,
GTK_WIDGET_CLASS (gtk_scale_parent_class)->expose_event (widget, event);
state_type = GTK_STATE_NORMAL;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
if (priv->marks)

2
gtk/gtkspinbutton.c
View File

@ -966,7 +966,7 @@ gtk_spin_button_state_changed (GtkWidget *widget,
{
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
{
gtk_spin_button_stop_spinning (spin);
gtk_widget_queue_draw (GTK_WIDGET (spin));

2
gtk/gtkspinner.c
View File

@ -231,7 +231,7 @@ gtk_spinner_expose (GtkWidget *widget,
gtk_widget_set_size_request (widget, 12, 12);
state_type = GTK_STATE_NORMAL;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
state_type = GTK_STATE_INSENSITIVE;
gtk_paint_spinner (widget->style,

2
gtk/gtkstatusbar.c
View File

@ -647,7 +647,7 @@ set_grip_cursor (GtkStatusbar *statusbar)
GdkCursorType cursor_type;
GdkCursor *cursor;
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
cursor_type = GDK_BOTTOM_RIGHT_CORNER;

6
gtk/gtktextview.c
View File

@ -4012,7 +4012,7 @@ gtk_text_view_state_changed (GtkWidget *widget,
{
gtk_text_view_set_background (text_view);
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
else
cursor = NULL;
@ -4025,7 +4025,7 @@ gtk_text_view_state_changed (GtkWidget *widget,
text_view->mouse_cursor_obscured = FALSE;
}
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
{
/* Clear any selection */
gtk_text_view_unselect (text_view);
@ -8030,7 +8030,7 @@ text_window_realize (GtkTextWindow *win,
if (win->type == GTK_TEXT_WINDOW_TEXT)
{
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
/* I-beam cursor */
cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (widget->window),

10
gtk/gtktreeitem.c
View File

@ -187,7 +187,7 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
item = (GtkTreeItem*) gtk_object_get_user_data (GTK_OBJECT (widget));
if (!GTK_WIDGET_IS_SENSITIVE (item))
if (!gtk_widget_is_sensitive (GTK_WIDGET (item)))
return FALSE;
if (item->expanded)
@ -614,7 +614,7 @@ gtk_tree_item_paint (GtkWidget *widget,
}
else
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
gtk_paint_flat_box(widget->style, widget->window,
widget->state, GTK_SHADOW_NONE,
area, widget, "treeitem",
@ -665,11 +665,11 @@ gtk_tree_item_button_press (GtkWidget *widget,
GdkEventButton *event)
{
if (event->type == GDK_BUTTON_PRESS
&& GTK_WIDGET_IS_SENSITIVE(widget)
&& gtk_widget_is_sensitive(widget)
&& !GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
return (event->type == GDK_BUTTON_PRESS && GTK_WIDGET_IS_SENSITIVE(widget));
return (event->type == GDK_BUTTON_PRESS && gtk_widget_is_sensitive(widget));
}
static void
@ -761,7 +761,7 @@ gtk_real_tree_item_toggle (GtkItem *item)
{
g_return_if_fail (GTK_IS_TREE_ITEM (item));
if(!GTK_WIDGET_IS_SENSITIVE(item))
if(!gtk_widget_is_sensitive(GTK_WIDGET (item)))
return;
if (GTK_IS_TREE (GTK_WIDGET (item)->parent))

2
gtk/gtktreeview.c
View File

@ -7950,7 +7950,7 @@ gtk_tree_view_focus (GtkWidget *widget,
GtkContainer *container = GTK_CONTAINER (widget);
GtkWidget *focus_child;
if (!GTK_WIDGET_IS_SENSITIVE (container) || !gtk_widget_get_can_focus (widget))
if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_can_focus (widget))
return FALSE;
focus_child = container->focus_child;

30
gtk/gtkwidget.c
View File

@ -4284,7 +4284,9 @@ gtk_widget_real_can_activate_accel (GtkWidget *widget,
guint signal_id)
{
/* widgets must be onscreen for accels to take effect */
return GTK_WIDGET_IS_SENSITIVE (widget) && gtk_widget_is_drawable (widget) && gdk_window_is_viewable (widget->window);
return gtk_widget_is_sensitive (widget) &&
gtk_widget_is_drawable (widget) &&
gdk_window_is_viewable (widget->window);
}
/**
@ -4640,7 +4642,7 @@ gtk_widget_mnemonic_activate (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
group_cycling = group_cycling != FALSE;
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
handled = TRUE;
else
g_signal_emit (widget,
@ -5253,7 +5255,7 @@ gtk_widget_grab_focus (GtkWidget *widget)
{
g_return_if_fail (GTK_IS_WIDGET (widget));
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
return;
g_object_ref (widget);
@ -5780,7 +5782,7 @@ gtk_widget_set_state (GtkWidget *widget,
data.state_restoration = FALSE;
data.use_forall = FALSE;
if (widget->parent)
data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget->parent) != FALSE);
data.parent_sensitive = (gtk_widget_is_sensitive (widget->parent) != FALSE);
else
data.parent_sensitive = TRUE;
@ -6235,7 +6237,7 @@ gtk_widget_set_sensitive (GtkWidget *widget,
data.use_forall = TRUE;
if (widget->parent)
data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget->parent) != FALSE);
data.parent_sensitive = (gtk_widget_is_sensitive (widget->parent) != FALSE);
else
data.parent_sensitive = TRUE;
@ -6284,7 +6286,7 @@ gtk_widget_is_sensitive (GtkWidget *widget)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
return GTK_WIDGET_IS_SENSITIVE (widget);
return gtk_widget_is_sensitive (widget);
}
/**
@ -6330,8 +6332,8 @@ gtk_widget_set_parent (GtkWidget *widget,
else
data.state = GTK_WIDGET_STATE (widget);
data.state_restoration = FALSE;
data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (parent) != FALSE);
data.use_forall = GTK_WIDGET_IS_SENSITIVE (parent) != GTK_WIDGET_IS_SENSITIVE (widget);
data.parent_sensitive = (gtk_widget_is_sensitive (parent) != FALSE);
data.use_forall = gtk_widget_is_sensitive (parent) != gtk_widget_is_sensitive (widget);
gtk_widget_propagate_state (widget, &data);
@ -7646,7 +7648,7 @@ gtk_widget_child_focus (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (!GTK_WIDGET_VISIBLE (widget) ||
!GTK_WIDGET_IS_SENSITIVE (widget))
!gtk_widget_is_sensitive (widget))
return FALSE;
/* child widgets must set CAN_FOCUS, containers
@ -9169,7 +9171,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
else
GTK_WIDGET_UNSET_FLAGS (widget, GTK_PARENT_SENSITIVE);
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
if (data->state_restoration)
GTK_WIDGET_STATE (widget) = widget->saved_state;
@ -9188,7 +9190,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE;
}
if (gtk_widget_is_focus (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_focus (widget) && !gtk_widget_is_sensitive (widget))
{
GtkWidget *window;
@ -9202,14 +9204,14 @@ gtk_widget_propagate_state (GtkWidget *widget,
{
g_object_ref (widget);
if (!GTK_WIDGET_IS_SENSITIVE (widget) && gtk_widget_has_grab (widget))
if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget))
gtk_grab_remove (widget);
g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state);
if (GTK_WIDGET_HAS_POINTER (widget) && !GTK_WIDGET_SHADOWED (widget))
{
if (!GTK_WIDGET_IS_SENSITIVE (widget))
if (!gtk_widget_is_sensitive (widget))
_gtk_widget_synthesize_crossing (widget, NULL,
GDK_CROSSING_STATE_CHANGED);
else if (old_state == GTK_STATE_INSENSITIVE)
@ -9219,7 +9221,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
if (GTK_IS_CONTAINER (widget))
{
data->parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget) != FALSE);
data->parent_sensitive = (gtk_widget_is_sensitive (widget) != FALSE);
if (data->use_forall)
gtk_container_forall (GTK_CONTAINER (widget),
(GtkCallback) gtk_widget_propagate_state,

4
gtk/gtkwidget.h
View File

@ -268,14 +268,18 @@ typedef enum
*/
#define GTK_WIDGET_PARENT_SENSITIVE(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_PARENT_SENSITIVE) != 0)
#ifndef GTK_DISABLE_DEPRECATED
/**
* GTK_WIDGET_IS_SENSITIVE:
* @wid: a #GtkWidget.
*
* Evaluates to %TRUE if the widget is effectively sensitive.
*
* Deprecated: 2.20: Use gtk_widget_is_sensitive() instead.
*/
#define GTK_WIDGET_IS_SENSITIVE(wid) (GTK_WIDGET_SENSITIVE (wid) && \
GTK_WIDGET_PARENT_SENSITIVE (wid))
#endif
#ifndef GTK_DISABLE_DEPRECATED
/**

8
gtk/gtkwindow.c
View File

@ -1968,7 +1968,7 @@ gtk_window_activate_focus (GtkWindow *window)
{
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
if (window->focus_widget && gtk_widget_is_sensitive (window->focus_widget))
return gtk_widget_activate (window->focus_widget);
return FALSE;
@ -2010,10 +2010,10 @@ gtk_window_activate_default (GtkWindow *window)
{
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
if (window->default_widget && gtk_widget_is_sensitive (window->default_widget) &&
(!window->focus_widget || !gtk_widget_get_receives_default (window->focus_widget)))
return gtk_widget_activate (window->default_widget);
else if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
else if (window->focus_widget && gtk_widget_is_sensitive (window->focus_widget))
return gtk_widget_activate (window->focus_widget);
return FALSE;
@ -5173,7 +5173,7 @@ gtk_window_propagate_key_event (GtkWindow *window,
{
GtkWidget *parent;
if (GTK_WIDGET_IS_SENSITIVE (focus))
if (gtk_widget_is_sensitive (focus))
handled = gtk_widget_event (focus, (GdkEvent*) event);
parent = focus->parent;

4
modules/other/gail/gailbutton.c
View File

@ -459,7 +459,7 @@ gail_button_do_action (AtkAction *action,
*/
return FALSE;
if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
if (!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
return FALSE;
button = GAIL_BUTTON (action);
@ -505,7 +505,7 @@ idle_do_action (gpointer data)
g_object_ref (gail_button);
if (widget == NULL /* State is defunct */ ||
!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
{
g_object_unref (gail_button);
return FALSE;

4
modules/other/gail/gailexpander.c
View File

@ -374,7 +374,7 @@ gail_expander_do_action (AtkAction *action,
*/
return FALSE;
if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
if (!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
return FALSE;
expander = GAIL_EXPANDER (action);
@ -404,7 +404,7 @@ idle_do_action (gpointer data)
widget = GTK_ACCESSIBLE (gail_expander)->widget;
if (widget == NULL /* State is defunct */ ||
!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
return FALSE;
gtk_widget_activate (widget);

2
modules/other/gail/gailscalebutton.c
View File

@ -115,7 +115,7 @@ gail_scale_button_do_action(AtkAction *action,
if (widget == NULL)
return FALSE;
if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
if (!gtk_widget_is_sensitive (widget) || !GTK_WIDGET_VISIBLE (widget))
return FALSE;
switch (i) {

2
modules/other/gail/gailwidget.c
View File

@ -482,7 +482,7 @@ gail_widget_ref_state_set (AtkObject *accessible)
}
else
{
if (GTK_WIDGET_IS_SENSITIVE (widget))
if (gtk_widget_is_sensitive (widget))
{
atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
atk_state_set_add_state (state_set, ATK_STATE_ENABLED);

2
tests/testgtk.c
View File

@ -2896,7 +2896,7 @@ create_sensitivity_control (GtkWidget *widget)
button = gtk_toggle_button_new_with_label ("Sensitive");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
GTK_WIDGET_IS_SENSITIVE (widget));
gtk_widget_is_sensitive (widget));
g_signal_connect (button,
"toggled",