]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtksocket-x11.c
Remove GtkObject completely
[~andy/gtk] / gtk / gtksocket-x11.c
index f3ebce4caa0199b50dd211639dcc200f775394d7..a1a32e229a3aa519a64f1bebc8359abbf05de16b 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
 #include "gtkdnd.h"
+#include "gtkdebug.h"
 
 #include "x11/gdkx.h"
 
@@ -129,7 +130,7 @@ _gtk_socket_windowing_send_key_event (GtkSocket *socket,
                                      gboolean   mask_key_presses)
 {
   XKeyEvent xkey;
-  GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
+  GdkScreen *screen = gdk_window_get_screen (socket->plug_window);
 
   memset (&xkey, 0, sizeof (xkey));
   xkey.type = (gdk_event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
@@ -295,7 +296,7 @@ xembed_get_info (GdkWindow     *window,
                 unsigned long *version,
                 unsigned long *flags)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Atom xembed_info_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO");
   Atom type;
   int format;