From 940f5ae85da605ce4f5c0e95b881903947a2e702 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 18 Apr 2006 23:11:50 +0000 Subject: [PATCH] Fix code when making scrollwindow bigger so that the scroll bars will finally disappear. The code forgot to scroll the window back to 0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/scrolwin.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index 0ca01db247..b0bf3aa768 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -81,8 +81,14 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkAdjustment *adj, int *lines, int *linesPerPage) { - if ( pixelsPerLine == 0 || winSize >= virtSize ) + if ( pixelsPerLine == 0 || winSize >= virtSize) { + if ( !wxIsNullDouble(adj->value) ) + { + adj->value = 0.0; + g_signal_emit_by_name (adj, "value_changed"); + } + adj->upper = 1.0; adj->page_increment = 1.0; adj->page_size = 1.0; @@ -105,16 +111,7 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkAdjustment *adj, if (adj->value < 0.0) adj->value = 0.0; - if ( m_win->GetChildren().empty() ) - { - // This is enough without child windows - *pos = (int)adj->value; - } - else - { - // We need to actually scroll window - g_signal_emit_by_name (adj, "value_changed"); - } + g_signal_emit_by_name (adj, "value_changed"); } } -- 2.45.2