modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp

rev 9734 : 8087516: Conditional support for GTK 3 on Linux
Reviewed-by:

@@ -39,11 +39,11 @@
     XKeyPressedEvent result;
     memset(&result, 0, sizeof (result));
 
     result.type = (event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
     result.send_event = event->send_event;
-    result.display = gdk_x11_display_get_xdisplay(glass_gdk_window_get_display(event->window));
+    result.display = gdk_x11_display_get_xdisplay(gdk_window_get_display(event->window));
     result.window = result.subwindow = GDK_WINDOW_XID(event->window);
     result.root = GDK_WINDOW_XID(gdk_screen_get_root_window(glass_gdk_window_get_screen(event->window)));
     result.time = event->time;
     result.state = event->state;
     result.keycode = event->hardware_keycode;

@@ -220,11 +220,11 @@
 
     return result;
 }
 
 void WindowContextBase::enableOrResetIME() {
-    Display *display = gdk_x11_display_get_xdisplay(glass_gdk_window_get_display(gdk_window));
+    Display *display = gdk_x11_display_get_xdisplay(gdk_window_get_display(gdk_window));
     if (xim.im == NULL || xim.ic == NULL) {
         xim.im = XOpenIM(display, NULL, NULL, NULL);
         if (xim.im == NULL) {
             return;
         }