Applied AutoWrap Renderer Bugfix by Roger Gammans (Patch 467479).

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 6e5f13c902fbfffeeaf085754e288ac44c94b837..b85060db7fc539ba0e3e836b530cf789f7c524a5 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1,14 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listctrl.cpp
-// Purpose:
+// Name:        generic/listctrl.cpp
+// Purpose:     generic implementation of wxListCtrl

 // Author:      Robert Roebling
 // Author:      Robert Roebling

+//              Vadim Zeitlin (virtual list control support)

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+   TODO
+
+   1. we need to implement searching/sorting for virtual controls somehow
+  ?2. when changing selection the lines are refreshed twice
+ */
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "listctrl.h"
+    #pragma implementation "listctrl.h"
+    #pragma implementation "listctrlbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -18,1172 +35,2713 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/dcscreen.h"
-#include "wx/app.h"
-#include "wx/listctrl.h"
-#include "wx/generic/imaglist.h"
+#if wxUSE_LISTCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+
+    #include "wx/dynarray.h"
+
+    #include "wx/dcscreen.h"
+
+    #include "wx/textctrl.h"
+#endif
+
+// Include wx/listctrl.h (with wxListView declaration)
+// only when wxGenericListCtrl is the only
+// implementation, and therefore wxListView needs
+// to be derived from the 'generic' version.
+
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #include "wx/generic/listctrl.h"
+#else
+    #include "wx/listctrl.h"
+#endif

 
 

-#ifndef wxUSE_GENERIC_LIST_EXTENSIONS
-#define wxUSE_GENERIC_LIST_EXTENSIONS 0
+#if defined(__WXGTK__)
+    #include <gtk/gtk.h>
+    #include "wx/gtk/win_gtk.h"

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the height of the header window (FIXME: should depend on its font!)
+static const int HEADER_HEIGHT = 23;
+
+// the scrollbar units
+static const int SCROLL_UNIT_X = 15;
+static const int SCROLL_UNIT_Y = 15;
+
+// the spacing between the lines (in report mode)
+static const int LINE_SPACING = 0;
+
+// extra margins around the text label
+static const int EXTRA_WIDTH = 3;
+static const int EXTRA_HEIGHT = 4;
+
+// offset for the header window
+static const int HEADER_OFFSET_X = 1;
+static const int HEADER_OFFSET_Y = 1;
+
+// when autosizing the columns, add some slack
+static const int AUTOSIZE_COL_MARGIN = 10;
+
+// default and minimal widths for the header columns
+static const int WIDTH_COL_DEFAULT = 80;
+static const int WIDTH_COL_MIN = 10;
+
+// the space between the image and the text in the report mode
+static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
+
+// ============================================================================
+// private classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSelectionStore
+// ----------------------------------------------------------------------------
+
+int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
+
+WX_DEFINE_SORTED_EXPORTED_ARRAY_LONG(size_t, wxIndexArray);
+
+// this class is used to store the selected items in the virtual list control
+// (but it is not tied to list control and so can be used with other controls
+// such as wxListBox in wxUniv)
+//
+// the idea is to make it really smart later (i.e. store the selections as an
+// array of ranes + individual items) but, as I don't have time to do it now
+// (this would require writing code to merge/break ranges and much more) keep
+// it simple but define a clean interface to it which allows it to be made
+// smarter later
+class WXDLLEXPORT wxSelectionStore
+{
+public:
+    wxSelectionStore() : m_itemsSel(wxSizeTCmpFn) { Init(); }
+
+    // set the total number of items we handle
+    void SetItemCount(size_t count) { m_count = count; }
+
+    // special case of SetItemCount(0)
+    void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = FALSE; }
+
+    // must be called when a new item is inserted/added
+    void OnItemAdd(size_t item) { wxFAIL_MSG( _T("TODO") ); }
+
+    // must be called when an item is deleted
+    void OnItemDelete(size_t item);
+
+    // select one item, use SelectRange() insted if possible!
+    //
+    // returns true if the items selection really changed
+    bool SelectItem(size_t item, bool select = TRUE);
+
+    // select the range of items
+    //
+    // return true and fill the itemsChanged array with the indices of items
+    // which have changed state if "few" of them did, otherwise return false
+    // (meaning that too many items changed state to bother counting them
+    // individually)
+    bool SelectRange(size_t itemFrom, size_t itemTo,
+                     bool select = TRUE,
+                     wxArrayInt *itemsChanged = NULL);
+
+    // return true if the given item is selected
+    bool IsSelected(size_t item) const;
+
+    // return the total number of selected items
+    size_t GetSelectedCount() const
+    {
+        return m_defaultState ? m_count - m_itemsSel.GetCount()
+                              : m_itemsSel.GetCount();
+    }
+
+private:
+    // (re)init
+    void Init() { m_defaultState = FALSE; }
+
+    // the total number of items we handle
+    size_t m_count;
+
+    // the default state: normally, FALSE (i.e. off) but maybe set to TRUE if
+    // there are more selected items than non selected ones - this allows to
+    // handle selection of all items efficiently
+    bool m_defaultState;
+
+    // the array of items whose selection state is different from default
+    wxIndexArray m_itemsSel;
+
+    DECLARE_NO_COPY_CLASS(wxSelectionStore)
+};
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-//  wxListItemData
+//  wxListItemData (internal)
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxListItemData
+{
+public:
+    wxListItemData(wxListMainWindow *owner);
+    ~wxListItemData();
+
+    void SetItem( const wxListItem &info );
+    void SetImage( int image ) { m_image = image; }
+    void SetData( long data ) { m_data = data; }
+    void SetPosition( int x, int y );
+    void SetSize( int width, int height );
+
+    bool 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
+    long m_data;
+
+    // the item coordinates are not used in report mode, instead this pointer
+    // is NULL and the owner window is used to retrieve the item position and
+    // size
+    wxRect *m_rect;
+
+    // the list ctrl we are in
+    wxListMainWindow *m_owner;
+
+    // custom attributes or NULL
+    wxListItemAttr *m_attr;
+
+protected:
+    // 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)

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject);
+WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxListItemDataList);

 
 

-wxListItemData::wxListItemData()
+class WXDLLEXPORT wxListLineData

 {
 {

-    m_image = -1;
-    m_data = 0;
-    m_xpos = 0;
-    m_ypos = 0;
-    m_width = 0;
-    m_height = 0;
-    m_attr = NULL;
-}
+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;
+    } *m_gi;
+
+    // is this item selected? [NB: not used in virtual mode]
+    bool m_highlighted;

 
 

-wxListItemData::wxListItemData( const wxListItem &info )
+    // back pointer to the list ctrl
+    wxListMainWindow *m_owner;
+
+public:
+    wxListLineData(wxListMainWindow *owner);
+
+    ~wxListLineData() { delete m_gi; }
+
+    // are we in report mode?
+    inline bool InReportView() const;
+
+    // are we in virtual report mode?
+    inline bool IsVirtual() const;
+
+    // these 2 methods shouldn't be called for report view controls, in that
+    // case we determine our position/size ourselves
+
+    // calculate the size of the line
+    void CalculateSize( wxDC *dc, int spacing );
+
+    // remember the position this line appears at
+    void SetPosition( int x, int y,  int window_width, int spacing );
+
+    // wxListCtrl API
+
+    void SetImage( int image ) { SetImage(0, image); }
+    int GetImage() const { return GetImage(0); }
+    bool HasImage() const { return GetImage() != -1; }
+    bool HasText() const { return !GetText(0).empty(); }
+
+    void SetItem( int index, const wxListItem &info );
+    void GetItem( int index, wxListItem &info );
+
+    wxString GetText(int index) const;
+    void SetText( int index, const wxString s );
+
+    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);
+
+    // these are only used by GetImage/SetImage above, we don't support images
+    // with subitems at the public API level yet
+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
+};
+
+WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(wxListLineDataArray);
+
+//-----------------------------------------------------------------------------
+//  wxListHeaderWindow (internal)
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxListHeaderWindow : public wxWindow

 {
 {

-    m_image = -1;
-    m_data = 0;
-    m_attr = NULL;
+protected:
+    wxListMainWindow  *m_owner;
+    wxCursor          *m_currentCursor;
+    wxCursor          *m_resizeCursor;
+    bool               m_isDragging;

 
 

-    SetItem( info );
-}
+    // column being resized or -1
+    int m_column;

 
 

-void wxListItemData::SetItem( const wxListItem &info )
+    // 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 = "wxlistctrlcolumntitles" );
+
+    virtual ~wxListHeaderWindow();
+
+    void DoDrawRect( wxDC *dc, int x, int y, int w, int h );
+    void DrawCurrent();
+    void AdjustDC(wxDC& dc);
+
+    void OnPaint( wxPaintEvent &event );
+    void OnMouse( wxMouseEvent &event );
+    void OnSetFocus( wxFocusEvent &event );
+
+    // needs refresh
+    bool m_dirty;
+
+private:
+    // common part of all ctors
+    void Init();
+
+    void SendListEvent(wxEventType type, wxPoint pos);
+
+    DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+//-----------------------------------------------------------------------------
+// wxListRenameTimer (internal)
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxListRenameTimer: public wxTimer

 {
 {

-    if (info.m_mask & wxLIST_MASK_TEXT) m_text = info.m_text;
-    if (info.m_mask & wxLIST_MASK_IMAGE) m_image = info.m_image;
-    if (info.m_mask & wxLIST_MASK_DATA) m_data = info.m_data;
+private:
+    wxListMainWindow *m_owner;

 
 

-    if ( info.HasAttributes() )
+public:
+    wxListRenameTimer( wxListMainWindow *owner );
+    void Notify();
+};
+
+//-----------------------------------------------------------------------------
+//  wxListTextCtrl (internal)
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
+{
+public:
+    wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit);
+
+protected:
+    void OnChar( wxKeyEvent &event );
+    void OnKeyUp( wxKeyEvent &event );
+    void OnKillFocus( wxFocusEvent &event );
+
+    bool AcceptChanges();
+    void Finish();
+
+private:
+    wxListMainWindow   *m_owner;
+    wxString            m_startValue;
+    size_t              m_itemEdited;
+    bool                m_finished;
+
+    DECLARE_EVENT_TABLE()
+};
+
+//-----------------------------------------------------------------------------
+//  wxListMainWindow (internal)
+//-----------------------------------------------------------------------------
+
+WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxListHeaderDataList);
+
+class WXDLLEXPORT 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 HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); }
+
+    void HighlightAll( bool on );
+
+    // all these functions only do something if the line is currently visible
+
+    // change the line "selected" state, return TRUE if it really changed
+    bool HighlightLine( size_t line, bool highlight = TRUE);
+
+    // as HighlightLine() but do it for the range of lines: this is incredibly
+    // more efficient for virtual list controls!
+    //
+    // NB: unlike HighlightLine() this one does refresh the lines on screen
+    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = TRUE );
+
+    // toggle the line state and refresh it
+    void ReverseHighlight( size_t line )
+        { HighlightLine(line, !IsHighlighted(line)); RefreshLine(line); }
+
+    // return true if the line is highlighted
+    bool IsHighlighted(size_t line) const;
+
+    // refresh one or several lines at once
+    void RefreshLine( size_t line );
+    void RefreshLines( size_t lineFrom, size_t lineTo );
+
+    // refresh all selected items
+    void RefreshSelected();
+
+    // refresh all lines below the given one: the difference with
+    // RefreshLines() is that the index here might not be a valid one (happens
+    // when the last line is deleted)
+    void RefreshAfter( size_t lineFrom );
+
+    // the methods which are forwarded to wxListLineData itself in list/icon
+    // modes but are here because the lines don't store their positions in the
+    // report mode
+
+    // get the bound rect for the entire line
+    wxRect GetLineRect(size_t line) const;
+
+    // get the bound rect of the label
+    wxRect GetLineLabelRect(size_t line) const;
+
+    // get the bound rect of the items icon (only may be called if we do have
+    // an icon!)
+    wxRect GetLineIconRect(size_t line) const;
+
+    // get the rect to be highlighted when the item has focus
+    wxRect GetLineHighlightRect(size_t line) const;
+
+    // get the size of the total line rect
+    wxSize GetLineSize(size_t line) const
+        { return GetLineRect(line).GetSize(); }
+
+    // return the hit code for the corresponding position (in this line)
+    long HitTestLine(size_t line, int x, int y) const;
+
+    // bring the selected item into view, scrolling to it if necessary
+    void MoveToItem(size_t item);
+
+    // bring the current item into view
+    void MoveToFocus() { MoveToItem(m_current); }
+
+    // start editing the label of the given item
+    void EditLabel( long item );
+
+    // suspend/resume redrawing the control
+    void Freeze();
+    void Thaw();
+
+    void SetFocus();
+
+    void OnRenameTimer();
+    bool OnRenameAccept(size_t itemEdit, const wxString& value);
+
+    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( wxImageListType *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 );
+    int GetItemState( long item, long stateMask ) const;
+    void GetItemRect( long index, wxRect &rect ) const;
+    bool GetItemPosition( long item, wxPoint& pos ) const;
+    int GetSelectedItemCount() const;
+
+    wxString GetItemText(long item) const

     {
     {

-        if ( m_attr )
-            *m_attr = *info.GetAttributes();
-        else
-            m_attr = new wxListItemAttr(*info.GetAttributes());
+        wxListItem info;
+        info.m_itemId = item;
+        GetItem( info );
+        return info.m_text;

     }
 
     }
 

-    m_xpos = 0;
-    m_ypos = 0;
-    m_width = info.m_width;
-    m_height = 0;
+    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, long data);
+    long HitTest( int x, int y, int &flags );
+    void InsertItem( wxListItem &item );
+    void InsertColumn( long col, 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,
+                     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;
+    int                  m_xScroll,
+                         m_yScroll;
+    wxImageListType         *m_small_image_list;
+    wxImageListType         *m_normal_image_list;
+    int                  m_small_spacing;
+    int                  m_normal_spacing;
+    bool                 m_hasFocus;
+
+    bool                 m_lastOnSame;
+    wxTimer             *m_renameTimer;
+    bool                 m_isCreated;
+    int                  m_dragCount;
+    wxPoint              m_dragStart;
+
+    // for double click logic
+    size_t m_lineLastClicked,
+           m_lineBeforeLastClicked;
+
+protected:
+    // the total count of items in a virtual list control
+    size_t m_countVirt;
+
+    // the object maintaining the items selection state, only used in virtual
+    // controls
+    wxSelectionStore m_selStore;
+
+    // common part of all ctors
+    void Init();
+
+    // intiialize m_[xy]Scroll
+    void InitScrolling();
+
+    // get the line data for the given index
+    wxListLineData *GetLine(size_t n) const
+    {
+        wxASSERT_MSG( n != (size_t)-1, _T("invalid line index") );
+
+        if ( IsVirtual() )
+        {
+            wxConstCast(this, wxListMainWindow)->CacheLineData(n);
+
+            n = 0;
+        }
+
+        return &m_lines[n];
+    }
+
+    // get a dummy line which can be used for geometry calculations and such:
+    // you must use GetLine() if you want to really draw the line
+    wxListLineData *GetDummyLine() const;
+
+    // cache the line data of the n-th line in m_lines[0]
+    void CacheLineData(size_t line);
+
+    // get the range of visible lines
+    void GetVisibleLinesRange(size_t *from, size_t *to);
+
+    // force us to recalculate the range of visible lines
+    void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; }
+
+    // get the colour to be used for drawing the rules
+    wxColour GetRuleColour() const
+    {
+#ifdef __WXMAC__
+        return *wxWHITE;
+#else
+        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
+#endif
+    }
+
+private:
+    // initialize the current item if needed
+    void UpdateCurrent();
+
+    // delete all items but don't refresh: called from dtor
+    void DoDeleteAllItems();
+
+    // the height of one line using the current font
+    wxCoord m_lineHeight;
+
+    // the total header width or 0 if not calculated yet
+    wxCoord m_headerWidth;
+
+    // the first and last lines being shown on screen right now (inclusive),
+    // both may be -1 if they must be calculated so never access them directly:
+    // use GetVisibleLinesRange() above instead
+    size_t m_lineFrom,
+           m_lineTo;
+
+    // the brushes to use for item highlighting when we do/don't have focus
+    wxBrush *m_highlightBrush,
+            *m_highlightUnfocusedBrush;
+
+    // if this is > 0, the control is frozen and doesn't redraw itself
+    size_t m_freezeCount;
+
+    DECLARE_DYNAMIC_CLASS(wxListMainWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSelectionStore
+// ----------------------------------------------------------------------------
+
+bool wxSelectionStore::IsSelected(size_t item) const
+{
+    bool isSel = m_itemsSel.Index(item) != wxNOT_FOUND;
+
+    // if the default state is to be selected, being in m_itemsSel means that
+    // the item is not selected, so we have to inverse the logic
+    return m_defaultState ? !isSel : isSel;

 }
 
 }
 

-void wxListItemData::SetText( const wxString &s )
+bool wxSelectionStore::SelectItem(size_t item, bool select)

 {
 {

-    m_text = s;
+    // search for the item ourselves as like this we get the index where to
+    // insert it later if needed, so we do only one search in the array instead
+    // of two (adding item to a sorted array requires a search)
+    size_t index = m_itemsSel.IndexForInsert(item);
+    bool isSel = index < m_itemsSel.GetCount() && m_itemsSel[index] == item;
+
+    if ( select != m_defaultState )
+    {
+        if ( !isSel )
+        {
+            m_itemsSel.AddAt(item, index);
+
+            return TRUE;
+        }
+    }
+    else // reset to default state
+    {
+        if ( isSel )
+        {
+            m_itemsSel.RemoveAt(index);
+            return TRUE;
+        }
+    }
+
+    return FALSE;

 }
 
 }
 

-void wxListItemData::SetImage( int image )
+bool wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo,
+                                   bool select,
+                                   wxArrayInt *itemsChanged)

 {
 {

-    m_image = image;
+    // 100 is hardcoded but it shouldn't matter much: the important thing is
+    // that we don't refresh everything when really few (e.g. 1 or 2) items
+    // change state
+    static const size_t MANY_ITEMS = 100;
+
+    wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
+
+    // are we going to have more [un]selected items than the other ones?
+    if ( itemTo - itemFrom > m_count/2 )
+    {
+        if ( select != m_defaultState )
+        {
+            // the default state now becomes the same as 'select'
+            m_defaultState = select;
+
+            // so all the old selections (which had state select) shouldn't be
+            // selected any more, but all the other ones should
+            wxIndexArray selOld = m_itemsSel;
+            m_itemsSel.Empty();
+
+            // TODO: it should be possible to optimize the searches a bit
+            //       knowing the possible range
+
+            size_t item;
+            for ( item = 0; item < itemFrom; item++ )
+            {
+                if ( selOld.Index(item) == wxNOT_FOUND )
+                    m_itemsSel.Add(item);
+            }
+
+            for ( item = itemTo + 1; item < m_count; item++ )
+            {
+                if ( selOld.Index(item) == wxNOT_FOUND )
+                    m_itemsSel.Add(item);
+            }
+
+            // many items (> half) changed state
+            itemsChanged = NULL;
+        }
+        else // select == m_defaultState
+        {
+            // get the inclusive range of items between itemFrom and itemTo
+            size_t count = m_itemsSel.GetCount(),
+                   start = m_itemsSel.IndexForInsert(itemFrom),
+                   end = m_itemsSel.IndexForInsert(itemTo);
+
+            if ( start == count || m_itemsSel[start] < itemFrom )
+            {
+                start++;
+            }
+
+            if ( end == count || m_itemsSel[end] > itemTo )
+            {
+                end--;
+            }
+
+            if ( start <= end )
+            {
+                // delete all of them (from end to avoid changing indices)
+                for ( int i = end; i >= (int)start; i-- )
+                {
+                    if ( itemsChanged )
+                    {
+                        if ( itemsChanged->GetCount() > MANY_ITEMS )
+                        {
+                            // stop counting (see comment below)
+                            itemsChanged = NULL;
+                        }
+                        else
+                        {
+                            itemsChanged->Add(m_itemsSel[i]);
+                        }
+                    }
+
+                    m_itemsSel.RemoveAt(i);
+                }
+            }
+        }
+    }
+    else // "few" items change state
+    {
+        if ( itemsChanged )
+        {
+            itemsChanged->Empty();
+        }
+
+        // just add the items to the selection
+        for ( size_t item = itemFrom; item <= itemTo; item++ )
+        {
+            if ( SelectItem(item, select) && itemsChanged )
+            {
+                itemsChanged->Add(item);
+
+                if ( itemsChanged->GetCount() > MANY_ITEMS )
+                {
+                    // stop counting them, we'll just eat gobs of memory
+                    // for nothing at all - faster to refresh everything in
+                    // this case
+                    itemsChanged = NULL;
+                }
+            }
+        }
+    }
+
+    // we set it to NULL if there are many items changing state
+    return itemsChanged != NULL;
+}
+
+void wxSelectionStore::OnItemDelete(size_t item)
+{
+    size_t count = m_itemsSel.GetCount(),
+           i = m_itemsSel.IndexForInsert(item);
+
+    if ( i < count && m_itemsSel[i] == item )
+    {
+        // this item itself was in m_itemsSel, remove it from there
+        m_itemsSel.RemoveAt(i);
+
+        count--;
+    }
+
+    // and adjust the index of all which follow it
+    while ( i < count )
+    {
+        // all following elements must be greater than the one we deleted
+        wxASSERT_MSG( m_itemsSel[i] > item, _T("logic error") );
+
+        m_itemsSel[i++]--;
+    }
+}
+
+//-----------------------------------------------------------------------------
+//  wxListItemData
+//-----------------------------------------------------------------------------
+
+wxListItemData::~wxListItemData()
+{
+    // in the virtual list control the attributes are managed by the main
+    // program, so don't delete them
+    if ( !m_owner->IsVirtual() )
+    {
+        delete m_attr;
+    }
+
+    delete m_rect;
+}
+
+void wxListItemData::Init()
+{
+    m_image = -1;
+    m_data = 0;
+
+    m_attr = NULL;
+}
+
+wxListItemData::wxListItemData(wxListMainWindow *owner)
+{
+    Init();
+
+    m_owner = owner;
+
+    if ( owner->InReportView() )
+    {
+        m_rect = NULL;
+    }
+    else
+    {
+        m_rect = new wxRect;
+    }
+}
+
+void wxListItemData::SetItem( const wxListItem &info )
+{
+    if ( info.m_mask & wxLIST_MASK_TEXT )
+        SetText(info.m_text);
+    if ( info.m_mask & wxLIST_MASK_IMAGE )
+        m_image = info.m_image;
+    if ( info.m_mask & wxLIST_MASK_DATA )
+        m_data = info.m_data;
+
+    if ( info.HasAttributes() )
+    {
+        if ( m_attr )
+            *m_attr = *info.GetAttributes();
+        else
+            m_attr = new wxListItemAttr(*info.GetAttributes());
+    }
+
+    if ( m_rect )
+    {
+        m_rect->x =
+        m_rect->y =
+        m_rect->height = 0;
+        m_rect->width = info.m_width;
+    }
+}
+
+void wxListItemData::SetPosition( int x, int y )
+{
+    wxCHECK_RET( m_rect, _T("unexpected SetPosition() call") );
+
+    m_rect->x = x;
+    m_rect->y = y;
+}
+
+void wxListItemData::SetSize( int width, int height )
+{
+    wxCHECK_RET( m_rect, _T("unexpected SetSize() call") );
+
+    if ( width != -1 )
+        m_rect->width = width;
+    if ( height != -1 )
+        m_rect->height = height;
+}
+
+bool wxListItemData::IsHit( int x, int y ) const
+{
+    wxCHECK_MSG( m_rect, FALSE, _T("can't be called in this mode") );
+
+    return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Inside(x, y);
+}
+
+int wxListItemData::GetX() const
+{
+    wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") );
+
+    return m_rect->x;
+}
+
+int wxListItemData::GetY() const
+{
+    wxCHECK_MSG( m_rect, 0, _T("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") );
+
+    return m_rect->width;
+}
+
+int wxListItemData::GetHeight() const
+{
+    wxCHECK_MSG( m_rect, 0, _T("can't be called in this mode") );
+
+    return m_rect->height;
+}
+
+void wxListItemData::GetItem( wxListItem &info ) const
+{
+    info.m_text = m_text;
+    info.m_image = m_image;
+    info.m_data = m_data;
+
+    if ( m_attr )
+    {
+        if ( m_attr->HasTextColour() )
+            info.SetTextColour(m_attr->GetTextColour());
+        if ( m_attr->HasBackgroundColour() )
+            info.SetBackgroundColour(m_attr->GetBackgroundColour());
+        if ( m_attr->HasFont() )
+            info.SetFont(m_attr->GetFont());
+    }
+}
+
+//-----------------------------------------------------------------------------
+//  wxListHeaderData
+//-----------------------------------------------------------------------------
+
+void wxListHeaderData::Init()
+{
+    m_mask = 0;
+    m_image = -1;
+    m_format = 0;
+    m_width = 0;
+    m_xpos = 0;
+    m_ypos = 0;
+    m_height = 0;
+}
+
+wxListHeaderData::wxListHeaderData()
+{
+    Init();
+}
+
+wxListHeaderData::wxListHeaderData( const wxListItem &item )
+{
+    Init();
+
+    SetItem( item );
+}
+
+void wxListHeaderData::SetItem( const wxListItem &item )
+{
+    m_mask = item.m_mask;
+
+    if ( m_mask & wxLIST_MASK_TEXT )
+        m_text = item.m_text;
+
+    if ( m_mask & wxLIST_MASK_IMAGE )
+        m_image = item.m_image;
+
+    if ( m_mask & wxLIST_MASK_FORMAT )
+        m_format = item.m_format;
+
+    if ( m_mask & wxLIST_MASK_WIDTH )
+        SetWidth(item.m_width);
+}
+
+void wxListHeaderData::SetPosition( int x, int y )
+{
+    m_xpos = x;
+    m_ypos = y;
+}
+
+void wxListHeaderData::SetHeight( int h )
+{
+    m_height = h;
+}
+
+void wxListHeaderData::SetWidth( int w )
+{
+    m_width = w;
+    if (m_width < 0)
+        m_width = WIDTH_COL_DEFAULT;
+    else if (m_width < WIDTH_COL_MIN)
+        m_width = WIDTH_COL_MIN;
+}
+
+void wxListHeaderData::SetFormat( int format )
+{
+    m_format = format;
+}
+
+bool wxListHeaderData::HasImage() const
+{
+    return m_image != -1;
+}
+
+bool wxListHeaderData::IsHit( int x, int y ) const
+{
+    return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
+}
+
+void wxListHeaderData::GetItem( wxListItem& item )
+{
+    item.m_mask = m_mask;
+    item.m_text = m_text;
+    item.m_image = m_image;
+    item.m_format = m_format;
+    item.m_width = m_width;
+}
+
+int wxListHeaderData::GetImage() const
+{
+    return m_image;
+}
+
+int wxListHeaderData::GetWidth() const
+{
+    return m_width;
+}
+
+int wxListHeaderData::GetFormat() const
+{
+    return m_format;
+}
+
+//-----------------------------------------------------------------------------
+//  wxListLineData
+//-----------------------------------------------------------------------------
+
+inline int wxListLineData::GetMode() const
+{
+    return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MASK_TYPE;
+}
+
+inline bool wxListLineData::InReportView() const
+{
+    return m_owner->HasFlag(wxLC_REPORT);
+}
+
+inline bool wxListLineData::IsVirtual() const
+{
+    return m_owner->IsVirtual();
+}
+
+wxListLineData::wxListLineData( wxListMainWindow *owner )
+{
+    m_owner = owner;
+    m_items.DeleteContents( TRUE );
+
+    if ( InReportView() )
+    {
+        m_gi = NULL;
+    }
+    else // !report
+    {
+        m_gi = new GeometryInfo;
+    }
+
+    m_highlighted = FALSE;
+
+    InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
+}
+
+void wxListLineData::CalculateSize( wxDC *dc, int spacing )
+{
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );
+
+    wxListItemData *item = node->GetData();
+
+    switch ( GetMode() )
+    {
+        case wxLC_ICON:
+        case wxLC_SMALL_ICON:
+            {
+                m_gi->m_rectAll.width = spacing;
+
+                wxString s = item->GetText();
+
+                wxCoord lw, lh;
+                if ( s.empty() )
+                {
+                    lh =
+                    m_gi->m_rectLabel.width =
+                    m_gi->m_rectLabel.height = 0;
+                }
+                else // has label
+                {
+                    dc->GetTextExtent( s, &lw, &lh );
+                    if (lh < SCROLL_UNIT_Y)
+                        lh = SCROLL_UNIT_Y;
+                    lw += EXTRA_WIDTH;
+                    lh += EXTRA_HEIGHT;
+
+                    m_gi->m_rectAll.height = spacing + lh;
+                    if (lw > spacing)
+                        m_gi->m_rectAll.width = lw;
+
+                    m_gi->m_rectLabel.width = lw;
+                    m_gi->m_rectLabel.height = lh;
+                }
+
+                if (item->HasImage())
+                {
+                    int w, h;
+                    m_owner->GetImageSize( item->GetImage(), w, h );
+                    m_gi->m_rectIcon.width = w + 8;
+                    m_gi->m_rectIcon.height = h + 8;
+
+                    if ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width )
+                        m_gi->m_rectAll.width = m_gi->m_rectIcon.width;
+                    if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 )
+                        m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4;
+                }
+
+                if ( item->HasText() )
+                {
+                    m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width;
+                    m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height;
+                }
+                else // no text, highlight the icon
+                {
+                    m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
+                    m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;
+                }
+            }
+            break;
+
+        case wxLC_LIST:
+            {
+                wxString s = item->GetTextForMeasuring();
+
+                wxCoord lw,lh;
+                dc->GetTextExtent( s, &lw, &lh );
+                if (lh < SCROLL_UNIT_Y)
+                    lh = SCROLL_UNIT_Y;
+                lw += EXTRA_WIDTH;
+                lh += EXTRA_HEIGHT;
+
+                m_gi->m_rectLabel.width = lw;
+                m_gi->m_rectLabel.height = lh;
+
+                m_gi->m_rectAll.width = lw;
+                m_gi->m_rectAll.height = lh;
+
+                if (item->HasImage())
+                {
+                    int w, h;
+                    m_owner->GetImageSize( item->GetImage(), w, h );
+                    m_gi->m_rectIcon.width = w;
+                    m_gi->m_rectIcon.height = h;
+
+                    m_gi->m_rectAll.width += 4 + w;
+                    if (h > m_gi->m_rectAll.height)
+                        m_gi->m_rectAll.height = h;
+                }
+
+                m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
+                m_gi->m_rectHighlight.height = m_gi->m_rectAll.height;
+            }
+            break;
+
+        case wxLC_REPORT:
+            wxFAIL_MSG( _T("unexpected call to SetSize") );
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown mode") );
+    }
+}
+
+void wxListLineData::SetPosition( int x, int y,
+                                  int window_width,
+                                  int spacing )
+{
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );
+
+    wxListItemData *item = node->GetData();
+
+    switch ( GetMode() )
+    {
+        case wxLC_ICON:
+        case wxLC_SMALL_ICON:
+            m_gi->m_rectAll.x = x;
+            m_gi->m_rectAll.y = y;
+
+            if ( item->HasImage() )
+            {
+                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 +
+                    (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2;
+                m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
+            }
+
+            if ( item->HasText() )
+            {
+                if (m_gi->m_rectAll.width > spacing)
+                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 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.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;
+            }
+            else // no text, highlight the icon
+            {
+                m_gi->m_rectHighlight.x = m_gi->m_rectIcon.x - 4;
+                m_gi->m_rectHighlight.y = m_gi->m_rectIcon.y - 4;
+            }
+            break;
+
+        case wxLC_LIST:
+            m_gi->m_rectAll.x = x;
+            m_gi->m_rectAll.y = y;
+
+            m_gi->m_rectHighlight.x = m_gi->m_rectAll.x;
+            m_gi->m_rectHighlight.y = m_gi->m_rectAll.y;
+            m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2;
+
+            if (item->HasImage())
+            {
+                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
+                m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;
+                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 6 + m_gi->m_rectIcon.width;
+            }
+            else
+            {
+                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
+            }
+            break;
+
+        case wxLC_REPORT:
+            wxFAIL_MSG( _T("unexpected call to SetPosition") );
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown mode") );
+    }

 }
 
 }
 

-void wxListItemData::SetData( long data )
+void wxListLineData::InitItems( int num )

 {
 {

-    m_data = data;
+    for (int i = 0; i < num; i++)
+        m_items.Append( new wxListItemData(m_owner) );

 }
 
 }
 

-void wxListItemData::SetPosition( int x, int y )
+void wxListLineData::SetItem( int index, const wxListItem &info )

 {
 {

-    m_xpos = x;
-    m_ypos = y;
-}
+    wxListItemDataList::Node *node = m_items.Item( index );
+    wxCHECK_RET( node, _T("invalid column index in SetItem") );

 
 

-void wxListItemData::SetSize( int width, int height )
-{
-    if (width != -1) m_width = width;
-    if (height != -1) m_height = height;
+    wxListItemData *item = node->GetData();
+    item->SetItem( info );

 }
 
 }
 

-bool wxListItemData::HasImage() const
+void wxListLineData::GetItem( int index, wxListItem &info )

 {
 {

-    return (m_image >= 0);
+    wxListItemDataList::Node *node = m_items.Item( index );
+    if (node)
+    {
+        wxListItemData *item = node->GetData();
+        item->GetItem( info );
+    }

 }
 
 }
 

-bool wxListItemData::HasText() const
+wxString wxListLineData::GetText(int index) const

 {
 {

-    return (!m_text.IsNull());
-}
+    wxString s;

 
 

-bool wxListItemData::IsHit( int x, int y ) const
-{
-    return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
-}
+    wxListItemDataList::Node *node = m_items.Item( index );
+    if (node)
+    {
+        wxListItemData *item = node->GetData();
+        s = item->GetText();
+    }

 
 

-void wxListItemData::GetText( wxString &s )
-{
-    s = m_text;
+    return s;

 }
 
 }
 

-int wxListItemData::GetX() const
+void wxListLineData::SetText( int index, const wxString s )

 {
 {

-    return m_xpos;
+    wxListItemDataList::Node *node = m_items.Item( index );
+    if (node)
+    {
+        wxListItemData *item = node->GetData();
+        item->SetText( s );
+    }

 }
 
 }
 

-int wxListItemData::GetY() const
+void wxListLineData::SetImage( int index, int image )

 {
 {

-    return m_ypos;
+    wxListItemDataList::Node *node = m_items.Item( index );
+    wxCHECK_RET( node, _T("invalid column index in SetImage()") );
+
+    wxListItemData *item = node->GetData();
+    item->SetImage(image);

 }
 
 }
 

-int wxListItemData::GetWidth() const
+int wxListLineData::GetImage( int index ) const

 {
 {

-    return m_width;
+    wxListItemDataList::Node *node = m_items.Item( index );
+    wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") );
+
+    wxListItemData *item = node->GetData();
+    return item->GetImage();

 }
 
 }
 

-int wxListItemData::GetHeight() const
+wxListItemAttr *wxListLineData::GetAttr() const

 {
 {

-    return m_height;
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    return item->GetAttr();

 }
 
 }
 

-int wxListItemData::GetImage() const
+void wxListLineData::SetAttr(wxListItemAttr *attr)

 {
 {

-    return m_image;
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("invalid column index in SetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    item->SetAttr(attr);

 }
 
 }
 

-void wxListItemData::GetItem( wxListItem &info ) const
+bool wxListLineData::SetAttributes(wxDC *dc,
+                                   const wxListItemAttr *attr,
+                                   bool highlighted)

 {
 {

-    info.m_text = m_text;
-    info.m_image = m_image;
-    info.m_data = m_data;
+    wxWindow *listctrl = m_owner->GetParent();

 
 

-    if ( m_attr )
+    // fg colour
+
+    // don't use foreground colour for drawing highlighted items - this might
+    // make them completely invisible (and there is no way to do bit
+    // arithmetics on wxColour, unfortunately)
+    wxColour colText;
+    if ( highlighted )

     {
     {

-        if ( m_attr->HasTextColour() )
-            info.SetTextColour(m_attr->GetTextColour());
-        if ( m_attr->HasBackgroundColour() )
-            info.SetBackgroundColour(m_attr->GetBackgroundColour());
-        if ( m_attr->HasFont() )
-            info.SetFont(m_attr->GetFont());
+        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    }
+    else
+    {
+        if ( attr && attr->HasTextColour() )
+        {
+            colText = attr->GetTextColour();
+        }
+        else
+        {
+            colText = listctrl->GetForegroundColour();
+        }

     }
     }

-}

 
 

-//-----------------------------------------------------------------------------
-//  wxListHeaderData
-//-----------------------------------------------------------------------------
+    dc->SetTextForeground(colText);

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject);
+    // font
+    wxFont font;
+    if ( attr && attr->HasFont() )
+    {
+        font = attr->GetFont();
+    }
+    else
+    {
+        font = listctrl->GetFont();
+    }

 
 

-wxListHeaderData::wxListHeaderData()
-{
-    m_mask = 0;
-    m_image = 0;
-    m_format = 0;
-    m_width = 0;
-    m_xpos = 0;
-    m_ypos = 0;
-    m_height = 0;
-}
+    dc->SetFont(font);

 
 

-wxListHeaderData::wxListHeaderData( const wxListItem &item )
-{
-    SetItem( item );
-    m_xpos = 0;
-    m_ypos = 0;
-    m_height = 0;
-}
+    // bg colour
+    bool hasBgCol = attr && attr->HasBackgroundColour();
+    if ( highlighted || hasBgCol )
+    {
+        if ( highlighted )
+        {
+            dc->SetBrush( *m_owner->GetHighlightBrush() );
+        }
+        else
+        {
+            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+        }

 
 

-void wxListHeaderData::SetItem( const wxListItem &item )
-{
-    m_mask = item.m_mask;
-    m_text = item.m_text;
-    m_image = item.m_image;
-    m_format = item.m_format;
-    m_width = item.m_width;
-    if (m_width < 0) m_width = 80;
-    if (m_width < 6) m_width = 6;
+        dc->SetPen( *wxTRANSPARENT_PEN );
+
+        return TRUE;
+    }
+
+    return FALSE;

 }
 
 }
 

-void wxListHeaderData::SetPosition( int x, int y )
+void wxListLineData::Draw( wxDC *dc )

 {
 {

-    m_xpos = x;
-    m_ypos = y;
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );
+
+    bool highlighted = IsHighlighted();
+
+    wxListItemAttr *attr = GetAttr();
+
+    if ( SetAttributes(dc, attr, highlighted) )
+    {
+        dc->DrawRectangle( m_gi->m_rectHighlight );
+    }
+
+    wxListItemData *item = node->GetData();
+    if (item->HasImage())
+    {
+        wxRect rectIcon = m_gi->m_rectIcon;
+        m_owner->DrawImage( item->GetImage(), dc,
+                            rectIcon.x, rectIcon.y );
+    }
+
+    if (item->HasText())
+    {
+        wxRect rectLabel = m_gi->m_rectLabel;
+
+        wxDCClipper clipper(*dc, rectLabel);
+        dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
+    }

 }
 
 }
 

-void wxListHeaderData::SetHeight( int h )
+void wxListLineData::DrawInReportMode( wxDC *dc,
+                                       const wxRect& rect,
+                                       const wxRect& rectHL,
+                                       bool highlighted )

 {
 {

-    m_height = h;
+    // TODO: later we should support setting different attributes for
+    //       different columns - to do it, just add "col" argument to
+    //       GetAttr() and move these lines into the loop below
+    wxListItemAttr *attr = GetAttr();
+    if ( SetAttributes(dc, attr, highlighted) )
+    {
+        dc->DrawRectangle( rectHL );
+    }
+
+    wxCoord x = rect.x + HEADER_OFFSET_X,
+            y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
+
+    size_t col = 0;
+    for ( wxListItemDataList::Node *node = m_items.GetFirst();
+          node;
+          node = node->GetNext(), col++ )
+    {
+        wxListItemData *item = node->GetData();
+
+        int width = m_owner->GetColumnWidth(col);
+        int xOld = x;
+        x += width;
+
+        if ( item->HasImage() )
+        {
+            int ix, iy;
+            m_owner->DrawImage( item->GetImage(), dc, xOld, y );
+            m_owner->GetImageSize( item->GetImage(), ix, iy );
+
+            ix += IMAGE_MARGIN_IN_REPORT_MODE;
+
+            xOld += ix;
+            width -= ix;
+        }
+
+        wxDCClipper clipper(*dc, xOld, y, width, rect.height);
+
+        if ( item->HasText() )
+        {
+            dc->DrawText( item->GetText(), xOld, y );
+        }
+    }

 }
 
 }
 

-void wxListHeaderData::SetWidth( int w )
+bool wxListLineData::Highlight( bool on )

 {
 {

-    m_width = w;
-    if (m_width < 0) m_width = 80;
-    if (m_width < 6) m_width = 6;
+    wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Highlight") );
+
+    if ( on == m_highlighted )
+        return FALSE;
+
+    m_highlighted = on;
+
+    return TRUE;

 }
 
 }
 

-void wxListHeaderData::SetFormat( int format )
+void wxListLineData::ReverseHighlight( void )

 {
 {

-    m_format = format;
+    Highlight(!IsHighlighted());

 }
 
 }
 

-bool wxListHeaderData::HasImage() const
+//-----------------------------------------------------------------------------
+//  wxListHeaderWindow
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow)
+
+BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
+    EVT_PAINT         (wxListHeaderWindow::OnPaint)
+    EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
+    EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
+END_EVENT_TABLE()
+
+void wxListHeaderWindow::Init()

 {
 {

-    return (m_image != 0);
+    m_currentCursor = (wxCursor *) NULL;
+    m_isDragging = FALSE;
+    m_dirty = FALSE;

 }
 
 }
 

-bool wxListHeaderData::HasText() const
+wxListHeaderWindow::wxListHeaderWindow()

 {
 {

-    return (m_text.Length() > 0);
+    Init();
+
+    m_owner = (wxListMainWindow *) NULL;
+    m_resizeCursor = (wxCursor *) NULL;

 }
 
 }
 

-bool wxListHeaderData::IsHit( int x, int y ) const
+wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
+                                        wxWindowID id,
+                                        wxListMainWindow *owner,
+                                        const wxPoint& pos,
+                                        const wxSize& size,
+                                        long style,
+                                        const wxString &name )
+                  : wxWindow( win, id, pos, size, style, name )

 {
 {

-    return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
+    Init();
+
+    m_owner = owner;
+    m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
+
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );

 }
 
 }
 

-void wxListHeaderData::GetItem( wxListItem &item )
+wxListHeaderWindow::~wxListHeaderWindow()

 {
 {

-    item.m_mask = m_mask;
-    item.m_text = m_text;
-    item.m_image = m_image;
-    item.m_format = m_format;
-    item.m_width = m_width;
+    delete m_resizeCursor;

 }
 
 }
 

-void wxListHeaderData::GetText( wxString &s )
+void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )

 {
 {

-    s =  m_text;
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+    GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
+                                               : GTK_STATE_INSENSITIVE;
+
+    x = dc->XLOG2DEV( x );
+
+    gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window,
+                   state, GTK_SHADOW_OUT,
+                   (GdkRectangle*) NULL, m_wxwindow,
+                   (char *)"button", // const_cast
+                   x-1, y-1, w+2, h+2);
+#elif defined( __WXMAC__  )
+    const int m_corner = 1;
+
+    dc->SetBrush( *wxTRANSPARENT_BRUSH );
+
+    dc->SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
+    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
+    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
+
+    wxPen pen( wxColour( 0x88 , 0x88 , 0x88 ), 1, wxSOLID );
+
+    dc->SetPen( pen );
+    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
+    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
+
+    dc->SetPen( *wxWHITE_PEN );
+    dc->DrawRectangle( x, y, w-m_corner+1, 1 );   // top (outer)
+    dc->DrawRectangle( x, y, 1, h );              // left (outer)
+    dc->DrawLine( x, y+h-1, x+1, y+h-1 );
+    dc->DrawLine( x+w-1, y, x+w-1, y+1 );
+#else // !GTK, !Mac
+    const int m_corner = 1;
+
+    dc->SetBrush( *wxTRANSPARENT_BRUSH );
+
+    dc->SetPen( *wxBLACK_PEN );
+    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
+    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
+
+    wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
+
+    dc->SetPen( pen );
+    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
+    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
+
+    dc->SetPen( *wxWHITE_PEN );
+    dc->DrawRectangle( x, y, w-m_corner+1, 1 );   // top (outer)
+    dc->DrawRectangle( x, y, 1, h );              // left (outer)
+    dc->DrawLine( x, y+h-1, x+1, y+h-1 );
+    dc->DrawLine( x+w-1, y, x+w-1, y+1 );
+#endif

 }
 
 }
 

-int wxListHeaderData::GetImage() const
+// shift the DC origin to match the position of the main window horz
+// scrollbar: this allows us to always use logical coords
+void wxListHeaderWindow::AdjustDC(wxDC& dc)

 {
 {

-    return m_image;
+    int xpix;
+    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
+
+    int x;
+    m_owner->GetViewStart( &x, NULL );
+
+    // account for the horz scrollbar offset
+    dc.SetDeviceOrigin( -x * xpix, 0 );

 }
 
 }
 

-int wxListHeaderData::GetWidth() const
+void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )

 {
 {

-    return m_width;
+#if defined(__WXGTK__)
+    wxClientDC dc( this );
+#else
+    wxPaintDC dc( this );
+#endif
+
+    PrepareDC( dc );
+    AdjustDC( dc );
+
+    dc.BeginDrawing();
+
+    dc.SetFont( GetFont() );
+
+    // width and height of the entire header window
+    int w, h;
+    GetClientSize( &w, &h );
+    m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
+
+    dc.SetBackgroundMode(wxTRANSPARENT);
+
+    // do *not* use the listctrl colour for headers - one day we will have a
+    // function to set it separately
+    //dc.SetTextForeground( *wxBLACK );
+    dc.SetTextForeground(wxSystemSettings::
+                            GetSystemColour( wxSYS_COLOUR_WINDOWTEXT ));
+
+    int x = HEADER_OFFSET_X;
+
+    int numColumns = m_owner->GetColumnCount();
+    wxListItem item;
+    for ( int i = 0; i < numColumns && x < w; i++ )
+    {
+        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
+        int cw = wCol - 2;
+
+        dc.SetPen( *wxWHITE_PEN );
+
+        DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );
+
+        // if we have an image, draw it on the right of the label
+        int image = item.m_image;
+        if ( image != -1 )
+        {
+            wxImageListType *imageList = m_owner->m_small_image_list;
+            if ( imageList )
+            {
+                int ix, iy;
+                imageList->GetSize(image, ix, iy);
+
+                imageList->Draw
+                           (
+                            image,
+                            dc,
+                            x + cw - ix - 1,
+                            HEADER_OFFSET_Y + (h - 4 - iy)/2,
+                            wxIMAGELIST_DRAW_TRANSPARENT
+                           );
+
+                cw -= ix + 2;
+            }
+            //else: ignore the column image
+        }
+
+        // draw the text clipping it so that it doesn't overwrite the column
+        // boundary
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+
+        dc.DrawText( item.GetText(),
+                     x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+
+        x += wCol;
+    }
+
+    dc.EndDrawing();

 }
 
 }
 

-int wxListHeaderData::GetFormat() const
+void wxListHeaderWindow::DrawCurrent()

 {
 {

-    return m_format;
-}
+    int x1 = m_currentX;
+    int y1 = 0;
+    m_owner->ClientToScreen( &x1, &y1 );

 
 

-//-----------------------------------------------------------------------------
-//  wxListLineData
-//-----------------------------------------------------------------------------
+    int x2 = m_currentX;
+    int y2 = 0;
+    m_owner->GetClientSize( NULL, &y2 );
+    m_owner->ClientToScreen( &x2, &y2 );
+
+    wxScreenDC dc;
+    dc.SetLogicalFunction( wxINVERT );
+    dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListLineData,wxObject);
+    AdjustDC(dc);

 
 

-wxListLineData::wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush )
-{
-    m_mode = mode;
-    m_hilighted = FALSE;
-    m_owner = owner;
-    m_hilightBrush = hilightBrush;
-    m_items.DeleteContents( TRUE );
-    m_spacing = 0;
+    dc.DrawLine( x1, y1, x2, y2 );
+
+    dc.SetLogicalFunction( wxCOPY );
+
+    dc.SetPen( wxNullPen );
+    dc.SetBrush( wxNullBrush );

 }
 
 }
 

-void wxListLineData::CalculateSize( wxDC *dc, int spacing )
+void wxListHeaderWindow::OnMouse( wxMouseEvent &event )

 {
 {

-    m_spacing = spacing;
-    switch (m_mode)
+    // we want to work with logical coords
+    int x;
+    m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
+    int y = event.GetY();
+
+    if (m_isDragging)

     {
     {

-        case wxLC_ICON:
+        SendListEvent(wxEVT_COMMAND_LIST_COL_DRAGGING,
+                      event.GetPosition());
+
+        // we don't draw the line beyond our window, but we allow dragging it
+        // there
+        int w = 0;
+        GetClientSize( &w, NULL );
+        m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
+        w -= 6;
+
+        // erase the line if it was drawn
+        if ( m_currentX < w )
+            DrawCurrent();
+
+        if (event.ButtonUp())

         {
         {

-            m_bound_all.width = m_spacing;
-            m_bound_all.height = m_spacing+13;
-            wxNode *node = m_items.First();
-            if (node)
-            {
-                wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s = item->GetText();
-                wxCoord lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
-                if (lw > m_spacing) m_bound_all.width = lw;
-            }
-            break;
+            ReleaseMouse();
+            m_isDragging = FALSE;
+            m_dirty = TRUE;
+            m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
+            SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG,
+                          event.GetPosition());

         }
         }

-        case wxLC_LIST:
+        else

         {
         {

-            wxNode *node = m_items.First();
-            if (node)
-            {
-                wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s = item->GetText();
-                wxCoord lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
-                m_bound_all.width = lw;
-                m_bound_all.height = lh;
-                if (item->HasImage())
-                {
-                    wxCoord w = 0;
-                    wxCoord h = 0;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_all.width += 4 + w;
-                    if (h > m_bound_all.height) m_bound_all.height = h;
-                }
-            }
-            break;
+            if (x > m_minX + 7)
+                m_currentX = x;
+            else
+                m_currentX = m_minX + 7;
+
+            // draw in the new location
+            if ( m_currentX < w )
+                DrawCurrent();

         }
         }

-        case wxLC_REPORT:
+    }
+    else // not dragging
+    {
+        m_minX = 0;
+        bool hit_border = FALSE;
+
+        // end of the current column
+        int xpos = 0;
+
+        // find the column where this event occured
+        int col,
+            countCol = m_owner->GetColumnCount();
+        for (col = 0; col < countCol; col++)

         {
         {

-            m_bound_all.width = 0;
-            m_bound_all.height = 0;
-            wxNode *node = m_items.First();
-            while (node)
+            xpos += m_owner->GetColumnWidth( col );
+            m_column = col;
+
+            if ( (abs(x-xpos) < 3) && (y < 22) )

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s;
-                item->GetText( s );
-                if (s.IsNull()) s = "H";
-                wxCoord lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
-                item->SetSize( item->GetWidth(), lh );
-                m_bound_all.width += lw;
-                m_bound_all.height = lh;
-                node = node->Next();
+                // near the column border
+                hit_border = TRUE;
+                break;

             }
             }

-            break;
-        }
-    }
-}

 
 

-void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
-{
-    m_bound_all.x = x;
-    m_bound_all.y = y;
-    switch (m_mode)
-    {
-        case wxLC_ICON:
-        {
-            AssignRect( m_bound_icon, 0, 0, 0, 0 );
-            AssignRect( m_bound_label, 0, 0, 0, 0 );
-            AssignRect( m_bound_hilight, m_bound_all );
-            wxNode *node = m_items.First();
-            if (node)
+            if ( x < xpos )

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                if (item->HasImage())
-                {
-                    wxListItemData *item = (wxListItemData*)node->Data();
-                    int w = 0;
-                    int h = 0;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2);
-                    m_bound_icon.y = m_bound_all.y + m_spacing - h - 5;
-                    m_bound_icon.width = w;
-                    m_bound_icon.height = h;
-                    if (!item->HasText())
-                    {
-                        AssignRect( m_bound_hilight, m_bound_icon );
-                        m_bound_hilight.x -= 5;
-                        m_bound_hilight.y -= 5;
-                        m_bound_hilight.width += 9;
-                        m_bound_hilight.height += 9;
-                    }
-                }
-                if (item->HasText())
-                {
-                    wxString s;
-                    item->GetText( s );
-                    wxCoord lw,lh;
-                    dc->GetTextExtent( s, &lw, &lh );
-                    if (m_bound_all.width > m_spacing)
-                        m_bound_label.x = m_bound_all.x;
-                    else
-                        m_bound_label.x = m_bound_all.x +  (m_spacing/2) - lw/2;
-                    m_bound_label.y = m_bound_all.y + m_bound_all.height - lh;
-                    m_bound_label.width = lw;
-                    m_bound_label.height = lh;
-                    AssignRect( m_bound_hilight, m_bound_label );
-                    m_bound_hilight.x -= 2;
-                    m_bound_hilight.y -= 2;
-                    m_bound_hilight.width += 4;
-                    m_bound_hilight.height += 4;
-                }
+                // inside the column
+                break;

             }
             }

-            break;
+
+            m_minX = xpos;

         }
         }

-        case wxLC_LIST:
+
+        if ( col == countCol )
+            m_column = -1;
+
+        if (event.LeftDown() || event.RightUp())

         {
         {

-            AssignRect( m_bound_label, m_bound_all );
-            m_bound_all.x -= 2;
-            m_bound_all.y -= 2;
-            m_bound_all.width += 4;
-            m_bound_all.height += 3;
-            AssignRect( m_bound_hilight, m_bound_all );
-            AssignRect( m_bound_icon, 0, 0, 0, 0 );
-            wxNode *node = m_items.First();
-            if (node)
+            if (hit_border && event.LeftDown())

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                if (item->HasImage())
-                {
-                    m_bound_icon.x = m_bound_all.x + 2;
-                    m_bound_icon.y = m_bound_all.y + 2;
-                    int w;
-                    int h;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_icon.width = w;
-                    m_bound_icon.height = h;
-                    m_bound_label.x += 4 + w;
-                    m_bound_label.width -= 4 + w;
-                }
+                m_isDragging = TRUE;
+                m_currentX = x;
+                DrawCurrent();
+                CaptureMouse();
+                SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
+                              event.GetPosition());
+            }
+            else // click on a column
+            {
+                SendListEvent( event.LeftDown()
+                                    ? wxEVT_COMMAND_LIST_COL_CLICK
+                                    : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+                                event.GetPosition());

             }
             }

-            break;

         }
         }

-        case wxLC_REPORT:
+        else if (event.Moving())

         {
         {

-            wxCoord lw,lh;
-            dc->GetTextExtent( "H", &lw, &lh );
-            m_bound_all.x = 0;
-            m_bound_all.y -= 0;
-            m_bound_all.height = lh+3;
-            m_bound_all.width = window_width;
-            AssignRect( m_bound_hilight, m_bound_all );
-            AssignRect( m_bound_label, m_bound_all );
-            AssignRect( m_bound_icon, 0, 0, 0, 0 );
-            wxNode *node = m_items.First();
-            if (node)
+            bool setCursor;
+            if (hit_border)

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s;
-                item->GetText( s );
-                if (s.IsEmpty()) s = wxT("H");
-                wxCoord lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
-                m_bound_label.width = lw;
-                m_bound_label.height = lh;
-                if (item->HasImage())
-                {
-                    m_bound_icon.x = m_bound_all.x + 2;
-                    m_bound_icon.y = m_bound_all.y + 2;
-                    int w;
-                    int h;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_icon.width = w;
-                    m_bound_icon.height = h;
-                    m_bound_label.x += 4 + w;
-                }
+                setCursor = m_currentCursor == wxSTANDARD_CURSOR;
+                m_currentCursor = m_resizeCursor;

             }
             }

-            break;
+            else
+            {
+                setCursor = m_currentCursor != wxSTANDARD_CURSOR;
+                m_currentCursor = wxSTANDARD_CURSOR;
+            }
+
+            if ( setCursor )
+                SetCursor(*m_currentCursor);

         }
     }
 }
 
         }
     }
 }
 

-void wxListLineData::SetColumnPosition( int index, int x )
+void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )

 {
 {

-    wxNode *node = m_items.Nth( (size_t)index );
-    if (node)
-    {
-        wxListItemData *item = (wxListItemData*)node->Data();
-        item->SetPosition( x, m_bound_all.y+1 );
-    }
+    m_owner->SetFocus();

 }
 
 }
 

-void wxListLineData::GetSize( int &width, int &height )
+void wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)

 {
 {

-    width = m_bound_all.width;
-    height = m_bound_all.height;
-}
+    wxWindow *parent = GetParent();
+    wxListEvent le( type, parent->GetId() );
+    le.SetEventObject( parent );
+    le.m_pointDrag = pos;

 
 

-void wxListLineData::GetExtent( int &x, int &y, int &width, int &height )
-{
-    x = m_bound_all.x;
-    y = m_bound_all.y;
-    width = m_bound_all.width;
-    height = m_bound_all.height;
-}
+    // the position should be relative to the parent window, not
+    // this one for compatibility with MSW and common sense: the
+    // user code doesn't know anything at all about this header
+    // window, so why should it get positions relative to it?
+    le.m_pointDrag.y -= GetSize().y;

 
 

-void wxListLineData::GetLabelExtent( int &x, int &y, int &width, int &height )
-{
-    x = m_bound_label.x;
-    y = m_bound_label.y;
-    width = m_bound_label.width;
-    height = m_bound_label.height;
+    le.m_col = m_column;
+    parent->GetEventHandler()->ProcessEvent( le );

 }
 
 }
 

-void wxListLineData::GetRect( wxRect &rect )
+//-----------------------------------------------------------------------------
+// wxListRenameTimer (internal)
+//-----------------------------------------------------------------------------
+
+wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner )

 {
 {

-    AssignRect( rect, m_bound_all );
+    m_owner = owner;

 }
 
 }
 

-long wxListLineData::IsHit( int x, int y )
+void wxListRenameTimer::Notify()

 {
 {

-    wxNode *node = m_items.First();
-    if (node)
-    {
-        wxListItemData *item = (wxListItemData*)node->Data();
-        if (item->HasImage() && IsInRect( x, y, m_bound_icon )) return wxLIST_HITTEST_ONITEMICON;
-        if (item->HasText() && IsInRect( x, y, m_bound_label )) return wxLIST_HITTEST_ONITEMLABEL;
-//      if (!(item->HasImage() || item->HasText())) return 0;
-    }
-    // if there is no icon or text = empty
-    if (IsInRect( x, y, m_bound_all )) return wxLIST_HITTEST_ONITEMICON;
-    return 0;
+    m_owner->OnRenameTimer();

 }
 
 }
 

-void wxListLineData::InitItems( int num )
+//-----------------------------------------------------------------------------
+// wxListTextCtrl (internal)
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
+    EVT_CHAR           (wxListTextCtrl::OnChar)
+    EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)
+    EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
+END_EVENT_TABLE()
+
+wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit)
+              : m_startValue(owner->GetItemText(itemEdit)),
+                m_itemEdited(itemEdit)

 {
 {

-    for (int i = 0; i < num; i++) m_items.Append( new wxListItemData() );
+    m_owner = owner;
+    m_finished = FALSE;
+
+    wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
+
+    m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
+                                  &rectLabel.x, &rectLabel.y);
+
+    (void)Create(owner, wxID_ANY, m_startValue,
+                 wxPoint(rectLabel.x-4,rectLabel.y-4),
+                 wxSize(rectLabel.width+11,rectLabel.height+8));

 }
 
 }
 

-void wxListLineData::SetItem( int index, const wxListItem &info )
+void wxListTextCtrl::Finish()

 {
 {

-    wxNode *node = m_items.Nth( index );
-    if (node)
+    if ( !m_finished )

     {
     {

-       wxListItemData *item = (wxListItemData*)node->Data();
-       item->SetItem( info );
+        wxPendingDelete.Append(this);
+
+        m_finished = TRUE;
+
+        m_owner->SetFocus();

     }
 }
 
     }
 }
 

-void wxListLineData::GetItem( int index, wxListItem &info )
+bool wxListTextCtrl::AcceptChanges()

 {
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
-    if (node)
+    const wxString value = GetValue();
+
+    if ( value == m_startValue )

     {
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
-        item->GetItem( info );
+        // nothing changed, always accept
+        return TRUE;

     }
     }

-}

 
 

-void wxListLineData::GetText( int index, wxString &s )
-{
-    int i = index;
-    wxNode *node = m_items.Nth( i );
-    s = "";
-    if (node)
+    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )

     {
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
-        item->GetText( s );
+        // vetoed by the user
+        return FALSE;

     }
     }

+
+    // accepted, do rename the item
+    m_owner->SetItemText(m_itemEdited, value);
+
+    return TRUE;

 }
 
 }
 

-void wxListLineData::SetText( int index, const wxString s )
+void wxListTextCtrl::OnChar( wxKeyEvent &event )

 {
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
-    if (node)
+    switch ( event.m_keyCode )

     {
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
-        item->SetText( s );
+        case WXK_RETURN:
+            if ( !AcceptChanges() )
+            {
+                // vetoed by the user code
+                break;
+            }
+            //else: fall through
+
+        case WXK_ESCAPE:
+            Finish();
+            break;
+
+        default:
+            event.Skip();

     }
 }
 
     }
 }
 

-int wxListLineData::GetImage( int index )
+void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )

 {
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
-    if (node)
+    if (m_finished)

     {
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
-        return item->GetImage();
+        event.Skip();
+        return;

     }
     }

-    return -1;
+
+    // auto-grow the textctrl:
+    wxSize parentSize = m_owner->GetSize();
+    wxPoint myPos = GetPosition();
+    wxSize mySize = GetSize();
+    int sx, sy;
+    GetTextExtent(GetValue() + _T("MM"), &sx, &sy);
+    if (myPos.x + sx > parentSize.x)
+        sx = parentSize.x - myPos.x;
+    if (mySize.x > sx)
+        sx = mySize.x;
+    SetSize(sx, -1);
+
+    event.Skip();

 }
 
 }
 

-void wxListLineData::SetAttributes(wxDC *dc,
-                                   const wxListItemAttr *attr,
-                                   const wxColour& colText,
-                                   const wxFont& font,
-                                   bool hilight)
+void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )

 {
 {

-    // don't use foregroud colour for drawing highlighted items - this might
-    // make them completely invisible (and there is no way to do bit
-    // arithmetics on wxColour, unfortunately)
-    if ( !hilight && attr && attr->HasTextColour() )
-    {
-        dc->SetTextForeground(attr->GetTextColour());
-    }
-    else
+    if ( !m_finished )

     {
     {

-        dc->SetTextForeground(colText);
-    }
+        (void)AcceptChanges();

 
 

-    if ( attr && attr->HasFont() )
-    {
-        dc->SetFont(attr->GetFont());
-    }
-    else
-    {
-        dc->SetFont(font);
+        Finish();

     }
     }

+
+    event.Skip();

 }
 
 }
 

-void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
-{
-    wxCoord dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
-    wxCoord dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
-    wxCoord dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 );
-    wxCoord dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 );
+//-----------------------------------------------------------------------------
+//  wxListMainWindow
+//-----------------------------------------------------------------------------

 
 

-    if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))
-    {
-        return;
-    }
+IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow)

 
 

-    wxWindow *listctrl = m_owner->GetParent();
+BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
+  EVT_PAINT          (wxListMainWindow::OnPaint)
+  EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
+  EVT_CHAR           (wxListMainWindow::OnChar)
+  EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
+  EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
+  EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
+  EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
+END_EVENT_TABLE()

 
 

-    // default foreground colour
-    wxColour colText;
-    if ( hilight )
-    {
-        colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
-    }
-    else
-    {
-        colText = listctrl->GetForegroundColour();
-    }
+void wxListMainWindow::Init()
+{
+    m_columns.DeleteContents( TRUE );
+    m_dirty = TRUE;
+    m_countVirt = 0;
+    m_lineFrom =
+    m_lineTo = (size_t)-1;
+    m_linesPerPage = 0;

 
 

-    // default font
-    wxFont font = listctrl->GetFont();
+    m_headerWidth =
+    m_lineHeight = 0;

 
 

-    // VZ: currently we set the colours/fonts only once, but like this (i.e.
-    //     using SetAttributes() inside the loop), it will be trivial to
-    //     customize the subitems (in report mode) too.
-    wxListItemData *item = (wxListItemData*)m_items.First()->Data();
-    wxListItemAttr *attr = item->GetAttributes();
-    SetAttributes(dc, attr, colText, font, hilight);
+    m_small_image_list = (wxImageListType *) NULL;
+    m_normal_image_list = (wxImageListType *) NULL;

 
 

-    bool hasBgCol = attr && attr->HasBackgroundColour();
-    if ( paintBG || hasBgCol )
-    {
-        if (hilight)
-        {
-            dc->SetBrush( * m_hilightBrush );
-        }
-        else
-        {
-            if ( hasBgCol )
-                dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-            else
-                dc->SetBrush( * wxWHITE_BRUSH );
-        }
+    m_small_spacing = 30;
+    m_normal_spacing = 40;

 
 

-        dc->SetPen( * wxTRANSPARENT_PEN );
-        dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
-                           m_bound_hilight.width, m_bound_hilight.height );
-    }
+    m_hasFocus = FALSE;
+    m_dragCount = 0;
+    m_isCreated = FALSE;

 
 

-    if (m_mode == wxLC_REPORT)
-    {
-        wxNode *node = m_items.First();
-        while (node)
-        {
-            wxListItemData *item = (wxListItemData*)node->Data();
-            dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() );
-            int x = item->GetX();
-            if (item->HasImage())
-            {
-                int y = 0;
-                m_owner->DrawImage( item->GetImage(), dc, x, item->GetY() );
-                m_owner->GetImageSize( item->GetImage(), x, y );
-                x += item->GetX() + 5;
-            }
-            if (item->HasText())
-            {
-                dc->DrawText( item->GetText(), x, item->GetY() );
-            }
-            dc->DestroyClippingRegion();
-            node = node->Next();
-        }
-    }
-    else
-    {
-        wxNode *node = m_items.First();
-        if (node)
-        {
-            wxListItemData *item = (wxListItemData*)node->Data();
-            if (item->HasImage())
-            {
-                m_owner->DrawImage( item->GetImage(), dc, m_bound_icon.x, m_bound_icon.y );
-            }
-            if (item->HasText())
-            {
-                dc->DrawText( item->GetText(), m_bound_label.x, m_bound_label.y );
-            }
-        }
-    }
-}
+    m_lastOnSame = FALSE;
+    m_renameTimer = new wxListRenameTimer( this );

 
 

-void wxListLineData::Hilight( bool on )
-{
-    if (on == m_hilighted) return;
-    m_hilighted = on;
-    if (on)
-        m_owner->SelectLine( this );
-    else
-        m_owner->DeselectLine( this );
-}
+    m_current =
+    m_lineLastClicked =
+    m_lineBeforeLastClicked = (size_t)-1;

 
 

-void wxListLineData::ReverseHilight( void )
-{
-    m_hilighted = !m_hilighted;
-    if (m_hilighted)
-        m_owner->SelectLine( this );
-    else
-        m_owner->DeselectLine( this );
+    m_freezeCount = 0;

 }
 
 }
 

-void wxListLineData::DrawRubberBand( wxDC *dc, bool on )
+void wxListMainWindow::InitScrolling()

 {
 {

-    if (on)
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        m_xScroll = SCROLL_UNIT_X;
+        m_yScroll = SCROLL_UNIT_Y;
+    }
+    else

     {
     {

-        dc->SetPen( * wxBLACK_PEN );
-        dc->SetBrush( * wxTRANSPARENT_BRUSH );
-        dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
-                           m_bound_hilight.width, m_bound_hilight.height );
+        m_xScroll = SCROLL_UNIT_Y;
+        m_yScroll = 0;

     }
 }
 
     }
 }
 

-void wxListLineData::Draw( wxDC *dc )
+wxListMainWindow::wxListMainWindow()

 {
 {

-    DoDraw( dc, m_hilighted, m_hilighted );
+    Init();
+
+    m_highlightBrush =
+    m_highlightUnfocusedBrush = (wxBrush *) NULL;
+
+    m_xScroll =
+    m_yScroll = 0;

 }
 
 }
 

-bool wxListLineData::IsInRect( int x, int y, const wxRect &rect )
-{
-    return ((x >= rect.x) && (x <= rect.x+rect.width) &&
-            (y >= rect.y) && (y <= rect.y+rect.height));
+wxListMainWindow::wxListMainWindow( wxWindow *parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long style,
+                                    const wxString &name )
+                : wxScrolledWindow( parent, id, pos, size,
+                                    style | wxHSCROLL | wxVSCROLL, name )
+{
+    Init();
+
+    m_highlightBrush = new wxBrush
+                           (
+                            wxSystemSettings::GetColour
+                            (
+                                wxSYS_COLOUR_HIGHLIGHT
+                            ),
+                            wxSOLID
+                           );
+
+    m_highlightUnfocusedBrush = new wxBrush
+                                    (
+                                       wxSystemSettings::GetColour
+                                       (
+                                           wxSYS_COLOUR_BTNSHADOW
+                                       ),
+                                       wxSOLID
+                                    );
+
+    wxSize sz = size;
+    sz.y = 25;
+
+    InitScrolling();
+    SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
+
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );

 }
 
 }
 

-bool wxListLineData::IsHilighted( void )
+wxListMainWindow::~wxListMainWindow()

 {
 {

-    return m_hilighted;
+    DoDeleteAllItems();
+
+    delete m_highlightBrush;
+    delete m_highlightUnfocusedBrush;
+
+    delete m_renameTimer;

 }
 
 }
 

-void wxListLineData::AssignRect( wxRect &dest, int x, int y, int width, int height )
+void wxListMainWindow::CacheLineData(size_t line)

 {
 {

-    dest.x = x;
-    dest.y = y;
-    dest.width = width;
-    dest.height = height;
+    wxGenericListCtrl *listctrl = GetListCtrl();
+
+    wxListLineData *ld = GetDummyLine();
+
+    size_t countCol = GetColumnCount();
+    for ( size_t col = 0; col < countCol; col++ )
+    {
+        ld->SetText(col, listctrl->OnGetItemText(line, col));
+    }
+
+    ld->SetImage(listctrl->OnGetItemImage(line));
+    ld->SetAttr(listctrl->OnGetItemAttr(line));

 }
 
 }
 

-void wxListLineData::AssignRect( wxRect &dest, const wxRect &source )
+wxListLineData *wxListMainWindow::GetDummyLine() const

 {
 {

-    dest.x = source.x;
-    dest.y = source.y;
-    dest.width = source.width;
-    dest.height = source.height;
-}
+    wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );

 
 

-//-----------------------------------------------------------------------------
-//  wxListHeaderWindow
-//-----------------------------------------------------------------------------
+    wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow);
+    wxListMainWindow *self = wxConstCast(this, wxListMainWindow);

 
 

-BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
-    EVT_PAINT         (wxListHeaderWindow::OnPaint)
-    EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
-    EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
-END_EVENT_TABLE()
+    // we need to recreate the dummy line if the number of columns in the
+    // control changed as it would have the incorrect number of fields
+    // otherwise
+    if ( !m_lines.IsEmpty() &&
+            m_lines[0].m_items.GetCount() != (size_t)GetColumnCount() )
+    {
+        self->m_lines.Clear();
+    }

 
 

-wxListHeaderWindow::wxListHeaderWindow( void )
-{
-    m_owner = (wxListMainWindow *) NULL;
-    m_currentCursor = (wxCursor *) NULL;
-    m_resizeCursor = (wxCursor *) NULL;
-    m_isDragging = FALSE;
+    if ( m_lines.IsEmpty() )
+    {
+        wxListLineData *line = new wxListLineData(self);
+        self->m_lines.Add(line);
+
+        // don't waste extra memory -- there never going to be anything
+        // else/more in this array
+        self->m_lines.Shrink();
+    }
+
+    return &m_lines[0];

 }
 
 }
 

-wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name ) :
-  wxWindow( win, id, pos, size, style, name )
+// ----------------------------------------------------------------------------
+// line geometry (report mode only)
+// ----------------------------------------------------------------------------
+
+wxCoord wxListMainWindow::GetLineHeight() const

 {
 {

-    m_owner = owner;
-//  m_currentCursor = wxSTANDARD_CURSOR;
-    m_currentCursor = (wxCursor *) NULL;
-    m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
-    m_isDragging = FALSE;
-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) );
+    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
+
+    // we cache the line height as calling GetTextExtent() is slow
+    if ( !m_lineHeight )
+    {
+        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
+
+        wxClientDC dc( self );
+        dc.SetFont( GetFont() );
+
+        wxCoord y;
+        dc.GetTextExtent(_T("H"), NULL, &y);
+
+        if ( y < SCROLL_UNIT_Y )
+            y = SCROLL_UNIT_Y;
+        y += EXTRA_HEIGHT;
+
+        self->m_lineHeight = y + LINE_SPACING;
+    }
+
+    return m_lineHeight;

 }
 
 }
 

-wxListHeaderWindow::~wxListHeaderWindow( void )
+wxCoord wxListMainWindow::GetLineY(size_t line) const

 {
 {

-    delete m_resizeCursor;
+    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
+
+    return LINE_SPACING + line*GetLineHeight();

 }
 
 }
 

-void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
+wxRect wxListMainWindow::GetLineRect(size_t line) const

 {
 {

-    const int m_corner = 1;
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectAll;

 
 

-    dc->SetBrush( *wxTRANSPARENT_BRUSH );
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetHeaderWidth();
+    rect.height = GetLineHeight();

 
 

-    dc->SetPen( *wxBLACK_PEN );
-    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
-    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
+    return rect;
+}

 
 

-    wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
+wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectLabel;

 
 

-    dc->SetPen( pen );
-    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
-    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetColumnWidth(0);
+    rect.height = GetLineHeight();

 
 

-    dc->SetPen( *wxWHITE_PEN );
-    dc->DrawRectangle( x, y, w-m_corner+1, 1 );   // top (outer)
-    dc->DrawRectangle( x, y, 1, h );              // left (outer)
-    dc->DrawLine( x, y+h-1, x+1, y+h-1 );
-    dc->DrawLine( x+w-1, y, x+w-1, y+1 );
+    return rect;

 }
 
 }
 

-void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+wxRect wxListMainWindow::GetLineIconRect(size_t line) const

 {
 {

-    wxPaintDC dc( this );
-    PrepareDC( dc );
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        if ( m_owner->GetMode() & wxLC_REPORT )
-        {
-                int x , y ;
-                int xpix , ypix ;
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectIcon;

 
 

-                m_owner->GetScrollPixelsPerUnit( &xpix , &ypix ) ;
-                m_owner->ViewStart( &x, &y ) ;
-            dc.SetDeviceOrigin( -x * xpix, 0 );
-        }
-#endif
-    dc.BeginDrawing();
+    wxListLineData *ld = GetLine(line);
+    wxASSERT_MSG( ld->HasImage(), _T("should have an image") );

 
 

-    dc.SetFont( GetFont() );
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    GetImageSize(ld->GetImage(), rect.width, rect.height);

 
 

-    int w = 0;
-    int h = 0;
-    int x = 0;
-    int y = 0;
-    GetClientSize( &w, &h );
+    return rect;
+}

 
 

-    dc.SetBackgroundMode(wxTRANSPARENT);
-    dc.SetTextForeground( *wxBLACK );
+wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const
+{
+    return InReportView() ? GetLineRect(line)
+                          : GetLine(line)->m_gi->m_rectHighlight;
+}

 
 

-    // do *not* use the listctrl colour for headers - one day we will have a
-    // function to set it separately
+long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
+{
+    wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") );

 
 

-    x = 1;
-    y = 1;
-    int numColumns = m_owner->GetColumnCount();
-    wxListItem item;
-    for (int i = 0; i < numColumns; i++)
+    wxListLineData *ld = GetLine(line);
+
+    if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
+        return wxLIST_HITTEST_ONITEMICON;
+
+    // VS: Testing for "ld->HasText() || InReportView()" instead of
+    //     "ld->HasText()" is needed to make empty lines in report view
+    //     possible
+    if ( ld->HasText() || InReportView() )

     {
     {

-        m_owner->GetColumn( i, item );
-        int cw = item.m_width-2;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        if ((i+1 == numColumns) || ( dc.LogicalToDeviceX(x+item.m_width) > w-5))
-            cw = dc.DeviceToLogicalX(w)-x-1;
-#else
-        if ((i+1 == numColumns) || (x+item.m_width > w-5))
-            cw = w-x-1;
-#endif
-        dc.SetPen( *wxWHITE_PEN );
+        wxRect rect = InReportView() ? GetLineRect(line)
+                                     : GetLineLabelRect(line);

 
 

-        DoDrawRect( &dc, x, y, cw, h-2 );
-        dc.SetClippingRegion( x, y, cw-5, h-4 );
-        dc.DrawText( item.m_text, x+4, y+3 );
-        dc.DestroyClippingRegion();
-        x += item.m_width;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        if (dc.LogicalToDeviceX(x) > w+5) break;
-#else
-        if (x > w+5) break;
-#endif
+        if ( rect.Inside(x, y) )
+            return wxLIST_HITTEST_ONITEMLABEL;

     }
     }

-    dc.EndDrawing();
-}
-
-void wxListHeaderWindow::DrawCurrent()
-{
-    int x1 = m_currentX;
-    int y1 = 0;
-    int x2 = m_currentX-1;
-    int y2 = 0;
-    int dummy;
-    m_owner->GetClientSize( &dummy, &y2 );
-    ClientToScreen( &x1, &y1 );
-    m_owner->ClientToScreen( &x2, &y2 );

 
 

-    wxScreenDC dc;
-    dc.SetLogicalFunction( wxINVERT );
-    dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
-    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+    return 0;
+}

 
 

-    dc.DrawLine( x1, y1, x2, y2 );
+// ----------------------------------------------------------------------------
+// highlight (selection) handling
+// ----------------------------------------------------------------------------

 
 

-    dc.SetLogicalFunction( wxCOPY );
+bool wxListMainWindow::IsHighlighted(size_t line) const
+{
+    if ( IsVirtual() )
+    {
+        return m_selStore.IsSelected(line);
+    }
+    else // !virtual
+    {
+        wxListLineData *ld = GetLine(line);
+        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") );

 
 

-    dc.SetPen( wxNullPen );
-    dc.SetBrush( wxNullBrush );
+        return ld->IsHighlighted();
+    }

 }
 
 }
 

-void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
+void wxListMainWindow::HighlightLines( size_t lineFrom,
+                                       size_t lineTo,
+                                       bool highlight )

 {
 {

-    wxCoord x = (wxCoord)event.GetX();
-    wxCoord y = (wxCoord)event.GetY();
-    if (m_isDragging)
+    if ( IsVirtual() )

     {
     {

-        DrawCurrent();
-        if (event.ButtonUp())
+        wxArrayInt linesChanged;
+        if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight,
+                                     &linesChanged) )

         {
         {

-            ReleaseMouse();
-            m_isDragging = FALSE;
-            m_owner->SetColumnWidth( m_column, m_currentX-m_minX );
+            // meny items changed state, refresh everything
+            RefreshLines(lineFrom, lineTo);

         }
         }

-        else
+        else // only a few items changed state, refresh only them

         {
         {

-            int size_x = 0;
-            int dummy;
-            GetClientSize( &size_x, & dummy );
-            if (x > m_minX+7)
-                m_currentX = x;
-            else
-                m_currentX = m_minX+7;
-            if (m_currentX > size_x-7) m_currentX = size_x-7;
-            DrawCurrent();
+            size_t count = linesChanged.GetCount();
+            for ( size_t n = 0; n < count; n++ )
+            {
+                RefreshLine(linesChanged[n]);
+            }

         }
         }

-        return;

     }
     }

-
-    m_minX = 0;
-    bool hit_border = FALSE;
-    int xpos = 0;
-    for (int j = 0; j < m_owner->GetColumnCount()-1; j++)
+    else // iterate over all items in non report view

     {
     {

-        xpos += m_owner->GetColumnWidth( j );
-        m_column = j;
-        if ((abs(x-xpos) < 3) && (y < 22))
-        {
-            hit_border = TRUE;
-            break;
-        }
-        if (x-xpos < 0)
+        for ( size_t line = lineFrom; line <= lineTo; line++ )

         {
         {

-            break;
+            if ( HighlightLine(line, highlight) )
+            {
+                RefreshLine(line);
+            }

         }
         }

-        m_minX = xpos;

     }
     }

+}
+
+bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
+{
+    bool changed;

 
 

-    if (event.LeftDown())
+    if ( IsVirtual() )

     {
     {

-        if (hit_border)
-        {
-            m_isDragging = TRUE;
-            m_currentX = x;
-            DrawCurrent();
-            CaptureMouse();
-            return;
-        }
-        else
-        {
-            wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
-            le.SetEventObject( GetParent() );
-            le.m_col = m_column;
-            GetParent()->GetEventHandler()->ProcessEvent( le );
-            return;
-        }
+        changed = m_selStore.SelectItem(line, highlight);
+    }
+    else // !virtual
+    {
+        wxListLineData *ld = GetLine(line);
+        wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") );
+
+        changed = ld->Highlight(highlight);

     }
 
     }
 

-    if (event.Moving())
+    if ( changed )

     {
     {

-        if (hit_border)
-        {
-            if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( * m_resizeCursor );
-            m_currentCursor = m_resizeCursor;
-        }
-        else
-        {
-            if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( * wxSTANDARD_CURSOR );
-            m_currentCursor = wxSTANDARD_CURSOR;
-        }
+        SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED
+                                    : wxEVT_COMMAND_LIST_ITEM_DESELECTED );

     }
     }

+
+    return changed;

 }
 
 }
 

-void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
+void wxListMainWindow::RefreshLine( size_t line )

 {
 {

-    m_owner->SetFocus();
-}
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);

 
 

-//-----------------------------------------------------------------------------
-// wxListRenameTimer (internal)
-//-----------------------------------------------------------------------------
+        if ( line < visibleFrom || line > visibleTo )
+            return;
+    }

 
 

-wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner )
-{
-    m_owner = owner;
+    wxRect rect = GetLineRect(line);
+
+    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    RefreshRect( rect );

 }
 
 }
 

-void wxListRenameTimer::Notify()
+void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )

 {
 {

-    m_owner->OnRenameTimer();
-}
+    // we suppose that they are ordered by caller
+    wxASSERT_MSG( lineFrom <= lineTo, _T("indices in disorder") );

 
 

-//-----------------------------------------------------------------------------
-// wxListTextCtrl (internal)
-//-----------------------------------------------------------------------------
+    wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl);
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);

 
 

-BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
-    EVT_CHAR           (wxListTextCtrl::OnChar)
-    EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
-END_EVENT_TABLE()
+        if ( lineFrom < visibleFrom )
+            lineFrom = visibleFrom;
+        if ( lineTo > visibleTo )
+            lineTo = visibleTo;

 
 

-wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
-    bool *accept, wxString *res, wxListMainWindow *owner,
-    const wxString &value, const wxPoint &pos, const wxSize &size,
-#if wxUSE_VALIDATORS
-    int style, const wxValidator& validator, const wxString &name ) :
-#endif
-  wxTextCtrl( parent, id, value, pos, size, style, validator, name )
-{
-    m_res = res;
-    m_accept = accept;
-    m_owner = owner;
-    (*m_accept) = FALSE;
-    (*m_res) = "";
-    m_startValue = value;
-}
+        wxRect rect;
+        rect.x = 0;
+        rect.y = GetLineY(lineFrom);
+        rect.width = GetClientSize().x;
+        rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();

 
 

-void wxListTextCtrl::OnChar( wxKeyEvent &event )
-{
-    if (event.m_keyCode == WXK_RETURN)
-    {
-        (*m_accept) = TRUE;
-        (*m_res) = GetValue();
-        m_owner->SetFocus();
-        return;
+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+        RefreshRect( rect );

     }
     }

-    if (event.m_keyCode == WXK_ESCAPE)
+    else // !report

     {
     {

-        (*m_accept) = FALSE;
-        (*m_res) = "";
-        m_owner->SetFocus();
-        return;
+        // TODO: this should be optimized...
+        for ( size_t line = lineFrom; line <= lineTo; line++ )
+        {
+            RefreshLine(line);
+        }

     }
     }

-    event.Skip();

 }
 
 }
 

-void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
+void wxListMainWindow::RefreshAfter( size_t lineFrom )

 {
 {

-    if (wxPendingDelete.Member(this)) return;
-
-    wxPendingDelete.Append(this);
-
-    if ((*m_accept) && ((*m_res) != m_startValue))
-        m_owner->OnRenameAccept();
-}
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);

 
 

-//-----------------------------------------------------------------------------
-//  wxListMainWindow
-//-----------------------------------------------------------------------------
+        if ( lineFrom < visibleFrom )
+            lineFrom = visibleFrom;
+        else if ( lineFrom > visibleTo )
+            return;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow);
+        wxRect rect;
+        rect.x = 0;
+        rect.y = GetLineY(lineFrom);
+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

 
 

-BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
-  EVT_PAINT          (wxListMainWindow::OnPaint)
-  EVT_SIZE           (wxListMainWindow::OnSize)
-  EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
-  EVT_CHAR           (wxListMainWindow::OnChar)
-  EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
-  EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
-  EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
-  EVT_SCROLLWIN                 (wxListMainWindow::OnScroll)
-END_EVENT_TABLE()
+        wxSize size = GetClientSize();
+        rect.width = size.x;
+        // refresh till the bottom of the window
+        rect.height = size.y - rect.y;

 
 

-wxListMainWindow::wxListMainWindow()
-{
-    m_mode = 0;
-    m_lines.DeleteContents( TRUE );
-    m_columns.DeleteContents( TRUE );
-    m_current = (wxListLineData *) NULL;
-    m_visibleLines = 0;
-    m_hilightBrush = (wxBrush *) NULL;
-    m_xScroll = 0;
-    m_yScroll = 0;
-    m_dirty = TRUE;
-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
-    m_small_spacing = 30;
-    m_normal_spacing = 40;
-    m_hasFocus = FALSE;
-    m_usedKeys = TRUE;
-    m_lastOnSame = FALSE;
-    m_renameTimer = new wxListRenameTimer( this );
-    m_isCreated = FALSE;
-    m_dragCount = 0;
+        RefreshRect( rect );
+    }
+    else // !report
+    {
+        // TODO: how to do it more efficiently?
+        m_dirty = TRUE;
+    }

 }
 
 }
 

-wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name ) :
-  wxScrolledWindow( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name )
-{
-    m_mode = style;
-    m_lines.DeleteContents( TRUE );
-    m_columns.DeleteContents( TRUE );
-    m_current = (wxListLineData *) NULL;
-    m_dirty = TRUE;
-    m_visibleLines = 0;
-    m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
-    m_small_spacing = 30;
-    m_normal_spacing = 40;
-    m_hasFocus = FALSE;
-    m_dragCount = 0;
-    m_isCreated = FALSE;
-    wxSize sz = size;
-    sz.y = 25;
-
-    if (m_mode & wxLC_REPORT)
+void wxListMainWindow::RefreshSelected()
+{
+    if ( IsEmpty() )
+        return;
+
+    size_t from, to;
+    if ( InReportView() )

     {
     {

-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        m_xScroll = 15;
-#else
-        m_xScroll = 0;
-#endif
-        m_yScroll = 15;
+        GetVisibleLinesRange(&from, &to);

     }
     }

-    else
+    else // !virtual

     {
     {

-        m_xScroll = 15;
-        m_yScroll = 0;
+        from = 0;
+        to = GetItemCount() - 1;

     }
     }

-    SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );

 
 

-    m_usedKeys = TRUE;
-    m_lastOnSame = FALSE;
-    m_renameTimer = new wxListRenameTimer( this );
-    m_renameAccept = FALSE;
+    if ( HasCurrent() && m_current >= from && m_current <= to )
+    {
+        RefreshLine(m_current);
+    }

 
 

-    SetBackgroundColour( *wxWHITE );
+    for ( size_t line = from; line <= to; line++ )
+    {
+        // NB: the test works as expected even if m_current == -1
+        if ( line != m_current && IsHighlighted(line) )
+        {
+            RefreshLine(line);
+        }
+    }

 }
 
 }
 

-wxListMainWindow::~wxListMainWindow()
+void wxListMainWindow::Freeze()

 {
 {

-    if (m_hilightBrush) delete m_hilightBrush;
-
-    delete m_renameTimer;
+    m_freezeCount++;

 }
 
 }
 

-void wxListMainWindow::RefreshLine( wxListLineData *line )
+void wxListMainWindow::Thaw()

 {
 {

-    if (m_dirty) return;
+    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );

 
 

-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
-    if (line)
+    if ( !--m_freezeCount )

     {
     {

-        wxClientDC dc(this);
-        PrepareDC( dc );
-        line->GetExtent( x, y, w, h );
-        wxRect rect(
-          dc.LogicalToDeviceX(x-3),
-          dc.LogicalToDeviceY(y-3),
-          dc.LogicalToDeviceXRel(w+6),
-          dc.LogicalToDeviceXRel(h+6) );
-        Refresh( TRUE, &rect );
+        Refresh();

     }
 }
 
     }
 }
 


@@ -1192,206 +2750,308 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     // Note: a wxPaintDC must be constructed even if no drawing is
     // done (a Windows requirement).
     wxPaintDC dc( this );
     // Note: a wxPaintDC must be constructed even if no drawing is
     // done (a Windows requirement).
     wxPaintDC dc( this );

-    PrepareDC( dc );

 
 

-    if (m_dirty) return;
+    if ( IsEmpty() || m_freezeCount )
+    {
+        // nothing to draw or not the moment to draw it
+        return;
+    }
+
+    if ( m_dirty )
+    {
+        // delay the repainting until we calculate all the items positions
+        return;
+    }
+
+    PrepareDC( dc );

 
 

-    if (m_lines.GetCount() == 0) return;
+    int dev_x, dev_y;
+    CalcScrolledPosition( 0, 0, &dev_x, &dev_y );

 
     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );
 
 
     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );
 

-    if (m_mode & wxLC_REPORT)
+    if ( HasFlag(wxLC_REPORT) )

     {
     {

-        int lineSpacing = 0;
-        wxListLineData *line = (wxListLineData*)m_lines.First()->Data();
-        int dummy = 0;
-        line->GetSize( dummy, lineSpacing );
-        lineSpacing += 1;
+        int lineHeight = GetLineHeight();
+
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        wxRect rectLine;
+        wxCoord xOrig, yOrig;
+        CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
+
+        // tell the caller cache to cache the data
+        if ( IsVirtual() )
+        {
+            wxListEvent evCache(wxEVT_COMMAND_LIST_CACHE_HINT,
+                                GetParent()->GetId());
+            evCache.SetEventObject( GetParent() );
+            evCache.m_oldItemIndex = visibleFrom;
+            evCache.m_itemIndex = visibleTo;
+            GetParent()->GetEventHandler()->ProcessEvent( evCache );
+        }
+
+        for ( size_t line = visibleFrom; line <= visibleTo; line++ )
+        {
+            rectLine = GetLineRect(line);

 
 

-        int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
+            if ( !IsExposed(rectLine.x - xOrig, rectLine.y - yOrig,
+                            rectLine.width, rectLine.height) )
+            {
+                // don't redraw unaffected lines to avoid flicker
+                continue;
+            }
+
+            GetLine(line)->DrawInReportMode( &dc,
+                                             rectLine,
+                                             GetLineHighlightRect(line),
+                                             IsHighlighted(line) );
+        }

 
 

-        wxNode *node = m_lines.Nth( y_s / lineSpacing );
-        for (int i = 0; i < m_visibleLines+2; i++)
+        if ( HasFlag(wxLC_HRULES) )

         {
         {

-            if (!node) break;
+            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxSize clientSize = GetClientSize();

 
 

-            line = (wxListLineData*)node->Data();
-            line->Draw( &dc );
-            node = node->Next();
+            for ( size_t i = visibleFrom; i <= visibleTo; i++ )
+            {
+                dc.SetPen(pen);
+                dc.SetBrush( *wxTRANSPARENT_BRUSH );
+                dc.DrawLine(0 - dev_x, i*lineHeight,
+                            clientSize.x - dev_x, i*lineHeight);
+            }
+
+            // Draw last horizontal rule
+            if ( visibleTo > visibleFrom )
+            {
+                dc.SetPen(pen);
+                dc.SetBrush( *wxTRANSPARENT_BRUSH );
+                dc.DrawLine(0 - dev_x, m_lineTo*lineHeight,
+                            clientSize.x - dev_x , m_lineTo*lineHeight );
+            }
+        }
+
+        // Draw vertical rules if required
+        if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
+        {
+            wxPen pen(GetRuleColour(), 1, wxSOLID);
+
+            int col = 0;
+            wxRect firstItemRect;
+            wxRect lastItemRect;
+            GetItemRect(0, firstItemRect);
+            GetItemRect(GetItemCount() - 1, lastItemRect);
+            int x = firstItemRect.GetX();
+            dc.SetPen(pen);
+            dc.SetBrush(* wxTRANSPARENT_BRUSH);
+            for (col = 0; col < GetColumnCount(); col++)
+            {
+                int colWidth = GetColumnWidth(col);
+                x += colWidth;
+                dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y,
+                            x - dev_x, lastItemRect.GetBottom() + 1 - dev_y);
+            }

         }
     }
         }
     }

-    else
+    else // !report

     {
     {

-        wxNode *node = m_lines.First();
-        while (node)
+        size_t count = GetItemCount();
+        for ( size_t i = 0; i < count; i++ )

         {
         {

-            wxListLineData *line = (wxListLineData*)node->Data();
-            line->Draw( &dc );
-            node = node->Next();
+            GetLine(i)->Draw( &dc );

         }
     }
 
         }
     }
 

-    if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
+    if ( HasCurrent() )
+    {
+        // don't draw rect outline under Max if we already have the background
+        // color but under other platforms only draw it if we do: it is a bit
+        // silly to draw "focus rect" if we don't have focus!
+#ifdef __WXMAC__
+        if ( !m_hasFocus )
+#else // !__WXMAC__
+        if ( m_hasFocus )
+#endif // __WXMAC__/!__WXMAC__
+        {
+            dc.SetPen( *wxBLACK_PEN );
+            dc.SetBrush( *wxTRANSPARENT_BRUSH );
+            dc.DrawRectangle( GetLineHighlightRect(m_current) );
+        }
+    }

 
     dc.EndDrawing();
 }
 
 
     dc.EndDrawing();
 }
 

-void wxListMainWindow::HilightAll( bool on )
+void wxListMainWindow::HighlightAll( bool on )

 {
 {

-    wxNode *node = m_lines.First();
-    while (node)
+    if ( IsSingleSel() )

     {
     {

-        wxListLineData *line = (wxListLineData *)node->Data();
-        if (line->IsHilighted() != on)
+        wxASSERT_MSG( !on, _T("can't do this in a single sel control") );
+
+        // we just have one item to turn off
+        if ( HasCurrent() && IsHighlighted(m_current) )

         {
         {

-            line->Hilight( on );
-            RefreshLine( line );
+            HighlightLine(m_current, FALSE);
+            RefreshLine(m_current);

         }
         }

-        node = node->Next();
+    }
+    else // multi sel
+    {
+        HighlightLines(0, GetItemCount() - 1, on);

     }
 }
 
     }
 }
 

-void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command )
+void wxListMainWindow::SendNotify( size_t line,
+                                   wxEventType command,
+                                   wxPoint point )

 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );

-    le.m_itemIndex = GetIndexOfLine( line );
-    line->GetItem( 0, le.m_item );
-    GetParent()->GetEventHandler()->ProcessEvent( le );
-//    GetParent()->GetEventHandler()->AddPendingEvent( le );
-}
+    le.m_itemIndex = line;

 
 

-void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
-{
-//  SendNotify( line, wxEVT_COMMAND_LIST_ITEM_FOCUSSED );
-}
+    // set only for events which have position
+    if ( point != wxDefaultPosition )
+        le.m_pointDrag = point;

 
 

-void wxListMainWindow::UnfocusLine( wxListLineData *WXUNUSED(line) )
-{
-//  SendNotify( line, wxEVT_COMMAND_LIST_ITEM_UNFOCUSSED );
-}
+    // don't try to get the line info for virtual list controls: the main
+    // program has it anyhow and if we did it would result in accessing all
+    // the lines, even those which are not visible now and this is precisely
+    // what we're trying to avoid
+    if ( !IsVirtual() && (command != wxEVT_COMMAND_LIST_DELETE_ITEM) )
+    {
+        if ( line != (size_t)-1 )
+        {
+            GetLine(line)->GetItem( 0, le.m_item );
+        }
+        //else: this happens for wxEVT_COMMAND_LIST_ITEM_FOCUSED event
+    }
+    //else: there may be no more such item

 
 

-void wxListMainWindow::SelectLine( wxListLineData *line )
-{
-    SendNotify( line, wxEVT_COMMAND_LIST_ITEM_SELECTED );
+    GetParent()->GetEventHandler()->ProcessEvent( le );

 }
 
 }
 

-void wxListMainWindow::DeselectLine( wxListLineData *line )
+void wxListMainWindow::ChangeCurrent(size_t current)

 {
 {

-    SendNotify( line, wxEVT_COMMAND_LIST_ITEM_DESELECTED );
-}
+    m_current = current;

 
 

-void wxListMainWindow::DeleteLine( wxListLineData *line )
-{
-    SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
+    SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);

 }
 
 }
 

-/* *** */
-

 void wxListMainWindow::EditLabel( long item )
 {
 void wxListMainWindow::EditLabel( long item )
 {

-    wxNode *node = m_lines.Nth( (size_t)item );
-    wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") );
+    wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),
+                 wxT("wrong index in wxGenericListCtrl::EditLabel()") );

 
 

-    m_currentEdit = (wxListLineData*) node->Data();
+    size_t itemEdit = (size_t)item;

 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );

-    le.m_itemIndex = GetIndexOfLine( m_currentEdit );
-    m_currentEdit->GetItem( 0, le.m_item );
-    GetParent()->GetEventHandler()->ProcessEvent( le );
-
-    if (!le.IsAllowed())
+    le.m_itemIndex = item;
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_RET( data, _T("invalid index in EditLabel()") );
+    data->GetItem( 0, le.m_item );
+    if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+    {
+        // vetoed by user code

         return;
         return;

+    }

 
 

-    // We have to call this here because the label in
-    // question might just have been added and no screen
-    // update taken place.
-    if (m_dirty) wxYield();
+    // We have to call this here because the label in question might just have
+    // been added and no screen update taken place.
+    if ( m_dirty )
+        wxSafeYield();

 
 

-    wxString s;
-    m_currentEdit->GetText( 0, s );
-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
-    m_currentEdit->GetLabelExtent( x, y, w, h );
-
-    wxClientDC dc(this);
-    PrepareDC( dc );
-    x = dc.LogicalToDeviceX( x );
-    y = dc.LogicalToDeviceY( y );
+    wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit);

 
 

-    wxListTextCtrl *text = new wxListTextCtrl(
-      this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) );

     text->SetFocus();
 }
 
 void wxListMainWindow::OnRenameTimer()
 {
     text->SetFocus();
 }
 
 void wxListMainWindow::OnRenameTimer()
 {

-    wxCHECK_RET( m_current, wxT("invalid m_current") );
+    wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") );

 
 

-    Edit( m_lines.IndexOf( m_current ) );
+    EditLabel( m_current );

 }
 
 }
 

-void wxListMainWindow::OnRenameAccept()
+bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)

 {
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
 {
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );

-    le.m_itemIndex = GetIndexOfLine( m_currentEdit );
-    m_currentEdit->GetItem( 0, le.m_item );
-    le.m_item.m_text = m_renameRes;
-    GetParent()->GetEventHandler()->ProcessEvent( le );
+    le.m_itemIndex = itemEdit;

 
 

-    if (!le.IsAllowed()) return;
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_MSG( data, FALSE, _T("invalid index in OnRenameAccept()") );

 
 

-    wxListItem info;
-    info.m_mask = wxLIST_MASK_TEXT;
-    info.m_itemId = le.m_itemIndex;
-    info.m_text = m_renameRes;
-    info.SetTextColour(le.m_item.GetTextColour());
-    SetItem( info );
+    data->GetItem( 0, le.m_item );
+    le.m_item.m_text = value;
+    return !GetParent()->GetEventHandler()->ProcessEvent( le ) ||
+                le.IsAllowed();

 }
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
 }
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {

-    if (GetParent()->GetEventHandler()->ProcessEvent( event)) return;
+    event.SetEventObject( GetParent() );
+    if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+        return;
+
+    if ( !HasCurrent() || IsEmpty() )
+        return;
+
+    if (m_dirty)
+        return;

 
 

-    if (!m_current) return;
-    if (m_dirty) return;
-    if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || event.ButtonDClick()) ) return;
+    if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() ||
+        event.ButtonDClick()) )
+        return;

 
 

-    wxClientDC dc(this);
-    PrepareDC(dc);
-    wxCoord x = dc.DeviceToLogicalX( (wxCoord)event.GetX() );
-    wxCoord y = dc.DeviceToLogicalY( (wxCoord)event.GetY() );
+    int x = event.GetX();
+    int y = event.GetY();
+    CalcUnscrolledPosition( x, y, &x, &y );

 
 

-    /* Did we actually hit an item ? */
+    // where did we hit it (if we did)?

     long hitResult = 0;
     long hitResult = 0;

-    wxNode *node = m_lines.First();
-    wxListLineData *line = (wxListLineData *) NULL;
-    while (node)
+
+    size_t count = GetItemCount(),
+           current;
+
+    if ( HasFlag(wxLC_REPORT) )

     {
     {

-        line = (wxListLineData*)node->Data();
-        hitResult = line->IsHit( x, y );
-        if (hitResult) break;
-        line = (wxListLineData *) NULL;
-        node = node->Next();
+        current = y / GetLineHeight();
+        if ( current < count )
+            hitResult = HitTestLine(current, x, y);
+    }
+    else // !report
+    {
+        // TODO: optimize it too! this is less simple than for report view but
+        //       enumerating all items is still not a way to do it!!
+        for ( current = 0; current < count; current++ )
+        {
+            hitResult = HitTestLine(current, x, y);
+            if ( hitResult )
+                break;
+        }

     }
 
     if (event.Dragging())
     {
         if (m_dragCount == 0)
     }
 
     if (event.Dragging())
     {
         if (m_dragCount == 0)

-            m_dragStart = wxPoint(x,y);
+        {
+            // we have to report the raw, physical coords as we want to be
+            // able to call HitTest(event.m_pointDrag) from the user code to
+            // get the item being dragged
+            m_dragStart = event.GetPosition();
+        }

 
         m_dragCount++;
 
 
         m_dragCount++;
 

-        if (m_dragCount != 3) return;
+        if (m_dragCount != 3)
+            return;

 
 

-        int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
-        if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+        int command = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG
+                                          : wxEVT_COMMAND_LIST_BEGIN_DRAG;

 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );


@@ -1405,163 +3065,193 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_dragCount = 0;
     }
 
         m_dragCount = 0;
     }
 

-    if (!line) return;
+    if ( !hitResult )
+    {
+        // outside of any item
+        return;
+    }

 
 

+    bool forceClick = FALSE;

     if (event.ButtonDClick())
     {
     if (event.ButtonDClick())
     {

-        m_usedKeys = FALSE;
-        m_lastOnSame = FALSE;

         m_renameTimer->Stop();
         m_renameTimer->Stop();

+        m_lastOnSame = FALSE;

 
 

-        SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+#ifdef __WXGTK__
+        // FIXME: wxGTK generates bad sequence of events prior to doubleclick
+        //        ("down, up, down, double, up" while other ports
+        //        do "down, up, double, up"). We have to have this hack
+        //        in place till somebody fixes wxGTK...
+        if ( current == m_lineBeforeLastClicked )
+#else
+        if ( current == m_lineLastClicked )
+#endif
+        {
+            SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );

 
 

-       return;
+            return;
+        }
+        else
+        {
+            // the first click was on another item, so don't interpret this as
+            // a double click, but as a simple click instead
+            forceClick = TRUE;
+        }

     }
 
     if (event.LeftUp() && m_lastOnSame)
     {
     }
 
     if (event.LeftUp() && m_lastOnSame)
     {

-        m_usedKeys = FALSE;
-        if ((line == m_current) &&
+        if ((current == m_current) &&

             (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
             (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&

-            (m_mode & wxLC_EDIT_LABELS)  )
+            HasFlag(wxLC_EDIT_LABELS)  )

         {
             m_renameTimer->Start( 100, TRUE );
         }
         m_lastOnSame = FALSE;
         {
             m_renameTimer->Start( 100, TRUE );
         }
         m_lastOnSame = FALSE;

-        return;

     }
     }

-
-    if (event.RightDown())
+    else if (event.RightDown())

     {
     {

-        SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK );
-        return;
+        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
+                    event.GetPosition() );

     }
     }

-
-    if (event.MiddleDown())
+    else if (event.MiddleDown())

     {
     {

-        SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );
-        return;
+        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );

     }
     }

-
-    if (event.LeftDown())
+    else if ( event.LeftDown() || forceClick )

     {
     {

-        m_usedKeys = FALSE;
-        wxListLineData *oldCurrent = m_current;
-        if (m_mode & wxLC_SINGLE_SEL)
+        m_lineBeforeLastClicked = m_lineLastClicked;
+        m_lineLastClicked = current;
+
+        size_t oldCurrent = m_current;
+
+        if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )

         {
         {

-            m_current = line;
-            HilightAll( FALSE );
-            m_current->ReverseHilight();
-            RefreshLine( m_current );
+            HighlightAll( FALSE );
+
+            ChangeCurrent(current);
+
+            ReverseHighlight(m_current);

         }
         }

-        else
+        else // multi sel & either ctrl or shift is down

         {
         {

-            if (event.ShiftDown())
+            if (event.ControlDown())

             {
             {

-                m_current = line;
-                m_current->ReverseHilight();
-                RefreshLine( m_current );
+                ChangeCurrent(current);
+
+                ReverseHighlight(m_current);

             }
             }

-            else if (event.ControlDown())
+            else if (event.ShiftDown())

             {
             {

-                m_current = line;
-
-                int numOfCurrent = -1;
-                node = m_lines.First();
-                while (node)
-                {
-                    wxListLineData *test_line = (wxListLineData*)node->Data();
-                    numOfCurrent++;
-                    if (test_line == oldCurrent) break;
-                    node = node->Next();
-                }
+                ChangeCurrent(current);

 
 

-                int numOfLine = -1;
-                node = m_lines.First();
-                while (node)
-                {
-                    wxListLineData *test_line = (wxListLineData*)node->Data();
-                    numOfLine++;
-                    if (test_line == line) break;
-                    node = node->Next();
-                }
+                size_t lineFrom = oldCurrent,
+                       lineTo = current;

 
 

-                if (numOfLine < numOfCurrent)
+                if ( lineTo < lineFrom )

                 {
                 {

-                    int i = numOfLine;
-                    numOfLine = numOfCurrent;
-                    numOfCurrent = i;
+                    lineTo = lineFrom;
+                    lineFrom = m_current;

                 }
 
                 }
 

-                wxNode *node = m_lines.Nth( numOfCurrent );
-                for (int i = 0; i <= numOfLine-numOfCurrent; i++)
-                {
-                    wxListLineData *test_line= (wxListLineData*)node->Data();
-                    test_line->Hilight(TRUE);
-                    RefreshLine( test_line );
-                    node = node->Next();
-                }
+                HighlightLines(lineFrom, lineTo);

             }
             }

-            else
+            else // !ctrl, !shift

             {
             {

-                m_current = line;
-                HilightAll( FALSE );
-                m_current->ReverseHilight();
-                RefreshLine( m_current );
+                // test in the enclosing if should make it impossible
+                wxFAIL_MSG( _T("how did we get here?") );

             }
         }
             }
         }

+

         if (m_current != oldCurrent)
         {
             RefreshLine( oldCurrent );
         if (m_current != oldCurrent)
         {
             RefreshLine( oldCurrent );

-            UnfocusLine( oldCurrent );
-            FocusLine( m_current );

         }
         }

-        m_lastOnSame = (m_current == oldCurrent);
-        return;
+
+        // forceClick is only set if the previous click was on another item
+        m_lastOnSame = !forceClick && (m_current == oldCurrent);

     }
 }
 
     }
 }
 

-void wxListMainWindow::MoveToFocus()
+void wxListMainWindow::MoveToItem(size_t item)

 {
 {

-    if (!m_current) return;
+    if ( item == (size_t)-1 )
+        return;
+
+    wxRect rect = GetLineRect(item);

 
 

-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
-    m_current->GetExtent( x, y, w, h );
+    int client_w, client_h;
+    GetClientSize( &client_w, &client_h );

 
 

-    int w_p = 0;
-    int h_p = 0;
-    GetClientSize( &w_p, &h_p );
+    int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL );
+    int view_y = m_yScroll*GetScrollPos( wxVERTICAL );

 
 

-    if (m_mode & wxLC_REPORT)
+    if ( HasFlag(wxLC_REPORT) )

     {
     {

-        int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
-        if ((y > y_s) && (y+h < y_s+h_p)) return;
-        if (y-y_s < 5) { Scroll( -1, (y-5-h_p/2)/m_yScroll ); }
-        if (y+h+5 > y_s+h_p) { Scroll( -1, (y+h-h_p/2+h+15)/m_yScroll); }
+        // the next we need the range of lines shown it might be different, so
+        // recalculate it
+        ResetVisibleLinesRange();
+
+        if (rect.y < view_y )
+            Scroll( -1, rect.y/m_yScroll );
+        if (rect.y+rect.height+5 > view_y+client_h)
+            Scroll( -1, (rect.y+rect.height-client_h+SCROLL_UNIT_Y)/m_yScroll );

     }
     }

-    else
+    else // !report

     {
     {

-        int x_s = m_xScroll*GetScrollPos( wxHORIZONTAL );
-        if ((x > x_s) && (x+w < x_s+w_p)) return;
-        if (x-x_s < 5) { Scroll( (x-5)/m_xScroll, -1 ); }
-        if (x+w-5 > x_s+w_p) { Scroll( (x+w-w_p+15)/m_xScroll, -1 ); }
+        if (rect.x-view_x < 5)
+            Scroll( (rect.x-5)/m_xScroll, -1 );
+        if (rect.x+rect.width-5 > view_x+client_w)
+            Scroll( (rect.x+rect.width-client_w+SCROLL_UNIT_X)/m_xScroll, -1 );

     }
 }
 
     }
 }
 

-void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
+// ----------------------------------------------------------------------------
+// keyboard handling
+// ----------------------------------------------------------------------------
+
+void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)

 {
 {

-    if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE );
-    wxListLineData *oldCurrent = m_current;
-    m_current = newCurrent;
-    MoveToFocus();
-    if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE );
+    wxCHECK_RET( newCurrent < (size_t)GetItemCount(),
+                 _T("invalid item index in OnArrowChar()") );
+
+    size_t oldCurrent = m_current;
+
+    // in single selection we just ignore Shift as we can't select several
+    // items anyhow
+    if ( event.ShiftDown() && !IsSingleSel() )
+    {
+        ChangeCurrent(newCurrent);
+
+        // select all the items between the old and the new one
+        if ( oldCurrent > newCurrent )
+        {
+            newCurrent = oldCurrent;
+            oldCurrent = m_current;
+        }
+
+        HighlightLines(oldCurrent, newCurrent);
+    }
+    else // !shift
+    {
+        // all previously selected items are unselected unless ctrl is held
+        if ( !event.ControlDown() )
+            HighlightAll(FALSE);
+
+        ChangeCurrent(newCurrent);
+
+        // refresh the old focus to remove it
+        RefreshLine( oldCurrent );
+
+        if ( !event.ControlDown() )
+        {
+            HighlightLine( m_current, TRUE );
+        }
+    }
+

     RefreshLine( m_current );
     RefreshLine( m_current );

-    RefreshLine( oldCurrent );
-    FocusLine( m_current );
-    UnfocusLine( oldCurrent );
+
+    MoveToFocus();

 }
 
 void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
 }
 
 void wxListMainWindow::OnKeyDown( wxKeyEvent &event )


@@ -1588,10 +3278,15 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     wxWindow *parent = GetParent();
 
     /* we send a list_key event up */
     wxWindow *parent = GetParent();
 
     /* we send a list_key event up */

-    wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
-    le.m_code = (int)event.KeyCode();
-    le.SetEventObject( parent );
-    parent->GetEventHandler()->ProcessEvent( le );
+    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 = (int)event.KeyCode();
+        le.SetEventObject( parent );
+        parent->GetEventHandler()->ProcessEvent( le );
+    }

 
     /* we propagate the char event up */
     wxKeyEvent ke( wxEVT_CHAR );
 
     /* we propagate the char event up */
     wxKeyEvent ke( wxEVT_CHAR );


@@ -1608,13 +3303,16 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     if (event.KeyCode() == WXK_TAB)
     {
         wxNavigationKeyEvent nevent;
     if (event.KeyCode() == WXK_TAB)
     {
         wxNavigationKeyEvent nevent;

+        nevent.SetWindowChange( event.ControlDown() );

         nevent.SetDirection( !event.ShiftDown() );
         nevent.SetDirection( !event.ShiftDown() );

+        nevent.SetEventObject( GetParent()->GetParent() );

         nevent.SetCurrentFocus( m_parent );
         nevent.SetCurrentFocus( m_parent );

-        if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;
+        if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent ))
+            return;

     }
 
     /* no item -> nothing to do */
     }
 
     /* no item -> nothing to do */

-    if (!m_current)
+    if (!HasCurrent())

     {
         event.Skip();
         return;
     {
         event.Skip();
         return;


@@ -1623,236 +3321,247 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     switch (event.KeyCode())
     {
         case WXK_UP:
     switch (event.KeyCode())
     {
         case WXK_UP:

-        {
-            wxNode *node = m_lines.Member( m_current )->Previous();
-            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            if ( m_current > 0 )
+                OnArrowChar( m_current - 1, event );

             break;
             break;

-        }
+

         case WXK_DOWN:
         case WXK_DOWN:

-        {
-            wxNode *node = m_lines.Member( m_current )->Next();
-            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            if ( m_current < (size_t)GetItemCount() - 1 )
+                OnArrowChar( m_current + 1, event );

             break;
             break;

-        }
+

         case WXK_END:
         case WXK_END:

-        {
-            wxNode *node = m_lines.Last();
-            OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            if (!IsEmpty())
+                OnArrowChar( GetItemCount() - 1, event );

             break;
             break;

-        }
+

         case WXK_HOME:
         case WXK_HOME:

-        {
-            wxNode *node = m_lines.First();
-            OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            if (!IsEmpty())
+                OnArrowChar( 0, event );

             break;
             break;

-        }
+

         case WXK_PRIOR:
         case WXK_PRIOR:

-        {
-            int steps = 0;
-            if (m_mode & wxLC_REPORT)
-            {
-                steps = m_visibleLines-1;
-            }
-            else

             {
             {

-                int pos = 0;
-                wxNode *node = m_lines.First();
-                for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
-                steps = pos % m_visibleLines;
+                int steps = 0;
+                if ( HasFlag(wxLC_REPORT) )
+                {
+                    steps = m_linesPerPage - 1;
+                }
+                else
+                {
+                    steps = m_current % m_linesPerPage;
+                }
+
+                int index = m_current - steps;
+                if (index < 0)
+                    index = 0;
+
+                OnArrowChar( index, event );

             }
             }

-            wxNode *node = m_lines.Member( m_current );
-            for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous();
-            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );

             break;
             break;

-        }
+

         case WXK_NEXT:
         case WXK_NEXT:

-        {
-            int steps = 0;
-            if (m_mode & wxLC_REPORT)

             {
             {

-                steps = m_visibleLines-1;
-            }
-            else
-            {
-                int pos = 0; wxNode *node = m_lines.First();
-                for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
-                steps = m_visibleLines-(pos % m_visibleLines)-1;
+                int steps = 0;
+                if ( HasFlag(wxLC_REPORT) )
+                {
+                    steps = m_linesPerPage - 1;
+                }
+                else
+                {
+                    steps = m_linesPerPage - (m_current % m_linesPerPage) - 1;
+                }
+
+                size_t index = m_current + steps;
+                size_t count = GetItemCount();
+                if ( index >= count )
+                    index = count - 1;
+
+                OnArrowChar( index, event );

             }
             }

-            wxNode *node = m_lines.Member( m_current );
-            for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next();
-            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );

             break;
             break;

-        }
+

         case WXK_LEFT:
         case WXK_LEFT:

-        {
-            if (!(m_mode & wxLC_REPORT))
+            if ( !HasFlag(wxLC_REPORT) )

             {
             {

-                wxNode *node = m_lines.Member( m_current );
-                for (int i = 0; i <m_visibleLines; i++) if (node->Previous()) node = node->Previous();
-                if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+                int index = m_current - m_linesPerPage;
+                if (index < 0)
+                    index = 0;
+
+                OnArrowChar( index, event );

             }
             break;
             }
             break;

-        }
+

         case WXK_RIGHT:
         case WXK_RIGHT:

-        {
-            if (!(m_mode & wxLC_REPORT))
+            if ( !HasFlag(wxLC_REPORT) )

             {
             {

-                wxNode *node = m_lines.Member( m_current );
-                for (int i = 0; i <m_visibleLines; i++) if (node->Next()) node = node->Next();
-                if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+                size_t index = m_current + m_linesPerPage;
+
+                size_t count = GetItemCount();
+                if ( index >= count )
+                    index = count - 1;
+
+                OnArrowChar( index, event );

             }
             break;
             }
             break;

-        }
+

         case WXK_SPACE:
         case WXK_SPACE:

-        {
-            m_current->ReverseHilight();
-            RefreshLine( m_current );
-            break;
-        }
-        case WXK_INSERT:
-        {
-            if (!(m_mode & wxLC_SINGLE_SEL))
+            if ( IsSingleSel() )

             {
             {

-                wxListLineData *oldCurrent = m_current;
-                m_current->ReverseHilight();
-                wxNode *node = m_lines.Member( m_current )->Next();
-                if (node) m_current = (wxListLineData*)node->Data();
-                MoveToFocus();
-                RefreshLine( oldCurrent );
-                RefreshLine( m_current );
-                UnfocusLine( oldCurrent );
-                FocusLine( m_current );
+                SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+
+                if ( IsHighlighted(m_current) )
+                {
+                    // don't unselect the item in single selection mode
+                    break;
+                }
+                //else: select it in ReverseHighlight() below if unselected

             }
             }

+
+            ReverseHighlight(m_current);

             break;
             break;

-        }
+

         case WXK_RETURN:
         case WXK_EXECUTE:
         case WXK_RETURN:
         case WXK_EXECUTE:

-        {
-            wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, GetParent()->GetId() );
-            le.SetEventObject( GetParent() );
-            le.m_itemIndex = GetIndexOfLine( m_current );
-            m_current->GetItem( 0, le.m_item );
-            GetParent()->GetEventHandler()->ProcessEvent( le );
+            SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );

             break;
             break;

-        }
+

         default:
         default:

-        {

             event.Skip();
             event.Skip();

-            return;
-        }

     }
     }

-    m_usedKeys = TRUE;

 }
 
 }
 

-#ifdef __WXGTK__
-extern wxWindow *g_focusWindow;
-#endif
+// ----------------------------------------------------------------------------
+// focus handling
+// ----------------------------------------------------------------------------
+
+void wxListMainWindow::SetFocus()
+{
+    // VS: wxListMainWindow derives from wxPanel (via wxScrolledWindow) and wxPanel
+    //     overrides SetFocus in such way that it does never change focus from
+    //     panel's child to the panel itself. Unfortunately, we must be able to change
+    //     focus to the panel from wxListTextCtrl because the text control should
+    //     disappear when the user clicks outside it.
+
+    wxWindow *oldFocus = FindFocus();
+
+    if ( oldFocus && oldFocus->GetParent() == this )
+    {
+        wxWindow::SetFocus();
+    }
+    else
+    {
+        wxScrolledWindow::SetFocus();
+    }
+}

 
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
 
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {

-    m_hasFocus = TRUE;
-    RefreshLine( m_current );
+    // wxGTK sends us EVT_SET_FOCUS events even if we had never got
+    // EVT_KILL_FOCUS before which means that we finish by redrawing the items
+    // which are already drawn correctly resulting in horrible flicker - avoid
+    // it
+    if ( !m_hasFocus )
+    {
+        m_hasFocus = TRUE;

 
 

-    if (!GetParent()) return;
+        RefreshSelected();
+    }

 
 

-#ifdef __WXGTK__
-    g_focusWindow = GetParent();
-#endif
+    if ( !GetParent() )
+        return;

 
     wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 }
 
 
     wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 }
 

-void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
-{
-    m_hasFocus = FALSE;
-    RefreshLine( m_current );
-}
-
-void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )

 {
 {

-/*
-  We don't even allow the wxScrolledWindow::AdjustScrollbars() call
+    m_hasFocus = FALSE;

 
 

-*/
+    RefreshSelected();

 }
 
 void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
 {
 }
 
 void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
 {

-    if ((m_mode & wxLC_ICON) && (m_normal_image_list))
+    if ( HasFlag(wxLC_ICON) && (m_normal_image_list))

     {
         m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     {
         m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );

-        return;

     }
     }

-    if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list))
+    else if ( HasFlag(wxLC_SMALL_ICON) && (m_small_image_list))

     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }

-    if ((m_mode & wxLC_LIST) && (m_small_image_list))
+    else if ( HasFlag(wxLC_LIST) && (m_small_image_list))

     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }

-    if ((m_mode & wxLC_REPORT) && (m_small_image_list))
+    else if ( HasFlag(wxLC_REPORT) && (m_small_image_list))

     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );

-        return;

     }
 }
 
     }
 }
 

-void wxListMainWindow::GetImageSize( int index, int &width, int &height )
+void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const

 {
 {

-    if ((m_mode & wxLC_ICON) && (m_normal_image_list))
+    if ( HasFlag(wxLC_ICON) && m_normal_image_list )

     {
         m_normal_image_list->GetSize( index, width, height );
     {
         m_normal_image_list->GetSize( index, width, height );

-        return;

     }
     }

-    if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list))
+    else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list )

     {
         m_small_image_list->GetSize( index, width, height );
     {
         m_small_image_list->GetSize( index, width, height );

-        return;

     }
     }

-    if ((m_mode & wxLC_LIST) && (m_small_image_list))
+    else if ( HasFlag(wxLC_LIST) && m_small_image_list )

     {
         m_small_image_list->GetSize( index, width, height );
     {
         m_small_image_list->GetSize( index, width, height );

-        return;

     }
     }

-    if ((m_mode & wxLC_REPORT) && (m_small_image_list))
+    else if ( HasFlag(wxLC_REPORT) && m_small_image_list )

     {
         m_small_image_list->GetSize( index, width, height );
     {
         m_small_image_list->GetSize( index, width, height );

-        return;

     }
     }

-    width = 0;
-    height = 0;
+    else
+    {
+        width =
+        height = 0;
+    }

 }
 
 }
 

-int wxListMainWindow::GetTextLength( wxString &s )
+int wxListMainWindow::GetTextLength( const wxString &s ) const

 {
 {

-    wxClientDC dc( this );
-    wxCoord lw = 0;
-    wxCoord lh = 0;
-    dc.GetTextExtent( s, &lw, &lh );
-    return lw + 6;
+    wxClientDC dc( wxConstCast(this, wxListMainWindow) );
+    dc.SetFont( GetFont() );
+
+    wxCoord lw;
+    dc.GetTextExtent( s, &lw, NULL );
+
+    return lw + AUTOSIZE_COL_MARGIN;

 }
 
 }
 

-int wxListMainWindow::GetIndexOfLine( const wxListLineData *line )
+void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )

 {
 {

-    int i = 0;
-    wxNode *node = m_lines.First();
-    while (node)
+    m_dirty = TRUE;
+
+    // calc the spacing from the icon size
+    int width = 0,
+        height = 0;
+    if ((imageList) && (imageList->GetImageCount()) )

     {
     {

-        if (line == (wxListLineData*)node->Data()) return i;
-        i++;
-        node = node->Next();
+        imageList->GetSize(0, width, height);

     }
     }

-    return -1;
-}

 
 

-void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
-{
-    m_dirty = TRUE;
-    if (which == wxIMAGE_LIST_NORMAL) m_normal_image_list = imageList;
-    if (which == wxIMAGE_LIST_SMALL) m_small_image_list = imageList;
+    if (which == wxIMAGE_LIST_NORMAL)
+    {
+        m_normal_image_list = imageList;
+        m_normal_spacing = width + 8;
+    }
+
+    if (which == wxIMAGE_LIST_SMALL)
+    {
+        m_small_image_list = imageList;
+        m_small_spacing = width + 14;
+    }

 }
 
 void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 }
 
 void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )


@@ -1870,661 +3579,841 @@ void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )
 {
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )
 {

-    if (isSmall) return m_small_spacing; else return m_normal_spacing;
+    return isSmall ? m_small_spacing : m_normal_spacing;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// columns
+// ----------------------------------------------------------------------------
+

 void wxListMainWindow::SetColumn( int col, wxListItem &item )
 {
 void wxListMainWindow::SetColumn( int col, wxListItem &item )
 {

+    wxListHeaderDataList::Node *node = m_columns.Item( col );
+
+    wxCHECK_RET( node, _T("invalid column index in SetColumn") );
+
+    if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER )
+        item.m_width = GetTextLength( item.m_text );
+
+    wxListHeaderData *column = node->GetData();
+    column->SetItem( item );
+
+    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
+    if ( headerWin )
+        headerWin->m_dirty = TRUE;
+

     m_dirty = TRUE;
     m_dirty = TRUE;

-    wxNode *node = m_columns.Nth( col );
-    if (node)
-    {
-        if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text )+7;
-        wxListHeaderData *column = (wxListHeaderData*)node->Data();
-        column->SetItem( item );
-    }
-    wxListCtrl *lc = (wxListCtrl*) GetParent();
-    if (lc->m_headerWin) lc->m_headerWin->Refresh();
+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;

 }
 
 void wxListMainWindow::SetColumnWidth( int col, int width )
 {
 }
 
 void wxListMainWindow::SetColumnWidth( int col, int width )
 {

-    if (!(m_mode & wxLC_REPORT)) return;
+    wxCHECK_RET( col >= 0 && col < GetColumnCount(),
+                 _T("invalid column index") );
+
+    wxCHECK_RET( HasFlag(wxLC_REPORT),
+                 _T("SetColumnWidth() can only be called in report mode.") );

 
     m_dirty = TRUE;
 
     m_dirty = TRUE;

+    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
+    if ( headerWin )
+        headerWin->m_dirty = TRUE;
+
+    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxCHECK_RET( node, _T("no column?") );

 
 

-    wxNode *node = (wxNode*) NULL;
+    wxListHeaderData *column = node->GetData();

 
 

-    if (width == wxLIST_AUTOSIZE_USEHEADER) width = 80;
-    if (width == wxLIST_AUTOSIZE)
+    size_t count = GetItemCount();
+
+    if (width == wxLIST_AUTOSIZE_USEHEADER)

     {
     {

-        wxClientDC dc(this);
-        dc.SetFont( GetFont() );
-        int max = 10;
-        node = m_lines.First();
-        while (node)
+        width = GetTextLength(column->GetText());
+    }
+    else if ( width == wxLIST_AUTOSIZE )
+    {
+        if ( IsVirtual() )

         {
         {

-            wxListLineData *line = (wxListLineData*)node->Data();
-            wxNode *n = line->m_items.Nth( col );
-            if (n)
+            // TODO: determine the max width somehow...
+            width = WIDTH_COL_DEFAULT;
+        }
+        else // !virtual
+        {
+            wxClientDC dc(this);
+            dc.SetFont( GetFont() );
+
+            int max = AUTOSIZE_COL_MARGIN;
+
+            for ( size_t i = 0; i < count; i++ )

             {
             {

-                wxListItemData *item = (wxListItemData*)n->Data();
-                int current = 0, ix = 0, iy = 0;
-                wxCoord lx = 0, ly = 0;
+                wxListLineData *line = GetLine(i);
+                wxListItemDataList::Node *n = line->m_items.Item( col );
+
+                wxCHECK_RET( n, _T("no subitem?") );
+
+                wxListItemData *item = n->GetData();
+                int current = 0;
+

                 if (item->HasImage())
                 {
                 if (item->HasImage())
                 {

+                    int ix, iy;

                     GetImageSize( item->GetImage(), ix, iy );
                     GetImageSize( item->GetImage(), ix, iy );

-                    current = ix + 5;
+                    current += ix + 5;

                 }
                 }

+

                 if (item->HasText())
                 {
                 if (item->HasText())
                 {

-                    wxString str;
-                    item->GetText( str );
-                    dc.GetTextExtent( str, &lx, &ly );
-                    current += lx;
+                    wxCoord w;
+                    dc.GetTextExtent( item->GetText(), &w, NULL );
+                    current += w;

                 }
                 }

-                if (current > max) max = current;
+
+                if (current > max)
+                    max = current;

             }
             }

-            node = node->Next();
+
+            width = max + AUTOSIZE_COL_MARGIN;

         }
         }

-        width = max+10;

     }
 
     }
 

-    node = m_columns.Nth( col );
-    if (node)
-    {
-        wxListHeaderData *column = (wxListHeaderData*)node->Data();
-        column->SetWidth( width );
-    }
+    column->SetWidth( width );
+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;
+}

 
 

-    node = m_lines.First();
-    while (node)
+int wxListMainWindow::GetHeaderWidth() const
+{
+    if ( !m_headerWidth )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        wxNode *n = line->m_items.Nth( col );
-        if (n)
+        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
+
+        size_t count = GetColumnCount();
+        for ( size_t col = 0; col < count; col++ )

         {
         {

-            wxListItemData *item = (wxListItemData*)n->Data();
-            item->SetSize( width, -1 );
+            self->m_headerWidth += GetColumnWidth(col);

         }
         }

-        node = node->Next();

     }
 
     }
 

-    wxListCtrl *lc = (wxListCtrl*) GetParent();
-    if (lc->m_headerWin) lc->m_headerWin->Refresh();
+    return m_headerWidth;

 }
 
 }
 

-void wxListMainWindow::GetColumn( int col, wxListItem &item )
+void wxListMainWindow::GetColumn( int col, wxListItem &item ) const

 {
 {

-    wxNode *node = m_columns.Nth( col );
-    if (node)
-    {
-        wxListHeaderData *column = (wxListHeaderData*)node->Data();
-        column->GetItem( item );
-    }
-    else
-    {
-        item.m_format = 0;
-        item.m_width = 0;
-        item.m_text = "";
-        item.m_image = 0;
-        item.m_data = 0;
-    }
-}
+    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxCHECK_RET( node, _T("invalid column index in GetColumn") );

 
 

-int wxListMainWindow::GetColumnWidth( int col )
-{
-    wxNode *node = m_columns.Nth( col );
-    if (node)
-    {
-        wxListHeaderData *column = (wxListHeaderData*)node->Data();
-        return column->GetWidth();
-    }
-    else
-    {
-        return 0;
-    }
+    wxListHeaderData *column = node->GetData();
+    column->GetItem( item );

 }
 
 }
 

-int wxListMainWindow::GetColumnCount()
+int wxListMainWindow::GetColumnWidth( int col ) const

 {
 {

-    return m_columns.Number();
-}
+    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxCHECK_MSG( node, 0, _T("invalid column index") );

 
 

-int wxListMainWindow::GetCountPerPage()
-{
-    return m_visibleLines;
+    wxListHeaderData *column = node->GetData();
+    return column->GetWidth();

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// item state
+// ----------------------------------------------------------------------------
+

 void wxListMainWindow::SetItem( wxListItem &item )
 {
 void wxListMainWindow::SetItem( wxListItem &item )
 {

-    m_dirty = TRUE;
-    wxNode *node = m_lines.Nth( (size_t)item.m_itemId );
-    if (node)
+    long id = item.m_itemId;
+    wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
+                 _T("invalid item index in SetItem") );
+
+    if ( !IsVirtual() )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        if (m_mode & wxLC_REPORT) item.m_width = GetColumnWidth( item.m_col )-3;
+        wxListLineData *line = GetLine((size_t)id);

         line->SetItem( item.m_col, item );
     }
         line->SetItem( item.m_col, item );
     }

+
+    if ( InReportView() )
+    {
+        // just refresh the line to show the new value of the text/image
+        RefreshLine((size_t)id);
+    }
+    else // !report
+    {
+        // refresh everything (resulting in horrible flicker - FIXME!)
+        m_dirty = TRUE;
+    }

 }
 
 }
 

-void wxListMainWindow::SetItemState( long item, long state, long stateMask )
+void wxListMainWindow::SetItemState( long litem, long state, long stateMask )

 {
 {

-    // m_dirty = TRUE; no recalcs needed
+     wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
+                  _T("invalid list ctrl item index in SetItem") );

 
 

-    wxListLineData *oldCurrent = m_current;
+    size_t oldCurrent = m_current;
+    size_t item = (size_t)litem;    // safe because of the check above

 
 

-    if (stateMask & wxLIST_STATE_FOCUSED)
+    // do we need to change the focus?
+    if ( stateMask & wxLIST_STATE_FOCUSED )

     {
     {

-        wxNode *node = m_lines.Nth( (size_t)item );
-        if (node)
+        if ( state & wxLIST_STATE_FOCUSED )
+        {
+            // don't do anything if this item is already focused
+            if ( item != m_current )
+            {
+                ChangeCurrent(item);
+
+                if ( oldCurrent != (size_t)-1 )
+                {
+                    if ( IsSingleSel() )
+                    {
+                        HighlightLine(oldCurrent, FALSE);
+                    }
+
+                    RefreshLine(oldCurrent);
+                }
+
+                RefreshLine( m_current );
+            }
+        }
+        else // unfocus

         {
         {

-            wxListLineData *line = (wxListLineData*)node->Data();
-            UnfocusLine( m_current );
-            m_current = line;
-            FocusLine( m_current );
-            RefreshLine( m_current );
-            if (oldCurrent) RefreshLine( oldCurrent );
+            // don't do anything if this item is not focused
+            if ( item == m_current )
+            {
+                ResetCurrent();
+
+                if ( IsSingleSel() )
+                {
+                    // we must unselect the old current item as well or we
+                    // might end up with more than one selected item in a
+                    // single selection control
+                    HighlightLine(oldCurrent, FALSE);
+                }
+
+                RefreshLine( oldCurrent );
+            }

         }
     }
 
         }
     }
 

-    if (stateMask & wxLIST_STATE_SELECTED)
+    // do we need to change the selection state?
+    if ( stateMask & wxLIST_STATE_SELECTED )

     {
         bool on = (state & wxLIST_STATE_SELECTED) != 0;
     {
         bool on = (state & wxLIST_STATE_SELECTED) != 0;

-        if (!on && (m_mode & wxLC_SINGLE_SEL)) return;

 
 

-        wxNode *node = m_lines.Nth( (size_t)item );
-        if (node)
+        if ( IsSingleSel() )

         {
         {

-            wxListLineData *line = (wxListLineData*)node->Data();
-            if (m_mode & wxLC_SINGLE_SEL)
+            if ( on )

             {
             {

-                UnfocusLine( m_current );
-                m_current = line;
-                FocusLine( m_current );
-                if (oldCurrent) oldCurrent->Hilight( FALSE );
-                RefreshLine( m_current );
-                if (oldCurrent) RefreshLine( oldCurrent );
+                // selecting the item also makes it the focused one in the
+                // single sel mode
+                if ( m_current != item )
+                {
+                    ChangeCurrent(item);
+
+                    if ( oldCurrent != (size_t)-1 )
+                    {
+                        HighlightLine( oldCurrent, FALSE );
+                        RefreshLine( oldCurrent );
+                    }
+                }

             }
             }

-            bool on = (state & wxLIST_STATE_SELECTED) != 0;
-            if (on != line->IsHilighted())
+            else // off

             {
             {

-                line->Hilight( on );
-                RefreshLine( line );
+                // only the current item may be selected anyhow
+                if ( item != m_current )
+                    return;

             }
         }
             }
         }

+
+        if ( HighlightLine(item, on) )
+        {
+            RefreshLine(item);
+        }

     }
 }
 
     }
 }
 

-int wxListMainWindow::GetItemState( long item, long stateMask )
+int wxListMainWindow::GetItemState( long item, long stateMask ) const

 {
 {

+    wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0,
+                 _T("invalid list ctrl item index in GetItemState()") );
+

     int ret = wxLIST_STATE_DONTCARE;
     int ret = wxLIST_STATE_DONTCARE;

-    if (stateMask & wxLIST_STATE_FOCUSED)
+
+    if ( stateMask & wxLIST_STATE_FOCUSED )

     {
     {

-        wxNode *node = m_lines.Nth( (size_t)item );
-        if (node)
-        {
-            wxListLineData *line = (wxListLineData*)node->Data();
-            if (line == m_current) ret |= wxLIST_STATE_FOCUSED;
-        }
+        if ( (size_t)item == m_current )
+            ret |= wxLIST_STATE_FOCUSED;

     }
     }

-    if (stateMask & wxLIST_STATE_SELECTED)
+
+    if ( stateMask & wxLIST_STATE_SELECTED )

     {
     {

-        wxNode *node = m_lines.Nth( (size_t)item );
-        if (node)
-        {
-            wxListLineData *line = (wxListLineData*)node->Data();
-            if (line->IsHilighted()) ret |= wxLIST_STATE_FOCUSED;
-        }
+        if ( IsHighlighted(item) )
+            ret |= wxLIST_STATE_SELECTED;

     }
     }

+

     return ret;
 }
 
     return ret;
 }
 

-void wxListMainWindow::GetItem( wxListItem &item )
+void wxListMainWindow::GetItem( wxListItem &item ) const

 {
 {

-    wxNode *node = m_lines.Nth( (size_t)item.m_itemId );
-    if (node)
-    {
-        wxListLineData *line = (wxListLineData*)node->Data();
-        line->GetItem( item.m_col, item );
-    }
-    else
-    {
-        item.m_mask = 0;
-        item.m_text = "";
-        item.m_image = 0;
-        item.m_data = 0;
-    }
+    wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
+                 _T("invalid item index in GetItem") );
+
+    wxListLineData *line = GetLine((size_t)item.m_itemId);
+    line->GetItem( item.m_col, item );

 }
 
 }
 

-int wxListMainWindow::GetItemCount()
+// ----------------------------------------------------------------------------
+// item count
+// ----------------------------------------------------------------------------
+
+size_t wxListMainWindow::GetItemCount() const

 {
 {

-    return m_lines.Number();
+    return IsVirtual() ? m_countVirt : m_lines.GetCount();

 }
 
 }
 

-void wxListMainWindow::GetItemRect( long index, wxRect &rect )
+void wxListMainWindow::SetItemCount(long count)

 {
 {

-    wxNode *node = m_lines.Nth( (size_t)index );
-    if (node)
-    {
-        wxListLineData *line = (wxListLineData*)node->Data();
-        line->GetRect( rect );
-    }
-    else
-    {
-        rect.x = 0;
-        rect.y = 0;
-        rect.width = 0;
-        rect.height = 0;
-    }
+    m_selStore.SetItemCount(count);
+    m_countVirt = count;
+
+    ResetVisibleLinesRange();
+
+    // scrollbars must be reset
+    m_dirty = TRUE;

 }
 
 }
 

-bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
+int wxListMainWindow::GetSelectedItemCount() const

 {
 {

-    wxNode *node = m_lines.Nth( (size_t)item );
-    if (node)
-    {
-        wxRect rect;
-        wxListLineData *line = (wxListLineData*)node->Data();
-        line->GetRect( rect );
-        pos.x = rect.x;
-        pos.y = rect.y;
-    }
-    else
+    // deal with the quick case first
+    if ( IsSingleSel() )

     {
     {

-       pos.x = 0;
-       pos.y = 0;
+        return HasCurrent() ? IsHighlighted(m_current) : FALSE;

     }
     }

-    return TRUE;
-}

 
 

-int wxListMainWindow::GetSelectedItemCount()
-{
-    int ret = 0;
-    wxNode *node = m_lines.First();
-    while (node)
+    // virtual controls remmebers all its selections itself
+    if ( IsVirtual() )
+        return m_selStore.GetSelectedCount();
+
+    // TODO: we probably should maintain the number of items selected even for
+    //       non virtual controls as enumerating all lines is really slow...
+    size_t countSel = 0;
+    size_t count = GetItemCount();
+    for ( size_t line = 0; line < count; line++ )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        if (line->IsHilighted()) ret++;
-        node = node->Next();
+        if ( GetLine(line)->IsHighlighted() )
+            countSel++;

     }
     }

-    return ret;
+
+    return countSel;

 }
 
 }
 

-void wxListMainWindow::SetMode( long mode )
+// ----------------------------------------------------------------------------
+// item position/size
+// ----------------------------------------------------------------------------
+
+void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const

 {
 {

-    m_dirty = TRUE;
-    m_mode = mode;
+    wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
+                 _T("invalid index in GetItemRect") );

 
 

-    DeleteEverything();
+    rect = GetLineRect((size_t)index);

 
 

-    if (m_mode & wxLC_REPORT)
-    {
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        m_xScroll = 15;
-#else
-        m_xScroll = 0;
-#endif
-        m_yScroll = 15;
-    }
-    else
-    {
-        m_xScroll = 15;
-        m_yScroll = 0;
-    }
+    CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);

 }
 
 }
 

-long wxListMainWindow::GetMode() const
+bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const

 {
 {

-    return m_mode;
+    wxRect rect;
+    GetItemRect(item, rect);
+
+    pos.x = rect.x;
+    pos.y = rect.y;
+
+    return TRUE;

 }
 
 }
 

-void wxListMainWindow::CalculatePositions()
-{
-    if (!m_lines.First()) return;
+// ----------------------------------------------------------------------------
+// geometry calculation
+// ----------------------------------------------------------------------------

 
 

+void wxListMainWindow::RecalculatePositions(bool noRefresh)
+{

     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 

-    int iconSpacing = 0;
-    if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing;
-    if (m_mode & wxLC_SMALL_ICON) iconSpacing = m_small_spacing;
-
-    // we take the first line (which also can be an icon or
-    // an a text item in wxLC_ICON and wxLC_LIST modes) to
-    // measure the size of the line
+    int iconSpacing;
+    if ( HasFlag(wxLC_ICON) )
+        iconSpacing = m_normal_spacing;
+    else if ( HasFlag(wxLC_SMALL_ICON) )
+        iconSpacing = m_small_spacing;
+    else
+        iconSpacing = 0;
+
+    // Note that we do not call GetClientSize() here but
+    // GetSize() and substract the border size for sunken
+    // borders manually. This is technically incorrect,
+    // but we need to know the client area's size WITHOUT
+    // scrollbars here. Since we don't know if there are
+    // any scrollbars, we use GetSize() instead. Another
+    // solution would be to call SetScrollbars() here to
+    // remove the scrollbars and call GetClientSize() then,
+    // but this might result in flicker and - worse - will
+    // reset the scrollbars to 0 which is not good at all
+    // if you resize a dialog/window, but don't want to
+    // reset the window scrolling. RR.
+    // Furthermore, we actually do NOT subtract the border
+    // width as 2 pixels is just the extra space which we
+    // need around the actual content in the window. Other-
+    // wise the text would e.g. touch the upper border. RR.
+    int clientWidth,
+        clientHeight;
+    GetSize( &clientWidth, &clientHeight );
+
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        // all lines have the same height
+        int lineHeight = GetLineHeight();

 
 

-    int lineWidth = 0;
-    int lineHeight = 0;
-    int lineSpacing = 0;
+        // scroll one line per step
+        m_yScroll = lineHeight;

 
 

-    wxListLineData *line = (wxListLineData*)m_lines.First()->Data();
-    line->CalculateSize( &dc, iconSpacing );
-    int dummy = 0;
-    line->GetSize( dummy, lineSpacing );
-    lineSpacing += 4;
+        size_t lineCount = GetItemCount();
+        int entireHeight = lineCount*lineHeight + LINE_SPACING;

 
 

-    int clientWidth = 0;
-    int clientHeight = 0;
+        m_linesPerPage = clientHeight / lineHeight;

 
 

-    if (m_mode & wxLC_REPORT)
-    {
-        int x = 4;
-        int y = 1;
-        int entireHeight = m_lines.Number() * lineSpacing + 2;
-        int scroll_pos = GetScrollPos( wxVERTICAL );
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        int x_scroll_pos = GetScrollPos( wxHORIZONTAL );
-#else
-        SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE );
-#endif
-        GetClientSize( &clientWidth, &clientHeight );
+        ResetVisibleLinesRange();

 
 

-        wxNode* node = m_lines.First();
-        int entireWidth = 0 ;
-        while (node)
-        {
-            wxListLineData *line = (wxListLineData*)node->Data();
-            line->CalculateSize( &dc, iconSpacing );
-            line->SetPosition( &dc, x, y, clientWidth );
-            int col_x = 2;
-            for (int i = 0; i < GetColumnCount(); i++)
-            {
-                line->SetColumnPosition( i, col_x );
-                col_x += GetColumnWidth( i );
-            }
-            entireWidth = wxMax( entireWidth , col_x ) ;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-            line->SetPosition( &dc, x, y, col_x );
-#endif
-            y += lineSpacing;  // one pixel blank line between items
-            node = node->Next();
-        }
-                m_visibleLines = clientHeight / lineSpacing;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-                SetScrollbars( m_xScroll, m_yScroll, entireWidth / m_xScroll , (entireHeight+15) / m_yScroll, x_scroll_pos  , scroll_pos, TRUE );
-#endif
+        SetScrollbars( m_xScroll, m_yScroll,
+                       GetHeaderWidth() / m_xScroll,
+                       (entireHeight + m_yScroll - 1)/m_yScroll,
+                       GetScrollPos(wxHORIZONTAL),
+                       GetScrollPos(wxVERTICAL),
+                       TRUE );

     }
     }

-    else
+    else // !report

     {
         // at first we try without any scrollbar. if the items don't
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
 
     {
         // at first we try without any scrollbar. if the items don't
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
 

-        GetSize( &clientWidth, &clientHeight );
-        clientHeight -= 4;  // sunken frame
-

         int entireWidth = 0;
 
         for (int tries = 0; tries < 2; tries++)
         {
         int entireWidth = 0;
 
         for (int tries = 0; tries < 2; tries++)
         {

-            entireWidth = 0;
-            int x = 5;  // painting is done at x-2
-            int y = 5;  // painting is done at y-2
+            // We start with 4 for the border around all items
+            entireWidth = 4;
+
+            if (tries == 1)
+            {
+                // Now we have decided that the items do not fit into the
+                // client area. Unfortunately, wxWindows sometimes thinks
+                // that it does fit and therefore NO horizontal scrollbar
+                // is inserted. This looks ugly, so we fudge here and make
+                // the calculated width bigger than was actually has been
+                // calculated. This ensures that wxScrolledWindows puts
+                // a scrollbar at the bottom of its client area.
+                entireWidth += SCROLL_UNIT_X;
+            }
+
+            // Start at 2,2 so the text does not touch the border
+            int x = 2;
+            int y = 2;

             int maxWidth = 0;
             int maxWidth = 0;

-            m_visibleLines = 0;
-            int m_currentVisibleLines = 0;
-            wxNode *node = m_lines.First();
-            while (node)
+            m_linesPerPage = 0;
+            int currentlyVisibleLines = 0;
+
+            size_t count = GetItemCount();
+            for (size_t i = 0; i < count; i++)

             {
             {

-                m_currentVisibleLines++;
-                wxListLineData *line = (wxListLineData*)node->Data();
+                currentlyVisibleLines++;
+                wxListLineData *line = GetLine(i);

                 line->CalculateSize( &dc, iconSpacing );
                 line->CalculateSize( &dc, iconSpacing );

-                line->SetPosition( &dc, x, y, clientWidth );
-                line->GetSize( lineWidth, lineHeight );
-                if (lineWidth > maxWidth) maxWidth = lineWidth;
-                y += lineSpacing;
-                if (m_currentVisibleLines > m_visibleLines)
-                    m_visibleLines = m_currentVisibleLines;
-                if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
+                line->SetPosition( x, y, clientWidth, iconSpacing );  // Why clientWidth? (FIXME)
+
+                wxSize sizeLine = GetLineSize(i);
+
+                if ( maxWidth < sizeLine.x )
+                    maxWidth = sizeLine.x;
+
+                y += sizeLine.y;
+                if (currentlyVisibleLines > m_linesPerPage)
+                    m_linesPerPage = currentlyVisibleLines;
+
+                // Assume that the size of the next one is the same... (FIXME)
+                if ( y + sizeLine.y >= clientHeight )

                 {
                 {

-                    m_currentVisibleLines = 0;
-                    y = 5;
+                    currentlyVisibleLines = 0;
+                    y = 2;

                     x += maxWidth+6;
                     entireWidth += maxWidth+6;
                     maxWidth = 0;
                 }
                     x += maxWidth+6;
                     entireWidth += maxWidth+6;
                     maxWidth = 0;
                 }

-                node = node->Next();
-                if (!node) entireWidth += maxWidth;
-                if ((tries == 0) && (entireWidth > clientWidth))
+
+                // We have reached the last item.
+                if ( i == count - 1 )
+                    entireWidth += maxWidth;
+
+                if ( (tries == 0) && (entireWidth+SCROLL_UNIT_X > clientWidth) )

                 {
                 {

-                    clientHeight -= 15; // scrollbar height
-                    m_visibleLines = 0;
-                    m_currentVisibleLines = 0;
+                    clientHeight -= 15; // We guess the scrollbar height. (FIXME)
+                    m_linesPerPage = 0;
+                    currentlyVisibleLines = 0;

                     break;
                 }
                     break;
                 }

-                if (!node) tries = 1;  // everything fits, no second try required
+
+                if ( i == count - 1 )
+                    tries = 1;  // Everything fits, no second try required.

             }
         }
 
         int scroll_pos = GetScrollPos( wxHORIZONTAL );
             }
         }
 
         int scroll_pos = GetScrollPos( wxHORIZONTAL );

-        SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
+        SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
+    }
+
+    if ( !noRefresh )
+    {
+        // FIXME: why should we call it from here?
+        UpdateCurrent();
+
+        RefreshAll();

     }
 }
 
     }
 }
 

-void wxListMainWindow::RealizeChanges( void )
+void wxListMainWindow::RefreshAll()

 {
 {

-    if (!m_current)
+    m_dirty = FALSE;
+    Refresh();
+
+    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
+    if ( headerWin && headerWin->m_dirty )

     {
     {

-        wxNode *node = m_lines.First();
-        if (node) m_current = (wxListLineData*)node->Data();
+        headerWin->m_dirty = FALSE;
+        headerWin->Refresh();

     }
     }

-    if (m_current)
+}
+
+void wxListMainWindow::UpdateCurrent()
+{
+    if ( !HasCurrent() && !IsEmpty() )

     {
     {

-        FocusLine( m_current );
-        if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE );
+        ChangeCurrent(0);

     }
 }
 
     }
 }
 

-long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state )
+long wxListMainWindow::GetNextItem( long item,
+                                    int WXUNUSED(geometry),
+                                    int state ) const

 {
 {

-    long ret = 0;
-    if (item > 0) ret = item;
-    if(ret >= GetItemCount()) return -1;
-    wxNode *node = m_lines.Nth( (size_t)ret );
-    while (node)
+    long ret = item,
+         max = GetItemCount();
+    wxCHECK_MSG( (ret == -1) || (ret < max), -1,
+                 _T("invalid listctrl index in GetNextItem()") );
+
+    // notice that we start with the next item (or the first one if item == -1)
+    // and this is intentional to allow writing a simple loop to iterate over
+    // all selected items
+    ret++;
+    if ( ret == max )
+    {
+        // this is not an error because the index was ok initially, just no
+        // such item
+        return -1;
+    }
+
+    if ( !state )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        if ((state & wxLIST_STATE_FOCUSED) && (line == m_current)) return ret;
-        if ((state & wxLIST_STATE_SELECTED) && (line->IsHilighted())) return ret;
-        if (!state) return ret;
-        ret++;
-        node = node->Next();
+        // any will do
+        return (size_t)ret;
+    }
+
+    size_t count = GetItemCount();
+    for ( size_t line = (size_t)ret; line < count; line++ )
+    {
+        if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) )
+            return line;
+
+        if ( (state & wxLIST_STATE_SELECTED) && IsHighlighted(line) )
+            return line;

     }
     }

+

     return -1;
 }
 
     return -1;
 }
 

-void wxListMainWindow::DeleteItem( long index )
+// ----------------------------------------------------------------------------
+// deleting stuff
+// ----------------------------------------------------------------------------
+
+void wxListMainWindow::DeleteItem( long lindex )

 {
 {

-    m_dirty = TRUE;
-    wxNode *node = m_lines.Nth( (size_t)index );
-    if (node)
+    size_t count = GetItemCount();
+
+    wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count),
+                 _T("invalid item index in DeleteItem") );
+
+    size_t index = (size_t)lindex;
+
+    // we don't need to adjust the index for the previous items
+    if ( HasCurrent() && m_current >= index )
+    {
+        // if the current item is being deleted, we want the next one to
+        // become selected - unless there is no next one - so don't adjust
+        // m_current in this case
+        if ( m_current != index || m_current == count - 1 )
+        {
+            m_current--;
+        }
+    }
+
+    if ( InReportView() )
+    {
+        ResetVisibleLinesRange();
+    }
+
+    if ( IsVirtual() )
+    {
+        m_countVirt--;
+
+        m_selStore.OnItemDelete(index);
+    }
+    else

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        if (m_current == line) m_current = (wxListLineData *) NULL;
-        DeleteLine( line );
-        m_lines.DeleteNode( node );
+        m_lines.RemoveAt( index );

     }
     }

+
+    // we need to refresh the (vert) scrollbar as the number of items changed
+    m_dirty = TRUE;
+
+    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
+
+    RefreshAfter(index);

 }
 
 void wxListMainWindow::DeleteColumn( int col )
 {
 }
 
 void wxListMainWindow::DeleteColumn( int col )
 {

-    wxCHECK_RET( col < (int)m_columns.GetCount(),
-               wxT("attempting to delete inexistent column in wxListView") );
+    wxListHeaderDataList::Node *node = m_columns.Item( col );
+
+    wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );

 
     m_dirty = TRUE;
 
     m_dirty = TRUE;

-    wxNode *node = m_columns.Nth( col );
-    if (node) m_columns.DeleteNode( node );
+    m_columns.DeleteNode( node );
+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;

 }
 
 }
 

-void wxListMainWindow::DeleteAllItems( void )
+void wxListMainWindow::DoDeleteAllItems()

 {
 {

-    m_dirty = TRUE;
-    m_current = (wxListLineData *) NULL;
+    if ( IsEmpty() )
+    {
+        // nothing to do - in particular, don't send the event
+        return;
+    }
+
+    ResetCurrent();

 
     // to make the deletion of all items faster, we don't send the
 
     // to make the deletion of all items faster, we don't send the

-    // notifications in this case: this is compatible with wxMSW and
-    // documented in DeleteAllItems() description
-#if 0
-    wxNode *node = m_lines.First();
-    while (node)
+    // notifications for each item deletion in this case but only one event
+    // for all of them: this is compatible with wxMSW and documented in
+    // DeleteAllItems() description
+
+    wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
+    event.SetEventObject( GetParent() );
+    GetParent()->GetEventHandler()->ProcessEvent( event );
+
+    if ( IsVirtual() )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
+        m_countVirt = 0;

 
 

-        DeleteLine( line );
+        m_selStore.Clear();
+    }

 
 

-        node = node->Next();
+    if ( InReportView() )
+    {
+        ResetVisibleLinesRange();

     }
     }

-#endif // 0

 
     m_lines.Clear();
 }
 
 
     m_lines.Clear();
 }
 

-void wxListMainWindow::DeleteEverything( void )
+void wxListMainWindow::DeleteAllItems()
+{
+    DoDeleteAllItems();
+
+    RecalculatePositions();
+}
+
+void wxListMainWindow::DeleteEverything()

 {
 {

-    m_dirty = TRUE;
-    m_current = (wxListLineData *) NULL;
-    wxNode *node = m_lines.First();
-    while (node)
-    {
-        wxListLineData *line = (wxListLineData*)node->Data();
-        DeleteLine( line );
-        node = node->Next();
-    }
-    m_lines.Clear();
-    m_current = (wxListLineData *) NULL;

     m_columns.Clear();
     m_columns.Clear();

+
+    DeleteAllItems();

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// scanning for an item
+// ----------------------------------------------------------------------------
+

 void wxListMainWindow::EnsureVisible( long index )
 {
 void wxListMainWindow::EnsureVisible( long index )
 {

-    // We have to call this here because the label in
-    // question might just have been added and no screen
-    // update taken place.
-    if (m_dirty) wxYield();
+    wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
+                 _T("invalid index in EnsureVisible") );
+
+    // We have to call this here because the label in question might just have
+    // been added and its position is not known yet
+    if ( m_dirty )
+    {
+        RecalculatePositions(TRUE /* no refresh */);
+    }

 
 

-    wxListLineData *oldCurrent = m_current;
-    m_current = (wxListLineData *) NULL;
-    wxNode *node = m_lines.Nth( (size_t)index );
-    if (node) m_current = (wxListLineData*)node->Data();
-    if (m_current) MoveToFocus();
-    m_current = oldCurrent;
+    MoveToItem((size_t)index);

 }
 
 long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
 {
     long pos = start;
     wxString tmp = str;
 }
 
 long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
 {
     long pos = start;
     wxString tmp = str;

-    if (pos < 0) pos = 0;
-    wxNode *node = m_lines.Nth( (size_t)pos );
-    while (node)
+    if (pos < 0)
+        pos = 0;
+
+    size_t count = GetItemCount();
+    for ( size_t i = (size_t)pos; i < count; i++ )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        wxString s = "";
-        line->GetText( 0, s );
-        if (s == tmp) return pos;
-        node = node->Next();
-        pos++;
+        wxListLineData *line = GetLine(i);
+        if ( line->GetText(0) == tmp )
+            return i;

     }
     }

-    return -1;
+
+    return wxNOT_FOUND;

 }
 
 long wxListMainWindow::FindItem(long start, long data)
 {
     long pos = start;
 }
 
 long wxListMainWindow::FindItem(long start, long data)
 {
     long pos = start;

-    if (pos < 0) pos = 0;
-    wxNode *node = m_lines.Nth( (size_t)pos );
-    while (node)
+    if (pos < 0)
+        pos = 0;
+
+    size_t count = GetItemCount();
+    for (size_t i = (size_t)pos; i < count; i++)

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
+        wxListLineData *line = GetLine(i);

         wxListItem item;
         line->GetItem( 0, item );
         wxListItem item;
         line->GetItem( 0, item );

-        if (item.m_data == data) return pos;
-        node = node->Next();
-        pos++;
+        if (item.m_data == data)
+            return i;

     }
     }

-    return -1;
+
+    return wxNOT_FOUND;

 }
 
 long wxListMainWindow::HitTest( int x, int y, int &flags )
 {
 }
 
 long wxListMainWindow::HitTest( int x, int y, int &flags )
 {

-    wxNode *node = m_lines.First();
-    int count = 0;
-    while (node)
+    CalcUnscrolledPosition( x, y, &x, &y );
+
+    size_t count = GetItemCount();
+
+    if ( HasFlag(wxLC_REPORT) )

     {
     {

-        wxListLineData *line = (wxListLineData*)node->Data();
-        long ret = line->IsHit( x, y );
-        if (ret & flags)
+        size_t current = y / GetLineHeight();
+        if ( current < count )

         {
         {

-            flags = (int)ret;
-            return count;
+            flags = HitTestLine(current, x, y);
+            if ( flags )
+                return current;

         }
         }

-        node = node->Next();
-        count++;

     }
     }

-    return -1;
+    else // !report
+    {
+        // TODO: optimize it too! this is less simple than for report view but
+        //       enumerating all items is still not a way to do it!!
+        for ( size_t current = 0; current < count; current++ )
+        {
+            flags = HitTestLine(current, x, y);
+            if ( flags )
+                return current;
+        }
+    }
+
+    return wxNOT_FOUND;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// adding stuff
+// ----------------------------------------------------------------------------
+

 void wxListMainWindow::InsertItem( wxListItem &item )
 {
 void wxListMainWindow::InsertItem( wxListItem &item )
 {

-    m_dirty = TRUE;
-    int mode = 0;
-    if (m_mode & wxLC_REPORT) mode = wxLC_REPORT;
-    else if (m_mode & wxLC_LIST) mode = wxLC_LIST;
-    else if (m_mode & wxLC_ICON) mode = wxLC_ICON;
-    else if (m_mode & wxLC_SMALL_ICON) mode = wxLC_ICON;  // no typo
+    wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );

 
 

-    wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush );
+    size_t count = GetItemCount();
+    wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId <= count,
+                 _T("invalid item index") );

 
 

-    if (m_mode & wxLC_REPORT)
-    {
-        line->InitItems( GetColumnCount() );
-        item.m_width = GetColumnWidth( 0 )-3;
-    }
+    size_t id = item.m_itemId;
+
+    m_dirty = TRUE;
+
+    int mode = 0;
+    if ( HasFlag(wxLC_REPORT) )
+        mode = wxLC_REPORT;
+    else if ( HasFlag(wxLC_LIST) )
+        mode = wxLC_LIST;
+    else if ( HasFlag(wxLC_ICON) )
+        mode = wxLC_ICON;
+    else if ( HasFlag(wxLC_SMALL_ICON) )
+        mode = wxLC_ICON;  // no typo

     else
     {
     else
     {

-        line->InitItems( 1 );
+        wxFAIL_MSG( _T("unknown mode") );

     }
 
     }
 

+    wxListLineData *line = new wxListLineData(this);
+

     line->SetItem( 0, item );
     line->SetItem( 0, item );

-    if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount()))
-    {
-        wxNode *node = m_lines.Nth( (size_t)item.m_itemId );
-        if (node) m_lines.Insert( node, line );
-    }
-    else
-    {
-        m_lines.Append( line );
-    }
+
+    m_lines.Insert( line, id );
+
+    m_dirty = TRUE;
+    RefreshLines(id, GetItemCount() - 1);

 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
     m_dirty = TRUE;
 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
     m_dirty = TRUE;

-    if (m_mode & wxLC_REPORT)
+    if ( HasFlag(wxLC_REPORT) )

     {
     {

-        if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text );
+        if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
+            item.m_width = GetTextLength( item.m_text );

         wxListHeaderData *column = new wxListHeaderData( item );
         if ((col >= 0) && (col < (int)m_columns.GetCount()))
         {
         wxListHeaderData *column = new wxListHeaderData( item );
         if ((col >= 0) && (col < (int)m_columns.GetCount()))
         {

-            wxNode *node = m_columns.Nth( (size_t)col );
-            if (node)
-                 m_columns.Insert( node, column );
+            wxListHeaderDataList::Node *node = m_columns.Item( col );
+            m_columns.Insert( node, column );

         }
         else
         {
             m_columns.Append( column );
         }
         }
         else
         {
             m_columns.Append( column );
         }

+
+        // invalidate it as it has to be recalculated
+        m_headerWidth = 0;

     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// sorting
+// ----------------------------------------------------------------------------
+

 wxListCtrlCompare list_ctrl_compare_func_2;
 long              list_ctrl_compare_data;
 
 wxListCtrlCompare list_ctrl_compare_func_2;
 long              list_ctrl_compare_data;
 

-int LINKAGEMODE list_ctrl_compare_func_1( const void *arg1, const void *arg2 )
+int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )

 {
 {

-    wxListLineData *line1 = *((wxListLineData**)arg1);
-    wxListLineData *line2 = *((wxListLineData**)arg2);
+    wxListLineData *line1 = *arg1;
+    wxListLineData *line2 = *arg2;

     wxListItem item;
     line1->GetItem( 0, item );
     long data1 = item.m_data;
     wxListItem item;
     line1->GetItem( 0, item );
     long data1 = item.m_data;


@@ -2538,208 +4427,214 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );
     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );

+    m_dirty = TRUE;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// scrolling
+// ----------------------------------------------------------------------------
+

 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

-        wxScrolledWindow::OnScroll( event ) ;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
+    // update our idea of which lines are shown when we redraw the window the
+    // next time
+    ResetVisibleLinesRange();

 
 

-    if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
-    {
-            wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ;
-            if ( lc )
-            {
-                    lc->m_headerWin->Refresh() ;
-#ifdef __WXMAC__
-                        lc->m_headerWin->MacUpdateImmediately() ;
-#endif
-            }
-    }
+    // FIXME
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+    wxScrolledWindow::OnScroll(event);
+#else
+    HandleOnScroll( event );

 #endif
 #endif

-}
-
-// -------------------------------------------------------------------------------------
-// wxListItem
-// -------------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)

 
 

-wxListItem::wxListItem()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
+    if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
+    {
+        wxGenericListCtrl* lc = GetListCtrl();
+        wxCHECK_RET( lc, _T("no listctrl window?") );

 
 

-    m_attr = NULL;
+        lc->m_headerWin->Refresh();
+        lc->m_headerWin->Update();
+    }

 }
 
 }
 

-void wxListItem::Clear()
+int wxListMainWindow::GetCountPerPage() const

 {
 {

-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text = wxEmptyString;
+    if ( !m_linesPerPage )
+    {
+        wxConstCast(this, wxListMainWindow)->
+            m_linesPerPage = GetClientSize().y / GetLineHeight();
+    }

 
 

-    if (m_attr) delete m_attr;
-    m_attr = NULL;
+    return m_linesPerPage;

 }
 
 }
 

-void wxListItem::ClearAttributes()
+void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)

 {
 {

-    if (m_attr) delete m_attr;
-    m_attr = NULL;
-}
+    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") );

 
 

-// -------------------------------------------------------------------------------------
-// wxListEvent
-// -------------------------------------------------------------------------------------
+    if ( m_lineFrom == (size_t)-1 )
+    {
+        size_t count = GetItemCount();
+        if ( count )
+        {
+            m_lineFrom = GetScrollPos(wxVERTICAL);

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+            // this may happen if SetScrollbars() hadn't been called yet
+            if ( m_lineFrom >= count )
+                m_lineFrom = count - 1;

 
 

-wxListEvent::wxListEvent( wxEventType commandType, int id ):
-  wxNotifyEvent( commandType, id )
-{
-    m_code = 0;
-    m_itemIndex = 0;
-    m_oldItemIndex = 0;
-    m_col = 0;
-    m_cancelled = FALSE;
-    m_pointDrag.x = 0;
-    m_pointDrag.y = 0;
-}
+            // we redraw one extra line but this is needed to make the redrawing
+            // logic work when there is a fractional number of lines on screen
+            m_lineTo = m_lineFrom + m_linesPerPage;
+            if ( m_lineTo >= count )
+                m_lineTo = count - 1;
+        }
+        else // empty control
+        {
+            m_lineFrom = 0;
+            m_lineTo = (size_t)-1;
+        }
+    }

 
 

-void wxListEvent::CopyObject(wxObject& object_dest) const
-{
-    wxListEvent *obj = (wxListEvent *)&object_dest;
+    wxASSERT_MSG( IsEmpty() ||
+                  (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()),
+                  _T("GetVisibleLinesRange() returns incorrect result") );

 
 

-    wxNotifyEvent::CopyObject(object_dest);
+    if ( from )
+        *from = m_lineFrom;
+    if ( to )
+        *to = m_lineTo;
+}

 
 

-    obj->m_code = m_code;
-    obj->m_itemIndex = m_itemIndex;
-    obj->m_oldItemIndex = m_oldItemIndex;
-    obj->m_col = m_col;
-    obj->m_cancelled = m_cancelled;
-    obj->m_pointDrag = m_pointDrag;
-    obj->m_item.m_mask = m_item.m_mask;
-    obj->m_item.m_itemId = m_item.m_itemId;
-    obj->m_item.m_col = m_item.m_col;
-    obj->m_item.m_state = m_item.m_state;
-    obj->m_item.m_stateMask = m_item.m_stateMask;
-    obj->m_item.m_text = m_item.m_text;
-    obj->m_item.m_image = m_item.m_image;
-    obj->m_item.m_data = m_item.m_data;
-    obj->m_item.m_format = m_item.m_format;
-    obj->m_item.m_width = m_item.m_width;
+// -------------------------------------------------------------------------------------
+// wxListItem
+// -------------------------------------------------------------------------------------

 
 

-    if ( m_item.HasAttributes() )
-    {
-        obj->m_item.SetTextColour(m_item.GetTextColour());
-    }
-}
+#if !defined(__WIN32__)
+IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+#endif

 
 // -------------------------------------------------------------------------------------
 
 // -------------------------------------------------------------------------------------

-// wxListCtrl
+// wxGenericListCtrl

 // -------------------------------------------------------------------------------------
 
 // -------------------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)
+
+#if !defined(__WIN32__)
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)

 
 

-BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
-  EVT_SIZE          (wxListCtrl::OnSize)
-  EVT_IDLE          (wxListCtrl::OnIdle)
+IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+#endif
+
+BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
+  EVT_SIZE(wxGenericListCtrl::OnSize)
+  EVT_IDLE(wxGenericListCtrl::OnIdle)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxListCtrl::wxListCtrl()
+#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+/*
+ * wxListCtrl has to be a real class or we have problems with
+ * the run-time information.
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
+#endif
+
+wxGenericListCtrl::wxGenericListCtrl()

 {
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
+    m_imageListNormal = (wxImageListType *) NULL;
+    m_imageListSmall = (wxImageListType *) NULL;
+    m_imageListState = (wxImageListType *) NULL;
+
+    m_ownsImageListNormal =
+    m_ownsImageListSmall =
+    m_ownsImageListState = FALSE;
+

     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 

-wxListCtrl::~wxListCtrl()
+wxGenericListCtrl::~wxGenericListCtrl()
+{
+    if (m_ownsImageListNormal)
+        delete m_imageListNormal;
+    if (m_ownsImageListSmall)
+        delete m_imageListSmall;
+    if (m_ownsImageListState)
+        delete m_imageListState;
+}
+
+void wxGenericListCtrl::CreateHeaderWindow()

 {
 {

+    m_headerWin = new wxListHeaderWindow
+                      (
+                        this, -1, m_mainWin,
+                        wxPoint(0, 0),
+                        wxSize(GetClientSize().x, HEADER_HEIGHT),
+                        wxTAB_TRAVERSAL
+                      );

 }
 
 }
 

-bool wxListCtrl::Create(wxWindow *parent,
+bool wxGenericListCtrl::Create(wxWindow *parent,

                         wxWindowID id,
                         const wxPoint &pos,
                         const wxSize &size,
                         long style,
                         wxWindowID id,
                         const wxPoint &pos,
                         const wxSize &size,
                         long style,

-#if wxUSE_VALIDATORS

                         const wxValidator &validator,
                         const wxValidator &validator,

-#endif

                         const wxString &name)
 {
                         const wxString &name)
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
+    m_imageListNormal =
+    m_imageListSmall =
+    m_imageListState = (wxImageListType *) NULL;
+    m_ownsImageListNormal =
+    m_ownsImageListSmall =
+    m_ownsImageListState = FALSE;
+

     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 

-    if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) )
+    if ( !(style & wxLC_MASK_TYPE) )

     {
         style = style | wxLC_LIST;
     }
 
     {
         style = style | wxLC_LIST;
     }
 

-    bool ret = wxControl::Create( parent,
-                                  id,
-                                  pos,
-                                  size,
-                                  style,
-#if wxUSE_VALIDATORS
-                                  validator,
-#endif
-                                  name );
-
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
+    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+        return FALSE;

 
 

-    if (style & wxSUNKEN_BORDER)
-        style -= wxSUNKEN_BORDER;
+    // don't create the inner window with the border
+    style &= ~wxSUNKEN_BORDER;

 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
 
 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
 

-    if (HasFlag(wxLC_REPORT))
-        m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL );
-    else
-        m_headerWin = (wxListHeaderWindow *) NULL;
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        CreateHeaderWindow();

 
 

-    SetBackgroundColour( *wxWHITE );
+        if ( HasFlag(wxLC_NO_HEADER) )
+        {
+            // VZ: why do we create it at all then?
+            m_headerWin->Show( FALSE );
+        }
+    }

 
 

-    return ret;
+    return TRUE;

 }
 
 }
 

-void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxGenericListCtrl::SetSingleStyle( long style, bool add )

 {
 {

-    /* handled in OnIdle */
-
-    if (m_mainWin) m_mainWin->m_dirty = TRUE;
-}
+    wxASSERT_MSG( !(style & wxLC_VIRTUAL),
+                  _T("wxLC_VIRTUAL can't be [un]set") );

 
 

-void wxListCtrl::SetSingleStyle( long style, bool add )
-{

     long flag = GetWindowStyle();
 
     if (add)
     {
     long flag = GetWindowStyle();
 
     if (add)
     {

-        if (style & wxLC_MASK_TYPE)  flag = flag & ~wxLC_MASK_TYPE;
-        if (style & wxLC_MASK_ALIGN) flag = flag & ~wxLC_MASK_ALIGN;
-        if (style & wxLC_MASK_SORT) flag = flag & ~wxLC_MASK_SORT;
+        if (style & wxLC_MASK_TYPE)
+            flag &= ~(wxLC_MASK_TYPE | wxLC_VIRTUAL);
+        if (style & wxLC_MASK_ALIGN)
+            flag &= ~wxLC_MASK_ALIGN;
+        if (style & wxLC_MASK_SORT)
+            flag &= ~wxLC_MASK_SORT;

     }
 
     if (add)
     }
 
     if (add)


@@ -2748,97 +4643,94 @@ void wxListCtrl::SetSingleStyle( long style, bool add )
     }
     else
     {
     }
     else
     {

-        if (flag & style) flag -= style;
+        flag &= ~style;

     }
 
     SetWindowStyleFlag( flag );
 }
 
     }
 
     SetWindowStyleFlag( flag );
 }
 

-void wxListCtrl::SetWindowStyleFlag( long flag )
+void wxGenericListCtrl::SetWindowStyleFlag( long flag )

 {
     if (m_mainWin)
     {
         m_mainWin->DeleteEverything();
 
 {
     if (m_mainWin)
     {
         m_mainWin->DeleteEverything();
 

-        int width = 0;
-        int height = 0;
-        GetClientSize( &width, &height );
+        // has the header visibility changed?
+        bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
+             willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);

 
 

-        m_mainWin->SetMode( flag );
-
-        if (flag & wxLC_REPORT)
+        if ( hasHeader != willHaveHeader )

         {
         {

-            if (!HasFlag(wxLC_REPORT))
+            // toggle it
+            if ( hasHeader )
+            {
+                if ( m_headerWin )
+                {
+                    // don't delete, just hide, as we can reuse it later
+                    m_headerWin->Show(FALSE);
+                }
+                //else: nothing to do
+            }
+            else // must show header

             {
                 if (!m_headerWin)
                 {
             {
                 if (!m_headerWin)
                 {

-                    m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin,
-                      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
-                    if (HasFlag(wxLC_NO_HEADER))
-                        m_headerWin->Show( FALSE );
+                    CreateHeaderWindow();

                 }
                 }

-                else
+                else // already have it, just show

                 {
                 {

-                    if (flag & wxLC_NO_HEADER)
-                        m_headerWin->Show( FALSE );
-                    else
-                        m_headerWin->Show( TRUE );
+                    m_headerWin->Show( TRUE );

                 }
             }
                 }
             }

-        }
-        else
-        {
-            if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER)))
-            {
-                m_headerWin->Show( FALSE );
-            }
+
+            ResizeReportView(willHaveHeader);

         }
     }
 
     wxWindow::SetWindowStyleFlag( flag );
 }
 
         }
     }
 
     wxWindow::SetWindowStyleFlag( flag );
 }
 

-bool wxListCtrl::GetColumn(int col, wxListItem &item) const
+bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const

 {
     m_mainWin->GetColumn( col, item );
     return TRUE;
 }
 
 {
     m_mainWin->GetColumn( col, item );
     return TRUE;
 }
 

-bool wxListCtrl::SetColumn( int col, wxListItem& item )
+bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )

 {
     m_mainWin->SetColumn( col, item );
     return TRUE;
 }
 
 {
     m_mainWin->SetColumn( col, item );
     return TRUE;
 }
 

-int wxListCtrl::GetColumnWidth( int col ) const
+int wxGenericListCtrl::GetColumnWidth( int col ) const

 {
     return m_mainWin->GetColumnWidth( col );
 }
 
 {
     return m_mainWin->GetColumnWidth( col );
 }
 

-bool wxListCtrl::SetColumnWidth( int col, int width )
+bool wxGenericListCtrl::SetColumnWidth( int col, int width )

 {
     m_mainWin->SetColumnWidth( col, width );
     return TRUE;
 }
 
 {
     m_mainWin->SetColumnWidth( col, width );
     return TRUE;
 }
 

-int wxListCtrl::GetCountPerPage() const
+int wxGenericListCtrl::GetCountPerPage() const

 {
   return m_mainWin->GetCountPerPage();  // different from Windows ?
 }
 
 {
   return m_mainWin->GetCountPerPage();  // different from Windows ?
 }
 

-bool wxListCtrl::GetItem( wxListItem &info ) const
+bool wxGenericListCtrl::GetItem( wxListItem &info ) const

 {
     m_mainWin->GetItem( info );
     return TRUE;
 }
 
 {
     m_mainWin->GetItem( info );
     return TRUE;
 }
 

-bool wxListCtrl::SetItem( wxListItem &info )
+bool wxGenericListCtrl::SetItem( wxListItem &info )

 {
     m_mainWin->SetItem( info );
     return TRUE;
 }
 
 {
     m_mainWin->SetItem( info );
     return TRUE;
 }
 

-long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
+long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )

 {
     wxListItem info;
     info.m_text = label;
 {
     wxListItem info;
     info.m_text = label;


@@ -2854,18 +4746,18 @@ long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageI
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxListCtrl::GetItemState( long item, long stateMask ) const
+int wxGenericListCtrl::GetItemState( long item, long stateMask ) const

 {
     return m_mainWin->GetItemState( item, stateMask );
 }
 
 {
     return m_mainWin->GetItemState( item, stateMask );
 }
 

-bool wxListCtrl::SetItemState( long item, long state, long stateMask )
+bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )

 {
     m_mainWin->SetItemState( item, state, stateMask );
     return TRUE;
 }
 
 {
     m_mainWin->SetItemState( item, state, stateMask );
     return TRUE;
 }
 

-bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
+bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )

 {
     wxListItem info;
     info.m_image = image;
 {
     wxListItem info;
     info.m_image = image;


@@ -2875,24 +4767,17 @@ bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxString wxListCtrl::GetItemText( long item ) const
+wxString wxGenericListCtrl::GetItemText( long item ) const

 {
 {

-    wxListItem info;
-    info.m_itemId = item;
-    m_mainWin->GetItem( info );
-    return info.m_text;
+    return m_mainWin->GetItemText(item);

 }
 
 }
 

-void wxListCtrl::SetItemText( long item, const wxString &str )
+void wxGenericListCtrl::SetItemText( long item, const wxString& str )

 {
 {

-    wxListItem info;
-    info.m_mask = wxLIST_MASK_TEXT;
-    info.m_itemId = item;
-    info.m_text = str;
-    m_mainWin->SetItem( info );
+    m_mainWin->SetItemText(item, str);

 }
 
 }
 

-long wxListCtrl::GetItemData( long item ) const
+long wxGenericListCtrl::GetItemData( long item ) const

 {
     wxListItem info;
     info.m_itemId = item;
 {
     wxListItem info;
     info.m_itemId = item;


@@ -2900,7 +4785,7 @@ long wxListCtrl::GetItemData( long item ) const
     return info.m_data;
 }
 
     return info.m_data;
 }
 

-bool wxListCtrl::SetItemData( long item, long data )
+bool wxGenericListCtrl::SetItemData( long item, long data )

 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;


@@ -2910,69 +4795,101 @@ bool wxListCtrl::SetItemData( long item, long data )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const
+bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const

 {
     m_mainWin->GetItemRect( item, rect );
     return TRUE;
 }
 
 {
     m_mainWin->GetItemRect( item, rect );
     return TRUE;
 }
 

-bool wxListCtrl::GetItemPosition( long item, wxPoint& pos ) const
+bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const

 {
     m_mainWin->GetItemPosition( item, pos );
     return TRUE;
 }
 
 {
     m_mainWin->GetItemPosition( item, pos );
     return TRUE;
 }
 

-bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
+bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-int wxListCtrl::GetItemCount() const
+int wxGenericListCtrl::GetItemCount() const

 {
     return m_mainWin->GetItemCount();
 }
 
 {
     return m_mainWin->GetItemCount();
 }
 

-int wxListCtrl::GetColumnCount() const
+int wxGenericListCtrl::GetColumnCount() const

 {
     return m_mainWin->GetColumnCount();
 }
 
 {
     return m_mainWin->GetColumnCount();
 }
 

-void wxListCtrl::SetItemSpacing( int spacing, bool isSmall )
+void wxGenericListCtrl::SetItemSpacing( int spacing, bool isSmall )

 {
     m_mainWin->SetItemSpacing( spacing, isSmall );
 }
 
 {
     m_mainWin->SetItemSpacing( spacing, isSmall );
 }
 

-int wxListCtrl::GetItemSpacing( bool isSmall ) const
+int wxGenericListCtrl::GetItemSpacing( bool isSmall ) const

 {
     return m_mainWin->GetItemSpacing( isSmall );
 }
 
 {
     return m_mainWin->GetItemSpacing( isSmall );
 }
 

-int wxListCtrl::GetSelectedItemCount() const
+void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetTextColour( col );
+    m_mainWin->SetItem( info );
+}
+
+wxColour wxGenericListCtrl::GetItemTextColour( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetTextColour();
+}
+
+void wxGenericListCtrl::SetItemBackgroundColour( long item, const wxColour &col )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetBackgroundColour( col );
+    m_mainWin->SetItem( info );
+}
+
+wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetBackgroundColour();
+}
+
+int wxGenericListCtrl::GetSelectedItemCount() const

 {
     return m_mainWin->GetSelectedItemCount();
 }
 
 {
     return m_mainWin->GetSelectedItemCount();
 }
 

-wxColour wxListCtrl::GetTextColour() const
+wxColour wxGenericListCtrl::GetTextColour() const

 {
     return GetForegroundColour();
 }
 
 {
     return GetForegroundColour();
 }
 

-void wxListCtrl::SetTextColour(const wxColour& col)
+void wxGenericListCtrl::SetTextColour(const wxColour& col)

 {
     SetForegroundColour(col);
 }
 
 {
     SetForegroundColour(col);
 }
 

-long wxListCtrl::GetTopItem() const
+long wxGenericListCtrl::GetTopItem() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-long wxListCtrl::GetNextItem( long item, int geom, int state ) const
+long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const

 {
     return m_mainWin->GetNextItem( item, geom, state );
 }
 
 {
     return m_mainWin->GetNextItem( item, geom, state );
 }
 

-wxImageList *wxListCtrl::GetImageList(int which) const
+wxImageListType *wxGenericListCtrl::GetImageList(int which) const

 {
     if (which == wxIMAGE_LIST_NORMAL)
     {
 {
     if (which == wxIMAGE_LIST_NORMAL)
     {


@@ -2986,89 +4903,127 @@ wxImageList *wxListCtrl::GetImageList(int which) const
     {
         return m_imageListState;
     }
     {
         return m_imageListState;
     }

-    return (wxImageList *) NULL;
+    return (wxImageListType *) NULL;

 }
 
 }
 

-void wxListCtrl::SetImageList( wxImageList *imageList, int which )
+void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )

 {
 {

+    if ( which == wxIMAGE_LIST_NORMAL )
+    {
+        if (m_ownsImageListNormal) delete m_imageListNormal;
+        m_imageListNormal = imageList;
+        m_ownsImageListNormal = FALSE;
+    }
+    else if ( which == wxIMAGE_LIST_SMALL )
+    {
+        if (m_ownsImageListSmall) delete m_imageListSmall;
+        m_imageListSmall = imageList;
+        m_ownsImageListSmall = FALSE;
+    }
+    else if ( which == wxIMAGE_LIST_STATE )
+    {
+        if (m_ownsImageListState) delete m_imageListState;
+        m_imageListState = imageList;
+        m_ownsImageListState = FALSE;
+    }
+

     m_mainWin->SetImageList( imageList, which );
 }
 
     m_mainWin->SetImageList( imageList, which );
 }
 

-bool wxListCtrl::Arrange( int WXUNUSED(flag) )
+void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which)
+{
+    SetImageList(imageList, which);
+    if ( which == wxIMAGE_LIST_NORMAL )
+        m_ownsImageListNormal = TRUE;
+    else if ( which == wxIMAGE_LIST_SMALL )
+        m_ownsImageListSmall = TRUE;
+    else if ( which == wxIMAGE_LIST_STATE )
+        m_ownsImageListState = TRUE;
+}
+
+bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-bool wxListCtrl::DeleteItem( long item )
+bool wxGenericListCtrl::DeleteItem( long item )

 {
     m_mainWin->DeleteItem( item );
     return TRUE;
 }
 
 {
     m_mainWin->DeleteItem( item );
     return TRUE;
 }
 

-bool wxListCtrl::DeleteAllItems()
+bool wxGenericListCtrl::DeleteAllItems()

 {
     m_mainWin->DeleteAllItems();
     return TRUE;
 }
 
 {
     m_mainWin->DeleteAllItems();
     return TRUE;
 }
 

-bool wxListCtrl::DeleteAllColumns()
+bool wxGenericListCtrl::DeleteAllColumns()

 {
 {

-    for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
-        DeleteColumn(n);
+    size_t count = m_mainWin->m_columns.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+        DeleteColumn(0);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-void wxListCtrl::ClearAll()
+void wxGenericListCtrl::ClearAll()

 {
     m_mainWin->DeleteEverything();
 }
 
 {
     m_mainWin->DeleteEverything();
 }
 

-bool wxListCtrl::DeleteColumn( int col )
+bool wxGenericListCtrl::DeleteColumn( int col )

 {
     m_mainWin->DeleteColumn( col );
 {
     m_mainWin->DeleteColumn( col );

+
+    // if we don't have the header any longer, we need to relayout the window
+    if ( !GetColumnCount() )
+    {
+        ResizeReportView(FALSE /* no header */);
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxListCtrl::Edit( long item )
+void wxGenericListCtrl::Edit( long item )

 {
 {

-    m_mainWin->Edit( item );
+    m_mainWin->EditLabel( item );

 }
 
 }
 

-bool wxListCtrl::EnsureVisible( long item )
+bool wxGenericListCtrl::EnsureVisible( long item )

 {
     m_mainWin->EnsureVisible( item );
     return TRUE;
 }
 
 {
     m_mainWin->EnsureVisible( item );
     return TRUE;
 }
 

-long wxListCtrl::FindItem( long start, const wxString& str,  bool partial )
+long wxGenericListCtrl::FindItem( long start, const wxString& str,  bool partial )

 {
     return m_mainWin->FindItem( start, str, partial );
 }
 
 {
     return m_mainWin->FindItem( start, str, partial );
 }
 

-long wxListCtrl::FindItem( long start, long data )
+long wxGenericListCtrl::FindItem( long start, long data )

 {
     return m_mainWin->FindItem( start, data );
 }
 
 {
     return m_mainWin->FindItem( start, data );
 }
 

-long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
+long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),

                            int WXUNUSED(direction))
 {
     return 0;
 }
 
                            int WXUNUSED(direction))
 {
     return 0;
 }
 

-long wxListCtrl::HitTest( const wxPoint &point, int &flags )
+long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )

 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }
 
 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }
 

-long wxListCtrl::InsertItem( wxListItem& info )
+long wxGenericListCtrl::InsertItem( wxListItem& info )

 {
     m_mainWin->InsertItem( info );
     return info.m_itemId;
 }
 
 {
     m_mainWin->InsertItem( info );
     return info.m_itemId;
 }
 

-long wxListCtrl::InsertItem( long index, const wxString &label )
+long wxGenericListCtrl::InsertItem( long index, const wxString &label )

 {
     wxListItem info;
     info.m_text = label;
 {
     wxListItem info;
     info.m_text = label;


@@ -3077,7 +5032,7 @@ long wxListCtrl::InsertItem( long index, const wxString &label )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

-long wxListCtrl::InsertItem( long index, int imageIndex )
+long wxGenericListCtrl::InsertItem( long index, int imageIndex )

 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_IMAGE;
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_IMAGE;


@@ -3086,7 +5041,7 @@ long wxListCtrl::InsertItem( long index, int imageIndex )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

-long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
+long wxGenericListCtrl::InsertItem( long index, const wxString &label, int imageIndex )

 {
     wxListItem info;
     info.m_text = label;
 {
     wxListItem info;
     info.m_text = label;


@@ -3096,16 +5051,25 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

-long wxListCtrl::InsertColumn( long col, wxListItem &item )
+long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )

 {
 {

-    wxASSERT( m_headerWin );
+    wxCHECK_MSG( m_headerWin, -1, _T("can't add column in non report mode") );
+

     m_mainWin->InsertColumn( col, item );
     m_mainWin->InsertColumn( col, item );

+
+    // if we hadn't had header before and have it now we need to relayout the
+    // window
+    if ( GetColumnCount() == 1 )
+    {
+        ResizeReportView(TRUE /* have header */);
+    }
+

     m_headerWin->Refresh();
 
     return 0;
 }
 
     m_headerWin->Refresh();
 
     return 0;
 }
 

-long wxListCtrl::InsertColumn( long col, const wxString &heading,
+long wxGenericListCtrl::InsertColumn( long col, const wxString &heading,

                                int format, int width )
 {
     wxListItem item;
                                int format, int width )
 {
     wxListItem item;


@@ -3121,7 +5085,7 @@ long wxListCtrl::InsertColumn( long col, const wxString &heading,
     return InsertColumn( col, item );
 }
 
     return InsertColumn( col, item );
 }
 

-bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
+bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )

 {
     return 0;
 }
 {
     return 0;
 }


@@ -3136,71 +5100,69 @@ bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 // or zero if the two items are equivalent.
 // data is arbitrary data to be passed to the sort function.
 
 // or zero if the two items are equivalent.
 // data is arbitrary data to be passed to the sort function.
 

-bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data )
+bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )

 {
     m_mainWin->SortItems( fn, data );
     return TRUE;
 }
 
 {
     m_mainWin->SortItems( fn, data );
     return TRUE;
 }
 

-void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))

 {
 {

-    if (!m_mainWin->m_dirty) return;
+    if ( !m_mainWin )
+        return;

 
 

-    int cw = 0;
-    int ch = 0;
-    GetClientSize( &cw, &ch );
+    ResizeReportView(m_mainWin->HasHeader());

 
 

-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
+    m_mainWin->RecalculatePositions();
+}

 
 

-    if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER))
-    {
-        m_headerWin->GetPosition( &x, &y );
-        m_headerWin->GetSize( &w, &h );
-        if ((x != 0) || (y != 0) || (w != cw) || (h != 23))
-            m_headerWin->SetSize( 0, 0, cw, 23 );
+void wxGenericListCtrl::ResizeReportView(bool showHeader)
+{
+    int cw, ch;
+    GetClientSize( &cw, &ch );

 
 

-        m_mainWin->GetPosition( &x, &y );
-        m_mainWin->GetSize( &w, &h );
-        if ((x != 0) || (y != 24) || (w != cw) || (h != ch-24))
-            m_mainWin->SetSize( 0, 24, cw, ch-24 );
+    if ( showHeader )
+    {
+        m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
+        m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );

     }
     }

-    else
+    else // no header window

     {
     {

-        m_mainWin->GetPosition( &x, &y );
-        m_mainWin->GetSize( &w, &h );
-        if ((x != 0) || (y != 24) || (w != cw) || (h != ch))
-            m_mainWin->SetSize( 0, 0, cw, ch );
+        m_mainWin->SetSize( 0, 0, cw, ch );

     }
     }

-
-    m_mainWin->CalculatePositions();
-    m_mainWin->RealizeChanges();
-    m_mainWin->m_dirty = FALSE;
-    m_mainWin->Refresh();

 }
 
 }
 

-bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
+void wxGenericListCtrl::OnIdle( wxIdleEvent & event )

 {
 {

-    if ( !wxWindow::SetBackgroundColour( colour ) )
-        return FALSE;
+    event.Skip();
+
+    // do it only if needed
+    if ( !m_mainWin->m_dirty )
+        return;

 
 

+    m_mainWin->RecalculatePositions();
+}
+
+// ----------------------------------------------------------------------------
+// font/colours
+// ----------------------------------------------------------------------------
+
+bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )
+{

     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }
 
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }
 

-    if (m_headerWin)
-    {
-//        m_headerWin->SetBackgroundColour( colour );
-    }
-

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::SetForegroundColour( const wxColour &colour )
+bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )

 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;


@@ -3219,7 +5181,7 @@ bool wxListCtrl::SetForegroundColour( const wxColour &colour )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::SetFont( const wxFont &font )
+bool wxGenericListCtrl::SetFont( const wxFont &font )

 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;
 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;


@@ -3238,3 +5200,112 @@ bool wxListCtrl::SetFont( const wxFont &font )
     return TRUE;
 }
 
     return TRUE;
 }
 

+// ----------------------------------------------------------------------------
+// methods forwarded to m_mainWin
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+void wxGenericListCtrl::SetDropTarget( wxDropTarget *dropTarget )
+{
+    m_mainWin->SetDropTarget( dropTarget );
+}
+
+wxDropTarget *wxGenericListCtrl::GetDropTarget() const
+{
+    return m_mainWin->GetDropTarget();
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+
+bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
+{
+    return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE;
+}
+
+wxColour wxGenericListCtrl::GetBackgroundColour() const
+{
+    return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour();
+}
+
+wxColour wxGenericListCtrl::GetForegroundColour() const
+{
+    return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
+}
+
+bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
+{
+#if wxUSE_MENUS
+    return m_mainWin->PopupMenu( menu, x, y );
+#else
+    return FALSE;
+#endif // wxUSE_MENUS
+}
+
+void wxGenericListCtrl::SetFocus()
+{
+    /* The test in window.cpp fails as we are a composite
+       window, so it checks against "this", but not m_mainWin. */
+    if ( FindFocus() != this )
+        m_mainWin->SetFocus();
+}
+
+// ----------------------------------------------------------------------------
+// virtual list control support
+// ----------------------------------------------------------------------------
+
+wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
+{
+    // this is a pure virtual function, in fact - which is not really pure
+    // because the controls which are not virtual don't need to implement it
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemText not supposed to be called") );
+
+    return wxEmptyString;
+}
+
+int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
+{
+    // same as above
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );
+
+    return -1;
+}
+
+wxListItemAttr *wxGenericListCtrl::OnGetItemAttr(long item) const
+{
+    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+                  _T("invalid item index in OnGetItemAttr()") );
+
+    // no attributes by default
+    return NULL;
+}
+
+void wxGenericListCtrl::SetItemCount(long count)
+{
+    wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
+
+    m_mainWin->SetItemCount(count);
+}
+
+void wxGenericListCtrl::RefreshItem(long item)
+{
+    m_mainWin->RefreshLine(item);
+}
+
+void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)
+{
+    m_mainWin->RefreshLines(itemFrom, itemTo);
+}
+
+void wxGenericListCtrl::Freeze()
+{
+    m_mainWin->Freeze();
+}
+
+void wxGenericListCtrl::Thaw()
+{
+    m_mainWin->Thaw();
+}
+
+#endif // wxUSE_LISTCTRL
+