diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index d7dc2db405..5a4c7a91ca 100644 --- a/src/osx/carbon/app.cpp +++ b/src/osx/carbon/app.cpp @@ -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 ) ; diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index 7e388aee4e..d8746577b0 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -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 diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp index 8b09c43ff2..06ba8a0f5f 100644 --- a/src/osx/core/hid.cpp +++ b/src/osx/core/hid.cpp @@ -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; } // ----------------------------------------------------------------------------