From d81cc883bc38c282f972490fe20dcc103c07393e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Aug 2002 21:00:28 +0000 Subject: [PATCH] some harmless warning fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/app.cpp | 2 +- src/mac/carbon/app.cpp | 2 +- src/mac/carbon/choice.cpp | 18 +++++------------- src/mac/choice.cpp | 18 +++++------------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/mac/app.cpp b/src/mac/app.cpp index baa5f6485e..268e014276 100644 --- 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() ; - 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 } } diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index baa5f6485e..268e014276 100644 --- 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() ; - 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 } } diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index a88ecc17a1..bc008702f4 100644 --- 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 ) { - wxCHECK_RET( n >= 0 && n < m_datas.GetCount(), + wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(), "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" ); - return (void *)m_datas[N]; + return (void *)m_datas[n]; } void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp index a88ecc17a1..bc008702f4 100644 --- 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 ) { - wxCHECK_RET( n >= 0 && n < m_datas.GetCount(), + wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(), "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" ); - return (void *)m_datas[N]; + return (void *)m_datas[n]; } void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) -- 2.45.2