diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index 7b54beb590..7161a232ca 100644 --- 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) - *x=usedRect.size.width; + *x=(int)usedRect.size.width; if(y) - *y=usedRect.size.height; + *y=(int)usedRect.size.height; if(descent) *descent=0; if(externalLeading) diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm index 23dd3261d6..cc84875881 100644 --- 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]; - *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; }