some harmless warning fixes

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index baa5f6485e5cc79ca3734d5a8da1eb5d1568b766..268e014276c4f89f6f0e679b79c3c2c52de97abb 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1950,7 +1950,7 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
         long keyval = wxMacTranslateKey(keychar, keycode) ;
 
         wxWindow* focus = wxWindow::FindFocus() ;
         long keyval = wxMacTranslateKey(keychar, keycode) ;
 
         wxWindow* focus = wxWindow::FindFocus() ;

-        bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
+        MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;

         // we don't have to do anything under classic here
     }
 }
         // we don't have to do anything under classic here
     }
 }

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index baa5f6485e5cc79ca3734d5a8da1eb5d1568b766..268e014276c4f89f6f0e679b79c3c2c52de97abb 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1950,7 +1950,7 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
         long keyval = wxMacTranslateKey(keychar, keycode) ;
 
         wxWindow* focus = wxWindow::FindFocus() ;
         long keyval = wxMacTranslateKey(keychar, keycode) ;
 
         wxWindow* focus = wxWindow::FindFocus() ;

-        bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
+        MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;

         // we don't have to do anything under classic here
     }
 }
         // we don't have to do anything under classic here
     }
 }

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index a88ecc17a1e136758aa963ebe612789ae94567c0..bc008702f43be2c29638fac049fa393aa2e53788 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -176,26 +176,18 @@ wxString wxChoice::GetString(int n) const
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {

-    wxCHECK_RET( n >= 0 && n < m_datas.GetCount(),
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),

                  "invalid index in wxChoice::SetClientData" );
                  "invalid index in wxChoice::SetClientData" );

-       wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ;

        
        

-       if ( m_datas.GetCount() > n )
-       {
-       m_datas[n] = (char*) clientData ;
-    }
-    else
-    {
-       m_datas.Add( (char*) clientData ) ;
-    }
+    m_datas[n] = (char*) clientData ;

 }
 
 }
 

-void *wxChoice::DoGetItemClientData(int N) const
+void *wxChoice::DoGetItemClientData(int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,

                  "invalid index in wxChoice::GetClientData" );
 
                  "invalid index in wxChoice::GetClientData" );
 

-    return (void *)m_datas[N];
+    return (void *)m_datas[n];

 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index a88ecc17a1e136758aa963ebe612789ae94567c0..bc008702f43be2c29638fac049fa393aa2e53788 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -176,26 +176,18 @@ wxString wxChoice::GetString(int n) const
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {

-    wxCHECK_RET( n >= 0 && n < m_datas.GetCount(),
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),

                  "invalid index in wxChoice::SetClientData" );
                  "invalid index in wxChoice::SetClientData" );

-       wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ;

        
        

-       if ( m_datas.GetCount() > n )
-       {
-       m_datas[n] = (char*) clientData ;
-    }
-    else
-    {
-       m_datas.Add( (char*) clientData ) ;
-    }
+    m_datas[n] = (char*) clientData ;

 }
 
 }
 

-void *wxChoice::DoGetItemClientData(int N) const
+void *wxChoice::DoGetItemClientData(int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,

                  "invalid index in wxChoice::GetClientData" );
 
                  "invalid index in wxChoice::GetClientData" );
 

-    return (void *)m_datas[N];
+    return (void *)m_datas[n];

 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )