diff options
| author | Jasmine Hassan <[email protected]> | 2012-12-22 05:37:47 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-12-22 05:37:47 +0200 |
| commit | 7b384b35d0226eed7711f2d1fa0ca04381380d23 (patch) | |
| tree | 8af568152e25f943566cd34e3029c7ac5509adba | |
| parent | 558280660418ef9e27e36ddd0619225c691e44b7 (diff) | |
| download | caja-7b384b35d0226eed7711f2d1fa0ca04381380d23.tar.bz2 caja-7b384b35d0226eed7711f2d1fa0ca04381380d23.tar.xz | |
[general] Don't use deprecated gdk_drawable_get_size at all
Since we now require GTK 2.24, we can directly use
gdk_window_get_width(), gdk_window_get_height()
| -rw-r--r-- | eel/eel-art-gtk-extensions.c | 13 | ||||
| -rw-r--r-- | libcaja-private/caja-tree-view-drag-dest.c | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/eel/eel-art-gtk-extensions.c b/eel/eel-art-gtk-extensions.c index 09f6d9d5..59963583 100644 --- a/eel/eel-art-gtk-extensions.c +++ b/eel/eel-art-gtk-extensions.c @@ -90,13 +90,8 @@ eel_gdk_window_get_bounds (GdkWindow *gdk_window) gdk_window_get_position (gdk_window, &bounds.x0, &bounds.y0); -#if GTK_CHECK_VERSION(3, 0, 0) width = gdk_window_get_width(gdk_window); height = gdk_window_get_height(gdk_window); -#else - gdk_drawable_get_size (gdk_window, &width, &height); -#endif - bounds.x1 = bounds.x0 + width; bounds.y1 = bounds.y0 + height; @@ -128,12 +123,8 @@ eel_gdk_window_get_screen_relative_bounds (GdkWindow *gdk_window) return eel_irect_empty; } -#if GTK_CHECK_VERSION(3, 0, 0) width = gdk_window_get_width(gdk_window); height = gdk_window_get_height(gdk_window); -#else - gdk_drawable_get_size(gdk_window, &width, &height); -#endif screen_bounds.x1 = screen_bounds.x0 + width; screen_bounds.y1 = screen_bounds.y0 + height; @@ -321,12 +312,8 @@ eel_gdk_window_get_dimensions (GdkWindow *gdk_window) g_return_val_if_fail (gdk_window != NULL, eel_dimensions_empty); -#if GTK_CHECK_VERSION(3, 0, 0) dimensions.width = gdk_window_get_width(gdk_window); dimensions.height = gdk_window_get_height(gdk_window); -#else - gdk_drawable_get_size (gdk_window, &dimensions.width, &dimensions.height); -#endif return dimensions; } diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c index 56e9a1cd..e1cb7bad 100644 --- a/libcaja-private/caja-tree-view-drag-dest.c +++ b/libcaja-private/caja-tree-view-drag-dest.c @@ -203,12 +203,8 @@ highlight_expose (GtkWidget *widget, /* FIXMEchpe: is bin window right here??? */ bin_window = gtk_tree_view_get_bin_window (GTK_TREE_VIEW (widget)); -#if GTK_CHECK_VERSION(3, 0, 0) width = gdk_window_get_width(bin_window); height = gdk_window_get_height(bin_window); -#else - gdk_drawable_get_size(bin_window, &width, &height); -#endif gtk_paint_focus (gtk_widget_get_style (widget), #if GTK_CHECK_VERSION(3,0,0) |