끝글자 버그를 고칩시다 2 - wxWidgets

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 02bd068..6a53aeb 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -862,24 +862,7 @@ GtkEntry *wxTextCtrl::GetEntry() const
 
 int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const
 {
-    if (IsSingleLine())
-        return wxTextEntry::GTKIMFilterKeypress(event);
-
-    int result;
-#if GTK_CHECK_VERSION(2, 22, 0)
-#ifndef __WXGTK3__
-    result = false;
-    if (gtk_check_version(2,22,0) == NULL)
-#endif
-    {
-        result = gtk_text_view_im_context_filter_keypress(GTK_TEXT_VIEW(m_text), event);
-    }
-#else // GTK+ < 2.22
-    wxUnusedVar(event);
-    result = false;
-#endif // GTK+ 2.22+
-
-    return result;
+    return false;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index d4eb406..6bb6d59 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -417,21 +417,7 @@ void wxTextEntry::SendMaxLenEvent()
 
 int wxTextEntry::GTKIMFilterKeypress(GdkEventKey* event) const
 {
-    int result;
-#if GTK_CHECK_VERSION(2, 22, 0)
-#ifndef __WXGTK3__
-    result = false;
-    if (gtk_check_version(2,22,0) == NULL)
-#endif
-    {
-        result = gtk_entry_im_context_filter_keypress(GetEntry(), event);
-    }
-#else // GTK+ < 2.22
-    wxUnusedVar(event);
-    result = false;
-#endif // GTK+ 2.22+
-
-    return result;
+    return false;
 }

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 02bd068..43ed914 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -750,6 +750,12 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     m_focusWidget = m_text;
 
+#if GTK_CHECK_VERSION(3, 24, 0)
+    g_object_set_data_full (G_OBJECT (m_text), "im-filter",
+                            gtk_event_controller_key_new (m_text),
+                            (GDestroyNotify) g_object_unref);
+#endif
+
     PostCreation(size);
 
     if (multi_line)
@@ -862,6 +868,12 @@ GtkEntry *wxTextCtrl::GetEntry() const
 
 int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const
 {
+#if GTK_CHECK_VERSION(3, 24, 0)
+    GtkEventController *im_filter;
+    im_filter = (GtkEventController*) g_object_get_data (G_OBJECT (m_text), "im-filter");
+    return gtk_event_controller_handle_event (im_filter, (GdkEvent*) event);
+#endif
+
     if (IsSingleLine())
         return wxTextEntry::GTKIMFilterKeypress(event);
 
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 96b4544..d67cd2c 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1077,19 +1077,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
 
 int wxWindowGTK::GTKIMFilterKeypress(GdkEventKey* event) const
 {
-    return m_imContext ? gtk_im_context_filter_keypress(m_imContext, event)
-                       : FALSE;
-}
-
-extern "C" {
-static void
-gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context),
-                        const gchar  *str,
-                        wxWindow     *window)
-{
-    // Ignore the return value here, it doesn't matter for the "commit" signal.
-    window->GTKDoInsertTextFromIM(str);
-}
+    return FALSE;
 }
 
 bool wxWindowGTK::GTKDoInsertTextFromIM(const char* str)
@@ -2065,15 +2053,6 @@ gtk_window_grab_broken( GtkWidget*,
 }
 #endif
 
-//-----------------------------------------------------------------------------
-// "unrealize"
-//-----------------------------------------------------------------------------
-
-static void unrealize(GtkWidget*, wxWindow* win)
-{
-    win->GTKHandleUnrealize();
-}
-
 #if GTK_CHECK_VERSION(3,8,0)
 //-----------------------------------------------------------------------------
 // "layout" from GdkFrameClock
@@ -2107,22 +2086,6 @@ void wxWindowGTK::GTKHandleRealized()
 {
     GdkWindow* const window = GTKGetDrawingWindow();
 
-    if (m_wxwindow)
-    {
-        if (m_imContext == NULL)
-        {
-            // Create input method handler
-            m_imContext = gtk_im_multicontext_new();
-
-            // Cannot handle drawing preedited text yet
-            gtk_im_context_set_use_preedit(m_imContext, false);
-
-            g_signal_connect(m_imContext,
-                "commit", G_CALLBACK(gtk_wxwindow_commit_cb), this);
-        }
-        gtk_im_context_set_client_window(m_imContext, window);
-    }
-
     // Use composited window if background is transparent, if supported.
     if (m_backgroundStyle == wxBG_STYLE_TRANSPARENT)
     {
@@ -2168,15 +2131,6 @@ void wxWindowGTK::GTKHandleRealized()
     GTKUpdateCursor(false, true);
 }
 
-void wxWindowGTK::GTKHandleUnrealize()
-{
-    if (m_wxwindow)
-    {
-        if (m_imContext)
-            gtk_im_context_set_client_window(m_imContext, NULL);
-    }
-}
-
 // ----------------------------------------------------------------------------
 // this wxWindowBase function is implemented here (in platform-specific file)
 // because it is static and so couldn't be made virtual
@@ -2330,7 +2284,6 @@ void wxWindowGTK::Init()
 
     m_clipPaintRegion = false;
 
-    m_imContext = NULL;
     m_imKeyEvent = NULL;
 
     m_dirtyTabOrder = false;
@@ -2518,13 +2471,6 @@ wxWindowGTK::~wxWindowGTK()
     // destroy children before destroying this window itself
     DestroyChildren();
 
-    // delete before the widgets to avoid a crash on solaris
-    if ( m_imContext )
-    {
-        g_object_unref(m_imContext);
-        m_imContext = NULL;
-    }
-
 #ifdef __WXGTK3__
     if (m_styleProvider)
         g_object_unref(m_styleProvider);
@@ -2660,7 +2606,6 @@ void wxWindowGTK::PostCreation()
         g_signal_connect (connect_widget, "realize",
                           G_CALLBACK (gtk_window_realized_callback), this);
     }
-    g_signal_connect(connect_widget, "unrealize", G_CALLBACK(unrealize), this);
 
     if (!IsTopLevel())
     {
@@ -3456,9 +3401,6 @@ bool wxWindowGTK::GTKHandleFocusIn()
                "handling focus_in event for %s(%p, %s)",
                GetClassInfo()->GetClassName(), this, GetLabel());
 
-    if (m_imContext)
-        gtk_im_context_focus_in(m_imContext);
-
     gs_currentFocus = this;
     gs_pendingFocus = NULL;
 
@@ -3519,9 +3461,6 @@ void wxWindowGTK::GTKHandleFocusOutNoDeferring()
                "handling focus_out event for %s(%p, %s)",
                GetClassInfo()->GetClassName(), this, GetLabel());
 
-    if (m_imContext)
-        gtk_im_context_focus_out(m_imContext);
-
     if ( gs_currentFocus != this )
     {
         // Something is terribly wrong, gs_currentFocus is out of sync with the