[gcompris/gcomprixogoo] Fixed compilation issues.

[Bruno Coudoin <bcoudoin src gnome org>]

commit ed4871df4a0e02f5248b0a19353dd2c59f0e79a1
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Wed Mar 24 01:11:05 2010 +0100

    Fixed compilation issues.

 src/gcompris/gcompris.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 7d1770f..bc89941 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -30,7 +30,7 @@
 // WIN32
 #elif NSBUNDLE
 // MACOSX
-#else WIN32
+#else
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
@@ -78,7 +78,7 @@ static void quit_cb (GtkWidget *widget, gpointer data);
 static void map_cb  (GtkWidget *widget, gpointer data);
 #ifdef WIN32
 #elif NSBUNDLE
-#else WIN32
+#else
 static gboolean _realize_callback (GtkWidget *widget, GdkEventExpose *event,
 				   gpointer data);
 #endif
@@ -818,7 +818,7 @@ static void setup_window ()
   gtk_window_set_wmclass(GTK_WINDOW(window), "gcompris", "GCompris");
 #ifdef WIN32
 #elif NSBUNDLE
-#else WIN32
+#else
   g_signal_connect (GTK_OBJECT (window), "realize",
 		    G_CALLBACK (_realize_callback), NULL);
 #endif
@@ -1095,12 +1095,16 @@ void gc_fullscreen_set(gboolean state)
     {
       gtk_window_get_position ( (GtkWindow*)( window ), &window_x, &window_y );
       gtk_window_get_size ( GTK_WINDOW ( window ), &window_w, &window_h );
-#ifdef WIN32 || NSBUNDLE
+#ifdef WIN32
       // WARNING: Doing this is required on Windows
       //          but keep the window hidden on GNU/Linux
       gtk_widget_hide ( window );
-#endif
+#elif NSBUNDLE
+      // WARNING: Doing this is required on Windows
+      //          but keep the window hidden on GNU/Linux
       gtk_widget_hide ( window );
+#else
+#endif
       gtk_window_set_decorated ( GTK_WINDOW ( window ), FALSE );
       gtk_window_set_type_hint ( GTK_WINDOW ( window ),
 				 GDK_WINDOW_TYPE_HINT_DESKTOP );