From d06800f14a0fdf7814403b3a5295189511274d67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Tue, 7 Dec 1999 16:11:43 +0000 Subject: [PATCH] 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 --- src/gtk/window.cpp | 5 ++--- src/gtk1/window.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 756fc35801..67006b5d8b 100644 --- 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 756fc35801..67006b5d8b 100644 --- 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; -- 2.49.0