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

1. Setting the listctrl as the event object before sending the event

Browse Source 
to any user event handlers.

2. InsertItem returns the actual index used when given one beyond the
end of the list.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-09-01 21:30:18 +00:00
parent cba349dc6e
commit 3e1c4e0021
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/listctrl.cpp
View File

@@ -1704,7 +1704,7 @@ void wxListMainWindow::DeleteLine( wxListLineData *line )
void wxListMainWindow::EditLabel( long item ) void wxListMainWindow::EditLabel( long item )
{ {
wxCHECK_RET( ((size_t)item < m_lines.GetCount()), wxCHECK_RET( ((size_t)item < m_lines.GetCount()),
wxT("wrong index in wxListCtrl::Edit()") ); wxT("wrong index in wxListCtrl::Edit()") );
m_currentEdit = &m_lines[(size_t)item]; m_currentEdit = &m_lines[(size_t)item];
@@ -1769,6 +1769,7 @@ void wxListMainWindow::OnRenameAccept()
void wxListMainWindow::OnMouse( wxMouseEvent &event ) void wxListMainWindow::OnMouse( wxMouseEvent &event )
{ {
event.SetEventObject( GetParent() );
if (GetParent()->GetEventHandler()->ProcessEvent( event)) return; if (GetParent()->GetEventHandler()->ProcessEvent( event)) return;
if (!m_current) return; if (!m_current) return;
@@ -1888,7 +1889,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
else if (event.ShiftDown()) else if (event.ShiftDown())
{ {
size_t j; size_t j;
m_current = line; m_current = line;
int numOfCurrent = -1; int numOfCurrent = -1;
@@ -2096,7 +2097,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
if (index != wxNOT_FOUND) if (index != wxNOT_FOUND)
{ {
index -= steps; index -= steps;
if (index < 0) index = 0; if (index < 0) index = 0;
OnArrowChar( &m_lines[index], event.ShiftDown() ); OnArrowChar( &m_lines[index], event.ShiftDown() );
} }
break; break;
@@ -2117,7 +2118,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
if (index != wxNOT_FOUND) if (index != wxNOT_FOUND)
{ {
index += steps; index += steps;
if ((size_t)index >= m_lines.GetCount()) if ((size_t)index >= m_lines.GetCount())
index = m_lines.GetCount()-1; index = m_lines.GetCount()-1;
OnArrowChar( &m_lines[index], event.ShiftDown() ); OnArrowChar( &m_lines[index], event.ShiftDown() );
} }
@@ -2145,7 +2146,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
if (index != wxNOT_FOUND) if (index != wxNOT_FOUND)
{ {
index += m_visibleLines; index += m_visibleLines;
if ((size_t)index >= m_lines.GetCount()) if ((size_t)index >= m_lines.GetCount())
index = m_lines.GetCount()-1; index = m_lines.GetCount()-1;
OnArrowChar( &m_lines[index], event.ShiftDown() ); OnArrowChar( &m_lines[index], event.ShiftDown() );
} }
@@ -2382,7 +2383,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
wxClientDC dc(this); wxClientDC dc(this);
dc.SetFont( GetFont() ); dc.SetFont( GetFont() );
int max = 10; int max = 10;
for (size_t i = 0; i < m_lines.GetCount(); i++) for (size_t i = 0; i < m_lines.GetCount(); i++)
{ {
wxListLineData *line = &m_lines[i]; wxListLineData *line = &m_lines[i];
@@ -2955,6 +2956,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
else else
{ {
m_lines.Add( line ); m_lines.Add( line );
item.m_itemId = m_lines.GetCount();
} }
} }