X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6b77239295c92072f13e88d49284fb647f79971..fb6261e9ba8b162347135a9174afbc81244b10cc:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 7e251dbf37..12a4d8d42e 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". @@ -22,11 +23,365 @@ #include "wx/app.h" #include "wx/listctrl.h" #include "wx/generic/imaglist.h" +#include "wx/dynarray.h" #ifndef wxUSE_GENERIC_LIST_EXTENSIONS -#define wxUSE_GENERIC_LIST_EXTENSIONS 0 +#define wxUSE_GENERIC_LIST_EXTENSIONS 1 #endif +// ============================================================================ +// private classes +// ============================================================================ + +//----------------------------------------------------------------------------- +// wxListItemData (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListItemData : public wxObject +{ +public: + wxString m_text; + int m_image; + long m_data; + int m_xpos,m_ypos; + int m_width,m_height; + + wxListItemAttr *m_attr; + +public: + wxListItemData(); + ~wxListItemData() { delete m_attr; } + + wxListItemData( const wxListItem &info ); + void SetItem( const wxListItem &info ); + void SetText( const wxString &s ); + void SetImage( int image ); + void SetData( long data ); + void SetPosition( int x, int y ); + void SetSize( int width, int height ); + bool HasImage() const; + bool HasText() const; + bool IsHit( int x, int y ) const; + void GetText( wxString &s ); + const wxString& GetText() { return m_text; } + int GetX( void ) const; + int GetY( void ) const; + int GetWidth() const; + int GetHeight() const; + int GetImage() const; + void GetItem( wxListItem &info ) const; + + wxListItemAttr *GetAttributes() const { return m_attr; } + +private: + DECLARE_DYNAMIC_CLASS(wxListItemData); +}; + +//----------------------------------------------------------------------------- +// wxListHeaderData (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListHeaderData : public wxObject +{ +protected: + long m_mask; + int m_image; + wxString m_text; + int m_format; + int m_width; + int m_xpos,m_ypos; + int m_height; + +public: + wxListHeaderData(); + wxListHeaderData( const wxListItem &info ); + void SetItem( const wxListItem &item ); + void SetPosition( int x, int y ); + void SetWidth( int w ); + void SetFormat( int format ); + void SetHeight( int h ); + bool HasImage() const; + bool HasText() const; + bool IsHit( int x, int y ) const; + void GetItem( wxListItem &item ); + void GetText( wxString &s ); + int GetImage() const; + int GetWidth() const; + int GetFormat() const; + +private: + DECLARE_DYNAMIC_CLASS(wxListHeaderData); +}; + +//----------------------------------------------------------------------------- +// wxListLineData (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListLineData : public wxObject +{ +public: + wxList m_items; + wxRect m_bound_all; + wxRect m_bound_label; + wxRect m_bound_icon; + wxRect m_bound_hilight; + int m_mode; + bool m_hilighted; + wxBrush *m_hilightBrush; + int m_spacing; + wxListMainWindow *m_owner; + + void DoDraw( wxDC *dc, bool hilight, bool paintBG ); + +public: + wxListLineData() {} + wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush ); + void CalculateSize( wxDC *dc, int spacing ); + void SetPosition( wxDC *dc, int x, int y, int window_width ); + void SetColumnPosition( int index, int x ); + void GetSize( int &width, int &height ); + void GetExtent( int &x, int &y, int &width, int &height ); + void GetLabelExtent( int &x, int &y, int &width, int &height ); + long IsHit( int x, int y ); + void InitItems( int num ); + void SetItem( int index, const wxListItem &info ); + void GetItem( int index, wxListItem &info ); + void GetText( int index, wxString &s ); + void SetText( int index, const wxString s ); + int GetImage( int index ); + void GetRect( wxRect &rect ); + void Hilight( bool on ); + void ReverseHilight(); + void DrawRubberBand( wxDC *dc, bool on ); + void Draw( wxDC *dc ); + bool IsInRect( int x, int y, const wxRect &rect ); + bool IsHilighted(); + void AssignRect( wxRect &dest, int x, int y, int width, int height ); + void AssignRect( wxRect &dest, const wxRect &source ); + +private: + void SetAttributes(wxDC *dc, + const wxListItemAttr *attr, + const wxColour& colText, const wxFont& font, + bool hilight); + + DECLARE_DYNAMIC_CLASS(wxListLineData); +}; + + +WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray); +#include "wx/arrimpl.cpp" +WX_DEFINE_OBJARRAY(wxListLineDataArray); + +//----------------------------------------------------------------------------- +// wxListHeaderWindow (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListHeaderWindow : public wxWindow +{ +protected: + wxListMainWindow *m_owner; + wxCursor *m_currentCursor; + wxCursor *m_resizeCursor; + bool m_isDragging; + + // column being resized + int m_column; + + // divider line position in logical (unscrolled) coords + int m_currentX; + + // minimal position beyond which the divider line can't be dragged in + // logical coords + int m_minX; + +public: + wxListHeaderWindow(); + virtual ~wxListHeaderWindow(); + + wxListHeaderWindow( wxWindow *win, + wxWindowID id, + wxListMainWindow *owner, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + long style = 0, + const wxString &name = "wxlistctrlcolumntitles" ); + + void DoDrawRect( wxDC *dc, int x, int y, int w, int h ); + void DrawCurrent(); + void AdjustDC(wxDC& dc); + + void OnPaint( wxPaintEvent &event ); + void OnMouse( wxMouseEvent &event ); + void OnSetFocus( wxFocusEvent &event ); + + // needs refresh + bool m_dirty; + +private: + DECLARE_DYNAMIC_CLASS(wxListHeaderWindow) + DECLARE_EVENT_TABLE() +}; + +//----------------------------------------------------------------------------- +// wxListRenameTimer (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListRenameTimer: public wxTimer +{ +private: + wxListMainWindow *m_owner; + +public: + wxListRenameTimer( wxListMainWindow *owner ); + void Notify(); +}; + +//----------------------------------------------------------------------------- +// wxListTextCtrl (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl +{ +private: + bool *m_accept; + wxString *m_res; + wxListMainWindow *m_owner; + wxString m_startValue; + +public: + wxListTextCtrl() {} + wxListTextCtrl( wxWindow *parent, const wxWindowID id, + bool *accept, wxString *res, wxListMainWindow *owner, + const wxString &value = "", + const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, + int style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString &name = "listctrltextctrl" ); + void OnChar( wxKeyEvent &event ); + void OnKillFocus( wxFocusEvent &event ); + +private: + DECLARE_DYNAMIC_CLASS(wxListTextCtrl); + DECLARE_EVENT_TABLE() +}; + +//----------------------------------------------------------------------------- +// wxListMainWindow (internal) +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow +{ +public: + long m_mode; + wxListLineDataArray m_lines; + wxList m_columns; + wxListLineData *m_current; + wxListLineData *m_currentEdit; + int m_visibleLines; + wxBrush *m_hilightBrush; + wxColour *m_hilightColour; + int m_xScroll,m_yScroll; + bool m_dirty; + wxImageList *m_small_image_list; + wxImageList *m_normal_image_list; + int m_small_spacing; + int m_normal_spacing; + bool m_hasFocus; + bool m_usedKeys; + bool m_lastOnSame; + wxTimer *m_renameTimer; + bool m_renameAccept; + wxString m_renameRes; + bool m_isCreated; + int m_dragCount; + wxPoint m_dragStart; + + // for double click logic + wxListLineData *m_lineLastClicked, + *m_lineBeforeLastClicked; + +public: + wxListMainWindow(); + wxListMainWindow( wxWindow *parent, wxWindowID id, + const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, + long style = 0, const wxString &name = "listctrlmainwindow" ); + ~wxListMainWindow(); + void RefreshLine( wxListLineData *line ); + void OnPaint( wxPaintEvent &event ); + void HilightAll( bool on ); + void SendNotify( wxListLineData *line, wxEventType command ); + void FocusLine( wxListLineData *line ); + void UnfocusLine( wxListLineData *line ); + void SelectLine( wxListLineData *line ); + void DeselectLine( wxListLineData *line ); + void DeleteLine( wxListLineData *line ); + + void EditLabel( long item ); + void Edit( long item ) { EditLabel(item); } // deprecated + void OnRenameTimer(); + void OnRenameAccept(); + + void OnMouse( wxMouseEvent &event ); + void MoveToFocus(); + void OnArrowChar( wxListLineData *newCurrent, bool shiftDown ); + void OnChar( wxKeyEvent &event ); + void OnKeyDown( wxKeyEvent &event ); + void OnSetFocus( wxFocusEvent &event ); + void OnKillFocus( wxFocusEvent &event ); + void OnSize( wxSizeEvent &event ); + void OnScroll(wxScrollWinEvent& event) ; + + void DrawImage( int index, wxDC *dc, int x, int y ); + void GetImageSize( int index, int &width, int &height ); + int GetIndexOfLine( const wxListLineData *line ); + int GetTextLength( wxString &s ); // should be const + + void SetImageList( wxImageList *imageList, int which ); + void SetItemSpacing( int spacing, bool isSmall = FALSE ); + int GetItemSpacing( bool isSmall = FALSE ); + void SetColumn( int col, wxListItem &item ); + void SetColumnWidth( int col, int width ); + void GetColumn( int col, wxListItem &item ); + int GetColumnWidth( int vol ); + int GetColumnCount(); + int GetCountPerPage(); + void SetItem( wxListItem &item ); + void GetItem( wxListItem &item ); + void SetItemState( long item, long state, long stateMask ); + int GetItemState( long item, long stateMask ); + int GetItemCount(); + void GetItemRect( long index, wxRect &rect ); + bool GetItemPosition( long item, wxPoint& pos ); + int GetSelectedItemCount(); + void SetMode( long mode ); + long GetMode() const; + void CalculatePositions(); + void RealizeChanges(); + long GetNextItem( long item, int geometry, int state ); + void DeleteItem( long index ); + void DeleteAllItems(); + void DeleteColumn( int col ); + void DeleteEverything(); + void EnsureVisible( long index ); + long FindItem( long start, const wxString& str, bool partial = FALSE ); + long FindItem( long start, long data); + long HitTest( int x, int y, int &flags ); + void InsertItem( wxListItem &item ); +// void AddItem( wxListItem &item ); + void InsertColumn( long col, wxListItem &item ); +// void AddColumn( wxListItem &item ); + void SortItems( wxListCtrlCompare fn, long data ); + +private: + DECLARE_DYNAMIC_CLASS(wxListMainWindow); + DECLARE_EVENT_TABLE() +}; + +// ============================================================================ +// implementation +// ============================================================================ + //----------------------------------------------------------------------------- // wxListItemData //----------------------------------------------------------------------------- @@ -41,14 +396,15 @@ wxListItemData::wxListItemData() m_ypos = 0; m_width = 0; m_height = 0; - m_colour = wxBLACK; + m_attr = NULL; } wxListItemData::wxListItemData( const wxListItem &info ) { m_image = -1; m_data = 0; - m_colour = info.m_colour; + m_attr = NULL; + SetItem( info ); } @@ -57,7 +413,15 @@ void wxListItemData::SetItem( const wxListItem &info ) if (info.m_mask & wxLIST_MASK_TEXT) m_text = info.m_text; if (info.m_mask & wxLIST_MASK_IMAGE) m_image = info.m_image; if (info.m_mask & wxLIST_MASK_DATA) m_data = info.m_data; - m_colour = info.m_colour; + + if ( info.HasAttributes() ) + { + if ( m_attr ) + *m_attr = *info.GetAttributes(); + else + m_attr = new wxListItemAttr(*info.GetAttributes()); + } + m_xpos = 0; m_ypos = 0; m_width = info.m_width; @@ -91,11 +455,6 @@ void wxListItemData::SetSize( int width, int height ) if (height != -1) m_height = height; } -void wxListItemData::SetColour( wxColour *col ) -{ - m_colour = col; -} - bool wxListItemData::HasImage() const { return (m_image >= 0); @@ -141,17 +500,21 @@ int wxListItemData::GetImage() const return m_image; } -void wxListItemData::GetItem( wxListItem &info ) +void wxListItemData::GetItem( wxListItem &info ) const { info.m_text = m_text; info.m_image = m_image; info.m_data = m_data; - info.m_colour = m_colour; -} -wxColour *wxListItemData::GetColour() -{ - return m_colour; + if ( m_attr ) + { + if ( m_attr->HasTextColour() ) + info.SetTextColour(m_attr->GetTextColour()); + if ( m_attr->HasBackgroundColour() ) + info.SetBackgroundColour(m_attr->GetBackgroundColour()); + if ( m_attr->HasFont() ) + info.SetFont(m_attr->GetFont()); + } } //----------------------------------------------------------------------------- @@ -281,16 +644,47 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) case wxLC_ICON: { m_bound_all.width = m_spacing; - m_bound_all.height = m_spacing+13; wxNode *node = m_items.First(); if (node) { wxListItemData *item = (wxListItemData*)node->Data(); - wxString s; - item->GetText( s ); - long lw,lh; + wxString s = item->GetText(); + if (s.IsEmpty()) s = wxT("H"); + wxCoord lw,lh; dc->GetTextExtent( s, &lw, &lh ); + if (lh < 15) lh = 15; + lw += 4; + lh += 3; + + m_bound_all.height = m_spacing+lh; if (lw > m_spacing) m_bound_all.width = lw; + m_bound_label.width = lw; + m_bound_label.height = lh; + + if (item->HasImage()) + { + int w = 0; + int h = 0; + m_owner->GetImageSize( item->GetImage(), w, h ); + m_bound_icon.width = w + 8; + m_bound_icon.height = h + 8; + + if ( m_bound_icon.width > m_bound_all.width ) + m_bound_all.width = m_bound_icon.width; + if ( h + lh > m_bound_all.height - 4 ) + m_bound_all.height = h + lh + 4; + } + + if (!item->HasText()) + { + m_bound_hilight.width = m_bound_icon.width; + m_bound_hilight.height = m_bound_icon.height; + } + else + { + m_bound_hilight.width = m_bound_label.width; + m_bound_hilight.height = m_bound_label.height; + } } break; } @@ -300,20 +694,34 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) if (node) { wxListItemData *item = (wxListItemData*)node->Data(); - wxString s; - item->GetText( s ); - long lw,lh; + + wxString s = item->GetText(); + if (s.IsEmpty()) s = wxT("H"); + wxCoord lw,lh; dc->GetTextExtent( s, &lw, &lh ); + if (lh < 15) lh = 15; + lw += 4; + lh += 3; + m_bound_label.width = lw; + m_bound_label.height = lh; + m_bound_all.width = lw; m_bound_all.height = lh; + if (item->HasImage()) { int w = 0; int h = 0; m_owner->GetImageSize( item->GetImage(), w, h ); + m_bound_icon.width = w; + m_bound_icon.height = h; + m_bound_all.width += 4 + w; if (h > m_bound_all.height) m_bound_all.height = h; } + + m_bound_hilight.width = m_bound_all.width; + m_bound_hilight.height = m_bound_all.height; } break; } @@ -325,11 +733,14 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) while (node) { wxListItemData *item = (wxListItemData*)node->Data(); - wxString s; - item->GetText( s ); - if (s.IsNull()) s = "H"; - long lw,lh; + wxString s = item->GetText(); + if (s.IsEmpty()) s = wxT("H"); + wxCoord lw,lh; dc->GetTextExtent( s, &lw, &lh ); + if (lh < 15) lh = 15; + lw += 4; + lh += 3; + item->SetSize( item->GetWidth(), lh ); m_bound_all.width += lw; m_bound_all.height = lh; @@ -340,7 +751,8 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) } } -void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width ) +void wxListLineData::SetPosition( wxDC * WXUNUSED(dc), + int x, int y, int window_width ) { m_bound_all.x = x; m_bound_all.y = y; @@ -348,63 +760,39 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width ) { case wxLC_ICON: { - AssignRect( m_bound_icon, 0, 0, 0, 0 ); - AssignRect( m_bound_label, 0, 0, 0, 0 ); - AssignRect( m_bound_hilight, m_bound_all ); wxNode *node = m_items.First(); if (node) { wxListItemData *item = (wxListItemData*)node->Data(); if (item->HasImage()) { - wxListItemData *item = (wxListItemData*)node->Data(); - int w = 0; - int h = 0; - m_owner->GetImageSize( item->GetImage(), w, h ); - m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2); - m_bound_icon.y = m_bound_all.y + m_spacing - h - 5; - m_bound_icon.width = w; - m_bound_icon.height = h; - if (!item->HasText()) - { - AssignRect( m_bound_hilight, m_bound_icon ); - m_bound_hilight.x -= 5; - m_bound_hilight.y -= 5; - m_bound_hilight.width += 9; - m_bound_hilight.height += 9; - } + m_bound_icon.x = m_bound_all.x + 4 + + (m_spacing - m_bound_icon.width)/2; + m_bound_icon.y = m_bound_all.y + 4; } if (item->HasText()) { - wxString s; - item->GetText( s ); - long lw,lh; - dc->GetTextExtent( s, &lw, &lh ); if (m_bound_all.width > m_spacing) - m_bound_label.x = m_bound_all.x; + m_bound_label.x = m_bound_all.x + 2; else - m_bound_label.x = m_bound_all.x + (m_spacing/2) - lw/2; - m_bound_label.y = m_bound_all.y + m_bound_all.height - lh; - m_bound_label.width = lw; - m_bound_label.height = lh; - AssignRect( m_bound_hilight, m_bound_label ); - m_bound_hilight.x -= 2; - m_bound_hilight.y -= 2; - m_bound_hilight.width += 4; - m_bound_hilight.height += 4; + m_bound_label.x = m_bound_all.x + 2 + (m_spacing/2) - (m_bound_label.width/2); + m_bound_label.y = m_bound_all.y + m_bound_all.height + 2 - m_bound_label.height; + m_bound_hilight.x = m_bound_label.x - 2; + m_bound_hilight.y = m_bound_label.y - 2; + } + else + { + m_bound_hilight.x = m_bound_icon.x - 4; + m_bound_hilight.y = m_bound_icon.y - 4; } } break; } case wxLC_LIST: { - AssignRect( m_bound_label, m_bound_all ); - m_bound_all.x -= 2; - m_bound_all.y -= 2; - m_bound_all.width += 4; - m_bound_all.height += 3; - AssignRect( m_bound_hilight, m_bound_all ); - AssignRect( m_bound_icon, 0, 0, 0, 0 ); + m_bound_hilight.x = m_bound_all.x; + m_bound_hilight.y = m_bound_all.y; + m_bound_label.y = m_bound_all.y + 2; wxNode *node = m_items.First(); if (node) { @@ -413,49 +801,31 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width ) { m_bound_icon.x = m_bound_all.x + 2; m_bound_icon.y = m_bound_all.y + 2; - int w; - int h; - m_owner->GetImageSize( item->GetImage(), w, h ); - m_bound_icon.width = w; - m_bound_icon.height = h; - m_bound_label.x += 4 + w; - m_bound_label.width -= 4 + w; + m_bound_label.x = m_bound_all.x + 6 + m_bound_icon.width; + } + else + { + m_bound_label.x = m_bound_all.x + 2; } } break; } case wxLC_REPORT: { - long lw,lh; - dc->GetTextExtent( "H", &lw, &lh ); m_bound_all.x = 0; - m_bound_all.y -= 0; - m_bound_all.height = lh+3; m_bound_all.width = window_width; AssignRect( m_bound_hilight, m_bound_all ); - AssignRect( m_bound_label, m_bound_all ); - AssignRect( m_bound_icon, 0, 0, 0, 0 ); + m_bound_label.x = m_bound_all.x + 2; + m_bound_label.y = m_bound_all.y + 2; wxNode *node = m_items.First(); if (node) { wxListItemData *item = (wxListItemData*)node->Data(); - wxString s; - item->GetText( s ); - if (s.IsEmpty()) s = wxT("H"); - long lw,lh; - dc->GetTextExtent( s, &lw, &lh ); - m_bound_label.width = lw; - m_bound_label.height = lh; if (item->HasImage()) { m_bound_icon.x = m_bound_all.x + 2; m_bound_icon.y = m_bound_all.y + 2; - int w; - int h; - m_owner->GetImageSize( item->GetImage(), w, h ); - m_bound_icon.width = w; - m_bound_icon.height = h; - m_bound_label.x += 4 + w; + m_bound_label.x += 4 + m_bound_icon.width; } } break; @@ -465,8 +835,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(); @@ -577,44 +946,94 @@ int wxListLineData::GetImage( int index ) return -1; } +void wxListLineData::SetAttributes(wxDC *dc, + const wxListItemAttr *attr, + const wxColour& colText, + const wxFont& font, + bool hilight) +{ + // don't use foregroud colour for drawing highlighted items - this might + // make them completely invisible (and there is no way to do bit + // arithmetics on wxColour, unfortunately) + if ( !hilight && attr && attr->HasTextColour() ) + { + dc->SetTextForeground(attr->GetTextColour()); + } + else + { + dc->SetTextForeground(colText); + } + + if ( attr && attr->HasFont() ) + { + dc->SetFont(attr->GetFont()); + } + else + { + dc->SetFont(font); + } +} + 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 ); + int dev_x = 0; + int dev_y = 0; + m_owner->CalcScrolledPosition( m_bound_all.x, m_bound_all.y, &dev_x, &dev_y ); + wxCoord dev_w = m_bound_all.width; + wxCoord dev_h = m_bound_all.height; if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h )) - { return; + + wxWindow *listctrl = m_owner->GetParent(); + + // default foreground colour + wxColour colText; + if ( hilight ) + { + colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ); + } + else + { + colText = listctrl->GetForegroundColour(); } - if (paintBG) + // default font + wxFont font = listctrl->GetFont(); + + // VZ: currently we set the colours/fonts only once, but like this (i.e. + // using SetAttributes() inside the loop), it will be trivial to + // customize the subitems (in report mode) too. + wxListItemData *item = (wxListItemData*)m_items.First()->Data(); + wxListItemAttr *attr = item->GetAttributes(); + SetAttributes(dc, attr, colText, font, hilight); + + bool hasBgCol = attr && attr->HasBackgroundColour(); + if ( paintBG || hasBgCol ) { if (hilight) { dc->SetBrush( * m_hilightBrush ); - dc->SetPen( * wxTRANSPARENT_PEN ); } else { - dc->SetBrush( * wxWHITE_BRUSH ); - dc->SetPen( * wxTRANSPARENT_PEN ); + if ( hasBgCol ) + dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); + else + dc->SetBrush( * wxWHITE_BRUSH ); } + + dc->SetPen( * wxTRANSPARENT_PEN ); dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y, m_bound_hilight.width, m_bound_hilight.height ); } - dc->SetBackgroundMode(wxTRANSPARENT); if (m_mode == wxLC_REPORT) { - wxString s; - wxColour *colour = (wxColour*) NULL; wxNode *node = m_items.First(); while (node) { wxListItemData *item = (wxListItemData*)node->Data(); - dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() ); int x = item->GetX(); if (item->HasImage()) { @@ -623,16 +1042,10 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) m_owner->GetImageSize( item->GetImage(), x, y ); x += item->GetX() + 5; } - if (!colour) - colour = item->GetColour(); + dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() ); if (item->HasText()) { - item->GetText( s ); - if (hilight) - dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - else - dc->SetTextForeground( *colour ); - dc->DrawText( s, x, item->GetY() ); + dc->DrawText( item->GetText(), x, item->GetY()+1 ); } dc->DestroyClippingRegion(); node = node->Next(); @@ -650,13 +1063,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) } if (item->HasText()) { - wxString s; - item->GetText( s ); - if (hilight) - dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - else - dc->SetTextForeground( * item->GetColour() ); - dc->DrawText( s, m_bound_label.x, m_bound_label.y ); + dc->DrawText( item->GetText(), m_bound_label.x, m_bound_label.y ); } } } @@ -665,11 +1072,11 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) void wxListLineData::Hilight( bool on ) { if (on == m_hilighted) return; + m_hilighted = on; if (on) m_owner->SelectLine( this ); else m_owner->DeselectLine( this ); - m_hilighted = on; } void wxListLineData::ReverseHilight( void ) @@ -754,6 +1161,8 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMain m_currentCursor = (wxCursor *) NULL; m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); m_isDragging = FALSE; + m_dirty = FALSE; + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) ); } @@ -785,61 +1194,76 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) dc->DrawLine( x+w-1, y, x+w-1, y+1 ); } +// shift the DC origin to match the position of the main window horz +// scrollbar: this allows us to always use logical coords +void wxListHeaderWindow::AdjustDC(wxDC& dc) +{ +#if wxUSE_GENERIC_LIST_EXTENSIONS + int xpix; + m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + + int x; + m_owner->GetViewStart( &x, NULL ); + + // account for the horz scrollbar offset + dc.SetDeviceOrigin( -x * xpix, 0 ); +#endif // wxUSE_GENERIC_LIST_EXTENSIONS +} + void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); PrepareDC( dc ); -#if wxUSE_GENERIC_LIST_EXTENSIONS - if ( m_owner->GetMode() & wxLC_REPORT ) - { - int x , y ; - int xpix , ypix ; + AdjustDC( dc ); - m_owner->GetScrollPixelsPerUnit( &xpix , &ypix ) ; - m_owner->ViewStart( &x, &y ) ; - dc.SetDeviceOrigin( -x * xpix, 0 ); - } -#endif dc.BeginDrawing(); dc.SetFont( GetFont() ); - int w = 0; - int h = 0; - int x = 0; - int y = 0; + // width and height of the entire header window + int w, h; GetClientSize( &w, &h ); +#if wxUSE_GENERIC_LIST_EXTENSIONS + m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); +#endif // wxUSE_GENERIC_LIST_EXTENSIONS dc.SetBackgroundMode(wxTRANSPARENT); - dc.SetTextForeground( *wxBLACK ); - if (m_foregroundColour.Ok()) dc.SetTextForeground( m_foregroundColour ); - x = 1; - y = 1; + // do *not* use the listctrl colour for headers - one day we will have a + // function to set it separately + //dc.SetTextForeground( *wxBLACK ); + dc.SetTextForeground(wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOWTEXT )); + + int x = 1; // left of the header rect + const int y = 1; // top int numColumns = m_owner->GetColumnCount(); wxListItem item; for (int i = 0; i < numColumns; i++) { m_owner->GetColumn( i, item ); - int cw = item.m_width-2; -#if wxUSE_GENERIC_LIST_EXTENSIONS - if ((i+1 == numColumns) || ( dc.LogicalToDeviceX(x+item.m_width) > w-5)) - cw = dc.DeviceToLogicalX(w)-x-1; -#else - if ((i+1 == numColumns) || (x+item.m_width > w-5)) cw = w-x-1; -#endif + int wCol = item.m_width; + int cw = wCol - 2; // the width of the rect to draw + + int xEnd = x + wCol; + + // VZ: no, draw it normally - this is better now as we allow resizing + // of the last column as well +#if 0 + // let the last column occupy all available space + if ( i == numColumns - 1 ) + cw = w-x-1; +#endif // 0 + dc.SetPen( *wxWHITE_PEN ); DoDrawRect( &dc, x, y, cw, h-2 ); dc.SetClippingRegion( x, y, cw-5, h-4 ); dc.DrawText( item.m_text, x+4, y+3 ); dc.DestroyClippingRegion(); - x += item.m_width; -#if wxUSE_GENERIC_LIST_EXTENSIONS - if (dc.LogicalToDeviceX(x) > w+5) break; -#else - if (x > w+5) break; -#endif + x += wCol; + + if (xEnd > w+5) + break; } dc.EndDrawing(); } @@ -848,11 +1272,11 @@ void wxListHeaderWindow::DrawCurrent() { int x1 = m_currentX; int y1 = 0; + ClientToScreen( &x1, &y1 ); + int x2 = m_currentX-1; int y2 = 0; - int dummy; - m_owner->GetClientSize( &dummy, &y2 ); - ClientToScreen( &x1, &y1 ); + m_owner->GetClientSize( NULL, &y2 ); m_owner->ClientToScreen( &x2, &y2 ); wxScreenDC dc; @@ -860,6 +1284,8 @@ void wxListHeaderWindow::DrawCurrent() dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) ); dc.SetBrush( *wxTRANSPARENT_BRUSH ); + AdjustDC(dc); + dc.DrawLine( x1, y1, x2, y2 ); dc.SetLogicalFunction( wxCOPY ); @@ -870,82 +1296,114 @@ void wxListHeaderWindow::DrawCurrent() void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) { + // we want to work with logical coords +#if wxUSE_GENERIC_LIST_EXTENSIONS + int x; + m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); +#else // !wxUSE_GENERIC_LIST_EXTENSIONS int x = event.GetX(); +#endif // wxUSE_GENERIC_LIST_EXTENSIONS int y = event.GetY(); + if (m_isDragging) { - DrawCurrent(); + // we don't draw the line beyond our window, but we allow dragging it + // there + int w = 0; + GetClientSize( &w, NULL ); +#if wxUSE_GENERIC_LIST_EXTENSIONS + m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); +#endif // wxUSE_GENERIC_LIST_EXTENSIONS + w -= 6; + + // erase the line if it was drawn + if ( m_currentX < w ) + DrawCurrent(); + if (event.ButtonUp()) { ReleaseMouse(); m_isDragging = FALSE; - m_owner->SetColumnWidth( m_column, m_currentX-m_minX ); + m_dirty = TRUE; + m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); } else { - int size_x = 0; - int dummy; - GetClientSize( &size_x, & dummy ); - if (x > m_minX+7) + if (x > m_minX + 7) m_currentX = x; else - m_currentX = m_minX+7; - if (m_currentX > size_x-7) m_currentX = size_x-7; - DrawCurrent(); - } - return; - } + m_currentX = m_minX + 7; - m_minX = 0; - bool hit_border = FALSE; - int xpos = 0; - for (int j = 0; j < m_owner->GetColumnCount()-1; j++) - { - xpos += m_owner->GetColumnWidth( j ); - m_column = j; - if ((abs(x-xpos) < 3) && (y < 22)) - { - hit_border = TRUE; - break; + // draw in the new location + if ( m_currentX < w ) + DrawCurrent(); } - if (x-xpos < 0) - { - break; - } - m_minX = xpos; } - - if (event.LeftDown()) + else // not dragging { - if (hit_border) - { - m_isDragging = TRUE; - m_currentX = x; - DrawCurrent(); - CaptureMouse(); - return; - } - else + m_minX = 0; + bool hit_border = FALSE; + + // end of the current column + int xpos = 0; + + // find the column where this event occured + int countCol = m_owner->GetColumnCount(); + for (int j = 0; j < countCol; j++) { - wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - le.m_col = m_column; - GetParent()->GetEventHandler()->ProcessEvent( le ); - return; + xpos += m_owner->GetColumnWidth( j ); + m_column = j; + + if ( (abs(x-xpos) < 3) && (y < 22) ) + { + // near the column border + hit_border = TRUE; + break; + } + + if ( x < xpos ) + { + // inside the column + break; + } + + m_minX = xpos; } - } - if (event.Moving()) - { - if (hit_border) + if (event.LeftDown()) { - if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( * m_resizeCursor ); - m_currentCursor = m_resizeCursor; + if (hit_border) + { + m_isDragging = TRUE; + m_currentX = x; + DrawCurrent(); + CaptureMouse(); + } + else + { + wxWindow *parent = GetParent(); + wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, parent->GetId() ); + le.SetEventObject( parent ); + le.m_col = m_column; + parent->GetEventHandler()->ProcessEvent( le ); + } } - else + else if (event.Moving()) { - if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( * wxSTANDARD_CURSOR ); - m_currentCursor = wxSTANDARD_CURSOR; + bool setCursor; + if (hit_border) + { + setCursor = m_currentCursor == wxSTANDARD_CURSOR; + m_currentCursor = m_resizeCursor; + } + else + { + setCursor = m_currentCursor != wxSTANDARD_CURSOR; + m_currentCursor = wxSTANDARD_CURSOR; + } + + if ( setCursor ) + SetCursor(*m_currentCursor); } } } @@ -980,13 +1438,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; @@ -1002,24 +1465,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(); @@ -1039,13 +1511,12 @@ 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() { m_mode = 0; - m_lines.DeleteContents( TRUE ); m_columns.DeleteContents( TRUE ); m_current = (wxListLineData *) NULL; m_visibleLines = 0; @@ -1063,6 +1534,9 @@ wxListMainWindow::wxListMainWindow() m_renameTimer = new wxListRenameTimer( this ); m_isCreated = FALSE; m_dragCount = 0; + + m_lineLastClicked = + m_lineBeforeLastClicked = (wxListLineData *)NULL; } wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, @@ -1071,7 +1545,6 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, wxScrolledWindow( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name ) { m_mode = style; - m_lines.DeleteContents( TRUE ); m_columns.DeleteContents( TRUE ); m_current = (wxListLineData *) NULL; m_dirty = TRUE; @@ -1108,11 +1581,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; @@ -1120,22 +1595,18 @@ wxListMainWindow::~wxListMainWindow() void wxListMainWindow::RefreshLine( wxListLineData *line ) { + if (m_dirty) return; + + if (!line) return; + int x = 0; int y = 0; int w = 0; int h = 0; - if (line) - { - wxClientDC dc(this); - PrepareDC( dc ); - line->GetExtent( x, y, w, h ); - wxRect rect( - dc.LogicalToDeviceX(x-3), - dc.LogicalToDeviceY(y-3), - dc.LogicalToDeviceXRel(w+6), - dc.LogicalToDeviceXRel(h+6) ); - Refresh( TRUE, &rect ); - } + line->GetExtent( x, y, w, h ); + CalcScrolledPosition( x, y, &x, &y ); + wxRect rect( x, y, w, h ); + Refresh( TRUE, &rect ); } void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) @@ -1155,33 +1626,57 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (m_mode & wxLC_REPORT) { + wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID); + dc.SetPen(pen); + dc.SetBrush(* wxTRANSPARENT_BRUSH); + + wxSize clientSize = GetClientSize(); + wxRect itemRect; + int lineSpacing = 0; - wxListLineData *line = (wxListLineData*)m_lines.First()->Data(); + wxListLineData *line = &m_lines[0]; int dummy = 0; line->GetSize( dummy, lineSpacing ); lineSpacing += 1; int y_s = m_yScroll*GetScrollPos( wxVERTICAL ); - wxNode *node = m_lines.Nth( y_s / lineSpacing ); - for (int i = 0; i < m_visibleLines+2; i++) + size_t i_to = y_s / lineSpacing + m_visibleLines+2; + if (i_to >= m_lines.GetCount()) i_to = m_lines.GetCount(); + size_t i; + for (i = y_s / lineSpacing; i < i_to; i++) { - if (!node) break; - - line = (wxListLineData*)node->Data(); - line->Draw( &dc ); - node = node->Next(); + m_lines[i].Draw( &dc ); + // Draw horizontal rule if required + if (GetWindowStyle() & wxLC_HRULES) + dc.DrawLine(0, i*lineSpacing, clientSize.x, i*lineSpacing); } + + // Draw last horizontal rule + if ((i > (size_t) (y_s / lineSpacing)) && (GetWindowStyle() & wxLC_HRULES)) + dc.DrawLine(0, i*lineSpacing, clientSize.x, i*lineSpacing); + + // Draw vertical rules if required + if ((GetWindowStyle() & wxLC_VRULES) && (GetItemCount() > 0)) + { + int col = 0; + wxRect firstItemRect; + wxRect lastItemRect; + GetItemRect(0, firstItemRect); + GetItemRect(GetItemCount() - 1, lastItemRect); + int x = firstItemRect.GetX(); + for (col = 0; col < GetColumnCount(); col++) + { + int colWidth = GetColumnWidth(col); + x += colWidth ; + dc.DrawLine(x, firstItemRect.GetY() - 1, x, lastItemRect.GetBottom() + 1); + } + } } else { - wxNode *node = m_lines.First(); - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - line->Draw( &dc ); - node = node->Next(); - } + for (size_t i = 0; i < m_lines.GetCount(); i++) + m_lines[i].Draw( &dc ); } if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus ); @@ -1191,16 +1686,14 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxListMainWindow::HilightAll( bool on ) { - wxNode *node = m_lines.First(); - while (node) + for (size_t i = 0; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData *)node->Data(); + wxListLineData *line = &m_lines[i]; if (line->IsHilighted() != on) { line->Hilight( on ); RefreshLine( line ); } - node = node->Next(); } } @@ -1210,8 +1703,8 @@ void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command ) le.SetEventObject( GetParent() ); le.m_itemIndex = GetIndexOfLine( line ); line->GetItem( 0, le.m_item ); -// GetParent()->GetEventHandler()->ProcessEvent( le ); - GetParent()->GetEventHandler()->AddPendingEvent( le ); + GetParent()->GetEventHandler()->ProcessEvent( le ); +// GetParent()->GetEventHandler()->AddPendingEvent( le ); } void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) ) @@ -1243,10 +1736,10 @@ void wxListMainWindow::DeleteLine( wxListLineData *line ) void wxListMainWindow::EditLabel( long item ) { - wxNode *node = m_lines.Nth( item ); - wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") ); + wxCHECK_RET( ((size_t)item < m_lines.GetCount()), + wxT("wrong index in wxListCtrl::Edit()") ); - m_currentEdit = (wxListLineData*) node->Data(); + m_currentEdit = &m_lines[(size_t)item]; wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() ); le.SetEventObject( GetParent() ); @@ -1284,7 +1777,7 @@ void wxListMainWindow::OnRenameTimer() { wxCHECK_RET( m_current, wxT("invalid m_current") ); - Edit( m_lines.IndexOf( m_current ) ); + Edit( m_lines.Index( *m_current ) ); } void wxListMainWindow::OnRenameAccept() @@ -1302,34 +1795,32 @@ void wxListMainWindow::OnRenameAccept() info.m_mask = wxLIST_MASK_TEXT; info.m_itemId = le.m_itemIndex; info.m_text = m_renameRes; - info.m_colour = le.m_item.m_colour; + info.SetTextColour(le.m_item.GetTextColour()); SetItem( info ); } void wxListMainWindow::OnMouse( wxMouseEvent &event ) { + event.SetEventObject( GetParent() ); if (GetParent()->GetEventHandler()->ProcessEvent( event)) return; if (!m_current) return; if (m_dirty) return; if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || event.ButtonDClick()) ) return; - wxClientDC dc(this); - PrepareDC(dc); - long x = dc.DeviceToLogicalX( (long)event.GetX() ); - long y = dc.DeviceToLogicalY( (long)event.GetY() ); + int x = event.GetX(); + int y = event.GetY(); + CalcUnscrolledPosition( x, y, &x, &y ); /* Did we actually hit an item ? */ long hitResult = 0; - wxNode *node = m_lines.First(); wxListLineData *line = (wxListLineData *) NULL; - while (node) + for (size_t i = 0; i < m_lines.GetCount(); i++) { - line = (wxListLineData*)node->Data(); + line = &m_lines[i]; hitResult = line->IsHit( x, y ); if (hitResult) break; line = (wxListLineData *) NULL; - node = node->Next(); } if (event.Dragging()) @@ -1358,15 +1849,26 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (!line) return; + bool forceClick = FALSE; if (event.ButtonDClick()) { - m_usedKeys = FALSE; - m_lastOnSame = FALSE; m_renameTimer->Stop(); + m_lastOnSame = FALSE; + + if ( line == m_lineBeforeLastClicked ) + { + m_usedKeys = FALSE; - SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); + SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); - return; + return; + } + else + { + // the first click was on another item, so don't interpret this as + // a double click, but as a simple click instead + forceClick = TRUE; + } } if (event.LeftUp() && m_lastOnSame) @@ -1394,8 +1896,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) return; } - if (event.LeftDown()) + if ( event.LeftDown() || forceClick ) { + m_lineBeforeLastClicked = m_lineLastClicked; + m_lineLastClicked = line; + m_usedKeys = FALSE; wxListLineData *oldCurrent = m_current; if (m_mode & wxLC_SINGLE_SEL) @@ -1407,34 +1912,33 @@ 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()) { + size_t j; + m_current = line; int numOfCurrent = -1; - node = m_lines.First(); - while (node) + for (j = 0; j < m_lines.GetCount(); j++) { - wxListLineData *test_line = (wxListLineData*)node->Data(); + wxListLineData *test_line = &m_lines[j]; numOfCurrent++; if (test_line == oldCurrent) break; - node = node->Next(); } int numOfLine = -1; - node = m_lines.First(); - while (node) + + for (j = 0; j < m_lines.GetCount(); j++) { - wxListLineData *test_line = (wxListLineData*)node->Data(); + wxListLineData *test_line = &m_lines[j]; numOfLine++; if (test_line == line) break; - node = node->Next(); } if (numOfLine < numOfCurrent) @@ -1444,13 +1948,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) numOfCurrent = i; } - wxNode *node = m_lines.Nth( numOfCurrent ); for (int i = 0; i <= numOfLine-numOfCurrent; i++) { - wxListLineData *test_line= (wxListLineData*)node->Data(); + wxListLineData *test_line= &m_lines[numOfCurrent + i]; test_line->Hilight(TRUE); RefreshLine( test_line ); - node = node->Next(); } } else @@ -1467,7 +1969,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) UnfocusLine( oldCurrent ); FocusLine( m_current ); } - m_lastOnSame = (m_current == oldCurrent); + + // forceClick is only set if the previous click was on another item + m_lastOnSame = !forceClick && (m_current == oldCurrent); + return; } } @@ -1476,29 +1981,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 ); } } @@ -1507,12 +2015,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 ) @@ -1539,10 +2047,15 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) wxWindow *parent = GetParent(); /* we send a list_key event up */ - wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() ); - le.m_code = event.KeyCode(); - le.SetEventObject( parent ); - parent->GetEventHandler()->ProcessEvent( le ); + if ( m_current ) + { + wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() ); + le.m_itemIndex = GetIndexOfLine( m_current ); + m_current->GetItem( 0, le.m_item ); + le.m_code = (int)event.KeyCode(); + le.SetEventObject( parent ); + parent->GetEventHandler()->ProcessEvent( le ); + } /* we propagate the char event up */ wxKeyEvent ke( wxEVT_CHAR ); @@ -1559,9 +2072,11 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) if (event.KeyCode() == WXK_TAB) { wxNavigationKeyEvent nevent; + nevent.SetWindowChange( event.ControlDown() ); 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 */ @@ -1575,72 +2090,83 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) { case WXK_UP: { - wxNode *node = m_lines.Member( m_current )->Previous(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); + int index = m_lines.Index(*m_current); + if (index != wxNOT_FOUND && index > 0) + OnArrowChar( &m_lines[index-1], event.ShiftDown() ); break; } case WXK_DOWN: { - wxNode *node = m_lines.Member( m_current )->Next(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); + int index = m_lines.Index(*m_current); + if (index != wxNOT_FOUND && (size_t)index < m_lines.GetCount()-1) + OnArrowChar( &m_lines[index+1], event.ShiftDown() ); break; } case WXK_END: { - wxNode *node = m_lines.Last(); - OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); + if (!m_lines.IsEmpty()) + OnArrowChar( &m_lines.Last(), event.ShiftDown() ); break; } case WXK_HOME: { - wxNode *node = m_lines.First(); - OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); + if (!m_lines.IsEmpty()) + OnArrowChar( &m_lines[0], event.ShiftDown() ); break; } case WXK_PRIOR: { int steps = 0; + int index = m_lines.Index(*m_current); if (m_mode & wxLC_REPORT) { steps = m_visibleLines-1; } else { - int pos = 0; - wxNode *node = m_lines.First(); - for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); } - steps = pos % m_visibleLines; + steps = index % m_visibleLines; + } + if (index != wxNOT_FOUND) + { + index -= steps; + if (index < 0) index = 0; + OnArrowChar( &m_lines[index], event.ShiftDown() ); } - wxNode *node = m_lines.Member( m_current ); - for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); break; } case WXK_NEXT: { int steps = 0; + int index = m_lines.Index(*m_current); if (m_mode & wxLC_REPORT) { steps = m_visibleLines-1; } else { - int pos = 0; wxNode *node = m_lines.First(); - for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); } - steps = m_visibleLines-(pos % m_visibleLines)-1; + steps = m_visibleLines-(index % m_visibleLines)-1; + } + + if (index != wxNOT_FOUND) + { + index += steps; + if ((size_t)index >= m_lines.GetCount()) + index = m_lines.GetCount()-1; + OnArrowChar( &m_lines[index], event.ShiftDown() ); } - wxNode *node = m_lines.Member( m_current ); - for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); break; } case WXK_LEFT: { if (!(m_mode & wxLC_REPORT)) { - wxNode *node = m_lines.Member( m_current ); - for (int i = 0; i Previous()) node = node->Previous(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); + int index = m_lines.Index(*m_current); + if (index != wxNOT_FOUND) + { + index -= m_visibleLines; + if (index < 0) index = 0; + OnArrowChar( &m_lines[index], event.ShiftDown() ); + } } break; } @@ -1648,16 +2174,32 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) { if (!(m_mode & wxLC_REPORT)) { - wxNode *node = m_lines.Member( m_current ); - for (int i = 0; i Next()) node = node->Next(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); + int index = m_lines.Index(*m_current); + if (index != wxNOT_FOUND) + { + index += m_visibleLines; + if ((size_t)index >= m_lines.GetCount()) + index = m_lines.GetCount()-1; + OnArrowChar( &m_lines[index], event.ShiftDown() ); + } } break; } case WXK_SPACE: { - m_current->ReverseHilight(); - RefreshLine( m_current ); + if (m_mode & wxLC_SINGLE_SEL) + { + wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, GetParent()->GetId() ); + le.SetEventObject( GetParent() ); + le.m_itemIndex = GetIndexOfLine( m_current ); + m_current->GetItem( 0, le.m_item ); + GetParent()->GetEventHandler()->ProcessEvent( le ); + } + else + { + m_current->ReverseHilight(); + RefreshLine( m_current ); + } break; } case WXK_INSERT: @@ -1666,13 +2208,14 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) { wxListLineData *oldCurrent = m_current; m_current->ReverseHilight(); - wxNode *node = m_lines.Member( m_current )->Next(); - if (node) m_current = (wxListLineData*)node->Data(); - MoveToFocus(); + int index = m_lines.Index( *m_current ) + 1; + if ( (size_t)index < m_lines.GetCount() ) + m_current = &m_lines[index]; RefreshLine( oldCurrent ); RefreshLine( m_current ); UnfocusLine( oldCurrent ); FocusLine( m_current ); + MoveToFocus(); } break; } @@ -1727,6 +2270,7 @@ void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) We don't even allow the wxScrolledWindow::AdjustScrollbars() call */ + m_dirty = TRUE; } void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y ) @@ -1780,30 +2324,42 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) int wxListMainWindow::GetTextLength( wxString &s ) { wxClientDC dc( this ); - long lw = 0; - long lh = 0; + wxCoord lw = 0; + wxCoord lh = 0; dc.GetTextExtent( s, &lw, &lh ); return lw + 6; } int wxListMainWindow::GetIndexOfLine( const wxListLineData *line ) { - int i = 0; - wxNode *node = m_lines.First(); - while (node) - { - if (line == (wxListLineData*)node->Data()) return i; - i++; - node = node->Next(); - } - return -1; + int i = m_lines.Index(*line); + if (i == wxNOT_FOUND) return -1; + else return i; } void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) { m_dirty = TRUE; - if (which == wxIMAGE_LIST_NORMAL) m_normal_image_list = imageList; - if (which == wxIMAGE_LIST_SMALL) m_small_image_list = imageList; + + // calc the spacing from the icon size + int width = 0, + height = 0; + if ((imageList) && (imageList->GetImageCount()) ) + { + imageList->GetSize(0, width, height); + } + + if (which == wxIMAGE_LIST_NORMAL) + { + m_normal_image_list = imageList; + m_normal_spacing = width + 8; + } + + if (which == wxIMAGE_LIST_SMALL) + { + m_small_image_list = imageList; + m_small_spacing = width + 14; + } } void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall ) @@ -1821,7 +2377,7 @@ void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall ) int wxListMainWindow::GetItemSpacing( bool isSmall ) { - if (isSmall) return m_small_spacing; else return m_normal_spacing; + return isSmall ? m_small_spacing : m_normal_spacing; } void wxListMainWindow::SetColumn( int col, wxListItem &item ) @@ -1834,34 +2390,41 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item ) wxListHeaderData *column = (wxListHeaderData*)node->Data(); column->SetItem( item ); } - wxListCtrl *lc = (wxListCtrl*) GetParent(); - if (lc->m_headerWin) lc->m_headerWin->Refresh(); + + wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin; + if ( headerWin ) + headerWin->m_dirty = TRUE; } void wxListMainWindow::SetColumnWidth( int col, int width ) { - if (!(m_mode & wxLC_REPORT)) return; + wxCHECK_RET( m_mode & wxLC_REPORT, + _T("SetColumnWidth() can only be called in report mode.") ); m_dirty = TRUE; wxNode *node = (wxNode*) NULL; - if (width == wxLIST_AUTOSIZE_USEHEADER) width = 80; - if (width == wxLIST_AUTOSIZE) + if (width == wxLIST_AUTOSIZE_USEHEADER) + { + // TODO do use the header + width = 80; + } + else if (width == wxLIST_AUTOSIZE) { wxClientDC dc(this); dc.SetFont( GetFont() ); int max = 10; - node = m_lines.First(); - while (node) + + for (size_t i = 0; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[i]; wxNode *n = line->m_items.Nth( col ); if (n) { wxListItemData *item = (wxListItemData*)n->Data(); int current = 0, ix = 0, iy = 0; - long lx = 0, ly = 0; + wxCoord lx = 0, ly = 0; if (item->HasImage()) { GetImageSize( item->GetImage(), ix, iy ); @@ -1876,7 +2439,6 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) } if (current > max) max = current; } - node = node->Next(); } width = max+10; } @@ -1888,21 +2450,20 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) column->SetWidth( width ); } - node = m_lines.First(); - while (node) + for (size_t i = 0; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[i]; wxNode *n = line->m_items.Nth( col ); if (n) { wxListItemData *item = (wxListItemData*)n->Data(); item->SetSize( width, -1 ); } - node = node->Next(); } - wxListCtrl *lc = (wxListCtrl*) GetParent(); - if (lc->m_headerWin) lc->m_headerWin->Refresh(); + wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin; + if ( headerWin ) + headerWin->m_dirty = TRUE; } void wxListMainWindow::GetColumn( int col, wxListItem &item ) @@ -1950,10 +2511,9 @@ int wxListMainWindow::GetCountPerPage() void wxListMainWindow::SetItem( wxListItem &item ) { m_dirty = TRUE; - wxNode *node = m_lines.Nth( item.m_itemId ); - if (node) + if (item.m_itemId >= 0 && (size_t)item.m_itemId < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)item.m_itemId]; if (m_mode & wxLC_REPORT) item.m_width = GetColumnWidth( item.m_col )-3; line->SetItem( item.m_col, item ); } @@ -1967,13 +2527,13 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask ) if (stateMask & wxLIST_STATE_FOCUSED) { - wxNode *node = m_lines.Nth( item ); - if (node) + if (item >= 0 && (size_t)item < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)item]; UnfocusLine( m_current ); m_current = line; FocusLine( m_current ); + if ((m_mode & wxLC_SINGLE_SEL) && oldCurrent) oldCurrent->Hilight( FALSE ); RefreshLine( m_current ); if (oldCurrent) RefreshLine( oldCurrent ); } @@ -1981,13 +2541,12 @@ 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 ); - if (node) + if (item >= 0 && (size_t)item < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)item]; if (m_mode & wxLC_SINGLE_SEL) { UnfocusLine( m_current ); @@ -1997,7 +2556,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 ); @@ -2012,19 +2571,17 @@ int wxListMainWindow::GetItemState( long item, long stateMask ) int ret = wxLIST_STATE_DONTCARE; if (stateMask & wxLIST_STATE_FOCUSED) { - wxNode *node = m_lines.Nth( item ); - if (node) + if (item >= 0 && (size_t)item < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)item]; if (line == m_current) ret |= wxLIST_STATE_FOCUSED; } } if (stateMask & wxLIST_STATE_SELECTED) { - wxNode *node = m_lines.Nth( item ); - if (node) + if (item >= 0 && (size_t)item < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)item]; if (line->IsHilighted()) ret |= wxLIST_STATE_FOCUSED; } } @@ -2033,10 +2590,9 @@ int wxListMainWindow::GetItemState( long item, long stateMask ) void wxListMainWindow::GetItem( wxListItem &item ) { - wxNode *node = m_lines.Nth( item.m_itemId ); - if (node) + if (item.m_itemId >= 0 && (size_t)item.m_itemId < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)item.m_itemId]; line->GetItem( item.m_col, item ); } else @@ -2050,16 +2606,14 @@ void wxListMainWindow::GetItem( wxListItem &item ) int wxListMainWindow::GetItemCount() { - return m_lines.Number(); + return m_lines.GetCount(); } void wxListMainWindow::GetItemRect( long index, wxRect &rect ) { - wxNode *node = m_lines.Nth( index ); - if (node) + if (index >= 0 && (size_t)index < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); - line->GetRect( rect ); + m_lines[(size_t)index].GetRect( rect ); } else { @@ -2072,12 +2626,10 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect ) bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) { - wxNode *node = m_lines.Nth( item ); - if (node) + if (item >= 0 && (size_t)item < m_lines.GetCount()) { wxRect rect; - wxListLineData *line = (wxListLineData*)node->Data(); - line->GetRect( rect ); + m_lines[(size_t)item].GetRect( rect ); pos.x = rect.x; pos.y = rect.y; } @@ -2092,12 +2644,9 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) int wxListMainWindow::GetSelectedItemCount() { int ret = 0; - wxNode *node = m_lines.First(); - while (node) + for (size_t i = 0; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); - if (line->IsHilighted()) ret++; - node = node->Next(); + if (m_lines[i].IsHilighted()) ret++; } return ret; } @@ -2132,7 +2681,7 @@ long wxListMainWindow::GetMode() const void wxListMainWindow::CalculatePositions() { - if (!m_lines.First()) return; + if (m_lines.IsEmpty()) return; wxClientDC dc( this ); dc.SetFont( GetFont() ); @@ -2149,11 +2698,11 @@ void wxListMainWindow::CalculatePositions() int lineHeight = 0; int lineSpacing = 0; - wxListLineData *line = (wxListLineData*)m_lines.First()->Data(); + wxListLineData *line = &m_lines[0]; line->CalculateSize( &dc, iconSpacing ); int dummy = 0; line->GetSize( dummy, lineSpacing ); - lineSpacing += 4; + lineSpacing += 1; int clientWidth = 0; int clientHeight = 0; @@ -2162,7 +2711,7 @@ void wxListMainWindow::CalculatePositions() { int x = 4; int y = 1; - int entireHeight = m_lines.Number() * lineSpacing + 2; + int entireHeight = m_lines.GetCount() * lineSpacing + 2; int scroll_pos = GetScrollPos( wxVERTICAL ); #if wxUSE_GENERIC_LIST_EXTENSIONS int x_scroll_pos = GetScrollPos( wxHORIZONTAL ); @@ -2171,11 +2720,10 @@ void wxListMainWindow::CalculatePositions() #endif GetClientSize( &clientWidth, &clientHeight ); - wxNode* node = m_lines.First(); int entireWidth = 0 ; - while (node) + for (size_t j = 0; j < m_lines.GetCount(); j++) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[j]; line->CalculateSize( &dc, iconSpacing ); line->SetPosition( &dc, x, y, clientWidth ); int col_x = 2; @@ -2189,7 +2737,6 @@ void wxListMainWindow::CalculatePositions() line->SetPosition( &dc, x, y, col_x ); #endif y += lineSpacing; // one pixel blank line between items - node = node->Next(); } m_visibleLines = clientHeight / lineSpacing; #if wxUSE_GENERIC_LIST_EXTENSIONS @@ -2210,16 +2757,15 @@ void wxListMainWindow::CalculatePositions() for (int tries = 0; tries < 2; tries++) { entireWidth = 0; - int x = 5; // painting is done at x-2 - int y = 5; // painting is done at y-2 + int x = 2; + int y = 2; int maxWidth = 0; m_visibleLines = 0; int m_currentVisibleLines = 0; - wxNode *node = m_lines.First(); - while (node) + for (size_t i = 0; i < m_lines.GetCount(); i++) { m_currentVisibleLines++; - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[i]; line->CalculateSize( &dc, iconSpacing ); line->SetPosition( &dc, x, y, clientWidth ); line->GetSize( lineWidth, lineHeight ); @@ -2230,13 +2776,12 @@ void wxListMainWindow::CalculatePositions() if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking" { m_currentVisibleLines = 0; - y = 5; + y = 2; x += maxWidth+6; entireWidth += maxWidth+6; maxWidth = 0; } - node = node->Next(); - if (!node) entireWidth += maxWidth; + if (i == m_lines.GetCount()-1) entireWidth += maxWidth; if ((tries == 0) && (entireWidth > clientWidth)) { clientHeight -= 15; // scrollbar height @@ -2244,7 +2789,7 @@ void wxListMainWindow::CalculatePositions() m_currentVisibleLines = 0; break; } - if (!node) tries = 1; // everything fits, no second try required + if (i == m_lines.GetCount()-1) tries = 1; // everything fits, no second try required } } @@ -2253,48 +2798,66 @@ void wxListMainWindow::CalculatePositions() } } -void wxListMainWindow::RealizeChanges( void ) +void wxListMainWindow::RealizeChanges() { if (!m_current) { - wxNode *node = m_lines.First(); - if (node) m_current = (wxListLineData*)node->Data(); + if (!m_lines.IsEmpty()) + m_current = &m_lines[0]; } if (m_current) { FocusLine( m_current ); - if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE ); + // TODO: MSW doesn't automatically hilight the + // first item. + // if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE ); } } -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 ); - while (node) + 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; + } + + for (size_t i = (size_t)ret; i < m_lines.GetCount(); i++) { - 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; + wxListLineData *line = &m_lines[i]; + 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 ); - if (node) + if (index >= 0 && (size_t)index < m_lines.GetCount()) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[(size_t)index]; if (m_current == line) m_current = (wxListLineData *) NULL; DeleteLine( line ); - m_lines.DeleteNode( node ); + m_lines.RemoveAt( (size_t)index ); } } @@ -2308,7 +2871,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; @@ -2316,34 +2879,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(); } @@ -2356,9 +2903,8 @@ void wxListMainWindow::EnsureVisible( long index ) wxListLineData *oldCurrent = m_current; m_current = (wxListLineData *) NULL; - int i = index; - wxNode *node = m_lines.Nth( i ); - if (node) m_current = (wxListLineData*)node->Data(); + if (index >= 0 && (size_t)index < m_lines.GetCount()) + m_current = &m_lines[(size_t)index]; if (m_current) MoveToFocus(); m_current = oldCurrent; } @@ -2368,14 +2914,12 @@ 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 ); - while (node) + for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[i]; wxString s = ""; line->GetText( 0, s ); if (s == tmp) return pos; - node = node->Next(); pos++; } return -1; @@ -2385,14 +2929,12 @@ long wxListMainWindow::FindItem(long start, long data) { long pos = start; if (pos < 0) pos = 0; - wxNode *node = m_lines.Nth( pos ); - while (node) + for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[i]; wxListItem item; line->GetItem( 0, item ); if (item.m_data == data) return pos; - node = node->Next(); pos++; } return -1; @@ -2400,18 +2942,18 @@ long wxListMainWindow::FindItem(long start, long data) long wxListMainWindow::HitTest( int x, int y, int &flags ) { - wxNode *node = m_lines.First(); + CalcUnscrolledPosition( x, y, &x, &y ); + int count = 0; - while (node) + for (size_t i = 0; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); + wxListLineData *line = &m_lines[i]; long ret = line->IsHit( x, y ); if (ret & flags) { - flags = ret; + flags = (int)ret; return count; } - node = node->Next(); count++; } return -1; @@ -2439,14 +2981,14 @@ void wxListMainWindow::InsertItem( wxListItem &item ) } line->SetItem( 0, item ); - if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount())) + if ((item.m_itemId >= 0) && ((size_t)item.m_itemId < m_lines.GetCount())) { - wxNode *node = m_lines.Nth( item.m_itemId ); - if (node) m_lines.Insert( node, line ); + m_lines.Insert( line, (size_t)item.m_itemId ); } else { - m_lines.Append( line ); + m_lines.Add( line ); + item.m_itemId = m_lines.GetCount(); } } @@ -2459,7 +3001,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 ); } @@ -2473,10 +3015,10 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item ) wxListCtrlCompare list_ctrl_compare_func_2; long list_ctrl_compare_data; -int LINKAGEMODE list_ctrl_compare_func_1( const void *arg1, const void *arg2 ) +int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 ) { - wxListLineData *line1 = *((wxListLineData**)arg1); - wxListLineData *line2 = *((wxListLineData**)arg2); + wxListLineData *line1 = *arg1; + wxListLineData *line2 = *arg2; wxListItem item; line1->GetItem( 0, item ); long data1 = item.m_data; @@ -2490,6 +3032,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) @@ -2528,7 +3071,31 @@ wxListItem::wxListItem() m_data = 0; m_format = wxLIST_FORMAT_CENTRE; m_width = 0; - m_colour = wxBLACK; + + m_attr = NULL; +} + +void wxListItem::Clear() +{ + m_mask = 0; + m_itemId = 0; + m_col = 0; + m_state = 0; + m_stateMask = 0; + m_image = 0; + m_data = 0; + m_format = wxLIST_FORMAT_CENTRE; + m_width = 0; + m_text = wxEmptyString; + + if (m_attr) delete m_attr; + m_attr = NULL; +} + +void wxListItem::ClearAttributes() +{ + if (m_attr) delete m_attr; + m_attr = NULL; } // ------------------------------------------------------------------------------------- @@ -2571,7 +3138,11 @@ void wxListEvent::CopyObject(wxObject& object_dest) const obj->m_item.m_data = m_item.m_data; obj->m_item.m_format = m_item.m_format; obj->m_item.m_width = m_item.m_width; - obj->m_item.m_colour = m_item.m_colour; + + if ( m_item.HasAttributes() ) + { + obj->m_item.SetTextColour(m_item.GetTextColour()); + } } // ------------------------------------------------------------------------------------- @@ -2598,12 +3169,13 @@ wxListCtrl::~wxListCtrl() { } -bool wxListCtrl::Create( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, -#if wxUSE_VALIDATORS - long style, const wxValidator &validator, -#endif - const wxString &name ) +bool wxListCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator &validator, + const wxString &name) { m_imageListNormal = (wxImageList *) NULL; m_imageListSmall = (wxImageList *) NULL; @@ -2611,39 +3183,29 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id, m_mainWin = (wxListMainWindow*) NULL; m_headerWin = (wxListHeaderWindow*) NULL; - long s = style; - -#ifdef __VMS__ -#pragma message disable codcauunr - // VMS reports on this part the warning: - // statement either is unreachable or causes unreachable code -#endif - if ((s & wxLC_REPORT == 0) && - (s & wxLC_LIST == 0) && - (s & wxLC_ICON == 0)) + if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) ) { - s = s | wxLC_LIST; + style = style | wxLC_LIST; } -#ifdef __VMS__ -#pragma message enable codcauunr -#endif - bool ret = wxControl::Create( parent, id, pos, size, s, name ); + bool ret = wxControl::Create( parent, id, pos, size, style, validator, name ); -#if wxUSE_VALIDATORS - SetValidator( validator ); -#endif - if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER; + if (style & wxSUNKEN_BORDER) + style -= wxSUNKEN_BORDER; - m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s ); + 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 ); + } return ret; } @@ -2876,15 +3438,15 @@ int wxListCtrl::GetSelectedItemCount() const return m_mainWin->GetSelectedItemCount(); } -/* wxColour wxListCtrl::GetTextColour() const { + return GetForegroundColour(); } -void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col)) +void wxListCtrl::SetTextColour(const wxColour& col) { + SetForegroundColour(col); } -*/ long wxListCtrl::GetTopItem() const { @@ -3022,7 +3584,10 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex ) long wxListCtrl::InsertColumn( long col, wxListItem &item ) { + wxASSERT( m_headerWin ); m_mainWin->InsertColumn( col, item ); + m_headerWin->Refresh(); + return 0; } @@ -3100,24 +3665,22 @@ void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) m_mainWin->RealizeChanges(); m_mainWin->m_dirty = FALSE; m_mainWin->Refresh(); + + if ( m_headerWin && m_headerWin->m_dirty ) + { + m_headerWin->m_dirty = FALSE; + m_headerWin->Refresh(); + } } bool wxListCtrl::SetBackgroundColour( const wxColour &colour ) { - if ( !wxWindow::SetBackgroundColour( colour ) ) - return FALSE; - if (m_mainWin) { m_mainWin->SetBackgroundColour( colour ); m_mainWin->m_dirty = TRUE; } - if (m_headerWin) - { -// m_headerWin->SetBackgroundColour( colour ); - } - return TRUE; } @@ -3159,3 +3722,44 @@ bool wxListCtrl::SetFont( const wxFont &font ) return TRUE; } +#if wxUSE_DRAG_AND_DROP + +void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget ) +{ + m_mainWin->SetDropTarget( dropTarget ); +} + +wxDropTarget *wxListCtrl::GetDropTarget() const +{ + return m_mainWin->GetDropTarget(); +} + +#endif // wxUSE_DRAG_AND_DROP + +bool wxListCtrl::SetCursor( const wxCursor &cursor ) +{ + return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE; +} + +wxColour wxListCtrl::GetBackgroundColour() const +{ + return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour(); +} + +wxColour wxListCtrl::GetForegroundColour() const +{ + return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour(); +} + +bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) +{ + return m_mainWin->PopupMenu( menu, x, y ); +} + +void wxListCtrl::SetFocus() +{ + /* The test in window.cpp fails as we are a composite + window, so it checks against "this", but not m_mainWin. */ + if ( FindFocus() != this ) + m_mainWin->SetFocus(); +}