From: David Elliott <dfe@tgwbd.org>
Date: Mon, 23 May 2005 04:11:29 +0000 (+0000)
Subject: Applied patch 1206278 from Mike Wetherell.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c05c7cb50b01e7d081e572193cb9c68a6974e1c6

Applied patch 1206278 from Mike Wetherell.
Changes ceilf calls to ceil to be compatible with Mac OS 10.1.


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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 5ae10895f6..a00ff71329 100644
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -106,6 +106,6 @@ wxSize wxButtonBase::GetDefaultSize()
 {
     static NSRect cocoaRect = MakeNSButtonDefaultRect();
     // Apple HIG says OK/Cancel buttons have default width of 68.
-    return wxSize(68,(int)ceilf(cocoaRect.size.height));
+    return wxSize(68,(int)ceil(cocoaRect.size.height));
 }
 
diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index b474911ec2..596f9cf4b0 100644
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -87,7 +87,7 @@ NS_ENDHANDLER
     if(cell)
     {
         NSSize cellSize = [cell cellSize];
-        wxSize size((int)ceilf(cellSize.width),(int)ceilf(cellSize.height));
+        wxSize size((int)ceil(cellSize.width),(int)ceil(cellSize.height));
         wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from NSCell"),this,size.x,size.y);
         return size;
     }
@@ -104,7 +104,7 @@ NS_ENDHANDLER
     if(didFit)
     {
         NSRect cocoaRect = [m_cocoaNSView frame];
-        wxSize size((int)ceilf(cocoaRect.size.width),(int)ceilf(cocoaRect.size.height));
+        wxSize size((int)ceil(cocoaRect.size.width),(int)ceil(cocoaRect.size.height));
         [m_cocoaNSView setFrame: storedRect];
         wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y);
         return size;
diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm
index 3405ae7db5..08b164e419 100644
--- a/src/cocoa/gauge.mm
+++ b/src/cocoa/gauge.mm
@@ -97,7 +97,7 @@ NS_ENDHANDLER
     if(didFit)
     {
         NSRect cocoaRect = [m_cocoaNSView frame];
-        wxSize size((int)ceilf(cocoaRect.size.width),(int)ceilf(cocoaRect.size.height));
+        wxSize size((int)ceil(cocoaRect.size.width),(int)ceil(cocoaRect.size.height));
         [m_cocoaNSView setFrame: storedRect];
         wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y);
         return /*wxConstCast(this, wxControl)->m_bestSize =*/ size;
diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index b1333610cb..ded17b2b1a 100644
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -215,7 +215,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
     NSCell *cell = [GetNSControl() cell];
     wxASSERT(cell);
     NSSize cellSize = [cell cellSize];
-    wxSize size(100,(int)ceilf(cellSize.height));
+    wxSize size(100,(int)ceil(cellSize.height));
 
     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
     return size;