Improved my fix to SetScrollbars, using wxMax & GetClientSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -344,13 +344,14 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
|
|||||||
// here not just the size. It makes SetScrollbars 'sticky'
|
// here not just the size. It makes SetScrollbars 'sticky'
|
||||||
// emulating the old non-autoscroll behaviour.
|
// emulating the old non-autoscroll behaviour.
|
||||||
|
|
||||||
wxSize sz = m_targetWindow->GetSize();
|
wxSize sz = m_targetWindow->GetClientSize();
|
||||||
|
#if 1
|
||||||
|
int x = wxMax(noUnitsX * pixelsPerUnitX, sz.x);
|
||||||
|
int y = wxMax(noUnitsY * pixelsPerUnitY, sz.y);
|
||||||
|
#else
|
||||||
int x = noUnitsX * pixelsPerUnitX;
|
int x = noUnitsX * pixelsPerUnitX;
|
||||||
int y = noUnitsY * pixelsPerUnitY;
|
int y = noUnitsY * pixelsPerUnitY;
|
||||||
if (x == 0)
|
#endif
|
||||||
x = sz.x;
|
|
||||||
if (y == 0)
|
|
||||||
y = sz.y;
|
|
||||||
m_targetWindow->SetVirtualSizeHints( x, y );
|
m_targetWindow->SetVirtualSizeHints( x, y );
|
||||||
|
|
||||||
// The above should arguably be deprecated, this however we still need.
|
// The above should arguably be deprecated, this however we still need.
|
||||||
|
Reference in New Issue
Block a user