Test for XIM support in gdk added, relevant code for window.cpp follows this

evening.

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

diff --git a/configure.in b/configure.in
index 4f36a1e0fd5a704a2717614f4d8cf0366366c2ea..bd10c4cde2c14e2df2e5214079243eff4b0f8da3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1524,6 +1524,10 @@ if test "$wxUSE_GTK" = 1; then
     UNIXOBJS="\$(UNIX_OBJS)"
     UNIXDEPS="\$(UNIX_DEPS)"
     GUIDIST=GTK_DIST
+
+dnl test for XIM support in libgdk
+AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_GDK_XIM))
+
 fi
 
 if test "$wxUSE_WINE" = 1; then

diff --git a/setup.h.in b/setup.h.in
index be5879c04b8f932ac951023aca20254b09b78cad..a6e821cc627f2c72c357f66bddd8dcf077c4acc8 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,4 @@
-
+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__
@@ -734,4 +734,7 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
+#undef HAVE_GDK_XIM
+
 #endif /* __WX_SETUP_H__ */