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

Fixes to wxMotif scrolling and colours (wxTreeCtrl/wxListCtrl now seem to work

Browse Source 
well, ta-ra!); fixes to thread.cpp since constants were changed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-28 21:32:10 +00:00
parent cffee23b4f
commit 88150e6073
14 changed files with 239 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/generic/scrolwin.cpp
View File

@@ -121,7 +121,6 @@ void wxScrolledWindow::OnScroll(wxScrollEvent& event)
int nScrollInc = CalcScrollInc(event);
if (nScrollInc == 0) return;
// TODO: should we store the scroll position here as well as in wxWindow?
if (orient == wxHORIZONTAL)
{
int newPos = m_xScrollPosition + nScrollInc;
@@ -133,19 +132,6 @@ void wxScrolledWindow::OnScroll(wxScrollEvent& event)
SetScrollPos(wxVERTICAL, newPos, TRUE );
}
/*
// TODO We need to multiply the ScrollWindow amount by the scaling
// factor, but how do we know what this is in wxWin 2.0???
float scaleX = 1.0;
float scaleY = 1.0;
if ( this->IsKindOf(CLASSINFO(wxCanvas)) )
{
wxDC* dc = ((wxCanvas *)this)->GetDC();
dc->GetUserScale(&scaleX, &scaleY);
}
*/
if (orient == wxHORIZONTAL)
{
m_xScrollPosition += nScrollInc;
@@ -234,6 +220,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
break;
}
}
if (orient == wxHORIZONTAL)
{
if (m_xScrollPixelsPerLine > 0) {
@@ -295,7 +282,8 @@ void wxScrolledWindow::AdjustScrollbars(void)
m_xScrollPosition = wxMax( 0, m_xScrollPosition );
SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
// SetScrollPageSize(wxHORIZONTAL, noPagePositions);
// The amount by which we scroll when paging
SetScrollPageSize(wxHORIZONTAL, noPagePositions);
}
else
{
@@ -316,7 +304,8 @@ void wxScrolledWindow::AdjustScrollbars(void)
m_yScrollPosition = wxMax( 0, m_yScrollPosition );
SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
// SetScrollPageSize(wxVERTICAL, noPagePositions);
// The amount by which we scroll when paging
SetScrollPageSize(wxVERTICAL, noPagePositions);
}
else
{