[gtk+/rendering-cleanup: 16/17] x11: _gdk_x11_drawable_update_size() => _gdk_x11_window_update_size()

[Benjamin Otte <otte src gnome org>]

commit 3a3eb1589418967c03b1ac6290cedcdc67900c89
Author: Benjamin Otte <otte redhat com>
Date:   Wed Oct 6 04:03:23 2010 +0200

    x11: _gdk_x11_drawable_update_size() => _gdk_x11_window_update_size()

 gdk/x11/gdkdisplay-x11.c  |    4 ++--
 gdk/x11/gdkdrawable-x11.h |    2 --
 gdk/x11/gdkwindow-x11.c   |   18 ++++++++----------
 gdk/x11/gdkwindow-x11.h   |   10 ++++++----
 4 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 1ee5d6a..53b56ec 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -692,7 +692,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
 	  window_private->height = xevent->xconfigure.height;
 
 	  _gdk_window_update_size (window);
-	  _gdk_x11_drawable_update_size (window_private->impl);
+	  _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window_private->impl));
 	  _gdk_x11_screen_size_changed (screen, xevent);
         }
 
@@ -748,7 +748,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
 	  window_private->height = xevent->xconfigure.height;
 
 	  _gdk_window_update_size (window);
-	  _gdk_x11_drawable_update_size (window_private->impl);
+	  _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window_private->impl));
 
 	  if (window_private->resize_count >= 1)
 	    {
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index ffaf803..21bf09e 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -59,8 +59,6 @@ struct _GdkDrawableImplX11Class
 
 GType _gdk_drawable_impl_x11_get_type (void);
 
-/* Note that the following take GdkDrawableImplX11, not the wrapper drawable */
-void _gdk_x11_drawable_update_size      (GdkDrawable  *drawable);
 
 G_END_DECLS
 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 2d868f2..35f3ae6 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -173,17 +173,15 @@ _gdk_x11_window_get_toplevel (GdkWindow *window)
 static const cairo_user_data_key_t gdk_x11_cairo_key;
 
 /**
- * _gdk_x11_drawable_update_size:
- * @drawable: a #GdkDrawableImplX11.
+ * _gdk_x11_window_update_size:
+ * @impl: a #GdkWindowImplX11.
  * 
- * Updates the state of the drawable (in particular the drawable's
+ * Updates the state of the window (in particular the drawable's
  * cairo surface) when its size has changed.
  **/
 void
-_gdk_x11_drawable_update_size (GdkDrawable *drawable)
+_gdk_x11_window_update_size (GdkWindowImplX11 *impl)
 {
-  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (drawable);
-  
   if (impl->cairo_surface)
     {
       cairo_xlib_surface_set_size (impl->cairo_surface,
@@ -1564,7 +1562,7 @@ window_x11_resize (GdkWindow *window,
         {
           private->width = width;
           private->height = height;
-          _gdk_x11_drawable_update_size (private->impl);
+          _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (private->impl));
         }
       else
         {
@@ -1573,7 +1571,7 @@ window_x11_resize (GdkWindow *window,
         }
     }
 
-  _gdk_x11_drawable_update_size (private->impl);
+  _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (private->impl));
 }
 
 static inline void
@@ -1594,7 +1592,7 @@ window_x11_move_resize (GdkWindow *window,
   if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
     {
       _gdk_window_move_resize_child (window, x, y, width, height);
-      _gdk_x11_drawable_update_size (private->impl);
+      _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (private->impl));
     }
   else
     {
@@ -1612,7 +1610,7 @@ window_x11_move_resize (GdkWindow *window,
           private->width = width;
           private->height = height;
 
-          _gdk_x11_drawable_update_size (private->impl);
+          _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (private->impl));
         }
       else
         {
diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index f0292ec..77eb32b 100644
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -158,10 +158,12 @@ void            _gdk_x11_window_tmp_reset_bg        (GdkWindow *window,
 void            _gdk_x11_window_tmp_unset_parent_bg (GdkWindow *window);
 void            _gdk_x11_window_tmp_reset_parent_bg (GdkWindow *window);
 
-GdkCursor      *_gdk_x11_window_get_cursor    (GdkWindow *window);
-void            _gdk_x11_window_get_offsets   (GdkWindow *window,
-                                               gint      *x_offset,
-                                               gint      *y_offset);
+GdkCursor      *_gdk_x11_window_get_cursor          (GdkWindow *window);
+void            _gdk_x11_window_get_offsets         (GdkWindow *window,
+                                                     gint      *x_offset,
+                                                     gint      *y_offset);
+
+void            _gdk_x11_window_update_size         (GdkWindowImplX11 *impl);
 
 G_END_DECLS