OS/2 scrolling support for controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -200,6 +200,15 @@ bool wxSlider::Create(
|
||||
{
|
||||
lMsStyle |= WS_VISIBLE | SS_TEXT | DT_VCENTER;
|
||||
|
||||
//
|
||||
// If the parent is a scrolled window the controls must
|
||||
// have this style or they will overlap the scrollbars
|
||||
//
|
||||
if (pParent)
|
||||
if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
|
||||
pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
|
||||
lMsStyle |= WS_CLIPSIBLINGS;
|
||||
|
||||
m_hStaticValue = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
|
||||
,WC_STATIC // Window class
|
||||
,(PSZ)NULL // Initial Text
|
||||
@@ -219,6 +228,15 @@ bool wxSlider::Create(
|
||||
lWstyle = SS_TEXT|DT_LEFT|WS_VISIBLE;
|
||||
if (m_windowStyle & wxCLIP_SIBLINGS)
|
||||
lWstyle |= WS_CLIPSIBLINGS;
|
||||
//
|
||||
// If the parent is a scrolled window the controls must
|
||||
// have this style or they will overlap the scrollbars
|
||||
//
|
||||
if (pParent)
|
||||
if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
|
||||
pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
|
||||
lWstyle |= WS_CLIPSIBLINGS;
|
||||
|
||||
m_hStaticMin = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
|
||||
,WC_STATIC // Window class
|
||||
,(PSZ)wxBuffer // Initial Text
|
||||
@@ -263,6 +281,15 @@ bool wxSlider::Create(
|
||||
else
|
||||
lMsStyle |= SLS_PRIMARYSCALE2;
|
||||
|
||||
//
|
||||
// If the parent is a scrolled window the controls must
|
||||
// have this style or they will overlap the scrollbars
|
||||
//
|
||||
if (pParent)
|
||||
if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
|
||||
pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
|
||||
lMsStyle |= WS_CLIPSIBLINGS;
|
||||
|
||||
m_nPageSize = ((nMaxValue - nMinValue)/10);
|
||||
vSlData.usScale1Increments = m_nPageSize;
|
||||
vSlData.usScale2Increments = m_nPageSize;
|
||||
@@ -311,6 +338,15 @@ bool wxSlider::Create(
|
||||
lWstyle = SS_TEXT|DT_LEFT|WS_VISIBLE;
|
||||
if (m_windowStyle & wxCLIP_SIBLINGS)
|
||||
lMsStyle |= WS_CLIPSIBLINGS;
|
||||
//
|
||||
// If the parent is a scrolled window the controls must
|
||||
// have this style or they will overlap the scrollbars
|
||||
//
|
||||
if (pParent)
|
||||
if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
|
||||
pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
|
||||
lWstyle |= WS_CLIPSIBLINGS;
|
||||
|
||||
m_hStaticMax = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
|
||||
,WC_STATIC // Window class
|
||||
,(PSZ)wxBuffer // Initial Text
|
||||
|
Reference in New Issue
Block a user