Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gtk/scrolwin.cpp
View File

@@ -313,7 +313,7 @@ bool wxScrolledWindow::Create(wxWindow *parent,
PostCreation();
Show( TRUE );
return TRUE;
}
@@ -349,8 +349,12 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
m_hAdjust->value = m_xScrollPosition = xPos;
m_vAdjust->value = m_yScrollPosition = yPos;
// Setting hints here should arguably be deprecated, but without it
// a sizer might override this manual scrollbar setting in old code.
m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
if (!noRefresh)
{
int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
@@ -381,13 +385,16 @@ void wxScrolledWindow::AdjustScrollbars()
// If the scrollbar hits the right side, move the window
// right to keep it from over extending.
if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper))
{
m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
if (m_hAdjust->value < 0.0)
m_hAdjust->value = 0.0;
if (GetChildren().GetCount() == 0)
{
m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
m_xScrollPosition = (int)m_hAdjust->value;
}
m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows
else
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window
}
}
@@ -401,13 +408,16 @@ void wxScrolledWindow::AdjustScrollbars()
m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))
{
m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
if (m_vAdjust->value < 0.0)
m_vAdjust->value = 0.0;
if (GetChildren().GetCount() == 0)
{
m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
m_yScrollPosition = (int)m_vAdjust->value;
}
m_yScrollPosition = (int)m_vAdjust->value;
else
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
}
}
@@ -823,10 +833,17 @@ bool wxScrolledWindow::Layout()
// Default OnSize resets scrollbars, if any
void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
{
if( m_targetWindow != this )
m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
if( GetAutoLayout() )
{
if( m_targetWindow != this )
m_targetWindow->FitInside();
SetVirtualSize( GetClientSize() );
FitInside();
}
else
{
AdjustScrollbars();
}
}
// This calls OnDraw, having adjusted the origin according to the current
@@ -849,7 +866,7 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
szx, szy, // view size (total)
clix, cliy; // view size (on screen)
ViewStart(&stx, &sty);
GetViewStart(&stx, &sty);
GetClientSize(&clix, &cliy);
GetVirtualSize(&szx, &szy);