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

Next round of RTL fixes. This change greatly simplifes

Browse Source 
the code and makes most #ifdefs redundant.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-16 21:44:21 +00:00
parent 9b0b3151e0
commit 807a572ef4
4 changed files with 65 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/generic/scrlwing.cpp
View File

@@ -815,8 +815,17 @@ void wxScrollHelper::AdjustScrollbars()
void wxScrollHelper::DoPrepareDC(wxDC& dc)
{
wxPoint pt = dc.GetDeviceOrigin();
dc.SetDeviceOrigin( pt.x - m_xScrollPosition * m_xScrollPixelsPerLine,
pt.y - m_yScrollPosition * m_yScrollPixelsPerLine );
#ifdef __WXGTK__
// It may actually be correct to always query
// the m_sign from the DC here, but I leve the
// #ifdef GTK for now.
if (m_win->GetLayoutDirection() == wxLayout_RightToLeft)
dc.SetDeviceOrigin( pt.x + m_xScrollPosition * m_xScrollPixelsPerLine,
pt.y - m_yScrollPosition * m_yScrollPixelsPerLine );
else
#endif
dc.SetDeviceOrigin( pt.x - m_xScrollPosition * m_xScrollPixelsPerLine,
pt.y - m_yScrollPosition * m_yScrollPixelsPerLine );
dc.SetUserScale( m_scaleX, m_scaleY );
}
@@ -949,33 +958,7 @@ void wxScrollHelper::GetViewStart (int *x, int *y) const
void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
{
if ( xx )
{
if ((m_xScrollLines == 0) || (m_xScrollPixelsPerLine == 0))
{
// nothing to do
*xx = x;
}
else
{
#ifdef __WXGTK__
if (m_win->GetLayoutDirection() == wxLayout_RightToLeft)
{
int w = 0, h = 0;
GetTargetSize(&w, &h);
// Calculate page size i.e. number of scroll units you get on the
// current client window
int noPagePositions = w/m_xScrollPixelsPerLine;
if (noPagePositions < 1) noPagePositions = 1;
*xx = x - ((m_xScrollLines - noPagePositions - m_xScrollPosition) * m_xScrollPixelsPerLine);
}
else
#endif
{
*xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
}
}
}
*xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
if ( yy )
*yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
}
@@ -983,33 +966,7 @@ void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) cons
void wxScrollHelper::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
{
if ( xx )
{
if ((m_xScrollLines == 0) || (m_xScrollPixelsPerLine == 0))
{
// nothing to do
*xx = x;
}
else
{
#ifdef __WXGTK__
if (m_win->GetLayoutDirection() == wxLayout_RightToLeft)
{
int w = 0, h = 0;
GetTargetSize(&w, &h);
// Calculate page size i.e. number of scroll units you get on the
// current client window
int noPagePositions = w/m_xScrollPixelsPerLine;
if (noPagePositions < 1) noPagePositions = 1;
*xx = x + ((m_xScrollLines - noPagePositions - m_xScrollPosition) * m_xScrollPixelsPerLine);
}
else
#endif
{
*xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
}
}
}
*xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
if ( yy )
*yy = y + m_yScrollPosition * m_yScrollPixelsPerLine;
}