X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d6d86a68427294503e40baee75c8f5758745af2..982d7f931701e2d65182f798e9182139efd67ed7:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 42db9247e5..26c3b4fdd8 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -11,7 +11,7 @@ // TODO // // 1. we need to implement searching/sorting for virtual controls somehow -// 2. when changing selection the lines are refreshed twice +// 2. when changing selection the lines are refreshed twice // For compilers that support precompilation, includes "wx.h". @@ -25,7 +25,7 @@ #include "wx/listctrl.h" -#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__) +#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__)) // if we have a native version, its implementation file does all this IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) @@ -42,16 +42,21 @@ #include "wx/dcclient.h" #include "wx/dcscreen.h" #include "wx/math.h" + #include "wx/settings.h" + #include "wx/sizer.h" #endif #include "wx/imaglist.h" -#include "wx/selstore.h" #include "wx/renderer.h" +#include "wx/generic/private/listctrl.h" #ifdef __WXMAC__ - #include "wx/mac/private.h" + #include "wx/osx/private.h" #endif +#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__) + #define "wx/msw/wrapwin.h" +#endif // NOTE: If using the wxListBox visual attributes works everywhere then this can // be removed, as well as the #else case below. @@ -71,16 +76,25 @@ static const int SCROLL_UNIT_X = 15; static const int LINE_SPACING = 0; // extra margins around the text label +#ifdef __WXGTK__ +static const int EXTRA_WIDTH = 6; +#else static const int EXTRA_WIDTH = 4; +#endif + +#ifdef __WXGTK__ +static const int EXTRA_HEIGHT = 6; +#else static const int EXTRA_HEIGHT = 4; +#endif // margin between the window and the items static const int EXTRA_BORDER_X = 2; static const int EXTRA_BORDER_Y = 2; // offset for the header window -static const int HEADER_OFFSET_X = 1; -static const int HEADER_OFFSET_Y = 1; +static const int HEADER_OFFSET_X = 0; +static const int HEADER_OFFSET_Y = 0; // margin between rows of icons in [small] icon view static const int MARGIN_BETWEEN_ROWS = 6; @@ -94,757 +108,28 @@ static const int WIDTH_COL_DEFAULT = 80; // the space between the image and the text in the report mode static const int IMAGE_MARGIN_IN_REPORT_MODE = 5; -// ============================================================================ -// private classes -// ============================================================================ - -//----------------------------------------------------------------------------- -// wxColWidthInfo (internal) -//----------------------------------------------------------------------------- - -struct wxColWidthInfo -{ - int nMaxWidth; - bool bNeedsUpdate; // only set to true when an item whose - // width == nMaxWidth is removed - - wxColWidthInfo(int w = 0, bool needsUpdate = false) - { - nMaxWidth = w; - bNeedsUpdate = needsUpdate; - } -}; +// the space between the image and the text in the report mode in header +static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2; -WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray); - -//----------------------------------------------------------------------------- -// wxListItemData (internal) -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxListItemData -{ -public: - wxListItemData(wxListMainWindow *owner); - ~wxListItemData(); - - void SetItem( const wxListItem &info ); - void SetImage( int image ) { m_image = image; } - void SetData( wxUIntPtr data ) { m_data = data; } - void SetPosition( int x, int y ); - void SetSize( int width, int height ); - - 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() const; - int GetY() const; - int GetWidth() const; - int GetHeight() const; - - int GetImage() const { return m_image; } - bool HasImage() const { return GetImage() != -1; } - - void GetItem( wxListItem &info ) const; - - void SetAttr(wxListItemAttr *attr) { m_attr = attr; } - wxListItemAttr *GetAttr() const { return m_attr; } - -public: - // the item image or -1 - int m_image; - - // user data associated with the item - wxUIntPtr 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: - // common part of all ctors - void Init(); - - wxString m_text; -}; - -//----------------------------------------------------------------------------- -// wxListHeaderData (internal) -//----------------------------------------------------------------------------- -class WXDLLEXPORT wxListHeaderData : public wxObject -{ -public: - wxListHeaderData(); - wxListHeaderData( const wxListItem &info ); - void SetItem( const wxListItem &item ); - void SetPosition( int x, int y ); - void SetWidth( int w ); - void SetFormat( int format ); - void SetHeight( int h ); - bool HasImage() const; - - bool HasText() const { return !m_text.empty(); } - const wxString& GetText() const { return m_text; } - void SetText(const wxString& text) { m_text = text; } - - void GetItem( wxListItem &item ); - - bool IsHit( int x, int y ) const; - int GetImage() const; - 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: - void Init(); -}; -//----------------------------------------------------------------------------- -// wxListLineData (internal) -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// arrays/list implementations +// ---------------------------------------------------------------------------- -WX_DECLARE_EXPORTED_LIST(wxListItemData, wxListItemDataList); #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxListItemDataList) -class wxListLineData -{ -public: - // 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; - - // extend all our rects to be centered inside the one of given width - void ExtendWidth(wxCoord w) - { - wxASSERT_MSG( m_rectAll.width <= w, - _T("width can only be increased") ); - - m_rectAll.width = w; - m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2; - m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2; - m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2; - } - } - *m_gi; - - // is this item selected? [NB: not used in virtual mode] - bool m_highlighted; - - // back pointer to the list ctrl - wxListMainWindow *m_owner; - -public: - wxListLineData(wxListMainWindow *owner); - - ~wxListLineData() - { - WX_CLEAR_LIST(wxListItemDataList, m_items); - 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 ); - - // remember the position this line appears at - void SetPosition( int x, int y, int spacing ); - - // wxListCtrl API - - void SetImage( int image ) { SetImage(0, image); } - int GetImage() const { return GetImage(0); } - void SetImage( int index, int image ); - int GetImage( int index ) const; - - 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 ); - - 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 ); - - // the same in report mode - void DrawInReportMode( wxDC *dc, - const wxRect& rect, - const wxRect& rectHL, - bool highlighted ); - -private: - // 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, - bool highlight); - - // draw the text on the DC with the correct justification; also add an - // ellipsis if the text is too large to fit in the current width - void DrawTextFormatted(wxDC *dc, - const wxString &text, - int col, - int x, - int yMid, // this is middle, not top, of the text - int width); -}; - -WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray); #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxListLineDataArray) -//----------------------------------------------------------------------------- -// wxListHeaderWindow (internal) -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxListHeaderWindow : public wxWindow -{ -protected: - wxListMainWindow *m_owner; - const wxCursor *m_currentCursor; - wxCursor *m_resizeCursor; - bool m_isDragging; - - // column being resized or -1 - int m_column; - - // divider line position in logical (unscrolled) coords - int m_currentX; - - // minimal position beyond which the divider line - // can't be dragged in logical coords - int m_minX; - -public: - wxListHeaderWindow(); - - wxListHeaderWindow( wxWindow *win, - wxWindowID id, - wxListMainWindow *owner, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxT("wxlistctrlcolumntitles") ); - - virtual ~wxListHeaderWindow(); - - void DrawCurrent(); - void AdjustDC( wxDC& dc ); - - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - - // needs refresh - bool m_dirty; - -private: - // common part of all ctors - void Init(); - - // generate and process the list event of the given type, return true if - // it wasn't vetoed, i.e. if we should proceed - bool SendListEvent(wxEventType type, const wxPoint& pos); - - DECLARE_DYNAMIC_CLASS(wxListHeaderWindow) - DECLARE_EVENT_TABLE() -}; - -//----------------------------------------------------------------------------- -// wxListRenameTimer (internal) -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxListRenameTimer: public wxTimer -{ -private: - wxListMainWindow *m_owner; - -public: - wxListRenameTimer( wxListMainWindow *owner ); - void Notify(); -}; - -//----------------------------------------------------------------------------- -// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxListTextCtrlWrapper : public wxEvtHandler -{ -public: - // NB: text must be a valid object but not Create()d yet - wxListTextCtrlWrapper(wxListMainWindow *owner, - wxTextCtrl *text, - size_t itemEdit); - - wxTextCtrl *GetText() const { return m_text; } - - void AcceptChangesAndFinish(); - -protected: - void OnChar( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - - bool AcceptChanges(); - void Finish(); - -private: - wxListMainWindow *m_owner; - wxTextCtrl *m_text; - wxString m_startValue; - size_t m_itemEdited; - bool m_finished; - bool m_aboutToFinish; - - DECLARE_EVENT_TABLE() -}; - -//----------------------------------------------------------------------------- -// wxListMainWindow (internal) -//----------------------------------------------------------------------------- - -WX_DECLARE_EXPORTED_LIST(wxListHeaderData, wxListHeaderDataList); #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxListHeaderDataList) -class wxListMainWindow : public wxScrolledWindow -{ -public: - wxListMainWindow(); - wxListMainWindow( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString &name = _T("listctrlmainwindow") ); - - virtual ~wxListMainWindow(); - - 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 InReportView() && !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 - wxTextCtrl *EditLabel(long item, - wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)); - wxTextCtrl *GetEditControl() const - { - return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL; - } - - void FinishEditing(wxTextCtrl *text) - { - delete text; - m_textctrlWrapper = NULL; - SetFocusIgnoringChildren(); - } - - // suspend/resume redrawing the control - void Freeze(); - void Thaw(); - - void OnRenameTimer(); - bool OnRenameAccept(size_t itemEdit, const wxString& value); - void OnRenameCancelled(size_t itemEdit); - - void OnMouse( wxMouseEvent &event ); - - // 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 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 ) const; - int GetTextLength( const wxString &s ) const; - - void SetImageList( wxImageList *imageList, int which ); - void SetItemSpacing( int spacing, bool isSmall = false ); - int GetItemSpacing( bool isSmall = false ); - - void SetColumn( int col, wxListItem &item ); - void SetColumnWidth( int col, int width ); - void GetColumn( int col, wxListItem &item ) 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 ) const; - void SetItemState( long item, long state, long stateMask ); - void SetItemStateAll( long state, long stateMask ); - int GetItemState( long item, long stateMask ) const; - void GetItemRect( long index, wxRect &rect ) const; - wxRect GetViewRect() const; - bool GetItemPosition( long item, wxPoint& pos ) const; - int GetSelectedItemCount() const; - - wxString GetItemText(long item) const - { - wxListItem info; - info.m_mask = wxLIST_MASK_TEXT; - 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 ); - void DeleteEverything(); - void EnsureVisible( long index ); - long FindItem( long start, const wxString& str, bool partial = false ); - long FindItem( long start, wxUIntPtr data); - long FindItem( const wxPoint& pt ); - long HitTest( int x, int y, int &flags ) const; - void InsertItem( wxListItem &item ); - void InsertColumn( long col, wxListItem &item ); - int GetItemWidthWithImage(wxListItem * item); - void SortItems( wxListCtrlCompare fn, long data ); - - size_t GetItemCount() const; - bool IsEmpty() const { return GetItemCount() == 0; } - void SetItemCount(long count); - - // 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; } - - // send out a wxListEvent - void SendNotify( size_t line, - wxEventType command, - const wxPoint& point = wxDefaultPosition ); - - // override base class virtual to reset m_lineHeight when the font changes - virtual bool SetFont(const wxFont& font) - { - if ( !wxScrolledWindow::SetFont(font) ) - return false; - - m_lineHeight = 0; - - return true; - } - - // these are for wxListLineData usage only - - // get the backpointer to the list ctrl - wxGenericListCtrl *GetListCtrl() const - { - return wxStaticCast(GetParent(), wxGenericListCtrl); - } - - // get the height of all lines (assuming they all do have the same height) - wxCoord GetLineHeight() const; - - // get the y position of the given line (only for report view) - wxCoord GetLineY(size_t line) const; - - // get the brush to use for the item highlighting - wxBrush *GetHighlightBrush() const - { - return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush; - } - -//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; - - // the list of column objects - wxListHeaderDataList m_columns; - - // currently focused item or -1 - size_t m_current; - - // the number of lines per page - int m_linesPerPage; - - // 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; - wxImageList *m_small_image_list; - wxImageList *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; - ColWidthArray m_aColWidths; - - // for double click logic - size_t m_lineLastClicked, - m_lineBeforeLastClicked, - m_lineSelectSingleOnUp; - -protected: - wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); } - - // 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(); - - // 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 - { - return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); - } - -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; - - // wrapper around the text control currently used for in place editing or - // NULL if no item is being edited - wxListTextCtrlWrapper *m_textctrlWrapper; - - - DECLARE_DYNAMIC_CLASS(wxListMainWindow) - DECLARE_EVENT_TABLE() - - friend class wxGenericListCtrl; -}; +// ---------------------------------------------------------------------------- +// wxListItemData +// ---------------------------------------------------------------------------- wxListItemData::~wxListItemData() { @@ -904,7 +189,7 @@ void wxListItemData::SetItem( const wxListItem &info ) void wxListItemData::SetPosition( int x, int y ) { - wxCHECK_RET( m_rect, _T("unexpected SetPosition() call") ); + wxCHECK_RET( m_rect, wxT("unexpected SetPosition() call") ); m_rect->x = x; m_rect->y = y; @@ -912,7 +197,7 @@ void wxListItemData::SetPosition( int x, int y ) void wxListItemData::SetSize( int width, int height ) { - wxCHECK_RET( m_rect, _T("unexpected SetSize() call") ); + wxCHECK_RET( m_rect, wxT("unexpected SetSize() call") ); if ( width != -1 ) m_rect->width = width; @@ -922,35 +207,35 @@ void wxListItemData::SetSize( int width, int height ) bool wxListItemData::IsHit( int x, int y ) const { - wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") ); + wxCHECK_MSG( m_rect, false, wxT("can't be called in this mode") ); return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Contains(x, y); } int wxListItemData::GetX() const { - wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); return m_rect->x; } int wxListItemData::GetY() const { - wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); return m_rect->y; } int wxListItemData::GetWidth() const { - wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); return m_rect->width; } int wxListItemData::GetHeight() const { - wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") ); + wxCHECK_MSG( m_rect, 0, wxT("can't be called in this mode") ); return m_rect->height; } @@ -993,6 +278,7 @@ void wxListHeaderData::Init() m_xpos = 0; m_ypos = 0; m_height = 0; + m_state = 0; } wxListHeaderData::wxListHeaderData() @@ -1022,6 +308,9 @@ void wxListHeaderData::SetItem( const wxListItem &item ) if ( m_mask & wxLIST_MASK_WIDTH ) SetWidth(item.m_width); + + if ( m_mask & wxLIST_MASK_STATE ) + SetState(item.m_state); } void wxListHeaderData::SetPosition( int x, int y ) @@ -1040,6 +329,11 @@ void wxListHeaderData::SetWidth( int w ) m_width = w < 0 ? WIDTH_COL_DEFAULT : w; } +void wxListHeaderData::SetState( int flag ) +{ + m_state = flag; +} + void wxListHeaderData::SetFormat( int format ) { m_format = format; @@ -1062,6 +356,7 @@ void wxListHeaderData::GetItem( wxListItem& item ) item.m_image = m_image; item.m_format = m_format; item.m_width = m_width; + item.m_state = m_state; } int wxListHeaderData::GetImage() const @@ -1079,6 +374,11 @@ int wxListHeaderData::GetFormat() const return m_format; } +int wxListHeaderData::GetState() const +{ + return m_state; +} + //----------------------------------------------------------------------------- // wxListLineData //----------------------------------------------------------------------------- @@ -1115,7 +415,7 @@ wxListLineData::wxListLineData( wxListMainWindow *owner ) void wxListLineData::CalculateSize( wxDC *dc, int spacing ) { wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, _T("no subitems at all??") ); + wxCHECK_RET( node, wxT("no subitems at all??") ); wxListItemData *item = node->GetData(); @@ -1205,11 +505,11 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) break; case wxLC_REPORT: - wxFAIL_MSG( _T("unexpected call to SetSize") ); + wxFAIL_MSG( wxT("unexpected call to SetSize") ); break; default: - wxFAIL_MSG( _T("unknown mode") ); + wxFAIL_MSG( wxT("unknown mode") ); break; } } @@ -1217,7 +517,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) void wxListLineData::SetPosition( int x, int y, int spacing ) { wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, _T("no subitems at all??") ); + wxCHECK_RET( node, wxT("no subitems at all??") ); wxListItemData *item = node->GetData(); @@ -1238,9 +538,9 @@ void wxListLineData::SetPosition( int x, int y, int spacing ) if ( item->HasText() ) { if (m_gi->m_rectAll.width > spacing) - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2; + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2); else - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing / 2) - (m_gi->m_rectLabel.width / 2); + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/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; @@ -1264,20 +564,20 @@ void wxListLineData::SetPosition( int x, int y, int spacing ) { 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; + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 4 + (EXTRA_WIDTH/2) + m_gi->m_rectIcon.width; } else { - m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2; + m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2); } break; case wxLC_REPORT: - wxFAIL_MSG( _T("unexpected call to SetPosition") ); + wxFAIL_MSG( wxT("unexpected call to SetPosition") ); break; default: - wxFAIL_MSG( _T("unknown mode") ); + wxFAIL_MSG( wxT("unknown mode") ); break; } } @@ -1291,7 +591,7 @@ void wxListLineData::InitItems( int num ) void wxListLineData::SetItem( int index, const wxListItem &info ) { wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - wxCHECK_RET( node, _T("invalid column index in SetItem") ); + wxCHECK_RET( node, wxT("invalid column index in SetItem") ); wxListItemData *item = node->GetData(); item->SetItem( info ); @@ -1334,7 +634,7 @@ void wxListLineData::SetText( int index, const wxString& s ) void wxListLineData::SetImage( int index, int image ) { wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - wxCHECK_RET( node, _T("invalid column index in SetImage()") ); + wxCHECK_RET( node, wxT("invalid column index in SetImage()") ); wxListItemData *item = node->GetData(); item->SetImage(image); @@ -1343,7 +643,7 @@ void wxListLineData::SetImage( int index, int image ) int wxListLineData::GetImage( int index ) const { wxListItemDataList::compatibility_iterator node = m_items.Item( index ); - wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") ); + wxCHECK_MSG( node, -1, wxT("invalid column index in GetImage()") ); wxListItemData *item = node->GetData(); return item->GetImage(); @@ -1352,7 +652,7 @@ int wxListLineData::GetImage( int index ) const wxListItemAttr *wxListLineData::GetAttr() const { wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") ); + wxCHECK_MSG( node, NULL, wxT("invalid column index in GetAttr()") ); wxListItemData *item = node->GetData(); return item->GetAttr(); @@ -1361,7 +661,7 @@ wxListItemAttr *wxListLineData::GetAttr() const void wxListLineData::SetAttr(wxListItemAttr *attr) { wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, _T("invalid column index in SetAttr()") ); + wxCHECK_RET( node, wxT("invalid column index in SetAttr()") ); wxListItemData *item = node->GetData(); item->SetAttr(attr); @@ -1380,7 +680,20 @@ bool wxListLineData::SetAttributes(wxDC *dc, // arithmetics on wxColour, unfortunately) wxColour colText; if ( highlighted ) +#ifdef __WXMAC__ + { + if (m_owner->HasFocus() +#if !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON + && IsControlActive( (ControlRef)m_owner->GetHandle() ) +#endif + ) + colText = *wxWHITE; + else + colText = *wxBLACK; + } +#else colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); +#endif else if ( attr && attr->HasTextColour() ) colText = attr->GetTextColour(); else @@ -1404,7 +717,7 @@ bool wxListLineData::SetAttributes(wxDC *dc, if ( highlighted ) dc->SetBrush( *m_owner->GetHighlightBrush() ); else - dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); + dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID)); dc->SetPen( *wxTRANSPARENT_PEN ); @@ -1417,14 +730,37 @@ bool wxListLineData::SetAttributes(wxDC *dc, void wxListLineData::Draw( wxDC *dc ) { wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); - wxCHECK_RET( node, _T("no subitems at all??") ); + wxCHECK_RET( node, wxT("no subitems at all??") ); bool highlighted = IsHighlighted(); wxListItemAttr *attr = GetAttr(); if ( SetAttributes(dc, attr, highlighted) ) +#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) ) + { dc->DrawRectangle( m_gi->m_rectHighlight ); + } +#else + { + if (highlighted) + { + int flags = wxCONTROL_SELECTED; + if (m_owner->HasFocus() +#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON + && IsControlActive( (ControlRef)m_owner->GetHandle() ) +#endif + ) + flags |= wxCONTROL_FOCUSED; + wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, m_gi->m_rectHighlight, flags ); + + } + else + { + dc->DrawRectangle( m_gi->m_rectHighlight ); + } + } +#endif // just for debugging to better see where the items are #if 0 @@ -1457,17 +793,46 @@ void wxListLineData::Draw( wxDC *dc ) void wxListLineData::DrawInReportMode( wxDC *dc, const wxRect& rect, const wxRect& rectHL, - bool highlighted ) + bool highlighted, + bool current ) { // 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) ) +#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) ) + { dc->DrawRectangle( rectHL ); + wxUnusedVar(current); + } +#else + { + if (highlighted) + { + int flags = wxCONTROL_SELECTED; + if (m_owner->HasFocus()) + flags |= wxCONTROL_FOCUSED; + if (current) + flags |= wxCONTROL_CURRENT; + wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, rectHL, flags ); + } + else + { + dc->DrawRectangle( rectHL ); + } + } +#endif + wxCoord x = rect.x + HEADER_OFFSET_X, yMid = rect.y + rect.height/2; +#ifdef __WXGTK__ + // This probably needs to be done + // on all platforms as the icons + // otherwise nearly touch the border + x += 2; +#endif size_t col = 0; for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); @@ -1480,6 +845,9 @@ void wxListLineData::DrawInReportMode( wxDC *dc, int xOld = x; x += width; + const int wText = width - 8; + wxDCClipper clipper(*dc, xOld, rect.y, wText, rect.height); + if ( item->HasImage() ) { int ix, iy; @@ -1493,17 +861,22 @@ void wxListLineData::DrawInReportMode( wxDC *dc, } if ( item->HasText() ) - DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width - 8); + DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, wText); } } void wxListLineData::DrawTextFormatted(wxDC *dc, - const wxString &text, + const wxString& textOrig, int col, int x, int yMid, int width) { + // we don't support displaying multiple lines currently (and neither does + // wxMSW FWIW) so just merge all the lines + wxString text(textOrig); + text.Replace(wxT("\n"), wxT(" ")); + wxCoord w, h; dc->GetTextExtent(text, &w, &h); @@ -1532,7 +905,7 @@ void wxListLineData::DrawTextFormatted(wxDC *dc, break; default: - wxFAIL_MSG( _T("unknown list item format") ); + wxFAIL_MSG( wxT("unknown list item format") ); break; } @@ -1574,7 +947,7 @@ void wxListLineData::DrawTextFormatted(wxDC *dc, bool wxListLineData::Highlight( bool on ) { - wxCHECK_MSG( !IsVirtual(), false, _T("unexpected call to Highlight") ); + wxCHECK_MSG( !IsVirtual(), false, wxT("unexpected call to Highlight") ); if ( on == m_highlighted ) return false; @@ -1593,8 +966,6 @@ void wxListLineData::ReverseHighlight( void ) // wxListHeaderWindow //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow) - BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow) EVT_PAINT (wxListHeaderWindow::OnPaint) EVT_MOUSE_EVENTS (wxListHeaderWindow::OnMouse) @@ -1603,17 +974,18 @@ END_EVENT_TABLE() void wxListHeaderWindow::Init() { - m_currentCursor = (wxCursor *) NULL; + m_currentCursor = NULL; m_isDragging = false; m_dirty = false; + m_sendSetColumnWidth = false; } wxListHeaderWindow::wxListHeaderWindow() { Init(); - m_owner = (wxListMainWindow *) NULL; - m_resizeCursor = (wxCursor *) NULL; + m_owner = NULL; + m_resizeCursor = NULL; } wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, @@ -1658,11 +1030,13 @@ wxListHeaderWindow::~wxListHeaderWindow() // scrollbar: this allows us to always use logical coords void wxListHeaderWindow::AdjustDC(wxDC& dc) { + wxGenericListCtrl *parent = m_owner->GetListCtrl(); + int xpix; - m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + parent->GetScrollPixelsPerUnit( &xpix, NULL ); int view_start; - m_owner->GetViewStart( &view_start, NULL ); + parent->GetViewStart( &view_start, NULL ); int org_x = 0; @@ -1685,9 +1059,10 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc) void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { + wxGenericListCtrl *parent = m_owner->GetListCtrl(); + wxPaintDC dc( this ); - PrepareDC( dc ); AdjustDC( dc ); dc.SetFont( GetFont() ); @@ -1695,9 +1070,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // width and height of the entire header window int w, h; GetClientSize( &w, &h ); - m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); + parent->CalcUnscrolledPosition(w, 0, &w, NULL); - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc.SetTextForeground(GetForegroundColour()); int x = HEADER_OFFSET_X; @@ -1708,23 +1083,32 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) m_owner->GetColumn( i, item ); int wCol = item.m_width; - // the width of the rect to draw: make it smaller to fit entirely - // inside the column rect -#ifdef __WXMAC__ int cw = wCol; int ch = h; -#else - int cw = wCol - 2; - int ch = h - 2; + + int flags = 0; + if (!m_parent->IsEnabled()) + flags |= wxCONTROL_DISABLED; + +// NB: The code below is not really Mac-specific, but since we are close +// to 2.8 release and I don't have time to test on other platforms, I +// defined this only for wxMac. If this behavior is desired on +// other platforms, please go ahead and revise or remove the #ifdef. +#ifdef __WXMAC__ + if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) && + (item.m_state & wxLIST_STATE_SELECTED) ) + flags |= wxCONTROL_SELECTED; #endif + if (i == 0) + flags |= wxCONTROL_SPECIAL; // mark as first column + wxRendererNative::Get().DrawHeaderButton ( this, dc, wxRect(x, HEADER_OFFSET_Y, cw, ch), - m_parent->IsEnabled() ? 0 - : (int)wxCONTROL_DISABLED + flags ); // see if we have enough space for the column label @@ -1736,17 +1120,16 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wLabel += 2 * EXTRA_WIDTH; // and the width of the icon, if any - static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2; int ix = 0, iy = 0; // init them just to suppress the compiler warnings const int image = item.m_image; wxImageList *imageList; if ( image != -1 ) { - imageList = m_owner->m_small_image_list; + imageList = m_owner->GetSmallImageList(); if ( imageList ) { imageList->GetSize(image, ix, iy); - wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON; + wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; } } else @@ -1759,7 +1142,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) switch ( wLabel < cw ? item.GetAlign() : wxLIST_FORMAT_LEFT ) { default: - wxFAIL_MSG( _T("unknown list item format") ); + wxFAIL_MSG( wxT("unknown list item format") ); // fall through case wxLIST_FORMAT_LEFT: @@ -1775,6 +1158,10 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) break; } + // draw the text and image clipping them so that they + // don't overwrite the column boundary + wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 ); + // if we have an image, draw it on the right of the label if ( imageList ) { @@ -1782,27 +1169,51 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) ( image, dc, - xAligned + wLabel - ix - MARGIN_BETWEEN_TEXT_AND_ICON, + xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE, HEADER_OFFSET_Y + (h - 4 - iy)/2, wxIMAGELIST_DRAW_TRANSPARENT ); - - cw -= ix + MARGIN_BETWEEN_TEXT_AND_ICON; } - // 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(), xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT ); x += wCol; } + + // Fill in what's missing to the right of the columns, otherwise we will + // leave an unpainted area when columns are removed (and it looks better) + if ( x < w ) + { + wxRendererNative::Get().DrawHeaderButton + ( + this, + dc, + wxRect(x, HEADER_OFFSET_Y, w - x, h), + wxCONTROL_DIRTY // mark as last column + ); + } +} + +void wxListHeaderWindow::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); + + if (m_sendSetColumnWidth) + { + m_owner->SetColumnWidth( m_colToSend, m_widthToSend ); + m_sendSetColumnWidth = false; + } } void wxListHeaderWindow::DrawCurrent() { +#if 1 + // m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); + m_sendSetColumnWidth = true; + m_colToSend = m_column; + m_widthToSend = m_currentX - m_minX; +#else int x1 = m_currentX; int y1 = 0; m_owner->ClientToScreen( &x1, &y1 ); @@ -1814,7 +1225,7 @@ void wxListHeaderWindow::DrawCurrent() wxScreenDC dc; dc.SetLogicalFunction( wxINVERT ); - dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) ); + dc.SetPen( wxPen(*wxBLACK, 2) ); dc.SetBrush( *wxTRANSPARENT_BRUSH ); AdjustDC(dc); @@ -1825,13 +1236,16 @@ void wxListHeaderWindow::DrawCurrent() dc.SetPen( wxNullPen ); dc.SetBrush( wxNullBrush ); +#endif } void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) { + wxGenericListCtrl *parent = m_owner->GetListCtrl(); + // we want to work with logical coords int x; - m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); + parent->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); int y = event.GetY(); if (m_isDragging) @@ -1842,7 +1256,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) // there int w = 0; GetClientSize( &w, NULL ); - m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); + parent->CalcUnscrolledPosition(w, 0, &w, NULL); w -= 6; // erase the line if it was drawn @@ -1920,6 +1334,22 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) } else // click on a column { + // record the selected state of the columns + if (event.LeftDown()) + { + for (int i=0; i < m_owner->GetColumnCount(); i++) + { + wxListItem colItem; + m_owner->GetColumn(i, colItem); + long state = colItem.GetState(); + if (i == m_column) + colItem.SetState(state | wxLIST_STATE_SELECTED); + else + colItem.SetState(state & ~wxLIST_STATE_SELECTED); + m_owner->SetColumn(i, colItem); + } + } + SendListEvent( event.LeftDown() ? wxEVT_COMMAND_LIST_COL_CLICK : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, @@ -2001,12 +1431,13 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner, { m_owner = owner; m_text = text; - m_finished = false; m_aboutToFinish = false; + wxGenericListCtrl *parent = m_owner->GetListCtrl(); + wxRect rectLabel = owner->GetLineLabelRect(itemEdit); - m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y, + parent->CalcScrolledPosition(rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y); m_text->Create(owner, wxID_ANY, m_startValue, @@ -2017,46 +1448,54 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner, m_text->PushEventHandler(this); } -void wxListTextCtrlWrapper::Finish() +void wxListTextCtrlWrapper::EndEdit(bool discardChanges) { - if ( !m_finished ) + m_aboutToFinish = true; + + if ( discardChanges ) { - m_finished = true; + m_owner->OnRenameCancelled(m_itemEdited); - m_text->RemoveEventHandler(this); - m_owner->FinishEditing(m_text); + Finish( true ); + } + else + { + // Notify the owner about the changes + AcceptChanges(); - wxPendingDelete.Append( this ); + // Even if vetoed, close the control (consistent with MSW) + Finish( true ); } } +void wxListTextCtrlWrapper::Finish( bool setfocus ) +{ + m_text->RemoveEventHandler(this); + m_owner->ResetTextControl( m_text ); + + wxPendingDelete.Append( this ); + + if (setfocus) + m_owner->SetFocus(); +} + bool wxListTextCtrlWrapper::AcceptChanges() { const wxString value = m_text->GetValue(); - if ( value == m_startValue ) - // nothing changed, always accept - return true; - + // notice that we should always call OnRenameAccept() to generate the "end + // label editing" event, even if the user hasn't really changed anything if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) + { // vetoed by the user return false; + } - // accepted, do rename the item - m_owner->SetItemText(m_itemEdited, value); - - return true; -} - -void wxListTextCtrlWrapper::AcceptChangesAndFinish() -{ - m_aboutToFinish = true; - - // Notify the owner about the changes - AcceptChanges(); + // accepted, do rename the item (unless nothing changed) + if ( value != m_startValue ) + m_owner->SetItemText(m_itemEdited, value); - // Even if vetoed, close the control (consistent with MSW) - Finish(); + return true; } void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event ) @@ -2064,12 +1503,11 @@ void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event ) switch ( event.m_keyCode ) { case WXK_RETURN: - AcceptChangesAndFinish(); + EndEdit( false ); break; case WXK_ESCAPE: - m_owner->OnRenameCancelled( m_itemEdited ); - Finish(); + EndEdit( true ); break; default: @@ -2079,35 +1517,32 @@ void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event ) void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) { - if (m_finished) + if (m_aboutToFinish) { - event.Skip(); - return; + // auto-grow the textctrl: + wxSize parentSize = m_owner->GetSize(); + wxPoint myPos = m_text->GetPosition(); + wxSize mySize = m_text->GetSize(); + int sx, sy; + m_text->GetTextExtent(m_text->GetValue() + wxT("MM"), &sx, &sy); + if (myPos.x + sx > parentSize.x) + sx = parentSize.x - myPos.x; + if (mySize.x > sx) + sx = mySize.x; + m_text->SetSize(sx, wxDefaultCoord); } - // auto-grow the textctrl: - wxSize parentSize = m_owner->GetSize(); - wxPoint myPos = m_text->GetPosition(); - wxSize mySize = m_text->GetSize(); - int sx, sy; - m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy); - if (myPos.x + sx > parentSize.x) - sx = parentSize.x - myPos.x; - if (mySize.x > sx) - sx = mySize.x; - m_text->SetSize(sx, wxDefaultCoord); - event.Skip(); } void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) { - if ( !m_finished && !m_aboutToFinish ) + if ( !m_aboutToFinish ) { if ( !AcceptChanges() ) m_owner->OnRenameCancelled( m_itemEdited ); - Finish(); + Finish( false ); } // We must let the native text control handle focus @@ -2118,16 +1553,16 @@ void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) // wxListMainWindow //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow) - -BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) +BEGIN_EVENT_TABLE(wxListMainWindow, wxWindow) EVT_PAINT (wxListMainWindow::OnPaint) EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse) EVT_CHAR (wxListMainWindow::OnChar) EVT_KEY_DOWN (wxListMainWindow::OnKeyDown) + EVT_KEY_UP (wxListMainWindow::OnKeyUp) EVT_SET_FOCUS (wxListMainWindow::OnSetFocus) EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus) EVT_SCROLLWIN (wxListMainWindow::OnScroll) + EVT_CHILD_FOCUS (wxListMainWindow::OnChildFocus) END_EVENT_TABLE() void wxListMainWindow::Init() @@ -2141,8 +1576,8 @@ void wxListMainWindow::Init() m_headerWidth = m_lineHeight = 0; - m_small_image_list = (wxImageList *) NULL; - m_normal_image_list = (wxImageList *) NULL; + m_small_image_list = NULL; + m_normal_image_list = NULL; m_small_spacing = 30; m_normal_spacing = 40; @@ -2159,8 +1594,6 @@ void wxListMainWindow::Init() m_lineLastClicked = m_lineSelectSingleOnUp = m_lineBeforeLastClicked = (size_t)-1; - - m_freezeCount = 0; } wxListMainWindow::wxListMainWindow() @@ -2168,7 +1601,7 @@ wxListMainWindow::wxListMainWindow() Init(); m_highlightBrush = - m_highlightUnfocusedBrush = (wxBrush *) NULL; + m_highlightUnfocusedBrush = NULL; } wxListMainWindow::wxListMainWindow( wxWindow *parent, @@ -2177,30 +1610,27 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, const wxSize& size, long style, const wxString &name ) - : wxScrolledWindow( parent, id, pos, size, - style | wxHSCROLL | wxVSCROLL, name ) + : wxWindow( parent, id, pos, size, style, name ) { Init(); m_highlightBrush = new wxBrush - ( + ( wxSystemSettings::GetColour ( wxSYS_COLOUR_HIGHLIGHT ), - wxSOLID - ); + wxBRUSHSTYLE_SOLID + ); m_highlightUnfocusedBrush = new wxBrush - ( - wxSystemSettings::GetColour - ( - wxSYS_COLOUR_BTNSHADOW - ), - wxSOLID - ); - - SetScrollbars( 0, 0, 0, 0, 0, 0 ); + ( + wxSystemSettings::GetColour + ( + wxSYS_COLOUR_BTNSHADOW + ), + wxBRUSHSTYLE_SOLID + ); wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes(); SetOwnForegroundColour( attr.colFg ); @@ -2238,8 +1668,8 @@ void wxListMainWindow::CacheLineData(size_t line) wxListLineData *wxListMainWindow::GetDummyLine() const { - wxASSERT_MSG( !IsEmpty(), _T("invalid line index") ); - wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") ); + wxASSERT_MSG( !IsEmpty(), wxT("invalid line index") ); + wxASSERT_MSG( IsVirtual(), wxT("GetDummyLine() shouldn't be called") ); wxListMainWindow *self = wxConstCast(this, wxListMainWindow); @@ -2280,7 +1710,7 @@ wxCoord wxListMainWindow::GetLineHeight() const dc.SetFont( GetFont() ); wxCoord y; - dc.GetTextExtent(_T("H"), NULL, &y); + dc.GetTextExtent(wxT("H"), NULL, &y); if ( m_small_image_list && m_small_image_list->GetImageCount() ) { @@ -2298,7 +1728,7 @@ wxCoord wxListMainWindow::GetLineHeight() const wxCoord wxListMainWindow::GetLineY(size_t line) const { - wxASSERT_MSG( InReportView(), _T("only works in report mode") ); + wxASSERT_MSG( InReportView(), wxT("only works in report mode") ); return LINE_SPACING + line * GetLineHeight(); } @@ -2322,10 +1752,24 @@ wxRect wxListMainWindow::GetLineLabelRect(size_t line) const if ( !InReportView() ) return GetLine(line)->m_gi->m_rectLabel; + int image_x = 0; + wxListLineData *data = GetLine(line); + wxListItemDataList::compatibility_iterator node = data->m_items.GetFirst(); + if (node) + { + wxListItemData *item = node->GetData(); + if ( item->HasImage() ) + { + int ix, iy; + GetImageSize( item->GetImage(), ix, iy ); + image_x = 3 + ix + IMAGE_MARGIN_IN_REPORT_MODE; + } + } + wxRect rect; - rect.x = HEADER_OFFSET_X; + rect.x = image_x + HEADER_OFFSET_X; rect.y = GetLineY(line); - rect.width = GetColumnWidth(0); + rect.width = GetColumnWidth(0) - image_x; rect.height = GetLineHeight(); return rect; @@ -2337,7 +1781,7 @@ wxRect wxListMainWindow::GetLineIconRect(size_t line) const return GetLine(line)->m_gi->m_rectIcon; wxListLineData *ld = GetLine(line); - wxASSERT_MSG( ld->HasImage(), _T("should have an image") ); + wxASSERT_MSG( ld->HasImage(), wxT("should have an image") ); wxRect rect; rect.x = HEADER_OFFSET_X; @@ -2355,7 +1799,7 @@ wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const long wxListMainWindow::HitTestLine(size_t line, int x, int y) const { - wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") ); + wxASSERT_MSG( line < GetItemCount(), wxT("invalid line in HitTestLine") ); wxListLineData *ld = GetLine(line); @@ -2390,7 +1834,7 @@ bool wxListMainWindow::IsHighlighted(size_t line) const else // !virtual { wxListLineData *ld = GetLine(line); - wxCHECK_MSG( ld, false, _T("invalid index in IsHighlighted") ); + wxCHECK_MSG( ld, false, wxT("invalid index in IsHighlighted") ); return ld->IsHighlighted(); } @@ -2439,7 +1883,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight ) else // !virtual { wxListLineData *ld = GetLine(line); - wxCHECK_MSG( ld, false, _T("invalid index in HighlightLine") ); + wxCHECK_MSG( ld, false, wxT("invalid index in HighlightLine") ); changed = ld->Highlight(highlight); } @@ -2466,16 +1910,16 @@ void wxListMainWindow::RefreshLine( size_t line ) wxRect rect = GetLineRect(line); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + GetListCtrl()->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( lineFrom <= lineTo, wxT("indices in disorder") ); - wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") ); + wxASSERT_MSG( lineTo < GetItemCount(), wxT("invalid line range") ); if ( InReportView() ) { @@ -2493,7 +1937,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo ) rect.width = GetClientSize().x; rect.height = GetLineY(lineTo) - rect.y + GetLineHeight(); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); RefreshRect( rect ); } else // !report @@ -2521,7 +1965,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom ) wxRect rect; rect.x = 0; rect.y = GetLineY(lineFrom); - CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); wxSize size = GetClientSize(); rect.width = size.x; @@ -2565,37 +2009,25 @@ void wxListMainWindow::RefreshSelected() } } -void wxListMainWindow::Freeze() -{ - m_freezeCount++; -} - -void wxListMainWindow::Thaw() -{ - wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") ); - - if ( --m_freezeCount == 0 ) - Refresh(); -} - void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { // Note: a wxPaintDC must be constructed even if no drawing is // done (a Windows requirement). wxPaintDC dc( this ); - if ( IsEmpty() || m_freezeCount ) + if ( IsEmpty() ) + { // 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; + RecalculatePositions( false ); - PrepareDC( dc ); + GetListCtrl()->PrepareDC( dc ); int dev_x, dev_y; - CalcScrolledPosition( 0, 0, &dev_x, &dev_y ); + GetListCtrl()->CalcScrolledPosition( 0, 0, &dev_x, &dev_y ); dc.SetFont( GetFont() ); @@ -2609,7 +2041,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRect rectLine; int xOrig = dc.LogicalToDeviceX( 0 ); int yOrig = dc.LogicalToDeviceY( 0 ); - + // tell the caller cache to cache the data if ( IsVirtual() ) { @@ -2636,16 +2068,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) GetLine(line)->DrawInReportMode( &dc, rectLine, GetLineHighlightRect(line), - IsHighlighted(line) ); + IsHighlighted(line), + line == m_current ); } if ( HasFlag(wxLC_HRULES) ) { - wxPen pen(GetRuleColour(), 1, wxSOLID); + wxPen pen(GetRuleColour(), 1, wxPENSTYLE_SOLID); wxSize clientSize = GetClientSize(); - // Don't draw the first one - for ( size_t i = visibleFrom + 1; i <= visibleTo; i++ ) + size_t i = visibleFrom; + if (i == 0) i = 1; // Don't draw the first one + for ( ; i <= visibleTo; i++ ) { dc.SetPen(pen); dc.SetBrush( *wxTRANSPARENT_BRUSH ); @@ -2666,7 +2100,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // Draw vertical rules if required if ( HasFlag(wxLC_VRULES) && !IsEmpty() ) { - wxPen pen(GetRuleColour(), 1, wxSOLID); + wxPen pen(GetRuleColour(), 1, wxPENSTYLE_SOLID); wxRect firstItemRect, lastItemRect; GetItemRect(visibleFrom, firstItemRect); @@ -2679,8 +2113,10 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { int colWidth = GetColumnWidth(col); x += colWidth; - dc.DrawLine(x - dev_x - 2, firstItemRect.GetY() - 1 - dev_y, - x - dev_x - 2, lastItemRect.GetBottom() + 1 - dev_y); + int x_pos = x - dev_x; + if (col < GetColumnCount()-1) x_pos -= 2; + dc.DrawLine(x_pos, firstItemRect.GetY() - 1 - dev_y, + x_pos, lastItemRect.GetBottom() + 1 - dev_y); } } } @@ -2693,15 +2129,17 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } -#ifndef __WXMAC__ +#if !defined( __WXMAC__) && !defined(__WXGTK20__) // Don't draw rect outline under Mac at all. + // Draw it elsewhere under GTK. if ( HasCurrent() ) { if ( m_hasFocus ) { + wxRect rect( GetLineHighlightRect( m_current ) ); dc.SetPen( *wxBLACK_PEN ); dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle( GetLineHighlightRect( m_current ) ); + dc.DrawRectangle( rect ); } } #endif @@ -2711,7 +2149,7 @@ void wxListMainWindow::HighlightAll( bool on ) { if ( IsSingleSel() ) { - wxASSERT_MSG( !on, _T("can't do this in a single selection control") ); + wxASSERT_MSG( !on, wxT("can't do this in a single selection control") ); // we just have one item to turn off if ( HasCurrent() && IsHighlighted(m_current) ) @@ -2720,18 +2158,27 @@ void wxListMainWindow::HighlightAll( bool on ) RefreshLine(m_current); } } - else // multi sel + else // multi selection { - HighlightLines(0, GetItemCount() - 1, on); + if ( !IsEmpty() ) + HighlightLines(0, GetItemCount() - 1, on); } } +void wxListMainWindow::OnChildFocus(wxChildFocusEvent& WXUNUSED(event)) +{ + // Do nothing here. This prevents the default handler in wxScrolledWindow + // from needlessly scrolling the window when the edit control is + // dismissed. See ticket #9563. +} + void wxListMainWindow::SendNotify( size_t line, wxEventType command, const wxPoint& point ) { wxListEvent le( command, GetParent()->GetId() ); le.SetEventObject( GetParent() ); + le.m_itemIndex = line; // set only for events which have position @@ -2742,7 +2189,7 @@ void wxListMainWindow::SendNotify( size_t line, // 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 ( !IsVirtual() ) { if ( line != (size_t)-1 ) { @@ -2759,6 +2206,11 @@ void wxListMainWindow::ChangeCurrent(size_t current) { m_current = current; + // as the current item changed, we shouldn't start editing it when the + // "slow click" timer expires as the click happened on another item + if ( m_renameTimer->IsRunning() ) + m_renameTimer->Stop(); + SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED); } @@ -2776,7 +2228,7 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass le.SetEventObject( GetParent() ); le.m_itemIndex = item; wxListLineData *data = GetLine(itemEdit); - wxCHECK_MSG( data, NULL, _T("invalid index in EditLabel()") ); + wxCHECK_MSG( data, NULL, wxT("invalid index in EditLabel()") ); data->GetItem( 0, le.m_item ); if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() ) @@ -2788,8 +2240,18 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass // 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 ) + { + // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead + // so that no pending events may change the item count (see below) + // IMPORTANT: needs to be tested! wxSafeYield(); + // Pending events dispatched by wxSafeYield might have changed the item + // count + if ( (size_t)item >= GetItemCount() ) + return NULL; + } + wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject(); m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item); return m_textctrlWrapper->GetText(); @@ -2810,7 +2272,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value) wxListLineData *data = GetLine(itemEdit); - wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") ); + wxCHECK_MSG( data, false, wxT("invalid index in OnRenameAccept()") ); data->GetItem( 0, le.m_item ); le.m_item.m_text = value; @@ -2829,7 +2291,7 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit) le.m_itemIndex = itemEdit; wxListLineData *data = GetLine(itemEdit); - wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") ); + wxCHECK_RET( data, wxT("invalid index in OnRenameCancelled()") ); data->GetItem( 0, le.m_item ); GetEventHandler()->ProcessEvent( le ); @@ -2837,23 +2299,25 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit) void wxListMainWindow::OnMouse( wxMouseEvent &event ) { - #ifdef __WXMAC__ // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly // shutdown the edit control when the mouse is clicked elsewhere on the // listctrl because the order of events is different (or something like // that), so explicitly end the edit if it is active. if ( event.LeftDown() && m_textctrlWrapper ) - m_textctrlWrapper->AcceptChangesAndFinish(); + m_textctrlWrapper->EndEdit( false ); #endif // __WXMAC__ + if ( event.LeftDown() ) + SetFocus(); + event.SetEventObject( GetParent() ); if ( GetParent()->GetEventHandler()->ProcessEvent( event) ) return; if (event.GetEventType() == wxEVT_MOUSEWHEEL) { - // let the base handle mouse wheel events. + // let the base class handle mouse wheel events. event.Skip(); return; } @@ -2863,8 +2327,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (event.RightDown()) { SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - // Allow generation of context menu event - event.Skip(); + + wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, + GetParent()->GetId(), + ClientToScreen(event.GetPosition())); + evtCtx.SetEventObject(GetParent()); + GetParent()->GetEventHandler()->ProcessEvent(evtCtx); } return; } @@ -2878,7 +2346,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) int x = event.GetX(); int y = event.GetY(); - CalcUnscrolledPosition( x, y, &x, &y ); + GetListCtrl()->CalcUnscrolledPosition( x, y, &x, &y ); // where did we hit it (if we did)? long hitResult = 0; @@ -2941,8 +2409,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (event.RightDown()) { SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - // Allow generation of context menu event - event.Skip(); + + wxContextMenuEvent evtCtx( + wxEVT_CONTEXT_MENU, + GetParent()->GetId(), + ClientToScreen(event.GetPosition())); + evtCtx.SetEventObject(GetParent()); + GetParent()->GetEventHandler()->ProcessEvent(evtCtx); } else { @@ -2956,7 +2429,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) bool forceClick = false; if (event.ButtonDClick()) { - m_renameTimer->Stop(); + if ( m_renameTimer->IsRunning() ) + m_renameTimer->Stop(); + m_lastOnSame = false; if ( current == m_lineLastClicked ) @@ -2988,7 +2463,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) (hitResult == wxLIST_HITTEST_ONITEMLABEL) && HasFlag(wxLC_EDIT_LABELS) ) { - m_renameTimer->Start( 100, true ); + if ( !InReportView() || + GetLineLabelRect(current).Contains(x, y) ) + { + int dclick = wxSystemSettings::GetMetric(wxSYS_DCLICK_MSEC); + m_renameTimer->Start(dclick > 0 ? dclick : 250, true); + } } } @@ -3077,7 +2557,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) else // !ctrl, !shift { // test in the enclosing if should make it impossible - wxFAIL_MSG( _T("how did we get here?") ); + wxFAIL_MSG( wxT("how did we get here?") ); } } @@ -3101,8 +2581,8 @@ void wxListMainWindow::MoveToItem(size_t item) const int hLine = GetLineHeight(); - int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL ); - int view_y = hLine * GetScrollPos( wxVERTICAL ); + int view_x = SCROLL_UNIT_X * GetListCtrl()->GetScrollPos( wxHORIZONTAL ); + int view_y = hLine * GetListCtrl()->GetScrollPos( wxVERTICAL ); if ( InReportView() ) { @@ -3111,17 +2591,66 @@ void wxListMainWindow::MoveToItem(size_t item) ResetVisibleLinesRange(); if (rect.y < view_y) - Scroll( -1, rect.y / hLine ); + GetListCtrl()->Scroll( -1, rect.y / hLine ); if (rect.y + rect.height + 5 > view_y + client_h) - Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine ); + GetListCtrl()->Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine ); + +#ifdef __WXMAC__ + // At least on Mac the visible lines value will get reset inside of + // Scroll *before* it actually scrolls the window because of the + // Update() that happens there, so it will still have the wrong value. + // So let's reset it again and wait for it to be recalculated in the + // next paint event. I would expect this problem to show up in wxGTK + // too but couldn't duplicate it there. Perhaps the order of events + // is different... --Robin + ResetVisibleLinesRange(); +#endif } else // !report { + int sx = -1, + sy = -1; + if (rect.x-view_x < 5) - Scroll( (rect.x - 5) / SCROLL_UNIT_X, -1 ); + sx = (rect.x - 5) / SCROLL_UNIT_X; if (rect.x + rect.width - 5 > view_x + client_w) - Scroll( (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X, -1 ); + sx = (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X; + + if (rect.y-view_y < 5) + sy = (rect.y - 5) / hLine; + if (rect.y + rect.height - 5 > view_y + client_h) + sy = (rect.y + rect.height - client_h + hLine) / hLine; + + GetListCtrl()->Scroll(sx, sy); + } +} + +bool wxListMainWindow::ScrollList(int WXUNUSED(dx), int dy) +{ + if ( !InReportView() ) + { + // TODO: this should work in all views but is not implemented now + return false; } + + size_t top, bottom; + GetVisibleLinesRange(&top, &bottom); + + if ( bottom == (size_t)-1 ) + return 0; + + ResetVisibleLinesRange(); + + int hLine = GetLineHeight(); + + GetListCtrl()->Scroll(-1, top + dy / hLine); + +#ifdef __WXMAC__ + // see comment in MoveToItem() for why we do this + ResetVisibleLinesRange(); +#endif + + return true; } // ---------------------------------------------------------------------------- @@ -3131,7 +2660,7 @@ void wxListMainWindow::MoveToItem(size_t item) void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) { wxCHECK_RET( newCurrent < (size_t)GetItemCount(), - _T("invalid item index in OnArrowChar()") ); + wxT("invalid item index in OnArrowChar()") ); size_t oldCurrent = m_current; @@ -3156,7 +2685,8 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) else // !shift { // all previously selected items are unselected unless ctrl is held - if ( !event.ControlDown() ) + // in a multiselection control + if ( !event.ControlDown() || IsSingleSel() ) HighlightAll(false); ChangeCurrent(newCurrent); @@ -3164,10 +2694,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) // refresh the old focus to remove it RefreshLine( oldCurrent ); - if ( !event.ControlDown() ) - { + // in single selection mode we must always have a selected item + if ( !event.ControlDown() || IsSingleSel() ) HighlightLine( m_current, true ); - } } RefreshLine( m_current ); @@ -3180,16 +2709,22 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event ) wxWindow *parent = GetParent(); // propagate the key event upwards - wxKeyEvent ke( wxEVT_KEY_DOWN ); - ke.m_shiftDown = event.m_shiftDown; - ke.m_controlDown = event.m_controlDown; - ke.m_altDown = event.m_altDown; - ke.m_metaDown = event.m_metaDown; - ke.m_keyCode = event.m_keyCode; - ke.m_x = event.m_x; - ke.m_y = event.m_y; + wxKeyEvent ke(event); ke.SetEventObject( parent ); - if (parent->GetEventHandler()->ProcessEvent( ke )) return; + if (parent->GetEventHandler()->ProcessEvent( ke )) + return; + + event.Skip(); +} + +void wxListMainWindow::OnKeyUp( wxKeyEvent &event ) +{ + wxWindow *parent = GetParent(); + + // propagate the key event upwards + wxKeyEvent ke(event); + if (parent->GetEventHandler()->ProcessEvent( ke )) + return; event.Skip(); } @@ -3209,29 +2744,25 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) parent->GetEventHandler()->ProcessEvent( le ); } - // propagate the char event upwards - wxKeyEvent ke( wxEVT_CHAR ); - ke.m_shiftDown = event.m_shiftDown; - ke.m_controlDown = event.m_controlDown; - ke.m_altDown = event.m_altDown; - ke.m_metaDown = event.m_metaDown; - ke.m_keyCode = event.m_keyCode; - ke.m_x = event.m_x; - ke.m_y = event.m_y; - ke.SetEventObject( parent ); - if (parent->GetEventHandler()->ProcessEvent( ke )) return; - - if (event.GetKeyCode() == WXK_TAB) + if ( (event.GetKeyCode() != WXK_UP) && + (event.GetKeyCode() != WXK_DOWN) && + (event.GetKeyCode() != WXK_RIGHT) && + (event.GetKeyCode() != WXK_LEFT) && + (event.GetKeyCode() != WXK_PAGEUP) && + (event.GetKeyCode() != WXK_PAGEDOWN) && + (event.GetKeyCode() != WXK_END) && + (event.GetKeyCode() != WXK_HOME) ) { - wxNavigationKeyEvent nevent; - nevent.SetWindowChange( event.ControlDown() ); - nevent.SetDirection( !event.ShiftDown() ); - nevent.SetEventObject( GetParent()->GetParent() ); - nevent.SetCurrentFocus( m_parent ); - if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) + // propagate the char event upwards + wxKeyEvent ke(event); + ke.SetEventObject( parent ); + if (parent->GetEventHandler()->ProcessEvent( ke )) return; } + if ( HandleAsNavigationKey(event) ) + return; + // no item -> nothing to do if (!HasCurrent()) { @@ -3241,7 +2772,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) // don't use m_linesPerPage directly as it might not be computed yet const int pageSize = GetCountPerPage(); - wxCHECK_RET( pageSize, _T("should have non zero page size") ); + wxCHECK_RET( pageSize, wxT("should have non zero page size") ); if (GetLayoutDirection() == wxLayout_RightToLeft) { @@ -3328,17 +2859,19 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) case WXK_SPACE: if ( IsSingleSel() ) { - SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); - - if ( IsHighlighted(m_current) ) + if ( event.ControlDown() ) + { + ReverseHighlight(m_current); + } + else // normal space press { - // don't unselect the item in single selection mode - break; + SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); } - //else: select it in ReverseHighlight() below if unselected } - - ReverseHighlight(m_current); + else // multiple selection + { + ReverseHighlight(m_current); + } break; case WXK_RETURN: @@ -3493,7 +3026,7 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item ) { wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_RET( node, _T("invalid column index in SetColumn") ); + wxCHECK_RET( node, wxT("invalid column index in SetColumn") ); if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER ) item.m_width = GetTextLength( item.m_text ); @@ -3514,18 +3047,19 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item ) void wxListMainWindow::SetColumnWidth( int col, int width ) { wxCHECK_RET( col >= 0 && col < GetColumnCount(), - _T("invalid column index") ); + wxT("invalid column index") ); wxCHECK_RET( InReportView(), - _T("SetColumnWidth() can only be called in report mode.") ); + wxT("SetColumnWidth() can only be called in report mode.") ); m_dirty = true; + wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; if ( headerWin ) headerWin->m_dirty = true; wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_RET( node, _T("no column?") ); + wxCHECK_RET( node, wxT("no column?") ); wxListHeaderData *column = node->GetData(); @@ -3534,6 +3068,19 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) if (width == wxLIST_AUTOSIZE_USEHEADER) { width = GetTextLength(column->GetText()); + width += 2*EXTRA_WIDTH; + + // check for column header's image availability + const int image = column->GetImage(); + if ( image != -1 ) + { + if ( m_small_image_list ) + { + int ix = 0, iy = 0; + m_small_image_list->GetSize(image, ix, iy); + width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; + } + } } else if ( width == wxLIST_AUTOSIZE ) { @@ -3557,7 +3104,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) wxListLineData *line = GetLine( i ); wxListItemDataList::compatibility_iterator n = line->m_items.Item( col ); - wxCHECK_RET( n, _T("no subitem?") ); + wxCHECK_RET( n, wxT("no subitem?") ); wxListItemData *itemData = n->GetData(); wxListItem item; @@ -3602,7 +3149,7 @@ int wxListMainWindow::GetHeaderWidth() const void wxListMainWindow::GetColumn( int col, wxListItem &item ) const { wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_RET( node, _T("invalid column index in GetColumn") ); + wxCHECK_RET( node, wxT("invalid column index in GetColumn") ); wxListHeaderData *column = node->GetData(); column->GetItem( item ); @@ -3611,7 +3158,7 @@ void wxListMainWindow::GetColumn( int col, wxListItem &item ) const int wxListMainWindow::GetColumnWidth( int col ) const { wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); - wxCHECK_MSG( node, 0, _T("invalid column index") ); + wxCHECK_MSG( node, 0, wxT("invalid column index") ); wxListHeaderData *column = node->GetData(); return column->GetWidth(); @@ -3625,7 +3172,7 @@ void wxListMainWindow::SetItem( wxListItem &item ) { long id = item.m_itemId; wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(), - _T("invalid item index in SetItem") ); + wxT("invalid item index in SetItem") ); if ( !IsVirtual() ) { @@ -3705,7 +3252,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask ) } wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(), - _T("invalid list ctrl item index in SetItem") ); + wxT("invalid list ctrl item index in SetItem") ); size_t oldCurrent = m_current; size_t item = (size_t)litem; // safe because of the check above @@ -3793,7 +3340,7 @@ void wxListMainWindow::SetItemState( long litem, long state, 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()") ); + wxT("invalid list ctrl item index in GetItemState()") ); int ret = wxLIST_STATE_DONTCARE; @@ -3815,7 +3362,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask ) const void wxListMainWindow::GetItem( wxListItem &item ) const { wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(), - _T("invalid item index in GetItem") ); + wxT("invalid item index in GetItem") ); wxListLineData *line = GetLine((size_t)item.m_itemId); line->GetItem( item.m_col, item ); @@ -3875,8 +3422,7 @@ int wxListMainWindow::GetSelectedItemCount() const wxRect wxListMainWindow::GetViewRect() const { - wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST), - _T("wxListCtrl::GetViewRect() only works in icon mode") ); + wxASSERT_MSG( !HasFlag(wxLC_LIST), "not implemented for list view" ); // we need to find the longest/tallest label wxCoord xMax = 0, yMax = 0; @@ -3885,8 +3431,9 @@ wxRect wxListMainWindow::GetViewRect() const { for ( int i = 0; i < count; i++ ) { - wxRect r; - GetItemRect(i, r); + // we need logical, not physical, coordinates here, so use + // GetLineRect() instead of GetItemRect() + wxRect r = GetLineRect(i); wxCoord x = r.GetRight(), y = r.GetBottom(); @@ -3912,10 +3459,14 @@ wxRect wxListMainWindow::GetViewRect() const return wxRect(0, 0, xMax, yMax); } -void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const +bool +wxListMainWindow::GetSubItemRect(long item, long subItem, wxRect& rect) const { - wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(), - _T("invalid index in GetItemRect") ); + wxCHECK_MSG( subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM || InReportView(), + false, + wxT("GetSubItemRect only meaningful in report view") ); + wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), false, + wxT("invalid item in GetSubItemRect") ); // ensure that we're laid out, otherwise we could return nonsense if ( m_dirty ) @@ -3924,9 +3475,24 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const RecalculatePositions(true /* no refresh */); } - rect = GetLineRect((size_t)index); + rect = GetLineRect((size_t)item); + + // Adjust rect to specified column + if ( subItem != wxLIST_GETSUBITEMRECT_WHOLEITEM ) + { + wxCHECK_MSG( subItem >= 0 && subItem < GetColumnCount(), false, + wxT("invalid subItem in GetSubItemRect") ); + + for (int i = 0; i < subItem; i++) + { + rect.x += GetColumnWidth(i); + } + rect.width = GetColumnWidth(subItem); + } + + GetListCtrl()->CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y); - CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y); + return true; } bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const @@ -3954,9 +3520,9 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) const size_t count = GetItemCount(); int iconSpacing; - if ( HasFlag(wxLC_ICON) ) + if ( HasFlag(wxLC_ICON) && m_normal_image_list ) iconSpacing = m_normal_spacing; - else if ( HasFlag(wxLC_SMALL_ICON) ) + else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list ) iconSpacing = m_small_spacing; else iconSpacing = 0; @@ -3990,11 +3556,11 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) ResetVisibleLinesRange(); - SetScrollbars( SCROLL_UNIT_X, lineHeight, + GetListCtrl()->SetScrollbars( SCROLL_UNIT_X, lineHeight, GetHeaderWidth() / SCROLL_UNIT_X, (entireHeight + lineHeight - 1) / lineHeight, - GetScrollPos(wxHORIZONTAL), - GetScrollPos(wxVERTICAL), + GetListCtrl()->GetScrollPos(wxHORIZONTAL), + GetListCtrl()->GetScrollPos(wxVERTICAL), true ); } else // !report @@ -4043,14 +3609,14 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) } } - SetScrollbars + GetListCtrl()->SetScrollbars ( SCROLL_UNIT_X, lineHeight, (x + SCROLL_UNIT_X) / SCROLL_UNIT_X, (y + lineHeight) / lineHeight, - GetScrollPos( wxHORIZONTAL ), - GetScrollPos( wxVERTICAL ), + GetListCtrl()->GetScrollPos( wxHORIZONTAL ), + GetListCtrl()->GetScrollPos( wxVERTICAL ), true ); } @@ -4124,13 +3690,13 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) } } - SetScrollbars + GetListCtrl()->SetScrollbars ( SCROLL_UNIT_X, lineHeight, (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X, 0, - GetScrollPos( wxHORIZONTAL ), + GetListCtrl()->GetScrollPos( wxHORIZONTAL ), 0, true ); @@ -4172,7 +3738,7 @@ long wxListMainWindow::GetNextItem( long item, long ret = item, max = GetItemCount(); wxCHECK_MSG( (ret == -1) || (ret < max), -1, - _T("invalid listctrl index in GetNextItem()") ); + wxT("invalid listctrl index in GetNextItem()") ); // notice that we start with the next item (or the first one if item == -1) // and this is intentional to allow writing a simple loop to iterate over @@ -4209,7 +3775,7 @@ void wxListMainWindow::DeleteItem( long lindex ) size_t count = GetItemCount(); wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count), - _T("invalid item index in DeleteItem") ); + wxT("invalid item index in DeleteItem") ); size_t index = (size_t)lindex; @@ -4225,8 +3791,8 @@ void wxListMainWindow::DeleteItem( long lindex ) if ( InReportView() ) { - // mark the Column Max Width cache as dirty if the items in the line - // we're deleting contain the Max Column Width + // mark the Column Max Width cache as dirty if the items in the line + // we're deleting contain the Max Column Width wxListLineData * const line = GetLine(index); wxListItemDataList::compatibility_iterator n; wxListItemData *itemData; @@ -4248,6 +3814,8 @@ void wxListMainWindow::DeleteItem( long lindex ) ResetVisibleLinesRange(); } + SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition ); + if ( IsVirtual() ) { m_countVirt--; @@ -4261,8 +3829,6 @@ void wxListMainWindow::DeleteItem( long lindex ) // 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); } @@ -4355,7 +3921,7 @@ void wxListMainWindow::DeleteEverything() void wxListMainWindow::EnsureVisible( long index ) { wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(), - _T("invalid index in EnsureVisible") ); + wxT("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 @@ -4365,10 +3931,13 @@ void wxListMainWindow::EnsureVisible( long index ) MoveToItem((size_t)index); } -long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) ) +long wxListMainWindow::FindItem(long start, const wxString& str, bool partial ) { + if (str.empty()) + return wxNOT_FOUND; + long pos = start; - wxString tmp = str; + wxString str_upper = str.Upper(); if (pos < 0) pos = 0; @@ -4376,8 +3945,17 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p for ( size_t i = (size_t)pos; i < count; i++ ) { wxListLineData *line = GetLine(i); - if ( line->GetText(0) == tmp ) - return i; + wxString line_upper = line->GetText(0).Upper(); + if (!partial) + { + if (line_upper == str_upper ) + return i; + } + else + { + if (line_upper.find(str_upper) == 0) + return i; + } } return wxNOT_FOUND; @@ -4421,7 +3999,7 @@ long wxListMainWindow::FindItem( const wxPoint& pt ) long wxListMainWindow::HitTest( int x, int y, int &flags ) const { - CalcUnscrolledPosition( x, y, &x, &y ); + GetListCtrl()->CalcUnscrolledPosition( x, y, &x, &y ); size_t count = GetItemCount(); @@ -4456,10 +4034,10 @@ long wxListMainWindow::HitTest( int x, int y, int &flags ) const void wxListMainWindow::InsertItem( wxListItem &item ) { - wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") ); + wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual control") ); int count = GetItemCount(); - wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") ); + wxCHECK_RET( item.m_itemId >= 0, wxT("invalid item index") ); if (item.m_itemId > count) item.m_itemId = count; @@ -4571,8 +4149,8 @@ int wxListMainWindow::GetItemWidthWithImage(wxListItem * item) // sorting // ---------------------------------------------------------------------------- -wxListCtrlCompare list_ctrl_compare_func_2; -long list_ctrl_compare_data; +static wxListCtrlCompare list_ctrl_compare_func_2; +static wxIntPtr list_ctrl_compare_data; int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 ) { @@ -4586,8 +4164,13 @@ int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data ); } -void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) +void wxListMainWindow::SortItems( wxListCtrlCompare fn, wxIntPtr data ) { + // selections won't make sense any more after sorting the items so reset + // them + HighlightAll(false); + ResetCurrent(); + list_ctrl_compare_func_2 = fn; list_ctrl_compare_data = data; m_lines.Sort( list_ctrl_compare_func_1 ); @@ -4604,20 +4187,16 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event) // next time ResetVisibleLinesRange(); - // FIXME -#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__) - wxScrolledWindow::OnScroll(event); -#else - HandleOnScroll( event ); -#endif - if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() ) { wxGenericListCtrl* lc = GetListCtrl(); - wxCHECK_RET( lc, _T("no listctrl window?") ); + wxCHECK_RET( lc, wxT("no listctrl window?") ); - lc->m_headerWin->Refresh(); - lc->m_headerWin->Update(); + if (lc->m_headerWin) // when we use wxLC_NO_HEADER, m_headerWin==NULL + { + lc->m_headerWin->Refresh(); + lc->m_headerWin->Update(); + } } } @@ -4634,14 +4213,14 @@ int wxListMainWindow::GetCountPerPage() const void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to) { - wxASSERT_MSG( InReportView(), _T("this is for report mode only") ); + wxASSERT_MSG( InReportView(), wxT("this is for report mode only") ); if ( m_lineFrom == (size_t)-1 ) { size_t count = GetItemCount(); if ( count ) { - m_lineFrom = GetScrollPos(wxVERTICAL); + m_lineFrom = GetListCtrl()->GetScrollPos(wxVERTICAL); // this may happen if SetScrollbars() hadn't been called yet if ( m_lineFrom >= count ) @@ -4662,7 +4241,7 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to) wxASSERT_MSG( IsEmpty() || (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()), - _T("GetVisibleLinesRange() returns incorrect result") ); + wxT("GetVisibleLinesRange() returns incorrect result") ); if ( from ) *from = m_lineFrom; @@ -4678,21 +4257,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl) BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl) EVT_SIZE(wxGenericListCtrl::OnSize) + EVT_SCROLLWIN(wxGenericListCtrl::OnScroll) END_EVENT_TABLE() -wxGenericListCtrl::wxGenericListCtrl() +void wxGenericListCtrl::Init() { - m_imageListNormal = (wxImageList *) NULL; - m_imageListSmall = (wxImageList *) NULL; - m_imageListState = (wxImageList *) NULL; + m_imageListNormal = NULL; + m_imageListSmall = NULL; + m_imageListState = NULL; m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false; - m_mainWin = (wxListMainWindow*) NULL; - m_headerWin = (wxListHeaderWindow*) NULL; - m_headerHeight = 0; + m_mainWin = NULL; + m_headerWin = NULL; + m_headerHeight = wxRendererNative::Get().GetHeaderButtonHeight(this); } wxGenericListCtrl::~wxGenericListCtrl() @@ -4705,43 +4285,40 @@ wxGenericListCtrl::~wxGenericListCtrl() delete m_imageListState; } -void wxGenericListCtrl::CalculateAndSetHeaderHeight() +void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded() { - if ( m_headerWin ) - { -#ifdef __WXMAC__ - SInt32 h; - GetThemeMetric( kThemeMetricListHeaderHeight, &h ); -#else - // we use 'g' to get the descent, too - int w, h, d; - m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d); - h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT; -#endif - - // only update if changed - if ( h != m_headerHeight ) - { - m_headerHeight = h; + bool needs_header = HasHeader(); + bool has_header = (m_headerWin != NULL); - if ( HasHeader() ) - ResizeReportView(true); - else //why is this needed if it doesn't have a header? - m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight); - } - } -} + if (needs_header == has_header) + return; -void wxGenericListCtrl::CreateHeaderWindow() -{ - m_headerWin = new wxListHeaderWindow + if (needs_header) + { + m_headerWin = new wxListHeaderWindow ( this, wxID_ANY, m_mainWin, wxPoint(0,0), wxSize(GetClientSize().x, m_headerHeight), wxTAB_TRAVERSAL ); - CalculateAndSetHeaderHeight(); + +#if defined( __WXMAC__ ) + wxFont font; + font.CreateSystemFont( wxOSX_SYSTEM_FONT_SMALL ); + m_headerWin->SetFont( font ); +#endif + + GetSizer()->Prepend( m_headerWin, 0, wxGROW ); + } + else + { + GetSizer()->Detach( m_headerWin ); + + delete m_headerWin; + + m_headerWin = NULL; + } } bool wxGenericListCtrl::Create(wxWindow *parent, @@ -4752,69 +4329,85 @@ bool wxGenericListCtrl::Create(wxWindow *parent, const wxValidator &validator, const wxString &name) { - m_imageListNormal = - m_imageListSmall = - m_imageListState = (wxImageList *) NULL; - m_ownsImageListNormal = - m_ownsImageListSmall = - m_ownsImageListState = false; - - m_mainWin = (wxListMainWindow*) NULL; - m_headerWin = (wxListHeaderWindow*) NULL; - - m_headerHeight = 0; + Init(); - if ( !(style & wxLC_MASK_TYPE) ) - { - style = style | wxLC_LIST; - } + // just like in other ports, an assert will fail if the user doesn't give any type style: + wxASSERT_MSG( (style & wxLC_MASK_TYPE), + wxT("wxListCtrl style should have exactly one mode bit set") ); - if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) + if ( !wxControl::Create( parent, id, pos, size, style|wxVSCROLL|wxHSCROLL, validator, name ) ) return false; - // don't create the inner window with the border +#ifdef __WXGTK__ style &= ~wxBORDER_MASK; + style |= wxBORDER_THEME; +#endif m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style ); -#ifdef __WXMAC_CARBON__ - // Human Interface Guidelines ask us for a special font in this case - if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ) + SetTargetWindow( m_mainWin ); + + wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); + sizer->Add( m_mainWin, 1, wxGROW ); + SetSizer( sizer ); + + CreateOrDestroyHeaderWindowAsNeeded(); + + SetInitialSize(size); + + return true; +} + +wxBorder wxGenericListCtrl::GetDefaultBorder() const +{ + return wxBORDER_THEME; +} + +#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__) +WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg, + WXWPARAM wParam, + WXLPARAM lParam) +{ + WXLRESULT rc = wxControl::MSWWindowProc(nMsg, wParam, lParam); + + // we need to process arrows ourselves for scrolling + if ( nMsg == WM_GETDLGCODE ) { - wxFont font; - font.MacCreateThemeFont( kThemeViewsFont ); - SetFont( font ); + rc |= DLGC_WANTARROWS; } -#endif - if ( InReportView() ) - { - CreateHeaderWindow(); + return rc; +} +#endif // __WXMSW__ -#ifdef __WXMAC_CARBON__ - if (m_headerWin) - { - wxFont font; - font.MacCreateThemeFont( kThemeSmallSystemFont ); - m_headerWin->SetFont( font ); - CalculateAndSetHeaderHeight(); - } -#endif +wxSize wxGenericListCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) +{ + wxSize newsize = size; + if (m_headerWin) + newsize.y -= m_headerWin->GetSize().y; - if ( HasFlag(wxLC_NO_HEADER) ) - // VZ: why do we create it at all then? - m_headerWin->Show( false ); - } + return newsize; +} - SetBestSize(size); +void wxGenericListCtrl::OnScroll(wxScrollWinEvent& event) +{ + // update our idea of which lines are shown when we redraw + // the window the next time + m_mainWin->ResetVisibleLinesRange(); - return true; + HandleOnScroll( event ); + + if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() ) + { + m_headerWin->Refresh(); + m_headerWin->Update(); + } } void wxGenericListCtrl::SetSingleStyle( long style, bool add ) { wxASSERT_MSG( !(style & wxLC_VIRTUAL), - _T("wxLC_VIRTUAL can't be [un]set") ); + wxT("wxLC_VIRTUAL can't be [un]set") ); long flag = GetWindowStyle(); @@ -4833,45 +4426,28 @@ void wxGenericListCtrl::SetSingleStyle( long style, bool add ) else flag &= ~style; - SetWindowStyleFlag( flag ); + // some styles can be set without recreating everything (as happens in + // SetWindowStyleFlag() which calls wxListMainWindow::DeleteEverything()) + if ( !(style & ~(wxLC_HRULES | wxLC_VRULES)) ) + { + Refresh(); + wxWindow::SetWindowStyleFlag(flag); + } + else + { + SetWindowStyleFlag( flag ); + } } void wxGenericListCtrl::SetWindowStyleFlag( long flag ) { if (m_mainWin) { - m_mainWin->DeleteEverything(); + // m_mainWin->DeleteEverything(); wxMSW doesn't do that - // has the header visibility changed? - bool hasHeader = HasHeader(); - bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER); - - if ( hasHeader != willHaveHeader ) - { - // 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) - { - CreateHeaderWindow(); - } - else // already have it, just show - { - m_headerWin->Show( true ); - } - } + CreateOrDestroyHeaderWindowAsNeeded(); - ResizeReportView(willHaveHeader); - } + GetSizer()->Layout(); } wxWindow::SetWindowStyleFlag( flag ); @@ -4982,7 +4558,7 @@ wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const return info.m_data; } -bool wxGenericListCtrl::SetItemData( long item, long data ) +bool wxGenericListCtrl::SetItemPtrData( long item, wxUIntPtr data ) { wxListItem info; info.m_mask = wxLIST_MASK_DATA; @@ -4997,11 +4573,22 @@ wxRect wxGenericListCtrl::GetViewRect() const return m_mainWin->GetViewRect(); } -bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const +bool wxGenericListCtrl::GetItemRect(long item, wxRect& rect, int code) const +{ + return GetSubItemRect(item, wxLIST_GETSUBITEMRECT_WHOLEITEM, rect, code); +} + +bool wxGenericListCtrl::GetSubItemRect(long item, + long subItem, + wxRect& rect, + int WXUNUSED(code)) const { - m_mainWin->GetItemRect( item, rect ); + if ( !m_mainWin->GetSubItemRect( item, subItem, rect ) ) + return false; + if ( m_mainWin->HasHeader() ) rect.y += m_headerHeight + 1; + return true; } @@ -5013,7 +4600,7 @@ bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) ) { - return 0; + return false; } int wxGenericListCtrl::GetItemCount() const @@ -5129,7 +4716,7 @@ wxImageList *wxGenericListCtrl::GetImageList(int which) const else if (which == wxIMAGE_LIST_STATE) return m_imageListState; - return (wxImageList *) NULL; + return NULL; } void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which ) @@ -5205,8 +4792,8 @@ 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 */); + // if ( !GetColumnCount() ) + return true; } @@ -5285,16 +4872,14 @@ long wxGenericListCtrl::InsertItem( long index, const wxString &label, int image long wxGenericListCtrl::InsertColumn( long col, wxListItem &item ) { - wxCHECK_MSG( m_headerWin, -1, _T("can't add column in non report mode") ); + wxCHECK_MSG( InReportView(), -1, wxT("can't add column in non report mode") ); m_mainWin->InsertColumn( col, item ); - // if we hadn't had a header before but have one now - // then we need to relayout the window - if ( GetColumnCount() == 1 && m_mainWin->HasHeader() ) - ResizeReportView(true /* have header */); - - m_headerWin->Refresh(); + // NOTE: if wxLC_NO_HEADER was given, then we are in report view mode but + // still have m_headerWin==NULL + if (m_headerWin) + m_headerWin->Refresh(); return 0; } @@ -5316,9 +4901,9 @@ long wxGenericListCtrl::InsertColumn( long col, const wxString &heading, return InsertColumn( col, item ); } -bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) +bool wxGenericListCtrl::ScrollList( int dx, int dy ) { - return 0; + return m_mainWin->ScrollList(dx, dy); } // Sort items. @@ -5331,7 +4916,7 @@ bool wxGenericListCtrl::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 wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data ) +bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, wxIntPtr data ) { m_mainWin->SortItems( fn, data ); return true; @@ -5343,43 +4928,28 @@ bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data ) void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) { - if ( !m_mainWin ) - return; + if (!m_mainWin) return; - ResizeReportView(m_mainWin->HasHeader()); - m_mainWin->RecalculatePositions(); -} + // We need to override OnSize so that our scrolled + // window a) does call Layout() to use sizers for + // positioning the controls but b) does not query + // the sizer for their size and use that for setting + // the scrollable area as set that ourselves by + // calling SetScrollbar() further down. -void wxGenericListCtrl::ResizeReportView(bool showHeader) -{ - int cw, ch; - GetClientSize( &cw, &ch ); + Layout(); - if ( showHeader ) - { - m_headerWin->SetSize( 0, 0, cw, m_headerHeight ); - if(ch > m_headerHeight) - m_mainWin->SetSize( 0, m_headerHeight + 1, - cw, ch - m_headerHeight - 1 ); - else - m_mainWin->SetSize( 0, m_headerHeight + 1, - cw, 0); - } - else // no header window - { - m_mainWin->SetSize( 0, 0, cw, ch ); - } + m_mainWin->RecalculatePositions(); + + AdjustScrollbars(); } void wxGenericListCtrl::OnInternalIdle() { wxWindow::OnInternalIdle(); - // do it only if needed - if ( !m_mainWin->m_dirty ) - return; - - m_mainWin->RecalculatePositions(); + if (m_mainWin->m_dirty) + m_mainWin->RecalculatePositions(); } // ---------------------------------------------------------------------------- @@ -5428,7 +4998,7 @@ bool wxGenericListCtrl::SetFont( const wxFont &font ) if (m_headerWin) { m_headerWin->SetFont( font ); - CalculateAndSetHeaderHeight(); + // CalculateAndSetHeaderHeight(); } Refresh(); @@ -5446,7 +5016,7 @@ wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant) #else wxUnusedVar(variant); wxVisualAttributes attr; - attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT); attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); return attr; @@ -5529,7 +5099,7 @@ wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col { // 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") ); + wxFAIL_MSG( wxT("wxGenericListCtrl::OnGetItemText not supposed to be called") ); return wxEmptyString; } @@ -5554,7 +5124,7 @@ wxListItemAttr * wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const { wxASSERT_MSG( item >= 0 && item < GetItemCount(), - _T("invalid item index in OnGetItemAttr()") ); + wxT("invalid item index in OnGetItemAttr()") ); // no attributes by default return NULL; @@ -5562,7 +5132,7 @@ wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const void wxGenericListCtrl::SetItemCount(long count) { - wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") ); + wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") ); m_mainWin->SetItemCount(count); } @@ -5626,14 +5196,18 @@ void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect) } } -void wxGenericListCtrl::Freeze() +void wxGenericListCtrl::Update() { - m_mainWin->Freeze(); -} + if ( m_mainWin ) + { + if ( m_mainWin->m_dirty ) + m_mainWin->RecalculatePositions(); -void wxGenericListCtrl::Thaw() -{ - m_mainWin->Thaw(); + m_mainWin->Update(); + } + + if ( m_headerWin ) + m_headerWin->Update(); } #endif // wxUSE_LISTCTRL