gtk: gdk_drawable_get_screen/visual => gdk_window_get_screen/visual

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 3d40f163d0c2da5634fdb95d2b488f2d340a06d7..23ec00b47be96299ca537cbc0afa72fe638c3b06 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1685,7 +1685,7 @@ gtk_drag_set_icon_name (GdkDragContext *context,
   g_return_if_fail (context->is_source);
   g_return_if_fail (icon_name != NULL);
 
-  screen = gdk_drawable_get_screen (context->source_window);
+  screen = gdk_window_get_screen (context->source_window);
   g_return_if_fail (screen != NULL);
 
   settings = gtk_settings_get_for_screen (screen);

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 4f3c8d62eb6f8625fff15c62d95fde9b0e5b0c47..9a7ab20dfcf9a27befc34736b6eb9e3bdee6a756 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1076,7 +1076,7 @@ gtk_drag_finish (GdkDragContext *context,
 
   if (target != GDK_NONE)
     {
-      GtkWidget *selection_widget = gtk_drag_get_ipc_widget_for_screen (gdk_drawable_get_screen (context->source_window));
+      GtkWidget *selection_widget = gtk_drag_get_ipc_widget_for_screen (gdk_window_get_screen (context->source_window));
 
       g_object_ref (context);
       
@@ -2143,7 +2143,7 @@ gtk_drag_dest_motion (GtkWidget        *widget,
        {
          gdk_drag_find_window_for_screen (info->proxy_source->context,
                                           NULL,
-                                          gdk_drawable_get_screen (current_event->dnd.window),
+                                          gdk_window_get_screen (current_event->dnd.window),
                                           current_event->dnd.x_root, 
                                           current_event->dnd.y_root,
                                           &dest_window, &proto);
@@ -2265,7 +2265,7 @@ gtk_drag_dest_drop (GtkWidget          *widget,
            {
              gdk_drag_find_window_for_screen (info->proxy_source->context,
                                               NULL,
-                                              gdk_drawable_get_screen (current_event->dnd.window),
+                                              gdk_window_get_screen (current_event->dnd.window),
                                               current_event->dnd.x_root, 
                                               current_event->dnd.y_root,
                                               &dest_window, &proto);
@@ -3127,7 +3127,7 @@ set_icon_stock_pixbuf (GdkDragContext    *context,
   g_return_if_fail (pixbuf != NULL || stock_id != NULL);
   g_return_if_fail (pixbuf == NULL || stock_id == NULL);
 
-  screen = gdk_drawable_get_screen (context->source_window);
+  screen = gdk_window_get_screen (context->source_window);
 
   window = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
@@ -3295,7 +3295,7 @@ gtk_drag_set_icon_surface (GdkDragContext    *context,
   _gtk_cairo_surface_extents (surface, &extents);
 
 
-  screen = gdk_drawable_get_screen (context->source_window);
+  screen = gdk_window_get_screen (context->source_window);
 
   window = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
@@ -3385,7 +3385,7 @@ gtk_drag_set_icon_name (GdkDragContext *context,
   g_return_if_fail (context->is_source);
   g_return_if_fail (icon_name != NULL);
 
-  screen = gdk_drawable_get_screen (context->source_window);
+  screen = gdk_window_get_screen (context->source_window);
   g_return_if_fail (screen != NULL);
 
   settings = gtk_settings_get_for_screen (screen);

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index b5d5937c4b4563d161548a8fafaf8cc1f341c2fa..ebbbd08d6bce01513e35b14aa189b1e3231a16bd 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -701,7 +701,7 @@ beep_window (GdkWindow *window)
     }
   else
     {
-      GdkScreen *screen = gdk_drawable_get_screen (GDK_DRAWABLE (window));
+      GdkScreen *screen = gdk_window_get_screen (GDK_DRAWABLE (window));
       gboolean   beep;
 
       g_object_get (gtk_settings_get_for_screen (screen),

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 70a689d39c68f4b1c1345d79b7684385b58a0474..788631d2ee7081dcc266c2a39bcf7f2179ed946f 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -683,7 +683,7 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
    */
   if (GDK_IS_DRAWABLE (client_window))
     {
-      screen = gdk_drawable_get_screen (GDK_DRAWABLE (client_window));
+      screen = gdk_window_get_screen (GDK_DRAWABLE (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 35e5221b2825ca99888ccfeb8f8704d09863949d..a8357babfe5ad187401120997a5911eba8ebd3e2 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -297,7 +297,7 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
 
   if (window)
     {
-      screen = gdk_drawable_get_screen (GDK_DRAWABLE (window));
+      screen = gdk_window_get_screen (GDK_DRAWABLE (window));
       settings = gtk_settings_get_for_screen (screen);
 
       connected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),

diff --git a/gtk/gtkplug-win32.c b/gtk/gtkplug-win32.c
index 2ca92c2bb75a3cbd414b0c7acaae18c5682f8965..15031fa5ae96655bf3d818cafbfa2e6dc7a15d95 100644 (file)
--- a/gtk/gtkplug-win32.c
+++ b/gtk/gtkplug-win32.c
@@ -169,7 +169,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
        {
          HWND parent = GetAncestor (msg->hwnd, GA_PARENT);
          gboolean was_embedded = priv->socket_window != NULL;
-         GdkScreen *screen = gdk_drawable_get_screen (event->any.window);
+         GdkScreen *screen = gdk_window_get_screen (event->any.window);
          GdkDisplay *display = gdk_screen_get_display (screen);
 
          GTK_NOTE (PLUGSOCKET, g_printerr ("WM_WINDOWPOSCHANGED: hwnd=%p GA_PARENT=%p socket_window=%p\n", msg->hwnd, parent, priv->socket_window));

diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index da8e5ea360c35ba92d86838c204fa099504e5a64..db3831d5e10ebe9a1ab8ebc0453613573ed9572e 100644 (file)
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -223,7 +223,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
                                 GdkEvent  *event,
                                 gpointer   data)
 {
-  GdkScreen *screen = gdk_drawable_get_screen (event->any.window);
+  GdkScreen *screen = gdk_window_get_screen (event->any.window);
   GdkDisplay *display = gdk_screen_get_display (screen);
   GtkPlug *plug = GTK_PLUG (data);
   GtkPlugPrivate *priv = plug->priv;

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 4e1f2040afa1a9093ebc7f1ee019cb25c7fcd4b5..57e42942169bc3d586de5f259c4dff63bc990fa9 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1974,7 +1974,7 @@ _gtk_settings_handle_event (GdkEventSetting *event)
   GParamSpec *pspec;
   guint property_id;
 
-  settings = gtk_settings_get_for_screen (gdk_drawable_get_screen (event->window));
+  settings = gtk_settings_get_for_screen (gdk_window_get_screen (event->window));
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), event->name);
  
   if (pspec) 

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index f3ebce4caa0199b50dd211639dcc200f775394d7..6866d7437a29ececbf55a189b2e5c3a0766732b3 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -129,7 +129,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;

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index dbefce2370897aa3189b4059fe543410d0ff8cf1..2df6c4bccefe01b7530fc9ed94f973bb0db72051 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -678,7 +678,7 @@ gtk_style_attach (GtkStyle  *style,
   g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
   g_return_val_if_fail (window != NULL, NULL);
   
-  visual = gdk_drawable_get_visual (window);
+  visual = gdk_window_get_visual (window);
   
   if (!style->styles)
     style->styles = g_slist_append (NULL, style);

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 8808609893d1407f1c21eb2b4a9c78d5b05e0347..758440a764fc9a056258cd3da156107601578b3d 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1412,7 +1412,7 @@ tooltips_enabled (GdkWindow *window)
   GdkScreen *screen;
   GtkSettings *settings;
 
-  screen = gdk_drawable_get_screen (window);
+  screen = gdk_window_get_screen (window);
   settings = gtk_settings_get_for_screen (screen);
 
   g_object_get (settings,

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8afb719e6a284579e8c96e7dc2e66ce545c3cc70..262bc9fc543b324f6857e8234019fd66debacc39 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14257,7 +14257,7 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view,
   gint tree_x, tree_y;
   gint tree_width, tree_height;
   GdkWindow *tree_window = gtk_widget_get_window (GTK_WIDGET (tree_view));
-  GdkScreen *screen = gdk_drawable_get_screen (tree_window);
+  GdkScreen *screen = gdk_window_get_screen (tree_window);
   GtkRequisition requisition;
   gint monitor_num;
   GdkRectangle monitor;

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index dfd14ef11b2a06f2242fc702fa16184d42306bea..7a8fd33a08768fb3008f659a845de2beb2fa97a6 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8675,7 +8675,7 @@ gtk_widget_get_visual (GtkWidget *widget)
     {
       if (gtk_widget_get_has_window (w) &&
           w->priv->window)
-        return gdk_drawable_get_visual (w->priv->window);
+        return gdk_window_get_visual (w->priv->window);
 
       if (GTK_IS_WINDOW (w))
         return _gtk_window_get_visual (GTK_WINDOW (w));
@@ -9350,7 +9350,7 @@ _gtk_widget_set_device_window (GtkWidget *widget,
   if (!gtk_widget_get_realized (widget))
     return;
 
-  screen = gdk_drawable_get_screen (priv->window);
+  screen = gdk_window_get_screen (priv->window);
   device_window = g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
 
   if (G_UNLIKELY (!device_window))
@@ -9394,7 +9394,7 @@ _gtk_widget_get_device_window (GtkWidget *widget,
   if (!gtk_widget_get_realized (widget))
     return NULL;
 
-  screen = gdk_drawable_get_screen (priv->window);
+  screen = gdk_window_get_screen (priv->window);
   device_window = g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
 
   if (G_UNLIKELY (!device_window))
@@ -9438,7 +9438,7 @@ _gtk_widget_list_devices (GtkWidget *widget)
   if (!gtk_widget_get_realized (widget))
     return NULL;
 
-  screen = gdk_drawable_get_screen (priv->window);
+  screen = gdk_window_get_screen (priv->window);
   device_window = g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
 
   if (G_UNLIKELY (!device_window))

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 0e53bc4ec50c46e0f35920671de391b013193b6d..2a3226edaa452c3415b52d75afbfd682937428e6 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -495,7 +495,7 @@ get_im (GdkWindow *client_window,
 {
   GSList *tmp_list;
   GtkXIMInfo *info;
-  GdkScreen *screen = gdk_drawable_get_screen (client_window);
+  GdkScreen *screen = gdk_window_get_screen (client_window);
 
   info = NULL;
   tmp_list = open_ims;
@@ -716,7 +716,7 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
   KeySym keysym;
   Status status;
   gboolean result = FALSE;
-  GdkWindow *root_window = gdk_screen_get_root_window (gdk_drawable_get_screen (event->window));
+  GdkWindow *root_window = gdk_screen_get_root_window (gdk_window_get_screen (event->window));
 
   XKeyPressedEvent xevent;
 

diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index 3d9404122a19fca0032c9c982d9c353439115c71..a99e43036d5cfec6475cddddc50129af32d13473 100644 (file)
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -828,7 +828,7 @@ filter_func (GdkXEvent *gdkxevent,
           if (window)
             {
               screen_n = gdk_screen_get_number (
-                  gdk_drawable_get_screen (GDK_DRAWABLE (window)));
+                  gdk_window_get_screen (GDK_DRAWABLE (window)));
 
               gail_screens [screen_n].update_stacked_windows = TRUE;
               if (!gail_screens [screen_n].update_handler)
@@ -966,7 +966,7 @@ get_window_zorder (GdkWindow *window)
   gail_return_val_if_fail (GDK_IS_WINDOW (window), -1);
 
   info = get_screen_info (
-               gdk_drawable_get_screen (GDK_DRAWABLE (window)));
+               gdk_window_get_screen (GDK_DRAWABLE (window)));
 
   gail_return_val_if_fail (info->stacked_windows != NULL, -1);