Fix harmless float to int conversion warnings in wxOSX build.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index f62557140981c2eb9f6d0649109a868b5ca82cbd..ebf81ecc1f267c5cadf75e99d9ce5fd66494a99b 100644 (file)
--- 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.
 
     // 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;
 }
 
     return m_minSize;
 }

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index 7545767b41643b0a47ae48c0b8aa632ffd8b25e0..a4b78de67591ab8192176decd5d0e9450f7607dd 100644 (file)
--- 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 );
     {
         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 accef767a8415e5beabff4925a701c7ddc323143..ced1a2369d6bfac1357266557f677b7f68fac776 100644 (file)
--- 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]];
     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);
 }
     }
     return wxSize(0,0);
 }