suppress warnings about implicit float -> int conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -201,17 +201,17 @@ void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height)
|
|||||||
hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller]
|
hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller]
|
||||||
hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller]
|
hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller]
|
||||||
borderType: [m_cocoaNSScrollView borderType]];
|
borderType: [m_cocoaNSScrollView borderType]];
|
||||||
width = frameSize.width;
|
width = (int)frameSize.width;
|
||||||
height = frameSize.height;
|
height = (int)frameSize.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const
|
void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const
|
||||||
{
|
{
|
||||||
NSSize nssize = [m_cocoaNSScrollView contentSize];
|
NSSize nssize = [m_cocoaNSScrollView contentSize];
|
||||||
if(x)
|
if(x)
|
||||||
*x = nssize.width;
|
*x = (int)nssize.width;
|
||||||
if(y)
|
if(y)
|
||||||
*y = nssize.height;
|
*y = (int)nssize.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindowCocoaScroller::Cocoa_FrameChanged(void)
|
void wxWindowCocoaScroller::Cocoa_FrameChanged(void)
|
||||||
|
Reference in New Issue
Block a user