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

More RTL work.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-13 22:20:10 +00:00
parent f4fe2f2052
commit 49e74855af
4 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gtk/dcclient.cpp
View File

@@ -331,8 +331,24 @@ wxWindowDC::wxWindowDC( wxWindow *window )
m_signX = -1;
// origin in the upper right corner
wxScrolledWindow *sw = wxDynamicCast( m_owner, wxScrolledWindow );
if (sw)
int scroll_lines = 0;
int scroll_step = 0;
// Are we using scrolling?
wxScrollHelper *sh = (wxScrollHelper*) m_owner->GetScrollHelper();
if (sh)
{
scroll_lines = sh->GetScrollLines(wxHORIZONTAL);
sh->GetScrollPixelsPerUnit( &scroll_step, NULL );
}
if (scroll_lines == 0)
{
int client_width = m_owner->GetClientSize().x;
m_deviceOriginX = client_width;
}
else
{
// We cannot use just the virtual size here, because
// the virtual size may be less than the visible area
@@ -340,26 +356,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
// horizontal scroll step is 10 pixels and the virtual
// area is 97 pixels, we should be able to see or scroll
// to 100 pixels, so the origin is at -100, not -97.
if (sw->GetScrollLines(wxHORIZONTAL) == 0)
{
int client_width = m_owner->GetClientSize().x;
m_deviceOriginX = client_width;
}
else
{
int scroll_step = 0;
sw->GetScrollPixelsPerUnit( &scroll_step, NULL );
int client_width = m_owner->GetClientSize().x;
int virtual_size = sw->GetVirtualSize().x;
int steps = (virtual_size + scroll_step - 1) / scroll_step;
int width = steps * scroll_step + (client_width % scroll_step);
m_deviceOriginX = width;
}
}
else
{
int client_width = m_owner->GetClientSize().x;
m_deviceOriginX = client_width;
int client_width = sh->GetTargetWindow()->GetClientSize().x;
int virtual_size = m_owner->GetVirtualSize().x;
int steps = (virtual_size + scroll_step - 1) / scroll_step;
int width = steps * scroll_step + (client_width % scroll_step);
m_deviceOriginX = width;
}
}
}
@@ -2151,6 +2152,11 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoo
rect.width = XLOG2DEVREL(width);
rect.height = YLOG2DEVREL(height);
if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
{
rect.x -= rect.width;
}
if (!m_currentClippingRegion.IsNull())
m_currentClippingRegion.Intersect( rect );
else