diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index f625571409..ebf81ecc1f 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -2334,7 +2334,7 @@ wxSize wxBoxSizer::CalcMin() // 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. - SizeInMajorDir(m_minSize) += maxMinSizeToProp*m_totalProportion; + SizeInMajorDir(m_minSize) += (int)(maxMinSizeToProp*m_totalProportion); return m_minSize; } diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp index 7545767b41..a4b78de675 100644 --- a/src/osx/carbon/window.cpp +++ b/src/osx/carbon/window.cpp @@ -998,8 +998,8 @@ void wxMacControl::GetPosition( int &x, int &y ) const { HIRect parent; HIViewGetFrame( HIViewGetSuperview(m_controlRef), &parent ); - x -= parent.origin.x; - y -= parent.origin.y; + x -= (int)parent.origin.x; + y -= (int)parent.origin.y; } } diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index accef767a8..ced1a2369d 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -503,10 +503,8 @@ wxSize wxNSTextViewControl::GetBestSize() const if (m_textView && [m_textView layoutManager]) { NSRect rect = [[m_textView layoutManager] usedRectForTextContainer: [m_textView textContainer]]; - wxSize size = wxSize(rect.size.width, rect.size.height); - size.x += [m_textView textContainerInset].width; - size.y += [m_textView textContainerInset].height; - return size; + return wxSize((int)(rect.size.width + [m_textView textContainerInset].width), + (int)(rect.size.height + [m_textView textContainerInset].height)); } return wxSize(0,0); }