Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some harmless warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-08-17 21:00:28 +00:00
parent 03914ad4ec
commit d81cc883bc
4 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/app.cpp
View File

@@ -1950,7 +1950,7 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
wxWindow* focus = wxWindow::FindFocus() ; 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
} }
} }

2
src/mac/carbon/app.cpp
View File

@@ -1950,7 +1950,7 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
wxWindow* focus = wxWindow::FindFocus() ; 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
} }
} }

18
src/mac/carbon/choice.cpp
View File

@@ -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 ;
{
m_datas[n] = (char*) clientData ;
}
else
{
m_datas.Add( (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 )

18
src/mac/choice.cpp
View File

@@ -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 ;
{
m_datas[n] = (char*) clientData ;
}
else
{
m_datas.Add( (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 )