diff --git a/configure.in.in b/configure.in.in index e465abb..943a580 100644 --- a/configure.in.in +++ b/configure.in.in @@ -154,7 +154,7 @@ dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) diff --git a/exo-desktop-item-edit/exo-die-command-entry.c b/exo-desktop-item-edit/exo-die-command-entry.c index 85893b2..9ed061a 100644 --- a/exo-desktop-item-edit/exo-die-command-entry.c +++ b/exo-desktop-item-edit/exo-die-command-entry.c @@ -248,7 +248,7 @@ exo_die_command_entry_button_clicked (GtkWidget *button, /* determine the toplevel window */ toplevel = gtk_widget_get_toplevel (button); - if (toplevel == NULL || !GTK_WIDGET_TOPLEVEL (toplevel)) + if (toplevel == NULL || !gtk_widget_is_toplevel (toplevel)) return; /* allocate the file chooser */ diff --git a/exo-desktop-item-edit/exo-die-editor.c b/exo-desktop-item-edit/exo-die-editor.c index 813aa95..2745ab9 100644 --- a/exo-desktop-item-edit/exo-die-editor.c +++ b/exo-desktop-item-edit/exo-die-editor.c @@ -583,7 +583,7 @@ exo_die_editor_icon_clicked (GtkWidget *button, /* determine the toplevel widget */ toplevel = gtk_widget_get_toplevel (button); - if (toplevel == NULL || !GTK_WIDGET_TOPLEVEL (toplevel)) + if (toplevel == NULL || !gtk_widget_is_toplevel (toplevel)) return; /* allocate the icon chooser dialog */ @@ -630,7 +630,7 @@ exo_die_editor_path_clicked (GtkWidget *button, /* determine the toplevel widget */ toplevel = gtk_widget_get_toplevel (button); - if (toplevel == NULL || !GTK_WIDGET_TOPLEVEL (toplevel)) + if (toplevel == NULL || !gtk_widget_is_toplevel (toplevel)) return; /* allocate the file chooser dialog */ diff --git a/exo-desktop-item-edit/main.c b/exo-desktop-item-edit/main.c index 602c19d..39d462d 100644 --- a/exo-desktop-item-edit/main.c +++ b/exo-desktop-item-edit/main.c @@ -312,7 +312,7 @@ main (int argc, char **argv) /* add the "Create"/"Save" button (as default) */ button = gtk_button_new_from_stock (opt_create_new ? _("C_reate") : GTK_STOCK_SAVE); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_ACCEPT); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); gtk_widget_show (button); diff --git a/exo-helper/exo-helper-chooser-dialog.c b/exo-helper/exo-helper-chooser-dialog.c index 302bef0..5084462 100644 --- a/exo-helper/exo-helper-chooser-dialog.c +++ b/exo-helper/exo-helper-chooser-dialog.c @@ -97,6 +97,7 @@ exo_helper_chooser_dialog_init (ExoHelperChooserDialog *chooser_dialog) g_assert (EXO_HELPER_N_CATEGORIES == 4); gtk_dialog_add_button (GTK_DIALOG (chooser_dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); + /* deprecated in 2.22, defaults to FALSE */ gtk_dialog_set_has_separator (GTK_DIALOG (chooser_dialog), FALSE); gtk_window_set_icon_name (GTK_WINDOW (chooser_dialog), "preferences-desktop-default-applications"); gtk_window_set_title (GTK_WINDOW (chooser_dialog), _("Preferred Applications")); diff --git a/exo-helper/exo-helper-chooser.c b/exo-helper/exo-helper-chooser.c index 344e8ca..fc71220 100644 --- a/exo-helper/exo-helper-chooser.c +++ b/exo-helper/exo-helper-chooser.c @@ -69,7 +69,6 @@ struct _ExoHelperChooser GtkWidget *image; GtkWidget *label; - GtkTooltips *tooltips; ExoHelperDatabase *database; ExoHelperCategory category; @@ -139,14 +138,11 @@ exo_helper_chooser_init (ExoHelperChooser *chooser) chooser->database = exo_helper_database_get (); - chooser->tooltips = gtk_tooltips_new (); - g_object_ref_sink (G_OBJECT (chooser->tooltips)); - gtk_widget_push_composite_child (); button = gtk_button_new (); g_signal_connect_swapped (G_OBJECT (button), "pressed", G_CALLBACK (exo_helper_chooser_pressed), chooser); - gtk_tooltips_set_tip (chooser->tooltips, button, _("Press left mouse button to change the selected application."), NULL); + gtk_widget_set_tooltip_text(button, _("Press left mouse button to change the selected application.")); gtk_container_add (GTK_CONTAINER (chooser), button); gtk_widget_show (button); @@ -193,7 +189,6 @@ exo_helper_chooser_finalize (GObject *object) ExoHelperChooser *chooser = EXO_HELPER_CHOOSER (object); g_object_unref (G_OBJECT (chooser->database)); - g_object_unref (G_OBJECT (chooser->tooltips)); (*G_OBJECT_CLASS (exo_helper_chooser_parent_class)->finalize) (object); } @@ -381,7 +376,7 @@ browse_clicked (GtkWidget *button, /* determine the toplevel window */ toplevel = gtk_widget_get_toplevel (entry); - if (toplevel == NULL || !GTK_WIDGET_TOPLEVEL (toplevel)) + if (toplevel == NULL || !gtk_widget_is_toplevel (toplevel)) return; /* allocate the chooser */ @@ -576,7 +571,7 @@ menu_activate_other (GtkWidget *item, gtk_widget_show (entry); button = gtk_button_new (); - gtk_tooltips_set_tip (chooser->tooltips, button, _("Browse the file system to choose a custom command."), NULL); + gtk_widget_set_tooltip_text(button, _("Browse the file system to choose a custom command.")); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (browse_clicked), entry); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_widget_show (button); @@ -760,7 +755,7 @@ exo_helper_chooser_pressed (ExoHelperChooser *chooser, } item = gtk_menu_item_new_with_mnemonic (_("_Other...")); - gtk_tooltips_set_tip (chooser->tooltips, item, _("Use a custom application which is not included in the above list."), NULL); + gtk_widget_set_tooltip_text(item, _("Use a custom application which is not included in the above list.")); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (menu_activate_other), chooser); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); @@ -784,7 +779,9 @@ exo_helper_chooser_pressed (ExoHelperChooser *chooser, gtk_grab_remove (menu); g_main_loop_unref (loop); - gtk_button_released (GTK_BUTTON (button)); + // deprecated signal: use button-release-event instead + g_signal_emit_by_name (button, "released"); + g_signal_emit_by_name (button, "button-release-event"); g_object_unref (G_OBJECT (menu)); } diff --git a/exo-helper/exo-helper-launcher-dialog.c b/exo-helper/exo-helper-launcher-dialog.c index a169abd..7381df1 100644 --- a/exo-helper/exo-helper-launcher-dialog.c +++ b/exo-helper/exo-helper-launcher-dialog.c @@ -108,6 +108,7 @@ exo_helper_launcher_dialog_init (ExoHelperLauncherDialog *launcher_dialog) gtk_dialog_add_button (GTK_DIALOG (launcher_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (launcher_dialog), GTK_STOCK_OK, GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (launcher_dialog), GTK_RESPONSE_OK); + /* deprecated in 2.22, defaults to FALSE */ gtk_dialog_set_has_separator (GTK_DIALOG (launcher_dialog), FALSE); gtk_window_set_resizable (GTK_WINDOW (launcher_dialog), FALSE); gtk_window_set_title (GTK_WINDOW (launcher_dialog), _("Choose Preferred Application")); diff --git a/exo/exo-cell-renderer-ellipsized-text.c b/exo/exo-cell-renderer-ellipsized-text.c index e3b408d..5d5ad2f 100644 --- a/exo/exo-cell-renderer-ellipsized-text.c +++ b/exo/exo-cell-renderer-ellipsized-text.c @@ -275,19 +275,19 @@ exo_cell_renderer_ellipsized_text_render (GtkCellRenderer *renderer, /* determine the widget state */ if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED) { - if (GTK_WIDGET_HAS_FOCUS (widget)) + if (gtk_widget_has_focus (widget)) state = GTK_STATE_SELECTED; else state = GTK_STATE_ACTIVE; } else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT - && GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT) + && gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT) { state = GTK_STATE_PRELIGHT; } else { - if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) + if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE) state = GTK_STATE_INSENSITIVE; else state = GTK_STATE_NORMAL; @@ -341,7 +341,7 @@ exo_cell_renderer_ellipsized_text_render (GtkCellRenderer *renderer, /* draw the focus indicator */ if ((flags & GTK_CELL_RENDERER_FOCUSED) != 0) { - gtk_paint_focus (widget->style, window, GTK_WIDGET_STATE (widget), NULL, widget, "icon_view", x0, y0, text_width, text_height); + gtk_paint_focus (widget->style, window, gtk_widget_get_state (widget), NULL, widget, "icon_view", x0, y0, text_width, text_height); flags &= ~GTK_CELL_RENDERER_FOCUSED; } } diff --git a/exo/exo-cell-renderer-icon.c b/exo/exo-cell-renderer-icon.c index 5202177..2863030 100644 --- a/exo/exo-cell-renderer-icon.c +++ b/exo/exo-cell-renderer-icon.c @@ -501,7 +501,7 @@ exo_cell_renderer_icon_render (GtkCellRenderer *renderer, { if ((flags & GTK_CELL_RENDERER_SELECTED) != 0) { - state = GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; + state = gtk_widget_has_focus (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; temp = exo_gdk_pixbuf_colorize (icon, &widget->style->base[state]); g_object_unref (G_OBJECT (icon)); icon = temp; @@ -516,7 +516,7 @@ exo_cell_renderer_icon_render (GtkCellRenderer *renderer, } /* check if we should render an insensitive icon */ - if (G_UNLIKELY (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE || !renderer->sensitive)) + if (G_UNLIKELY (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE || !renderer->sensitive)) { /* allocate an icon source */ icon_source = gtk_icon_source_new (); diff --git a/exo/exo-icon-bar.c b/exo/exo-icon-bar.c index ee46425..6092d09 100644 --- a/exo/exo-icon-bar.c +++ b/exo/exo-icon-bar.c @@ -434,7 +434,7 @@ exo_icon_bar_init (ExoIconBar *icon_bar) icon_bar->priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (icon_bar), NULL); pango_layout_set_width (icon_bar->priv->layout, -1); - GTK_WIDGET_UNSET_FLAGS (icon_bar, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (GTK_WIDGET (icon_bar), FALSE); exo_icon_bar_set_adjustments (icon_bar, NULL, NULL); } @@ -549,7 +549,7 @@ exo_icon_bar_style_set (GtkWidget *widget, (*GTK_WIDGET_CLASS (exo_icon_bar_parent_class)->style_set) (widget, previous_style); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) { gdk_window_set_background (icon_bar->priv->bin_window, &widget->style->base[widget->state]); @@ -565,7 +565,7 @@ exo_icon_bar_realize (GtkWidget *widget) ExoIconBar *icon_bar = EXO_ICON_BAR (widget); gint attributes_mask; - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + gtk_widget_set_realized (widget, TRUE); attributes.window_type = GDK_WINDOW_CHILD; attributes.x = widget->allocation.x; @@ -680,7 +680,7 @@ exo_icon_bar_size_allocate (GtkWidget *widget, widget->allocation = *allocation; - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) { gdk_window_move_resize (widget->window, allocation->x, @@ -810,7 +810,7 @@ exo_icon_bar_button_press (GtkWidget *widget, ExoIconBarItem *item; ExoIconBar *icon_bar = EXO_ICON_BAR (widget); - if (!GTK_WIDGET_HAS_FOCUS (widget)) + if (!gtk_widget_has_focus (widget)) gtk_widget_grab_focus (widget); if (event->button == 1 && event->type == GDK_BUTTON_PRESS) @@ -860,7 +860,7 @@ exo_icon_bar_set_adjustments (ExoIconBar *icon_bar, { icon_bar->priv->hadjustment = hadj; g_object_ref (icon_bar->priv->hadjustment); - gtk_object_sink (GTK_OBJECT (icon_bar->priv->hadjustment)); + g_object_ref_sink (icon_bar->priv->hadjustment); g_signal_connect (icon_bar->priv->hadjustment, "value_changed", G_CALLBACK (exo_icon_bar_adjustment_changed), icon_bar); @@ -871,7 +871,7 @@ exo_icon_bar_set_adjustments (ExoIconBar *icon_bar, { icon_bar->priv->vadjustment = vadj; g_object_ref (icon_bar->priv->vadjustment); - gtk_object_sink (GTK_OBJECT (icon_bar->priv->vadjustment)); + g_object_ref_sink (icon_bar->priv->vadjustment); g_signal_connect (icon_bar->priv->vadjustment, "value_changed", G_CALLBACK (exo_icon_bar_adjustment_changed), icon_bar); @@ -888,7 +888,7 @@ static void exo_icon_bar_adjustment_changed (GtkAdjustment *adjustment, ExoIconBar *icon_bar) { - if (GTK_WIDGET_REALIZED (icon_bar)) + if (gtk_widget_get_realized (GTK_WIDGET (icon_bar))) { gdk_window_move (icon_bar->priv->bin_window, - icon_bar->priv->hadjustment->value, @@ -935,7 +935,7 @@ exo_icon_bar_queue_draw_item (ExoIconBar *icon_bar, { GdkRectangle area; - if (GTK_WIDGET_REALIZED (icon_bar)) + if (gtk_widget_get_realized (GTK_WIDGET (icon_bar))) { if (icon_bar->priv->orientation == GTK_ORIENTATION_VERTICAL) { diff --git a/exo/exo-icon-chooser-dialog.c b/exo/exo-icon-chooser-dialog.c index ba2c6eb..4c277e5 100644 --- a/exo/exo-icon-chooser-dialog.c +++ b/exo/exo-icon-chooser-dialog.c @@ -212,9 +212,9 @@ exo_icon_chooser_dialog_init (ExoIconChooserDialog *icon_chooser_dialog) gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); - priv->combo = gtk_combo_box_new_text (); + priv->combo = gtk_combo_box_text_new (); for (context = 0; context < G_N_ELEMENTS (CONTEXT_TITLES); ++context) - gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _(CONTEXT_TITLES[context])); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _(CONTEXT_TITLES[context])); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (priv->combo), exo_icon_chooser_dialog_separator_func, icon_chooser_dialog, NULL); g_signal_connect (G_OBJECT (priv->combo), "changed", G_CALLBACK (exo_icon_chooser_dialog_combo_changed), icon_chooser_dialog); gtk_table_attach (GTK_TABLE (table), priv->combo, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); @@ -344,7 +344,7 @@ exo_icon_chooser_dialog_close (GtkDialog *dialog) GdkEvent *event; /* verify that the dialog is realized */ - if (G_LIKELY (GTK_WIDGET_REALIZED (dialog))) + if (G_LIKELY (gtk_widget_get_realized (GTK_WIDGET (dialog)))) { /* send a delete event to the dialog */ event = gdk_event_new (GDK_DELETE); diff --git a/exo/exo-icon-chooser-model.c b/exo/exo-icon-chooser-model.c index 7b70bf8..ff166ea 100644 --- a/exo/exo-icon-chooser-model.c +++ b/exo/exo-icon-chooser-model.c @@ -575,7 +575,7 @@ static gint exo_icon_chooser_model_item_compare (gconstpointer item_a, gconstpointer item_b) { - return g_strcasecmp (((const ExoIconChooserModelItem *) item_a)->icon_name, + return g_ascii_strcasecmp (((const ExoIconChooserModelItem *) item_a)->icon_name, ((const ExoIconChooserModelItem *) item_b)->icon_name); } diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c index 18bedad..bbc8603 100644 --- a/exo/exo-icon-view.c +++ b/exo/exo-icon-view.c @@ -1146,7 +1146,7 @@ exo_icon_view_init (ExoIconView *icon_view) icon_view->priv->text_cell = -1; icon_view->priv->pixbuf_cell = -1; - GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (GTK_WIDGET (icon_view), TRUE); exo_icon_view_set_adjustments (icon_view, NULL, NULL); @@ -1411,7 +1411,7 @@ exo_icon_view_realize (GtkWidget *widget) GdkWindowAttr attributes; gint attributes_mask; - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + gtk_widget_set_realized (widget, TRUE); /* Allocate the clipping window */ attributes.window_type = GDK_WINDOW_CHILD; @@ -1488,7 +1488,7 @@ exo_icon_view_size_request (GtkWidget *widget, for (lp = priv->children; lp != NULL; lp = lp->next) { child = lp->data; - if (GTK_WIDGET_VISIBLE (child->widget)) + if (gtk_widget_get_visible (child->widget)) gtk_widget_size_request (child->widget, &child_requisition); } } @@ -1543,7 +1543,7 @@ exo_icon_view_size_allocate (GtkWidget *widget, /* move/resize the clipping window, the icons window * will be handled by exo_icon_view_layout(). */ - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) gdk_window_move_resize (widget->window, allocation->x, allocation->y, allocation->width, allocation->height); /* layout the items */ @@ -1589,7 +1589,7 @@ exo_icon_view_style_set (GtkWidget *widget, (*GTK_WIDGET_CLASS (exo_icon_view_parent_class)->style_set) (widget, previous_style); /* apply the new style for the bin_window if we're realized */ - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]); } @@ -1708,7 +1708,7 @@ exo_icon_view_expose_event (GtkWidget *widget, { case EXO_ICON_VIEW_DROP_INTO: gtk_paint_focus (widget->style, priv->bin_window, - GTK_WIDGET_STATE (widget), NULL, widget, + gtk_widget_get_state (widget), NULL, widget, "iconview-drop-indicator", dest_item->area.x, dest_item->area.y, dest_item->area.width, dest_item->area.height); @@ -1716,7 +1716,7 @@ exo_icon_view_expose_event (GtkWidget *widget, case EXO_ICON_VIEW_DROP_ABOVE: gtk_paint_focus (widget->style, priv->bin_window, - GTK_WIDGET_STATE (widget), NULL, widget, + gtk_widget_get_state (widget), NULL, widget, "iconview-drop-indicator", dest_item->area.x, dest_item->area.y - 1, dest_item->area.width, 2); @@ -1724,7 +1724,7 @@ exo_icon_view_expose_event (GtkWidget *widget, case EXO_ICON_VIEW_DROP_LEFT: gtk_paint_focus (widget->style, priv->bin_window, - GTK_WIDGET_STATE (widget), NULL, widget, + gtk_widget_get_state (widget), NULL, widget, "iconview-drop-indicator", dest_item->area.x - 1, dest_item->area.y, 2, dest_item->area.height); @@ -1732,7 +1732,7 @@ exo_icon_view_expose_event (GtkWidget *widget, case EXO_ICON_VIEW_DROP_BELOW: gtk_paint_focus (widget->style, priv->bin_window, - GTK_WIDGET_STATE (widget), NULL, widget, + gtk_widget_get_state (widget), NULL, widget, "iconview-drop-indicator", dest_item->area.x, dest_item->area.y + dest_item->area.height - 1, dest_item->area.width, 2); @@ -1740,7 +1740,7 @@ exo_icon_view_expose_event (GtkWidget *widget, case EXO_ICON_VIEW_DROP_RIGHT: gtk_paint_focus (widget->style, priv->bin_window, - GTK_WIDGET_STATE (widget), NULL, widget, + gtk_widget_get_state (widget), NULL, widget, "iconview-drop-indicator", dest_item->area.x + dest_item->area.width - 1, dest_item->area.y, 2, dest_item->area.height); @@ -1991,7 +1991,7 @@ exo_icon_view_put (ExoIconView *icon_view, icon_view->priv->children = g_list_append (icon_view->priv->children, child); /* setup the parent for the child */ - if (GTK_WIDGET_REALIZED (icon_view)) + if (gtk_widget_get_realized (GTK_WIDGET (icon_view))) gtk_widget_set_parent_window (child->widget, icon_view->priv->bin_window); gtk_widget_set_parent (widget, GTK_WIDGET (icon_view)); } @@ -2014,7 +2014,7 @@ exo_icon_view_remove_widget (GtkCellEditable *editable, for (lp = icon_view->priv->cell_list; lp != NULL; lp = lp->next) ((ExoIconViewCellInfo *) lp->data)->editing = FALSE; - if (GTK_WIDGET_HAS_FOCUS (editable)) + if (gtk_widget_has_focus (GTK_WIDGET (editable))) gtk_widget_grab_focus (GTK_WIDGET (icon_view)); g_signal_handlers_disconnect_by_func (editable, exo_icon_view_remove_widget, icon_view); @@ -2150,7 +2150,7 @@ exo_icon_view_button_press_event (GtkWidget *widget, if (G_UNLIKELY (icon_view->priv->single_click_timeout_id != 0)) g_source_remove (icon_view->priv->single_click_timeout_id); - if (G_UNLIKELY (!GTK_WIDGET_HAS_FOCUS (widget))) + if (G_UNLIKELY (!gtk_widget_has_focus (widget))) gtk_widget_grab_focus (widget); if (event->button == 1 && event->type == GDK_BUTTON_PRESS) @@ -2275,7 +2275,7 @@ exo_icon_view_button_press_event (GtkWidget *widget, /* grab focus and stop drawing the keyboard focus indicator on single clicks */ if (G_LIKELY (event->type != GDK_2BUTTON_PRESS && event->type != GDK_3BUTTON_PRESS)) { - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) gtk_widget_grab_focus (GTK_WIDGET (icon_view)); EXO_ICON_VIEW_UNSET_FLAG (icon_view, EXO_ICON_VIEW_DRAW_KEYFOCUS); } @@ -2480,7 +2480,7 @@ exo_icon_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) { /* reset cursor to default */ - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) gdk_window_set_cursor (widget->window, NULL); /* call the parent's leave_notify_event (if any) */ @@ -2786,7 +2786,7 @@ exo_icon_view_set_adjustments (ExoIconView *icon_view, { icon_view->priv->hadjustment = hadj; g_object_ref (icon_view->priv->hadjustment); - gtk_object_sink (GTK_OBJECT (icon_view->priv->hadjustment)); + g_object_ref_sink (icon_view->priv->hadjustment); g_signal_connect (icon_view->priv->hadjustment, "value-changed", G_CALLBACK (exo_icon_view_adjustment_changed), @@ -2798,7 +2798,7 @@ exo_icon_view_set_adjustments (ExoIconView *icon_view, { icon_view->priv->vadjustment = vadj; g_object_ref (icon_view->priv->vadjustment); - gtk_object_sink (GTK_OBJECT (icon_view->priv->vadjustment)); + g_object_ref_sink (icon_view->priv->vadjustment); g_signal_connect (icon_view->priv->vadjustment, "value-changed", G_CALLBACK (exo_icon_view_adjustment_changed), @@ -2928,7 +2928,7 @@ static void exo_icon_view_adjustment_changed (GtkAdjustment *adjustment, ExoIconView *icon_view) { - if (GTK_WIDGET_REALIZED (icon_view)) + if (gtk_widget_get_realized (GTK_WIDGET (icon_view))) { gdk_window_move (icon_view->priv->bin_window, -icon_view->priv->hadjustment->value, -icon_view->priv->vadjustment->value); @@ -3319,7 +3319,7 @@ exo_icon_view_layout (ExoIconView *icon_view) exo_icon_view_set_adjustment_upper (priv->hadjustment, priv->width); exo_icon_view_set_adjustment_upper (priv->vadjustment, priv->height); - if (GTK_WIDGET_REALIZED (icon_view)) + if (gtk_widget_get_realized (GTK_WIDGET (icon_view))) { gdk_window_resize (priv->bin_window, MAX (priv->width, GTK_WIDGET (icon_view)->allocation.width), @@ -3555,7 +3555,7 @@ exo_icon_view_paint_item (ExoIconView *icon_view, if (item->selected) { flags = GTK_CELL_RENDERER_SELECTED; - state = GTK_WIDGET_HAS_FOCUS (icon_view) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; + state = gtk_widget_has_focus (GTK_WIDGET (icon_view)) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; /* FIXME We hardwire background drawing behind text cell renderers * here. This is ugly, but it's done to be consistent with GtkIconView. @@ -3914,7 +3914,7 @@ exo_icon_view_row_deleted (GtkTreeModel *model, g_source_remove (icon_view->priv->single_click_timeout_id); /* in single click mode, we also reset the cursor when realized */ - if (G_UNLIKELY (icon_view->priv->single_click && GTK_WIDGET_REALIZED (icon_view))) + if (G_UNLIKELY (icon_view->priv->single_click && gtk_widget_get_realized (GTK_WIDGET (icon_view)))) gdk_window_set_cursor (icon_view->priv->bin_window, NULL); } @@ -4031,7 +4031,7 @@ exo_icon_view_real_move_cursor (ExoIconView *icon_view, step == GTK_MOVEMENT_PAGES || step == GTK_MOVEMENT_BUFFER_ENDS, FALSE); - if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (icon_view))) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) return FALSE; exo_icon_view_stop_editing (icon_view, FALSE); @@ -4251,7 +4251,7 @@ exo_icon_view_move_cursor_up_down (ExoIconView *icon_view, gint cell = -1; gint step; - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) return; if (!icon_view->priv->cursor_item) @@ -4344,7 +4344,7 @@ exo_icon_view_move_cursor_page_up_down (ExoIconView *icon_view, ExoIconViewItem *item; gboolean dirty = FALSE; - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) return; if (!icon_view->priv->cursor_item) @@ -4401,7 +4401,7 @@ exo_icon_view_move_cursor_left_right (ExoIconView *icon_view, gint cell = -1; gint step; - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) return; if (!icon_view->priv->cursor_item) @@ -4499,7 +4499,7 @@ exo_icon_view_move_cursor_start_end (ExoIconView *icon_view, gboolean dirty = FALSE; GList *lp; - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) return; lp = (count < 0) ? icon_view->priv->items : g_list_last (icon_view->priv->items); @@ -4672,7 +4672,7 @@ exo_icon_view_cell_layout_pack_start (GtkCellLayout *layout, _exo_return_if_fail (exo_icon_view_get_cell_info (icon_view, renderer) == NULL); g_object_ref (renderer); - gtk_object_sink (GTK_OBJECT (renderer)); + g_object_ref_sink (renderer); info = g_slice_new0 (ExoIconViewCellInfo); info->cell = renderer; @@ -4701,7 +4701,7 @@ exo_icon_view_cell_layout_pack_end (GtkCellLayout *layout, _exo_return_if_fail (exo_icon_view_get_cell_info (icon_view, renderer) == NULL); g_object_ref (renderer); - gtk_object_sink (GTK_OBJECT (renderer)); + g_object_ref_sink (renderer); info = g_slice_new0 (ExoIconViewCellInfo); info->cell = renderer; @@ -5280,7 +5280,7 @@ exo_icon_view_set_model (ExoIconView *icon_view, g_source_remove (icon_view->priv->single_click_timeout_id); /* reset cursor when in single click mode and realized */ - if (G_UNLIKELY (icon_view->priv->single_click && GTK_WIDGET_REALIZED (icon_view))) + if (G_UNLIKELY (icon_view->priv->single_click && gtk_widget_get_realized (GTK_WIDGET (icon_view)))) gdk_window_set_cursor (icon_view->priv->bin_window, NULL); } @@ -5351,7 +5351,7 @@ exo_icon_view_set_model (ExoIconView *icon_view, /* notify listeners */ g_object_notify (G_OBJECT (icon_view), "model"); - if (GTK_WIDGET_REALIZED (icon_view)) + if (gtk_widget_get_realized (GTK_WIDGET (icon_view))) gtk_widget_queue_resize (GTK_WIDGET (icon_view)); } @@ -5797,7 +5797,7 @@ exo_icon_view_scroll_to_path (ExoIconView *icon_view, g_return_if_fail (col_align >= 0.0 && col_align <= 1.0); /* Delay scrolling if either not realized or pending layout() */ - if (!GTK_WIDGET_REALIZED (icon_view) || icon_view->priv->layout_idle_id != 0) + if (!gtk_widget_get_realized (GTK_WIDGET (icon_view)) || icon_view->priv->layout_idle_id != 0) { /* release the previous scroll_to_path reference */ if (G_UNLIKELY (icon_view->priv->scroll_to_path != NULL)) @@ -7308,7 +7308,7 @@ exo_icon_view_create_drag_icon (ExoIconView *icon_view, g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, NULL); /* verify that the widget is realized */ - if (G_UNLIKELY (!GTK_WIDGET_REALIZED (icon_view))) + if (G_UNLIKELY (!gtk_widget_get_realized (GTK_WIDGET (icon_view)))) return NULL; idx = gtk_tree_path_get_indices (path)[0]; @@ -7324,7 +7324,7 @@ exo_icon_view_create_drag_icon (ExoIconView *icon_view, -1); gc = gdk_gc_new (drawable); - gdk_gc_set_rgb_fg_color (gc, &widget->style->base[GTK_WIDGET_STATE (widget)]); + gdk_gc_set_rgb_fg_color (gc, &widget->style->base[gtk_widget_get_state (widget)]); gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, item->area.width + 2, item->area.height + 2); area.x = 0; @@ -7546,7 +7546,7 @@ exo_icon_view_single_click_timeout (gpointer user_data) GDK_THREADS_ENTER (); /* verify that we are in single-click mode, have focus and a prelit item */ - if (GTK_WIDGET_HAS_FOCUS (icon_view) && icon_view->priv->single_click && icon_view->priv->prelit_item != NULL) + if (gtk_widget_has_focus (GTK_WIDGET (icon_view)) && icon_view->priv->single_click && icon_view->priv->prelit_item != NULL) { /* work on the prelit item */ item = icon_view->priv->prelit_item; @@ -8127,14 +8127,14 @@ exo_icon_view_search_start (ExoIconView *icon_view, return FALSE; /* check if we already display the search window */ - if (icon_view->priv->search_window != NULL && GTK_WIDGET_VISIBLE (icon_view->priv->search_window)) + if (icon_view->priv->search_window != NULL && gtk_widget_get_visible (icon_view->priv->search_window)) return TRUE; /* we only start interactive search if we have focus, * we don't want to start interactive search if one of * our children has the focus. */ - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) + if (!gtk_widget_has_focus (GTK_WIDGET (icon_view))) return FALSE; /* verify that we have a search column */ diff --git a/exo/exo-private.c b/exo/exo-private.c index c0fbce8..89c9173 100644 --- a/exo/exo-private.c +++ b/exo/exo-private.c @@ -63,8 +63,8 @@ _exo_gtk_widget_send_focus_change (GtkWidget *widget, g_object_ref (G_OBJECT (widget)); if (in) - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - else + gtk_widget_grab_focus (widget); + else // deprecated in 2.22, no replacement GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); fevent = gdk_event_new (GDK_FOCUS_CHANGE); diff --git a/exo/exo-thumbnail-preview.c b/exo/exo-thumbnail-preview.c index ea1a749..fc95655 100644 --- a/exo/exo-thumbnail-preview.c +++ b/exo/exo-thumbnail-preview.c @@ -148,7 +148,7 @@ exo_thumbnail_preview_style_set (GtkWidget *ebox, _exo_return_if_fail (GTK_IS_EVENT_BOX (ebox)); /* check if the ebox is already realized */ - if (GTK_WIDGET_REALIZED (ebox)) + if (gtk_widget_get_realized (ebox)) { /* set background color (using the base color) */ g_signal_handlers_block_by_func (G_OBJECT (ebox), exo_thumbnail_preview_style_set, thumbnail_preview); diff --git a/exo/exo-toolbars-editor-dialog.c b/exo/exo-toolbars-editor-dialog.c index c771d64..3f3252b 100644 --- a/exo/exo-toolbars-editor-dialog.c +++ b/exo/exo-toolbars-editor-dialog.c @@ -90,6 +90,7 @@ exo_toolbars_editor_dialog_init (ExoToolbarsEditorDialog *dialog) dialog->priv = EXO_TOOLBARS_EDITOR_DIALOG_GET_PRIVATE (dialog); + /* deprecated in 2.22, defaults to FALSE */ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 300); diff --git a/exo/exo-toolbars-view.c b/exo/exo-toolbars-view.c index 2617117..32a32bc 100644 --- a/exo/exo-toolbars-view.c +++ b/exo/exo-toolbars-view.c @@ -663,7 +663,7 @@ exo_toolbars_view_drag_data_received (GtkWidget *toolbar, data_is_separator (id), NULL); g_object_ref (G_OBJECT (view->priv->dragged_item)); - gtk_object_sink (GTK_OBJECT (view->priv->dragged_item)); + g_object_ref_sink (G_OBJECT (view->priv->dragged_item)); } else { diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c index 159f5b1..a748cb9 100644 --- a/exo/exo-tree-view.c +++ b/exo/exo-tree-view.c @@ -575,7 +575,7 @@ exo_tree_view_leave_notify_event (GtkWidget *widget, } /* reset the cursor for the tree view internal window */ - if (GTK_WIDGET_REALIZED (tree_view)) + if (gtk_widget_get_realized (GTK_WIDGET (tree_view))) gdk_window_set_cursor (gtk_tree_view_get_bin_window (GTK_TREE_VIEW (tree_view)), NULL); /* the next button-release-event should not activate */ @@ -621,7 +621,7 @@ exo_tree_view_move_cursor (GtkTreeView *view, } /* reset the cursor for the tree view internal window */ - if (GTK_WIDGET_REALIZED (tree_view)) + if (gtk_widget_get_realized (GTK_WIDGET (tree_view))) gdk_window_set_cursor (gtk_tree_view_get_bin_window (GTK_TREE_VIEW (tree_view)), NULL); /* call the parent's handler */ @@ -646,7 +646,7 @@ exo_tree_view_single_click_timeout (gpointer user_data) GDK_THREADS_ENTER (); /* verify that we are in single-click mode, have focus and a hover path */ - if (GTK_WIDGET_HAS_FOCUS (tree_view) && tree_view->priv->single_click && tree_view->priv->hover_path != NULL) + if (gtk_widget_has_focus (GTK_WIDGET (tree_view)) && tree_view->priv->single_click && tree_view->priv->hover_path != NULL) { /* transform the hover_path to a tree iterator */ model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view)); diff --git a/exo/exo-wrap-table.c b/exo/exo-wrap-table.c index d511900..873bd5d 100644 --- a/exo/exo-wrap-table.c +++ b/exo/exo-wrap-table.c @@ -190,7 +190,7 @@ exo_wrap_table_init (ExoWrapTable *table) table->priv = EXO_WRAP_TABLE_GET_PRIVATE (table); /* we don't provide our own window */ - GTK_WIDGET_SET_FLAGS (table, GTK_NO_WINDOW); + gtk_widget_set_has_window (GTK_WIDGET (table), FALSE); } @@ -323,13 +323,13 @@ exo_wrap_table_add (GtkContainer *container, table->priv->children = g_list_append (table->priv->children, widget); /* realize the widget if required */ - if (GTK_WIDGET_REALIZED (container)) + if (gtk_widget_get_realized (GTK_WIDGET (container))) gtk_widget_realize (widget); /* map the widget if required */ - if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (widget)) + if (gtk_widget_get_visible (GTK_WIDGET (container)) && gtk_widget_get_visible (GTK_WIDGET (widget))) { - if (GTK_WIDGET_MAPPED (container)) + if (gtk_widget_get_mapped (GTK_WIDGET (container))) gtk_widget_map (widget); } @@ -347,7 +347,7 @@ exo_wrap_table_remove (GtkContainer *container, gboolean widget_was_visible; /* check if the widget was visible */ - widget_was_visible = GTK_WIDGET_VISIBLE (widget); + widget_was_visible = gtk_widget_get_visible (widget); /* unparent and remove the widget */ gtk_widget_unparent (widget); @@ -429,7 +429,7 @@ exo_wrap_table_layout (ExoWrapTable *table) { /* allocate space only for visible children */ child = GTK_WIDGET (lp->data); - if (G_UNLIKELY (!GTK_WIDGET_VISIBLE (child))) + if (G_UNLIKELY (!gtk_widget_get_visible (child))) continue; /* initialize the child position */ @@ -500,7 +500,7 @@ exo_wrap_table_get_max_child_size (const ExoWrapTable *table, for (lp = table->priv->children; lp != NULL; lp = lp->next) { child = GTK_WIDGET (lp->data); - if (GTK_WIDGET_VISIBLE (child)) + if (gtk_widget_get_visible (child)) { gtk_widget_size_request (child, &child_requisition); if (child_requisition.width > max_width)