implementing wxALWAYS_SHOW_SB from 1744665

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-07-23 17:08:28 +00:00
parent b63b53820a
commit 188b7013e8

View File

@@ -2611,7 +2611,7 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
{ {
if ( m_hScrollBar ) if ( m_hScrollBar )
{ {
showScroller = ((range != 0) && (range > thumbVisible)); showScroller = HasFlag( wxALWAYS_SHOW_SB ) || ((range != 0) && (range > thumbVisible));
if ( m_hScrollBar->IsShown() != showScroller ) if ( m_hScrollBar->IsShown() != showScroller )
{ {
m_hScrollBar->Show( showScroller ); m_hScrollBar->Show( showScroller );
@@ -2625,7 +2625,7 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
{ {
if ( m_vScrollBar ) if ( m_vScrollBar )
{ {
showScroller = ((range != 0) && (range > thumbVisible)); showScroller = HasFlag( wxALWAYS_SHOW_SB ) || ((range != 0) && (range > thumbVisible));
if ( m_vScrollBar->IsShown() != showScroller ) if ( m_vScrollBar->IsShown() != showScroller )
{ {
m_vScrollBar->Show( showScroller ) ; m_vScrollBar->Show( showScroller ) ;
@@ -3187,7 +3187,7 @@ void wxWindowMac::MacCreateScrollBars( long style )
if ( style & wxVSCROLL ) if ( style & wxVSCROLL )
m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL); m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL);
if ( style & wxHSCROLL ) if ( style & wxHSCROLL )
m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL); m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
} }