// 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".
#include "wx/listctrl.h"
-#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)
- IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
- IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
-#endif
-
#ifndef WX_PRECOMP
#include "wx/scrolwin.h"
#include "wx/timer.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/osx/private.h"
- // for themeing support
- #include <Carbon/Carbon.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.
// the space between the image and the text in the report mode in header
static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
-// ============================================================================
-// 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;
- }
-};
-
-WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
-
-//-----------------------------------------------------------------------------
-// wxListItemData (internal)
-//-----------------------------------------------------------------------------
-
-class 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 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 SetState( int state );
- 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;
- int GetState() 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;
- int m_state;
-
-private:
- void Init();
-};
-
-//-----------------------------------------------------------------------------
-// wxListLineData (internal)
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// arrays/list implementations
+// ----------------------------------------------------------------------------
-WX_DECLARE_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_OBJARRAY(wxListLineData, wxListLineDataArray);
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxListLineDataArray)
-//-----------------------------------------------------------------------------
-// wxListHeaderWindow (internal)
-//-----------------------------------------------------------------------------
-
-class 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;
-
- // Update main window's column later
- bool m_sendSetColumnWidth;
- int m_colToSend;
- int m_widthToSend;
-
- virtual void OnInternalIdle();
-
-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_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxListRenameTimer (internal)
-//-----------------------------------------------------------------------------
-
-class 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 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 EndEdit( bool discardChanges );
-
-protected:
- void OnChar( wxKeyEvent &event );
- void OnKeyUp( wxKeyEvent &event );
- void OnKillFocus( wxFocusEvent &event );
-
- bool AcceptChanges();
- void Finish( bool setfocus );
-
-private:
- wxListMainWindow *m_owner;
- wxTextCtrl *m_text;
- wxString m_startValue;
- size_t m_itemEdited;
- bool m_aboutToFinish;
-
- DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxListMainWindow (internal)
-//-----------------------------------------------------------------------------
-
-WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListHeaderDataList)
-class wxListMainWindow : public wxWindow
-{
-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);
-
- bool ScrollList( int WXUNUSED(dx), int dy );
-
- // 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 ResetTextControl(wxTextCtrl *text)
- {
- delete text;
- m_textctrlWrapper = NULL;
- }
-
- 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 OnKeyUp( wxKeyEvent &event );
- void OnSetFocus( wxFocusEvent &event );
- void OnKillFocus( wxFocusEvent &event );
- void OnScroll( wxScrollWinEvent& event );
-
- void OnPaint( wxPaintEvent &event );
-
- void OnChildFocus(wxChildFocusEvent& 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;
- bool GetItemRect( long item, wxRect &rect ) const
- {
- return GetSubItemRect(item, wxLIST_GETSUBITEMRECT_WHOLEITEM, rect);
- }
- bool GetSubItemRect( long item, long subItem, 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 ( !wxWindow::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;
- }
-
- bool HasFocus() const
- {
- return m_hasFocus;
- }
-
-//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;
-
- // wrapper around the text control currently used for in place editing or
- // NULL if no item is being edited
- wxListTextCtrlWrapper *m_textctrlWrapper;
-
-
- DECLARE_EVENT_TABLE()
-
- friend class wxGenericListCtrl;
-};
+// ----------------------------------------------------------------------------
+// wxListItemData
+// ----------------------------------------------------------------------------
wxListItemData::~wxListItemData()
{
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;
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;
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;
}
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();
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;
}
}
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();
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;
}
}
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 );
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);
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();
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();
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);
}
-bool wxListLineData::SetAttributes(wxDC *dc,
- const wxListItemAttr *attr,
- bool highlighted)
+void wxListLineData::ApplyAttributes(wxDC *dc,
+ const wxRect& rectHL,
+ bool highlighted,
+ bool current)
{
- wxWindow *listctrl = m_owner->GetParent();
+ const wxListItemAttr * const attr = GetAttr();
+
+ wxWindow * const listctrl = m_owner->GetParent();
+
+ const bool hasFocus = listctrl->HasFocus()
+#if defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
+ && IsControlActive( (ControlRef)listctrl->GetHandle() )
+#endif
+ ;
// fg colour
// 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
- )
+#ifdef __WXMAC__
+ if ( hasFocus )
colText = *wxWHITE;
else
colText = *wxBLACK;
- }
#else
- colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ if ( hasFocus )
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ else
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
#endif
+ }
else if ( attr && attr->HasTextColour() )
colText = attr->GetTextColour();
else
dc->SetFont(font);
- // bg colour
- bool hasBgCol = attr && attr->HasBackgroundColour();
- if ( highlighted || hasBgCol )
- {
- if ( highlighted )
- dc->SetBrush( *m_owner->GetHighlightBrush() );
- else
- dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
-
- dc->SetPen( *wxTRANSPARENT_PEN );
-
- return true;
- }
-
- return false;
-}
-
-void wxListLineData::Draw( wxDC *dc )
-{
- wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
- wxCHECK_RET( node, _T("no subitems at all??") );
-
- bool highlighted = IsHighlighted();
-
- wxListItemAttr *attr = GetAttr();
-
- if ( SetAttributes(dc, attr, highlighted) )
-#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) )
+ // background
+ if ( highlighted )
{
- dc->DrawRectangle( m_gi->m_rectHighlight );
+ // Use the renderer method to ensure that the selected items use the
+ // native look.
+ int flags = wxCONTROL_SELECTED;
+ if ( hasFocus )
+ flags |= wxCONTROL_FOCUSED;
+ if (current)
+ flags |= wxCONTROL_CURRENT;
+ wxRendererNative::Get().
+ DrawItemSelectionRect( m_owner, *dc, rectHL, flags );
}
-#else
+ else if ( attr && attr->HasBackgroundColour() )
{
- 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 );
- }
+ // Draw the background using the items custom background colour.
+ dc->SetBrush(attr->GetBackgroundColour());
+ dc->SetPen(*wxTRANSPARENT_PEN);
+ dc->DrawRectangle(rectHL);
}
-#endif
// just for debugging to better see where the items are
#if 0
dc->SetPen(*wxGREEN_PEN);
dc->DrawRectangle( m_gi->m_rectIcon );
#endif
+}
+
+void wxListLineData::Draw(wxDC *dc, bool current)
+{
+ wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+ wxCHECK_RET( node, wxT("no subitems at all??") );
+
+ ApplyAttributes(dc, m_gi->m_rectHighlight, IsHighlighted(), current);
wxListItemData *item = node->GetData();
if (item->HasImage())
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 );
- }
-#else
- {
- if (highlighted)
- {
- int flags = wxCONTROL_SELECTED;
- if (m_owner->HasFocus())
- flags |= wxCONTROL_FOCUSED;
- wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, rectHL, flags );
- }
- else
- {
- dc->DrawRectangle( rectHL );
- }
- }
-#endif
+
+ ApplyAttributes(dc, rectHL, highlighted, current);
wxCoord x = rect.x + HEADER_OFFSET_X,
yMid = rect.y + rect.height/2;
int xOld = x;
x += width;
- const int wText = width - 8;
+ width -= 8;
+ const int wText = width;
wxDCClipper clipper(*dc, xOld, rect.y, wText, rect.height);
if ( item->HasImage() )
}
if ( item->HasText() )
- DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, wText);
+ DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, 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(_T("\n"), _T(" "));
+ text.Replace(wxT("\n"), wxT(" "));
wxCoord w, h;
dc->GetTextExtent(text, &w, &h);
break;
default:
- wxFAIL_MSG( _T("unknown list item format") );
+ wxFAIL_MSG( wxT("unknown list item format") );
break;
}
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;
// 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
+// defined this only for wxMac. If this behaviour 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) &&
wxImageList *imageList;
if ( image != -1 )
{
- imageList = m_owner->m_small_image_list;
+ imageList = m_owner->GetSmallImageList();
if ( imageList )
{
imageList->GetSize(image, ix, iy);
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:
// 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 );
+ wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h);
// if we have an image, draw it on the right of the label
if ( imageList )
image,
dc,
xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,
- HEADER_OFFSET_Y + (h - 4 - iy)/2,
+ HEADER_OFFSET_Y + (h - iy)/2,
wxIMAGELIST_DRAW_TRANSPARENT
);
}
dc.DrawText( item.GetText(),
- xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
+ xAligned + EXTRA_WIDTH, (h - hLabel) / 2 );
x += wCol;
}
wxScreenDC dc;
dc.SetLogicalFunction( wxINVERT );
- dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
+ dc.SetPen( wxPen(*wxBLACK, 2) );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
AdjustDC(dc);
m_text->PushEventHandler(this);
}
-void wxListTextCtrlWrapper::EndEdit(bool discardChanges)
+void wxListTextCtrlWrapper::EndEdit(EndReason reason)
{
m_aboutToFinish = true;
- if ( discardChanges )
+ switch ( reason )
{
- m_owner->OnRenameCancelled(m_itemEdited);
+ case End_Accept:
+ // Notify the owner about the changes
+ AcceptChanges();
- Finish( true );
- }
- else
- {
- // Notify the owner about the changes
- AcceptChanges();
+ // Even if vetoed, close the control (consistent with MSW)
+ Finish( true );
+ break;
+
+ case End_Discard:
+ m_owner->OnRenameCancelled(m_itemEdited);
+
+ Finish( true );
+ break;
- // Even if vetoed, close the control (consistent with MSW)
- Finish( true );
+ case End_Destroy:
+ // Don't generate any notifications for the control being destroyed
+ // and don't set focus to it neither.
+ Finish(false);
+ break;
}
}
switch ( event.m_keyCode )
{
case WXK_RETURN:
- EndEdit( false );
+ EndEdit( End_Accept );
break;
case WXK_ESCAPE:
- EndEdit( true );
+ EndEdit( End_Discard );
break;
default:
wxPoint myPos = m_text->GetPosition();
wxSize mySize = m_text->GetSize();
int sx, sy;
- m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &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)
// wxListMainWindow
//-----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledCanvas)
+BEGIN_EVENT_TABLE(wxListMainWindow, wxWindow)
EVT_PAINT (wxListMainWindow::OnPaint)
EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse)
EVT_CHAR (wxListMainWindow::OnChar)
wxListMainWindow::~wxListMainWindow()
{
+ if ( m_textctrlWrapper )
+ m_textctrlWrapper->EndEdit(wxListTextCtrlWrapper::End_Destroy);
+
DoDeleteAllItems();
WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
WX_CLEAR_ARRAY(m_aColWidths);
delete m_renameTimer;
}
+void wxListMainWindow::SetReportView(bool inReportView)
+{
+ const size_t count = m_lines.size();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ m_lines[n].SetReportView(inReportView);
+ }
+}
+
void wxListMainWindow::CacheLineData(size_t line)
{
wxGenericListCtrl *listctrl = GetListCtrl();
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);
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() )
{
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();
}
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;
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);
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();
}
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);
}
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() )
{
GetLine(line)->DrawInReportMode( &dc,
rectLine,
GetLineHighlightRect(line),
- IsHighlighted(line) );
+ IsHighlighted(line),
+ line == m_current );
}
if ( HasFlag(wxLC_HRULES) )
size_t count = GetItemCount();
for ( size_t i = 0; i < count; i++ )
{
- GetLine(i)->Draw( &dc );
+ GetLine(i)->Draw( &dc, i == m_current );
}
}
+ // DrawFocusRect() is unusable under Mac, it draws outside of the highlight
+ // rectangle somehow and so leaves traces when the item is not selected any
+ // more, see #12229.
#ifndef __WXMAC__
- // Don't draw rect outline under Mac at all.
if ( HasCurrent() )
{
- if ( m_hasFocus )
- {
- wxRect rect( GetLineHighlightRect( m_current ) );
-#ifndef __WXGTK20__
- dc.SetPen( *wxBLACK_PEN );
- dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawRectangle( rect );
-#else
- wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, wxCONTROL_CURRENT|wxCONTROL_FOCUSED );
+ int flags = 0;
+ if ( IsHighlighted(m_current) )
+ flags |= wxCONTROL_SELECTED;
-#endif
- }
+ wxRendererNative::Get().
+ DrawFocusRect(this, dc, GetLineHighlightRect(m_current), flags);
}
-#endif
+#endif // !__WXMAC__
}
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) )
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() )
// 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
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;
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 );
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->EndEdit( false );
+ m_textctrlWrapper->EndEdit(wxListTextCtrlWrapper::End_Accept);
#endif // __WXMAC__
if ( event.LeftDown() )
if (event.GetEventType() == wxEVT_MOUSEWHEEL)
{
- // let the base handle mouse wheel events.
+ // let the base class handle mouse wheel events.
event.Skip();
return;
}
{
SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
- wxContextMenuEvent evtCtx(
- wxEVT_CONTEXT_MENU,
- GetParent()->GetId(),
- ClientToScreen(event.GetPosition()));
+ wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
+ GetParent()->GetId(),
+ ClientToScreen(event.GetPosition()));
evtCtx.SetEventObject(GetParent());
GetParent()->GetEventHandler()->ProcessEvent(evtCtx);
}
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?") );
}
}
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() )
{
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;
if (parent->GetEventHandler()->ProcessEvent( ke ))
return;
+ // send a list event
+ wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, parent->GetId() );
+ le.m_itemIndex = m_current;
+ if (HasCurrent())
+ GetLine(m_current)->GetItem( 0, le.m_item );
+ le.m_code = event.GetKeyCode();
+ le.SetEventObject( parent );
+ if (parent->GetEventHandler()->ProcessEvent( le ))
+ return;
+
event.Skip();
}
{
wxWindow *parent = GetParent();
- // send a list_key event up
- if ( HasCurrent() )
- {
- wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
- le.m_itemIndex = m_current;
- GetLine(m_current)->GetItem( 0, le.m_item );
- le.m_code = event.GetKeyCode();
- le.SetEventObject( parent );
- parent->GetEventHandler()->ProcessEvent( le );
- }
-
- 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) )
- {
- // propagate the char event upwards
- wxKeyEvent ke(event);
- ke.SetEventObject( parent );
- if (parent->GetEventHandler()->ProcessEvent( ke ))
- return;
- }
+ // propagate the char event upwards
+ wxKeyEvent ke(event);
+ ke.SetEventObject( parent );
+ if (parent->GetEventHandler()->ProcessEvent( ke ))
+ return;
if ( HandleAsNavigationKey(event) )
return;
// 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)
{
{
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 );
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;
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();
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;
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 );
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();
{
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() )
{
}
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
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;
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 );
{
wxCHECK_MSG( subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM || InReportView(),
false,
- _T("GetSubItemRect only meaningful in report view") );
+ wxT("GetSubItemRect only meaningful in report view") );
wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), false,
- _T("invalid item in GetSubItemRect") );
+ wxT("invalid item in GetSubItemRect") );
// ensure that we're laid out, otherwise we could return nonsense
if ( m_dirty )
if ( subItem != wxLIST_GETSUBITEMRECT_WHOLEITEM )
{
wxCHECK_MSG( subItem >= 0 && subItem < GetColumnCount(), false,
- _T("invalid subItem in GetSubItemRect") );
+ wxT("invalid subItem in GetSubItemRect") );
for (int i = 0; i < subItem; i++)
{
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
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;
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
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;
{
ResetVisibleLinesRange();
+ const unsigned col = item.GetColumn();
+ wxCHECK_RET( col < m_aColWidths.size(), "invalid item column" );
+
// calculate the width of the item and adjust the max column width
- wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
+ wxColWidthInfo *pWidthInfo = m_aColWidths.Item(col);
int width = GetItemWidthWithImage(&item);
item.SetWidth(width);
if (width > pWidthInfo->nMaxWidth)
wxListLineData *line = new wxListLineData(this);
line->SetItem( item.m_col, item );
+ if ( item.m_mask & wxLIST_MASK_IMAGE )
+ {
+ // Reset the buffered height if it's not big enough for the new image.
+ if (m_small_image_list)
+ {
+ int imageWidth, imageHeight;
+ m_small_image_list->GetSize(item.GetImage(),
+ imageWidth, imageHeight);
+
+ if ( imageHeight > m_lineHeight )
+ m_lineHeight = 0;
+ }
+ }
m_lines.Insert( line, id );
// ----------------------------------------------------------------------------
static wxListCtrlCompare list_ctrl_compare_func_2;
-static long list_ctrl_compare_data;
+static wxIntPtr list_ctrl_compare_data;
int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )
{
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
void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
{
- wxPrintf( "wxListMainWindow::OnScroll\n" );
-
- // HandleOnScroll( event );
-
// update our idea of which lines are shown when we redraw the window the
// next time
ResetVisibleLinesRange();
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();
+ }
}
}
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 )
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;
m_mainWin = NULL;
m_headerWin = NULL;
- m_headerHeight = wxRendererNative::Get().GetHeaderButtonHeight(this);
}
wxGenericListCtrl::~wxGenericListCtrl()
(
this, wxID_ANY, m_mainWin,
wxPoint(0,0),
- wxSize(GetClientSize().x, m_headerHeight),
+ wxSize
+ (
+ GetClientSize().x,
+ wxRendererNative::Get().GetHeaderButtonHeight(this)
+ ),
wxTAB_TRAVERSAL
);
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
- wxFont font;
-#if wxOSX_USE_ATSU_TEXT
- font.MacCreateFromThemeFont( kThemeSmallSystemFont );
-#else
- font.MacCreateFromUIFont( kCTFontSystemFontType );
-#endif
+#if defined( __WXMAC__ )
+ static wxFont font( wxOSX_SYSTEM_FONT_SMALL );
m_headerWin->SetFont( font );
#endif
{
GetSizer()->Detach( m_headerWin );
- delete m_headerWin;
-
- m_headerWin = NULL;
+ wxDELETE(m_headerWin);
}
}
// just like in other ports, an assert will fail if the user doesn't give any type style:
wxASSERT_MSG( (style & wxLC_MASK_TYPE),
- _T("wxListCtrl style should have exactly one mode bit set") );
+ wxT("wxListCtrl style should have exactly one mode bit set") );
if ( !wxControl::Create( parent, id, pos, size, style|wxVSCROLL|wxHSCROLL, validator, name ) )
return false;
SetTargetWindow( m_mainWin );
+ // We use the cursor keys for moving the selection, not scrolling, so call
+ // this method to ensure wxScrollHelperEvtHandler doesn't catch all
+ // keyboard events forwarded to us from wxListMainWindow.
+ DisableKeyboardScrolling();
+
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
sizer->Add( m_mainWin, 1, wxGROW );
SetSizer( sizer );
return wxBORDER_THEME;
}
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam)
{
WXLRESULT rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
-#ifndef __WXWINCE__
// we need to process arrows ourselves for scrolling
if ( nMsg == WM_GETDLGCODE )
{
rc |= DLGC_WANTARROWS;
}
-#endif
return rc;
}
-#endif
+#endif // __WXMSW__
wxSize wxGenericListCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
{
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();
void wxGenericListCtrl::SetWindowStyleFlag( long flag )
{
+ // we add wxHSCROLL and wxVSCROLL in ctor unconditionally and it never
+ // makes sense to remove them as we'll always add scrollbars anyhow when
+ // needed
+ flag |= wxHSCROLL | wxVSCROLL;
+
+ const bool wasInReportView = HasFlag(wxLC_REPORT);
+
+ // update the window style first so that the header is created or destroyed
+ // corresponding to the new style
+ wxWindow::SetWindowStyleFlag( flag );
+
if (m_mainWin)
{
+ const bool inReportView = (flag & wxLC_REPORT) != 0;
+ if ( inReportView != wasInReportView )
+ {
+ // we need to notify the main window about this change as it must
+ // update its data structures
+ m_mainWin->SetReportView(inReportView);
+ }
+
// m_mainWin->DeleteEverything(); wxMSW doesn't do that
CreateOrDestroyHeaderWindowAsNeeded();
GetSizer()->Layout();
}
-
- wxWindow::SetWindowStyleFlag( flag );
}
bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const
return true;
}
-wxString wxGenericListCtrl::GetItemText( long item ) const
+wxString wxGenericListCtrl::GetItemText( long item, int col ) const
{
- return m_mainWin->GetItemText(item);
+ return m_mainWin->GetItemText(item, col);
}
void wxGenericListCtrl::SetItemText( long item, const wxString& str )
return false;
if ( m_mainWin->HasHeader() )
- rect.y += m_headerHeight + 1;
+ rect.y += m_headerWin->GetSize().y + 1;
return true;
}
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() )
-
- 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;
}
// 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;
void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
{
- m_mainWin->DoClientToScreen(x, y);
+ // It's not clear whether this can be called before m_mainWin is created
+ // but it seems better to be on the safe side and check.
+ if ( m_mainWin )
+ m_mainWin->DoClientToScreen(x, y);
+ else
+ wxControl::DoClientToScreen(x, y);
}
void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
{
- m_mainWin->DoScreenToClient(x, y);
+ // At least in wxGTK/Univ build this method can be called before m_mainWin
+ // is created so avoid crashes in this case.
+ if ( m_mainWin )
+ m_mainWin->DoScreenToClient(x, y);
+ else
+ wxControl::DoScreenToClient(x, y);
}
void wxGenericListCtrl::SetFocus()
m_mainWin->SetFocus();
}
-wxSize wxGenericListCtrl::DoGetBestSize() const
+wxSize wxGenericListCtrl::DoGetBestClientSize() const
{
- // Something is better than nothing...
- // 100x80 is what the MSW version will get from the default
- // wxControl::DoGetBestSize
- return wxSize(100, 80);
+ // Something is better than nothing even if this is completely arbitrary.
+ wxSize sizeBest(100, 80);
+
+ if ( !InReportView() )
+ {
+ // Ensure that our minimal width is at least big enough to show all our
+ // items. This is important for wxListbook to size itself correctly.
+
+ // Remember the offset of the first item: this corresponds to the
+ // margins around the item so we will add it to the minimal size below
+ // to ensure that we have equal margins on all sides.
+ wxPoint ofs;
+
+ // We can iterate over all items as there shouldn't be too many of them
+ // in non-report view. If it ever becomes a problem, we could examine
+ // just the first few items probably, the determination of the best
+ // size is less important if we will need scrollbars anyhow.
+ for ( int n = 0; n < GetItemCount(); n++ )
+ {
+ const wxRect itemRect = m_mainWin->GetLineRect(n);
+ if ( !n )
+ {
+ // Remember the position of the first item as all the rest are
+ // offset by at least this number of pixels too.
+ ofs = itemRect.GetPosition();
+ }
+
+ sizeBest.IncTo(itemRect.GetSize());
+ }
+
+ sizeBest.IncBy(2*ofs);
+
+
+ // If we have the scrollbars we need to account for them too. And to
+ // make sure the scrollbars status is up to date we need to call this
+ // function to set them.
+ m_mainWin->RecalculatePositions(true /* no refresh */);
+
+ // Unfortunately we can't use wxWindow::HasScrollbar() here as we need
+ // to use m_mainWin client/virtual size for determination of whether we
+ // use scrollbars and not the size of this window itself. Maybe that
+ // function should be extended to work correctly in the case when our
+ // scrollbars manage a different window from this one but currently it
+ // doesn't work.
+ const wxSize sizeClient = m_mainWin->GetClientSize();
+ const wxSize sizeVirt = m_mainWin->GetVirtualSize();
+
+ if ( sizeVirt.x > sizeClient.x /* HasScrollbar(wxHORIZONTAL) */ )
+ sizeBest.y += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+
+ if ( sizeVirt.y > sizeClient.y /* HasScrollbar(wxVERTICAL) */ )
+ sizeBest.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+ }
+
+ return sizeBest;
}
// ----------------------------------------------------------------------------
{
// 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;
}
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;
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);
}
}
}
+void wxGenericListCtrl::Update()
+{
+ if ( m_mainWin )
+ {
+ if ( m_mainWin->m_dirty )
+ m_mainWin->RecalculatePositions();
+
+ m_mainWin->Update();
+ }
+
+ if ( m_headerWin )
+ m_headerWin->Update();
+}
+
#endif // wxUSE_LISTCTRL
projects / wxWidgets.git / blobdiff