Add new keysyms from X11R6.4 (including EuroSign).

[~andy/gtk] / gtk / gtkmain.c

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4109c8ba2c7a81782a55daab4f4ce08688ced55f..94a5b621fa0f4a4ff04d9692d344465f5638dcd3 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -26,7 +26,7 @@
 
 #include "gdkx.h"              /* For GDK_WINDOWING */
 
-#if GDK_WINDOWING == GDK_WINDOWING_X11
+#ifdef GDK_WINDOWING_X11
 #include <X11/Xlocale.h>       /* so we get the right setlocale */
 #else
 #include <locale.h>
@@ -401,11 +401,11 @@ gtk_init_check (int        *argc,
     }
 
 #ifdef ENABLE_NLS
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
   bindtextdomain("gtk+", GTK_LOCALEDIR);
 #else
   {
-    /* GTk+ locale dir is %WinDir%\gtk\locale */
+    /* GTk+ locale dir is %WinDir%\gtk+\locale */
     extern char *get_gtk_sysconf_directory ();
     bindtextdomain ("gtk+", g_strconcat (get_gtk_sysconf_directory (),
                                         G_DIR_SEPARATOR_S,
@@ -450,7 +450,7 @@ gtk_init_check (int  *argc,
     }
   g_slist_free (gtk_modules);
   
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
   /* No use warning on Win32, there aren't any non-devel versions anyhow... */
   g_warning (""              "YOU ARE USING THE DEVEL BRANCH 1.3.x OF GTK+ WHICH IS CURRENTLY\n"
             "                UNDER HEAVY DEVELOPMENT AND FREQUENTLY INTRODUCES INSTABILITIES.\n"