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

No real changes, just use wxSize::Get{Width,Height} and not Get{X,Y}.

Browse Source 
Use more readable accessors in wxGrid code to avoid confusion between wxGrid
(x, y) coordinates and wxSize (x, y) fields.

Closes #14347.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-15 23:23:27 +00:00
parent 4a699e3a59
commit 8e2c6c3f7d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/grid.cpp
View File

@@ -1942,20 +1942,20 @@ wxGrid::SetRenderScale(wxDC& dc,
double scaleX, scaleY;
wxSize sizeTemp;
if ( size.GetX() != wxDefaultSize.GetX() ) // size.x was specified
sizeTemp.SetWidth( size.GetX() );
if ( size.GetWidth() != wxDefaultSize.GetWidth() ) // size.x was specified
sizeTemp.SetWidth( size.GetWidth() );
else
sizeTemp.SetWidth( dc.DeviceToLogicalXRel( dc.GetSize().GetX() )
sizeTemp.SetWidth( dc.DeviceToLogicalXRel( dc.GetSize().GetWidth() )
- pos.x );
if ( size.GetY() != wxDefaultSize.GetY() ) // size.y was specified
sizeTemp.SetHeight( size.GetY() );
if ( size.GetHeight() != wxDefaultSize.GetHeight() ) // size.y was specified
sizeTemp.SetHeight( size.GetHeight() );
else
sizeTemp.SetHeight( dc.DeviceToLogicalYRel( dc.GetSize().GetY() )
sizeTemp.SetHeight( dc.DeviceToLogicalYRel( dc.GetSize().GetHeight() )
- pos.y );
scaleX = (double)( (double) sizeTemp.GetX() / (double) sizeGrid.GetX() );
scaleY = (double)( (double) sizeTemp.GetY() / (double) sizeGrid.GetY() );
scaleX = (double)( (double) sizeTemp.GetWidth() / (double) sizeGrid.GetWidth() );
scaleY = (double)( (double) sizeTemp.GetHeight() / (double) sizeGrid.GetHeight() );
dc.SetUserScale( wxMin( scaleX, scaleY), wxMin( scaleX, scaleY ) );
}