use GtkIMContext variable, not GtkIMMulticontext, we don't use functions that take...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 521ac22eacefd618018ee9ba7b2eca01fba2fdf6..270f4372365e8beae7108cc1b9061429c5d46a6f 100644 (file)
--- 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 a2e8a9068b7be7598d8446f7d0c909a8f91225f4..2395fb0d1f9a64e89bd33999e71eb08ecc460ac7 100644 (file)
--- 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 a2e8a9068b7be7598d8446f7d0c909a8f91225f4..2395fb0d1f9a64e89bd33999e71eb08ecc460ac7 100644 (file)
--- 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 33085d03c9ce37be6350752ae98166d76920fbc5..4c95bf0741fee838f9aecfb2d806a0e374f53c57 100644 (file)
--- 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 33085d03c9ce37be6350752ae98166d76920fbc5..4c95bf0741fee838f9aecfb2d806a0e374f53c57 100644 (file)
--- 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
         }