diff options
Diffstat (limited to 'widgets/table')
| -rw-r--r-- | widgets/table/e-cell-combo.c | 8 | ||||
| -rw-r--r-- | widgets/table/e-table-field-chooser.c | 6 | ||||
| -rw-r--r-- | widgets/table/e-table.c | 2 | ||||
| -rw-r--r-- | widgets/table/e-tree.c | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 47e1a87eac..186ae4dfed 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -146,12 +146,8 @@ e_cell_combo_init (ECellCombo *ecc) gtk_scrolled_window_set_policy (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - GTK_WIDGET_UNSET_FLAGS ( - gtk_scrolled_window_get_hscrollbar (scrolled_window), - GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS ( - gtk_scrolled_window_get_vscrollbar (scrolled_window), - GTK_CAN_FOCUS); + gtk_widget_set_can_focus (gtk_scrolled_window_get_hscrollbar (scrolled_window), FALSE); + gtk_widget_set_can_focus (gtk_scrolled_window_get_vscrollbar (scrolled_window), FALSE); gtk_container_add (GTK_CONTAINER (frame), ecc->popup_scrolled_window); gtk_widget_show (ecc->popup_scrolled_window); diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index e56293b111..2cf0d5f114 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -156,14 +156,14 @@ create_content (GnomeCanvas **canvas) scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow1); gtk_box_pack_start (GTK_BOX (vbox_top), scrolledwindow1, TRUE, TRUE, 0); - GTK_WIDGET_UNSET_FLAGS (scrolledwindow1, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (scrolledwindow1, FALSE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); canvas_buttons = e_canvas_new (); gtk_widget_show (canvas_buttons); gtk_container_add (GTK_CONTAINER (scrolledwindow1), canvas_buttons); - GTK_WIDGET_UNSET_FLAGS (canvas_buttons, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (canvas_buttons, GTK_CAN_DEFAULT); + gtk_widget_set_can_focus (canvas_buttons, FALSE); + gtk_widget_set_can_default (canvas_buttons, FALSE); *canvas = GNOME_CANVAS (canvas_buttons); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index ce2253bc66..90c42b9e44 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -509,7 +509,7 @@ et_finalize (GObject *object) static void e_table_init (ETable *e_table) { - GTK_WIDGET_SET_FLAGS (GTK_WIDGET (e_table), GTK_CAN_FOCUS); + gtk_widget_set_can_focus (GTK_WIDGET (e_table), TRUE); gtk_table_set_homogeneous (GTK_TABLE (e_table), FALSE); diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 586544900d..f14c72b4dd 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -538,7 +538,7 @@ et_search_accept (ETableSearch *search, ETree *et) static void e_tree_init (ETree *e_tree) { - GTK_WIDGET_SET_FLAGS (GTK_WIDGET (e_tree), GTK_CAN_FOCUS); + gtk_widget_set_can_focus (GTK_WIDGET (e_tree), TRUE); gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE); @@ -709,7 +709,7 @@ e_tree_setup_header (ETree *e_tree) { gchar *pointer; e_tree->priv->header_canvas = GNOME_CANVAS (e_canvas_new ()); - GTK_WIDGET_UNSET_FLAGS (e_tree->priv->header_canvas, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (e_tree->priv->header_canvas, FALSE); gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas)); |