Applied patch [ 1217285 ] fix for bug 1040539

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 8c8a4f17cffcbea3644efeb4a0265a84b1dcd98f..b7edbd5e961ed4ec97e2252b10255081c38e13f7 100644 (file)
--- 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);
 
     // 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 );
     {
 #if wxUSE_TWO_WINDOWS
         SetInsertIntoMain( true );


@@ -156,7 +156,7 @@ bool wxWindow::Create(wxWindow *parent,
 #endif
     }
 
 #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
     if ( style & wxHSCROLL )
     {
 #if wxUSE_TWO_WINDOWS