From 1cb853a8ca8376cbbe5aa094a7ccfc4ce3b74b33 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 16 Jun 2005 16:07:49 +0000 Subject: [PATCH] Applied patch [ 1217285 ] fix for bug 1040539 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/univ/winuniv.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 8c8a4f17cf..b7edbd5e96 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -142,8 +142,8 @@ bool wxWindow::Create(wxWindow *parent, // when calling the base window Create(). wxWindowBase::SetWindowStyleFlag(style); - // if we should always have a vertical scrollbar, do show it - if ( style & wxALWAYS_SHOW_SB ) + // if we allow or should always have a vertical scrollbar, make it + if ( style & wxVSCROLL || style & wxALWAYS_SHOW_SB ) { #if wxUSE_TWO_WINDOWS SetInsertIntoMain( true ); @@ -156,7 +156,7 @@ bool wxWindow::Create(wxWindow *parent, #endif } - // if we should always have a horizontal scrollbar, do show it + // if we should allow a horizontal scrollbar, make it if ( style & wxHSCROLL ) { #if wxUSE_TWO_WINDOWS -- 2.45.2