fixing some warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index d7dc2db405f3118cd2c725fe4a56ebef3de94f57..5a4c7a91ca3f5806590647c0748993940c99b197 100644 (file)
--- 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 7e388aee4e3344d53c574aa535a1b2b87f644cc6..d8746577b0e2518a51a07b03c813e1cd6dabddb5 100644 (file)
--- 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 8b09c43ff24982ee4ffb658182fa5b3a1eaf52ec..06ba8a0f5f661b68e72839b69afda93e6dc95414 100644 (file)
--- 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;
 }
 
 // ----------------------------------------------------------------------------