[gtk+] gtk: Avoid GdkDrawable usage, including needless casts

[Benjamin Otte <otte src gnome org>]

commit a7e6d6c4b4a50181c758db7e7fab650a51804986
Author: Benjamin Otte <otte redhat com>
Date:   Mon Nov 22 17:47:56 2010 +0100

    gtk: Avoid GdkDrawable usage, including needless casts

 gtk/gtkimcontextsimple.c |    2 +-
 gtk/gtkimmodule.c        |    4 ++--
 gtk/gtkimmulticontext.c  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index d9c70e5..1270bb0 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -692,7 +692,7 @@ check_hex (GtkIMContextSimple *context_simple,
 static void
 beep_window (GdkWindow *window)
 {
-  GdkScreen *screen = gdk_window_get_screen (GDK_DRAWABLE (window));
+  GdkScreen *screen = gdk_window_get_screen (window);
   gboolean   beep;
 
   g_object_get (gtk_settings_get_for_screen (screen),
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 788631d..868cfe1 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -681,9 +681,9 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
 
   /* Check if the certain immodule is set in XSETTINGS.
    */
-  if (GDK_IS_DRAWABLE (client_window))
+  if (GDK_IS_WINDOW (client_window))
     {
-      screen = gdk_window_get_screen (GDK_DRAWABLE (client_window));
+      screen = gdk_window_get_screen (client_window);
       settings = gtk_settings_get_for_screen (screen);
       g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
       if (tmp)
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index a8357ba..f2454fc 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -297,7 +297,7 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
 
   if (window)
     {
-      screen = gdk_window_get_screen (GDK_DRAWABLE (window));
+      screen = gdk_window_get_screen (window);
       settings = gtk_settings_get_for_screen (screen);
 
       connected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),