X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef7c5bd22aecd50c2dacd21cd2f12652309d8254..ec53826c06f6a4de6e9d0c6dedead881458736fc:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 6d25185ea9..aeee3f956f 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -2,11 +2,27 @@ // Name: generic/listctrl.cpp // Purpose: generic implementation of wxListCtrl // Author: Robert Roebling +// Vadim Zeitlin (virtual list control support) // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* + TODO + + 1. we need to implement searching/sorting for virtual controls somehow + ?2. when changing selection the lines are refreshed twice + */ + +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "listctrl.h" #pragma implementation "listctrlbase.h" @@ -21,19 +37,30 @@ #if wxUSE_LISTCTRL -#include "wx/dcscreen.h" -#include "wx/app.h" -#include "wx/listctrl.h" -#include "wx/generic/imaglist.h" -#include "wx/dynarray.h" +#ifndef WX_PRECOMP + #include "wx/app.h" -#ifdef __WXGTK__ -#include -#include "wx/gtk/win_gtk.h" + #include "wx/dynarray.h" + + #include "wx/dcscreen.h" + + #include "wx/textctrl.h" +#endif + +// Include wx/listctrl.h (with wxListView declaration) +// only when wxGenericListCtrl is the only +// implementation, and therefore wxListView needs +// to be derived from the 'generic' version. + +#if defined(__WIN32__) && !defined(__WXUNIVERSAL__) + #include "wx/generic/listctrl.h" +#else + #include "wx/listctrl.h" #endif -#ifndef wxUSE_GENERIC_LIST_EXTENSIONS -#define wxUSE_GENERIC_LIST_EXTENSIONS 1 +#if defined(__WXGTK__) + #include + #include "wx/gtk/win_gtk.h" #endif // ---------------------------------------------------------------------------- @@ -53,62 +80,198 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK) DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT) + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// the height of the header window (FIXME: should depend on its font!) +static const int HEADER_HEIGHT = 23; + +// the scrollbar units +static const int SCROLL_UNIT_X = 15; +static const int SCROLL_UNIT_Y = 15; + +// the spacing between the lines (in report mode) +static const int LINE_SPACING = 0; + +// extra margins around the text label +static const int EXTRA_WIDTH = 3; +static const int EXTRA_HEIGHT = 4; + +// offset for the header window +static const int HEADER_OFFSET_X = 1; +static const int HEADER_OFFSET_Y = 1; + +// when autosizing the columns, add some slack +static const int AUTOSIZE_COL_MARGIN = 10; + +// default and minimal widths for the header columns +static const int WIDTH_COL_DEFAULT = 80; +static const int WIDTH_COL_MIN = 10; + +// the space between the image and the text in the report mode +static const int IMAGE_MARGIN_IN_REPORT_MODE = 5; // ============================================================================ // private classes // ============================================================================ +// ---------------------------------------------------------------------------- +// wxSelectionStore +// ---------------------------------------------------------------------------- + +int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; } + +WX_DEFINE_SORTED_EXPORTED_ARRAY_LONG(size_t, wxIndexArray); + +// this class is used to store the selected items in the virtual list control +// (but it is not tied to list control and so can be used with other controls +// such as wxListBox in wxUniv) +// +// the idea is to make it really smart later (i.e. store the selections as an +// array of ranes + individual items) but, as I don't have time to do it now +// (this would require writing code to merge/break ranges and much more) keep +// it simple but define a clean interface to it which allows it to be made +// smarter later +class WXDLLEXPORT wxSelectionStore +{ +public: + wxSelectionStore() : m_itemsSel(wxSizeTCmpFn) { Init(); } + + // set the total number of items we handle + void SetItemCount(size_t count) { m_count = count; } + + // special case of SetItemCount(0) + void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = FALSE; } + + // must be called when a new item is inserted/added + void OnItemAdd(size_t item) { wxFAIL_MSG( _T("TODO") ); } + + // must be called when an item is deleted + void OnItemDelete(size_t item); + + // select one item, use SelectRange() insted if possible! + // + // returns true if the items selection really changed + bool SelectItem(size_t item, bool select = TRUE); + + // select the range of items + // + // return true and fill the itemsChanged array with the indices of items + // which have changed state if "few" of them did, otherwise return false + // (meaning that too many items changed state to bother counting them + // individually) + bool SelectRange(size_t itemFrom, size_t itemTo, + bool select = TRUE, + wxArrayInt *itemsChanged = NULL); + + // return true if the given item is selected + bool IsSelected(size_t item) const; + + // return the total number of selected items + size_t GetSelectedCount() const + { + return m_defaultState ? m_count - m_itemsSel.GetCount() + : m_itemsSel.GetCount(); + } + +private: + // (re)init + void Init() { m_defaultState = FALSE; } + + // the total number of items we handle + size_t m_count; + + // the default state: normally, FALSE (i.e. off) but maybe set to TRUE if + // there are more selected items than non selected ones - this allows to + // handle selection of all items efficiently + bool m_defaultState; + + // the array of items whose selection state is different from default + wxIndexArray m_itemsSel; + + DECLARE_NO_COPY_CLASS(wxSelectionStore) +}; + //----------------------------------------------------------------------------- // wxListItemData (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListItemData : public wxObject +class WXDLLEXPORT wxListItemData { public: - wxListItemData(); - ~wxListItemData() { delete m_attr; } + wxListItemData(wxListMainWindow *owner); + ~wxListItemData(); - wxListItemData( const wxListItem &info ); void SetItem( const wxListItem &info ); - void SetImage( int image ); - void SetData( long data ); + void SetImage( int image ) { m_image = image; } + void SetData( long data ) { m_data = data; } void SetPosition( int x, int y ); void SetSize( int width, int height ); - bool HasImage() const; bool HasText() const { return !m_text.empty(); } const wxString& GetText() const { return m_text; } void SetText(const wxString& text) { m_text = text; } + // we can't use empty string for measuring the string width/height, so + // always return something + wxString GetTextForMeasuring() const + { + wxString s = GetText(); + if ( s.empty() ) + s = _T('H'); + + return s; + } + bool IsHit( int x, int y ) const; - int GetX( void ) const; - int GetY( void ) const; + int GetX() const; + int GetY() const; int GetWidth() const; int GetHeight() const; - int GetImage() const; + + int GetImage() const { return m_image; } + bool HasImage() const { return GetImage() != -1; } + void GetItem( wxListItem &info ) const; - wxListItemAttr *GetAttributes() const { return m_attr; } + void SetAttr(wxListItemAttr *attr) { m_attr = attr; } + wxListItemAttr *GetAttr() const { return m_attr; } public: - int m_image; - long m_data; - int m_xpos, - m_ypos; - int m_width, - m_height; + // the item image or -1 + int m_image; + // user data associated with the item + long m_data; + + // the item coordinates are not used in report mode, instead this pointer + // is NULL and the owner window is used to retrieve the item position and + // size + wxRect *m_rect; + + // the list ctrl we are in + wxListMainWindow *m_owner; + + // custom attributes or NULL wxListItemAttr *m_attr; protected: - wxString m_text; + // common part of all ctors + void Init(); -private: - DECLARE_DYNAMIC_CLASS(wxListItemData); + wxString m_text; }; //----------------------------------------------------------------------------- @@ -117,15 +280,6 @@ private: 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 ); @@ -147,66 +301,132 @@ public: int GetWidth() const; int GetFormat() const; +protected: + long m_mask; + int m_image; + wxString m_text; + int m_format; + int m_width; + int m_xpos, + m_ypos; + int m_height; + private: - DECLARE_DYNAMIC_CLASS(wxListHeaderData); + void Init(); }; //----------------------------------------------------------------------------- // wxListLineData (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListLineData : public wxObject +WX_DECLARE_LIST(wxListItemData, wxListItemDataList); +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxListItemDataList); + +class WXDLLEXPORT wxListLineData { 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; + // the list of subitems: only may have more than one item in report mode + wxListItemDataList m_items; + + // this is not used in report view + struct GeometryInfo + { + // total item rect + wxRect m_rectAll; + + // label only + wxRect m_rectLabel; + + // icon only + wxRect m_rectIcon; + + // the part to be highlighted + wxRect m_rectHighlight; + } *m_gi; + + // is this item selected? [NB: not used in virtual mode] + bool m_highlighted; - void DoDraw( wxDC *dc, bool hilight, bool paintBG ); + // back pointer to the list ctrl + wxListMainWindow *m_owner; public: - wxListLineData() {} - wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush ); + wxListLineData(wxListMainWindow *owner); + + ~wxListLineData() { delete m_gi; } + + // are we in report mode? + inline bool InReportView() const; + + // are we in virtual report mode? + inline bool IsVirtual() const; + + // these 2 methods shouldn't be called for report view controls, in that + // case we determine our position/size ourselves + + // calculate the size of the line 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 ); + + // remember the position this line appears at + void SetPosition( int x, int y, int window_width, int spacing ); + + // wxListCtrl API + + void SetImage( int image ) { SetImage(0, image); } + int GetImage() const { return GetImage(0); } + bool HasImage() const { return GetImage() != -1; } + bool HasText() const { return !GetText(0).empty(); } + void SetItem( int index, const wxListItem &info ); void GetItem( int index, wxListItem &info ); + wxString GetText(int index) const; 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 ); + + wxListItemAttr *GetAttr() const; + void SetAttr(wxListItemAttr *attr); + + // return true if the highlighting really changed + bool Highlight( bool on ); + + void ReverseHighlight(); + + bool IsHighlighted() const + { + wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") ); + + return m_highlighted; + } + + // draw the line on the given DC in icon/list mode 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 ); + + // the same in report mode + void DrawInReportMode( wxDC *dc, + const wxRect& rect, + const wxRect& rectHL, + bool highlighted ); private: - void SetAttributes(wxDC *dc, + // set the line to contain num items (only can be > 1 in report mode) + void InitItems( int num ); + + // get the mode (i.e. style) of the list control + inline int GetMode() const; + + // prepare the DC for drawing with these item's attributes, return true if + // we need to draw the items background to highlight it, false otherwise + bool SetAttributes(wxDC *dc, const wxListItemAttr *attr, - const wxColour& colText, const wxFont& font, - bool hilight); + bool highlight); - DECLARE_DYNAMIC_CLASS(wxListLineData); + // these are only used by GetImage/SetImage above, we don't support images + // with subitems at the public API level yet + void SetImage( int index, int image ); + int GetImage( int index ) const; }; - WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray); #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxListLineDataArray); @@ -223,7 +443,7 @@ protected: wxCursor *m_resizeCursor; bool m_isDragging; - // column being resized + // column being resized or -1 int m_column; // divider line position in logical (unscrolled) coords @@ -235,7 +455,6 @@ protected: public: wxListHeaderWindow(); - virtual ~wxListHeaderWindow(); wxListHeaderWindow( wxWindow *win, wxWindowID id, @@ -245,6 +464,8 @@ public: long style = 0, const wxString &name = "wxlistctrlcolumntitles" ); + virtual ~wxListHeaderWindow(); + void DoDrawRect( wxDC *dc, int x, int y, int w, int h ); void DrawCurrent(); void AdjustDC(wxDC& dc); @@ -257,6 +478,11 @@ public: bool m_dirty; private: + // common part of all ctors + void Init(); + + void SendListEvent(wxEventType type, wxPoint pos); + DECLARE_DYNAMIC_CLASS(wxListHeaderWindow) DECLARE_EVENT_TABLE() }; @@ -268,7 +494,7 @@ private: class WXDLLEXPORT wxListRenameTimer: public wxTimer { private: - wxListMainWindow *m_owner; + wxListMainWindow *m_owner; public: wxListRenameTimer( wxListMainWindow *owner ); @@ -281,27 +507,23 @@ public: 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" ); + wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit); + +protected: void OnChar( wxKeyEvent &event ); void OnKeyUp( wxKeyEvent &event ); void OnKillFocus( wxFocusEvent &event ); + bool AcceptChanges(); + void Finish(); + private: - DECLARE_DYNAMIC_CLASS(wxListTextCtrl); + wxListMainWindow *m_owner; + wxString m_startValue; + size_t m_itemEdited; + bool m_finished; + DECLARE_EVENT_TABLE() }; @@ -309,97 +531,176 @@ private: // wxListMainWindow (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow +WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList); +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxListHeaderDataList); + +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; + wxListMainWindow(); + wxListMainWindow( wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString &name = _T("listctrlmainwindow") ); - // for double click logic - wxListLineData *m_lineLastClicked, - *m_lineBeforeLastClicked; + virtual ~wxListMainWindow(); -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, - wxPoint point = wxDefaultPosition ); - void FocusLine( wxListLineData *line ); - void UnfocusLine( wxListLineData *line ); - void SelectLine( wxListLineData *line ); - void DeselectLine( wxListLineData *line ); - void DeleteLine( wxListLineData *line ); + bool HasFlag(int flag) const { return m_parent->HasFlag(flag); } + + // return true if this is a virtual list control + bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); } + + // return true if the control is in report mode + bool InReportView() const { return HasFlag(wxLC_REPORT); } + + // return true if we are in single selection mode, false if multi sel + bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); } + + // do we have a header window? + bool HasHeader() const + { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); } + + void HighlightAll( bool on ); + + // all these functions only do something if the line is currently visible + + // change the line "selected" state, return TRUE if it really changed + bool HighlightLine( size_t line, bool highlight = TRUE); + + // as HighlightLine() but do it for the range of lines: this is incredibly + // more efficient for virtual list controls! + // + // NB: unlike HighlightLine() this one does refresh the lines on screen + void HighlightLines( size_t lineFrom, size_t lineTo, bool on = TRUE ); + + // toggle the line state and refresh it + void ReverseHighlight( size_t line ) + { HighlightLine(line, !IsHighlighted(line)); RefreshLine(line); } + + // return true if the line is highlighted + bool IsHighlighted(size_t line) const; + + // refresh one or several lines at once + void RefreshLine( size_t line ); + void RefreshLines( size_t lineFrom, size_t lineTo ); + + // refresh all selected items + void RefreshSelected(); + + // refresh all lines below the given one: the difference with + // RefreshLines() is that the index here might not be a valid one (happens + // when the last line is deleted) + void RefreshAfter( size_t lineFrom ); + + // the methods which are forwarded to wxListLineData itself in list/icon + // modes but are here because the lines don't store their positions in the + // report mode + // get the bound rect for the entire line + wxRect GetLineRect(size_t line) const; + + // get the bound rect of the label + wxRect GetLineLabelRect(size_t line) const; + + // get the bound rect of the items icon (only may be called if we do have + // an icon!) + wxRect GetLineIconRect(size_t line) const; + + // get the rect to be highlighted when the item has focus + wxRect GetLineHighlightRect(size_t line) const; + + // get the size of the total line rect + wxSize GetLineSize(size_t line) const + { return GetLineRect(line).GetSize(); } + + // return the hit code for the corresponding position (in this line) + long HitTestLine(size_t line, int x, int y) const; + + // bring the selected item into view, scrolling to it if necessary + void MoveToItem(size_t item); + + // bring the current item into view + void MoveToFocus() { MoveToItem(m_current); } + + // start editing the label of the given item void EditLabel( long item ); - void Edit( long item ) { EditLabel(item); } // deprecated + + // suspend/resume redrawing the control + void Freeze(); + void Thaw(); + + void SetFocus(); + void OnRenameTimer(); - void OnRenameAccept(); + bool OnRenameAccept(size_t itemEdit, const wxString& value); void OnMouse( wxMouseEvent &event ); - void MoveToFocus(); - void OnArrowChar( wxListLineData *newCurrent, bool shiftDown ); + + // called to switch the selection from the current item to newCurrent, + void OnArrowChar( size_t newCurrent, const wxKeyEvent& event ); + 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 OnPaint( wxPaintEvent &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 GetImageSize( int index, int &width, int &height ) const; + int GetTextLength( const wxString &s ) const; - void SetImageList( wxImageList *imageList, int which ); + void SetImageList( wxGenericImageList *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 GetColumn( int col, wxListItem &item ) const; + int GetColumnWidth( int col ) const; + int GetColumnCount() const { return m_columns.GetCount(); } + + // returns the sum of the heights of all columns + int GetHeaderWidth() const; + + int GetCountPerPage() const; + void SetItem( wxListItem &item ); - void GetItem( wxListItem &item ); + void GetItem( wxListItem &item ) const; 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 ); + int GetItemState( long item, long stateMask ) const; + void GetItemRect( long index, wxRect &rect ) const; + bool GetItemPosition( long item, wxPoint& pos ) const; + int GetSelectedItemCount() const; + + wxString GetItemText(long item) const + { + wxListItem info; + info.m_itemId = item; + GetItem( info ); + return info.m_text; + } + + void SetItemText(long item, const wxString& value) + { + wxListItem info; + info.m_mask = wxLIST_MASK_TEXT; + info.m_itemId = item; + info.m_text = value; + SetItem( info ); + } + + // set the scrollbars and update the positions of the items + void RecalculatePositions(bool noRefresh = FALSE); + + // refresh the window and the header + void RefreshAll(); + + long GetNextItem( long item, int geometry, int state ) const; void DeleteItem( long index ); void DeleteAllItems(); void DeleteColumn( int col ); @@ -409,124 +710,475 @@ public: 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 -// ============================================================================ + size_t GetItemCount() const; + bool IsEmpty() const { return GetItemCount() == 0; } + void SetItemCount(long count); -//----------------------------------------------------------------------------- -// wxListItemData -//----------------------------------------------------------------------------- + // change the current (== focused) item, send a notification event + void ChangeCurrent(size_t current); + void ResetCurrent() { ChangeCurrent((size_t)-1); } + bool HasCurrent() const { return m_current != (size_t)-1; } -IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject); + // send out a wxListEvent + void SendNotify( size_t line, + wxEventType command, + wxPoint point = wxDefaultPosition ); -wxListItemData::wxListItemData() -{ - m_image = -1; - m_data = 0; - m_xpos = 0; - m_ypos = 0; - m_width = 0; - m_height = 0; - m_attr = NULL; -} + // override base class virtual to reset m_lineHeight when the font changes + virtual bool SetFont(const wxFont& font) + { + if ( !wxScrolledWindow::SetFont(font) ) + return FALSE; -wxListItemData::wxListItemData( const wxListItem &info ) -{ - m_image = -1; - m_data = 0; - m_attr = NULL; + m_lineHeight = 0; - SetItem( info ); -} + return TRUE; + } -void wxListItemData::SetItem( const wxListItem &info ) -{ - if (info.m_mask & wxLIST_MASK_TEXT) - SetText(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; + // these are for wxListLineData usage only - if ( info.HasAttributes() ) + // get the backpointer to the list ctrl + wxGenericListCtrl *GetListCtrl() const { - if ( m_attr ) - *m_attr = *info.GetAttributes(); - else - m_attr = new wxListItemAttr(*info.GetAttributes()); + return wxStaticCast(GetParent(), wxGenericListCtrl); } - m_xpos = 0; - m_ypos = 0; - m_width = info.m_width; - m_height = 0; -} + // get the height of all lines (assuming they all do have the same height) + wxCoord GetLineHeight() const; -void wxListItemData::SetImage( int image ) -{ - m_image = image; -} + // get the y position of the given line (only for report view) + wxCoord GetLineY(size_t line) const; -void wxListItemData::SetData( long data ) -{ - m_data = data; -} + // get the brush to use for the item highlighting + wxBrush *GetHighlightBrush() const + { + return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush; + } -void wxListItemData::SetPosition( int x, int y ) -{ - m_xpos = x; - m_ypos = y; -} +//protected: + // the array of all line objects for a non virtual list control (for the + // virtual list control we only ever use m_lines[0]) + wxListLineDataArray m_lines; -void wxListItemData::SetSize( int width, int height ) -{ - if (width != -1) m_width = width; - if (height != -1) m_height = height; -} + // the list of column objects + wxListHeaderDataList m_columns; -bool wxListItemData::HasImage() const -{ - return (m_image >= 0); -} + // currently focused item or -1 + size_t m_current; -bool wxListItemData::IsHit( int x, int y ) const -{ - return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height)); -} + // the number of lines per page + int m_linesPerPage; -int wxListItemData::GetX() const -{ - return m_xpos; -} + // this flag is set when something which should result in the window + // redrawing happens (i.e. an item was added or deleted, or its appearance + // changed) and OnPaint() doesn't redraw the window while it is set which + // allows to minimize the number of repaintings when a lot of items are + // being added. The real repainting occurs only after the next OnIdle() + // call + bool m_dirty; + + wxColour *m_highlightColour; + int m_xScroll, + m_yScroll; + wxGenericImageList *m_small_image_list; + wxGenericImageList *m_normal_image_list; + int m_small_spacing; + int m_normal_spacing; + bool m_hasFocus; + + bool m_lastOnSame; + wxTimer *m_renameTimer; + bool m_isCreated; + int m_dragCount; + wxPoint m_dragStart; + + // for double click logic + size_t m_lineLastClicked, + m_lineBeforeLastClicked; + +protected: + // the total count of items in a virtual list control + size_t m_countVirt; + + // the object maintaining the items selection state, only used in virtual + // controls + wxSelectionStore m_selStore; + + // common part of all ctors + void Init(); + + // intiialize m_[xy]Scroll + void InitScrolling(); + + // get the line data for the given index + wxListLineData *GetLine(size_t n) const + { + wxASSERT_MSG( n != (size_t)-1, _T("invalid line index") ); + + if ( IsVirtual() ) + { + wxConstCast(this, wxListMainWindow)->CacheLineData(n); + + n = 0; + } + + return &m_lines[n]; + } + + // get a dummy line which can be used for geometry calculations and such: + // you must use GetLine() if you want to really draw the line + wxListLineData *GetDummyLine() const; + + // cache the line data of the n-th line in m_lines[0] + void CacheLineData(size_t line); + + // get the range of visible lines + void GetVisibleLinesRange(size_t *from, size_t *to); + + // force us to recalculate the range of visible lines + void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; } + + // get the colour to be used for drawing the rules + wxColour GetRuleColour() const + { +#ifdef __WXMAC__ + return *wxWHITE; +#else + return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); +#endif + } + +private: + // initialize the current item if needed + void UpdateCurrent(); + + // delete all items but don't refresh: called from dtor + void DoDeleteAllItems(); + + // the height of one line using the current font + wxCoord m_lineHeight; + + // the total header width or 0 if not calculated yet + wxCoord m_headerWidth; + + // the first and last lines being shown on screen right now (inclusive), + // both may be -1 if they must be calculated so never access them directly: + // use GetVisibleLinesRange() above instead + size_t m_lineFrom, + m_lineTo; + + // the brushes to use for item highlighting when we do/don't have focus + wxBrush *m_highlightBrush, + *m_highlightUnfocusedBrush; + + // if this is > 0, the control is frozen and doesn't redraw itself + size_t m_freezeCount; + + DECLARE_DYNAMIC_CLASS(wxListMainWindow) + DECLARE_EVENT_TABLE() +}; + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxSelectionStore +// ---------------------------------------------------------------------------- + +bool wxSelectionStore::IsSelected(size_t item) const +{ + bool isSel = m_itemsSel.Index(item) != wxNOT_FOUND; + + // if the default state is to be selected, being in m_itemsSel means that + // the item is not selected, so we have to inverse the logic + return m_defaultState ? !isSel : isSel; +} + +bool wxSelectionStore::SelectItem(size_t item, bool select) +{ + // search for the item ourselves as like this we get the index where to + // insert it later if needed, so we do only one search in the array instead + // of two (adding item to a sorted array requires a search) + size_t index = m_itemsSel.IndexForInsert(item); + bool isSel = index < m_itemsSel.GetCount() && m_itemsSel[index] == item; + + if ( select != m_defaultState ) + { + if ( !isSel ) + { + m_itemsSel.AddAt(item, index); + + return TRUE; + } + } + else // reset to default state + { + if ( isSel ) + { + m_itemsSel.RemoveAt(index); + return TRUE; + } + } + + return FALSE; +} + +bool wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, + bool select, + wxArrayInt *itemsChanged) +{ + // 100 is hardcoded but it shouldn't matter much: the important thing is + // that we don't refresh everything when really few (e.g. 1 or 2) items + // change state + static const size_t MANY_ITEMS = 100; + + wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") ); + + // are we going to have more [un]selected items than the other ones? + if ( itemTo - itemFrom > m_count/2 ) + { + if ( select != m_defaultState ) + { + // the default state now becomes the same as 'select' + m_defaultState = select; + + // so all the old selections (which had state select) shouldn't be + // selected any more, but all the other ones should + wxIndexArray selOld = m_itemsSel; + m_itemsSel.Empty(); + + // TODO: it should be possible to optimize the searches a bit + // knowing the possible range + + size_t item; + for ( item = 0; item < itemFrom; item++ ) + { + if ( selOld.Index(item) == wxNOT_FOUND ) + m_itemsSel.Add(item); + } + + for ( item = itemTo + 1; item < m_count; item++ ) + { + if ( selOld.Index(item) == wxNOT_FOUND ) + m_itemsSel.Add(item); + } + + // many items (> half) changed state + itemsChanged = NULL; + } + else // select == m_defaultState + { + // get the inclusive range of items between itemFrom and itemTo + size_t count = m_itemsSel.GetCount(), + start = m_itemsSel.IndexForInsert(itemFrom), + end = m_itemsSel.IndexForInsert(itemTo); + + if ( start == count || m_itemsSel[start] < itemFrom ) + { + start++; + } + + if ( end == count || m_itemsSel[end] > itemTo ) + { + end--; + } + + if ( start <= end ) + { + // delete all of them (from end to avoid changing indices) + for ( int i = end; i >= (int)start; i-- ) + { + if ( itemsChanged ) + { + if ( itemsChanged->GetCount() > MANY_ITEMS ) + { + // stop counting (see comment below) + itemsChanged = NULL; + } + else + { + itemsChanged->Add(m_itemsSel[i]); + } + } + + m_itemsSel.RemoveAt(i); + } + } + } + } + else // "few" items change state + { + if ( itemsChanged ) + { + itemsChanged->Empty(); + } + + // just add the items to the selection + for ( size_t item = itemFrom; item <= itemTo; item++ ) + { + if ( SelectItem(item, select) && itemsChanged ) + { + itemsChanged->Add(item); + + if ( itemsChanged->GetCount() > MANY_ITEMS ) + { + // stop counting them, we'll just eat gobs of memory + // for nothing at all - faster to refresh everything in + // this case + itemsChanged = NULL; + } + } + } + } + + // we set it to NULL if there are many items changing state + return itemsChanged != NULL; +} + +void wxSelectionStore::OnItemDelete(size_t item) +{ + size_t count = m_itemsSel.GetCount(), + i = m_itemsSel.IndexForInsert(item); + + if ( i < count && m_itemsSel[i] == item ) + { + // this item itself was in m_itemsSel, remove it from there + m_itemsSel.RemoveAt(i); + + count--; + } + + // and adjust the index of all which follow it + while ( i < count ) + { + // all following elements must be greater than the one we deleted + wxASSERT_MSG( m_itemsSel[i] > item, _T("logic error") ); + + m_itemsSel[i++]--; + } +} + +//----------------------------------------------------------------------------- +// wxListItemData +//----------------------------------------------------------------------------- + +wxListItemData::~wxListItemData() +{ + // in the virtual list control the attributes are managed by the main + // program, so don't delete them + if ( !m_owner->IsVirtual() ) + { + delete m_attr; + } + + delete m_rect; +} + +void wxListItemData::Init() +{ + m_image = -1; + m_data = 0; + + m_attr = NULL; +} + +wxListItemData::wxListItemData(wxListMainWindow *owner) +{ + Init(); + + m_owner = owner; + + if ( owner->InReportView() ) + { + m_rect = NULL; + } + else + { + m_rect = new wxRect; + } +} + +void wxListItemData::SetItem( const wxListItem &info ) +{ + if ( info.m_mask & wxLIST_MASK_TEXT ) + SetText(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; + + if ( info.HasAttributes() ) + { + if ( m_attr ) + *m_attr = *info.GetAttributes(); + else + m_attr = new wxListItemAttr(*info.GetAttributes()); + } + + if ( m_rect ) + { + m_rect->x = + m_rect->y = + m_rect->height = 0; + m_rect->width = info.m_width; + } +} + +void wxListItemData::SetPosition( int x, int y ) +{ + wxCHECK_RET( m_rect, _T("unexpected SetPosition() call") ); + + m_rect->x = x; + m_rect->y = y; +} + +void wxListItemData::SetSize( int width, int height ) +{ + wxCHECK_RET( m_rect, _T("unexpected SetSize() call") ); + + if ( width != -1 ) + m_rect->width = width; + if ( height != -1 ) + m_rect->height = height; +} + +bool wxListItemData::IsHit( int x, int y ) const +{ + wxCHECK_MSG( m_rect, FALSE, _T("can't be called in this mode") ); + + return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Inside(x, y); +} + +int wxListItemData::GetX() const +{ + wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + + return m_rect->x; +} int wxListItemData::GetY() const { - return m_ypos; + wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + + return m_rect->y; } int wxListItemData::GetWidth() const { - return m_width; + wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + + return m_rect->width; } int wxListItemData::GetHeight() const { - return m_height; -} + wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); -int wxListItemData::GetImage() const -{ - return m_image; + return m_rect->height; } void wxListItemData::GetItem( wxListItem &info ) const @@ -550,12 +1202,10 @@ void wxListItemData::GetItem( wxListItem &info ) const // wxListHeaderData //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject); - -wxListHeaderData::wxListHeaderData() +void wxListHeaderData::Init() { m_mask = 0; - m_image = 0; + m_image = -1; m_format = 0; m_width = 0; m_xpos = 0; @@ -563,23 +1213,33 @@ wxListHeaderData::wxListHeaderData() m_height = 0; } +wxListHeaderData::wxListHeaderData() +{ + Init(); +} + wxListHeaderData::wxListHeaderData( const wxListItem &item ) { + Init(); + SetItem( item ); - m_xpos = 0; - m_ypos = 0; - m_height = 0; } void wxListHeaderData::SetItem( const wxListItem &item ) { m_mask = item.m_mask; - m_text = item.m_text; - m_image = item.m_image; - m_format = item.m_format; - m_width = item.m_width; - if (m_width < 0) m_width = 80; - if (m_width < 6) m_width = 6; + + if ( m_mask & wxLIST_MASK_TEXT ) + m_text = item.m_text; + + if ( m_mask & wxLIST_MASK_IMAGE ) + m_image = item.m_image; + + if ( m_mask & wxLIST_MASK_FORMAT ) + m_format = item.m_format; + + if ( m_mask & wxLIST_MASK_WIDTH ) + SetWidth(item.m_width); } void wxListHeaderData::SetPosition( int x, int y ) @@ -596,8 +1256,10 @@ void wxListHeaderData::SetHeight( int h ) void wxListHeaderData::SetWidth( int w ) { m_width = w; - if (m_width < 0) m_width = 80; - if (m_width < 6) m_width = 6; + if (m_width < 0) + m_width = WIDTH_COL_DEFAULT; + else if (m_width < WIDTH_COL_MIN) + m_width = WIDTH_COL_MIN; } void wxListHeaderData::SetFormat( int format ) @@ -607,7 +1269,7 @@ void wxListHeaderData::SetFormat( int format ) bool wxListHeaderData::HasImage() const { - return (m_image != 0); + return m_image != -1; } bool wxListHeaderData::IsHit( int x, int y ) const @@ -615,7 +1277,7 @@ bool wxListHeaderData::IsHit( int x, int y ) const return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height)); } -void wxListHeaderData::GetItem( wxListItem &item ) +void wxListHeaderData::GetItem( wxListItem& item ) { item.m_mask = m_mask; item.m_text = m_text; @@ -643,308 +1305,238 @@ int wxListHeaderData::GetFormat() const // wxListLineData //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListLineData,wxObject); +inline int wxListLineData::GetMode() const +{ + return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MASK_TYPE; +} + +inline bool wxListLineData::InReportView() const +{ + return m_owner->HasFlag(wxLC_REPORT); +} -wxListLineData::wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush ) +inline bool wxListLineData::IsVirtual() const +{ + return m_owner->IsVirtual(); +} + +wxListLineData::wxListLineData( wxListMainWindow *owner ) { - m_mode = mode; - m_hilighted = FALSE; m_owner = owner; - m_hilightBrush = hilightBrush; m_items.DeleteContents( TRUE ); - m_spacing = 0; + + if ( InReportView() ) + { + m_gi = NULL; + } + else // !report + { + m_gi = new GeometryInfo; + } + + m_highlighted = FALSE; + + InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 ); } void wxListLineData::CalculateSize( wxDC *dc, int spacing ) { - m_spacing = spacing; - switch (m_mode) + wxListItemDataList::Node *node = m_items.GetFirst(); + wxCHECK_RET( node, _T("no subitems at all??") ); + + wxListItemData *item = node->GetData(); + + switch ( GetMode() ) { case wxLC_ICON: - { - m_bound_all.width = m_spacing; - wxNode *node = m_items.First(); - if (node) + case wxLC_SMALL_ICON: { - wxListItemData *item = (wxListItemData*)node->Data(); + m_gi->m_rectAll.width = spacing; + 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; + wxCoord lw, lh; + if ( s.empty() ) + { + lh = + m_gi->m_rectLabel.width = + m_gi->m_rectLabel.height = 0; + } + else // has label + { + dc->GetTextExtent( s, &lw, &lh ); + if (lh < SCROLL_UNIT_Y) + lh = SCROLL_UNIT_Y; + lw += EXTRA_WIDTH; + lh += EXTRA_HEIGHT; + + m_gi->m_rectAll.height = spacing + lh; + if (lw > spacing) + m_gi->m_rectAll.width = lw; + + m_gi->m_rectLabel.width = lw; + m_gi->m_rectLabel.height = lh; + } if (item->HasImage()) { - int w = 0; - int h = 0; + int w, h; m_owner->GetImageSize( item->GetImage(), w, h ); - m_bound_icon.width = w + 8; - m_bound_icon.height = h + 8; + m_gi->m_rectIcon.width = w + 8; + m_gi->m_rectIcon.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 ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width ) + m_gi->m_rectAll.width = m_gi->m_rectIcon.width; + if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 ) + m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4; } - if (!item->HasText()) + if ( item->HasText() ) { - m_bound_hilight.width = m_bound_icon.width; - m_bound_hilight.height = m_bound_icon.height; + m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width; + m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height; } - else + else // no text, highlight the icon { - m_bound_hilight.width = m_bound_label.width; - m_bound_hilight.height = m_bound_label.height; + m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width; + m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height; } } break; - } + case wxLC_LIST: - { - wxNode *node = m_items.First(); - if (node) { - wxListItemData *item = (wxListItemData*)node->Data(); + wxString s = item->GetTextForMeasuring(); - 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; + if (lh < SCROLL_UNIT_Y) + lh = SCROLL_UNIT_Y; + lw += EXTRA_WIDTH; + lh += EXTRA_HEIGHT; + + m_gi->m_rectLabel.width = lw; + m_gi->m_rectLabel.height = lh; - m_bound_all.width = lw; - m_bound_all.height = lh; + m_gi->m_rectAll.width = lw; + m_gi->m_rectAll.height = lh; if (item->HasImage()) { - int w = 0; - int h = 0; + int w, h; m_owner->GetImageSize( item->GetImage(), w, h ); - m_bound_icon.width = w; - m_bound_icon.height = h; + m_gi->m_rectIcon.width = w; + m_gi->m_rectIcon.height = h; - m_bound_all.width += 4 + w; - if (h > m_bound_all.height) m_bound_all.height = h; + m_gi->m_rectAll.width += 4 + w; + if (h > m_gi->m_rectAll.height) + m_gi->m_rectAll.height = h; } - m_bound_hilight.width = m_bound_all.width; - m_bound_hilight.height = m_bound_all.height; + m_gi->m_rectHighlight.width = m_gi->m_rectAll.width; + m_gi->m_rectHighlight.height = m_gi->m_rectAll.height; } break; - } + case wxLC_REPORT: - { - 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(); - 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; + wxFAIL_MSG( _T("unexpected call to SetSize") ); break; - } + + default: + wxFAIL_MSG( _T("unknown mode") ); } } -void wxListLineData::SetPosition( wxDC * WXUNUSED(dc), - int x, int y, int window_width ) +void wxListLineData::SetPosition( int x, int y, + int window_width, + int spacing ) { - m_bound_all.x = x; - m_bound_all.y = y; - switch (m_mode) + wxListItemDataList::Node *node = m_items.GetFirst(); + wxCHECK_RET( node, _T("no subitems at all??") ); + + wxListItemData *item = node->GetData(); + + switch ( GetMode() ) { case wxLC_ICON: - { - wxNode *node = m_items.First(); - if (node) + case wxLC_SMALL_ICON: + m_gi->m_rectAll.x = x; + m_gi->m_rectAll.y = y; + + if ( item->HasImage() ) { - 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; - } + m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 + + (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2; + m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4; } - break; - } - case wxLC_LIST: - { - 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) + + if ( item->HasText() ) { - 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; - } + if (m_gi->m_rectAll.width > spacing) + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2; else - { - m_bound_label.x = m_bound_all.x + 2; - } + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing/2) - (m_gi->m_rectLabel.width/2); + m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height; + m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2; + m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2; } - break; - } - case wxLC_REPORT: - { - 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) + else // no text, highlight the icon { - 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; - } + m_gi->m_rectHighlight.x = m_gi->m_rectIcon.x - 4; + m_gi->m_rectHighlight.y = m_gi->m_rectIcon.y - 4; } break; - } - } -} -void wxListLineData::SetColumnPosition( int index, int x ) -{ - wxNode *node = m_items.Nth( (size_t)index ); - if (node) - { - wxListItemData *item = (wxListItemData*)node->Data(); - item->SetPosition( x, m_bound_all.y+1 ); - } -} - -void wxListLineData::GetSize( int &width, int &height ) -{ - width = m_bound_all.width; - height = m_bound_all.height; -} + case wxLC_LIST: + m_gi->m_rectAll.x = x; + m_gi->m_rectAll.y = y; -void wxListLineData::GetExtent( int &x, int &y, int &width, int &height ) -{ - x = m_bound_all.x; - y = m_bound_all.y; - width = m_bound_all.width; - height = m_bound_all.height; -} + m_gi->m_rectHighlight.x = m_gi->m_rectAll.x; + m_gi->m_rectHighlight.y = m_gi->m_rectAll.y; + m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2; -void wxListLineData::GetLabelExtent( int &x, int &y, int &width, int &height ) -{ - x = m_bound_label.x; - y = m_bound_label.y; - width = m_bound_label.width; - height = m_bound_label.height; -} + if (item->HasImage()) + { + m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2; + m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2; + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 6 + m_gi->m_rectIcon.width; + } + else + { + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2; + } + break; -void wxListLineData::GetRect( wxRect &rect ) -{ - AssignRect( rect, m_bound_all ); -} + case wxLC_REPORT: + wxFAIL_MSG( _T("unexpected call to SetPosition") ); + break; -long wxListLineData::IsHit( int x, int y ) -{ - wxNode *node = m_items.First(); - if (node) - { - wxListItemData *item = (wxListItemData*)node->Data(); - if (item->HasImage() && IsInRect( x, y, m_bound_icon )) return wxLIST_HITTEST_ONITEMICON; - if (item->HasText() && IsInRect( x, y, m_bound_label )) return wxLIST_HITTEST_ONITEMLABEL; -// if (!(item->HasImage() || item->HasText())) return 0; + default: + wxFAIL_MSG( _T("unknown mode") ); } - // if there is no icon or text = empty - if (IsInRect( x, y, m_bound_all )) return wxLIST_HITTEST_ONITEMICON; - return 0; } void wxListLineData::InitItems( int num ) { - for (int i = 0; i < num; i++) m_items.Append( new wxListItemData() ); + for (int i = 0; i < num; i++) + m_items.Append( new wxListItemData(m_owner) ); } void wxListLineData::SetItem( int index, const wxListItem &info ) { - wxNode *node = m_items.Nth( index ); - if (node) - { - wxListItemData *item = (wxListItemData*)node->Data(); - item->SetItem( info ); - } + wxListItemDataList::Node *node = m_items.Item( index ); + wxCHECK_RET( node, _T("invalid column index in SetItem") ); + + wxListItemData *item = node->GetData(); + item->SetItem( info ); } void wxListLineData::GetItem( int index, wxListItem &info ) { - int i = index; - wxNode *node = m_items.Nth( i ); + wxListItemDataList::Node *node = m_items.Item( index ); if (node) { - wxListItemData *item = (wxListItemData*)node->Data(); + wxListItemData *item = node->GetData(); item->GetItem( info ); } } @@ -953,10 +1545,10 @@ wxString wxListLineData::GetText(int index) const { wxString s; - wxNode *node = m_items.Nth( index ); + wxListItemDataList::Node *node = m_items.Item( index ); if (node) { - wxListItemData *item = (wxListItemData*)node->Data(); + wxListItemData *item = node->GetData(); s = item->GetText(); } @@ -965,217 +1557,216 @@ wxString wxListLineData::GetText(int index) const void wxListLineData::SetText( int index, const wxString s ) { - int i = index; - wxNode *node = m_items.Nth( i ); + wxListItemDataList::Node *node = m_items.Item( index ); if (node) { - wxListItemData *item = (wxListItemData*)node->Data(); + wxListItemData *item = node->GetData(); item->SetText( s ); } } -int wxListLineData::GetImage( int index ) +void wxListLineData::SetImage( int index, int image ) { - int i = index; - wxNode *node = m_items.Nth( i ); - if (node) - { - wxListItemData *item = (wxListItemData*)node->Data(); - return item->GetImage(); - } - return -1; + wxListItemDataList::Node *node = m_items.Item( index ); + wxCHECK_RET( node, _T("invalid column index in SetImage()") ); + + wxListItemData *item = node->GetData(); + item->SetImage(image); } -void wxListLineData::SetAttributes(wxDC *dc, - const wxListItemAttr *attr, - const wxColour& colText, - const wxFont& font, - bool hilight) +int wxListLineData::GetImage( int index ) const { - // 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); - } + wxListItemDataList::Node *node = m_items.Item( index ); + wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") ); - if ( attr && attr->HasFont() ) - { - dc->SetFont(attr->GetFont()); - } - else - { - dc->SetFont(font); - } + wxListItemData *item = node->GetData(); + return item->GetImage(); } -void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) +wxListItemAttr *wxListLineData::GetAttr() const { - 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; + wxListItemDataList::Node *node = m_items.GetFirst(); + wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") ); - if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h )) - return; + wxListItemData *item = node->GetData(); + return item->GetAttr(); +} +void wxListLineData::SetAttr(wxListItemAttr *attr) +{ + wxListItemDataList::Node *node = m_items.GetFirst(); + wxCHECK_RET( node, _T("invalid column index in SetAttr()") ); + + wxListItemData *item = node->GetData(); + item->SetAttr(attr); +} + +bool wxListLineData::SetAttributes(wxDC *dc, + const wxListItemAttr *attr, + bool highlighted) +{ wxWindow *listctrl = m_owner->GetParent(); - // default foreground colour + // fg colour + + // don't use foreground colour for drawing highlighted items - this might + // make them completely invisible (and there is no way to do bit + // arithmetics on wxColour, unfortunately) wxColour colText; - if ( hilight ) + if ( highlighted ) { - colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ); + colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); } else { - colText = listctrl->GetForegroundColour(); + if ( attr && attr->HasTextColour() ) + { + colText = attr->GetTextColour(); + } + else + { + colText = listctrl->GetForegroundColour(); + } } - // default font - wxFont font = listctrl->GetFont(); + dc->SetTextForeground(colText); + + // font + wxFont font; + if ( attr && attr->HasFont() ) + { + font = attr->GetFont(); + } + else + { + 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); + dc->SetFont(font); + // bg colour bool hasBgCol = attr && attr->HasBackgroundColour(); - if ( paintBG || hasBgCol ) + if ( highlighted || hasBgCol ) { - if (hilight) + if ( highlighted ) { - dc->SetBrush( * m_hilightBrush ); + dc->SetBrush( *m_owner->GetHighlightBrush() ); } else { - if ( hasBgCol ) - dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); - else - dc->SetBrush( * wxWHITE_BRUSH ); + dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); } - dc->SetPen( * wxTRANSPARENT_PEN ); - dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y, - m_bound_hilight.width, m_bound_hilight.height ); + dc->SetPen( *wxTRANSPARENT_PEN ); + + return TRUE; } - if (m_mode == wxLC_REPORT) + return FALSE; +} + +void wxListLineData::Draw( wxDC *dc ) +{ + wxListItemDataList::Node *node = m_items.GetFirst(); + wxCHECK_RET( node, _T("no subitems at all??") ); + + bool highlighted = IsHighlighted(); + + wxListItemAttr *attr = GetAttr(); + + if ( SetAttributes(dc, attr, highlighted) ) { - 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(); - } + dc->DrawRectangle( m_gi->m_rectHighlight ); } - else + + wxListItemData *item = node->GetData(); + if (item->HasImage()) { - 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 ); - } - } + wxRect rectIcon = m_gi->m_rectIcon; + m_owner->DrawImage( item->GetImage(), dc, + rectIcon.x, rectIcon.y ); } -} -void wxListLineData::Hilight( bool on ) -{ - if (on == m_hilighted) return; - m_hilighted = on; - if (on) - m_owner->SelectLine( this ); - else - m_owner->DeselectLine( this ); -} + if (item->HasText()) + { + wxRect rectLabel = m_gi->m_rectLabel; -void wxListLineData::ReverseHilight( void ) -{ - m_hilighted = !m_hilighted; - if (m_hilighted) - m_owner->SelectLine( this ); - else - m_owner->DeselectLine( this ); + wxDCClipper clipper(*dc, rectLabel); + dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y ); + } } -void wxListLineData::DrawRubberBand( wxDC *dc, bool on ) +void wxListLineData::DrawInReportMode( wxDC *dc, + const wxRect& rect, + const wxRect& rectHL, + bool highlighted ) { - if (on) + // TODO: later we should support setting different attributes for + // different columns - to do it, just add "col" argument to + // GetAttr() and move these lines into the loop below + wxListItemAttr *attr = GetAttr(); + if ( SetAttributes(dc, attr, highlighted) ) { - 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 ); + dc->DrawRectangle( rectHL ); } -} -void wxListLineData::Draw( wxDC *dc ) -{ - DoDraw( dc, m_hilighted, m_hilighted ); -} + wxCoord x = rect.x + HEADER_OFFSET_X, + y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2; -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)); -} + size_t col = 0; + for ( wxListItemDataList::Node *node = m_items.GetFirst(); + node; + node = node->GetNext(), col++ ) + { + wxListItemData *item = node->GetData(); -bool wxListLineData::IsHilighted( void ) -{ - return m_hilighted; + int width = m_owner->GetColumnWidth(col); + int xOld = x; + x += width; + + if ( item->HasImage() ) + { + int ix, iy; + m_owner->DrawImage( item->GetImage(), dc, xOld, y ); + m_owner->GetImageSize( item->GetImage(), ix, iy ); + + ix += IMAGE_MARGIN_IN_REPORT_MODE; + + xOld += ix; + width -= ix; + } + + wxDCClipper clipper(*dc, xOld, y, width, rect.height); + + if ( item->HasText() ) + { + dc->DrawText( item->GetText(), xOld, y ); + } + } } -void wxListLineData::AssignRect( wxRect &dest, int x, int y, int width, int height ) +bool wxListLineData::Highlight( bool on ) { - dest.x = x; - dest.y = y; - dest.width = width; - dest.height = height; + wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Highlight") ); + + if ( on == m_highlighted ) + return FALSE; + + m_highlighted = on; + + return TRUE; } -void wxListLineData::AssignRect( wxRect &dest, const wxRect &source ) +void wxListLineData::ReverseHighlight( void ) { - dest.x = source.x; - dest.y = source.y; - dest.width = source.width; - dest.height = source.height; + Highlight(!IsHighlighted()); } //----------------------------------------------------------------------------- // wxListHeaderWindow //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow); +IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow) BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow) EVT_PAINT (wxListHeaderWindow::OnPaint) @@ -1183,45 +1774,77 @@ BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow) EVT_SET_FOCUS (wxListHeaderWindow::OnSetFocus) END_EVENT_TABLE() -wxListHeaderWindow::wxListHeaderWindow( void ) +void wxListHeaderWindow::Init() { - m_owner = (wxListMainWindow *) NULL; m_currentCursor = (wxCursor *) NULL; - m_resizeCursor = (wxCursor *) NULL; m_isDragging = FALSE; + m_dirty = FALSE; +} + +wxListHeaderWindow::wxListHeaderWindow() +{ + Init(); + + m_owner = (wxListMainWindow *) NULL; + m_resizeCursor = (wxCursor *) NULL; } -wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) : - wxWindow( win, id, pos, size, style, name ) +wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, + wxWindowID id, + wxListMainWindow *owner, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString &name ) + : wxWindow( win, id, pos, size, style, name ) { + Init(); + m_owner = owner; -// m_currentCursor = wxSTANDARD_CURSOR; - m_currentCursor = (wxCursor *) NULL; m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - m_isDragging = FALSE; - m_dirty = FALSE; - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) ); + SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); } -wxListHeaderWindow::~wxListHeaderWindow( void ) +wxListHeaderWindow::~wxListHeaderWindow() { delete m_resizeCursor; } void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) { -#ifdef __WXGTK__ - GtkStateType state = GTK_STATE_NORMAL; - if (!m_parent->IsEnabled()) state = GTK_STATE_INSENSITIVE; - +#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) + GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL + : 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 + + gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window, + state, GTK_SHADOW_OUT, + (GdkRectangle*) NULL, m_wxwindow, + (char *)"button", // const_cast + x-1, y-1, w+2, h+2); +#elif defined( __WXMAC__ ) + const int m_corner = 1; + + dc->SetBrush( *wxTRANSPARENT_BRUSH ); + + dc->SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) ); + 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( wxColour( 0x88 , 0x88 , 0x88 ), 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) + + 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 ); +#else // !GTK, !Mac const int m_corner = 1; dc->SetBrush( *wxTRANSPARENT_BRUSH ); @@ -1230,7 +1853,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) 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 ); + wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID ); dc->SetPen( pen ); dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner) @@ -1248,7 +1871,6 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) // 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 ); @@ -1257,12 +1879,11 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc) // account for the horz scrollbar offset dc.SetDeviceOrigin( -x * xpix, 0 ); -#endif // wxUSE_GENERIC_LIST_EXTENSIONS } void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { -#ifdef __WXGTK__ +#if defined(__WXGTK__) wxClientDC dc( this ); #else wxPaintDC dc( this ); @@ -1278,48 +1899,67 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // 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.SetTextForeground(wxSystemSettings:: + GetSystemColour( wxSYS_COLOUR_WINDOWTEXT )); + + int x = HEADER_OFFSET_X; - 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++) + for ( int i = 0; i < numColumns && x < w; i++ ) { m_owner->GetColumn( i, item ); int wCol = item.m_width; - int cw = wCol - 2; // the width of the rect to draw - - int xEnd = x + wCol; - // VZ: no, draw it normally - this is better now as we allow resizing - // of the last column as well -#if 0 - // let the last column occupy all available space - if ( i == numColumns - 1 ) - cw = w-x-1; -#endif // 0 + // the width of the rect to draw: make it smaller to fit entirely + // inside the column rect + int cw = wCol - 2; dc.SetPen( *wxWHITE_PEN ); - DoDrawRect( &dc, x, y, cw, h-2 ); - dc.SetClippingRegion( x, y, cw-5, h-4 ); - dc.DrawText( item.GetText(), x+4, y+3 ); - dc.DestroyClippingRegion(); - x += wCol; + DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 ); - if (xEnd > w+5) - break; + // if we have an image, draw it on the right of the label + int image = item.m_image; + if ( image != -1 ) + { + wxGenericImageList *imageList = m_owner->m_small_image_list; + if ( imageList ) + { + int ix, iy; + imageList->GetSize(image, ix, iy); + + imageList->Draw + ( + image, + dc, + x + cw - ix - 1, + HEADER_OFFSET_Y + (h - 4 - iy)/2, + wxIMAGELIST_DRAW_TRANSPARENT + ); + + cw -= ix + 2; + } + //else: ignore the column image + } + + // draw the text clipping it so that it doesn't overwrite the column + // boundary + wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 ); + + dc.DrawText( item.GetText(), + x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT ); + + x += wCol; } + dc.EndDrawing(); } @@ -1327,9 +1967,9 @@ void wxListHeaderWindow::DrawCurrent() { int x1 = m_currentX; int y1 = 0; - ClientToScreen( &x1, &y1 ); + m_owner->ClientToScreen( &x1, &y1 ); - int x2 = m_currentX-1; + int x2 = m_currentX; int y2 = 0; m_owner->GetClientSize( NULL, &y2 ); m_owner->ClientToScreen( &x2, &y2 ); @@ -1352,23 +1992,20 @@ void wxListHeaderWindow::DrawCurrent() void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) { // we want to work with logical coords -#if wxUSE_GENERIC_LIST_EXTENSIONS int x; m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); -#else // !wxUSE_GENERIC_LIST_EXTENSIONS - int x = event.GetX(); -#endif // wxUSE_GENERIC_LIST_EXTENSIONS int y = event.GetY(); if (m_isDragging) { + SendListEvent(wxEVT_COMMAND_LIST_COL_DRAGGING, + event.GetPosition()); + // 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 @@ -1381,6 +2018,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) m_isDragging = FALSE; m_dirty = TRUE; m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); + SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, + event.GetPosition()); } else { @@ -1403,11 +2042,12 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) int xpos = 0; // find the column where this event occured - int countCol = m_owner->GetColumnCount(); - for (int j = 0; j < countCol; j++) + int col, + countCol = m_owner->GetColumnCount(); + for (col = 0; col < countCol; col++) { - xpos += m_owner->GetColumnWidth( j ); - m_column = j; + xpos += m_owner->GetColumnWidth( col ); + m_column = col; if ( (abs(x-xpos) < 3) && (y < 22) ) { @@ -1425,22 +2065,26 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) m_minX = xpos; } - if (event.LeftDown()) + if ( col == countCol ) + m_column = -1; + + if (event.LeftDown() || event.RightUp()) { - if (hit_border) + if (hit_border && event.LeftDown()) { m_isDragging = TRUE; m_currentX = x; DrawCurrent(); CaptureMouse(); + SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, + event.GetPosition()); } - else + else // click on a column { - wxWindow *parent = GetParent(); - wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, parent->GetId() ); - le.SetEventObject( parent ); - le.m_col = m_column; - parent->GetEventHandler()->ProcessEvent( le ); + SendListEvent( event.LeftDown() + ? wxEVT_COMMAND_LIST_COL_CLICK + : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, + event.GetPosition()); } } else if (event.Moving()) @@ -1468,6 +2112,23 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) m_owner->SetFocus(); } +void wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos) +{ + wxWindow *parent = GetParent(); + wxListEvent le( type, parent->GetId() ); + le.SetEventObject( parent ); + le.m_pointDrag = pos; + + // the position should be relative to the parent window, not + // this one for compatibility with MSW and common sense: the + // user code doesn't know anything at all about this header + // window, so why should it get positions relative to it? + le.m_pointDrag.y -= GetSize().y; + + le.m_col = m_column; + parent->GetEventHandler()->ProcessEvent( le ); +} + //----------------------------------------------------------------------------- // wxListRenameTimer (internal) //----------------------------------------------------------------------------- @@ -1486,97 +2147,127 @@ void wxListRenameTimer::Notify() // wxListTextCtrl (internal) //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl); - BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl) EVT_CHAR (wxListTextCtrl::OnChar) - EVT_KEY_UP (wxListTextCtrl::OnKeyUp) + EVT_KEY_UP (wxListTextCtrl::OnKeyUp) 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; +wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit) + : m_startValue(owner->GetItemText(itemEdit)), + m_itemEdited(itemEdit) +{ m_owner = owner; - (*m_accept) = FALSE; - (*m_res) = ""; - m_startValue = value; + m_finished = FALSE; + + wxRect rectLabel = owner->GetLineLabelRect(itemEdit); + + m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y, + &rectLabel.x, &rectLabel.y); + + (void)Create(owner, wxID_ANY, m_startValue, + wxPoint(rectLabel.x-4,rectLabel.y-4), + wxSize(rectLabel.width+11,rectLabel.height+8)); } -void wxListTextCtrl::OnChar( wxKeyEvent &event ) +void wxListTextCtrl::Finish() { - if (event.m_keyCode == WXK_RETURN) + if ( !m_finished ) { - (*m_accept) = TRUE; - (*m_res) = GetValue(); + wxPendingDelete.Append(this); - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + m_finished = TRUE; - if ((*m_accept) && ((*m_res) != m_startValue)) - m_owner->OnRenameAccept(); + m_owner->SetFocus(); + } +} - return; +bool wxListTextCtrl::AcceptChanges() +{ + const wxString value = GetValue(); + + if ( value == m_startValue ) + { + // nothing changed, always accept + return TRUE; } - if (event.m_keyCode == WXK_ESCAPE) + + if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) { - (*m_accept) = FALSE; - (*m_res) = ""; + // vetoed by the user + return FALSE; + } - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + // accepted, do rename the item + m_owner->SetItemText(m_itemEdited, value); - return; - } + return TRUE; +} - event.Skip(); +void wxListTextCtrl::OnChar( wxKeyEvent &event ) +{ + switch ( event.m_keyCode ) + { + case WXK_RETURN: + if ( !AcceptChanges() ) + { + // vetoed by the user code + break; + } + //else: fall through + + case WXK_ESCAPE: + Finish(); + break; + + default: + event.Skip(); + } } void wxListTextCtrl::OnKeyUp( wxKeyEvent &event ) { + if (m_finished) + { + event.Skip(); + return; + } + // auto-grow the textctrl: wxSize parentSize = m_owner->GetSize(); wxPoint myPos = GetPosition(); wxSize mySize = GetSize(); int sx, sy; GetTextExtent(GetValue() + _T("MM"), &sx, &sy); - if (myPos.x + sx > parentSize.x) sx = parentSize.x - myPos.x; - if (mySize.x > sx) sx = mySize.x; + if (myPos.x + sx > parentSize.x) + sx = parentSize.x - myPos.x; + if (mySize.x > sx) + sx = mySize.x; SetSize(sx, -1); - + event.Skip(); } -void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) +void wxListTextCtrl::OnKillFocus( wxFocusEvent &event ) { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + if ( !m_finished ) + { + (void)AcceptChanges(); - if ((*m_accept) && ((*m_res) != m_startValue)) - m_owner->OnRenameAccept(); + Finish(); + } + + event.Skip(); } //----------------------------------------------------------------------------- // wxListMainWindow //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow); +IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow) BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) EVT_PAINT (wxListMainWindow::OnPaint) - EVT_SIZE (wxListMainWindow::OnSize) EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse) EVT_CHAR (wxListMainWindow::OnChar) EVT_KEY_DOWN (wxListMainWindow::OnKeyDown) @@ -1585,99 +2276,473 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) EVT_SCROLLWIN (wxListMainWindow::OnScroll) END_EVENT_TABLE() -wxListMainWindow::wxListMainWindow() +void wxListMainWindow::Init() { - m_mode = 0; m_columns.DeleteContents( TRUE ); - m_current = (wxListLineData *) NULL; - m_visibleLines = 0; - m_hilightBrush = (wxBrush *) NULL; - m_xScroll = 0; - m_yScroll = 0; m_dirty = TRUE; - m_small_image_list = (wxImageList *) NULL; - m_normal_image_list = (wxImageList *) NULL; + m_countVirt = 0; + m_lineFrom = + m_lineTo = (size_t)-1; + m_linesPerPage = 0; + + m_headerWidth = + m_lineHeight = 0; + + m_small_image_list = (wxGenericImageList *) NULL; + m_normal_image_list = (wxGenericImageList *) NULL; + m_small_spacing = 30; m_normal_spacing = 40; + m_hasFocus = FALSE; - m_usedKeys = TRUE; + m_dragCount = 0; + m_isCreated = FALSE; + m_lastOnSame = FALSE; m_renameTimer = new wxListRenameTimer( this ); - m_isCreated = FALSE; - m_dragCount = 0; - m_lineLastClicked = - m_lineBeforeLastClicked = (wxListLineData *)NULL; + m_current = + m_lineLastClicked = + m_lineBeforeLastClicked = (size_t)-1; + + m_freezeCount = 0; +} + +void wxListMainWindow::InitScrolling() +{ + if ( HasFlag(wxLC_REPORT) ) + { + m_xScroll = SCROLL_UNIT_X; + m_yScroll = SCROLL_UNIT_Y; + } + else + { + m_xScroll = SCROLL_UNIT_Y; + m_yScroll = 0; + } +} + +wxListMainWindow::wxListMainWindow() +{ + Init(); + + m_highlightBrush = + m_highlightUnfocusedBrush = (wxBrush *) NULL; + + m_xScroll = + m_yScroll = 0; +} + +wxListMainWindow::wxListMainWindow( wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString &name ) + : wxScrolledWindow( parent, id, pos, size, + style | wxHSCROLL | wxVSCROLL, name ) +{ + Init(); + + m_highlightBrush = new wxBrush + ( + wxSystemSettings::GetColour + ( + wxSYS_COLOUR_HIGHLIGHT + ), + wxSOLID + ); + + m_highlightUnfocusedBrush = new wxBrush + ( + wxSystemSettings::GetColour + ( + wxSYS_COLOUR_BTNSHADOW + ), + wxSOLID + ); + + wxSize sz = size; + sz.y = 25; + + InitScrolling(); + SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 ); + + SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) ); +} + +wxListMainWindow::~wxListMainWindow() +{ + DoDeleteAllItems(); + + delete m_highlightBrush; + delete m_highlightUnfocusedBrush; + + delete m_renameTimer; +} + +void wxListMainWindow::CacheLineData(size_t line) +{ + wxGenericListCtrl *listctrl = GetListCtrl(); + + wxListLineData *ld = GetDummyLine(); + + size_t countCol = GetColumnCount(); + for ( size_t col = 0; col < countCol; col++ ) + { + ld->SetText(col, listctrl->OnGetItemText(line, col)); + } + + ld->SetImage(listctrl->OnGetItemImage(line)); + ld->SetAttr(listctrl->OnGetItemAttr(line)); +} + +wxListLineData *wxListMainWindow::GetDummyLine() const +{ + wxASSERT_MSG( !IsEmpty(), _T("invalid line index") ); + + wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") ); + + wxListMainWindow *self = wxConstCast(this, wxListMainWindow); + + // we need to recreate the dummy line if the number of columns in the + // control changed as it would have the incorrect number of fields + // otherwise + if ( !m_lines.IsEmpty() && + m_lines[0].m_items.GetCount() != (size_t)GetColumnCount() ) + { + self->m_lines.Clear(); + } + + if ( m_lines.IsEmpty() ) + { + wxListLineData *line = new wxListLineData(self); + self->m_lines.Add(line); + + // don't waste extra memory -- there never going to be anything + // else/more in this array + self->m_lines.Shrink(); + } + + return &m_lines[0]; +} + +// ---------------------------------------------------------------------------- +// line geometry (report mode only) +// ---------------------------------------------------------------------------- + +wxCoord wxListMainWindow::GetLineHeight() const +{ + wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") ); + + // we cache the line height as calling GetTextExtent() is slow + if ( !m_lineHeight ) + { + wxListMainWindow *self = wxConstCast(this, wxListMainWindow); + + wxClientDC dc( self ); + dc.SetFont( GetFont() ); + + wxCoord y; + dc.GetTextExtent(_T("H"), NULL, &y); + + if ( y < SCROLL_UNIT_Y ) + y = SCROLL_UNIT_Y; + y += EXTRA_HEIGHT; + + self->m_lineHeight = y + LINE_SPACING; + } + + return m_lineHeight; +} + +wxCoord wxListMainWindow::GetLineY(size_t line) const +{ + wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") ); + + return LINE_SPACING + line*GetLineHeight(); +} + +wxRect wxListMainWindow::GetLineRect(size_t line) const +{ + if ( !InReportView() ) + return GetLine(line)->m_gi->m_rectAll; + + wxRect rect; + rect.x = HEADER_OFFSET_X; + rect.y = GetLineY(line); + rect.width = GetHeaderWidth(); + rect.height = GetLineHeight(); + + return rect; +} + +wxRect wxListMainWindow::GetLineLabelRect(size_t line) const +{ + if ( !InReportView() ) + return GetLine(line)->m_gi->m_rectLabel; + + wxRect rect; + rect.x = HEADER_OFFSET_X; + rect.y = GetLineY(line); + rect.width = GetColumnWidth(0); + rect.height = GetLineHeight(); + + return rect; +} + +wxRect wxListMainWindow::GetLineIconRect(size_t line) const +{ + if ( !InReportView() ) + return GetLine(line)->m_gi->m_rectIcon; + + wxListLineData *ld = GetLine(line); + wxASSERT_MSG( ld->HasImage(), _T("should have an image") ); + + wxRect rect; + rect.x = HEADER_OFFSET_X; + rect.y = GetLineY(line); + GetImageSize(ld->GetImage(), rect.width, rect.height); + + return rect; +} + +wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const +{ + return InReportView() ? GetLineRect(line) + : GetLine(line)->m_gi->m_rectHighlight; +} + +long wxListMainWindow::HitTestLine(size_t line, int x, int y) const +{ + wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") ); + + wxListLineData *ld = GetLine(line); + + if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) ) + return wxLIST_HITTEST_ONITEMICON; + + // VS: Testing for "ld->HasText() || InReportView()" instead of + // "ld->HasText()" is needed to make empty lines in report view + // possible + if ( ld->HasText() || InReportView() ) + { + wxRect rect = InReportView() ? GetLineRect(line) + : GetLineLabelRect(line); + + if ( rect.Inside(x, y) ) + return wxLIST_HITTEST_ONITEMLABEL; + } + + return 0; +} + +// ---------------------------------------------------------------------------- +// highlight (selection) handling +// ---------------------------------------------------------------------------- + +bool wxListMainWindow::IsHighlighted(size_t line) const +{ + if ( IsVirtual() ) + { + return m_selStore.IsSelected(line); + } + else // !virtual + { + wxListLineData *ld = GetLine(line); + wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") ); + + return ld->IsHighlighted(); + } +} + +void wxListMainWindow::HighlightLines( size_t lineFrom, + size_t lineTo, + bool highlight ) +{ + if ( IsVirtual() ) + { + wxArrayInt linesChanged; + if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight, + &linesChanged) ) + { + // meny items changed state, refresh everything + RefreshLines(lineFrom, lineTo); + } + else // only a few items changed state, refresh only them + { + size_t count = linesChanged.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + RefreshLine(linesChanged[n]); + } + } + } + else // iterate over all items in non report view + { + for ( size_t line = lineFrom; line <= lineTo; line++ ) + { + if ( HighlightLine(line, highlight) ) + { + RefreshLine(line); + } + } + } +} + +bool wxListMainWindow::HighlightLine( size_t line, bool highlight ) +{ + bool changed; + + if ( IsVirtual() ) + { + changed = m_selStore.SelectItem(line, highlight); + } + else // !virtual + { + wxListLineData *ld = GetLine(line); + wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") ); + + changed = ld->Highlight(highlight); + } + + if ( changed ) + { + SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED + : wxEVT_COMMAND_LIST_ITEM_DESELECTED ); + } + + return changed; +} + +void wxListMainWindow::RefreshLine( size_t line ) +{ + if ( HasFlag(wxLC_REPORT) ) + { + size_t visibleFrom, visibleTo; + GetVisibleLinesRange(&visibleFrom, &visibleTo); + + if ( line < visibleFrom || line > visibleTo ) + return; + } + + wxRect rect = GetLineRect(line); + + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + RefreshRect( rect ); +} + +void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo ) +{ + // we suppose that they are ordered by caller + wxASSERT_MSG( lineFrom <= lineTo, _T("indices in disorder") ); + + wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") ); + + if ( HasFlag(wxLC_REPORT) ) + { + size_t visibleFrom, visibleTo; + GetVisibleLinesRange(&visibleFrom, &visibleTo); + + if ( lineFrom < visibleFrom ) + lineFrom = visibleFrom; + if ( lineTo > visibleTo ) + lineTo = visibleTo; + + wxRect rect; + rect.x = 0; + rect.y = GetLineY(lineFrom); + rect.width = GetClientSize().x; + rect.height = GetLineY(lineTo) - rect.y + GetLineHeight(); + + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + RefreshRect( rect ); + } + else // !report + { + // TODO: this should be optimized... + for ( size_t line = lineFrom; line <= lineTo; line++ ) + { + RefreshLine(line); + } + } +} + +void wxListMainWindow::RefreshAfter( size_t lineFrom ) +{ + if ( HasFlag(wxLC_REPORT) ) + { + size_t visibleFrom, visibleTo; + GetVisibleLinesRange(&visibleFrom, &visibleTo); + + if ( lineFrom < visibleFrom ) + lineFrom = visibleFrom; + else if ( lineFrom > visibleTo ) + return; + + wxRect rect; + rect.x = 0; + rect.y = GetLineY(lineFrom); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + + wxSize size = GetClientSize(); + rect.width = size.x; + // refresh till the bottom of the window + rect.height = size.y - rect.y; + + RefreshRect( rect ); + } + else // !report + { + // TODO: how to do it more efficiently? + m_dirty = TRUE; + } } -wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) : - wxScrolledWindow( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name ) +void wxListMainWindow::RefreshSelected() { - m_mode = style; - m_columns.DeleteContents( TRUE ); - m_current = (wxListLineData *) NULL; - m_dirty = TRUE; - m_visibleLines = 0; - m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID ); - m_small_image_list = (wxImageList *) NULL; - m_normal_image_list = (wxImageList *) NULL; - m_small_spacing = 30; - m_normal_spacing = 40; - m_hasFocus = FALSE; - m_dragCount = 0; - m_isCreated = FALSE; - wxSize sz = size; - sz.y = 25; + if ( IsEmpty() ) + return; - if (m_mode & wxLC_REPORT) + size_t from, to; + if ( InReportView() ) { -#if wxUSE_GENERIC_LIST_EXTENSIONS - m_xScroll = 15; -#else - m_xScroll = 0; -#endif - m_yScroll = 15; + GetVisibleLinesRange(&from, &to); } - else + else // !virtual { - m_xScroll = 15; - m_yScroll = 0; + from = 0; + to = GetItemCount() - 1; } - SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 ); - m_usedKeys = TRUE; - m_lastOnSame = FALSE; - m_renameTimer = new wxListRenameTimer( this ); - m_renameAccept = FALSE; + if ( HasCurrent() && m_current >= from && m_current <= to ) + { + RefreshLine(m_current); + } - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); + for ( size_t line = from; line <= to; line++ ) + { + // NB: the test works as expected even if m_current == -1 + if ( line != m_current && IsHighlighted(line) ) + { + RefreshLine(line); + } + } } -wxListMainWindow::~wxListMainWindow() +void wxListMainWindow::Freeze() { - DeleteEverything(); - - if (m_hilightBrush) delete m_hilightBrush; - - delete m_renameTimer; + m_freezeCount++; } -void wxListMainWindow::RefreshLine( wxListLineData *line ) +void wxListMainWindow::Thaw() { - if (m_dirty) return; + wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") ); - if (!line) return; - - int x = 0; - int y = 0; - int w = 0; - int h = 0; - line->GetExtent( x, y, w, h ); - CalcScrolledPosition( x, y, &x, &y ); - wxRect rect( x, y, w, h ); - Refresh( TRUE, &rect ); + if ( !--m_freezeCount ) + { + Refresh(); + } } void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) @@ -1685,59 +2750,95 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // Note: a wxPaintDC must be constructed even if no drawing is // done (a Windows requirement). wxPaintDC dc( this ); - PrepareDC( dc ); - int dev_x = 0; - int dev_y = 0; - CalcScrolledPosition( 0, 0, &dev_x, &dev_y ); + if ( IsEmpty() || m_freezeCount ) + { + // nothing to draw or not the moment to draw it + return; + } + + if ( m_dirty ) + { + // delay the repainting until we calculate all the items positions + return; + } - if (m_dirty) return; + PrepareDC( dc ); - if (m_lines.GetCount() == 0) return; + int dev_x, dev_y; + CalcScrolledPosition( 0, 0, &dev_x, &dev_y ); dc.BeginDrawing(); dc.SetFont( GetFont() ); - if (m_mode & wxLC_REPORT) + if ( HasFlag(wxLC_REPORT) ) { - wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID); - wxSize clientSize = GetClientSize(); + int lineHeight = GetLineHeight(); - int lineSpacing = 0; - wxListLineData *line = &m_lines[0]; - int dummy = 0; - line->GetSize( dummy, lineSpacing ); - lineSpacing += 1; + size_t visibleFrom, visibleTo; + GetVisibleLinesRange(&visibleFrom, &visibleTo); - int y_s = m_yScroll*GetScrollPos( wxVERTICAL ); + wxRect rectLine; + wxCoord xOrig, yOrig; + CalcUnscrolledPosition(0, 0, &xOrig, &yOrig); - 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++) + // tell the caller cache to cache the data + if ( IsVirtual() ) { - m_lines[i].Draw( &dc ); - // Draw horizontal rule if required - if (m_mode & wxLC_HRULES) + wxListEvent evCache(wxEVT_COMMAND_LIST_CACHE_HINT, + GetParent()->GetId()); + evCache.SetEventObject( GetParent() ); + evCache.m_oldItemIndex = visibleFrom; + evCache.m_itemIndex = visibleTo; + GetParent()->GetEventHandler()->ProcessEvent( evCache ); + } + + for ( size_t line = visibleFrom; line <= visibleTo; line++ ) + { + rectLine = GetLineRect(line); + + if ( !IsExposed(rectLine.x - xOrig, rectLine.y - yOrig, + rectLine.width, rectLine.height) ) { - dc.SetPen(pen); - dc.SetBrush(* wxTRANSPARENT_BRUSH); - dc.DrawLine(0 - dev_x , i*lineSpacing , clientSize.x - dev_x , i*lineSpacing ); - } + // don't redraw unaffected lines to avoid flicker + continue; + } + + GetLine(line)->DrawInReportMode( &dc, + rectLine, + GetLineHighlightRect(line), + IsHighlighted(line) ); } - // Draw last horizontal rule - if ((i > (size_t) (y_s / lineSpacing)) && (m_mode & wxLC_HRULES)) + if ( HasFlag(wxLC_HRULES) ) { - dc.SetPen(pen); - dc.SetBrush(* wxTRANSPARENT_BRUSH); - dc.DrawLine(0 - dev_x , i*lineSpacing , clientSize.x - dev_x , i*lineSpacing ); - } + wxPen pen(GetRuleColour(), 1, wxSOLID); + wxSize clientSize = GetClientSize(); + + for ( size_t i = visibleFrom; i <= visibleTo; i++ ) + { + dc.SetPen(pen); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawLine(0 - dev_x, i*lineHeight, + clientSize.x - dev_x, i*lineHeight); + } + + // Draw last horizontal rule + if ( visibleTo > visibleFrom ) + { + dc.SetPen(pen); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawLine(0 - dev_x, m_lineTo*lineHeight, + clientSize.x - dev_x , m_lineTo*lineHeight ); + } + } // Draw vertical rules if required - if ((m_mode & wxLC_VRULES) && (GetItemCount() > 0)) + if ( HasFlag(wxLC_VRULES) && !IsEmpty() ) { + wxPen pen(GetRuleColour(), 1, wxSOLID); + int col = 0; wxRect firstItemRect; wxRect lastItemRect; @@ -1749,175 +2850,205 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) for (col = 0; col < GetColumnCount(); col++) { int colWidth = GetColumnWidth(col); - x += colWidth ; - dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y, x - dev_x, lastItemRect.GetBottom() + 1 - dev_y); + x += colWidth; + dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y, + x - dev_x, lastItemRect.GetBottom() + 1 - dev_y); } } } - else + else // !report { - for (size_t i = 0; i < m_lines.GetCount(); i++) - m_lines[i].Draw( &dc ); + size_t count = GetItemCount(); + for ( size_t i = 0; i < count; i++ ) + { + GetLine(i)->Draw( &dc ); + } } - if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus ); + if ( HasCurrent() ) + { + // don't draw rect outline under Max if we already have the background + // color but under other platforms only draw it if we do: it is a bit + // silly to draw "focus rect" if we don't have focus! +#ifdef __WXMAC__ + if ( !m_hasFocus ) +#else // !__WXMAC__ + if ( m_hasFocus ) +#endif // __WXMAC__/!__WXMAC__ + { + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( GetLineHighlightRect(m_current) ); + } + } dc.EndDrawing(); } -void wxListMainWindow::HilightAll( bool on ) +void wxListMainWindow::HighlightAll( bool on ) { - for (size_t i = 0; i < m_lines.GetCount(); i++) + if ( IsSingleSel() ) { - wxListLineData *line = &m_lines[i]; - if (line->IsHilighted() != on) + wxASSERT_MSG( !on, _T("can't do this in a single sel control") ); + + // we just have one item to turn off + if ( HasCurrent() && IsHighlighted(m_current) ) { - line->Hilight( on ); - RefreshLine( line ); + HighlightLine(m_current, FALSE); + RefreshLine(m_current); } } + else // multi sel + { + HighlightLines(0, GetItemCount() - 1, on); + } } -void wxListMainWindow::SendNotify( wxListLineData *line, +void wxListMainWindow::SendNotify( size_t line, wxEventType command, wxPoint point ) { wxListEvent le( command, GetParent()->GetId() ); le.SetEventObject( GetParent() ); - le.m_itemIndex = GetIndexOfLine( line ); + le.m_itemIndex = line; // set only for events which have position if ( point != wxDefaultPosition ) le.m_pointDrag = point; - line->GetItem( 0, le.m_item ); - GetParent()->GetEventHandler()->ProcessEvent( le ); -// GetParent()->GetEventHandler()->AddPendingEvent( le ); -} - -void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) ) -{ -// SendNotify( line, wxEVT_COMMAND_LIST_ITEM_FOCUSSED ); -} - -void wxListMainWindow::UnfocusLine( wxListLineData *WXUNUSED(line) ) -{ -// SendNotify( line, wxEVT_COMMAND_LIST_ITEM_UNFOCUSSED ); -} + // don't try to get the line info for virtual list controls: the main + // program has it anyhow and if we did it would result in accessing all + // the lines, even those which are not visible now and this is precisely + // what we're trying to avoid + if ( !IsVirtual() && (command != wxEVT_COMMAND_LIST_DELETE_ITEM) ) + { + if ( line != (size_t)-1 ) + { + GetLine(line)->GetItem( 0, le.m_item ); + } + //else: this happens for wxEVT_COMMAND_LIST_ITEM_FOCUSED event + } + //else: there may be no more such item -void wxListMainWindow::SelectLine( wxListLineData *line ) -{ - SendNotify( line, wxEVT_COMMAND_LIST_ITEM_SELECTED ); + GetParent()->GetEventHandler()->ProcessEvent( le ); } -void wxListMainWindow::DeselectLine( wxListLineData *line ) +void wxListMainWindow::ChangeCurrent(size_t current) { - SendNotify( line, wxEVT_COMMAND_LIST_ITEM_DESELECTED ); -} + m_current = current; -void wxListMainWindow::DeleteLine( wxListLineData *line ) -{ - SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM ); + SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED); } -/* *** */ - void wxListMainWindow::EditLabel( long item ) { - wxCHECK_RET( ((size_t)item < m_lines.GetCount()), - wxT("wrong index in wxListCtrl::Edit()") ); + wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()), + wxT("wrong index in wxGenericListCtrl::EditLabel()") ); - m_currentEdit = &m_lines[(size_t)item]; + size_t itemEdit = (size_t)item; wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() ); le.SetEventObject( GetParent() ); - le.m_itemIndex = GetIndexOfLine( m_currentEdit ); - m_currentEdit->GetItem( 0, le.m_item ); - GetParent()->GetEventHandler()->ProcessEvent( le ); - - if (!le.IsAllowed()) + le.m_itemIndex = item; + wxListLineData *data = GetLine(itemEdit); + wxCHECK_RET( data, _T("invalid index in EditLabel()") ); + data->GetItem( 0, le.m_item ); + if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() ) + { + // vetoed by user code 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_currentEdit->GetText(0); - int x = 0; - int y = 0; - int w = 0; - int h = 0; - m_currentEdit->GetLabelExtent( x, y, w, h ); + // 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 ) + wxSafeYield(); - wxClientDC dc(this); - PrepareDC( dc ); - x = dc.LogicalToDeviceX( x ); - y = dc.LogicalToDeviceY( y ); + wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit); - wxListTextCtrl *text = new wxListTextCtrl( - this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) ); text->SetFocus(); } void wxListMainWindow::OnRenameTimer() { - wxCHECK_RET( m_current, wxT("invalid m_current") ); + wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") ); - Edit( m_lines.Index( *m_current ) ); + EditLabel( m_current ); } -void wxListMainWindow::OnRenameAccept() +bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value) { 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 ); + le.m_itemIndex = itemEdit; - if (!le.IsAllowed()) return; + wxListLineData *data = GetLine(itemEdit); + wxCHECK_MSG( data, FALSE, _T("invalid index in OnRenameAccept()") ); - 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 ); + data->GetItem( 0, le.m_item ); + le.m_item.m_text = value; + return !GetParent()->GetEventHandler()->ProcessEvent( le ) || + le.IsAllowed(); } void wxListMainWindow::OnMouse( wxMouseEvent &event ) { event.SetEventObject( GetParent() ); - if (GetParent()->GetEventHandler()->ProcessEvent( event)) return; + if ( GetParent()->GetEventHandler()->ProcessEvent( event) ) + return; + + if ( !HasCurrent() || IsEmpty() ) + return; + + if (m_dirty) + return; - if (!m_current) return; - if (m_dirty) return; - if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || event.ButtonDClick()) ) return; + if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || + event.ButtonDClick()) ) + return; int x = event.GetX(); int y = event.GetY(); CalcUnscrolledPosition( x, y, &x, &y ); - /* Did we actually hit an item ? */ + // where did we hit it (if we did)? long hitResult = 0; - wxListLineData *line = (wxListLineData *) NULL; - for (size_t i = 0; i < m_lines.GetCount(); i++) + + size_t count = GetItemCount(), + current; + + if ( HasFlag(wxLC_REPORT) ) { - line = &m_lines[i]; - hitResult = line->IsHit( x, y ); - if (hitResult) break; - line = (wxListLineData *) NULL; + current = y / GetLineHeight(); + if ( current < count ) + hitResult = HitTestLine(current, x, y); + } + else // !report + { + // TODO: optimize it too! this is less simple than for report view but + // enumerating all items is still not a way to do it!! + for ( current = 0; current < count; current++ ) + { + hitResult = HitTestLine(current, x, y); + if ( hitResult ) + break; + } } if (event.Dragging()) { if (m_dragCount == 0) - m_dragStart = wxPoint(x,y); + { + // we have to report the raw, physical coords as we want to be + // able to call HitTest(event.m_pointDrag) from the user code to + // get the item being dragged + m_dragStart = event.GetPosition(); + } m_dragCount++; - if (m_dragCount != 3) return; + if (m_dragCount != 3) + return; int command = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG : wxEVT_COMMAND_LIST_BEGIN_DRAG; @@ -1934,7 +3065,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) m_dragCount = 0; } - if (!line) return; + if ( !hitResult ) + { + // outside of any item + return; + } bool forceClick = FALSE; if (event.ButtonDClick()) @@ -1942,11 +3077,17 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) m_renameTimer->Stop(); m_lastOnSame = FALSE; - if ( line == m_lineBeforeLastClicked ) +#ifdef __WXGTK__ + // FIXME: wxGTK generates bad sequence of events prior to doubleclick + // ("down, up, down, double, up" while other ports + // do "down, up, double, up"). We have to have this hack + // in place till somebody fixes wxGTK... + if ( current == m_lineBeforeLastClicked ) +#else + if ( current == m_lineLastClicked ) +#endif { - m_usedKeys = FALSE; - - SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); + SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); return; } @@ -1960,154 +3101,156 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (event.LeftUp() && m_lastOnSame) { - m_usedKeys = FALSE; - if ((line == m_current) && + if ((current == m_current) && (hitResult == wxLIST_HITTEST_ONITEMLABEL) && - (m_mode & wxLC_EDIT_LABELS) ) + HasFlag(wxLC_EDIT_LABELS) ) { m_renameTimer->Start( 100, TRUE ); } m_lastOnSame = FALSE; - return; } - - if (event.RightDown()) + else if (event.RightDown()) { - SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, + SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - return; } - - if (event.MiddleDown()) + else if (event.MiddleDown()) { - SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK ); - return; + SendNotify( current, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK ); } - - if ( event.LeftDown() || forceClick ) + else if ( event.LeftDown() || forceClick ) { m_lineBeforeLastClicked = m_lineLastClicked; - m_lineLastClicked = line; + m_lineLastClicked = current; + + size_t oldCurrent = m_current; - m_usedKeys = FALSE; - wxListLineData *oldCurrent = m_current; - if (m_mode & wxLC_SINGLE_SEL) + if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) ) { - m_current = line; - HilightAll( FALSE ); - m_current->ReverseHilight(); - RefreshLine( m_current ); + HighlightAll( FALSE ); + + ChangeCurrent(current); + + ReverseHighlight(m_current); } - else + else // multi sel & either ctrl or shift is down { if (event.ControlDown()) { - m_current = line; - m_current->ReverseHilight(); - RefreshLine( m_current ); + ChangeCurrent(current); + + ReverseHighlight(m_current); } else if (event.ShiftDown()) { - size_t j; - - m_current = line; - - int numOfCurrent = -1; - for (j = 0; j < m_lines.GetCount(); j++) - { - wxListLineData *test_line = &m_lines[j]; - numOfCurrent++; - if (test_line == oldCurrent) break; - } - - int numOfLine = -1; + ChangeCurrent(current); - for (j = 0; j < m_lines.GetCount(); j++) - { - wxListLineData *test_line = &m_lines[j]; - numOfLine++; - if (test_line == line) break; - } + size_t lineFrom = oldCurrent, + lineTo = current; - if (numOfLine < numOfCurrent) + if ( lineTo < lineFrom ) { - int i = numOfLine; - numOfLine = numOfCurrent; - numOfCurrent = i; + lineTo = lineFrom; + lineFrom = m_current; } - for (int i = 0; i <= numOfLine-numOfCurrent; i++) - { - wxListLineData *test_line= &m_lines[numOfCurrent + i]; - test_line->Hilight(TRUE); - RefreshLine( test_line ); - } + HighlightLines(lineFrom, lineTo); } - else + else // !ctrl, !shift { - m_current = line; - HilightAll( FALSE ); - m_current->ReverseHilight(); - RefreshLine( m_current ); + // test in the enclosing if should make it impossible + wxFAIL_MSG( _T("how did we get here?") ); } } + if (m_current != oldCurrent) { RefreshLine( oldCurrent ); - UnfocusLine( oldCurrent ); - FocusLine( m_current ); } // forceClick is only set if the previous click was on another item m_lastOnSame = !forceClick && (m_current == oldCurrent); - - return; } } -void wxListMainWindow::MoveToFocus() +void wxListMainWindow::MoveToItem(size_t item) { - if (!m_current) return; + if ( item == (size_t)-1 ) + return; - 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 ); + wxRect rect = GetLineRect(item); - int client_w = 0; - int client_h = 0; + int client_w, client_h; GetClientSize( &client_w, &client_h ); int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL ); int view_y = m_yScroll*GetScrollPos( wxVERTICAL ); - if (m_mode & wxLC_REPORT) + if ( HasFlag(wxLC_REPORT) ) { - if (item_y < view_y ) - Scroll( -1, (item_y)/m_yScroll ); - if (item_y+item_h+5 > view_y+client_h) - Scroll( -1, (item_y+item_h-client_h+15)/m_yScroll ); + // the next we need the range of lines shown it might be different, so + // recalculate it + ResetVisibleLinesRange(); + + if (rect.y < view_y ) + Scroll( -1, rect.y/m_yScroll ); + if (rect.y+rect.height+5 > view_y+client_h) + Scroll( -1, (rect.y+rect.height-client_h+SCROLL_UNIT_Y)/m_yScroll ); } - else + else // !report { - 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 ); + if (rect.x-view_x < 5) + Scroll( (rect.x-5)/m_xScroll, -1 ); + if (rect.x+rect.width-5 > view_x+client_w) + Scroll( (rect.x+rect.width-client_w+SCROLL_UNIT_X)/m_xScroll, -1 ); } } -void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown ) +// ---------------------------------------------------------------------------- +// keyboard handling +// ---------------------------------------------------------------------------- + +void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) { - if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE ); - wxListLineData *oldCurrent = m_current; - m_current = newCurrent; - if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE ); + wxCHECK_RET( newCurrent < (size_t)GetItemCount(), + _T("invalid item index in OnArrowChar()") ); + + size_t oldCurrent = m_current; + + // in single selection we just ignore Shift as we can't select several + // items anyhow + if ( event.ShiftDown() && !IsSingleSel() ) + { + ChangeCurrent(newCurrent); + + // select all the items between the old and the new one + if ( oldCurrent > newCurrent ) + { + newCurrent = oldCurrent; + oldCurrent = m_current; + } + + HighlightLines(oldCurrent, newCurrent); + } + else // !shift + { + // all previously selected items are unselected unless ctrl is held + if ( !event.ControlDown() ) + HighlightAll(FALSE); + + ChangeCurrent(newCurrent); + + // refresh the old focus to remove it + RefreshLine( oldCurrent ); + + if ( !event.ControlDown() ) + { + HighlightLine( m_current, TRUE ); + } + } + RefreshLine( m_current ); - RefreshLine( oldCurrent ); - FocusLine( m_current ); - UnfocusLine( oldCurrent ); + MoveToFocus(); } @@ -2135,11 +3278,11 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) wxWindow *parent = GetParent(); /* we send a list_key event up */ - if ( m_current ) + if ( HasCurrent() ) { wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() ); - le.m_itemIndex = GetIndexOfLine( m_current ); - m_current->GetItem( 0, le.m_item ); + le.m_itemIndex = m_current; + GetLine(m_current)->GetItem( 0, le.m_item ); le.m_code = (int)event.KeyCode(); le.SetEventObject( parent ); parent->GetEventHandler()->ProcessEvent( le ); @@ -2164,11 +3307,12 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) nevent.SetDirection( !event.ShiftDown() ); nevent.SetEventObject( GetParent()->GetParent() ); nevent.SetCurrentFocus( m_parent ); - if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) return; + if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) + return; } /* no item -> nothing to do */ - if (!m_current) + if (!HasCurrent()) { event.Skip(); return; @@ -2177,169 +3321,155 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) switch (event.KeyCode()) { case WXK_UP: - { - int index = m_lines.Index(*m_current); - if (index != wxNOT_FOUND && index > 0) - OnArrowChar( &m_lines[index-1], event.ShiftDown() ); + if ( m_current > 0 ) + OnArrowChar( m_current - 1, event ); 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() ); + if ( m_current < (size_t)GetItemCount() - 1 ) + OnArrowChar( m_current + 1, event ); break; - } + case WXK_END: - { - if (!m_lines.IsEmpty()) - OnArrowChar( &m_lines.Last(), event.ShiftDown() ); + if (!IsEmpty()) + OnArrowChar( GetItemCount() - 1, event ); break; - } + case WXK_HOME: - { - if (!m_lines.IsEmpty()) - OnArrowChar( &m_lines[0], event.ShiftDown() ); + if (!IsEmpty()) + OnArrowChar( 0, event ); 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() ); + int steps = 0; + if ( HasFlag(wxLC_REPORT) ) + { + steps = m_linesPerPage - 1; + } + else + { + steps = m_current % m_linesPerPage; + } + + int index = m_current - steps; + if (index < 0) + index = 0; + + OnArrowChar( index, event ); } 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; - } + int steps = 0; + if ( HasFlag(wxLC_REPORT) ) + { + steps = m_linesPerPage - 1; + } + else + { + steps = m_linesPerPage - (m_current % m_linesPerPage) - 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() ); + size_t index = m_current + steps; + size_t count = GetItemCount(); + if ( index >= count ) + index = count - 1; + + OnArrowChar( index, event ); } break; - } + case WXK_LEFT: - { - if (!(m_mode & wxLC_REPORT)) + if ( !HasFlag(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() ); - } + int index = m_current - m_linesPerPage; + if (index < 0) + index = 0; + + OnArrowChar( index, event ); } break; - } + case WXK_RIGHT: - { - if (!(m_mode & wxLC_REPORT)) + if ( !HasFlag(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() ); - } + size_t index = m_current + m_linesPerPage; + + size_t count = GetItemCount(); + if ( index >= count ) + index = count - 1; + + OnArrowChar( index, event ); } 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)) + if ( IsSingleSel() ) { - 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(); + SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); + + if ( IsHighlighted(m_current) ) + { + // don't unselect the item in single selection mode + break; + } + //else: select it in ReverseHighlight() below if unselected } + + ReverseHighlight(m_current); 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 ); + SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); break; - } + default: - { event.Skip(); - return; - } } - m_usedKeys = TRUE; } -#ifdef __WXGTK__ -extern wxWindow *g_focusWindow; -#endif +// ---------------------------------------------------------------------------- +// focus handling +// ---------------------------------------------------------------------------- + +void wxListMainWindow::SetFocus() +{ + // VS: wxListMainWindow derives from wxPanel (via wxScrolledWindow) and wxPanel + // overrides SetFocus in such way that it does never change focus from + // panel's child to the panel itself. Unfortunately, we must be able to change + // focus to the panel from wxListTextCtrl because the text control should + // disappear when the user clicks outside it. + + wxWindow *oldFocus = FindFocus(); + + if ( oldFocus && oldFocus->GetParent() == this ) + { + wxWindow::SetFocus(); + } + else + { + wxScrolledWindow::SetFocus(); + } +} void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { - m_hasFocus = TRUE; - RefreshLine( m_current ); + // wxGTK sends us EVT_SET_FOCUS events even if we had never got + // EVT_KILL_FOCUS before which means that we finish by redrawing the items + // which are already drawn correctly resulting in horrible flicker - avoid + // it + if ( !m_hasFocus ) + { + m_hasFocus = TRUE; - if (!GetParent()) return; + RefreshSelected(); + } -#ifdef __WXGTK__ - g_focusWindow = GetParent(); -#endif + if ( !GetParent() ) + return; wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() ); event.SetEventObject( GetParent() ); @@ -2349,83 +3479,67 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = FALSE; - RefreshLine( m_current ); -} - -void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) -{ -/* - We don't even allow the wxScrolledWindow::AdjustScrollbars() call -*/ - m_dirty = TRUE; + RefreshSelected(); } void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y ) { - if ((m_mode & wxLC_ICON) && (m_normal_image_list)) + if ( HasFlag(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)) + else if ( HasFlag(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)) + else if ( HasFlag(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)) + else if ( HasFlag(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 ) +void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const { - if ((m_mode & wxLC_ICON) && (m_normal_image_list)) + if ( HasFlag(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)) + else if ( HasFlag(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)) + else if ( HasFlag(wxLC_LIST) && m_small_image_list ) { m_small_image_list->GetSize( index, width, height ); - return; } - if ((m_mode & wxLC_REPORT) && (m_small_image_list)) + else if ( HasFlag(wxLC_REPORT) && m_small_image_list ) { m_small_image_list->GetSize( index, width, height ); - return; } - width = 0; - height = 0; + else + { + width = + height = 0; + } } -int wxListMainWindow::GetTextLength( wxString &s ) +int wxListMainWindow::GetTextLength( const wxString &s ) const { - wxClientDC dc( this ); - wxCoord lw = 0; - wxCoord lh = 0; - dc.GetTextExtent( s, &lw, &lh ); - return lw + 6; -} + wxClientDC dc( wxConstCast(this, wxListMainWindow) ); + dc.SetFont( GetFont() ); -int wxListMainWindow::GetIndexOfLine( const wxListLineData *line ) -{ - int i = m_lines.Index(*line); - if (i == wxNOT_FOUND) return -1; - else return i; + wxCoord lw; + dc.GetTextExtent( s, &lw, NULL ); + + return lw + AUTOSIZE_COL_MARGIN; } -void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) +void wxListMainWindow::SetImageList( wxGenericImageList *imageList, int which ) { m_dirty = TRUE; @@ -2468,457 +3582,531 @@ int wxListMainWindow::GetItemSpacing( bool isSmall ) return isSmall ? m_small_spacing : m_normal_spacing; } +// ---------------------------------------------------------------------------- +// columns +// ---------------------------------------------------------------------------- + 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 ); - } + wxListHeaderDataList::Node *node = m_columns.Item( col ); - wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin; + wxCHECK_RET( node, _T("invalid column index in SetColumn") ); + + if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER ) + item.m_width = GetTextLength( item.m_text ); + + wxListHeaderData *column = node->GetData(); + column->SetItem( item ); + + wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; if ( headerWin ) headerWin->m_dirty = TRUE; + + m_dirty = TRUE; + + // invalidate it as it has to be recalculated + m_headerWidth = 0; } void wxListMainWindow::SetColumnWidth( int col, int width ) { - wxCHECK_RET( m_mode & wxLC_REPORT, + wxCHECK_RET( col >= 0 && col < GetColumnCount(), + _T("invalid column index") ); + + wxCHECK_RET( HasFlag(wxLC_REPORT), _T("SetColumnWidth() can only be called in report mode.") ); m_dirty = TRUE; + wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; + if ( headerWin ) + headerWin->m_dirty = TRUE; + + wxListHeaderDataList::Node *node = m_columns.Item( col ); + wxCHECK_RET( node, _T("no column?") ); - wxNode *node = (wxNode*) NULL; + wxListHeaderData *column = node->GetData(); + + size_t count = GetItemCount(); if (width == wxLIST_AUTOSIZE_USEHEADER) { - // TODO do use the header - width = 80; + width = GetTextLength(column->GetText()); } - else if (width == wxLIST_AUTOSIZE) + else if ( width == wxLIST_AUTOSIZE ) { - wxClientDC dc(this); - dc.SetFont( GetFont() ); - int max = 10; - - for (size_t i = 0; i < m_lines.GetCount(); i++) + if ( IsVirtual() ) + { + // TODO: determine the max width somehow... + width = WIDTH_COL_DEFAULT; + } + else // !virtual { - wxListLineData *line = &m_lines[i]; - wxNode *n = line->m_items.Nth( col ); - if (n) + wxClientDC dc(this); + dc.SetFont( GetFont() ); + + int max = AUTOSIZE_COL_MARGIN; + + for ( size_t i = 0; i < count; i++ ) { - wxListItemData *item = (wxListItemData*)n->Data(); - int current = 0, ix = 0, iy = 0; - wxCoord lx = 0, ly = 0; + wxListLineData *line = GetLine(i); + wxListItemDataList::Node *n = line->m_items.Item( col ); + + wxCHECK_RET( n, _T("no subitem?") ); + + wxListItemData *item = n->GetData(); + int current = 0; + if (item->HasImage()) { + int ix, iy; GetImageSize( item->GetImage(), ix, iy ); - current = ix + 5; + current += ix + 5; } + if (item->HasText()) { - wxString str = item->GetText(); - dc.GetTextExtent( str, &lx, &ly ); - current += lx; + wxCoord w; + dc.GetTextExtent( item->GetText(), &w, NULL ); + current += w; } - if (current > max) max = current; + + if (current > max) + max = current; } + + width = max + AUTOSIZE_COL_MARGIN; } - width = max+10; } - node = m_columns.Nth( col ); - if (node) - { - wxListHeaderData *column = (wxListHeaderData*)node->Data(); - column->SetWidth( width ); - } + column->SetWidth( width ); + + // invalidate it as it has to be recalculated + m_headerWidth = 0; +} - for (size_t i = 0; i < m_lines.GetCount(); i++) +int wxListMainWindow::GetHeaderWidth() const +{ + if ( !m_headerWidth ) { - wxListLineData *line = &m_lines[i]; - wxNode *n = line->m_items.Nth( col ); - if (n) + wxListMainWindow *self = wxConstCast(this, wxListMainWindow); + + size_t count = GetColumnCount(); + for ( size_t col = 0; col < count; col++ ) { - wxListItemData *item = (wxListItemData*)n->Data(); - item->SetSize( width, -1 ); + self->m_headerWidth += GetColumnWidth(col); } } - wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin; - if ( headerWin ) - headerWin->m_dirty = TRUE; + return m_headerWidth; } -void wxListMainWindow::GetColumn( int col, wxListItem &item ) +void wxListMainWindow::GetColumn( int col, wxListItem &item ) const { - 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 = _T(""); - item.m_image = 0; - item.m_data = 0; - } -} + wxListHeaderDataList::Node *node = m_columns.Item( col ); + wxCHECK_RET( node, _T("invalid column index in GetColumn") ); -int wxListMainWindow::GetColumnWidth( int col ) -{ - wxNode *node = m_columns.Nth( col ); - if (node) - { - wxListHeaderData *column = (wxListHeaderData*)node->Data(); - return column->GetWidth(); - } - else - { - return 0; - } + wxListHeaderData *column = node->GetData(); + column->GetItem( item ); } -int wxListMainWindow::GetColumnCount() +int wxListMainWindow::GetColumnWidth( int col ) const { - return m_columns.Number(); -} + wxListHeaderDataList::Node *node = m_columns.Item( col ); + wxCHECK_MSG( node, 0, _T("invalid column index") ); -int wxListMainWindow::GetCountPerPage() -{ - return m_visibleLines; + wxListHeaderData *column = node->GetData(); + return column->GetWidth(); } +// ---------------------------------------------------------------------------- +// item state +// ---------------------------------------------------------------------------- + void wxListMainWindow::SetItem( wxListItem &item ) { - m_dirty = TRUE; - if (item.m_itemId >= 0 && (size_t)item.m_itemId < m_lines.GetCount()) + long id = item.m_itemId; + wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(), + _T("invalid item index in SetItem") ); + + if ( !IsVirtual() ) { - wxListLineData *line = &m_lines[(size_t)item.m_itemId]; - if (m_mode & wxLC_REPORT) item.m_width = GetColumnWidth( item.m_col )-3; + wxListLineData *line = GetLine((size_t)id); line->SetItem( item.m_col, item ); } + + if ( InReportView() ) + { + // just refresh the line to show the new value of the text/image + RefreshLine((size_t)id); + } + else // !report + { + // refresh everything (resulting in horrible flicker - FIXME!) + m_dirty = TRUE; + } } -void wxListMainWindow::SetItemState( long item, long state, long stateMask ) +void wxListMainWindow::SetItemState( long litem, long state, long stateMask ) { - wxCHECK_RET( item >= 0 && (size_t)item < m_lines.GetCount(), + wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(), _T("invalid list ctrl item index in SetItem") ); - // m_dirty = TRUE; no recalcs needed - - wxListLineData *oldCurrent = m_current; + size_t oldCurrent = m_current; + size_t item = (size_t)litem; // safe because of the check above + // do we need to change the focus? if ( stateMask & wxLIST_STATE_FOCUSED ) { - wxListLineData *line = &m_lines[(size_t)item]; if ( state & wxLIST_STATE_FOCUSED ) { // don't do anything if this item is already focused - if ( line != m_current ) + if ( item != m_current ) { - UnfocusLine( m_current ); - m_current = line; - FocusLine( m_current ); - if ( (m_mode & wxLC_SINGLE_SEL) && oldCurrent ) - oldCurrent->Hilight( FALSE ); + ChangeCurrent(item); + + if ( oldCurrent != (size_t)-1 ) + { + if ( IsSingleSel() ) + { + HighlightLine(oldCurrent, FALSE); + } + + RefreshLine(oldCurrent); + } RefreshLine( m_current ); - if ( oldCurrent ) - RefreshLine( oldCurrent ); } } else // unfocus { // don't do anything if this item is not focused - if ( line == m_current ) + if ( item == m_current ) { - UnfocusLine( m_current ); - m_current = NULL; + ResetCurrent(); + + if ( IsSingleSel() ) + { + // we must unselect the old current item as well or we + // might end up with more than one selected item in a + // single selection control + HighlightLine(oldCurrent, FALSE); + } + + RefreshLine( oldCurrent ); } } } + // do we need to change the selection state? if ( stateMask & wxLIST_STATE_SELECTED ) { bool on = (state & wxLIST_STATE_SELECTED) != 0; - if (!on && (m_mode & wxLC_SINGLE_SEL)) - return; - wxListLineData *line = &m_lines[(size_t)item]; - if (m_mode & wxLC_SINGLE_SEL) + if ( IsSingleSel() ) { - UnfocusLine( m_current ); - m_current = line; - FocusLine( m_current ); - if (oldCurrent) - oldCurrent->Hilight( FALSE ); - RefreshLine( m_current ); - if (oldCurrent) - RefreshLine( oldCurrent ); + if ( on ) + { + // selecting the item also makes it the focused one in the + // single sel mode + if ( m_current != item ) + { + ChangeCurrent(item); + + if ( oldCurrent != (size_t)-1 ) + { + HighlightLine( oldCurrent, FALSE ); + RefreshLine( oldCurrent ); + } + } + } + else // off + { + // only the current item may be selected anyhow + if ( item != m_current ) + return; + } } - if (on != line->IsHilighted()) + if ( HighlightLine(item, on) ) { - line->Hilight( on ); - RefreshLine( line ); + RefreshLine(item); } } } -int wxListMainWindow::GetItemState( long item, long stateMask ) +int wxListMainWindow::GetItemState( long item, long stateMask ) const { + wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0, + _T("invalid list ctrl item index in GetItemState()") ); + int ret = wxLIST_STATE_DONTCARE; - if (stateMask & wxLIST_STATE_FOCUSED) + + if ( stateMask & wxLIST_STATE_FOCUSED ) { - if (item >= 0 && (size_t)item < m_lines.GetCount()) - { - wxListLineData *line = &m_lines[(size_t)item]; - if (line == m_current) ret |= wxLIST_STATE_FOCUSED; - } + if ( (size_t)item == m_current ) + ret |= wxLIST_STATE_FOCUSED; } - if (stateMask & wxLIST_STATE_SELECTED) + + if ( stateMask & wxLIST_STATE_SELECTED ) { - if (item >= 0 && (size_t)item < m_lines.GetCount()) - { - wxListLineData *line = &m_lines[(size_t)item]; - if (line->IsHilighted()) ret |= wxLIST_STATE_SELECTED; - } + if ( IsHighlighted(item) ) + ret |= wxLIST_STATE_SELECTED; } + return ret; } -void wxListMainWindow::GetItem( wxListItem &item ) +void wxListMainWindow::GetItem( wxListItem &item ) const { - if (item.m_itemId >= 0 && (size_t)item.m_itemId < m_lines.GetCount()) - { - wxListLineData *line = &m_lines[(size_t)item.m_itemId]; - line->GetItem( item.m_col, item ); - } - else - { - item.m_mask = 0; - item.m_text = _T(""); - item.m_image = 0; - item.m_data = 0; - } -} + wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(), + _T("invalid item index in GetItem") ); -int wxListMainWindow::GetItemCount() -{ - return m_lines.GetCount(); + wxListLineData *line = GetLine((size_t)item.m_itemId); + line->GetItem( item.m_col, item ); } -void wxListMainWindow::GetItemRect( long index, wxRect &rect ) +// ---------------------------------------------------------------------------- +// item count +// ---------------------------------------------------------------------------- + +size_t wxListMainWindow::GetItemCount() const { - if (index >= 0 && (size_t)index < m_lines.GetCount()) - { - m_lines[(size_t)index].GetRect( rect ); - this->CalcScrolledPosition(rect.x,rect.y,&rect.x,&rect.y); - } - else - { - rect.x = 0; - rect.y = 0; - rect.width = 0; - rect.height = 0; - } + return IsVirtual() ? m_countVirt : m_lines.GetCount(); } -bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) +void wxListMainWindow::SetItemCount(long count) { - wxRect rect; - this->GetItemRect(item,rect); - pos.x=rect.x; pos.y=rect.y; - return TRUE; + m_selStore.SetItemCount(count); + m_countVirt = count; + + ResetVisibleLinesRange(); + + // scrollbars must be reset + m_dirty = TRUE; } -int wxListMainWindow::GetSelectedItemCount() +int wxListMainWindow::GetSelectedItemCount() const { - int ret = 0; - for (size_t i = 0; i < m_lines.GetCount(); i++) + // deal with the quick case first + if ( IsSingleSel() ) { - if (m_lines[i].IsHilighted()) ret++; + return HasCurrent() ? IsHighlighted(m_current) : FALSE; } - return ret; -} - -void wxListMainWindow::SetMode( long mode ) -{ - m_dirty = TRUE; - m_mode = mode; - DeleteEverything(); + // virtual controls remmebers all its selections itself + if ( IsVirtual() ) + return m_selStore.GetSelectedCount(); - if (m_mode & wxLC_REPORT) - { -#if wxUSE_GENERIC_LIST_EXTENSIONS - m_xScroll = 15; -#else - m_xScroll = 0; -#endif - m_yScroll = 15; - } - else + // TODO: we probably should maintain the number of items selected even for + // non virtual controls as enumerating all lines is really slow... + size_t countSel = 0; + size_t count = GetItemCount(); + for ( size_t line = 0; line < count; line++ ) { - m_xScroll = 15; - m_yScroll = 0; + if ( GetLine(line)->IsHighlighted() ) + countSel++; } + + return countSel; } -long wxListMainWindow::GetMode() const +// ---------------------------------------------------------------------------- +// item position/size +// ---------------------------------------------------------------------------- + +void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const { - return m_mode; + wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(), + _T("invalid index in GetItemRect") ); + + rect = GetLineRect((size_t)index); + + CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y); } -void wxListMainWindow::CalculatePositions() +bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const { - if (m_lines.IsEmpty()) return; + wxRect rect; + GetItemRect(item, rect); + + pos.x = rect.x; + pos.y = rect.y; + + return TRUE; +} + +// ---------------------------------------------------------------------------- +// geometry calculation +// ---------------------------------------------------------------------------- +void wxListMainWindow::RecalculatePositions(bool noRefresh) +{ 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 = &m_lines[0]; - line->CalculateSize( &dc, iconSpacing ); - int dummy = 0; - line->GetSize( dummy, lineSpacing ); - lineSpacing += 1; - - int clientWidth = 0; - int clientHeight = 0; - - if (m_mode & wxLC_REPORT) - { - // scroll one line per step - m_yScroll = lineSpacing; - - int x = 4; - int y = 1; - int entireHeight = m_lines.GetCount() * lineSpacing + 2; - int scroll_pos = GetScrollPos( wxVERTICAL ); -#if wxUSE_GENERIC_LIST_EXTENSIONS - int x_scroll_pos = GetScrollPos( wxHORIZONTAL ); -#else - SetScrollbars( m_xScroll, m_yScroll, 0, entireHeight/m_yScroll +1, 0, scroll_pos, TRUE ); -#endif - GetClientSize( &clientWidth, &clientHeight ); + int iconSpacing; + if ( HasFlag(wxLC_ICON) ) + iconSpacing = m_normal_spacing; + else if ( HasFlag(wxLC_SMALL_ICON) ) + iconSpacing = m_small_spacing; + else + iconSpacing = 0; + + // Note that we do not call GetClientSize() here but + // GetSize() and substract the border size for sunken + // borders manually. This is technically incorrect, + // but we need to know the client area's size WITHOUT + // scrollbars here. Since we don't know if there are + // any scrollbars, we use GetSize() instead. Another + // solution would be to call SetScrollbars() here to + // remove the scrollbars and call GetClientSize() then, + // but this might result in flicker and - worse - will + // reset the scrollbars to 0 which is not good at all + // if you resize a dialog/window, but don't want to + // reset the window scrolling. RR. + // Furthermore, we actually do NOT subtract the border + // width as 2 pixels is just the extra space which we + // need around the actual content in the window. Other- + // wise the text would e.g. touch the upper border. RR. + int clientWidth, + clientHeight; + GetSize( &clientWidth, &clientHeight ); + + if ( HasFlag(wxLC_REPORT) ) + { + // all lines have the same height + int lineHeight = GetLineHeight(); - int entireWidth = 0 ; - for (size_t j = 0; j < m_lines.GetCount(); j++) - { - wxListLineData *line = &m_lines[j]; - line->CalculateSize( &dc, iconSpacing ); - line->SetPosition( &dc, x, y, clientWidth ); - int col_x = 2; - for (int i = 0; i < GetColumnCount(); i++) - { - 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 - } - m_visibleLines = clientHeight / lineSpacing; -#if wxUSE_GENERIC_LIST_EXTENSIONS - SetScrollbars( m_xScroll, m_yScroll, entireWidth/m_xScroll +1, entireHeight/m_yScroll +1, x_scroll_pos , scroll_pos, TRUE ); -#endif + // scroll one line per step + m_yScroll = lineHeight; + + size_t lineCount = GetItemCount(); + int entireHeight = lineCount*lineHeight + LINE_SPACING; + + m_linesPerPage = clientHeight / lineHeight; + + ResetVisibleLinesRange(); + + SetScrollbars( m_xScroll, m_yScroll, + GetHeaderWidth() / m_xScroll, + (entireHeight + m_yScroll - 1)/m_yScroll, + GetScrollPos(wxHORIZONTAL), + GetScrollPos(wxVERTICAL), + TRUE ); } - else + else // !report { // 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 - int entireWidth = 0; for (int tries = 0; tries < 2; tries++) { - entireWidth = 0; + // We start with 4 for the border around all items + entireWidth = 4; + + if (tries == 1) + { + // Now we have decided that the items do not fit into the + // client area. Unfortunately, wxWindows sometimes thinks + // that it does fit and therefore NO horizontal scrollbar + // is inserted. This looks ugly, so we fudge here and make + // the calculated width bigger than was actually has been + // calculated. This ensures that wxScrolledWindows puts + // a scrollbar at the bottom of its client area. + entireWidth += SCROLL_UNIT_X; + } + + // Start at 2,2 so the text does not touch the border int x = 2; int y = 2; int maxWidth = 0; - m_visibleLines = 0; - int m_currentVisibleLines = 0; - for (size_t i = 0; i < m_lines.GetCount(); i++) + m_linesPerPage = 0; + int currentlyVisibleLines = 0; + + size_t count = GetItemCount(); + for (size_t i = 0; i < count; i++) { - m_currentVisibleLines++; - wxListLineData *line = &m_lines[i]; + currentlyVisibleLines++; + wxListLineData *line = GetLine(i); line->CalculateSize( &dc, iconSpacing ); - line->SetPosition( &dc, x, y, clientWidth ); - line->GetSize( lineWidth, lineHeight ); - if (lineWidth > maxWidth) maxWidth = lineWidth; - y += lineSpacing; - if (m_currentVisibleLines > m_visibleLines) - m_visibleLines = m_currentVisibleLines; - if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking" + line->SetPosition( x, y, clientWidth, iconSpacing ); // Why clientWidth? (FIXME) + + wxSize sizeLine = GetLineSize(i); + + if ( maxWidth < sizeLine.x ) + maxWidth = sizeLine.x; + + y += sizeLine.y; + if (currentlyVisibleLines > m_linesPerPage) + m_linesPerPage = currentlyVisibleLines; + + // Assume that the size of the next one is the same... (FIXME) + if ( y + sizeLine.y >= clientHeight ) { - m_currentVisibleLines = 0; + currentlyVisibleLines = 0; y = 2; x += maxWidth+6; entireWidth += maxWidth+6; maxWidth = 0; } - if (i == m_lines.GetCount()-1) entireWidth += maxWidth; - if ((tries == 0) && (entireWidth > clientWidth)) + + // We have reached the last item. + if ( i == count - 1 ) + entireWidth += maxWidth; + + if ( (tries == 0) && (entireWidth+SCROLL_UNIT_X > clientWidth) ) { - clientHeight -= 15; // scrollbar height - m_visibleLines = 0; - m_currentVisibleLines = 0; + clientHeight -= 15; // We guess the scrollbar height. (FIXME) + m_linesPerPage = 0; + currentlyVisibleLines = 0; break; } - if (i == m_lines.GetCount()-1) tries = 1; // everything fits, no second try required + + if ( i == count - 1 ) + tries = 1; // Everything fits, no second try required. } } int scroll_pos = GetScrollPos( wxHORIZONTAL ); - SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE ); + SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE ); + } + + if ( !noRefresh ) + { + // FIXME: why should we call it from here? + UpdateCurrent(); + + RefreshAll(); } } -void wxListMainWindow::RealizeChanges() +void wxListMainWindow::RefreshAll() { - if (!m_current) + m_dirty = FALSE; + Refresh(); + + wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; + if ( headerWin && headerWin->m_dirty ) { - if (!m_lines.IsEmpty()) - m_current = &m_lines[0]; + headerWin->m_dirty = FALSE; + headerWin->Refresh(); } - if (m_current) +} + +void wxListMainWindow::UpdateCurrent() +{ + if ( !HasCurrent() && !IsEmpty() ) { - FocusLine( m_current ); - // TODO: MSW doesn't automatically hilight the - // first item. - // if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE ); + ChangeCurrent(0); } } long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), - int state ) + int state ) const { long ret = item, max = GetItemCount(); @@ -2936,186 +4124,289 @@ long wxListMainWindow::GetNextItem( long item, return -1; } - for (size_t i = (size_t)ret; i < m_lines.GetCount(); i++) + if ( !state ) + { + // any will do + return (size_t)ret; + } + + size_t count = GetItemCount(); + for ( size_t line = (size_t)ret; line < count; line++ ) { - 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++; + if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) ) + return line; + + if ( (state & wxLIST_STATE_SELECTED) && IsHighlighted(line) ) + return line; } return -1; } -void wxListMainWindow::DeleteItem( long index ) +// ---------------------------------------------------------------------------- +// deleting stuff +// ---------------------------------------------------------------------------- + +void wxListMainWindow::DeleteItem( long lindex ) { - m_dirty = TRUE; - if (index >= 0 && (size_t)index < m_lines.GetCount()) + size_t count = GetItemCount(); + + wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count), + _T("invalid item index in DeleteItem") ); + + size_t index = (size_t)lindex; + + // we don't need to adjust the index for the previous items + if ( HasCurrent() && m_current >= index ) + { + // if the current item is being deleted, we want the next one to + // become selected - unless there is no next one - so don't adjust + // m_current in this case + if ( m_current != index || m_current == count - 1 ) + { + m_current--; + } + } + + if ( InReportView() ) + { + ResetVisibleLinesRange(); + } + + if ( IsVirtual() ) + { + m_countVirt--; + + m_selStore.OnItemDelete(index); + } + else { - wxListLineData *line = &m_lines[(size_t)index]; - if (m_current == line) m_current = (wxListLineData *) NULL; - DeleteLine( line ); - m_lines.RemoveAt( (size_t)index ); + m_lines.RemoveAt( index ); } + + // we need to refresh the (vert) scrollbar as the number of items changed + m_dirty = TRUE; + + SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM ); + + RefreshAfter(index); } void wxListMainWindow::DeleteColumn( int col ) { - wxCHECK_RET( col < (int)m_columns.GetCount(), - wxT("attempting to delete inexistent column in wxListView") ); + wxListHeaderDataList::Node *node = m_columns.Item( col ); + + wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") ); m_dirty = TRUE; - wxNode *node = m_columns.Nth( col ); - if (node) m_columns.DeleteNode( node ); + m_columns.DeleteNode( node ); + + // invalidate it as it has to be recalculated + m_headerWidth = 0; } -void wxListMainWindow::DeleteAllItems() +void wxListMainWindow::DoDeleteAllItems() { - m_dirty = TRUE; - m_current = (wxListLineData *) NULL; + if ( IsEmpty() ) + { + // nothing to do - in particular, don't send the event + return; + } + + ResetCurrent(); // 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 + // notifications for each item deletion in this case but only one event + // for all of them: 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 ); + if ( IsVirtual() ) + { + m_countVirt = 0; + + m_selStore.Clear(); + } + + if ( InReportView() ) + { + ResetVisibleLinesRange(); + } + m_lines.Clear(); } -void wxListMainWindow::DeleteEverything() +void wxListMainWindow::DeleteAllItems() { - DeleteAllItems(); + DoDeleteAllItems(); + RecalculatePositions(); +} + +void wxListMainWindow::DeleteEverything() +{ m_columns.Clear(); + + DeleteAllItems(); } +// ---------------------------------------------------------------------------- +// scanning for an item +// ---------------------------------------------------------------------------- + void wxListMainWindow::EnsureVisible( long index ) { - // 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(); + wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(), + _T("invalid index in EnsureVisible") ); + + // We have to call this here because the label in question might just have + // been added and its position is not known yet + if ( m_dirty ) + { + RecalculatePositions(TRUE /* no refresh */); + } - 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; + MoveToItem((size_t)index); } long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) ) { 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); - if (s == tmp) - return pos; + if (pos < 0) + pos = 0; - pos++; + size_t count = GetItemCount(); + for ( size_t i = (size_t)pos; i < count; i++ ) + { + wxListLineData *line = GetLine(i); + if ( line->GetText(0) == tmp ) + return i; } - return -1; + + return wxNOT_FOUND; } long wxListMainWindow::FindItem(long start, long data) { long pos = start; - if (pos < 0) pos = 0; - for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++) + if (pos < 0) + pos = 0; + + size_t count = GetItemCount(); + for (size_t i = (size_t)pos; i < count; i++) { - wxListLineData *line = &m_lines[i]; + wxListLineData *line = GetLine(i); wxListItem item; line->GetItem( 0, item ); - if (item.m_data == data) return pos; - pos++; + if (item.m_data == data) + return i; } - return -1; + + return wxNOT_FOUND; } long wxListMainWindow::HitTest( int x, int y, int &flags ) { CalcUnscrolledPosition( x, y, &x, &y ); - int count = 0; - for (size_t i = 0; i < m_lines.GetCount(); i++) + size_t count = GetItemCount(); + + if ( HasFlag(wxLC_REPORT) ) { - 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 + size_t current = y / GetLineHeight(); + if ( current < count ) { - flags = (int)ret; - return count; + flags = HitTestLine(current, x, y); + if ( flags ) + return current; } - count++; } - return -1; + else // !report + { + // TODO: optimize it too! this is less simple than for report view but + // enumerating all items is still not a way to do it!! + for ( size_t current = 0; current < count; current++ ) + { + flags = HitTestLine(current, x, y); + if ( flags ) + return current; + } + } + + return wxNOT_FOUND; } +// ---------------------------------------------------------------------------- +// adding stuff +// ---------------------------------------------------------------------------- + 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 + wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") ); - wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush ); + size_t count = GetItemCount(); + wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId <= count, + _T("invalid item index") ); - if (m_mode & wxLC_REPORT) - { - line->InitItems( GetColumnCount() ); - item.m_width = GetColumnWidth( 0 )-3; - } + size_t id = item.m_itemId; + + m_dirty = TRUE; + + int mode = 0; + if ( HasFlag(wxLC_REPORT) ) + mode = wxLC_REPORT; + else if ( HasFlag(wxLC_LIST) ) + mode = wxLC_LIST; + else if ( HasFlag(wxLC_ICON) ) + mode = wxLC_ICON; + else if ( HasFlag(wxLC_SMALL_ICON) ) + mode = wxLC_ICON; // no typo else { - line->InitItems( 1 ); + wxFAIL_MSG( _T("unknown mode") ); } + wxListLineData *line = new wxListLineData(this); + 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_lines.Add( line ); - item.m_itemId = m_lines.GetCount()-1; - } + + m_lines.Insert( line, id ); + + m_dirty = TRUE; + RefreshLines(id, GetItemCount() - 1); } void wxListMainWindow::InsertColumn( long col, wxListItem &item ) { m_dirty = TRUE; - if (m_mode & wxLC_REPORT) + if ( HasFlag(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 ); + wxListHeaderDataList::Node *node = m_columns.Item( col ); + m_columns.Insert( node, column ); } else { m_columns.Append( column ); } + + // invalidate it as it has to be recalculated + m_headerWidth = 0; } } +// ---------------------------------------------------------------------------- +// sorting +// ---------------------------------------------------------------------------- + wxListCtrlCompare list_ctrl_compare_func_2; long list_ctrl_compare_data; @@ -3139,151 +4430,152 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) m_dirty = TRUE; } +// ---------------------------------------------------------------------------- +// scrolling +// ---------------------------------------------------------------------------- + void wxListMainWindow::OnScroll(wxScrollWinEvent& event) { + // update our idea of which lines are shown when we redraw the window the + // next time + ResetVisibleLinesRange(); + // FIXME -#ifdef __WXGTK__ +#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) wxScrolledWindow::OnScroll(event); #else HandleOnScroll( event ); #endif -#if wxUSE_GENERIC_LIST_EXTENSIONS - - if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT )) + if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() ) { - wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ; - if ( lc ) - { - lc->m_headerWin->Refresh() ; -#ifdef __WXMAC__ - lc->m_headerWin->MacUpdateImmediately() ; -#endif - } + wxGenericListCtrl* lc = GetListCtrl(); + wxCHECK_RET( lc, _T("no listctrl window?") ); + + lc->m_headerWin->Refresh(); + lc->m_headerWin->Update(); } -#endif } -// ------------------------------------------------------------------------------------- -// wxListItem -// ------------------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) - -wxListItem::wxListItem() +int wxListMainWindow::GetCountPerPage() const { - 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; + if ( !m_linesPerPage ) + { + wxConstCast(this, wxListMainWindow)-> + m_linesPerPage = GetClientSize().y / GetLineHeight(); + } - m_attr = NULL; + return m_linesPerPage; } -void wxListItem::Clear() +void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to) { - 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 = _T(""); + wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") ); - if (m_attr) delete m_attr; - m_attr = NULL; -} + if ( m_lineFrom == (size_t)-1 ) + { + size_t count = GetItemCount(); + if ( count ) + { + m_lineFrom = GetScrollPos(wxVERTICAL); -void wxListItem::ClearAttributes() -{ - if (m_attr) delete m_attr; - m_attr = NULL; -} + // this may happen if SetScrollbars() hadn't been called yet + if ( m_lineFrom >= count ) + m_lineFrom = count - 1; -// ------------------------------------------------------------------------------------- -// wxListEvent -// ------------------------------------------------------------------------------------- + // we redraw one extra line but this is needed to make the redrawing + // logic work when there is a fractional number of lines on screen + m_lineTo = m_lineFrom + m_linesPerPage; + if ( m_lineTo >= count ) + m_lineTo = count - 1; + } + else // empty control + { + m_lineFrom = 0; + m_lineTo = (size_t)-1; + } + } -IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) + wxASSERT_MSG( IsEmpty() || + (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()), + _T("GetVisibleLinesRange() returns incorrect result") ); -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; + if ( from ) + *from = m_lineFrom; + if ( to ) + *to = m_lineTo; } -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; +// ------------------------------------------------------------------------------------- +// wxListItem +// ------------------------------------------------------------------------------------- - if ( m_item.HasAttributes() ) - { - obj->m_item.SetTextColour(m_item.GetTextColour()); - } -} +#if !defined(__WIN32__) +IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) +#endif // ------------------------------------------------------------------------------------- -// wxListCtrl +// wxGenericListCtrl // ------------------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl) + +#if !defined(__WIN32__) +IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) -BEGIN_EVENT_TABLE(wxListCtrl,wxControl) - EVT_SIZE (wxListCtrl::OnSize) - EVT_IDLE (wxListCtrl::OnIdle) +IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) +#endif + +BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl) + EVT_SIZE(wxGenericListCtrl::OnSize) + EVT_IDLE(wxGenericListCtrl::OnIdle) END_EVENT_TABLE() -wxListCtrl::wxListCtrl() +#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) +/* + * wxListCtrl has to be a real class or we have problems with + * the run-time information. + */ + +IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl) +#endif + +wxGenericListCtrl::wxGenericListCtrl() { - m_imageListNormal = (wxImageList *) NULL; - m_imageListSmall = (wxImageList *) NULL; - m_imageListState = (wxImageList *) NULL; - m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE; + m_imageListNormal = (wxGenericImageList *) NULL; + m_imageListSmall = (wxGenericImageList *) NULL; + m_imageListState = (wxGenericImageList *) NULL; + + m_ownsImageListNormal = + m_ownsImageListSmall = + m_ownsImageListState = FALSE; + m_mainWin = (wxListMainWindow*) NULL; m_headerWin = (wxListHeaderWindow*) NULL; } -wxListCtrl::~wxListCtrl() +wxGenericListCtrl::~wxGenericListCtrl() +{ + if (m_ownsImageListNormal) + delete m_imageListNormal; + if (m_ownsImageListSmall) + delete m_imageListSmall; + if (m_ownsImageListState) + delete m_imageListState; +} + +void wxGenericListCtrl::CreateHeaderWindow() { - if (m_ownsImageListNormal) delete m_imageListNormal; - if (m_ownsImageListSmall) delete m_imageListSmall; - if (m_ownsImageListState) delete m_imageListState; + m_headerWin = new wxListHeaderWindow + ( + this, -1, m_mainWin, + wxPoint(0, 0), + wxSize(GetClientSize().x, HEADER_HEIGHT), + wxTAB_TRAVERSAL + ); } -bool wxListCtrl::Create(wxWindow *parent, +bool wxGenericListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, @@ -3291,56 +4583,58 @@ bool wxListCtrl::Create(wxWindow *parent, const wxValidator &validator, const wxString &name) { - m_imageListNormal = (wxImageList *) NULL; - m_imageListSmall = (wxImageList *) NULL; - m_imageListState = (wxImageList *) NULL; - m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE; + m_imageListNormal = + m_imageListSmall = + m_imageListState = (wxGenericImageList *) NULL; + m_ownsImageListNormal = + m_ownsImageListSmall = + m_ownsImageListState = FALSE; + m_mainWin = (wxListMainWindow*) NULL; m_headerWin = (wxListHeaderWindow*) NULL; - if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) ) + if ( !(style & wxLC_MASK_TYPE) ) { style = style | wxLC_LIST; } - bool ret = wxControl::Create( parent, id, pos, size, style, validator, name ); - + if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) + return FALSE; - if (style & wxSUNKEN_BORDER) - style -= wxSUNKEN_BORDER; + // don't create the inner window with the border + style &= ~wxSUNKEN_BORDER; m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style ); - if (HasFlag(wxLC_REPORT)) + 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)) + CreateHeaderWindow(); + + if ( HasFlag(wxLC_NO_HEADER) ) + { + // VZ: why do we create it at all then? m_headerWin->Show( FALSE ); - } - else - { - m_headerWin = (wxListHeaderWindow *) NULL; + } } - return ret; + return TRUE; } -void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) +void wxGenericListCtrl::SetSingleStyle( long style, bool add ) { - /* handled in OnIdle */ - - if (m_mainWin) m_mainWin->m_dirty = TRUE; -} + wxASSERT_MSG( !(style & wxLC_VIRTUAL), + _T("wxLC_VIRTUAL can't be [un]set") ); -void wxListCtrl::SetSingleStyle( long style, bool add ) -{ 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 (style & wxLC_MASK_TYPE) + flag &= ~(wxLC_MASK_TYPE | wxLC_VIRTUAL); + if (style & wxLC_MASK_ALIGN) + flag &= ~wxLC_MASK_ALIGN; + if (style & wxLC_MASK_SORT) + flag &= ~wxLC_MASK_SORT; } if (add) @@ -3349,97 +4643,94 @@ void wxListCtrl::SetSingleStyle( long style, bool add ) } else { - if (flag & style) flag -= style; + flag &= ~style; } SetWindowStyleFlag( flag ); } -void wxListCtrl::SetWindowStyleFlag( long flag ) +void wxGenericListCtrl::SetWindowStyleFlag( long flag ) { if (m_mainWin) { m_mainWin->DeleteEverything(); - int width = 0; - int height = 0; - GetClientSize( &width, &height ); + // has the header visibility changed? + bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER), + willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER); - m_mainWin->SetMode( flag ); - - if (flag & wxLC_REPORT) + if ( hasHeader != willHaveHeader ) { - if (!HasFlag(wxLC_REPORT)) + // toggle it + if ( hasHeader ) + { + if ( m_headerWin ) + { + // don't delete, just hide, as we can reuse it later + m_headerWin->Show(FALSE); + } + //else: nothing to do + } + else // must show header { 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 ); + CreateHeaderWindow(); } - else + else // already have it, just show { - if (flag & wxLC_NO_HEADER) - m_headerWin->Show( FALSE ); - else - m_headerWin->Show( TRUE ); + m_headerWin->Show( TRUE ); } } - } - else - { - if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER))) - { - m_headerWin->Show( FALSE ); - } + + ResizeReportView(willHaveHeader); } } wxWindow::SetWindowStyleFlag( flag ); } -bool wxListCtrl::GetColumn(int col, wxListItem &item) const +bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const { m_mainWin->GetColumn( col, item ); return TRUE; } -bool wxListCtrl::SetColumn( int col, wxListItem& item ) +bool wxGenericListCtrl::SetColumn( int col, wxListItem& item ) { m_mainWin->SetColumn( col, item ); return TRUE; } -int wxListCtrl::GetColumnWidth( int col ) const +int wxGenericListCtrl::GetColumnWidth( int col ) const { return m_mainWin->GetColumnWidth( col ); } -bool wxListCtrl::SetColumnWidth( int col, int width ) +bool wxGenericListCtrl::SetColumnWidth( int col, int width ) { m_mainWin->SetColumnWidth( col, width ); return TRUE; } -int wxListCtrl::GetCountPerPage() const +int wxGenericListCtrl::GetCountPerPage() const { return m_mainWin->GetCountPerPage(); // different from Windows ? } -bool wxListCtrl::GetItem( wxListItem &info ) const +bool wxGenericListCtrl::GetItem( wxListItem &info ) const { m_mainWin->GetItem( info ); return TRUE; } -bool wxListCtrl::SetItem( wxListItem &info ) +bool wxGenericListCtrl::SetItem( wxListItem &info ) { m_mainWin->SetItem( info ); return TRUE; } -long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId ) +long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId ) { wxListItem info; info.m_text = label; @@ -3455,18 +4746,18 @@ long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageI return TRUE; } -int wxListCtrl::GetItemState( long item, long stateMask ) const +int wxGenericListCtrl::GetItemState( long item, long stateMask ) const { return m_mainWin->GetItemState( item, stateMask ); } -bool wxListCtrl::SetItemState( long item, long state, long stateMask ) +bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask ) { m_mainWin->SetItemState( item, state, stateMask ); return TRUE; } -bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) +bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) { wxListItem info; info.m_image = image; @@ -3476,24 +4767,17 @@ bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) return TRUE; } -wxString wxListCtrl::GetItemText( long item ) const +wxString wxGenericListCtrl::GetItemText( long item ) const { - wxListItem info; - info.m_itemId = item; - m_mainWin->GetItem( info ); - return info.m_text; + return m_mainWin->GetItemText(item); } -void wxListCtrl::SetItemText( long item, const wxString &str ) +void wxGenericListCtrl::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 ); + m_mainWin->SetItemText(item, str); } -long wxListCtrl::GetItemData( long item ) const +long wxGenericListCtrl::GetItemData( long item ) const { wxListItem info; info.m_itemId = item; @@ -3501,7 +4785,7 @@ long wxListCtrl::GetItemData( long item ) const return info.m_data; } -bool wxListCtrl::SetItemData( long item, long data ) +bool wxGenericListCtrl::SetItemData( long item, long data ) { wxListItem info; info.m_mask = wxLIST_MASK_DATA; @@ -3511,69 +4795,101 @@ bool wxListCtrl::SetItemData( long item, long data ) return TRUE; } -bool wxListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const +bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const { m_mainWin->GetItemRect( item, rect ); return TRUE; } -bool wxListCtrl::GetItemPosition( long item, wxPoint& pos ) const +bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const { m_mainWin->GetItemPosition( item, pos ); return TRUE; } -bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) ) +bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) ) { return 0; } -int wxListCtrl::GetItemCount() const +int wxGenericListCtrl::GetItemCount() const { return m_mainWin->GetItemCount(); } -int wxListCtrl::GetColumnCount() const +int wxGenericListCtrl::GetColumnCount() const { return m_mainWin->GetColumnCount(); } -void wxListCtrl::SetItemSpacing( int spacing, bool isSmall ) +void wxGenericListCtrl::SetItemSpacing( int spacing, bool isSmall ) { m_mainWin->SetItemSpacing( spacing, isSmall ); } -int wxListCtrl::GetItemSpacing( bool isSmall ) const +int wxGenericListCtrl::GetItemSpacing( bool isSmall ) const { return m_mainWin->GetItemSpacing( isSmall ); } -int wxListCtrl::GetSelectedItemCount() const +void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col ) +{ + wxListItem info; + info.m_itemId = item; + info.SetTextColour( col ); + m_mainWin->SetItem( info ); +} + +wxColour wxGenericListCtrl::GetItemTextColour( long item ) const +{ + wxListItem info; + info.m_itemId = item; + m_mainWin->GetItem( info ); + return info.GetTextColour(); +} + +void wxGenericListCtrl::SetItemBackgroundColour( long item, const wxColour &col ) +{ + wxListItem info; + info.m_itemId = item; + info.SetBackgroundColour( col ); + m_mainWin->SetItem( info ); +} + +wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const +{ + wxListItem info; + info.m_itemId = item; + m_mainWin->GetItem( info ); + return info.GetBackgroundColour(); +} + +int wxGenericListCtrl::GetSelectedItemCount() const { return m_mainWin->GetSelectedItemCount(); } -wxColour wxListCtrl::GetTextColour() const +wxColour wxGenericListCtrl::GetTextColour() const { return GetForegroundColour(); } -void wxListCtrl::SetTextColour(const wxColour& col) +void wxGenericListCtrl::SetTextColour(const wxColour& col) { SetForegroundColour(col); } -long wxListCtrl::GetTopItem() const +long wxGenericListCtrl::GetTopItem() const { return 0; } -long wxListCtrl::GetNextItem( long item, int geom, int state ) const +long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const { return m_mainWin->GetNextItem( item, geom, state ); } -wxImageList *wxListCtrl::GetImageList(int which) const +wxGenericImageList *wxGenericListCtrl::GetImageList(int which) const { if (which == wxIMAGE_LIST_NORMAL) { @@ -3587,10 +4903,10 @@ wxImageList *wxListCtrl::GetImageList(int which) const { return m_imageListState; } - return (wxImageList *) NULL; + return (wxGenericImageList *) NULL; } -void wxListCtrl::SetImageList( wxImageList *imageList, int which ) +void wxGenericListCtrl::SetImageList( wxGenericImageList *imageList, int which ) { if ( which == wxIMAGE_LIST_NORMAL ) { @@ -3614,7 +4930,7 @@ void wxListCtrl::SetImageList( wxImageList *imageList, int which ) m_mainWin->SetImageList( imageList, which ); } -void wxListCtrl::AssignImageList(wxImageList *imageList, int which) +void wxGenericListCtrl::AssignImageList(wxGenericImageList *imageList, int which) { SetImageList(imageList, which); if ( which == wxIMAGE_LIST_NORMAL ) @@ -3625,81 +4941,89 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which) m_ownsImageListState = TRUE; } -bool wxListCtrl::Arrange( int WXUNUSED(flag) ) +bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) ) { return 0; } -bool wxListCtrl::DeleteItem( long item ) +bool wxGenericListCtrl::DeleteItem( long item ) { m_mainWin->DeleteItem( item ); return TRUE; } -bool wxListCtrl::DeleteAllItems() +bool wxGenericListCtrl::DeleteAllItems() { m_mainWin->DeleteAllItems(); return TRUE; } -bool wxListCtrl::DeleteAllColumns() +bool wxGenericListCtrl::DeleteAllColumns() { - for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ ) - DeleteColumn(n); + size_t count = m_mainWin->m_columns.GetCount(); + for ( size_t n = 0; n < count; n++ ) + DeleteColumn(0); return TRUE; } -void wxListCtrl::ClearAll() +void wxGenericListCtrl::ClearAll() { m_mainWin->DeleteEverything(); } -bool wxListCtrl::DeleteColumn( int col ) +bool wxGenericListCtrl::DeleteColumn( int col ) { m_mainWin->DeleteColumn( col ); + + // if we don't have the header any longer, we need to relayout the window + if ( !GetColumnCount() ) + { + ResizeReportView(FALSE /* no header */); + } + return TRUE; } -void wxListCtrl::Edit( long item ) +void wxGenericListCtrl::Edit( long item ) { - m_mainWin->Edit( item ); + m_mainWin->EditLabel( item ); } -bool wxListCtrl::EnsureVisible( long item ) +bool wxGenericListCtrl::EnsureVisible( long item ) { m_mainWin->EnsureVisible( item ); return TRUE; } -long wxListCtrl::FindItem( long start, const wxString& str, bool partial ) +long wxGenericListCtrl::FindItem( long start, const wxString& str, bool partial ) { return m_mainWin->FindItem( start, str, partial ); } -long wxListCtrl::FindItem( long start, long data ) +long wxGenericListCtrl::FindItem( long start, long data ) { return m_mainWin->FindItem( start, data ); } -long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt), +long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt), int WXUNUSED(direction)) { return 0; } -long wxListCtrl::HitTest( const wxPoint &point, int &flags ) +long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags ) { return m_mainWin->HitTest( (int)point.x, (int)point.y, flags ); } -long wxListCtrl::InsertItem( wxListItem& info ) +long wxGenericListCtrl::InsertItem( wxListItem& info ) { m_mainWin->InsertItem( info ); return info.m_itemId; } -long wxListCtrl::InsertItem( long index, const wxString &label ) +long wxGenericListCtrl::InsertItem( long index, const wxString &label ) { wxListItem info; info.m_text = label; @@ -3708,7 +5032,7 @@ long wxListCtrl::InsertItem( long index, const wxString &label ) return InsertItem( info ); } -long wxListCtrl::InsertItem( long index, int imageIndex ) +long wxGenericListCtrl::InsertItem( long index, int imageIndex ) { wxListItem info; info.m_mask = wxLIST_MASK_IMAGE; @@ -3717,7 +5041,7 @@ long wxListCtrl::InsertItem( long index, int imageIndex ) return InsertItem( info ); } -long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex ) +long wxGenericListCtrl::InsertItem( long index, const wxString &label, int imageIndex ) { wxListItem info; info.m_text = label; @@ -3727,16 +5051,25 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex ) return InsertItem( info ); } -long wxListCtrl::InsertColumn( long col, wxListItem &item ) +long wxGenericListCtrl::InsertColumn( long col, wxListItem &item ) { - wxASSERT( m_headerWin ); + wxCHECK_MSG( m_headerWin, -1, _T("can't add column in non report mode") ); + m_mainWin->InsertColumn( col, item ); + + // if we hadn't had header before and have it now we need to relayout the + // window + if ( GetColumnCount() == 1 ) + { + ResizeReportView(TRUE /* have header */); + } + m_headerWin->Refresh(); return 0; } -long wxListCtrl::InsertColumn( long col, const wxString &heading, +long wxGenericListCtrl::InsertColumn( long col, const wxString &heading, int format, int width ) { wxListItem item; @@ -3752,7 +5085,7 @@ long wxListCtrl::InsertColumn( long col, const wxString &heading, return InsertColumn( col, item ); } -bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) +bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) { return 0; } @@ -3767,58 +5100,58 @@ bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) // or zero if the two items are equivalent. // data is arbitrary data to be passed to the sort function. -bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data ) +bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data ) { m_mainWin->SortItems( fn, data ); return TRUE; } -void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- + +void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) { - if (!m_mainWin->m_dirty) return; + if ( !m_mainWin ) + return; - int cw = 0; - int ch = 0; - GetClientSize( &cw, &ch ); + ResizeReportView(m_mainWin->HasHeader()); + + m_mainWin->RecalculatePositions(); +} - int x = 0; - int y = 0; - int w = 0; - int h = 0; +void wxGenericListCtrl::ResizeReportView(bool showHeader) +{ + int cw, ch; + GetClientSize( &cw, &ch ); - if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER)) + if ( showHeader ) { - 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 ); + m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT ); + m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 ); } - else + else // no header window { - 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->SetSize( 0, 0, cw, ch ); } +} + +void wxGenericListCtrl::OnIdle( wxIdleEvent & event ) +{ + event.Skip(); - m_mainWin->CalculatePositions(); - m_mainWin->RealizeChanges(); - m_mainWin->m_dirty = FALSE; - m_mainWin->Refresh(); + // do it only if needed + if ( !m_mainWin->m_dirty ) + return; - if ( m_headerWin && m_headerWin->m_dirty ) - { - m_headerWin->m_dirty = FALSE; - m_headerWin->Refresh(); - } + m_mainWin->RecalculatePositions(); } -bool wxListCtrl::SetBackgroundColour( const wxColour &colour ) +// ---------------------------------------------------------------------------- +// font/colours +// ---------------------------------------------------------------------------- + +bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour ) { if (m_mainWin) { @@ -3829,7 +5162,7 @@ bool wxListCtrl::SetBackgroundColour( const wxColour &colour ) return TRUE; } -bool wxListCtrl::SetForegroundColour( const wxColour &colour ) +bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour ) { if ( !wxWindow::SetForegroundColour( colour ) ) return FALSE; @@ -3848,7 +5181,7 @@ bool wxListCtrl::SetForegroundColour( const wxColour &colour ) return TRUE; } -bool wxListCtrl::SetFont( const wxFont &font ) +bool wxGenericListCtrl::SetFont( const wxFont &font ) { if ( !wxWindow::SetFont( font ) ) return FALSE; @@ -3867,41 +5200,49 @@ bool wxListCtrl::SetFont( const wxFont &font ) return TRUE; } +// ---------------------------------------------------------------------------- +// methods forwarded to m_mainWin +// ---------------------------------------------------------------------------- + #if wxUSE_DRAG_AND_DROP -void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget ) +void wxGenericListCtrl::SetDropTarget( wxDropTarget *dropTarget ) { m_mainWin->SetDropTarget( dropTarget ); } -wxDropTarget *wxListCtrl::GetDropTarget() const +wxDropTarget *wxGenericListCtrl::GetDropTarget() const { return m_mainWin->GetDropTarget(); } #endif // wxUSE_DRAG_AND_DROP -bool wxListCtrl::SetCursor( const wxCursor &cursor ) +bool wxGenericListCtrl::SetCursor( const wxCursor &cursor ) { return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE; } -wxColour wxListCtrl::GetBackgroundColour() const +wxColour wxGenericListCtrl::GetBackgroundColour() const { return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour(); } -wxColour wxListCtrl::GetForegroundColour() const +wxColour wxGenericListCtrl::GetForegroundColour() const { return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour(); } -bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) +bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) { +#if wxUSE_MENUS return m_mainWin->PopupMenu( menu, x, y ); +#else + return FALSE; +#endif // wxUSE_MENUS } -void wxListCtrl::SetFocus() +void wxGenericListCtrl::SetFocus() { /* The test in window.cpp fails as we are a composite window, so it checks against "this", but not m_mainWin. */ @@ -3909,4 +5250,62 @@ void wxListCtrl::SetFocus() m_mainWin->SetFocus(); } +// ---------------------------------------------------------------------------- +// virtual list control support +// ---------------------------------------------------------------------------- + +wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const +{ + // this is a pure virtual function, in fact - which is not really pure + // because the controls which are not virtual don't need to implement it + wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemText not supposed to be called") ); + + return wxEmptyString; +} + +int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const +{ + // same as above + wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") ); + + return -1; +} + +wxListItemAttr *wxGenericListCtrl::OnGetItemAttr(long item) const +{ + wxASSERT_MSG( item >= 0 && item < GetItemCount(), + _T("invalid item index in OnGetItemAttr()") ); + + // no attributes by default + return NULL; +} + +void wxGenericListCtrl::SetItemCount(long count) +{ + wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") ); + + m_mainWin->SetItemCount(count); +} + +void wxGenericListCtrl::RefreshItem(long item) +{ + m_mainWin->RefreshLine(item); +} + +void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo) +{ + m_mainWin->RefreshLines(itemFrom, itemTo); +} + +void wxGenericListCtrl::Freeze() +{ + m_mainWin->Freeze(); +} + +void wxGenericListCtrl::Thaw() +{ + m_mainWin->Thaw(); +} + #endif // wxUSE_LISTCTRL +