Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch 1206278 from Mike Wetherell.

Browse Source 
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
This commit is contained in:
David Elliott
2005-05-23 04:11:29 +00:00
parent efe854952a
commit c05c7cb50b
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cocoa/button.mm
View File

@@ -106,6 +106,6 @@ wxSize wxButtonBase::GetDefaultSize()
{ {
static NSRect cocoaRect = MakeNSButtonDefaultRect(); static NSRect cocoaRect = MakeNSButtonDefaultRect();
// Apple HIG says OK/Cancel buttons have default width of 68. // 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));
} }

4
src/cocoa/control.mm
View File

@@ -87,7 +87,7 @@ NS_ENDHANDLER
if(cell) if(cell)
{ {
NSSize cellSize = [cell cellSize]; 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); wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from NSCell"),this,size.x,size.y);
return size; return size;
} }
@@ -104,7 +104,7 @@ NS_ENDHANDLER
if(didFit) if(didFit)
{ {
NSRect cocoaRect = [m_cocoaNSView frame]; 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]; [m_cocoaNSView setFrame: storedRect];
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y); wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y);
return size; return size;

2
src/cocoa/gauge.mm
View File

@@ -97,7 +97,7 @@ NS_ENDHANDLER
if(didFit) if(didFit)
{ {
NSRect cocoaRect = [m_cocoaNSView frame]; 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]; [m_cocoaNSView setFrame: storedRect];
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y); 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; return /*wxConstCast(this, wxControl)->m_bestSize =*/ size;

2
src/cocoa/textctrl.mm
View File

@@ -215,7 +215,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
NSCell *cell = [GetNSControl() cell]; NSCell *cell = [GetNSControl() cell];
wxASSERT(cell); wxASSERT(cell);
NSSize cellSize = [cell cellSize]; 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); wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
return size; return size;