HAVE_GDK_XIM -> HAVE_XIM

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index bd10c4cde2c14e2df2e5214079243eff4b0f8da3..392d467ac4a1734e6da9503044eb6b81904da67d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1526,7 +1526,7 @@ if test "$wxUSE_GTK" = 1; then
     GUIDIST=GTK_DIST
 
 dnl test for XIM support in libgdk
-AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_GDK_XIM))
+AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
 
 fi
 

diff --git a/setup.h.in b/setup.h.in
index a6e821cc627f2c72c357f66bddd8dcf077c4acc8..1cb2cf005cb2341b74bf0ffec4af4bdc7e1ae0be 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,3 @@
-G
 /* This define (__WX_SETUP_H__) is used both to insure setup.h is included
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
@@ -735,6 +734,6 @@ G
 #undef HAVE_WCSTR_H
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
-#undef HAVE_GDK_XIM
+#undef HAVE_XIM
 
 #endif /* __WX_SETUP_H__ */