fixing some warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3f2cd15f3d
commit
728447a06a
@ -1388,7 +1388,6 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
|
||||
if ( !focus )
|
||||
return false ;
|
||||
|
||||
bool handled;
|
||||
wxKeyEvent event( wxEVT_KEY_UP ) ;
|
||||
MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
|
||||
|
||||
|
@ -73,7 +73,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
|
||||
|
||||
CGColorRef col = 0 ;
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
if ( CGColorCreateGenericRGB )
|
||||
if ( CGColorCreateGenericRGB != NULL )
|
||||
col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
|
||||
else
|
||||
#endif
|
||||
@ -93,7 +93,7 @@ void wxColour::InitRGBColor( const RGBColor& col )
|
||||
m_alpha = wxALPHA_OPAQUE;
|
||||
CGColorRef cfcol;
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
if ( CGColorCreateGenericRGB )
|
||||
if ( CGColorCreateGenericRGB != NULL )
|
||||
cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
|
||||
(CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
|
||||
else
|
||||
|
@ -376,7 +376,7 @@ bool wxHIDDevice::IsActive(int nIndex)
|
||||
// ----------------------------------------------------------------------------
|
||||
bool wxHIDDevice::HasElement(int nIndex)
|
||||
{
|
||||
return m_pCookies[nIndex] != NULL;
|
||||
return (void*) m_pCookies[nIndex] != NULL;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user