Fixed XIM compilation, but doesn't work yet.

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 756fc358017ec752760d32e9f7184790d0c90bdb..67006b5d8bc206f29b242b751bc661568aeeef90 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1654,7 +1654,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-#ifdef USE_XIM
+#ifdef HAVE_XIM
     if (win->m_ic) return FALSE;
     if (!widget) return FALSE;
     if (!gdk_im_ready()) return FALSE;
@@ -1714,7 +1714,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
 
          break;
        }
-       
+
       win->m_ic = gdk_ic_new (attr, attrmask);
      
       if (win->m_ic == NULL)
@@ -1728,7 +1728,6 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
          if (GTK_WIDGET_HAS_FOCUS(widget))
            gdk_im_begin (win->m_ic, widget->window);
        }
-    }
 #endif
 
     return FALSE;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 756fc358017ec752760d32e9f7184790d0c90bdb..67006b5d8bc206f29b242b751bc661568aeeef90 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1654,7 +1654,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-#ifdef USE_XIM
+#ifdef HAVE_XIM
     if (win->m_ic) return FALSE;
     if (!widget) return FALSE;
     if (!gdk_im_ready()) return FALSE;
@@ -1714,7 +1714,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
 
          break;
        }
-       
+
       win->m_ic = gdk_ic_new (attr, attrmask);
      
       if (win->m_ic == NULL)
@@ -1728,7 +1728,6 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
          if (GTK_WIDGET_HAS_FOCUS(widget))
            gdk_im_begin (win->m_ic, widget->window);
        }
-    }
 #endif
 
     return FALSE;