X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25e3a937dbf4c2ba42cc83e5d26dd491fe4c0514..d1c0b4f97ee996b8dd8b3290fa64196ca9761393:/src/generic/listctrl.cpp?ds=sidebyside diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index e19e1ac69c..fa4ced72aa 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -8,7 +8,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "listctrl.h" + #pragma implementation "listctrl.h" + #pragma implementation "listctrlbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -314,8 +315,13 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) m_bound_all.height = lh; if (item->HasImage()) { +#ifdef __WIN16__ + int w = 0; + int h = 0; +#else wxCoord w = 0; wxCoord h = 0; +#endif m_owner->GetImageSize( item->GetImage(), w, h ); m_bound_all.width += 4 + w; if (h > m_bound_all.height) m_bound_all.height = h; @@ -471,8 +477,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width ) void wxListLineData::SetColumnPosition( int index, int x ) { - int i = index; - wxNode *node = m_items.Nth( i ); + wxNode *node = m_items.Nth( (size_t)index ); if (node) { wxListItemData *item = (wxListItemData*)node->Data(); @@ -613,10 +618,10 @@ void wxListLineData::SetAttributes(wxDC *dc, void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) { - long dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 ); - long dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 ); - long dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 ); - long dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 ); + wxCoord dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 ); + wxCoord dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 ); + wxCoord dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 ); + wxCoord dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 ); if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h )) { @@ -918,8 +923,8 @@ void wxListHeaderWindow::DrawCurrent() void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) { - int x = event.GetX(); - int y = event.GetY(); + wxCoord x = (wxCoord)event.GetX(); + wxCoord y = (wxCoord)event.GetY(); if (m_isDragging) { DrawCurrent(); @@ -947,11 +952,11 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) m_minX = 0; bool hit_border = FALSE; int xpos = 0; - for (int j = 0; j < m_owner->GetColumnCount()-1; j++) + for (int j = 0; j < m_owner->GetColumnCount(); j++) { xpos += m_owner->GetColumnWidth( j ); m_column = j; - if ((abs(x-xpos) < 3) && (y < 22)) + if ((abs(x-xpos) < 3) && (y < 22) && (m_column < m_owner->GetColumnCount()-1)) { hit_border = TRUE; break; @@ -1028,13 +1033,18 @@ BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl) EVT_KILL_FOCUS (wxListTextCtrl::OnKillFocus) END_EVENT_TABLE() -wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id, - bool *accept, wxString *res, wxListMainWindow *owner, - const wxString &value, const wxPoint &pos, const wxSize &size, -#if wxUSE_VALIDATORS - int style, const wxValidator& validator, const wxString &name ) : -#endif - wxTextCtrl( parent, id, value, pos, size, style, validator, name ) +wxListTextCtrl::wxListTextCtrl( wxWindow *parent, + const wxWindowID id, + bool *accept, + wxString *res, + wxListMainWindow *owner, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + int style, + const wxValidator& validator, + const wxString &name ) + : wxTextCtrl( parent, id, value, pos, size, style, validator, name ) { m_res = res; m_accept = accept; @@ -1050,24 +1060,33 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event ) { (*m_accept) = TRUE; (*m_res) = GetValue(); - m_owner->SetFocus(); + + if (!wxPendingDelete.Member(this)) + wxPendingDelete.Append(this); + + if ((*m_accept) && ((*m_res) != m_startValue)) + m_owner->OnRenameAccept(); + return; } if (event.m_keyCode == WXK_ESCAPE) { (*m_accept) = FALSE; (*m_res) = ""; - m_owner->SetFocus(); + + if (!wxPendingDelete.Member(this)) + wxPendingDelete.Append(this); + return; } + event.Skip(); } void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { - if (wxPendingDelete.Member(this)) return; - - wxPendingDelete.Append(this); + if (!wxPendingDelete.Member(this)) + wxPendingDelete.Append(this); if ((*m_accept) && ((*m_res) != m_startValue)) m_owner->OnRenameAccept(); @@ -1087,7 +1106,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) EVT_KEY_DOWN (wxListMainWindow::OnKeyDown) EVT_SET_FOCUS (wxListMainWindow::OnSetFocus) EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus) - EVT_SCROLLWIN (wxListMainWindow::OnScroll) + EVT_SCROLLWIN (wxListMainWindow::OnScroll) END_EVENT_TABLE() wxListMainWindow::wxListMainWindow() @@ -1156,11 +1175,13 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, m_renameTimer = new wxListRenameTimer( this ); m_renameAccept = FALSE; - SetBackgroundColour( *wxWHITE ); + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); } wxListMainWindow::~wxListMainWindow() { + DeleteEverything(); + if (m_hilightBrush) delete m_hilightBrush; delete m_renameTimer; @@ -1293,7 +1314,7 @@ void wxListMainWindow::DeleteLine( wxListLineData *line ) void wxListMainWindow::EditLabel( long item ) { - wxNode *node = m_lines.Nth( item ); + wxNode *node = m_lines.Nth( (size_t)item ); wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") ); m_currentEdit = (wxListLineData*) node->Data(); @@ -1366,8 +1387,8 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) wxClientDC dc(this); PrepareDC(dc); - long x = dc.DeviceToLogicalX( (long)event.GetX() ); - long y = dc.DeviceToLogicalY( (long)event.GetY() ); + wxCoord x = dc.DeviceToLogicalX( (wxCoord)event.GetX() ); + wxCoord y = dc.DeviceToLogicalY( (wxCoord)event.GetY() ); /* Did we actually hit an item ? */ long hitResult = 0; @@ -1457,13 +1478,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) } else { - if (event.ShiftDown()) + if (event.ControlDown()) { m_current = line; m_current->ReverseHilight(); RefreshLine( m_current ); } - else if (event.ControlDown()) + else if (event.ShiftDown()) { m_current = line; @@ -1526,29 +1547,32 @@ void wxListMainWindow::MoveToFocus() { if (!m_current) return; - int x = 0; - int y = 0; - int w = 0; - int h = 0; - m_current->GetExtent( x, y, w, h ); + int item_x = 0; + int item_y = 0; + int item_w = 0; + int item_h = 0; + m_current->GetExtent( item_x, item_y, item_w, item_h ); - int w_p = 0; - int h_p = 0; - GetClientSize( &w_p, &h_p ); + int client_w = 0; + int client_h = 0; + GetClientSize( &client_w, &client_h ); + + int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL ); + int view_y = m_yScroll*GetScrollPos( wxVERTICAL ); if (m_mode & wxLC_REPORT) { - int y_s = m_yScroll*GetScrollPos( wxVERTICAL ); - if ((y > y_s) && (y+h < y_s+h_p)) return; - if (y-y_s < 5) { Scroll( -1, (y-5-h_p/2)/m_yScroll ); } - if (y+h+5 > y_s+h_p) { Scroll( -1, (y+h-h_p/2+h+15)/m_yScroll); } + if (item_y-5 < view_y ) + Scroll( -1, (item_y-5)/m_yScroll ); + if (item_y+item_h+5 > view_y+client_h) + Scroll( -1, (item_y+item_h-client_h+15)/m_yScroll ); } else { - int x_s = m_xScroll*GetScrollPos( wxHORIZONTAL ); - if ((x > x_s) && (x+w < x_s+w_p)) return; - if (x-x_s < 5) { Scroll( (x-5)/m_xScroll, -1 ); } - if (x+w-5 > x_s+w_p) { Scroll( (x+w-w_p+15)/m_xScroll, -1 ); } + if (item_x-view_x < 5) + Scroll( (item_x-5)/m_xScroll, -1 ); + if (item_x+item_w-5 > view_x+client_w) + Scroll( (item_x+item_w-client_w+15)/m_xScroll, -1 ); } } @@ -1557,12 +1581,12 @@ void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown ) if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE ); wxListLineData *oldCurrent = m_current; m_current = newCurrent; - MoveToFocus(); if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE ); RefreshLine( m_current ); RefreshLine( oldCurrent ); FocusLine( m_current ); UnfocusLine( oldCurrent ); + MoveToFocus(); } void wxListMainWindow::OnKeyDown( wxKeyEvent &event ) @@ -1590,7 +1614,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) /* we send a list_key event up */ wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() ); - le.m_code = event.KeyCode(); + le.m_code = (int)event.KeyCode(); le.SetEventObject( parent ); parent->GetEventHandler()->ProcessEvent( le ); @@ -1610,8 +1634,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) { wxNavigationKeyEvent nevent; nevent.SetDirection( !event.ShiftDown() ); + nevent.SetEventObject( GetParent()->GetParent() ); nevent.SetCurrentFocus( m_parent ); - if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return; + if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) return; } /* no item -> nothing to do */ @@ -1718,11 +1743,11 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) m_current->ReverseHilight(); wxNode *node = m_lines.Member( m_current )->Next(); if (node) m_current = (wxListLineData*)node->Data(); - MoveToFocus(); RefreshLine( oldCurrent ); RefreshLine( m_current ); UnfocusLine( oldCurrent ); FocusLine( m_current ); + MoveToFocus(); } break; } @@ -2000,7 +2025,7 @@ int wxListMainWindow::GetCountPerPage() void wxListMainWindow::SetItem( wxListItem &item ) { m_dirty = TRUE; - wxNode *node = m_lines.Nth( item.m_itemId ); + wxNode *node = m_lines.Nth( (size_t)item.m_itemId ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2017,7 +2042,7 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask ) if (stateMask & wxLIST_STATE_FOCUSED) { - wxNode *node = m_lines.Nth( item ); + wxNode *node = m_lines.Nth( (size_t)item ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2031,10 +2056,10 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask ) if (stateMask & wxLIST_STATE_SELECTED) { - bool on = state & wxLIST_STATE_SELECTED; + bool on = (state & wxLIST_STATE_SELECTED) != 0; if (!on && (m_mode & wxLC_SINGLE_SEL)) return; - wxNode *node = m_lines.Nth( item ); + wxNode *node = m_lines.Nth( (size_t)item ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2047,7 +2072,7 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask ) RefreshLine( m_current ); if (oldCurrent) RefreshLine( oldCurrent ); } - bool on = state & wxLIST_STATE_SELECTED; + bool on = (state & wxLIST_STATE_SELECTED) != 0; if (on != line->IsHilighted()) { line->Hilight( on ); @@ -2062,7 +2087,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask ) int ret = wxLIST_STATE_DONTCARE; if (stateMask & wxLIST_STATE_FOCUSED) { - wxNode *node = m_lines.Nth( item ); + wxNode *node = m_lines.Nth( (size_t)item ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2071,7 +2096,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask ) } if (stateMask & wxLIST_STATE_SELECTED) { - wxNode *node = m_lines.Nth( item ); + wxNode *node = m_lines.Nth( (size_t)item ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2083,7 +2108,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask ) void wxListMainWindow::GetItem( wxListItem &item ) { - wxNode *node = m_lines.Nth( item.m_itemId ); + wxNode *node = m_lines.Nth( (size_t)item.m_itemId ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2105,7 +2130,7 @@ int wxListMainWindow::GetItemCount() void wxListMainWindow::GetItemRect( long index, wxRect &rect ) { - wxNode *node = m_lines.Nth( index ); + wxNode *node = m_lines.Nth( (size_t)index ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2122,7 +2147,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect ) bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) { - wxNode *node = m_lines.Nth( item ); + wxNode *node = m_lines.Nth( (size_t)item ); if (node) { wxRect rect; @@ -2317,28 +2342,48 @@ void wxListMainWindow::RealizeChanges( void ) } } -long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state ) +long wxListMainWindow::GetNextItem( long item, + int WXUNUSED(geometry), + int state ) { - long ret = 0; - if (item > 0) ret = item; - if(ret >= GetItemCount()) return -1; - wxNode *node = m_lines.Nth( ret ); + long ret = item, + max = GetItemCount(); + wxCHECK_MSG( (ret == -1) || (ret < max), -1, + _T("invalid listctrl index in GetNextItem()") ); + + // notice that we start with the next item (or the first one if item == -1) + // and this is intentional to allow writing a simple loop to iterate over + // all selected items + ret++; + if ( ret == max ) + { + // this is not an error because the index was ok initially, just no + // such item + return -1; + } + + wxNode *node = m_lines.Nth( (size_t)ret ); while (node) { wxListLineData *line = (wxListLineData*)node->Data(); - if ((state & wxLIST_STATE_FOCUSED) && (line == m_current)) return ret; - if ((state & wxLIST_STATE_SELECTED) && (line->IsHilighted())) return ret; - if (!state) return ret; + if ((state & wxLIST_STATE_FOCUSED) && (line == m_current)) + return ret; + if ((state & wxLIST_STATE_SELECTED) && (line->IsHilighted())) + return ret; + if (!state) + return ret; ret++; + node = node->Next(); } + return -1; } void wxListMainWindow::DeleteItem( long index ) { m_dirty = TRUE; - wxNode *node = m_lines.Nth( index ); + wxNode *node = m_lines.Nth( (size_t)index ); if (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2358,7 +2403,7 @@ void wxListMainWindow::DeleteColumn( int col ) if (node) m_columns.DeleteNode( node ); } -void wxListMainWindow::DeleteAllItems( void ) +void wxListMainWindow::DeleteAllItems() { m_dirty = TRUE; m_current = (wxListLineData *) NULL; @@ -2366,34 +2411,18 @@ void wxListMainWindow::DeleteAllItems( void ) // to make the deletion of all items faster, we don't send the // notifications in this case: this is compatible with wxMSW and // documented in DeleteAllItems() description -#if 0 - wxNode *node = m_lines.First(); - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - DeleteLine( line ); - - node = node->Next(); - } -#endif // 0 + wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() ); + event.SetEventObject( GetParent() ); + GetParent()->GetEventHandler()->ProcessEvent( event ); m_lines.Clear(); } -void wxListMainWindow::DeleteEverything( void ) +void wxListMainWindow::DeleteEverything() { - m_dirty = TRUE; - m_current = (wxListLineData *) NULL; - wxNode *node = m_lines.First(); - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - DeleteLine( line ); - node = node->Next(); - } - m_lines.Clear(); - m_current = (wxListLineData *) NULL; + DeleteAllItems(); + m_columns.Clear(); } @@ -2406,8 +2435,7 @@ void wxListMainWindow::EnsureVisible( long index ) wxListLineData *oldCurrent = m_current; m_current = (wxListLineData *) NULL; - int i = index; - wxNode *node = m_lines.Nth( i ); + wxNode *node = m_lines.Nth( (size_t)index ); if (node) m_current = (wxListLineData*)node->Data(); if (m_current) MoveToFocus(); m_current = oldCurrent; @@ -2418,7 +2446,7 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p long pos = start; wxString tmp = str; if (pos < 0) pos = 0; - wxNode *node = m_lines.Nth( pos ); + wxNode *node = m_lines.Nth( (size_t)pos ); while (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2435,7 +2463,7 @@ long wxListMainWindow::FindItem(long start, long data) { long pos = start; if (pos < 0) pos = 0; - wxNode *node = m_lines.Nth( pos ); + wxNode *node = m_lines.Nth( (size_t)pos ); while (node) { wxListLineData *line = (wxListLineData*)node->Data(); @@ -2458,7 +2486,7 @@ long wxListMainWindow::HitTest( int x, int y, int &flags ) long ret = line->IsHit( x, y ); if (ret & flags) { - flags = ret; + flags = (int)ret; return count; } node = node->Next(); @@ -2491,7 +2519,7 @@ void wxListMainWindow::InsertItem( wxListItem &item ) line->SetItem( 0, item ); if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount())) { - wxNode *node = m_lines.Nth( item.m_itemId ); + wxNode *node = m_lines.Nth( (size_t)item.m_itemId ); if (node) m_lines.Insert( node, line ); } else @@ -2509,7 +2537,7 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item ) wxListHeaderData *column = new wxListHeaderData( item ); if ((col >= 0) && (col < (int)m_columns.GetCount())) { - wxNode *node = m_columns.Nth( col ); + wxNode *node = m_columns.Nth( (size_t)col ); if (node) m_columns.Insert( node, column ); } @@ -2540,6 +2568,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) list_ctrl_compare_func_2 = fn; list_ctrl_compare_data = data; m_lines.Sort( list_ctrl_compare_func_1 ); + m_dirty = TRUE; } void wxListMainWindow::OnScroll(wxScrollWinEvent& event) @@ -2681,9 +2710,7 @@ bool wxListCtrl::Create(wxWindow *parent, const wxPoint &pos, const wxSize &size, long style, -#if wxUSE_VALIDATORS const wxValidator &validator, -#endif const wxString &name) { m_imageListNormal = (wxImageList *) NULL; @@ -2696,32 +2723,27 @@ bool wxListCtrl::Create(wxWindow *parent, { style = style | wxLC_LIST; } - - bool ret = wxControl::Create( parent, - id, - pos, - size, - style, -#if wxUSE_VALIDATORS - validator, -#endif - name ); - -#if wxUSE_VALIDATORS - SetValidator( validator ); -#endif - + + bool ret = wxControl::Create( parent, id, pos, size, style, validator, name ); + + if (style & wxSUNKEN_BORDER) style -= wxSUNKEN_BORDER; m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style ); if (HasFlag(wxLC_REPORT)) + { m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL ); + if (HasFlag(wxLC_NO_HEADER)) + m_headerWin->Show( FALSE ); + } else + { m_headerWin = (wxListHeaderWindow *) NULL; + } - SetBackgroundColour( *wxWHITE ); + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); return ret; }