From cbe6a493b66ad18b6a1f490589f2706f0f841b01 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 14 Dec 2012 06:29:54 +0000 Subject: [PATCH] compute scrollbar spacing the same way GtkScrolledWindow does it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 62b93d3..66e9818 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2837,8 +2837,16 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(m_widget), &policy[ScrollDir_Horz], &policy[ScrollDir_Vert]); - int scrollbar_spacing; - gtk_widget_style_get(m_widget, "scrollbar-spacing", &scrollbar_spacing, NULL); + + // get scrollbar spacing the same way the GTK-private function + // _gtk_scrolled_window_get_scrollbar_spacing() does it + int scrollbar_spacing = + GTK_SCROLLED_WINDOW_GET_CLASS(m_widget)->scrollbar_spacing; + if (scrollbar_spacing < 0) + { + gtk_widget_style_get( + m_widget, "scrollbar-spacing", &scrollbar_spacing, NULL); + } for ( int i = 0; i < ScrollDir_Max; i++ ) { -- 2.7.4