Add support for wxALWAYS_SHOW_SB style to wxScrolled<>.

Simply call ShowScrollbars(wxSHOW_SB_ALWAYS) if this style is specified.

Closes #13616.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index c2240e528df281f1a5c82fef03df4280f83599b8..59fb3b6d127ae14f1154aea03cbaa43d34017b7b 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -563,6 +563,7 @@ All (GUI):
 - Add wxStyledTextCtrl::AnnotationClearLine() (sentieshar).
 - Add support for background-color style to span element in wxHTML (gevorg).
 - Add "inherit" to <font> XRC tag (Steffen Olszewski, Gero Meßsysteme GmbH).
 - Add wxStyledTextCtrl::AnnotationClearLine() (sentieshar).
 - Add support for background-color style to span element in wxHTML (gevorg).
 - Add "inherit" to <font> XRC tag (Steffen Olszewski, Gero Meßsysteme GmbH).

+- Add support for wxALWAYS_SHOW_SB style to wxScrolled<> (Catalin Raceanu).

 
 wxGTK:
 
 
 wxGTK:
 

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 6360fd721b1d5d45e82c2aac06055ce9c0fb755f..53883f2ae2c6068a1cdc206b809d1a227e3ba5d5 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -384,6 +384,9 @@ public:
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 

+        if ( style & wxALWAYS_SHOW_SB )
+            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
+

         return T::Create(parent, winid, pos, size, style, name);
     }
 
         return T::Create(parent, winid, pos, size, style, name);
     }
 

diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h
index 3d3f8f4717aaca5b1c7997d62096d3de641661ca..f7c3568b58cfecd966f9d7d789f31f8ea87718e3 100644 (file)
--- a/interface/wx/scrolwin.h
+++ b/interface/wx/scrolwin.h
@@ -109,6 +109,9 @@ enum wxScrollbarVisibility
            scrollable only in vertical direction (by default, i.e. if neither
            this style nor ::wxHSCROLL is specified, it scrolls in both
            directions).
            scrollable only in vertical direction (by default, i.e. if neither
            this style nor ::wxHSCROLL is specified, it scrolls in both
            directions).

+    @style{wxALWAYS_SHOW_SB}
+           Since wxWidgets 2.9.5, specifying this style makes the window always
+           show its scrollbars, even if they are not used. See ShowScrollbars().

     @style{wxRETAINED}
            Uses a backing pixmap to speed refreshes. Motif only.
     @endStyleTable
     @style{wxRETAINED}
            Uses a backing pixmap to speed refreshes. Motif only.
     @endStyleTable