[goffice] Compilation: fix fallout from G_SEAL.

[Morten Welinder <mortenw src gnome org>]

commit 0e3614ba11f1cf0b4fa01348037edb8785749336
Author: Morten Welinder <terra gnome org>
Date:   Mon Oct 12 09:30:30 2009 -0400

    Compilation: fix fallout from G_SEAL.

 goffice/gtk/go-combo-text.c   |    1 +
 goffice/gtk/go-gtk-compat.h   |   34 +++++++++++++++++++++-------------
 goffice/gtk/go-rotation-sel.c |    1 +
 3 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/goffice/gtk/go-combo-text.c b/goffice/gtk/go-combo-text.c
index 6cdeebc..07f0c6b 100644
--- a/goffice/gtk/go-combo-text.c
+++ b/goffice/gtk/go-combo-text.c
@@ -7,6 +7,7 @@
 #include "go-combo-text.h"
 #include "go-combo-box.h"
 #include <goffice/utils/go-marshalers.h>
+#include <goffice/gtk/go-gtk-compat.h>
 
 #include <gsf/gsf-impl-utils.h>
 
diff --git a/goffice/gtk/go-gtk-compat.h b/goffice/gtk/go-gtk-compat.h
index 43f52db..54419ac 100644
--- a/goffice/gtk/go-gtk-compat.h
+++ b/goffice/gtk/go-gtk-compat.h
@@ -90,8 +90,8 @@
 #       define gtk_widget_get_window(w) (w)->window
 #endif
 
-#ifndef HAVE_GTK_WIDGET_HAVE_FOCUS
-#       define gtk_widget_have_focus(w) GTK_WIDGET_HAVE_FOCUS (w)
+#ifndef HAVE_GTK_WIDGET_HAS_FOCUS
+#       define gtk_widget_has_focus(w) GTK_WIDGET_HAS_FOCUS (w)
 #endif
 
 #ifndef HAVE_GTK_WIDGET_IS_MAPPED
@@ -111,27 +111,35 @@
 #endif
 
 #ifndef HAVE_GTK_WIDGET_SET_CAN_DEFAULT
-#       define gtk_widget_set_can_default(w,t) \
-		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_DEFAULT); \
-		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_CAN_DEFAULT)
+#define gtk_widget_set_can_default(w,t)					\
+	do {								\
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_DEFAULT);	\
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_CAN_DEFAULT);	\
+	} while (0)
 #endif
 
 #ifndef HAVE_GTK_WIDGET_SET_CAN_FOCUS
-#       define gtk_widget_set_can_focus(w,t) \
-		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_FOCUS); \
-		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_CAN_FOCUS)
+#define gtk_widget_set_can_focus(w,t)					\
+	do {								\
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_FOCUS);	\
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_CAN_FOCUS);	\
+	} while (0)		     
 #endif
 
 #ifndef HAVE_GTK_WIDGET_SET_HAS_FOCUS
-#       define gtk_widget_set_has_focus(w,t) \
-		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_HAS_FOCUS); \
-		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_HAS_FOCUS)
+#define gtk_widget_set_has_focus(w,t)					\
+	do {								\
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_HAS_FOCUS);	\
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_HAS_FOCUS);	\
+	} while (0)		     
 #endif
 
 #ifndef HAVE_GTK_WIDGET_SET_RECEIVES_DEFAULT
-#       define gtk_widget_set_receives_default (w,t) \
+#define gtk_widget_set_receives_default(w,t)				\
+	do {								\
 		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_RECEIVES_DEFAULT); \
-		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_RECEIVES_DEFAULT)
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_RECEIVES_DEFAULT); \
+	} while (0)
 #endif
 
 #ifndef HAVE_GTK_WINDOW_GET_DEFAULT_WIDGET
diff --git a/goffice/gtk/go-rotation-sel.c b/goffice/gtk/go-rotation-sel.c
index c4e8116..967f7dd 100644
--- a/goffice/gtk/go-rotation-sel.c
+++ b/goffice/gtk/go-rotation-sel.c
@@ -19,6 +19,7 @@
 
 #include <goffice/goffice-config.h>
 #include <goffice/goffice.h>
+#include <goffice/gtk/go-gtk-compat.h>
 
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>