summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-02-23 16:52:23 -0500
committerMatthias Clasen <mclasen@redhat.com>2019-02-23 22:01:50 -0500
commitc4edc285429764b6534b197bf36363ec3c8fe71e (patch)
treeb33ed8512600a6e1902a3439079cfb233fd86f86
parentb4e0bae7dcffac39e7da257201e0e89cb7f53c61 (diff)
downloadgtk+-c4edc285429764b6534b197bf36363ec3c8fe71e.tar.gz
ime: Stop using gdk_surface_get_user_data
Use gtk_root_get_for_surface instead.
-rw-r--r--gtk/gtkimcontextime.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkimcontextime.c b/gtk/gtkimcontextime.c
index 62961eb3b3..e18795c89e 100644
--- a/gtk/gtkimcontextime.c
+++ b/gtk/gtkimcontextime.c
@@ -29,6 +29,7 @@
#include "gtkimcontextime.h"
#include "gtkimmoduleprivate.h"
+#include "gtkroot.h"
#include "imm-extra.h"
@@ -878,9 +879,9 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context)
if (!context_ime->client_surface)
return;
- gdk_surface_get_user_data (context_ime->client_surface, (gpointer) &widget);
- if (!GTK_IS_WIDGET (widget))
- return;
+ widget = gtk_root_get_for_surface (context_ime->client_surface);
+ if (!widget)
+ return
hwnd = gdk_win32_surface_get_impl_hwnd (context_ime->client_surface);
himc = ImmGetContext (hwnd);