[gnome-games] GSEAL: fixes for GTK_WIDGET flags

[Thomas Hindoe Paaboel Andersen <thomashpa src gnome org>]

commit bb03a6ae391f8b5ff3dcec45ab4e9310adf00c9d
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Dec 8 07:26:30 2009 +0100

    GSEAL: fixes for GTK_WIDGET flags
    
    Substitute:
    GTK_WIDGET_DRAWABLE(),
    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS)
    GTK_WIDGET_HAS_FOCUS()
    
    https://bugzilla.gnome.org/show_bug.cgi?id=586731

 aisleriot/board-noclutter.c         |    2 +-
 aisleriot/board.c                   |    8 ++++----
 glines/glines.c                     |    2 +-
 gnomine/minefield.c                 |    2 +-
 libgames-support/games-gtk-compat.h |    2 ++
 mahjongg/drawing.c                  |    2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/aisleriot/board-noclutter.c b/aisleriot/board-noclutter.c
index b83c11b..5e8bdd5 100644
--- a/aisleriot/board-noclutter.c
+++ b/aisleriot/board-noclutter.c
@@ -3331,7 +3331,7 @@ aisleriot_board_init (AisleriotBoard *board)
 
   gtk_widget_set_name (widget, "aisleriot-board");
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (widget, TRUE);
 
   priv->is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
 
diff --git a/aisleriot/board.c b/aisleriot/board.c
index 46ad3cd..6342008 100644
--- a/aisleriot/board.c
+++ b/aisleriot/board.c
@@ -494,7 +494,7 @@ set_focus (AisleriotBoard *board,
   if (priv->focus_slot != NULL) {
 #ifdef FIXMEchpe
     if (priv->show_focus &&
-        GTK_WIDGET_HAS_FOCUS (widget)) {
+        gtk_widget_has_focus (widget)) {
       gdk_window_invalidate_rect (widget->window, &priv->focus_rect, FALSE);
     
       priv->show_focus = FALSE;
@@ -515,7 +515,7 @@ set_focus (AisleriotBoard *board,
 
 #ifdef FIXMEchpe
   if (show_focus &&
-      GTK_WIDGET_HAS_FOCUS (widget)) {
+      gtk_widget_has_focus (widget)) {
     get_focus_rect (board, &priv->focus_rect);
     gdk_window_invalidate_rect (widget->window, &priv->focus_rect, FALSE);
   }
@@ -2242,7 +2242,7 @@ aisleriot_board_activate (AisleriotBoard *board,
   int selection_start_card_id = priv->selection_start_card_id;
 
 #ifdef FIXMEchpe
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_has_focus (widget))
     return;
 #endif
 
@@ -2325,7 +2325,7 @@ aisleriot_board_move_cursor (AisleriotBoard *board,
   int count;
 
 #ifdef FIXMEchpe
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_has_focus (widget))
     return FALSE;
 #endif
 
diff --git a/glines/glines.c b/glines/glines.c
index ff8fbc3..f9a5f03 100644
--- a/glines/glines.c
+++ b/glines/glines.c
@@ -1929,7 +1929,7 @@ main (int argc, char *argv[])
                          gtk_widget_get_events (draw_area) |
                          GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK);
 
-  GTK_WIDGET_SET_FLAGS (draw_area, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (draw_area, TRUE);
   gtk_widget_grab_focus (draw_area);
 
   load_properties ();
diff --git a/gnomine/minefield.c b/gnomine/minefield.c
index d16b4e3..dd59fc3 100644
--- a/gnomine/minefield.c
+++ b/gnomine/minefield.c
@@ -578,7 +578,7 @@ gtk_minefield_expose (GtkWidget * widget, GdkEventExpose * event)
   g_return_val_if_fail (GTK_IS_MINEFIELD (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
-  if (GTK_WIDGET_DRAWABLE (widget)) {
+  if (gtk_widget_is_drawable (widget)) {
     guint x1, y1, x2, y2, x, y;
     GtkMineField *mfield = GTK_MINEFIELD (widget);
     GdkRectangle *area = &event->area;
diff --git a/libgames-support/games-gtk-compat.h b/libgames-support/games-gtk-compat.h
index 741c035..f2e16bd 100644
--- a/libgames-support/games-gtk-compat.h
+++ b/libgames-support/games-gtk-compat.h
@@ -34,6 +34,8 @@ G_BEGIN_DECLS
 #define gtk_widget_has_focus(widget) (GTK_WIDGET_HAS_FOCUS (widget))
 #define gtk_widget_get_state(widget) ((widget)->state)
 #define gtk_widget_get_visible(widget) (GTK_WIDGET_VISIBLE (widget))
+#define gtk_widget_is_drawable(widget) (GTK_WIDGET_DRAWABLE (widget))
+#define gtk_widget_set_can_focus(widget, TRUE) (GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS))
 #endif /* GTK < 2.18.0 */
 
 #if !GTK_CHECK_VERSION (2, 14, 0)
diff --git a/mahjongg/drawing.c b/mahjongg/drawing.c
index 5c6e378..748ba52 100644
--- a/mahjongg/drawing.c
+++ b/mahjongg/drawing.c
@@ -432,7 +432,7 @@ GtkWidget *
 create_mahjongg_board (void)
 {
   board = gtk_drawing_area_new ();
-  GTK_WIDGET_SET_FLAGS (board, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (board, TRUE);
 
   gtk_widget_set_size_request (board, MINWIDTH, MINHEIGHT);