some float -> int conversion warnings suppressed (but I wonder if this is really the right thing to do?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,12 +47,12 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
|
||||
{
|
||||
NSRect contentRect = [[GetNSBox() contentView] frame];
|
||||
NSRect thisRect = [m_cocoaNSView frame];
|
||||
*borderTop = thisRect.size.height - (contentRect.origin.y+contentRect.size.height);
|
||||
*borderOther = thisRect.size.width - (contentRect.origin.x+contentRect.size.width);
|
||||
int nextBorder = contentRect.origin.y;
|
||||
*borderTop = (int)(thisRect.size.height - (contentRect.origin.y+contentRect.size.height));
|
||||
*borderOther = (int)(thisRect.size.width - (contentRect.origin.x+contentRect.size.width));
|
||||
int nextBorder = (int)contentRect.origin.y;
|
||||
if(nextBorder > *borderOther)
|
||||
*borderOther = nextBorder;
|
||||
nextBorder = contentRect.origin.x;
|
||||
nextBorder = (int)contentRect.origin.x;
|
||||
if(nextBorder > *borderOther)
|
||||
*borderOther = nextBorder;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user