X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065e208ec09e3d08d51d9604497f92f53c210f93..9c862cfb93c8d54cfdd18a7c54c518b1234afa1c:/src/cocoa/control.mm diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm index b474911ec2..3bb9b1b29f 100644 --- a/src/cocoa/control.mm +++ b/src/cocoa/control.mm @@ -1,18 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/control.mm +// Name: src/cocoa/control.mm // Purpose: wxControl class // Author: David Elliiott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/control.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" - #include "wx/control.h" #include "wx/log.h" #endif @@ -87,7 +88,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 +105,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; @@ -123,4 +124,3 @@ void wxControl::CocoaSetEnabled(bool enable) { [GetNSControl() setEnabled: enable]; } -