getting rid of warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -544,9 +544,9 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
|
|||||||
wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
|
wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
|
||||||
}
|
}
|
||||||
#endif // wxUSE_OWNER_DRAWN
|
#endif // wxUSE_OWNER_DRAWN
|
||||||
wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
|
wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , "invalid client_data array" ) ;
|
||||||
|
|
||||||
if ( m_dataArray.GetCount() > N )
|
if ( m_dataArray.GetCount() > (size_t) N )
|
||||||
{
|
{
|
||||||
m_dataArray[N] = (char*) Client_data ;
|
m_dataArray[N] = (char*) Client_data ;
|
||||||
}
|
}
|
||||||
@@ -815,12 +815,13 @@ void wxListBox::MacSetRedraw( bool doDraw )
|
|||||||
void wxListBox::MacDoClick()
|
void wxListBox::MacDoClick()
|
||||||
{
|
{
|
||||||
wxArrayInt aSelections;
|
wxArrayInt aSelections;
|
||||||
int n, count = GetSelections(aSelections);
|
int n ;
|
||||||
|
size_t count = GetSelections(aSelections);
|
||||||
|
|
||||||
if ( count == m_selectionPreImage.GetCount() )
|
if ( count == m_selectionPreImage.GetCount() )
|
||||||
{
|
{
|
||||||
bool hasChanged = false ;
|
bool hasChanged = false ;
|
||||||
for ( int i = 0 ; i < count ; ++i )
|
for ( size_t i = 0 ; i < count ; ++i )
|
||||||
{
|
{
|
||||||
if ( aSelections[i] != m_selectionPreImage[i] )
|
if ( aSelections[i] != m_selectionPreImage[i] )
|
||||||
{
|
{
|
||||||
@@ -865,8 +866,6 @@ void wxListBox::MacDoDoubleClick()
|
|||||||
GetEventHandler()->ProcessEvent(event) ;
|
GetEventHandler()->ProcessEvent(event) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
static long sLastTypeIn = 0 ;
|
|
||||||
|
|
||||||
void wxListBox::OnChar(wxKeyEvent& event)
|
void wxListBox::OnChar(wxKeyEvent& event)
|
||||||
{
|
{
|
||||||
if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
|
if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
|
||||||
|
@@ -544,9 +544,9 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
|
|||||||
wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
|
wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
|
||||||
}
|
}
|
||||||
#endif // wxUSE_OWNER_DRAWN
|
#endif // wxUSE_OWNER_DRAWN
|
||||||
wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
|
wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , "invalid client_data array" ) ;
|
||||||
|
|
||||||
if ( m_dataArray.GetCount() > N )
|
if ( m_dataArray.GetCount() > (size_t) N )
|
||||||
{
|
{
|
||||||
m_dataArray[N] = (char*) Client_data ;
|
m_dataArray[N] = (char*) Client_data ;
|
||||||
}
|
}
|
||||||
@@ -815,12 +815,13 @@ void wxListBox::MacSetRedraw( bool doDraw )
|
|||||||
void wxListBox::MacDoClick()
|
void wxListBox::MacDoClick()
|
||||||
{
|
{
|
||||||
wxArrayInt aSelections;
|
wxArrayInt aSelections;
|
||||||
int n, count = GetSelections(aSelections);
|
int n ;
|
||||||
|
size_t count = GetSelections(aSelections);
|
||||||
|
|
||||||
if ( count == m_selectionPreImage.GetCount() )
|
if ( count == m_selectionPreImage.GetCount() )
|
||||||
{
|
{
|
||||||
bool hasChanged = false ;
|
bool hasChanged = false ;
|
||||||
for ( int i = 0 ; i < count ; ++i )
|
for ( size_t i = 0 ; i < count ; ++i )
|
||||||
{
|
{
|
||||||
if ( aSelections[i] != m_selectionPreImage[i] )
|
if ( aSelections[i] != m_selectionPreImage[i] )
|
||||||
{
|
{
|
||||||
@@ -865,8 +866,6 @@ void wxListBox::MacDoDoubleClick()
|
|||||||
GetEventHandler()->ProcessEvent(event) ;
|
GetEventHandler()->ProcessEvent(event) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
static long sLastTypeIn = 0 ;
|
|
||||||
|
|
||||||
void wxListBox::OnChar(wxKeyEvent& event)
|
void wxListBox::OnChar(wxKeyEvent& event)
|
||||||
{
|
{
|
||||||
if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
|
if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
|
||||||
|
Reference in New Issue
Block a user