From da2101204027855793c4264388b95a208967ae15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 24 Jun 2004 17:54:08 +0000 Subject: [PATCH] use GtkIMContext variable, not GtkIMMulticontext, we don't use functions that take the latter as their argument git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 2 +- include/wx/gtk/window.h | 2 +- include/wx/gtk1/window.h | 2 +- src/gtk/window.cpp | 16 ++++++++-------- src/gtk1/window.cpp | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 521ac22eac..270f437236 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2369,7 +2369,7 @@ typedef GtkWidget *WXWidget; #ifdef __WXGTK20__ /* Input method thing */ -typedef struct _GtkIMMulticontext GtkIMMulticontext; +typedef struct _GtkIMContext GtkIMContext; #endif /* __WXGTK20__ */ #endif /* __WXGTK__ */ diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index a2e8a9068b..2395fb0d1f 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -193,7 +193,7 @@ public: GtkWidget *m_focusWidget; #ifdef __WXGTK20__ - GtkIMMulticontext *m_imContext; + GtkIMContext *m_imContext; #else #if HAVE_XIM // XIM support for wxWidgets diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index a2e8a9068b..2395fb0d1f 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -193,7 +193,7 @@ public: GtkWidget *m_focusWidget; #ifdef __WXGTK20__ - GtkIMMulticontext *m_imContext; + GtkIMContext *m_imContext; #else #if HAVE_XIM // XIM support for wxWidgets diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 33085d03c9..4c95bf0741 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1142,7 +1142,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */); if ( !key_code && win->m_imContext ) { - gtk_im_context_filter_keypress ( (GtkIMContext*) win->m_imContext, gdk_event ); + gtk_im_context_filter_keypress(win->m_imContext, gdk_event ); ret = TRUE; } else @@ -2311,7 +2311,7 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (win->m_imContext) { GtkPizza *pizza = GTK_PIZZA( m_widget ); - gtk_im_context_set_client_window( (GtkIMContext*) win->m_imContext, pizza->bin_window ); + gtk_im_context_set_client_window( win->m_imContext, pizza->bin_window ); } #endif @@ -2697,13 +2697,13 @@ bool wxWindowGTK::Create( wxWindow *parent, #ifdef __WXGTK20__ // Create input method handler - m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); + m_imContext = gtk_im_multicontext_new(); // Cannot handle drawing preedited text yet - gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); + gtk_im_context_set_use_preedit( m_imContext, FALSE ); g_signal_connect (G_OBJECT (m_imContext), "commit", - G_CALLBACK (gtk_wxwindow_commit_cb), this); + G_CALLBACK (gtk_wxwindow_commit_cb), this); #endif gtk_widget_show( m_wxwindow ); @@ -2804,13 +2804,13 @@ void wxWindowGTK::PostCreation() #ifdef __WXGTK20__ // Create input method handler - m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); + m_imContext = gtk_im_multicontext_new(); // Cannot handle drawing preedited text yet - gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); + gtk_im_context_set_use_preedit( m_imContext, FALSE ); g_signal_connect (G_OBJECT (m_imContext), "commit", - G_CALLBACK (gtk_wxwindow_commit_cb), this); + G_CALLBACK (gtk_wxwindow_commit_cb), this); #endif } diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 33085d03c9..4c95bf0741 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1142,7 +1142,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */); if ( !key_code && win->m_imContext ) { - gtk_im_context_filter_keypress ( (GtkIMContext*) win->m_imContext, gdk_event ); + gtk_im_context_filter_keypress(win->m_imContext, gdk_event ); ret = TRUE; } else @@ -2311,7 +2311,7 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (win->m_imContext) { GtkPizza *pizza = GTK_PIZZA( m_widget ); - gtk_im_context_set_client_window( (GtkIMContext*) win->m_imContext, pizza->bin_window ); + gtk_im_context_set_client_window( win->m_imContext, pizza->bin_window ); } #endif @@ -2697,13 +2697,13 @@ bool wxWindowGTK::Create( wxWindow *parent, #ifdef __WXGTK20__ // Create input method handler - m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); + m_imContext = gtk_im_multicontext_new(); // Cannot handle drawing preedited text yet - gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); + gtk_im_context_set_use_preedit( m_imContext, FALSE ); g_signal_connect (G_OBJECT (m_imContext), "commit", - G_CALLBACK (gtk_wxwindow_commit_cb), this); + G_CALLBACK (gtk_wxwindow_commit_cb), this); #endif gtk_widget_show( m_wxwindow ); @@ -2804,13 +2804,13 @@ void wxWindowGTK::PostCreation() #ifdef __WXGTK20__ // Create input method handler - m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); + m_imContext = gtk_im_multicontext_new(); // Cannot handle drawing preedited text yet - gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); + gtk_im_context_set_use_preedit( m_imContext, FALSE ); g_signal_connect (G_OBJECT (m_imContext), "commit", - G_CALLBACK (gtk_wxwindow_commit_cb), this); + G_CALLBACK (gtk_wxwindow_commit_cb), this); #endif } -- 2.45.2