some float -> int conversion warnings suppressed (but I wonder if this is really...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 7b54beb5905ea94d5842545115c59ce5e867555d..7161a232ca256afee933a63827b76d1d858c687b 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -88,9 +88,9 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord
     NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer];
     NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer];
     if(x)
     NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer];
     NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer];
     if(x)

-        *x=usedRect.size.width;
+        *x=(int)usedRect.size.width;

     if(y)
     if(y)

-        *y=usedRect.size.height;
+        *y=(int)usedRect.size.height;

     if(descent)
         *descent=0;
     if(externalLeading)
     if(descent)
         *descent=0;
     if(externalLeading)

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index 23dd3261d615fd009a3a8adeb87c91b931676e50..cc8487588116043c708cf5fcc20aea7e8f3cefdb 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -47,12 +47,12 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
     NSRect contentRect = [[GetNSBox() contentView] frame];
     NSRect thisRect = [m_cocoaNSView frame];
 {
     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;
     if(nextBorder > *borderOther)
         *borderOther = nextBorder;

-    nextBorder = contentRect.origin.x;
+    nextBorder = (int)contentRect.origin.x;

     if(nextBorder > *borderOther)
         *borderOther = nextBorder;
 }
     if(nextBorder > *borderOther)
         *borderOther = nextBorder;
 }