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
This commit is contained in:
@@ -1654,7 +1654,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
|
|||||||
if (g_isIdle)
|
if (g_isIdle)
|
||||||
wxapp_install_idle_handler();
|
wxapp_install_idle_handler();
|
||||||
|
|
||||||
#ifdef USE_XIM
|
#ifdef HAVE_XIM
|
||||||
if (win->m_ic) return FALSE;
|
if (win->m_ic) return FALSE;
|
||||||
if (!widget) return FALSE;
|
if (!widget) return FALSE;
|
||||||
if (!gdk_im_ready()) return FALSE;
|
if (!gdk_im_ready()) return FALSE;
|
||||||
@@ -1728,7 +1728,6 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
|
|||||||
if (GTK_WIDGET_HAS_FOCUS(widget))
|
if (GTK_WIDGET_HAS_FOCUS(widget))
|
||||||
gdk_im_begin (win->m_ic, widget->window);
|
gdk_im_begin (win->m_ic, widget->window);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@@ -1654,7 +1654,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
|
|||||||
if (g_isIdle)
|
if (g_isIdle)
|
||||||
wxapp_install_idle_handler();
|
wxapp_install_idle_handler();
|
||||||
|
|
||||||
#ifdef USE_XIM
|
#ifdef HAVE_XIM
|
||||||
if (win->m_ic) return FALSE;
|
if (win->m_ic) return FALSE;
|
||||||
if (!widget) return FALSE;
|
if (!widget) return FALSE;
|
||||||
if (!gdk_im_ready()) return FALSE;
|
if (!gdk_im_ready()) return FALSE;
|
||||||
@@ -1728,7 +1728,6 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
|
|||||||
if (GTK_WIDGET_HAS_FOCUS(widget))
|
if (GTK_WIDGET_HAS_FOCUS(widget))
|
||||||
gdk_im_begin (win->m_ic, widget->window);
|
gdk_im_begin (win->m_ic, widget->window);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
Reference in New Issue
Block a user