X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/139adb6a281e8c1a94519e24a1e7be319b50155e..f1d93f0beeec9d88f8a225aa35a9ccc163dcdb15:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 7b63d0044a..8e7857291f 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -8,12 +8,384 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "listctrl.h" + #pragma implementation "listctrl.h" + #pragma implementation "listctrlbase.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop #endif #include "wx/dcscreen.h" #include "wx/app.h" #include "wx/listctrl.h" +#include "wx/generic/imaglist.h" +#include "wx/dynarray.h" + +#ifdef __WXGTK__ +#include +#include "wx/gtk/win_gtk.h" +#endif + +#ifndef wxUSE_GENERIC_LIST_EXTENSIONS +#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 @@ -21,7 +393,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject); -wxListItemData::wxListItemData(void) +wxListItemData::wxListItemData() { m_image = -1; m_data = 0; @@ -29,14 +401,15 @@ wxListItemData::wxListItemData(void) 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 ); } @@ -45,7 +418,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; @@ -73,23 +454,18 @@ void wxListItemData::SetPosition( int x, int y ) m_ypos = y; } -void wxListItemData::SetSize( int const width, int height ) +void wxListItemData::SetSize( int width, int height ) { if (width != -1) m_width = width; if (height != -1) m_height = height; } -void wxListItemData::SetColour( wxColour *col ) -{ - m_colour = col; -} - -bool wxListItemData::HasImage(void) const +bool wxListItemData::HasImage() const { return (m_image >= 0); } -bool wxListItemData::HasText(void) const +bool wxListItemData::HasText() const { return (!m_text.IsNull()); } @@ -104,41 +480,46 @@ void wxListItemData::GetText( wxString &s ) s = m_text; } -int wxListItemData::GetX( void ) const +int wxListItemData::GetX() const { return m_xpos; } -int wxListItemData::GetY( void ) const +int wxListItemData::GetY() const { return m_ypos; } -int wxListItemData::GetWidth(void) const +int wxListItemData::GetWidth() const { return m_width; } -int wxListItemData::GetHeight(void) const +int wxListItemData::GetHeight() const { return m_height; } -int wxListItemData::GetImage(void) const +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; -} -wxColour *wxListItemData::GetColour(void) -{ - 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()); + } } //----------------------------------------------------------------------------- @@ -147,7 +528,7 @@ wxColour *wxListItemData::GetColour(void) IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject); -wxListHeaderData::wxListHeaderData(void) +wxListHeaderData::wxListHeaderData() { m_mask = 0; m_image = 0; @@ -200,12 +581,12 @@ void wxListHeaderData::SetFormat( int format ) m_format = format; } -bool wxListHeaderData::HasImage(void) const +bool wxListHeaderData::HasImage() const { return (m_image != 0); } -bool wxListHeaderData::HasText(void) const +bool wxListHeaderData::HasText() const { return (m_text.Length() > 0); } @@ -229,17 +610,17 @@ void wxListHeaderData::GetText( wxString &s ) s = m_text; } -int wxListHeaderData::GetImage(void) const +int wxListHeaderData::GetImage() const { return m_image; } -int wxListHeaderData::GetWidth(void) const +int wxListHeaderData::GetWidth() const { return m_width; } -int wxListHeaderData::GetFormat(void) const +int wxListHeaderData::GetFormat() const { return m_format; } @@ -260,7 +641,7 @@ wxListLineData::wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hili m_spacing = 0; } -void wxListLineData::CalculateSize( wxPaintDC *dc, int spacing ) +void wxListLineData::CalculateSize( wxDC *dc, int spacing ) { m_spacing = spacing; switch (m_mode) @@ -268,16 +649,47 @@ void wxListLineData::CalculateSize( wxPaintDC *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; } @@ -287,12 +699,34 @@ void wxListLineData::CalculateSize( wxPaintDC *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; } @@ -301,111 +735,131 @@ void wxListLineData::CalculateSize( wxPaintDC *dc, int spacing ) m_bound_all.width = 0; m_bound_all.height = 0; wxNode *node = m_items.First(); + if (node) + { + wxListItemData *item = (wxListItemData*)node->Data(); + 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; + } + else + { + m_bound_icon.width = 0; + m_bound_icon.height = 0; + } + } 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; node = node->Next(); } + m_bound_label.width = m_bound_all.width; + m_bound_label.height = m_bound_all.height; break; } } } -void wxListLineData::SetPosition( wxPaintDC *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; - switch (m_mode) - { - case wxLC_ICON: + m_bound_all.x = x; + m_bound_all.y = y; + switch (m_mode) { - 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()) + case wxLC_ICON: + { + wxNode *node = m_items.First(); + if (node) + { + wxListItemData *item = (wxListItemData*)node->Data(); + if (item->HasImage()) + { + 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()) + { + if (m_bound_all.width > m_spacing) + m_bound_label.x = m_bound_all.x + 2; + else + 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: { - 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_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) + { + wxListItemData *item = (wxListItemData*)node->Data(); + if (item->HasImage()) + { + m_bound_icon.x = m_bound_all.x + 2; + m_bound_icon.y = m_bound_all.y + 2; + m_bound_label.x = m_bound_all.x + 6 + m_bound_icon.width; + } + else + { + m_bound_label.x = m_bound_all.x + 2; + } + } + break; } - if (item->HasText()) + case wxLC_REPORT: { - 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; - 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_all.x = 0; + m_bound_all.width = window_width; + AssignRect( m_bound_hilight, m_bound_all ); + 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(); + if (item->HasImage()) + { + m_bound_icon.x = m_bound_all.x + 2; + m_bound_icon.y = m_bound_all.y + 2; + m_bound_label.x += 4 + m_bound_icon.width; + } + } + break; } - } - 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 ); - 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, 0, 0, 0 ,0 ); - AssignRect( m_bound_icon, 0, 0, 0, 0 ); - break; } - } } 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(); @@ -435,7 +889,7 @@ void wxListLineData::GetLabelExtent( int &x, int &y, int &width, int &height ) height = m_bound_label.height; } -void wxListLineData::GetRect( wxRectangle &rect ) +void wxListLineData::GetRect( wxRect &rect ) { AssignRect( rect, m_bound_all ); } @@ -470,7 +924,7 @@ void wxListLineData::SetItem( int index, const wxListItem &info ) } } -void wxListLineData::GetItem( int const index, wxListItem &info ) +void wxListLineData::GetItem( int index, wxListItem &info ) { int i = index; wxNode *node = m_items.Nth( i ); @@ -516,145 +970,189 @@ int wxListLineData::GetImage( int index ) return -1; } -void wxListLineData::DoDraw( wxPaintDC *dc, bool hilight, bool paintBG ) +void wxListLineData::SetAttributes(wxDC *dc, + const wxListItemAttr *attr, + const wxColour& colText, + const wxFont& font, + bool hilight) { - 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 ); - + // 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 ) +{ + 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; - } - if (paintBG) - { - if (hilight) + wxWindow *listctrl = m_owner->GetParent(); + + // default foreground colour + wxColour colText; + if ( hilight ) { - dc->SetBrush( * m_hilightBrush ); - dc->SetPen( * wxTRANSPARENT_PEN ); + colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ); } else { - dc->SetBrush( * wxWHITE_BRUSH ); - dc->SetPen( * wxTRANSPARENT_PEN ); + colText = listctrl->GetForegroundColour(); } - dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y, - m_bound_hilight.width, m_bound_hilight.height ); - } - if (m_mode == wxLC_REPORT) - { - wxString s; - 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()) - { - int y = 0; - m_owner->DrawImage( item->GetImage(), dc, x, item->GetY() ); - m_owner->GetImageSize( item->GetImage(), x, y ); - x += item->GetX() + 5; - } - if (item->HasText()) - { - item->GetText( s ); - if (hilight) - dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - else - dc->SetTextForeground( *item->GetColour() ); - dc->DrawText( s, x, item->GetY() ); - } - dc->DestroyClippingRegion(); - node = node->Next(); - } - } - else - { - wxNode *node = m_items.First(); - if (node) + + // 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 ) { - wxListItemData *item = (wxListItemData*)node->Data(); - if (item->HasImage()) - { - m_owner->DrawImage( item->GetImage(), dc, m_bound_icon.x, m_bound_icon.y ); - } - 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 ); - } + if (hilight) + { + dc->SetBrush( * m_hilightBrush ); + } + else + { + 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 ); + } + + if (m_mode == wxLC_REPORT) + { + wxNode *node = m_items.First(); + while (node) + { + wxListItemData *item = (wxListItemData*)node->Data(); + int x = item->GetX(); + if (item->HasImage()) + { + int y = 0; + m_owner->DrawImage( item->GetImage(), dc, x, item->GetY() ); + m_owner->GetImageSize( item->GetImage(), x, y ); + x += item->GetX() + 5; + } + dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() ); + if (item->HasText()) + { + dc->DrawText( item->GetText(), x, item->GetY()+1 ); + } + dc->DestroyClippingRegion(); + node = node->Next(); + } + } + else + { + wxNode *node = m_items.First(); + if (node) + { + wxListItemData *item = (wxListItemData*)node->Data(); + if (item->HasImage()) + { + m_owner->DrawImage( item->GetImage(), dc, m_bound_icon.x, m_bound_icon.y ); + } + if (item->HasText()) + { + dc->DrawText( item->GetText(), m_bound_label.x, m_bound_label.y ); + } + } } - } } void wxListLineData::Hilight( bool on ) { - if (on == m_hilighted) return; - if (on) - m_owner->SelectLine( this ); - else - m_owner->DeselectLine( this ); - m_hilighted = on; + if (on == m_hilighted) return; + m_hilighted = on; + if (on) + m_owner->SelectLine( this ); + else + m_owner->DeselectLine( this ); } void wxListLineData::ReverseHilight( void ) { - m_hilighted = !m_hilighted; - if (m_hilighted) - m_owner->SelectLine( this ); - else - m_owner->DeselectLine( this ); + m_hilighted = !m_hilighted; + if (m_hilighted) + m_owner->SelectLine( this ); + else + m_owner->DeselectLine( this ); } -void wxListLineData::DrawRubberBand( wxPaintDC *dc, bool on ) +void wxListLineData::DrawRubberBand( wxDC *dc, bool on ) { - if (on) - { - dc->SetPen( * wxBLACK_PEN ); - dc->SetBrush( * wxTRANSPARENT_BRUSH ); - dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y, - m_bound_hilight.width, m_bound_hilight.height ); - } + if (on) + { + dc->SetPen( * wxBLACK_PEN ); + dc->SetBrush( * wxTRANSPARENT_BRUSH ); + dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y, + m_bound_hilight.width, m_bound_hilight.height ); + } } -void wxListLineData::Draw( wxPaintDC *dc ) +void wxListLineData::Draw( wxDC *dc ) { - DoDraw( dc, m_hilighted, m_hilighted ); + DoDraw( dc, m_hilighted, m_hilighted ); } -bool wxListLineData::IsInRect( int x, int y, const wxRectangle &rect ) +bool wxListLineData::IsInRect( int x, int y, const wxRect &rect ) { - return ((x >= rect.x) && (x <= rect.x+rect.width) && (y >= rect.y) && (y <= rect.y+rect.height)); + return ((x >= rect.x) && (x <= rect.x+rect.width) && + (y >= rect.y) && (y <= rect.y+rect.height)); } bool wxListLineData::IsHilighted( void ) { - return m_hilighted; + return m_hilighted; } -void wxListLineData::AssignRect( wxRectangle &dest, int x, int y, int width, int height ) +void wxListLineData::AssignRect( wxRect &dest, int x, int y, int width, int height ) { - dest.x = x; - dest.y = y; - dest.width = width; - dest.height = height; + dest.x = x; + dest.y = y; + dest.width = width; + dest.height = height; } -void wxListLineData::AssignRect( wxRectangle &dest, const wxRectangle &source ) +void wxListLineData::AssignRect( wxRect &dest, const wxRect &source ) { - dest.x = source.x; - dest.y = source.y; - dest.width = source.width; - dest.height = source.height; + dest.x = source.x; + dest.y = source.y; + dest.width = source.width; + dest.height = source.height; } //----------------------------------------------------------------------------- @@ -664,17 +1162,17 @@ void wxListLineData::AssignRect( wxRectangle &dest, const wxRectangle &source ) IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow); BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow) - EVT_PAINT (wxListHeaderWindow::OnPaint) - EVT_MOUSE_EVENTS (wxListHeaderWindow::OnMouse) - EVT_SET_FOCUS (wxListHeaderWindow::OnSetFocus) + EVT_PAINT (wxListHeaderWindow::OnPaint) + EVT_MOUSE_EVENTS (wxListHeaderWindow::OnMouse) + EVT_SET_FOCUS (wxListHeaderWindow::OnSetFocus) END_EVENT_TABLE() wxListHeaderWindow::wxListHeaderWindow( void ) { - m_owner = (wxListMainWindow *) NULL; - m_currentCursor = (wxCursor *) NULL; - m_resizeCursor = (wxCursor *) NULL; - m_isDraging = FALSE; + m_owner = (wxListMainWindow *) NULL; + m_currentCursor = (wxCursor *) NULL; + m_resizeCursor = (wxCursor *) NULL; + m_isDragging = FALSE; } wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner, @@ -682,174 +1180,271 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMain long style, const wxString &name ) : wxWindow( win, id, pos, size, style, name ) { - m_owner = owner; + m_owner = owner; // m_currentCursor = wxSTANDARD_CURSOR; - m_currentCursor = (wxCursor *) NULL; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - m_isDraging = FALSE; + m_currentCursor = (wxCursor *) NULL; + m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); + m_isDragging = FALSE; + m_dirty = FALSE; + + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) ); } wxListHeaderWindow::~wxListHeaderWindow( void ) { - delete m_resizeCursor; + delete m_resizeCursor; } -void wxListHeaderWindow::DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h ) +void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) { - const int m_corner = 1; +#ifdef __WXGTK__ + GtkStateType state = GTK_STATE_NORMAL; + if (!m_parent->IsEnabled()) state = GTK_STATE_INSENSITIVE; + + x = dc->XLOG2DEV( x ); + + gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window, state, GTK_SHADOW_OUT, + (GdkRectangle*) NULL, m_wxwindow, "button", x-1, y-1, w+2, h+2); +#else + const int m_corner = 1; - dc->SetBrush( *wxTRANSPARENT_BRUSH ); + dc->SetBrush( *wxTRANSPARENT_BRUSH ); - dc->SetPen( *wxBLACK_PEN ); - dc->DrawLine( x+w-m_corner+1, y, x+w, y+h ); // right (outer) - dc->DrawRectangle( x, y+h, w, 1 ); // bottom (outer) + dc->SetPen( *wxBLACK_PEN ); + dc->DrawLine( x+w-m_corner+1, y, x+w, y+h ); // right (outer) + dc->DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer) - wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID ); - - dc->SetPen( pen ); - dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner) - dc->DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) + wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID ); - dc->SetPen( *wxWHITE_PEN ); - dc->DrawRectangle( x, y, w-m_corner+1, 1 ); // top (outer) - dc->DrawRectangle( x, y, 1, h ); // left (outer) - dc->DrawLine( x, y+h-1, x+1, y+h-1 ); - dc->DrawLine( x+w-1, y, x+w-1, y+1 ); + dc->SetPen( pen ); + dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner) + dc->DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) + + dc->SetPen( *wxWHITE_PEN ); + dc->DrawRectangle( x, y, w-m_corner+1, 1 ); // top (outer) + dc->DrawRectangle( x, y, 1, h ); // left (outer) + dc->DrawLine( x, y+h-1, x+1, y+h-1 ); + dc->DrawLine( x+w-1, y, x+w-1, y+1 ); +#endif +} + +// 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 ); + wxPaintDC dc( this ); + PrepareDC( dc ); + AdjustDC( dc ); + + dc.BeginDrawing(); + + dc.SetFont( GetFont() ); + + // 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); + + // 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 )); - dc.BeginDrawing(); + 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 wCol = item.m_width; + int cw = wCol - 2; // the width of the rect to draw - dc.SetFont( GetFont() ); + int xEnd = x + wCol; - int w = 0; - int h = 0; - int x = 0; - int y = 0; - GetClientSize( &w, &h ); + // 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.SetTextForeground( *wxBLACK ); - if (m_foregroundColour.Ok()) dc.SetTextForeground( m_foregroundColour ); + dc.SetPen( *wxWHITE_PEN ); - x = 1; - y = 1; - 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 ((i+1 == numColumns) || (x+item.m_width > w-5)) cw = w-x-1; - 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 += wCol; - 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 (x > w+5) break; - } - dc.EndDrawing(); + if (xEnd > w+5) + break; + } + dc.EndDrawing(); } void wxListHeaderWindow::DrawCurrent() { - int x1 = m_currentX; - int y1 = 0; - int x2 = m_currentX-1; - int y2 = 0; - int dummy; - m_owner->GetClientSize( &dummy, &y2 ); - ClientToScreen( &x1, &y1 ); - m_owner->ClientToScreen( &x2, &y2 ); + int x1 = m_currentX; + int y1 = 0; + ClientToScreen( &x1, &y1 ); + + int x2 = m_currentX-1; + int y2 = 0; + m_owner->GetClientSize( NULL, &y2 ); + m_owner->ClientToScreen( &x2, &y2 ); - wxScreenDC dc; - dc.SetLogicalFunction( wxXOR ); - dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) ); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); + wxScreenDC dc; + dc.SetLogicalFunction( wxINVERT ); + dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawLine( x1, y1, x2, y2 ); + AdjustDC(dc); - dc.SetLogicalFunction( wxCOPY ); + dc.DrawLine( x1, y1, x2, y2 ); - dc.SetPen( wxNullPen ); - dc.SetBrush( wxNullBrush ); + dc.SetLogicalFunction( wxCOPY ); + + dc.SetPen( wxNullPen ); + dc.SetBrush( wxNullBrush ); } void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) { - int x = event.GetX(); - int y = event.GetY(); - if (m_isDraging) - { - DrawCurrent(); - if (event.ButtonUp()) - { - ReleaseMouse(); - m_isDraging = FALSE; - 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) - m_currentX = x; - else - m_currentX = m_minX+7; - if (m_currentX > size_x-7) m_currentX = size_x-7; - DrawCurrent(); - } - return; - } - - m_minX = 0; - bool hit_border = FALSE; - int xpos = 0; - for (int j = 0; j < m_owner->GetColumnCount(); j++) - { - xpos += m_owner->GetColumnWidth( j ); - if ((abs(x-xpos) < 3) && (y < 22)) - { - hit_border = TRUE; - m_column = j; - break; - } - m_minX = xpos; - } - - if (event.LeftDown() && hit_border) - { - m_isDraging = TRUE; - m_currentX = x; - DrawCurrent(); - CaptureMouse(); - return; - } - - if (event.Moving()) - { - if (hit_border) - { - if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( * m_resizeCursor ); - m_currentCursor = m_resizeCursor; + // 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) + { + // 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_dirty = TRUE; + m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); + } + else + { + if (x > m_minX + 7) + m_currentX = x; + else + m_currentX = m_minX + 7; + + // draw in the new location + if ( m_currentX < w ) + DrawCurrent(); + } } - else + else // not dragging { - if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( * wxSTANDARD_CURSOR ); - m_currentCursor = wxSTANDARD_CURSOR; + 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++) + { + 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.LeftDown()) + { + 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 if (event.Moving()) + { + 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); + } } - } } void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { - m_owner->SetFocus(); + m_owner->SetFocus(); } //----------------------------------------------------------------------------- @@ -858,12 +1453,12 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner ) { - m_owner = owner; + m_owner = owner; } void wxListRenameTimer::Notify() { - m_owner->OnRenameTimer(); + m_owner->OnRenameTimer(); } //----------------------------------------------------------------------------- @@ -873,50 +1468,67 @@ void wxListRenameTimer::Notify() IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl); BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl) - EVT_CHAR (wxListTextCtrl::OnChar) - EVT_KILL_FOCUS (wxListTextCtrl::OnKillFocus) + EVT_CHAR (wxListTextCtrl::OnChar) + 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, - int style, const wxValidator& validator, const wxString &name ) : - wxTextCtrl( parent, id, value, pos, size, style, validator, name ) -{ - m_res = res; - m_accept = accept; - m_owner = owner; +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; + m_owner = owner; + (*m_accept) = FALSE; + (*m_res) = ""; + m_startValue = value; } void wxListTextCtrl::OnChar( wxKeyEvent &event ) { - if (event.m_keyCode == WXK_RETURN) - { - (*m_accept) = TRUE; - (*m_res) = GetValue(); - m_owner->OnRenameAccept(); -// Show( FALSE ); - Destroy(); - return; - } - if (event.m_keyCode == WXK_ESCAPE) - { - (*m_accept) = FALSE; - (*m_res) = ""; -// Show( FALSE ); - Destroy(); - return; - } - event.Skip(); + if (event.m_keyCode == WXK_RETURN) + { + (*m_accept) = TRUE; + (*m_res) = GetValue(); + + 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) = ""; + + if (!wxPendingDelete.Member(this)) + wxPendingDelete.Append(this); + + return; + } + + event.Skip(); } void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { - (*m_accept) = FALSE; - (*m_res) = ""; -// Show( FALSE ); - Destroy(); - return; + if (!wxPendingDelete.Member(this)) + wxPendingDelete.Append(this); + + if ((*m_accept) && ((*m_res) != m_startValue)) + m_owner->OnRenameAccept(); } //----------------------------------------------------------------------------- @@ -930,14 +1542,15 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) EVT_SIZE (wxListMainWindow::OnSize) EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse) EVT_CHAR (wxListMainWindow::OnChar) + EVT_KEY_DOWN (wxListMainWindow::OnKeyDown) EVT_SET_FOCUS (wxListMainWindow::OnSetFocus) EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus) + EVT_SCROLLWIN (wxListMainWindow::OnScroll) END_EVENT_TABLE() -wxListMainWindow::wxListMainWindow( void ) +wxListMainWindow::wxListMainWindow() { m_mode = 0; - m_lines.DeleteContents( TRUE ); m_columns.DeleteContents( TRUE ); m_current = (wxListLineData *) NULL; m_visibleLines = 0; @@ -955,6 +1568,9 @@ wxListMainWindow::wxListMainWindow( void ) m_renameTimer = new wxListRenameTimer( this ); m_isCreated = FALSE; m_dragCount = 0; + + m_lineLastClicked = + m_lineBeforeLastClicked = (wxListLineData *)NULL; } wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, @@ -963,7 +1579,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; @@ -981,7 +1596,11 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, if (m_mode & wxLC_REPORT) { +#if wxUSE_GENERIC_LIST_EXTENSIONS + m_xScroll = 15; +#else m_xScroll = 0; +#endif m_yScroll = 15; } else @@ -996,80 +1615,103 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, m_renameTimer = new wxListRenameTimer( this ); m_renameAccept = FALSE; - SetBackgroundColour( *wxWHITE ); + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); } -wxListMainWindow::~wxListMainWindow( void ) +wxListMainWindow::~wxListMainWindow() { + DeleteEverything(); + if (m_hilightBrush) delete m_hilightBrush; - + delete m_renameTimer; } 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 ); - wxRectangle 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) ) { - if (m_dirty) return; - - if (m_lines.GetCount() == 0) return; - + // Note: a wxPaintDC must be constructed even if no drawing is + // done (a Windows requirement). wxPaintDC dc( this ); PrepareDC( dc ); + if (m_dirty) return; + + if (m_lines.GetCount() == 0) return; + dc.BeginDrawing(); dc.SetFont( GetFont() ); - + if (m_mode & wxLC_REPORT) { + wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID); + dc.SetPen(pen); + dc.SetBrush(* wxTRANSPARENT_BRUSH); + + wxSize clientSize = GetClientSize(); + 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++) - { - if (!node) break; - - line = (wxListLineData*)node->Data(); - line->Draw( &dc ); - node = node->Next(); - } + + 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++) + { + 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 ); dc.EndDrawing(); @@ -1077,16 +1719,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(); } } @@ -1097,6 +1737,7 @@ void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command ) le.m_itemIndex = GetIndexOfLine( line ); line->GetItem( 0, le.m_item ); GetParent()->GetEventHandler()->ProcessEvent( le ); +// GetParent()->GetEventHandler()->AddPendingEvent( le ); } void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) ) @@ -1124,31 +1765,36 @@ void wxListMainWindow::DeleteLine( wxListLineData *line ) SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM ); } -void wxListMainWindow::StartLabelEdit( wxListLineData *line ) -{ - SendNotify( line, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ); -} +/* *** */ -void wxListMainWindow::RenameLine( wxListLineData *line, const wxString &newName ) +void wxListMainWindow::EditLabel( long item ) { - wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() ); + wxCHECK_RET( ((size_t)item < m_lines.GetCount()), + wxT("wrong index in wxListCtrl::Edit()") ); + + m_currentEdit = &m_lines[(size_t)item]; + + wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() ); le.SetEventObject( GetParent() ); - le.m_itemIndex = GetIndexOfLine( line ); - line->GetItem( 0, le.m_item ); - le.m_item.m_text = newName; + le.m_itemIndex = GetIndexOfLine( m_currentEdit ); + m_currentEdit->GetItem( 0, le.m_item ); GetParent()->GetEventHandler()->ProcessEvent( le ); -} -void wxListMainWindow::OnRenameTimer() -{ - StartLabelEdit( m_current ); + if (!le.IsAllowed()) + return; + + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxString s; - m_current->GetText( 0, s ); + m_currentEdit->GetText( 0, s ); int x = 0; int y = 0; int w = 0; int h = 0; - m_current->GetLabelExtent( x, y, w, h ); + m_currentEdit->GetLabelExtent( x, y, w, h ); wxClientDC dc(this); PrepareDC( dc ); @@ -1160,65 +1806,102 @@ void wxListMainWindow::OnRenameTimer() text->SetFocus(); } +void wxListMainWindow::OnRenameTimer() +{ + wxCHECK_RET( m_current, wxT("invalid m_current") ); + + Edit( m_lines.Index( *m_current ) ); +} + void wxListMainWindow::OnRenameAccept() { - RenameLine( m_current, m_renameRes ); + wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() ); + le.SetEventObject( GetParent() ); + le.m_itemIndex = GetIndexOfLine( m_currentEdit ); + m_currentEdit->GetItem( 0, le.m_item ); + le.m_item.m_text = m_renameRes; + GetParent()->GetEventHandler()->ProcessEvent( le ); + + if (!le.IsAllowed()) return; + + wxListItem info; + info.m_mask = wxLIST_MASK_TEXT; + info.m_itemId = le.m_itemIndex; + info.m_text = m_renameRes; + 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() ); - - // Did we actually hit an item ? + 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()) - m_dragCount = 0; - else + if (event.Dragging()) + { + if (m_dragCount == 0) + m_dragStart = wxPoint(x,y); + m_dragCount++; - if (event.Dragging() && (m_dragCount > 3)) + if (m_dragCount != 3) return; + + int command = wxEVT_COMMAND_LIST_BEGIN_DRAG; + if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG; + + wxListEvent le( command, GetParent()->GetId() ); + le.SetEventObject( GetParent() ); + le.m_pointDrag = m_dragStart; + GetParent()->GetEventHandler()->ProcessEvent( le ); + + return; + } + else { m_dragCount = 0; - - wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_DRAG, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - le.m_pointDrag.x = x; - le.m_pointDrag.y = y; - GetParent()->GetEventHandler()->ProcessEvent( le ); - - return; } if (!line) return; + bool forceClick = FALSE; if (event.ButtonDClick()) { - m_usedKeys = FALSE; - m_lastOnSame = FALSE; m_renameTimer->Stop(); - - SendNotify( line, wxEVT_COMMAND_LIST_KEY_DOWN ); - - return; + m_lastOnSame = FALSE; + + if ( line == m_lineBeforeLastClicked ) + { + m_usedKeys = FALSE; + + SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); + + 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) @@ -1239,15 +1922,18 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK ); return; } - + if (event.MiddleDown()) { SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK ); 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) @@ -1259,50 +1945,47 @@ 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) - { - int i = numOfLine; - numOfLine = numOfCurrent; - numOfCurrent = i; - } - - wxNode *node = m_lines.Nth( numOfCurrent ); + { + int i = numOfLine; + numOfLine = numOfCurrent; + numOfCurrent = i; + } + 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 @@ -1319,38 +2002,44 @@ 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; } } -void wxListMainWindow::MoveToFocus( void ) +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 w_p = 0; - int h_p = 0; - GetClientSize( &w_p, &h_p ); - + + 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 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 ); } } @@ -1359,161 +2048,253 @@ 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 ) +{ + wxWindow *parent = GetParent(); + + /* we propagate the key event up */ + wxKeyEvent ke( wxEVT_KEY_DOWN ); + ke.m_shiftDown = event.m_shiftDown; + ke.m_controlDown = event.m_controlDown; + ke.m_altDown = event.m_altDown; + ke.m_metaDown = event.m_metaDown; + ke.m_keyCode = event.m_keyCode; + ke.m_x = event.m_x; + ke.m_y = event.m_y; + ke.SetEventObject( parent ); + if (parent->GetEventHandler()->ProcessEvent( ke )) return; + + event.Skip(); } void wxListMainWindow::OnChar( wxKeyEvent &event ) { -/* - if (event.KeyCode() == WXK_TAB) - { - if (event.ShiftDown()) - TravPrev( &event ); - else - TravNext( &event ); - return; - } -*/ - if (!m_current) return; - switch (event.KeyCode()) - { - case WXK_UP: - { - wxNode *node = m_lines.Member( m_current )->Previous(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); - break; - } - case WXK_DOWN: - { - wxNode *node = m_lines.Member( m_current )->Next(); - if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); - break; - } - case WXK_END: - { - wxNode *node = m_lines.Last(); - OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); - break; - } - case WXK_HOME: - { - wxNode *node = m_lines.First(); - OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() ); - break; - } - case WXK_PRIOR: - { - int steps = 0; - 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; - } - 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; - 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; - } - 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() ); - } - break; - } - case WXK_RIGHT: - { - 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() ); - } - break; - } - case WXK_SPACE: - { - m_current->ReverseHilight(); - RefreshLine( m_current ); - } - break; - case WXK_INSERT: - { - if (!(m_mode & wxLC_SINGLE_SEL)) - { - wxListLineData *oldCurrent = m_current; - 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 ); - } + wxWindow *parent = GetParent(); + + /* we send a list_key event up */ + 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 ); + ke.m_shiftDown = event.m_shiftDown; + ke.m_controlDown = event.m_controlDown; + ke.m_altDown = event.m_altDown; + ke.m_metaDown = event.m_metaDown; + ke.m_keyCode = event.m_keyCode; + ke.m_x = event.m_x; + ke.m_y = event.m_y; + ke.SetEventObject( parent ); + if (parent->GetEventHandler()->ProcessEvent( ke )) return; + + if (event.KeyCode() == WXK_TAB) + { + wxNavigationKeyEvent nevent; + nevent.SetWindowChange( event.ControlDown() ); + nevent.SetDirection( !event.ShiftDown() ); + nevent.SetEventObject( GetParent()->GetParent() ); + nevent.SetCurrentFocus( m_parent ); + if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) return; } - break; - case WXK_RETURN: - case WXK_EXECUTE: + + /* no item -> nothing to do */ + if (!m_current) { - wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() ); - le.SetEventObject( GetParent() ); - le.m_itemIndex = GetIndexOfLine( m_current ); - m_current->GetItem( 0, le.m_item ); - GetParent()->GetEventHandler()->ProcessEvent( le ); + event.Skip(); + return; } - break; - default: + + switch (event.KeyCode()) { - event.Skip(); - return; + case WXK_UP: + { + int index = m_lines.Index(*m_current); + if (index != wxNOT_FOUND && index > 0) + OnArrowChar( &m_lines[index-1], event.ShiftDown() ); + break; + } + case WXK_DOWN: + { + 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: + { + if (!m_lines.IsEmpty()) + OnArrowChar( &m_lines.Last(), event.ShiftDown() ); + break; + } + case WXK_HOME: + { + 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 + { + steps = index % m_visibleLines; + } + if (index != wxNOT_FOUND) + { + index -= steps; + if (index < 0) index = 0; + OnArrowChar( &m_lines[index], 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 + { + 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() ); + } + break; + } + case WXK_LEFT: + { + if (!(m_mode & wxLC_REPORT)) + { + 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; + } + case WXK_RIGHT: + { + if (!(m_mode & wxLC_REPORT)) + { + 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: + { + 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: + { + if (!(m_mode & wxLC_SINGLE_SEL)) + { + wxListLineData *oldCurrent = m_current; + m_current->ReverseHilight(); + 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; + } + case WXK_RETURN: + case WXK_EXECUTE: + { + 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 ); + break; + } + default: + { + event.Skip(); + return; + } } - } - m_usedKeys = TRUE; + m_usedKeys = TRUE; } +#ifdef __WXGTK__ +extern wxWindow *g_focusWindow; +#endif + void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { - m_hasFocus = TRUE; - RefreshLine( m_current ); + m_hasFocus = TRUE; + RefreshLine( m_current ); + + if (!GetParent()) return; - if (!GetParent()) return; +#ifdef __WXGTK__ + g_focusWindow = GetParent(); +#endif - wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() ); - event.SetEventObject( GetParent() ); - GetParent()->GetEventHandler()->ProcessEvent( event ); + wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() ); + event.SetEventObject( GetParent() ); + GetParent()->GetEventHandler()->ProcessEvent( event ); } void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { - m_hasFocus = FALSE; - RefreshLine( m_current ); + m_hasFocus = FALSE; + RefreshLine( m_current ); } void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) @@ -1521,79 +2302,97 @@ void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) /* We don't even allow the wxScrolledWindow::AdjustScrollbars() call - CalculatePositions(); - printf( "OnSize::Refresh.\n" ); - Refresh(); - event.Skip(); */ + m_dirty = TRUE; } -void wxListMainWindow::DrawImage( int index, wxPaintDC *dc, int x, int y ) +void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y ) { - if ((m_mode & wxLC_ICON) && (m_normal_image_list)) - { - m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - return; - } - if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list)) - { - m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - } - if ((m_mode & wxLC_REPORT) && (m_small_image_list)) - { - m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); - return; - } + if ((m_mode & wxLC_ICON) && (m_normal_image_list)) + { + m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); + return; + } + if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list)) + { + m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); + } + if ((m_mode & wxLC_LIST) && (m_small_image_list)) + { + m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); + } + if ((m_mode & wxLC_REPORT) && (m_small_image_list)) + { + m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); + return; + } } void wxListMainWindow::GetImageSize( int index, int &width, int &height ) { - if ((m_mode & wxLC_ICON) && (m_normal_image_list)) - { - m_normal_image_list->GetSize( index, width, height ); - return; - } - if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list)) - { - m_small_image_list->GetSize( index, width, height ); - return; - } - if ((m_mode & wxLC_REPORT) && (m_small_image_list)) - { - m_small_image_list->GetSize( index, width, height ); - return; - } - width = 0; - height = 0; + if ((m_mode & wxLC_ICON) && (m_normal_image_list)) + { + m_normal_image_list->GetSize( index, width, height ); + return; + } + if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list)) + { + m_small_image_list->GetSize( index, width, height ); + return; + } + if ((m_mode & wxLC_LIST) && (m_small_image_list)) + { + m_small_image_list->GetSize( index, width, height ); + return; + } + if ((m_mode & wxLC_REPORT) && (m_small_image_list)) + { + m_small_image_list->GetSize( index, width, height ); + return; + } + width = 0; + height = 0; } int wxListMainWindow::GetTextLength( wxString &s ) { - wxPaintDC dc( this ); - long lw = 0; - long lh = 0; + wxClientDC dc( this ); + 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 ) @@ -1611,69 +2410,111 @@ 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 ) { - m_dirty = TRUE; - wxNode *node = m_columns.Nth( col ); - if (node) - { - if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text )+7; - wxListHeaderData *column = (wxListHeaderData*)node->Data(); - column->SetItem( item ); - } - wxListCtrl *lc = (wxListCtrl*) GetParent(); - if (lc->m_headerWin) lc->m_headerWin->Refresh(); + m_dirty = TRUE; + wxNode *node = m_columns.Nth( col ); + if (node) + { + if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text )+7; + wxListHeaderData *column = (wxListHeaderData*)node->Data(); + column->SetItem( item ); + } + + 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; + m_dirty = TRUE; - wxNode *node = m_columns.Nth( col ); - if (node) - { - wxListHeaderData *column = (wxListHeaderData*)node->Data(); - column->SetWidth( width ); - } + wxNode *node = (wxNode*) NULL; - node = m_lines.First(); - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - wxNode *n = line->m_items.Nth( col ); - if (n) + if (width == wxLIST_AUTOSIZE_USEHEADER) { - wxListItemData *item = (wxListItemData*)n->Data(); - item->SetSize( width, -1 ); + // TODO do use the header + width = 80; } - node = node->Next(); - } + else if (width == wxLIST_AUTOSIZE) + { + wxClientDC dc(this); + dc.SetFont( GetFont() ); + int max = 10; - wxListCtrl *lc = (wxListCtrl*) GetParent(); - if (lc->m_headerWin) lc->m_headerWin->Refresh(); + for (size_t i = 0; i < m_lines.GetCount(); i++) + { + 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; + wxCoord lx = 0, ly = 0; + if (item->HasImage()) + { + GetImageSize( item->GetImage(), ix, iy ); + current = ix + 5; + } + if (item->HasText()) + { + wxString str; + item->GetText( str ); + dc.GetTextExtent( str, &lx, &ly ); + current += lx; + } + if (current > max) max = current; + } + } + width = max+10; + } + + node = m_columns.Nth( col ); + if (node) + { + wxListHeaderData *column = (wxListHeaderData*)node->Data(); + column->SetWidth( width ); + } + + for (size_t i = 0; i < m_lines.GetCount(); i++) + { + wxListLineData *line = &m_lines[i]; + wxNode *n = line->m_items.Nth( col ); + if (n) + { + wxListItemData *item = (wxListItemData*)n->Data(); + item->SetSize( width, -1 ); + } + } + + wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin; + if ( headerWin ) + headerWin->m_dirty = TRUE; } void wxListMainWindow::GetColumn( int col, wxListItem &item ) { - wxNode *node = m_columns.Nth( col ); - if (node) - { - wxListHeaderData *column = (wxListHeaderData*)node->Data(); - column->GetItem( item ); - } - else - { - item.m_format = 0; - item.m_width = 0; - item.m_text = ""; - item.m_image = 0; - item.m_data = 0; - } + wxNode *node = m_columns.Nth( col ); + if (node) + { + wxListHeaderData *column = (wxListHeaderData*)node->Data(); + column->GetItem( item ); + } + else + { + item.m_format = 0; + item.m_width = 0; + item.m_text = ""; + item.m_image = 0; + item.m_data = 0; + } } int wxListMainWindow::GetColumnWidth( int col ) @@ -1686,16 +2527,16 @@ int wxListMainWindow::GetColumnWidth( int col ) } else { - return 0; + return 0; } } -int wxListMainWindow::GetColumnCount( void ) +int wxListMainWindow::GetColumnCount() { return m_columns.Number(); } -int wxListMainWindow::GetCountPerPage( void ) +int wxListMainWindow::GetCountPerPage() { return m_visibleLines; } @@ -1703,10 +2544,9 @@ int wxListMainWindow::GetCountPerPage( void ) 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 ); } @@ -1720,42 +2560,41 @@ 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 ); - RefreshLine( oldCurrent ); + if (oldCurrent) RefreshLine( oldCurrent ); } } 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 ); m_current = line; FocusLine( m_current ); - oldCurrent->Hilight( FALSE ); + if (oldCurrent) oldCurrent->Hilight( FALSE ); RefreshLine( m_current ); - RefreshLine( oldCurrent ); + if (oldCurrent) RefreshLine( oldCurrent ); } - bool on = state & wxLIST_STATE_SELECTED; - if (on != line->IsHilighted()) - { + bool on = (state & wxLIST_STATE_SELECTED) != 0; + if (on != line->IsHilighted()) + { line->Hilight( on ); RefreshLine( line ); - } + } } } } @@ -1765,19 +2604,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; } } @@ -1786,10 +2623,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 @@ -1801,18 +2637,16 @@ void wxListMainWindow::GetItem( wxListItem &item ) } } -int wxListMainWindow::GetItemCount( void ) +int wxListMainWindow::GetItemCount() { - return m_lines.Number(); + return m_lines.GetCount(); } -void wxListMainWindow::GetItemRect( long index, wxRectangle &rect ) +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 { @@ -1825,12 +2659,10 @@ void wxListMainWindow::GetItemRect( long index, wxRectangle &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()) { - wxRectangle rect; - wxListLineData *line = (wxListLineData*)node->Data(); - line->GetRect( rect ); + wxRect rect; + m_lines[(size_t)item].GetRect( rect ); pos.x = rect.x; pos.y = rect.y; } @@ -1842,15 +2674,12 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) return TRUE; } -int wxListMainWindow::GetSelectedItemCount( void ) +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; } @@ -1864,7 +2693,11 @@ void wxListMainWindow::SetMode( long mode ) if (m_mode & wxLC_REPORT) { +#if wxUSE_GENERIC_LIST_EXTENSIONS + m_xScroll = 15; +#else m_xScroll = 0; +#endif m_yScroll = 15; } else @@ -1874,35 +2707,35 @@ void wxListMainWindow::SetMode( long mode ) } } -long wxListMainWindow::GetMode( void ) const +long wxListMainWindow::GetMode() const { - return m_mode; + return m_mode; } -void wxListMainWindow::CalculatePositions( void ) +void wxListMainWindow::CalculatePositions() { - if (!m_lines.First()) return; + if (m_lines.IsEmpty()) return; - wxPaintDC dc( this ); + wxClientDC dc( this ); dc.SetFont( GetFont() ); int iconSpacing = 0; if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing; if (m_mode & wxLC_SMALL_ICON) iconSpacing = m_small_spacing; - + // we take the first line (which also can be an icon or // an a text item in wxLC_ICON and wxLC_LIST modes) to // measure the size of the line - + int lineWidth = 0; 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; @@ -1911,15 +2744,19 @@ void wxListMainWindow::CalculatePositions( void ) { 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 ); - SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15-6) / m_yScroll, 0, scroll_pos, TRUE ); +#if wxUSE_GENERIC_LIST_EXTENSIONS + int x_scroll_pos = GetScrollPos( wxHORIZONTAL ); +#else + SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE ); +#endif GetClientSize( &clientWidth, &clientHeight ); - wxNode* node = m_lines.First(); - while (node) + int entireWidth = 0 ; + 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; @@ -1928,278 +2765,326 @@ void wxListMainWindow::CalculatePositions( void ) line->SetColumnPosition( i, col_x ); col_x += GetColumnWidth( i ); } + entireWidth = wxMax( entireWidth , col_x ) ; +#if wxUSE_GENERIC_LIST_EXTENSIONS + line->SetPosition( &dc, x, y, col_x ); +#endif y += lineSpacing; // one pixel blank line between items - node = node->Next(); } - m_visibleLines = clientHeight / lineSpacing; + m_visibleLines = clientHeight / lineSpacing; +#if wxUSE_GENERIC_LIST_EXTENSIONS + SetScrollbars( m_xScroll, m_yScroll, entireWidth / m_xScroll , (entireHeight+15) / m_yScroll, x_scroll_pos , scroll_pos, TRUE ); +#endif } else { // at first we try without any scrollbar. if the items don't // fit into the window, we recalculate after subtracting an // approximated 15 pt for the horizontal scrollbar - + GetSize( &clientWidth, &clientHeight ); - clientHeight -= 4; // sunken frame + clientHeight -= 4; // sunken frame int entireWidth = 0; 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; - wxNode *node = m_lines.First(); - while (node) + m_visibleLines = 0; + int m_currentVisibleLines = 0; + for (size_t i = 0; i < m_lines.GetCount(); i++) { - wxListLineData *line = (wxListLineData*)node->Data(); + m_currentVisibleLines++; + wxListLineData *line = &m_lines[i]; line->CalculateSize( &dc, iconSpacing ); line->SetPosition( &dc, x, y, clientWidth ); line->GetSize( lineWidth, lineHeight ); if (lineWidth > maxWidth) maxWidth = lineWidth; y += lineSpacing; - if (y+lineSpacing-7 >= clientHeight) // -7 for earlier "line breaking" + if (m_currentVisibleLines > m_visibleLines) + m_visibleLines = m_currentVisibleLines; + if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking" { - y = 5; - x += maxWidth+5; - entireWidth += maxWidth+5; + m_currentVisibleLines = 0; + 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 + m_visibleLines = 0; + 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 } } - m_visibleLines = (clientHeight+7) / (lineSpacing); // +7 for earlier "line breaking" - + int scroll_pos = GetScrollPos( wxHORIZONTAL ); SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE ); } } -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; - wxNode *node = m_lines.Nth( 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; + 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++; - node = node->Next(); - } - return -1; + 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 = &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++; + } + + return -1; } void wxListMainWindow::DeleteItem( long index ) { - m_dirty = TRUE; - wxNode *node = m_lines.Nth( index ); - if (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - if (m_current == line) m_current = (wxListLineData *) NULL; - DeleteLine( line ); - m_lines.DeleteNode( node ); - } + m_dirty = TRUE; + if (index >= 0 && (size_t)index < m_lines.GetCount()) + { + wxListLineData *line = &m_lines[(size_t)index]; + if (m_current == line) m_current = (wxListLineData *) NULL; + DeleteLine( line ); + m_lines.RemoveAt( (size_t)index ); + } } void wxListMainWindow::DeleteColumn( int col ) { - wxCHECK_RET( col < (int)m_columns.GetCount(), - "attempting to delete inexistent column in wxListView" ); + wxCHECK_RET( col < (int)m_columns.GetCount(), + wxT("attempting to delete inexistent column in wxListView") ); - m_dirty = TRUE; - wxNode *node = m_columns.Nth( col ); - if (node) m_columns.DeleteNode( node ); + m_dirty = TRUE; + wxNode *node = m_columns.Nth( col ); + if (node) m_columns.DeleteNode( node ); } -void wxListMainWindow::DeleteAllItems( void ) +void wxListMainWindow::DeleteAllItems() { - 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_dirty = TRUE; + m_current = (wxListLineData *) NULL; + + // 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 + + 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; - m_columns.Clear(); + DeleteAllItems(); + + m_columns.Clear(); } 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 (m_current) MoveToFocus(); - m_current = oldCurrent; + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + + wxListLineData *oldCurrent = m_current; + m_current = (wxListLineData *) NULL; + if (index >= 0 && (size_t)index < m_lines.GetCount()) + m_current = &m_lines[(size_t)index]; + if (m_current) MoveToFocus(); + m_current = oldCurrent; } long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) ) { - long pos = start; - wxString tmp = str; - if (pos < 0) pos = 0; - wxNode *node = m_lines.Nth( pos ); - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - wxString s = ""; - line->GetText( 0, s ); - if (s == tmp) return pos; - node = node->Next(); - pos++; - } - return -1; + long pos = start; + wxString tmp = str; + if (pos < 0) pos = 0; + for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++) + { + wxListLineData *line = &m_lines[i]; + wxString s = ""; + line->GetText( 0, s ); + if (s == tmp) return pos; + pos++; + } + return -1; } long wxListMainWindow::FindItem(long start, long data) { - long pos = start; - if (pos < 0) pos = 0; - wxNode *node = m_lines.Nth( pos ); - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - wxListItem item; - line->GetItem( 0, item ); - if (item.m_data == data) return pos; - node = node->Next(); - pos++; - } - return -1; + long pos = start; + if (pos < 0) pos = 0; + for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++) + { + wxListLineData *line = &m_lines[i]; + wxListItem item; + line->GetItem( 0, item ); + if (item.m_data == data) return pos; + pos++; + } + return -1; } long wxListMainWindow::HitTest( int x, int y, int &flags ) { - wxNode *node = m_lines.First(); - int count = 0; - while (node) - { - wxListLineData *line = (wxListLineData*)node->Data(); - long ret = line->IsHit( x, y ); - if (ret & flags) + CalcUnscrolledPosition( x, y, &x, &y ); + + int count = 0; + for (size_t i = 0; i < m_lines.GetCount(); i++) { - flags = ret; - return count; + wxListLineData *line = &m_lines[i]; + long ret = line->IsHit( x, y ); + if (ret) // & flags) // No: flags is output-only so may be garbage at this point + { + flags = (int)ret; + return count; + } + count++; } - node = node->Next(); - count++; - } - return -1; + return -1; } void wxListMainWindow::InsertItem( wxListItem &item ) { - m_dirty = TRUE; - int mode = 0; - if (m_mode & wxLC_REPORT) mode = wxLC_REPORT; - else if (m_mode & wxLC_LIST) mode = wxLC_LIST; - else if (m_mode & wxLC_ICON) mode = wxLC_ICON; - else if (m_mode & wxLC_SMALL_ICON) mode = wxLC_ICON; // no typo - wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush ); - if (m_mode & wxLC_REPORT) - { - line->InitItems( GetColumnCount() ); - item.m_width = GetColumnWidth( 0 )-3; - } - else - line->InitItems( 1 ); - line->SetItem( 0, item ); - if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount())) - { - wxNode *node = m_lines.Nth( item.m_itemId ); - if (node) m_lines.Insert( node, line ); - } - else - { - m_lines.Append( line ); - } -} + m_dirty = TRUE; + int mode = 0; + if (m_mode & wxLC_REPORT) mode = wxLC_REPORT; + else if (m_mode & wxLC_LIST) mode = wxLC_LIST; + else if (m_mode & wxLC_ICON) mode = wxLC_ICON; + else if (m_mode & wxLC_SMALL_ICON) mode = wxLC_ICON; // no typo -void wxListMainWindow::InsertColumn( long col, wxListItem &item ) -{ - m_dirty = TRUE; - if (m_mode & wxLC_REPORT) - { - if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text ); - wxListHeaderData *column = new wxListHeaderData( item ); - if ((col >= 0) && (col < (int)m_columns.GetCount())) + wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush ); + + if (m_mode & wxLC_REPORT) + { + line->InitItems( GetColumnCount() ); + item.m_width = GetColumnWidth( 0 )-3; + } + else { - wxNode *node = m_columns.Nth( col ); - if (node) - m_columns.Insert( node, column ); + line->InitItems( 1 ); + } + + line->SetItem( 0, item ); + if ((item.m_itemId >= 0) && ((size_t)item.m_itemId < m_lines.GetCount())) + { + m_lines.Insert( line, (size_t)item.m_itemId ); } else { - m_columns.Append( column ); + m_lines.Add( line ); + item.m_itemId = m_lines.GetCount()-1; + } +} + +void wxListMainWindow::InsertColumn( long col, wxListItem &item ) +{ + m_dirty = TRUE; + if (m_mode & wxLC_REPORT) + { + if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text ); + wxListHeaderData *column = new wxListHeaderData( item ); + if ((col >= 0) && (col < (int)m_columns.GetCount())) + { + wxNode *node = m_columns.Nth( (size_t)col ); + if (node) + m_columns.Insert( node, column ); + } + else + { + m_columns.Append( column ); + } } - } } wxListCtrlCompare list_ctrl_compare_func_2; long list_ctrl_compare_data; -int 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); - wxListItem item; - line1->GetItem( 0, item ); - long data1 = item.m_data; - line2->GetItem( 0, item ); - long data2 = item.m_data; - return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data ); + wxListLineData *line1 = *arg1; + wxListLineData *line2 = *arg2; + wxListItem item; + line1->GetItem( 0, item ); + long data1 = item.m_data; + line2->GetItem( 0, item ); + long data2 = item.m_data; + return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data ); } 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 ); + 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) +{ + wxScrolledWindow::OnScroll( event ) ; +#if wxUSE_GENERIC_LIST_EXTENSIONS + + if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT )) + { + wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ; + if ( lc ) + { + lc->m_headerWin->Refresh() ; +#ifdef __WXMAC__ + lc->m_headerWin->MacUpdateImmediately() ; +#endif + } + } +#endif } // ------------------------------------------------------------------------------------- @@ -2208,18 +3093,42 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) -wxListItem::wxListItem(void) +wxListItem::wxListItem() +{ + 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_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() { - 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_colour = wxBLACK; + if (m_attr) delete m_attr; + m_attr = NULL; } // ------------------------------------------------------------------------------------- @@ -2231,13 +3140,42 @@ IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) wxListEvent::wxListEvent( wxEventType commandType, int id ): wxNotifyEvent( commandType, id ) { - m_code = 0; - m_itemIndex = 0; - m_oldItemIndex = 0; - m_col = 0; - m_cancelled = FALSE; - m_pointDrag.x = 0; - m_pointDrag.y = 0; + m_code = 0; + m_itemIndex = 0; + m_oldItemIndex = 0; + m_col = 0; + m_cancelled = FALSE; + m_pointDrag.x = 0; + m_pointDrag.y = 0; +} + +void wxListEvent::CopyObject(wxObject& object_dest) const +{ + wxListEvent *obj = (wxListEvent *)&object_dest; + + wxNotifyEvent::CopyObject(object_dest); + + obj->m_code = m_code; + obj->m_itemIndex = m_itemIndex; + obj->m_oldItemIndex = m_oldItemIndex; + obj->m_col = m_col; + obj->m_cancelled = m_cancelled; + obj->m_pointDrag = m_pointDrag; + obj->m_item.m_mask = m_item.m_mask; + obj->m_item.m_itemId = m_item.m_itemId; + obj->m_item.m_col = m_item.m_col; + obj->m_item.m_state = m_item.m_state; + obj->m_item.m_stateMask = m_item.m_stateMask; + obj->m_item.m_text = m_item.m_text; + obj->m_item.m_image = m_item.m_image; + 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; + + if ( m_item.HasAttributes() ) + { + obj->m_item.SetTextColour(m_item.GetTextColour()); + } } // ------------------------------------------------------------------------------------- @@ -2251,446 +3189,495 @@ BEGIN_EVENT_TABLE(wxListCtrl,wxControl) EVT_IDLE (wxListCtrl::OnIdle) END_EVENT_TABLE() -wxListCtrl::wxListCtrl(void) +wxListCtrl::wxListCtrl() { - m_imageListNormal = (wxImageList *) NULL; - m_imageListSmall = (wxImageList *) NULL; - m_imageListState = (wxImageList *) NULL; - m_mainWin = (wxListMainWindow*) NULL; - m_headerWin = (wxListHeaderWindow*) NULL; + m_imageListNormal = (wxImageList *) NULL; + m_imageListSmall = (wxImageList *) NULL; + m_imageListState = (wxImageList *) NULL; + m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE; + m_mainWin = (wxListMainWindow*) NULL; + m_headerWin = (wxListHeaderWindow*) NULL; } -wxListCtrl::~wxListCtrl(void) +wxListCtrl::~wxListCtrl() { + if (m_ownsImageListNormal) delete m_imageListNormal; + if (m_ownsImageListSmall) delete m_imageListSmall; + if (m_ownsImageListState) delete m_imageListState; } -bool wxListCtrl::Create( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator &validator, - 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; - m_imageListState = (wxImageList *) NULL; - m_mainWin = (wxListMainWindow*) NULL; - m_headerWin = (wxListHeaderWindow*) NULL; + m_imageListNormal = (wxImageList *) NULL; + m_imageListSmall = (wxImageList *) NULL; + m_imageListState = (wxImageList *) NULL; + m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE; + m_mainWin = (wxListMainWindow*) NULL; + m_headerWin = (wxListHeaderWindow*) NULL; - long s = style; + if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) ) + { + style = style | wxLC_LIST; + } - if ((s & wxLC_REPORT == 0) && - (s & wxLC_LIST == 0) && - (s & wxLC_ICON == 0)) - s = s | wxLC_LIST; + bool ret = wxControl::Create( parent, id, pos, size, style, validator, name ); - bool ret = wxControl::Create( parent, id, pos, size, s, name ); - SetValidator( validator ); - - 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 (GetWindowStyleFlag() & wxLC_REPORT) - m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23) ); - else - m_headerWin = (wxListHeaderWindow *) NULL; + 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; + } - return ret; + return ret; } void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) { - // handled in OnIdle + /* handled in OnIdle */ - if (m_mainWin) m_mainWin->m_dirty = TRUE; + if (m_mainWin) m_mainWin->m_dirty = TRUE; } void wxListCtrl::SetSingleStyle( long style, bool add ) { - long flag = GetWindowStyleFlag(); + long flag = GetWindowStyle(); - if (add) - { - if (style & wxLC_MASK_TYPE) flag = flag & ~wxLC_MASK_TYPE; - if (style & wxLC_MASK_ALIGN) flag = flag & ~wxLC_MASK_ALIGN; - if (style & wxLC_MASK_SORT) flag = flag & ~wxLC_MASK_SORT; - } + if (add) + { + if (style & wxLC_MASK_TYPE) flag = flag & ~wxLC_MASK_TYPE; + if (style & wxLC_MASK_ALIGN) flag = flag & ~wxLC_MASK_ALIGN; + if (style & wxLC_MASK_SORT) flag = flag & ~wxLC_MASK_SORT; + } - if (add) - { - flag |= style; - } - else - { - if (flag & style) flag -= style; - } + if (add) + { + flag |= style; + } + else + { + if (flag & style) flag -= style; + } - SetWindowStyleFlag( flag ); + SetWindowStyleFlag( flag ); } void wxListCtrl::SetWindowStyleFlag( long flag ) { - m_mainWin->DeleteEverything(); + if (m_mainWin) + { + m_mainWin->DeleteEverything(); - int width = 0; - int height = 0; - GetClientSize( &width, &height ); + int width = 0; + int height = 0; + GetClientSize( &width, &height ); - m_mainWin->SetMode( flag ); + m_mainWin->SetMode( flag ); - if (flag & wxLC_REPORT) - { - if (!(GetWindowStyleFlag() & wxLC_REPORT)) - { -// m_mainWin->SetSize( 0, 24, width, height-24 ); - if (!m_headerWin) - { - m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(width,23) ); - } - else - { -// m_headerWin->SetSize( 0, 0, width, 23 ); - m_headerWin->Show( TRUE ); - } - } - } - else - { - if (GetWindowStyleFlag() & wxLC_REPORT) - { -// m_mainWin->SetSize( 0, 0, width, height ); - m_headerWin->Show( FALSE ); + if (flag & wxLC_REPORT) + { + if (!HasFlag(wxLC_REPORT)) + { + if (!m_headerWin) + { + m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, + wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL ); + if (HasFlag(wxLC_NO_HEADER)) + m_headerWin->Show( FALSE ); + } + else + { + if (flag & wxLC_NO_HEADER) + m_headerWin->Show( FALSE ); + else + m_headerWin->Show( TRUE ); + } + } + } + else + { + if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER))) + { + m_headerWin->Show( FALSE ); + } + } } - } - wxWindow::SetWindowStyleFlag( flag ); + wxWindow::SetWindowStyleFlag( flag ); } bool wxListCtrl::GetColumn(int col, wxListItem &item) const { - m_mainWin->GetColumn( col, item ); - return TRUE; + m_mainWin->GetColumn( col, item ); + return TRUE; } bool wxListCtrl::SetColumn( int col, wxListItem& item ) { - m_mainWin->SetColumn( col, item ); - return TRUE; + m_mainWin->SetColumn( col, item ); + return TRUE; } int wxListCtrl::GetColumnWidth( int col ) const { - return m_mainWin->GetColumnWidth( col ); + return m_mainWin->GetColumnWidth( col ); } bool wxListCtrl::SetColumnWidth( int col, int width ) { - m_mainWin->SetColumnWidth( col, width ); - return TRUE; + m_mainWin->SetColumnWidth( col, width ); + return TRUE; } -int wxListCtrl::GetCountPerPage(void) const +int wxListCtrl::GetCountPerPage() const { return m_mainWin->GetCountPerPage(); // different from Windows ? } -/* -wxText& wxListCtrl::GetEditControl(void) const -{ -} -*/ - bool wxListCtrl::GetItem( wxListItem &info ) const { - m_mainWin->GetItem( info ); - return TRUE; + m_mainWin->GetItem( info ); + return TRUE; } bool wxListCtrl::SetItem( wxListItem &info ) { - m_mainWin->SetItem( info ); - return TRUE; + m_mainWin->SetItem( info ); + return TRUE; } long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId ) { - wxListItem info; - info.m_text = label; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = index; - info.m_col = col; - if ( imageId > -1 ) - { - info.m_image = imageId; - info.m_mask |= wxLIST_MASK_IMAGE; - } -; - m_mainWin->SetItem(info); - return TRUE; + wxListItem info; + info.m_text = label; + info.m_mask = wxLIST_MASK_TEXT; + info.m_itemId = index; + info.m_col = col; + if ( imageId > -1 ) + { + info.m_image = imageId; + info.m_mask |= wxLIST_MASK_IMAGE; + }; + m_mainWin->SetItem(info); + return TRUE; } int wxListCtrl::GetItemState( long item, long stateMask ) const { - return m_mainWin->GetItemState( item, stateMask ); + return m_mainWin->GetItemState( item, stateMask ); } bool wxListCtrl::SetItemState( long item, long state, long stateMask ) { - m_mainWin->SetItemState( item, state, stateMask ); - return TRUE; + m_mainWin->SetItemState( item, state, stateMask ); + return TRUE; } bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) { - wxListItem info; - info.m_image = image; - info.m_mask = wxLIST_MASK_IMAGE; - info.m_itemId = item; - m_mainWin->SetItem( info ); - return TRUE; + wxListItem info; + info.m_image = image; + info.m_mask = wxLIST_MASK_IMAGE; + info.m_itemId = item; + m_mainWin->SetItem( info ); + return TRUE; } wxString wxListCtrl::GetItemText( long item ) const { - wxListItem info; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.m_text; + wxListItem info; + info.m_itemId = item; + m_mainWin->GetItem( info ); + return info.m_text; } void wxListCtrl::SetItemText( long item, const wxString &str ) { - wxListItem info; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = item; - info.m_text = str; - m_mainWin->SetItem( info ); + wxListItem info; + info.m_mask = wxLIST_MASK_TEXT; + info.m_itemId = item; + info.m_text = str; + m_mainWin->SetItem( info ); } long wxListCtrl::GetItemData( long item ) const { - wxListItem info; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.m_data; + wxListItem info; + info.m_itemId = item; + m_mainWin->GetItem( info ); + return info.m_data; } bool wxListCtrl::SetItemData( long item, long data ) { - wxListItem info; - info.m_mask = wxLIST_MASK_DATA; - info.m_itemId = item; - info.m_data = data; - m_mainWin->SetItem( info ); - return TRUE; + wxListItem info; + info.m_mask = wxLIST_MASK_DATA; + info.m_itemId = item; + info.m_data = data; + m_mainWin->SetItem( info ); + return TRUE; } -bool wxListCtrl::GetItemRect( long item, wxRectangle &rect, int WXUNUSED(code) ) const +bool wxListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const { - m_mainWin->GetItemRect( item, rect ); - return TRUE; + m_mainWin->GetItemRect( item, rect ); + return TRUE; } bool wxListCtrl::GetItemPosition( long item, wxPoint& pos ) const { - m_mainWin->GetItemPosition( item, pos ); - return TRUE; + m_mainWin->GetItemPosition( item, pos ); + return TRUE; } bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) ) { - return 0; + return 0; } -int wxListCtrl::GetItemCount(void) const +int wxListCtrl::GetItemCount() const { - return m_mainWin->GetItemCount(); + return m_mainWin->GetItemCount(); } -int wxListCtrl::GetColumnCount(void) const +int wxListCtrl::GetColumnCount() const { - return m_mainWin->GetColumnCount(); + return m_mainWin->GetColumnCount(); } void wxListCtrl::SetItemSpacing( int spacing, bool isSmall ) { - m_mainWin->SetItemSpacing( spacing, isSmall ); + m_mainWin->SetItemSpacing( spacing, isSmall ); } int wxListCtrl::GetItemSpacing( bool isSmall ) const { - return m_mainWin->GetItemSpacing( isSmall ); + return m_mainWin->GetItemSpacing( isSmall ); } -int wxListCtrl::GetSelectedItemCount(void) const +int wxListCtrl::GetSelectedItemCount() const { - return m_mainWin->GetSelectedItemCount(); + return m_mainWin->GetSelectedItemCount(); } -/* -wxColour wxListCtrl::GetTextColour(void) const +wxColour wxListCtrl::GetTextColour() const { + return GetForegroundColour(); } -void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col)) +void wxListCtrl::SetTextColour(const wxColour& col) { + SetForegroundColour(col); } -*/ -long wxListCtrl::GetTopItem(void) const +long wxListCtrl::GetTopItem() const { - return 0; + return 0; } long wxListCtrl::GetNextItem( long item, int geom, int state ) const { - return m_mainWin->GetNextItem( item, geom, state ); + return m_mainWin->GetNextItem( item, geom, state ); } wxImageList *wxListCtrl::GetImageList(int which) const { - if (which == wxIMAGE_LIST_NORMAL) - { - return m_imageListNormal; - } - else if (which == wxIMAGE_LIST_SMALL) - { - return m_imageListSmall; - } - else if (which == wxIMAGE_LIST_STATE) - { - return m_imageListState; - } - return (wxImageList *) NULL; + if (which == wxIMAGE_LIST_NORMAL) + { + return m_imageListNormal; + } + else if (which == wxIMAGE_LIST_SMALL) + { + return m_imageListSmall; + } + else if (which == wxIMAGE_LIST_STATE) + { + return m_imageListState; + } + return (wxImageList *) NULL; } void wxListCtrl::SetImageList( wxImageList *imageList, int which ) { - m_mainWin->SetImageList( imageList, which ); + if ( which == wxIMAGE_LIST_NORMAL ) + { + if (m_ownsImageListNormal) delete m_imageListNormal; + m_imageListNormal = imageList; + m_ownsImageListNormal = FALSE; + } + else if ( which == wxIMAGE_LIST_SMALL ) + { + if (m_ownsImageListSmall) delete m_imageListSmall; + m_imageListSmall = imageList; + m_ownsImageListSmall = FALSE; + } + else if ( which == wxIMAGE_LIST_STATE ) + { + if (m_ownsImageListState) delete m_imageListState; + m_imageListState = imageList; + m_ownsImageListState = FALSE; + } + + m_mainWin->SetImageList( imageList, which ); +} + +void wxListCtrl::AssignImageList(wxImageList *imageList, int which) +{ + SetImageList(imageList, which); + if ( which == wxIMAGE_LIST_NORMAL ) + m_ownsImageListNormal = TRUE; + else if ( which == wxIMAGE_LIST_SMALL ) + m_ownsImageListSmall = TRUE; + else if ( which == wxIMAGE_LIST_STATE ) + m_ownsImageListState = TRUE; } bool wxListCtrl::Arrange( int WXUNUSED(flag) ) { - return 0; + return 0; } bool wxListCtrl::DeleteItem( long item ) { - m_mainWin->DeleteItem( item ); - return TRUE; + m_mainWin->DeleteItem( item ); + return TRUE; } -bool wxListCtrl::DeleteAllItems(void) +bool wxListCtrl::DeleteAllItems() { - m_mainWin->DeleteAllItems(); - return TRUE; + m_mainWin->DeleteAllItems(); + return TRUE; } -void wxListCtrl::DeleteAllColumns() +bool wxListCtrl::DeleteAllColumns() { for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ ) DeleteColumn(n); + + return TRUE; +} + +void wxListCtrl::ClearAll() +{ + m_mainWin->DeleteEverything(); } bool wxListCtrl::DeleteColumn( int col ) { - m_mainWin->DeleteColumn( col ); - return TRUE; + m_mainWin->DeleteColumn( col ); + return TRUE; } -/* -wxText& wxListCtrl::Edit( long WXUNUSED(item ) ) +void wxListCtrl::Edit( long item ) { + m_mainWin->Edit( item ); } -*/ bool wxListCtrl::EnsureVisible( long item ) { - m_mainWin->EnsureVisible( item ); - return TRUE; + m_mainWin->EnsureVisible( item ); + return TRUE; } long wxListCtrl::FindItem( long start, const wxString& str, bool partial ) { - return m_mainWin->FindItem( start, str, partial ); + return m_mainWin->FindItem( start, str, partial ); } long wxListCtrl::FindItem( long start, long data ) { - return m_mainWin->FindItem( start, data ); + return m_mainWin->FindItem( start, data ); } long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt), int WXUNUSED(direction)) { - return 0; + return 0; } long wxListCtrl::HitTest( const wxPoint &point, int &flags ) { - return m_mainWin->HitTest( (int)point.x, (int)point.y, flags ); + return m_mainWin->HitTest( (int)point.x, (int)point.y, flags ); } long wxListCtrl::InsertItem( wxListItem& info ) { - m_mainWin->InsertItem( info ); - return 0; + m_mainWin->InsertItem( info ); + return info.m_itemId; } long wxListCtrl::InsertItem( long index, const wxString &label ) { - wxListItem info; - info.m_text = label; - info.m_mask = wxLIST_MASK_TEXT; - info.m_itemId = index; - return InsertItem( info ); + wxListItem info; + info.m_text = label; + info.m_mask = wxLIST_MASK_TEXT; + info.m_itemId = index; + return InsertItem( info ); } long wxListCtrl::InsertItem( long index, int imageIndex ) { - wxListItem info; - info.m_mask = wxLIST_MASK_IMAGE; - info.m_image = imageIndex; - info.m_itemId = index; - return InsertItem( info ); + wxListItem info; + info.m_mask = wxLIST_MASK_IMAGE; + info.m_image = imageIndex; + info.m_itemId = index; + return InsertItem( info ); } long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex ) { - wxListItem info; - info.m_text = label; - info.m_image = imageIndex; - info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE; - info.m_itemId = index; - return InsertItem( info ); + wxListItem info; + info.m_text = label; + info.m_image = imageIndex; + info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE; + info.m_itemId = index; + return InsertItem( info ); } long wxListCtrl::InsertColumn( long col, wxListItem &item ) { - m_mainWin->InsertColumn( col, item ); - return 0; + wxASSERT( m_headerWin ); + m_mainWin->InsertColumn( col, item ); + m_headerWin->Refresh(); + + return 0; } long wxListCtrl::InsertColumn( long col, const wxString &heading, int format, int width ) { - wxListItem item; - item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT; - item.m_text = heading; - if (width >= -2) - { - item.m_mask |= wxLIST_MASK_WIDTH; - item.m_width = width; - } -; - item.m_format = format; + wxListItem item; + item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT; + item.m_text = heading; + if (width >= -2) + { + item.m_mask |= wxLIST_MASK_WIDTH; + item.m_width = width; + } + item.m_format = format; - return InsertColumn( col, item ); + return InsertColumn( col, item ); } bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) { - return 0; + return 0; } // Sort items. @@ -2705,79 +3692,142 @@ bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data ) { - m_mainWin->SortItems( fn, data ); - return TRUE; + m_mainWin->SortItems( fn, data ); + return TRUE; } void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) { - if (!m_mainWin->m_dirty) return; + if (!m_mainWin->m_dirty) return; + + int cw = 0; + int ch = 0; + GetClientSize( &cw, &ch ); + + int x = 0; + int y = 0; + int w = 0; + int h = 0; + + if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER)) + { + m_headerWin->GetPosition( &x, &y ); + m_headerWin->GetSize( &w, &h ); + if ((x != 0) || (y != 0) || (w != cw) || (h != 23)) + m_headerWin->SetSize( 0, 0, cw, 23 ); + + m_mainWin->GetPosition( &x, &y ); + m_mainWin->GetSize( &w, &h ); + if ((x != 0) || (y != 24) || (w != cw) || (h != ch-24)) + m_mainWin->SetSize( 0, 24, cw, ch-24 ); + } + else + { + m_mainWin->GetPosition( &x, &y ); + m_mainWin->GetSize( &w, &h ); + if ((x != 0) || (y != 24) || (w != cw) || (h != ch)) + m_mainWin->SetSize( 0, 0, cw, ch ); + } + + m_mainWin->CalculatePositions(); + 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 (m_mainWin) + { + m_mainWin->SetBackgroundColour( colour ); + m_mainWin->m_dirty = TRUE; + } + + return TRUE; +} + +bool wxListCtrl::SetForegroundColour( const wxColour &colour ) +{ + if ( !wxWindow::SetForegroundColour( colour ) ) + return FALSE; + + if (m_mainWin) + { + m_mainWin->SetForegroundColour( colour ); + m_mainWin->m_dirty = TRUE; + } + + if (m_headerWin) + { + m_headerWin->SetForegroundColour( colour ); + } + + return TRUE; +} + +bool wxListCtrl::SetFont( const wxFont &font ) +{ + if ( !wxWindow::SetFont( font ) ) + return FALSE; - int cw = 0; - int ch = 0; - GetClientSize( &cw, &ch ); + if (m_mainWin) + { + m_mainWin->SetFont( font ); + m_mainWin->m_dirty = TRUE; + } + + if (m_headerWin) + { + m_headerWin->SetFont( font ); + } + + return TRUE; +} - int x = 0; - int y = 0; - int w = 0; - int h = 0; +#if wxUSE_DRAG_AND_DROP - if (GetWindowStyleFlag() & wxLC_REPORT) - { - m_headerWin->GetPosition( &x, &y ); - m_headerWin->GetSize( &w, &h ); - if ((x != 0) || (y != 0) || (w != cw) || (h != 23)) - m_headerWin->SetSize( 0, 0, cw, 23 ); +void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget ) +{ + m_mainWin->SetDropTarget( dropTarget ); +} + +wxDropTarget *wxListCtrl::GetDropTarget() const +{ + return m_mainWin->GetDropTarget(); +} - m_mainWin->GetPosition( &x, &y ); - m_mainWin->GetSize( &w, &h ); - if ((x != 0) || (y != 24) || (w != cw) || (h != ch-24)) - m_mainWin->SetSize( 0, 24, cw, ch-24 ); - } - else - { - m_mainWin->GetPosition( &x, &y ); - m_mainWin->GetSize( &w, &h ); - if ((x != 0) || (y != 24) || (w != cw) || (h != ch)) - m_mainWin->SetSize( 0, 0, cw, ch ); - } +#endif // wxUSE_DRAG_AND_DROP - m_mainWin->CalculatePositions(); - m_mainWin->RealizeChanges(); - m_mainWin->m_dirty = FALSE; - m_mainWin->Refresh(); +bool wxListCtrl::SetCursor( const wxCursor &cursor ) +{ + return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE; } -void wxListCtrl::SetBackgroundColour( const wxColour &colour ) +wxColour wxListCtrl::GetBackgroundColour() const { - if (m_mainWin) - { - m_mainWin->SetBackgroundColour( colour ); - m_mainWin->m_dirty = TRUE; - } - if (m_headerWin) - m_headerWin->SetBackgroundColour( colour ); + return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour(); } -void wxListCtrl::SetForegroundColour( const wxColour &colour ) +wxColour wxListCtrl::GetForegroundColour() const { - if (m_mainWin) - { - m_mainWin->SetForegroundColour( colour ); - m_mainWin->m_dirty = TRUE; - } - if (m_headerWin) - m_headerWin->SetForegroundColour( colour ); + return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour(); } -void wxListCtrl::SetFont( const wxFont &font ) +bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) { - if (m_mainWin) - { - m_mainWin->SetFont( font ); - m_mainWin->m_dirty = TRUE; - } - if (m_headerWin) - m_headerWin->SetFont( font ); + 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(); +}