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

Fix harmless float to int conversion warnings in wxOSX build.

Browse Source 
Add casts to truncate the values as the code intended anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-07-28 11:26:26 +00:00
parent 6178debcd3
commit 4a49fa24c9
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/sizer.cpp
View File

@@ -2334,7 +2334,7 @@ wxSize wxBoxSizer::CalcMin()
// Using the max ratio ensures that the min size is big enough for all // Using the max ratio ensures that the min size is big enough for all
// items to have their min size and satisfy the proportions among them. // items to have their min size and satisfy the proportions among them.
SizeInMajorDir(m_minSize) += maxMinSizeToProp*m_totalProportion; SizeInMajorDir(m_minSize) += (int)(maxMinSizeToProp*m_totalProportion);
return m_minSize; return m_minSize;
} }

4
src/osx/carbon/window.cpp
View File

@@ -998,8 +998,8 @@ void wxMacControl::GetPosition( int &x, int &y ) const
{ {
HIRect parent; HIRect parent;
HIViewGetFrame( HIViewGetSuperview(m_controlRef), &parent ); HIViewGetFrame( HIViewGetSuperview(m_controlRef), &parent );
x -= parent.origin.x; x -= (int)parent.origin.x;
y -= parent.origin.y; y -= (int)parent.origin.y;
} }
} }

6
src/osx/cocoa/textctrl.mm
View File

@@ -503,10 +503,8 @@ wxSize wxNSTextViewControl::GetBestSize() const
if (m_textView && [m_textView layoutManager]) if (m_textView && [m_textView layoutManager])
{ {
NSRect rect = [[m_textView layoutManager] usedRectForTextContainer: [m_textView textContainer]]; NSRect rect = [[m_textView layoutManager] usedRectForTextContainer: [m_textView textContainer]];
wxSize size = wxSize(rect.size.width, rect.size.height); return wxSize((int)(rect.size.width + [m_textView textContainerInset].width),
size.x += [m_textView textContainerInset].width; (int)(rect.size.height + [m_textView textContainerInset].height));
size.y += [m_textView textContainerInset].height;
return size;
} }
return wxSize(0,0); return wxSize(0,0);
} }