[gnome-disk-utility] Use gtk_widget_has_focus() instead of deprecated GTK_WIDGET_HAS_FOCUS()



commit b0a4a7345df0f198ec2977857012378af360c2fe
Author: David Zeuthen <davidz redhat com>
Date:   Fri Mar 12 12:13:36 2010 -0500

    Use gtk_widget_has_focus() instead of deprecated GTK_WIDGET_HAS_FOCUS()

 src/gdu-gtk/gdu-ata-smart-dialog.c       |    2 +-
 src/gdu-gtk/gdu-disk-selection-widget.c  |    2 +-
 src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c |    2 +-
 src/gdu-gtk/gdu-edit-linux-md-dialog.c   |    2 +-
 src/gdu-gtk/gdu-pool-tree-view.c         |    2 +-
 src/gdu-gtk/gdu-volume-grid.c            |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/gdu-gtk/gdu-ata-smart-dialog.c b/src/gdu-gtk/gdu-ata-smart-dialog.c
index e77ec15..9e96060 100644
--- a/src/gdu-gtk/gdu-ata-smart-dialog.c
+++ b/src/gdu-gtk/gdu-ata-smart-dialog.c
@@ -680,7 +680,7 @@ get_grey_color (GtkTreeView *tree_view,
         tree_selection = gtk_tree_view_get_selection (tree_view);
         style = gtk_widget_get_style (GTK_WIDGET (tree_view));
         if (gtk_tree_selection_iter_is_selected (tree_selection, iter)) {
-                if (GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (tree_view)))
+                if (gtk_widget_has_focus (GTK_WIDGET (tree_view)))
                         state = GTK_STATE_SELECTED;
                 else
                         state = GTK_STATE_ACTIVE;
diff --git a/src/gdu-gtk/gdu-disk-selection-widget.c b/src/gdu-gtk/gdu-disk-selection-widget.c
index 697de74..a3e4416 100644
--- a/src/gdu-gtk/gdu-disk-selection-widget.c
+++ b/src/gdu-gtk/gdu-disk-selection-widget.c
@@ -681,7 +681,7 @@ disk_name_data_func (GtkCellLayout   *cell_layout,
         /* This color business shouldn't be this hard... */
         style = gtk_widget_get_style (GTK_WIDGET (widget->priv->tree_view));
         if (gtk_tree_selection_iter_is_selected (tree_selection, iter)) {
-                if (GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (widget->priv->tree_view)))
+                if (gtk_widget_has_focus (GTK_WIDGET (widget->priv->tree_view)))
                         state = GTK_STATE_SELECTED;
                 else
                         state = GTK_STATE_ACTIVE;
diff --git a/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c b/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
index 8778e72..352d0a6 100644
--- a/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
+++ b/src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
@@ -205,7 +205,7 @@ format_markup (GtkCellLayout   *cell_layout,
         /* This color business shouldn't be this hard... */
         style = gtk_widget_get_style (GTK_WIDGET (dialog->priv->pvs_tree_view));
         if (gtk_tree_selection_iter_is_selected (tree_selection, iter)) {
-                if (GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (dialog->priv->pvs_tree_view)))
+                if (gtk_widget_has_focus (GTK_WIDGET (dialog->priv->pvs_tree_view)))
                         state = GTK_STATE_SELECTED;
                 else
                         state = GTK_STATE_ACTIVE;
diff --git a/src/gdu-gtk/gdu-edit-linux-md-dialog.c b/src/gdu-gtk/gdu-edit-linux-md-dialog.c
index eecb0cc..a2f30f9 100644
--- a/src/gdu-gtk/gdu-edit-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-edit-linux-md-dialog.c
@@ -250,7 +250,7 @@ format_markup (GtkCellLayout   *cell_layout,
         /* This color business shouldn't be this hard... */
         style = gtk_widget_get_style (GTK_WIDGET (dialog->priv->components_tree_view));
         if (gtk_tree_selection_iter_is_selected (tree_selection, iter)) {
-                if (GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (dialog->priv->components_tree_view)))
+                if (gtk_widget_has_focus (GTK_WIDGET (dialog->priv->components_tree_view)))
                         state = GTK_STATE_SELECTED;
                 else
                         state = GTK_STATE_ACTIVE;
diff --git a/src/gdu-gtk/gdu-pool-tree-view.c b/src/gdu-gtk/gdu-pool-tree-view.c
index 5b9e132..ccc8ae7 100644
--- a/src/gdu-gtk/gdu-pool-tree-view.c
+++ b/src/gdu-gtk/gdu-pool-tree-view.c
@@ -170,7 +170,7 @@ format_markup (GtkCellLayout   *cell_layout,
         /* This color business shouldn't be this hard... */
         style = gtk_widget_get_style (GTK_WIDGET (view));
         if (gtk_tree_selection_iter_is_selected (tree_selection, iter)) {
-                if (GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (view)))
+                if (gtk_widget_has_focus (GTK_WIDGET (view)))
                         state = GTK_STATE_SELECTED;
                 else
                         state = GTK_STATE_ACTIVE;
diff --git a/src/gdu-gtk/gdu-volume-grid.c b/src/gdu-gtk/gdu-volume-grid.c
index ecaebc4..043b4e7 100644
--- a/src/gdu-gtk/gdu-volume-grid.c
+++ b/src/gdu-gtk/gdu-volume-grid.c
@@ -1447,7 +1447,7 @@ render_slice (GduVolumeGrid *grid,
 
                 is_selected = FALSE;
                 is_focused = FALSE;
-                is_grid_focused = GTK_WIDGET_HAS_FOCUS (grid);
+                is_grid_focused = gtk_widget_has_focus (GTK_WIDGET (grid));
 
                 if (element == grid->priv->selected)
                         is_selected = TRUE;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]