[Xfce4-commits] <midori:master> Avoid GtkScrolledWindow members in KatzeScrolled

[Christian Dywan]

Updating branch refs/heads/master
         to daa04eaeb199804246f7a3527b1c6d639df3094c (commit)
       from e94edca7664a054940d079e08e2e3050a1d83a9a (commit)

commit daa04eaeb199804246f7a3527b1c6d639df3094c
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Feb 19 19:02:57 2010 +0100

    Avoid GtkScrolledWindow members in KatzeScrolled

 katze/katze-scrolled.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/katze/katze-scrolled.c b/katze/katze-scrolled.c
index 54cdc79..9d30110 100644
--- a/katze/katze-scrolled.c
+++ b/katze/katze-scrolled.c
@@ -29,8 +29,9 @@
     #define gtk_widget_set_window(wdgt, wndw) wdgt->window = wndw
     #define gtk_widget_get_allocation (wdgt, alloc) *alloc = wdgt->allocation
     #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
+    #define gtk_widget_get_drawable GTK_WIDGET_VISIBLE
 #endif
-#if !GTK_CHECK_VERSION (2, 20, 0)
+#if !GTK_CHECK_VERSION (2, 19, 6)
     #define gtk_widget_set_realized(wdgt, real) \
         if (real) GTK_WIDGET_SET_FLAGS (wdgt, GTK_REALIZED); \
         else GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_REALIZED)
@@ -679,18 +680,22 @@ button_press_event (GtkWidget*      widget,
         priv->start_time  = event->time;
     }
 
-    if (priv->scrolling_hints && !GTK_SCROLLED_WINDOW (scrolled)->hscrollbar_visible &&
-        adjust_scrollbar (scrolled, priv->horizontal_scrollbar_window,
-                     gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled)),
-                         &priv->horizontal_scrollbar_size, FALSE))
+    if (priv->scrolling_hints
+        && !gtk_widget_get_visible (gtk_scrolled_window_get_hscrollbar (
+                                    GTK_SCROLLED_WINDOW (scrolled)))
+        && adjust_scrollbar (scrolled, priv->horizontal_scrollbar_window,
+           gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled)),
+               &priv->horizontal_scrollbar_size, FALSE))
     {
         gdk_window_raise (priv->horizontal_scrollbar_window);
         gdk_window_show (priv->horizontal_scrollbar_window);
     }
-    if (priv->scrolling_hints && !GTK_SCROLLED_WINDOW (scrolled)->vscrollbar_visible &&
-        adjust_scrollbar (scrolled, priv->vertical_scrollbar_window,
-                     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled)),
-                         &priv->vertical_scrollbar_size, TRUE))
+    if (priv->scrolling_hints
+        && !gtk_widget_get_visible (gtk_scrolled_window_get_vscrollbar (
+                                    GTK_SCROLLED_WINDOW (scrolled)))
+        && adjust_scrollbar (scrolled, priv->vertical_scrollbar_window,
+           gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled)),
+               &priv->vertical_scrollbar_size, TRUE))
     {
         gdk_window_raise (priv->vertical_scrollbar_window);
         gdk_window_show (priv->vertical_scrollbar_window);