using new API (no visual difference)

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index c97dd4631a9ee03e0801d46c2b73a0f93b097ec7..41beca006a6ace93a1dd1d02126d8ba537819be9 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2,15 +2,17 @@
 // Name:        generic/listctrl.cpp
 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling
 // Name:        generic/listctrl.cpp
 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling

+//              Vadim Zeitlin (virtual list control support)

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

-#ifdef __GNUG__
-    #pragma implementation "listctrl.h"
-    #pragma implementation "listctrlbase.h"
-#endif
+// TODO
+//
+//   1. we need to implement searching/sorting for virtual controls somehow
+// 2. when changing selection the lines are refreshed twice
+

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


@@ -19,21 +21,50 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/dcscreen.h"
-#include "wx/app.h"
-#include "wx/listctrl.h"
-#include "wx/generic/imaglist.h"
-#include "wx/dynarray.h"
+#if wxUSE_LISTCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dynarray.h"
+    #include "wx/dcscreen.h"
+    #include "wx/textctrl.h"
+#endif

 
 

-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
+// under Win32 we always use the native version and also may use the generic
+// one, however some things should be done only if we use only the generic
+// version
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #define HAVE_NATIVE_LISTCTRL

 #endif
 
 #endif
 

-#ifndef wxUSE_GENERIC_LIST_EXTENSIONS
-#define wxUSE_GENERIC_LIST_EXTENSIONS 1
+// if we have the native control, wx/listctrl.h declares it and not this one
+#ifdef HAVE_NATIVE_LISTCTRL
+    #include "wx/generic/listctrl.h"
+#else // !HAVE_NATIVE_LISTCTRL
+    #include "wx/listctrl.h"
+
+    // if we have a native version, its implementation file does all this
+    IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
+    IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+
+    IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
+#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
+
+#include "wx/selstore.h"
+#include "wx/renderer.h"
+#include "wx/math.h"
+
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"

 #endif
 
 #endif
 

+
+// NOTE: If using the wxListBox visual attributes works everywhere then this can
+// be removed, as well as the #else case below.
+#define _USE_VISATTR 0
+
+

 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------


@@ -44,69 +75,152 @@ 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_END_LABEL_EDIT)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)

+#if WXWIN_COMPATIBILITY_2_4

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)

+#endif

 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_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_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;
+
+static const int SCROLL_UNIT_X = 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 = 4;
+static const int EXTRA_HEIGHT = 4;
+
+// margin between the window and the items
+static const int EXTRA_BORDER_X = 2;
+static const int EXTRA_BORDER_Y = 2;
+
+// offset for the header window
+static const int HEADER_OFFSET_X = 1;
+static const int HEADER_OFFSET_Y = 1;
+
+// margin between rows of icons in [small] icon view
+static const int MARGIN_BETWEEN_ROWS = 6;
+
+// when autosizing the columns, add some slack
+static const int AUTOSIZE_COL_MARGIN = 10;
+
+// default width for the header columns
+static const int WIDTH_COL_DEFAULT = 80;
+
+// the space between the image and the text in the report mode
+static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;

 
 // ============================================================================
 // private classes
 // ============================================================================
 
 
 // ============================================================================
 // private classes
 // ============================================================================
 

+//-----------------------------------------------------------------------------
+//  wxColWidthInfo (internal)
+//-----------------------------------------------------------------------------
+
+struct wxColWidthInfo
+{
+    int     nMaxWidth;
+    bool    bNeedsUpdate;   //  only set to true when an item whose
+                            //  width == nMaxWidth is removed
+
+    wxColWidthInfo(int w = 0, bool needsUpdate = false)
+    {
+        nMaxWidth = w;
+        bNeedsUpdate = needsUpdate;
+    }
+};
+
+WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
+

 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListItemData : public wxObject
+class WXDLLEXPORT wxListItemData

 {
 public:
 {
 public:

-    wxListItemData();
-    ~wxListItemData() { delete m_attr; }
+    wxListItemData(wxListMainWindow *owner);
+    ~wxListItemData();

 
 

-    wxListItemData( const wxListItem &info );

     void SetItem( const wxListItem &info );
     void SetItem( const wxListItem &info );

-    void SetImage( int image );
-    void SetData( long data );
+    void SetImage( int image ) { m_image = image; }
+    void SetData( wxUIntPtr data ) { m_data = data; }

     void SetPosition( int x, int y );
     void SetSize( int width, int height );
     void SetPosition( int x, int y );
     void SetSize( int width, int height );

-    bool HasImage() const;

 
     bool HasText() const { return !m_text.empty(); }
     const wxString& GetText() const { return m_text; }
     void SetText(const wxString& text) { m_text = text; }
 
 
     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;
 
     bool IsHit( int x, int y ) const;
 

-    int GetX( void ) const;
-    int GetY( void ) const;
+    int GetX() const;
+    int GetY() const;

     int GetWidth() const;
     int GetHeight() const;
     int GetWidth() const;
     int GetHeight() const;

-    int GetImage() const;
+
+    int GetImage() const { return m_image; }
+    bool HasImage() const { return GetImage() != -1; }
+

     void GetItem( wxListItem &info ) const;
 
     void GetItem( wxListItem &info ) const;
 

-    wxListItemAttr *GetAttributes() const { return m_attr; }
+    void SetAttr(wxListItemAttr *attr) { m_attr = attr; }
+    wxListItemAttr *GetAttr() const { return m_attr; }

 
 public:
 
 public:

-    int        m_image;
-    long       m_data;
-    int        m_xpos,
-               m_ypos;
-    int        m_width,
-               m_height;
+    // the item image or -1
+    int m_image;

 
 

+    // user data associated with the item
+    wxUIntPtr m_data;
+
+    // the item coordinates are not used in report mode; instead this pointer is
+    // NULL and the owner window is used to retrieve the item position and size
+    wxRect *m_rect;
+
+    // the list ctrl we are in
+    wxListMainWindow *m_owner;
+
+    // custom attributes or NULL

     wxListItemAttr *m_attr;
 
 protected:
     wxListItemAttr *m_attr;
 
 protected:

-    wxString   m_text;
+    // common part of all ctors
+    void Init();

 
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxListItemData);
+    wxString m_text;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -115,15 +229,6 @@ private:
 
 class WXDLLEXPORT wxListHeaderData : public wxObject
 {
 
 class WXDLLEXPORT wxListHeaderData : public wxObject
 {

-protected:
-    long      m_mask;
-    int       m_image;
-    wxString  m_text;
-    int       m_format;
-    int       m_width;
-    int       m_xpos,m_ypos;
-    int       m_height;
-

 public:
     wxListHeaderData();
     wxListHeaderData( const wxListItem &info );
 public:
     wxListHeaderData();
     wxListHeaderData( const wxListItem &info );


@@ -145,69 +250,159 @@ public:
     int GetWidth() const;
     int GetFormat() 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:
 private:

-    DECLARE_DYNAMIC_CLASS(wxListHeaderData);
+    void Init();

 };
 
 //-----------------------------------------------------------------------------
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListLineData : public wxObject
+WX_DECLARE_EXPORTED_LIST(wxListItemData, wxListItemDataList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxListItemDataList)
+
+class wxListLineData

 {
 public:
 {
 public:

-    wxList              m_items;
-    wxRect              m_bound_all;
-    wxRect              m_bound_label;
-    wxRect              m_bound_icon;
-    wxRect              m_bound_hilight;
-    int                 m_mode;
-    bool                m_hilighted;
-    wxBrush            *m_hilightBrush;
-    int                 m_spacing;
-    wxListMainWindow   *m_owner;
+    // the list of subitems: only may have more than one item in report mode
+    wxListItemDataList m_items;
+
+    // this is not used in report view
+    struct GeometryInfo
+    {
+        // total item rect
+        wxRect m_rectAll;
+
+        // label only
+        wxRect m_rectLabel;
+
+        // icon only
+        wxRect m_rectIcon;
+
+        // the part to be highlighted
+        wxRect m_rectHighlight;
+
+        // extend all our rects to be centered inside the one of given width
+        void ExtendWidth(wxCoord w)
+        {
+            wxASSERT_MSG( m_rectAll.width <= w,
+                            _T("width can only be increased") );
+
+            m_rectAll.width = w;
+            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
+            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2;
+            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2;
+        }
+    }
+    *m_gi;

 
 

-    void DoDraw( wxDC *dc, bool hilight, bool paintBG );
+    // is this item selected? [NB: not used in virtual mode]
+    bool m_highlighted;
+
+    // back pointer to the list ctrl
+    wxListMainWindow *m_owner;

 
 public:
 
 public:

-    wxListLineData() {}
-    wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush );
+    wxListLineData(wxListMainWindow *owner);
+
+    ~wxListLineData()
+    {
+        WX_CLEAR_LIST(wxListItemDataList, m_items);
+        delete m_gi;
+    }
+
+    // are we in report mode?
+    inline bool InReportView() const;
+
+    // are we in virtual report mode?
+    inline bool IsVirtual() const;
+
+    // these 2 methods shouldn't be called for report view controls, in that
+    // case we determine our position/size ourselves
+
+    // calculate the size of the line

     void CalculateSize( wxDC *dc, int spacing );
     void CalculateSize( wxDC *dc, int spacing );

-    void SetPosition( wxDC *dc, int x, int y,  int window_width );
-    void SetColumnPosition( int index, int x );
-    void GetSize( int &width, int &height );
-    void GetExtent( int &x, int &y, int &width, int &height );
-    void GetLabelExtent( int &x, int &y, int &width, int &height );
-    long IsHit( int x, int y );
-    void InitItems( int num );
+
+    // remember the position this line appears at
+    void SetPosition( int x, int y, int spacing );
+
+    // wxListCtrl API
+
+    void SetImage( int image ) { SetImage(0, image); }
+    int GetImage() const { return GetImage(0); }
+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
+
+    bool HasImage() const { return GetImage() != -1; }
+    bool HasText() const { return !GetText(0).empty(); }
+

     void SetItem( int index, const wxListItem &info );
     void GetItem( int index, wxListItem &info );
     void SetItem( int index, const wxListItem &info );
     void GetItem( int index, wxListItem &info );

+

     wxString GetText(int index) const;
     wxString GetText(int index) const;

-    void SetText( int index, const wxString s );
-    int GetImage( int index );
-    void GetRect( wxRect &rect );
-    void Hilight( bool on );
-    void ReverseHilight();
-    void DrawRubberBand( wxDC *dc, bool on );
+    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 );
     void Draw( wxDC *dc );

-    bool IsInRect( int x, int y, const wxRect &rect );
-    bool IsHilighted();
-    void AssignRect( wxRect &dest, int x, int y, int width, int height );
-    void AssignRect( wxRect &dest, const wxRect &source );
+
+    // the same in report mode
+    void DrawInReportMode( wxDC *dc,
+                           const wxRect& rect,
+                           const wxRect& rectHL,
+                           bool highlighted );

 
 private:
 
 private:

-    void SetAttributes(wxDC *dc,
-                       const wxListItemAttr *attr,
-                       const wxColour& colText, const wxFont& font,
-                       bool hilight);
+    // set the line to contain num items (only can be > 1 in report mode)
+    void InitItems( int num );

 
 

-    DECLARE_DYNAMIC_CLASS(wxListLineData);
-};
+    // get the mode (i.e. style)  of the list control
+    inline int GetMode() const;

 
 

+    // prepare the DC for drawing with these item's attributes, return true if
+    // we need to draw the items background to highlight it, false otherwise
+    bool SetAttributes(wxDC *dc,
+                       const wxListItemAttr *attr,
+                       bool highlight);
+
+    // draw the text on the DC with the correct justification; also add an
+    // ellipsis if the text is too large to fit in the current width
+    void DrawTextFormatted(wxDC *dc,
+                           const wxString &text,
+                           int col,
+                           int x,
+                           int yMid,    // this is middle, not top, of the text
+                           int width);
+};

 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+WX_DEFINE_OBJARRAY(wxListLineDataArray)

 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)


@@ -221,19 +416,18 @@ protected:
     wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 
     wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 

-    // column being resized
+    // column being resized or -1

     int m_column;
 
     // divider line position in logical (unscrolled) coords
     int m_currentX;
 
     int m_column;
 
     // divider line position in logical (unscrolled) coords
     int m_currentX;
 

-    // minimal position beyond which the divider line can't be dragged in
-    // logical coords
+    // minimal position beyond which the divider line
+    // can't be dragged in logical coords

     int m_minX;
 
 public:
     wxListHeaderWindow();
     int m_minX;
 
 public:
     wxListHeaderWindow();

-    virtual ~wxListHeaderWindow();

 
     wxListHeaderWindow( wxWindow *win,
                         wxWindowID id,
 
     wxListHeaderWindow( wxWindow *win,
                         wxWindowID id,


@@ -241,11 +435,12 @@ public:
                         const wxPoint &pos = wxDefaultPosition,
                         const wxSize &size = wxDefaultSize,
                         long style = 0,
                         const wxPoint &pos = wxDefaultPosition,
                         const wxSize &size = wxDefaultSize,
                         long style = 0,

-                        const wxString &name = "wxlistctrlcolumntitles" );
+                        const wxString &name = wxT("wxlistctrlcolumntitles") );
+
+    virtual ~wxListHeaderWindow();

 
 

-    void DoDrawRect( wxDC *dc, int x, int y, int w, int h );

     void DrawCurrent();
     void DrawCurrent();

-    void AdjustDC(wxDC& dc);
+    void AdjustDC( wxDC& dc );

 
     void OnPaint( wxPaintEvent &event );
     void OnMouse( wxMouseEvent &event );
 
     void OnPaint( wxPaintEvent &event );
     void OnMouse( wxMouseEvent &event );


@@ -255,6 +450,13 @@ public:
     bool m_dirty;
 
 private:
     bool m_dirty;
 
 private:

+    // common part of all ctors
+    void Init();
+
+    // generate and process the list event of the given type, return true if
+    // it wasn't vetoed, i.e. if we should proceed
+    bool SendListEvent(wxEventType type, const wxPoint& pos);
+

     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()
 };


@@ -266,7 +468,7 @@ private:
 class WXDLLEXPORT wxListRenameTimer: public wxTimer
 {
 private:
 class WXDLLEXPORT wxListRenameTimer: public wxTimer
 {
 private:

-    wxListMainWindow   *m_owner;
+    wxListMainWindow *m_owner;

 
 public:
     wxListRenameTimer( wxListMainWindow *owner );
 
 public:
     wxListRenameTimer( wxListMainWindow *owner );


@@ -274,32 +476,37 @@ public:
 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-//  wxListTextCtrl (internal)
+// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing

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

-class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
+class WXDLLEXPORT wxListTextCtrlWrapper : public wxEvtHandler

 {
 {

-private:
-    bool               *m_accept;
-    wxString           *m_res;
-    wxListMainWindow   *m_owner;
-    wxString            m_startValue;
-

 public:
 public:

-    wxListTextCtrl() {}
-    wxListTextCtrl( wxWindow *parent, const wxWindowID id,
-                    bool *accept, wxString *res, wxListMainWindow *owner,
-                    const wxString &value = "",
-                    const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-                    int style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString &name = "listctrltextctrl" );
+    // NB: text must be a valid object but not Create()d yet
+    wxListTextCtrlWrapper(wxListMainWindow *owner,
+                          wxTextCtrl *text,
+                          size_t itemEdit);
+
+    wxTextCtrl *GetText() const { return m_text; }
+
+    void AcceptChangesAndFinish();
+
+protected:

     void OnChar( wxKeyEvent &event );
     void OnKeyUp( wxKeyEvent &event );
     void OnKillFocus( wxFocusEvent &event );
 
     void OnChar( wxKeyEvent &event );
     void OnKeyUp( wxKeyEvent &event );
     void OnKillFocus( wxFocusEvent &event );
 

+    bool AcceptChanges();
+    void Finish();
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxListTextCtrl);
+    wxListMainWindow   *m_owner;
+    wxTextCtrl         *m_text;
+    wxString            m_startValue;
+    size_t              m_itemEdited;
+    bool                m_finished;
+    bool                m_aboutToFinish;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -307,231 +514,496 @@ private:
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow
+WX_DECLARE_EXPORTED_LIST(wxListHeaderData, wxListHeaderDataList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxListHeaderDataList)
+
+class wxListMainWindow : public wxScrolledWindow

 {
 public:
 {
 public:

-    long                 m_mode;
-    wxListLineDataArray  m_lines;
-    wxList               m_columns;
-    wxListLineData      *m_current;
-    wxListLineData      *m_currentEdit;
-    int                  m_visibleLines;
-    wxBrush             *m_hilightBrush;
-    wxColour            *m_hilightColour;
-    int                  m_xScroll,m_yScroll;
-    bool                 m_dirty;
-    wxImageList         *m_small_image_list;
-    wxImageList         *m_normal_image_list;
-    int                  m_small_spacing;
-    int                  m_normal_spacing;
-    bool                 m_hasFocus;
-    bool                 m_usedKeys;
-    bool                 m_lastOnSame;
-    wxTimer             *m_renameTimer;
-    bool                 m_renameAccept;
-    wxString             m_renameRes;
-    bool                 m_isCreated;
-    int                  m_dragCount;
-    wxPoint              m_dragStart;
+    wxListMainWindow();
+    wxListMainWindow( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint& pos = wxDefaultPosition,
+                      const wxSize& size = wxDefaultSize,
+                      long style = 0,
+                      const wxString &name = _T("listctrlmainwindow") );

 
 

-    // for double click logic
-    wxListLineData      *m_lineLastClicked,
-                        *m_lineBeforeLastClicked;
+    virtual ~wxListMainWindow();
+
+    bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
+
+    // return true if this is a virtual list control
+    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
+
+    // return true if the control is in report mode
+    bool InReportView() const { return HasFlag(wxLC_REPORT); }
+
+    // return true if we are in single selection mode, false if multi sel
+    bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); }
+
+    // do we have a header window?
+    bool HasHeader() const
+        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }
+
+    void HighlightAll( bool on );
+
+    // all these functions only do something if the line is currently visible
+
+    // change the line "selected" state, return true if it really changed
+    bool HighlightLine( size_t line, bool highlight = true);
+
+    // as HighlightLine() but do it for the range of lines: this is incredibly
+    // more efficient for virtual list controls!
+    //
+    // NB: unlike HighlightLine() this one does refresh the lines on screen
+    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true );
+
+    // toggle the line state and refresh it
+    void ReverseHighlight( size_t line )
+        { HighlightLine(line, !IsHighlighted(line)); RefreshLine(line); }
+
+    // return true if the line is highlighted
+    bool IsHighlighted(size_t line) const;
+
+    // refresh one or several lines at once
+    void RefreshLine( size_t line );
+    void RefreshLines( size_t lineFrom, size_t lineTo );
+
+    // refresh all selected items
+    void RefreshSelected();
+
+    // refresh all lines below the given one: the difference with
+    // RefreshLines() is that the index here might not be a valid one (happens
+    // when the last line is deleted)
+    void RefreshAfter( size_t lineFrom );
+
+    // the methods which are forwarded to wxListLineData itself in list/icon
+    // modes but are here because the lines don't store their positions in the
+    // report mode
+
+    // get the bound rect for the entire line
+    wxRect GetLineRect(size_t line) const;
+
+    // get the bound rect of the label
+    wxRect GetLineLabelRect(size_t line) const;
+
+    // get the bound rect of the items icon (only may be called if we do have
+    // an icon!)
+    wxRect GetLineIconRect(size_t line) const;
+
+    // get the rect to be highlighted when the item has focus
+    wxRect GetLineHighlightRect(size_t line) const;
+
+    // get the size of the total line rect
+    wxSize GetLineSize(size_t line) const
+        { return GetLineRect(line).GetSize(); }
+
+    // return the hit code for the corresponding position (in this line)
+    long HitTestLine(size_t line, int x, int y) const;
+
+    // bring the selected item into view, scrolling to it if necessary
+    void MoveToItem(size_t item);
+
+    // bring the current item into view
+    void MoveToFocus() { MoveToItem(m_current); }
+
+    // start editing the label of the given item
+    wxTextCtrl *EditLabel(long item,
+                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+    wxTextCtrl *GetEditControl() const
+    {
+        return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
+    }
+
+    void FinishEditing(wxTextCtrl *text)
+    {
+        delete text;
+        m_textctrlWrapper = NULL;
+        SetFocusIgnoringChildren();
+    }
+
+    // suspend/resume redrawing the control
+    void Freeze();
+    void Thaw();

 
 

-public:
-    wxListMainWindow();
-    wxListMainWindow( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      long style = 0, const wxString &name = "listctrlmainwindow" );
-    ~wxListMainWindow();
-    void RefreshLine( wxListLineData *line );
-    void OnPaint( wxPaintEvent &event );
-    void HilightAll( bool on );
-    void SendNotify( wxListLineData *line,
-                     wxEventType command,
-                     wxPoint point = wxDefaultPosition );
-    void FocusLine( wxListLineData *line );
-    void UnfocusLine( wxListLineData *line );
-    void SelectLine( wxListLineData *line );
-    void DeselectLine( wxListLineData *line );
-    void DeleteLine( wxListLineData *line );
-
-    void EditLabel( long item );
-    void Edit( long item ) { EditLabel(item); }         // deprecated

     void OnRenameTimer();
     void OnRenameTimer();

-    void OnRenameAccept();
+    bool OnRenameAccept(size_t itemEdit, const wxString& value);
+    void OnRenameCancelled(size_t itemEdit);

 
     void OnMouse( wxMouseEvent &event );
 
     void OnMouse( wxMouseEvent &event );

-    void MoveToFocus();
-    void OnArrowChar( wxListLineData *newCurrent, bool shiftDown );
+
+    // called to switch the selection from the current item to newCurrent,
+    void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );
+

     void OnChar( wxKeyEvent &event );
     void OnKeyDown( wxKeyEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnKeyDown( wxKeyEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );

-    void OnSize( wxSizeEvent &event );
-    void OnScroll(wxScrollWinEvent& event) ;
+    void OnScroll( wxScrollWinEvent& event );
+
+    void OnPaint( wxPaintEvent &event );

 
     void DrawImage( int index, wxDC *dc, int x, int y );
 
     void DrawImage( int index, wxDC *dc, int x, int y );

-    void GetImageSize( int index, int &width, int &height );
-    int GetIndexOfLine( const wxListLineData *line );
-    int GetTextLength( wxString &s );  // should be const
+    void GetImageSize( int index, int &width, int &height ) const;
+    int GetTextLength( const wxString &s ) const;
+
+    void SetImageList( wxImageListType *imageList, int which );
+    void SetItemSpacing( int spacing, bool isSmall = false );
+    int GetItemSpacing( bool isSmall = false );

 
 

-    void SetImageList( wxImageList *imageList, int which );
-    void SetItemSpacing( int spacing, bool isSmall = FALSE );
-    int GetItemSpacing( bool isSmall = FALSE );

     void SetColumn( int col, wxListItem &item );
     void SetColumnWidth( int col, int width );
     void SetColumn( int col, wxListItem &item );
     void SetColumnWidth( int col, int width );

-    void GetColumn( int col, wxListItem &item );
-    int GetColumnWidth( int vol );
-    int GetColumnCount();
-    int GetCountPerPage();
+    void GetColumn( int col, wxListItem &item ) const;
+    int GetColumnWidth( int col ) const;
+    int GetColumnCount() const { return m_columns.GetCount(); }
+
+    // returns the sum of the heights of all columns
+    int GetHeaderWidth() const;
+
+    int GetCountPerPage() const;
+

     void SetItem( wxListItem &item );
     void SetItem( wxListItem &item );

-    void GetItem( wxListItem &item );
+    void GetItem( wxListItem &item ) const;

     void SetItemState( long item, long state, long stateMask );
     void SetItemState( long item, long state, long stateMask );

-    int GetItemState( long item, long stateMask );
-    int GetItemCount();
-    void GetItemRect( long index, wxRect &rect );
-    bool GetItemPosition( long item, wxPoint& pos );
-    int GetSelectedItemCount();
-    void SetMode( long mode );
-    long GetMode() const;
-    void CalculatePositions();
-    void RealizeChanges();
-    long GetNextItem( long item, int geometry, int state );
+    void SetItemStateAll( long state, long stateMask );
+    int GetItemState( long item, long stateMask ) const;
+    void GetItemRect( long index, wxRect &rect ) const;
+    wxRect GetViewRect() const;
+    bool GetItemPosition( long item, wxPoint& pos ) const;
+    int GetSelectedItemCount() const;
+
+    wxString GetItemText(long item) const
+    {
+        wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
+        info.m_itemId = item;
+        GetItem( info );
+        return info.m_text;
+    }
+
+    void SetItemText(long item, const wxString& value)
+    {
+        wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
+        info.m_itemId = item;
+        info.m_text = value;
+        SetItem( info );
+    }
+
+    // set the scrollbars and update the positions of the items
+    void RecalculatePositions(bool noRefresh = false);
+
+    // refresh the window and the header
+    void RefreshAll();
+
+    long GetNextItem( long item, int geometry, int state ) const;

     void DeleteItem( long index );
     void DeleteAllItems();
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );
     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 FindItem( long start, const wxString& str, bool partial = false );
+    long FindItem( long start, wxUIntPtr data);
+    long FindItem( const wxPoint& pt );

     long HitTest( int x, int y, int &flags );
     void InsertItem( wxListItem &item );
     long HitTest( int x, int y, int &flags );
     void InsertItem( wxListItem &item );

-//    void AddItem( wxListItem &item );

     void InsertColumn( long col, wxListItem &item );
     void InsertColumn( long col, wxListItem &item );

-//    void AddColumn( wxListItem &item );
+    int GetItemWidthWithImage(wxListItem * item);

     void SortItems( wxListCtrlCompare fn, long data );
 
     void SortItems( wxListCtrlCompare fn, long data );
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxListMainWindow);
-    DECLARE_EVENT_TABLE()
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
+    size_t GetItemCount() const;
+    bool IsEmpty() const { return GetItemCount() == 0; }
+    void SetItemCount(long count);

 
 

-//-----------------------------------------------------------------------------
-//  wxListItemData
-//-----------------------------------------------------------------------------
+    // change the current (== focused) item, send a notification event
+    void ChangeCurrent(size_t current);
+    void ResetCurrent() { ChangeCurrent((size_t)-1); }
+    bool HasCurrent() const { return m_current != (size_t)-1; }

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject);
+    // send out a wxListEvent
+    void SendNotify( size_t line,
+                     wxEventType command,
+                     const wxPoint& point = wxDefaultPosition );

 
 

-wxListItemData::wxListItemData()
-{
-    m_image = -1;
-    m_data = 0;
-    m_xpos = 0;
-    m_ypos = 0;
-    m_width = 0;
-    m_height = 0;
-    m_attr = NULL;
-}
+    // override base class virtual to reset m_lineHeight when the font changes
+    virtual bool SetFont(const wxFont& font)
+    {
+        if ( !wxScrolledWindow::SetFont(font) )
+            return false;

 
 

-wxListItemData::wxListItemData( const wxListItem &info )
-{
-    m_image = -1;
-    m_data = 0;
-    m_attr = NULL;
+        m_lineHeight = 0;

 
 

-    SetItem( info );
-}
+        return true;
+    }

 
 

-void wxListItemData::SetItem( const wxListItem &info )
-{
-    if (info.m_mask & wxLIST_MASK_TEXT)
-        SetText(info.m_text);
-    if (info.m_mask & wxLIST_MASK_IMAGE)
-        m_image = info.m_image;
-    if (info.m_mask & wxLIST_MASK_DATA)
-        m_data = info.m_data;
+    // these are for wxListLineData usage only

 
 

-    if ( info.HasAttributes() )
+    // get the backpointer to the list ctrl
+    wxGenericListCtrl *GetListCtrl() const

     {
     {

-        if ( m_attr )
-            *m_attr = *info.GetAttributes();
-        else
-            m_attr = new wxListItemAttr(*info.GetAttributes());
+        return wxStaticCast(GetParent(), wxGenericListCtrl);

     }
 
     }
 

-    m_xpos = 0;
-    m_ypos = 0;
-    m_width = info.m_width;
-    m_height = 0;
-}
-
-void wxListItemData::SetImage( int image )
-{
-    m_image = image;
-}
+    // get the height of all lines (assuming they all do have the same height)
+    wxCoord GetLineHeight() const;

 
 

-void wxListItemData::SetData( long data )
-{
-    m_data = data;
-}
+    // get the y position of the given line (only for report view)
+    wxCoord GetLineY(size_t line) const;

 
 

-void wxListItemData::SetPosition( int x, int y )
-{
-    m_xpos = x;
-    m_ypos = y;
-}
+    // get the brush to use for the item highlighting
+    wxBrush *GetHighlightBrush() const
+    {
+        return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
+    }

 
 

-void wxListItemData::SetSize( int width, int height )
-{
-    if (width != -1) m_width = width;
-    if (height != -1) m_height = height;
-}
+//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;

 
 

-bool wxListItemData::HasImage() const
-{
-    return (m_image >= 0);
-}
+    // the list of column objects
+    wxListHeaderDataList m_columns;

 
 

-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));
-}
+    // currently focused item or -1
+    size_t               m_current;

 
 

-int wxListItemData::GetX() const
-{
-    return m_xpos;
-}
+    // the number of lines per page
+    int                  m_linesPerPage;

 
 

-int wxListItemData::GetY() const
-{
-    return m_ypos;
-}
+    // 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;

 
 

-int wxListItemData::GetWidth() const
+    wxColour            *m_highlightColour;
+    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;
+    ColWidthArray        m_aColWidths;
+
+    // for double click logic
+    size_t m_lineLastClicked,
+           m_lineBeforeLastClicked,
+           m_lineSelectSingleOnUp;
+
+protected:
+    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
+
+    // the total count of items in a virtual list control
+    size_t m_countVirt;
+
+    // the object maintaining the items selection state, only used in virtual
+    // controls
+    wxSelectionStore m_selStore;
+
+    // common part of all ctors
+    void Init();
+
+    // get the line data for the given index
+    wxListLineData *GetLine(size_t n) const
+    {
+        wxASSERT_MSG( n != (size_t)-1, _T("invalid line index") );
+
+        if ( IsVirtual() )
+        {
+            wxConstCast(this, wxListMainWindow)->CacheLineData(n);
+            n = 0;
+        }
+
+        return &m_lines[n];
+    }
+
+    // get a dummy line which can be used for geometry calculations and such:
+    // you must use GetLine() if you want to really draw the line
+    wxListLineData *GetDummyLine() const;
+
+    // cache the line data of the n-th line in m_lines[0]
+    void CacheLineData(size_t line);
+
+    // get the range of visible lines
+    void GetVisibleLinesRange(size_t *from, size_t *to);
+
+    // force us to recalculate the range of visible lines
+    void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; }
+
+    // get the colour to be used for drawing the rules
+    wxColour GetRuleColour() const
+    {
+        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
+    }
+
+private:
+    // initialize the current item if needed
+    void UpdateCurrent();
+
+    // delete all items but don't refresh: called from dtor
+    void DoDeleteAllItems();
+
+    // the height of one line using the current font
+    wxCoord m_lineHeight;
+
+    // the total header width or 0 if not calculated yet
+    wxCoord m_headerWidth;
+
+    // the first and last lines being shown on screen right now (inclusive),
+    // both may be -1 if they must be calculated so never access them directly:
+    // use GetVisibleLinesRange() above instead
+    size_t m_lineFrom,
+           m_lineTo;
+
+    // the brushes to use for item highlighting when we do/don't have focus
+    wxBrush *m_highlightBrush,
+            *m_highlightUnfocusedBrush;
+
+    // if this is > 0, the control is frozen and doesn't redraw itself
+    size_t m_freezeCount;
+
+    // wrapper around the text control currently used for in place editing or
+    // NULL if no item is being edited
+    wxListTextCtrlWrapper *m_textctrlWrapper;
+
+
+    DECLARE_DYNAMIC_CLASS(wxListMainWindow)
+    DECLARE_EVENT_TABLE()
+
+    friend class wxGenericListCtrl;
+};
+
+
+wxListItemData::~wxListItemData()

 {
 {

-    return m_width;
+    // 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;

 }
 
 }
 

-int wxListItemData::GetHeight() const
+void wxListItemData::Init()

 {
 {

-    return m_height;
+    m_image = -1;
+    m_data = 0;
+
+    m_attr = NULL;

 }
 
 }
 

-int wxListItemData::GetImage() const
+wxListItemData::wxListItemData(wxListMainWindow *owner)

 {
 {

-    return m_image;
+    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
 {
 }
 
 void wxListItemData::GetItem( wxListItem &info ) const
 {

-    info.m_text = m_text;
-    info.m_image = m_image;
-    info.m_data = m_data;
+    long mask = info.m_mask;
+    if ( !mask )
+        // by default, get everything for backwards compatibility
+        mask = -1;
+
+    if ( mask & wxLIST_MASK_TEXT )
+        info.m_text = m_text;
+    if ( mask & wxLIST_MASK_IMAGE )
+        info.m_image = m_image;
+    if ( mask & wxLIST_MASK_DATA )
+        info.m_data = m_data;

 
     if ( m_attr )
     {
 
     if ( m_attr )
     {


@@ -548,12 +1020,10 @@ void wxListItemData::GetItem( wxListItem &info ) const
 //  wxListHeaderData
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderData
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject);
-
-wxListHeaderData::wxListHeaderData()
+void wxListHeaderData::Init()

 {
     m_mask = 0;
 {
     m_mask = 0;

-    m_image = 0;
+    m_image = -1;

     m_format = 0;
     m_width = 0;
     m_xpos = 0;
     m_format = 0;
     m_width = 0;
     m_xpos = 0;


@@ -561,23 +1031,33 @@ wxListHeaderData::wxListHeaderData()
     m_height = 0;
 }
 
     m_height = 0;
 }
 

+wxListHeaderData::wxListHeaderData()
+{
+    Init();
+}
+

 wxListHeaderData::wxListHeaderData( const wxListItem &item )
 {
 wxListHeaderData::wxListHeaderData( const wxListItem &item )
 {

+    Init();
+

     SetItem( item );
     SetItem( item );

-    m_xpos = 0;
-    m_ypos = 0;
-    m_height = 0;

 }
 
 void wxListHeaderData::SetItem( const wxListItem &item )
 {
     m_mask = item.m_mask;
 }
 
 void wxListHeaderData::SetItem( const wxListItem &item )
 {
     m_mask = item.m_mask;

-    m_text = item.m_text;
-    m_image = item.m_image;
-    m_format = item.m_format;
-    m_width = item.m_width;
-    if (m_width < 0) m_width = 80;
-    if (m_width < 6) m_width = 6;
+
+    if ( m_mask & wxLIST_MASK_TEXT )
+        m_text = item.m_text;
+
+    if ( m_mask & wxLIST_MASK_IMAGE )
+        m_image = item.m_image;
+
+    if ( m_mask & wxLIST_MASK_FORMAT )
+        m_format = item.m_format;
+
+    if ( m_mask & wxLIST_MASK_WIDTH )
+        SetWidth(item.m_width);

 }
 
 void wxListHeaderData::SetPosition( int x, int y )
 }
 
 void wxListHeaderData::SetPosition( int x, int y )


@@ -593,9 +1073,7 @@ void wxListHeaderData::SetHeight( int h )
 
 void wxListHeaderData::SetWidth( int w )
 {
 
 void wxListHeaderData::SetWidth( int w )
 {

-    m_width = w;
-    if (m_width < 0) m_width = 80;
-    if (m_width < 6) m_width = 6;
+    m_width = w < 0 ? WIDTH_COL_DEFAULT : w;

 }
 
 void wxListHeaderData::SetFormat( int format )
 }
 
 void wxListHeaderData::SetFormat( int format )


@@ -605,7 +1083,7 @@ void wxListHeaderData::SetFormat( int format )
 
 bool wxListHeaderData::HasImage() const
 {
 
 bool wxListHeaderData::HasImage() const
 {

-    return (m_image != 0);
+    return m_image != -1;

 }
 
 bool wxListHeaderData::IsHit( int x, int y ) const
 }
 
 bool wxListHeaderData::IsHit( int x, int y ) const


@@ -613,7 +1091,7 @@ bool wxListHeaderData::IsHit( int x, int y ) const
     return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
 }
 
     return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
 }
 

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

 {
     item.m_mask = m_mask;
     item.m_text = m_text;
 {
     item.m_mask = m_mask;
     item.m_text = m_text;


@@ -641,308 +1119,226 @@ int wxListHeaderData::GetFormat() const
 //  wxListLineData
 //-----------------------------------------------------------------------------
 
 //  wxListLineData
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListLineData,wxObject);
+inline int wxListLineData::GetMode() const
+{
+    return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MASK_TYPE;
+}
+
+inline bool wxListLineData::InReportView() const
+{
+    return m_owner->HasFlag(wxLC_REPORT);
+}
+
+inline bool wxListLineData::IsVirtual() const
+{
+    return m_owner->IsVirtual();
+}

 
 

-wxListLineData::wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush )
+wxListLineData::wxListLineData( wxListMainWindow *owner )

 {
 {

-    m_mode = mode;
-    m_hilighted = FALSE;

     m_owner = owner;
     m_owner = owner;

-    m_hilightBrush = hilightBrush;
-    m_items.DeleteContents( TRUE );
-    m_spacing = 0;
+
+    if ( InReportView() )
+        m_gi = NULL;
+    else // !report
+        m_gi = new GeometryInfo;
+
+    m_highlighted = false;
+
+    InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );

 }
 
 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {
 }
 
 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {

-    m_spacing = spacing;
-    switch (m_mode)
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );
+
+    wxListItemData *item = node->GetData();
+
+    wxString s;
+    wxCoord lw, lh;
+
+    switch ( GetMode() )

     {
         case wxLC_ICON:
     {
         case wxLC_ICON:

-        {
-            m_bound_all.width = m_spacing;
-            wxNode *node = m_items.First();
-            if (node)
+        case wxLC_SMALL_ICON:
+            m_gi->m_rectAll.width = spacing;
+
+            s = item->GetText();
+
+            if ( s.empty() )
+            {
+                lh =
+                m_gi->m_rectLabel.width =
+                m_gi->m_rectLabel.height = 0;
+            }
+            else // has label

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s = item->GetText();
-                if (s.IsEmpty()) s = wxT("H");
-                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 dc->GetTextExtent( s, &lw, &lh );

-                if (lh < 15) lh = 15;
-                lw += 4;
-                lh += 3;
+                lw += EXTRA_WIDTH;
+                lh += EXTRA_HEIGHT;

 
 

-                m_bound_all.height = m_spacing+lh;
-                if (lw > m_spacing) m_bound_all.width = lw;
-                m_bound_label.width = lw;
-                m_bound_label.height = lh;
+                m_gi->m_rectAll.height = spacing + lh;
+                if (lw > spacing)
+                    m_gi->m_rectAll.width = lw;

 
 

-                if (item->HasImage())
-                {
-                    int w = 0;
-                    int h = 0;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_icon.width = w + 8;
-                    m_bound_icon.height = h + 8;
-
-                    if ( m_bound_icon.width > m_bound_all.width )
-                        m_bound_all.width = m_bound_icon.width;
-                    if ( h + lh > m_bound_all.height - 4 )
-                        m_bound_all.height = h + lh + 4;
-                }
+                m_gi->m_rectLabel.width = lw;
+                m_gi->m_rectLabel.height = lh;
+            }

 
 

-                if (!item->HasText())
-                {
-                    m_bound_hilight.width = m_bound_icon.width;
-                    m_bound_hilight.height = m_bound_icon.height;
-                }
-                else
-                {
-                    m_bound_hilight.width = m_bound_label.width;
-                    m_bound_hilight.height = m_bound_label.height;
-                }
+            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;
             }
             break;

-        }
+

         case wxLC_LIST:
         case wxLC_LIST:

-        {
-            wxNode *node = m_items.First();
-            if (node)
-            {
-                wxListItemData *item = (wxListItemData*)node->Data();
+            s = item->GetTextForMeasuring();

 
 

-                wxString s = item->GetText();
-                if (s.IsEmpty()) s = wxT("H");
-                wxCoord lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
-                if (lh < 15) lh = 15;
-                lw += 4;
-                lh += 3;
-                m_bound_label.width = lw;
-                m_bound_label.height = lh;
+            dc->GetTextExtent( s, &lw, &lh );
+            lw += EXTRA_WIDTH;
+            lh += EXTRA_HEIGHT;

 
 

-                m_bound_all.width = lw;
-                m_bound_all.height = lh;
+            m_gi->m_rectLabel.width = lw;
+            m_gi->m_rectLabel.height = lh;

 
 

-                if (item->HasImage())
-                {
-                    int w = 0;
-                    int h = 0;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_icon.width = w;
-                    m_bound_icon.height = h;
-
-                    m_bound_all.width += 4 + w;
-                    if (h > m_bound_all.height) m_bound_all.height = h;
-                }
+            m_gi->m_rectAll.width = lw;
+            m_gi->m_rectAll.height = lh;

 
 

-                m_bound_hilight.width = m_bound_all.width;
-                m_bound_hilight.height = m_bound_all.height;
+            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;
             break;

-        }
+

         case wxLC_REPORT:
         case wxLC_REPORT:

-        {
-            m_bound_all.width = 0;
-            m_bound_all.height = 0;
-            wxNode *node = m_items.First();
-            if (node)
-            {
-                wxListItemData *item = (wxListItemData*)node->Data();
-                if (item->HasImage())
-                {
-                    int w = 0;
-                    int h = 0;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_bound_icon.width = w;
-                    m_bound_icon.height = h;
-                }
-                else
-                {
-                    m_bound_icon.width = 0;
-                    m_bound_icon.height = 0;
-                }
-            }
-            while (node)
-            {
-                wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s = item->GetText();
-                if (s.IsEmpty()) s = wxT("H");
-                wxCoord lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
-                if (lh < 15) lh = 15;
-                lw += 4;
-                lh += 3;
-
-                item->SetSize( item->GetWidth(), lh );
-                m_bound_all.width += lw;
-                m_bound_all.height = lh;
-                node = node->Next();
-            }
-            m_bound_label.width = m_bound_all.width;
-            m_bound_label.height = m_bound_all.height;
+            wxFAIL_MSG( _T("unexpected call to SetSize") );
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown mode") );

             break;
             break;

-        }

     }
 }
 
     }
 }
 

-void wxListLineData::SetPosition( wxDC * WXUNUSED(dc),
-                                  int x, int y, int window_width )
+void wxListLineData::SetPosition( int x, int y, int spacing )

 {
 {

-    m_bound_all.x = x;
-    m_bound_all.y = y;
-    switch (m_mode)
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );
+
+    wxListItemData *item = node->GetData();
+
+    switch ( GetMode() )

     {
         case wxLC_ICON:
     {
         case wxLC_ICON:

-        {
-            wxNode *node = m_items.First();
-            if (node)
+        case wxLC_SMALL_ICON:
+            m_gi->m_rectAll.x = x;
+            m_gi->m_rectAll.y = y;
+
+            if ( item->HasImage() )

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                if (item->HasImage())
-                {
-                    m_bound_icon.x = m_bound_all.x + 4
-                                        + (m_spacing - m_bound_icon.width)/2;
-                    m_bound_icon.y = m_bound_all.y + 4;
-                }
-                if (item->HasText())
-                {
-                    if (m_bound_all.width > m_spacing)
-                        m_bound_label.x = m_bound_all.x + 2;
-                    else
-                        m_bound_label.x = m_bound_all.x + 2 + (m_spacing/2) - (m_bound_label.width/2);
-                    m_bound_label.y = m_bound_all.y + m_bound_all.height + 2 - m_bound_label.height;
-                    m_bound_hilight.x = m_bound_label.x - 2;
-                    m_bound_hilight.y = m_bound_label.y - 2;
-                }
-                else
-                {
-                    m_bound_hilight.x = m_bound_icon.x - 4;
-                    m_bound_hilight.y = m_bound_icon.y - 4;
-                }
+                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 +
+                    (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2;
+                m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;

             }
             }

-            break;
-        }
-        case wxLC_LIST:
-        {
-            m_bound_hilight.x = m_bound_all.x;
-            m_bound_hilight.y = m_bound_all.y;
-            m_bound_label.y = m_bound_all.y + 2;
-            wxNode *node = m_items.First();
-            if (node)
+
+            if ( item->HasText() )

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                if (item->HasImage())
-                {
-                    m_bound_icon.x = m_bound_all.x + 2;
-                    m_bound_icon.y = m_bound_all.y + 2;
-                    m_bound_label.x = m_bound_all.x + 6 + m_bound_icon.width;
-                }
+                if (m_gi->m_rectAll.width > spacing)
+                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;

                 else
                 else

-                {
-                    m_bound_label.x = m_bound_all.x + 2;
-                }
+                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing / 2) - (m_gi->m_rectLabel.width / 2);
+                m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height;
+                m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2;
+                m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2;

             }
             }

-            break;
-        }
-        case wxLC_REPORT:
-        {
-            m_bound_all.x = 0;
-            m_bound_all.width = window_width;
-            AssignRect( m_bound_hilight, m_bound_all );
-            m_bound_label.x = m_bound_all.x + 2;
-            m_bound_label.y = m_bound_all.y + 2;
-            wxNode *node = m_items.First();
-            if (node)
+            else // no text, highlight the icon

             {
             {

-                wxListItemData *item = (wxListItemData*)node->Data();
-                if (item->HasImage())
-                {
-                    m_bound_icon.x = m_bound_all.x + 2;
-                    m_bound_icon.y = m_bound_all.y + 2;
-                    m_bound_label.x += 4 + m_bound_icon.width;
-                }
+                m_gi->m_rectHighlight.x = m_gi->m_rectIcon.x - 4;
+                m_gi->m_rectHighlight.y = m_gi->m_rectIcon.y - 4;

             }
             break;
             }
             break;

-        }
-    }
-}
-
-void wxListLineData::SetColumnPosition( int index, int x )
-{
-    wxNode *node = m_items.Nth( (size_t)index );
-    if (node)
-    {
-        wxListItemData *item = (wxListItemData*)node->Data();
-        item->SetPosition( x, m_bound_all.y+1 );
-    }
-}

 
 

-void wxListLineData::GetSize( int &width, int &height )
-{
-    width = m_bound_all.width;
-    height = m_bound_all.height;
-}
+        case wxLC_LIST:
+            m_gi->m_rectAll.x = x;
+            m_gi->m_rectAll.y = y;

 
 

-void wxListLineData::GetExtent( int &x, int &y, int &width, int &height )
-{
-    x = m_bound_all.x;
-    y = m_bound_all.y;
-    width = m_bound_all.width;
-    height = m_bound_all.height;
-}
+            m_gi->m_rectHighlight.x = m_gi->m_rectAll.x;
+            m_gi->m_rectHighlight.y = m_gi->m_rectAll.y;
+            m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2;

 
 

-void wxListLineData::GetLabelExtent( int &x, int &y, int &width, int &height )
-{
-    x = m_bound_label.x;
-    y = m_bound_label.y;
-    width = m_bound_label.width;
-    height = m_bound_label.height;
-}
+            if (item->HasImage())
+            {
+                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
+                m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;
+                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 6 + m_gi->m_rectIcon.width;
+            }
+            else
+            {
+                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
+            }
+            break;

 
 

-void wxListLineData::GetRect( wxRect &rect )
-{
-    AssignRect( rect, m_bound_all );
-}
+        case wxLC_REPORT:
+            wxFAIL_MSG( _T("unexpected call to SetPosition") );
+            break;

 
 

-long wxListLineData::IsHit( int x, int y )
-{
-    wxNode *node = m_items.First();
-    if (node)
-    {
-        wxListItemData *item = (wxListItemData*)node->Data();
-        if (item->HasImage() && IsInRect( x, y, m_bound_icon )) return wxLIST_HITTEST_ONITEMICON;
-        if (item->HasText() && IsInRect( x, y, m_bound_label )) return wxLIST_HITTEST_ONITEMLABEL;
-//      if (!(item->HasImage() || item->HasText())) return 0;
+        default:
+            wxFAIL_MSG( _T("unknown mode") );
+            break;

     }
     }

-    // if there is no icon or text = empty
-    if (IsInRect( x, y, m_bound_all )) return wxLIST_HITTEST_ONITEMICON;
-    return 0;

 }
 
 void wxListLineData::InitItems( int num )
 {
 }
 
 void wxListLineData::InitItems( int num )
 {

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

 }
 
 void wxListLineData::SetItem( int index, const wxListItem &info )
 {
 }
 
 void wxListLineData::SetItem( int index, const wxListItem &info )
 {

-    wxNode *node = m_items.Nth( index );
-    if (node)
-    {
-       wxListItemData *item = (wxListItemData*)node->Data();
-       item->SetItem( info );
-    }
+    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
+    wxCHECK_RET( node, _T("invalid column index in SetItem") );
+
+    wxListItemData *item = node->GetData();
+    item->SetItem( info );

 }
 
 void wxListLineData::GetItem( int index, wxListItem &info )
 {
 }
 
 void wxListLineData::GetItem( int index, wxListItem &info )
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
+    wxListItemDataList::compatibility_iterator node = m_items.Item( index );

     if (node)
     {
     if (node)
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
+        wxListItemData *item = node->GetData();

         item->GetItem( info );
     }
 }
         item->GetItem( info );
     }
 }


@@ -951,229 +1347,289 @@ wxString wxListLineData::GetText(int index) const
 {
     wxString s;
 
 {
     wxString s;
 

-    wxNode *node = m_items.Nth( index );
+    wxListItemDataList::compatibility_iterator node = m_items.Item( index );

     if (node)
     {
     if (node)
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
+        wxListItemData *item = node->GetData();

         s = item->GetText();
     }
 
     return s;
 }
 
         s = item->GetText();
     }
 
     return s;
 }
 

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

 {
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
+    wxListItemDataList::compatibility_iterator node = m_items.Item( index );

     if (node)
     {
     if (node)
     {

-        wxListItemData *item = (wxListItemData*)node->Data();
+        wxListItemData *item = node->GetData();

         item->SetText( s );
     }
 }
 
         item->SetText( s );
     }
 }
 

-int wxListLineData::GetImage( int index )
+void wxListLineData::SetImage( int index, int image )

 {
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
-    if (node)
-    {
-        wxListItemData *item = (wxListItemData*)node->Data();
-        return item->GetImage();
-    }
-    return -1;
+    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
+    wxCHECK_RET( node, _T("invalid column index in SetImage()") );
+
+    wxListItemData *item = node->GetData();
+    item->SetImage(image);
+}
+
+int wxListLineData::GetImage( int index ) const
+{
+    wxListItemDataList::compatibility_iterator node = m_items.Item( index );
+    wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") );
+
+    wxListItemData *item = node->GetData();
+    return item->GetImage();
+}
+
+wxListItemAttr *wxListLineData::GetAttr() const
+{
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    return item->GetAttr();
+}
+
+void wxListLineData::SetAttr(wxListItemAttr *attr)
+{
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("invalid column index in SetAttr()") );
+
+    wxListItemData *item = node->GetData();
+    item->SetAttr(attr);

 }
 
 }
 

-void wxListLineData::SetAttributes(wxDC *dc,
+bool wxListLineData::SetAttributes(wxDC *dc,

                                    const wxListItemAttr *attr,
                                    const wxListItemAttr *attr,

-                                   const wxColour& colText,
-                                   const wxFont& font,
-                                   bool hilight)
+                                   bool highlighted)

 {
 {

-    // don't use foregroud colour for drawing highlighted items - this might
+    wxWindow *listctrl = m_owner->GetParent();
+
+    // 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)
     // 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());
-    }
+    wxColour colText;
+    if ( highlighted )
+        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    else if ( attr && attr->HasTextColour() )
+        colText = attr->GetTextColour();

     else
     else

-    {
-        dc->SetTextForeground(colText);
-    }
+        colText = listctrl->GetForegroundColour();

 
 

+    dc->SetTextForeground(colText);
+
+    // font
+    wxFont font;

     if ( attr && attr->HasFont() )
     if ( attr && attr->HasFont() )

-    {
-        dc->SetFont(attr->GetFont());
-    }
+        font = attr->GetFont();

     else
     else

+        font = listctrl->GetFont();
+
+    dc->SetFont(font);
+
+    // bg colour
+    bool hasBgCol = attr && attr->HasBackgroundColour();
+    if ( highlighted || hasBgCol )

     {
     {

-        dc->SetFont(font);
+        if ( highlighted )
+            dc->SetBrush( *m_owner->GetHighlightBrush() );
+        else
+            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+
+        dc->SetPen( *wxTRANSPARENT_PEN );
+
+        return true;

     }
     }

+
+    return false;

 }
 
 }
 

-void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
+void wxListLineData::Draw( wxDC *dc )

 {
 {

-    int dev_x = 0;
-    int dev_y = 0;
-    m_owner->CalcScrolledPosition( m_bound_all.x, m_bound_all.y, &dev_x, &dev_y );
-    wxCoord dev_w = m_bound_all.width;
-    wxCoord dev_h = m_bound_all.height;
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );

 
 

-    if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))
-        return;
+    bool highlighted = IsHighlighted();

 
 

-    wxWindow *listctrl = m_owner->GetParent();
+    wxListItemAttr *attr = GetAttr();

 
 

-    // default foreground colour
-    wxColour colText;
-    if ( hilight )
+    if ( SetAttributes(dc, attr, highlighted) )
+        dc->DrawRectangle( m_gi->m_rectHighlight );
+
+    // just for debugging to better see where the items are
+#if 0
+    dc->SetPen(*wxRED_PEN);
+    dc->SetBrush(*wxTRANSPARENT_BRUSH);
+    dc->DrawRectangle( m_gi->m_rectAll );
+    dc->SetPen(*wxGREEN_PEN);
+    dc->DrawRectangle( m_gi->m_rectIcon );
+#endif
+
+    wxListItemData *item = node->GetData();
+    if (item->HasImage())

     {
     {

-        colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
+        // centre the image inside our rectangle, this looks nicer when items
+        // ae aligned in a row
+        const wxRect& rectIcon = m_gi->m_rectIcon;
+
+        m_owner->DrawImage(item->GetImage(), dc, rectIcon.x, rectIcon.y);

     }
     }

-    else
+
+    if (item->HasText())

     {
     {

-        colText = listctrl->GetForegroundColour();
+        const wxRect& rectLabel = m_gi->m_rectLabel;
+
+        wxDCClipper clipper(*dc, rectLabel);
+        dc->DrawText(item->GetText(), rectLabel.x, rectLabel.y);

     }
     }

+}

 
 

-    // default font
-    wxFont font = listctrl->GetFont();
+void wxListLineData::DrawInReportMode( wxDC *dc,
+                                       const wxRect& rect,
+                                       const wxRect& rectHL,
+                                       bool highlighted )
+{
+    // 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 );

 
 

-    // 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);
+    wxCoord x = rect.x + HEADER_OFFSET_X,
+            yMid = rect.y + rect.height/2;

 
 

-    bool hasBgCol = attr && attr->HasBackgroundColour();
-    if ( paintBG || hasBgCol )
+    size_t col = 0;
+    for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+          node;
+          node = node->GetNext(), col++ )

     {
     {

-        if (hilight)
-        {
-            dc->SetBrush( * m_hilightBrush );
-        }
-        else
+        wxListItemData *item = node->GetData();
+
+        int width = m_owner->GetColumnWidth(col);
+        int xOld = x;
+        x += width;
+
+        if ( item->HasImage() )

         {
         {

-            if ( hasBgCol )
-                dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-            else
-                dc->SetBrush( * wxWHITE_BRUSH );
+            int ix, iy;
+            m_owner->GetImageSize( item->GetImage(), ix, iy );
+            m_owner->DrawImage( item->GetImage(), dc, xOld, yMid - iy/2 );
+
+            ix += IMAGE_MARGIN_IN_REPORT_MODE;
+
+            xOld += ix;
+            width -= ix;

         }
 
         }
 

-        dc->SetPen( * wxTRANSPARENT_PEN );
-        dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
-                           m_bound_hilight.width, m_bound_hilight.height );
+        if ( item->HasText() )
+            DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width - 8);

     }
     }

+}
+
+void wxListLineData::DrawTextFormatted(wxDC *dc,
+                                       const wxString &text,
+                                       int col,
+                                       int x,
+                                       int yMid,
+                                       int width)
+{
+    wxCoord w, h;
+    dc->GetTextExtent(text, &w, &h);
+
+    const wxCoord y = yMid - (h + 1)/2;

 
 

-    if (m_mode == wxLC_REPORT)
+    wxDCClipper clipper(*dc, x, y, width, h);
+
+    // determine if the string can fit inside the current width
+    if (w <= width)

     {
     {

-        wxNode *node = m_items.First();
-        while (node)
+        // it can, draw it using the items alignment
+        wxListItem item;
+        m_owner->GetColumn(col, item);
+        switch ( item.GetAlign() )

         {
         {

-            wxListItemData *item = (wxListItemData*)node->Data();
-            int x = item->GetX();
-            if (item->HasImage())
-            {
-                int y = 0;
-                m_owner->DrawImage( item->GetImage(), dc, x, item->GetY() );
-                m_owner->GetImageSize( item->GetImage(), x, y );
-                x += item->GetX() + 5;
-            }
-            dc->SetClippingRegion( item->GetX(), item->GetY(), item->GetWidth()-3, item->GetHeight() );
-            if (item->HasText())
-            {
-                dc->DrawText( item->GetText(), x, item->GetY()+1 );
-            }
-            dc->DestroyClippingRegion();
-            node = node->Next();
+            case wxLIST_FORMAT_LEFT:
+                // nothing to do
+                break;
+
+            case wxLIST_FORMAT_RIGHT:
+                x += width - w;
+                break;
+
+            case wxLIST_FORMAT_CENTER:
+                x += (width - w) / 2;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                break;

         }
         }

+
+        dc->DrawText(text, x, y);

     }
     }

-    else
+    else // otherwise, truncate and add an ellipsis if possible

     {
     {

-        wxNode *node = m_items.First();
-        if (node)
+        // determine the base width
+        wxString ellipsis(wxT("..."));
+        wxCoord base_w;
+        dc->GetTextExtent(ellipsis, &base_w, &h);
+
+        // continue until we have enough space or only one character left
+        wxCoord w_c, h_c;
+        size_t len = text.Length();
+        wxString drawntext = text.Left(len);
+        while (len > 1)

         {
         {

-            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 );
-            }
+            dc->GetTextExtent(drawntext.Last(), &w_c, &h_c);
+            drawntext.RemoveLast();
+            len--;
+            w -= w_c;
+            if (w + base_w <= width)
+                break;

         }
         }

-    }
-}
-
-void wxListLineData::Hilight( bool on )
-{
-    if (on == m_hilighted) return;
-    m_hilighted = on;
-    if (on)
-        m_owner->SelectLine( this );
-    else
-        m_owner->DeselectLine( this );
-}

 
 

-void wxListLineData::ReverseHilight( void )
-{
-    m_hilighted = !m_hilighted;
-    if (m_hilighted)
-        m_owner->SelectLine( this );
-    else
-        m_owner->DeselectLine( this );
-}
+        // if still not enough space, remove ellipsis characters
+        while (ellipsis.Length() > 0 && w + base_w > width)
+        {
+            ellipsis = ellipsis.Left(ellipsis.Length() - 1);
+            dc->GetTextExtent(ellipsis, &base_w, &h);
+        }

 
 

-void wxListLineData::DrawRubberBand( wxDC *dc, bool on )
-{
-    if (on)
-    {
-        dc->SetPen( * wxBLACK_PEN );
-        dc->SetBrush( * wxTRANSPARENT_BRUSH );
-        dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
-                           m_bound_hilight.width, m_bound_hilight.height );
+        // now draw the text
+        dc->DrawText(drawntext, x, y);
+        dc->DrawText(ellipsis, x + w, y);

     }
 }
 
     }
 }
 

-void wxListLineData::Draw( wxDC *dc )
+bool wxListLineData::Highlight( bool on )

 {
 {

-    DoDraw( dc, m_hilighted, m_hilighted );
-}
+    wxCHECK_MSG( !IsVirtual(), false, _T("unexpected call to Highlight") );

 
 

-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));
-}
+    if ( on == m_highlighted )
+        return false;

 
 

-bool wxListLineData::IsHilighted( void )
-{
-    return m_hilighted;
-}
+    m_highlighted = on;

 
 

-void wxListLineData::AssignRect( wxRect &dest, int x, int y, int width, int height )
-{
-    dest.x = x;
-    dest.y = y;
-    dest.width = width;
-    dest.height = height;
+    return true;

 }
 
 }
 

-void wxListLineData::AssignRect( wxRect &dest, const wxRect &source )
+void wxListLineData::ReverseHighlight( void )

 {
 {

-    dest.x = source.x;
-    dest.y = source.y;
-    dest.width = source.width;
-    dest.height = source.height;
+    Highlight(!IsHighlighted());

 }
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow)

 
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
 
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)


@@ -1181,72 +1637,63 @@ BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
 END_EVENT_TABLE()
 
     EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
 END_EVENT_TABLE()
 

-wxListHeaderWindow::wxListHeaderWindow( void )
+void wxListHeaderWindow::Init()

 {
 {

-    m_owner = (wxListMainWindow *) NULL;

     m_currentCursor = (wxCursor *) NULL;
     m_currentCursor = (wxCursor *) NULL;

+    m_isDragging = false;
+    m_dirty = false;
+}
+
+wxListHeaderWindow::wxListHeaderWindow()
+{
+    Init();
+
+    m_owner = (wxListMainWindow *) NULL;

     m_resizeCursor = (wxCursor *) NULL;
     m_resizeCursor = (wxCursor *) NULL;

-    m_isDragging = FALSE;

 }
 
 }
 

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

 {
 {

+    Init();
+

     m_owner = owner;
     m_owner = owner;

-//  m_currentCursor = wxSTANDARD_CURSOR;
-    m_currentCursor = (wxCursor *) NULL;

     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );

-    m_isDragging = FALSE;
-    m_dirty = FALSE;

 
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) );
+#if _USE_VISATTR
+    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );
+#else
+    SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+    SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+    if (!m_hasFont)
+        SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT ));
+#endif

 }
 
 }
 

-wxListHeaderWindow::~wxListHeaderWindow( void )
+wxListHeaderWindow::~wxListHeaderWindow()

 {
     delete m_resizeCursor;
 }
 
 {
     delete m_resizeCursor;
 }
 

-void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
-{
-#ifdef __WXGTK__
-    GtkStateType state = GTK_STATE_NORMAL;
-    if (!m_parent->IsEnabled()) state = GTK_STATE_INSENSITIVE;
-    
-    x = dc->XLOG2DEV( x );
-    
-    gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window, state, GTK_SHADOW_OUT,
-                   (GdkRectangle*) NULL, m_wxwindow, "button", x-1, y-1, w+2, h+2);
-#else
-    const int m_corner = 1;
-
-    dc->SetBrush( *wxTRANSPARENT_BRUSH );
-
-    dc->SetPen( *wxBLACK_PEN );
-    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
-    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
-
-    wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
-
-    dc->SetPen( pen );
-    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
-    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
-
-    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 );
+#ifdef __WXUNIVERSAL__
+#include "wx/univ/renderer.h"
+#include "wx/univ/theme.h"

 #endif
 #endif

-}

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

-#if wxUSE_GENERIC_LIST_EXTENSIONS

     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 


@@ -1255,79 +1702,133 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
 
     // account for the horz scrollbar offset
     dc.SetDeviceOrigin( -x * xpix, 0 );
 
     // account for the horz scrollbar offset
     dc.SetDeviceOrigin( -x * xpix, 0 );

-#endif // wxUSE_GENERIC_LIST_EXTENSIONS

 }
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 }
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

-#ifdef __WXGTK__
-    wxClientDC dc( this );
-#else

     wxPaintDC dc( this );
     wxPaintDC dc( this );

-#endif

 
     PrepareDC( dc );
     AdjustDC( dc );
 
 
     PrepareDC( dc );
     AdjustDC( dc );
 

-    dc.BeginDrawing();
-

     dc.SetFont( GetFont() );
 
     // width and height of the entire header window
     int w, h;
     GetClientSize( &w, &h );
     dc.SetFont( GetFont() );
 
     // width and height of the entire header window
     int w, h;
     GetClientSize( &w, &h );

-#if wxUSE_GENERIC_LIST_EXTENSIONS

     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);

-#endif // wxUSE_GENERIC_LIST_EXTENSIONS

 
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     dc.SetBackgroundMode(wxTRANSPARENT);

+    dc.SetTextForeground(GetForegroundColour());

 
 

-    // 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 = 1;          // left of the header rect
-    const int y = 1;    // top
+    int x = HEADER_OFFSET_X;

     int numColumns = m_owner->GetColumnCount();
     wxListItem item;
     int numColumns = m_owner->GetColumnCount();
     wxListItem item;

-    for (int i = 0; i < numColumns; i++)
+    for ( int i = 0; i < numColumns && x < w; i++ )

     {
         m_owner->GetColumn( i, item );
         int wCol = item.m_width;
     {
         m_owner->GetColumn( i, item );
         int wCol = item.m_width;

-        int cw = wCol - 2; // the width of the rect to draw

 
 

-        int xEnd = x + wCol;
+        // the width of the rect to draw: make it smaller to fit entirely
+        // inside the column rect
+#ifdef __WXMAC__
+        int cw = wCol;
+        int ch = h;
+#else
+        int cw = wCol - 2;
+        int ch = h - 2;
+#endif
+
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(x, HEADER_OFFSET_Y, cw, ch),
+                                    m_parent->IsEnabled() ? 0
+                                                          : (int)wxCONTROL_DISABLED
+                                );
+
+        // see if we have enough space for the column label
+
+        // for this we need the width of the text
+        wxCoord wLabel;
+        wxCoord hLabel;
+        dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
+        wLabel += 2 * EXTRA_WIDTH;
+
+        // and the width of the icon, if any
+        static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
+        int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
+        const int image = item.m_image;
+        wxImageListType *imageList;
+        if ( image != -1 )
+        {
+            imageList = m_owner->m_small_image_list;
+            if ( imageList )
+            {
+                imageList->GetSize(image, ix, iy);
+                wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON;
+            }
+        }
+        else
+        {
+            imageList = NULL;
+        }

 
 

-        // VZ: no, draw it normally - this is better now as we allow resizing
-        //     of the last column as well
-#if 0
-        // let the last column occupy all available space
-        if ( i == numColumns - 1 )
-            cw = w-x-1;
-#endif // 0
+        // ignore alignment if there is not enough space anyhow
+        int xAligned;
+        switch ( wLabel < cw ? item.GetAlign() : wxLIST_FORMAT_LEFT )
+        {
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                // fall through

 
 

-        dc.SetPen( *wxWHITE_PEN );
+            case wxLIST_FORMAT_LEFT:
+                xAligned = x;
+                break;

 
 

-        DoDrawRect( &dc, x, y, cw, h-2 );
-        dc.SetClippingRegion( x, y, cw-5, h-4 );
-        dc.DrawText( item.GetText(), x+4, y+3 );
-        dc.DestroyClippingRegion();
-        x += wCol;
+            case wxLIST_FORMAT_RIGHT:
+                xAligned = x + cw - wLabel;
+                break;

 
 

-        if (xEnd > w+5)
-            break;
+            case wxLIST_FORMAT_CENTER:
+                xAligned = x + (cw - wLabel) / 2;
+                break;
+        }
+
+        // if we have an image, draw it on the right of the label
+        if ( imageList )
+        {
+            imageList->Draw
+                       (
+                        image,
+                        dc,
+                        xAligned + wLabel - ix - MARGIN_BETWEEN_TEXT_AND_ICON,
+                        HEADER_OFFSET_Y + (h - 4 - iy)/2,
+                        wxIMAGELIST_DRAW_TRANSPARENT
+                       );
+
+            cw -= ix + MARGIN_BETWEEN_TEXT_AND_ICON;
+        }
+
+        // draw the text clipping it so that it doesn't overwrite the column
+        // boundary
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+
+        dc.DrawText( item.GetText(),
+                     xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
+
+        x += wCol;

     }
     }

-    dc.EndDrawing();

 }
 
 void wxListHeaderWindow::DrawCurrent()
 {
     int x1 = m_currentX;
     int y1 = 0;
 }
 
 void wxListHeaderWindow::DrawCurrent()
 {
     int x1 = m_currentX;
     int y1 = 0;

-    ClientToScreen( &x1, &y1 );
+    m_owner->ClientToScreen( &x1, &y1 );

 
 

-    int x2 = m_currentX-1;
+    int x2 = m_currentX;

     int y2 = 0;
     m_owner->GetClientSize( NULL, &y2 );
     m_owner->ClientToScreen( &x2, &y2 );
     int y2 = 0;
     m_owner->GetClientSize( NULL, &y2 );
     m_owner->ClientToScreen( &x2, &y2 );


@@ -1350,23 +1851,19 @@ void wxListHeaderWindow::DrawCurrent()
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
     // we want to work with logical coords
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
     // we want to work with logical coords

-#if wxUSE_GENERIC_LIST_EXTENSIONS

     int x;
     m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
     int x;
     m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);

-#else // !wxUSE_GENERIC_LIST_EXTENSIONS
-    int x = event.GetX();
-#endif // wxUSE_GENERIC_LIST_EXTENSIONS

     int y = event.GetY();
 
     if (m_isDragging)
     {
     int y = event.GetY();
 
     if (m_isDragging)
     {

+        SendListEvent(wxEVT_COMMAND_LIST_COL_DRAGGING, event.GetPosition());
+

         // we don't draw the line beyond our window, but we allow dragging it
         // there
         int w = 0;
         GetClientSize( &w, NULL );
         // we don't draw the line beyond our window, but we allow dragging it
         // there
         int w = 0;
         GetClientSize( &w, NULL );

-#if wxUSE_GENERIC_LIST_EXTENSIONS

         m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
         m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);

-#endif // wxUSE_GENERIC_LIST_EXTENSIONS

         w -= 6;
 
         // erase the line if it was drawn
         w -= 6;
 
         // erase the line if it was drawn


@@ -1376,9 +1873,10 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         if (event.ButtonUp())
         {
             ReleaseMouse();
         if (event.ButtonUp())
         {
             ReleaseMouse();

-            m_isDragging = FALSE;
-            m_dirty = TRUE;
+            m_isDragging = false;
+            m_dirty = true;

             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );

+            SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition());

         }
         else
         {
         }
         else
         {


@@ -1395,22 +1893,23 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     else // not dragging
     {
         m_minX = 0;
     else // not dragging
     {
         m_minX = 0;

-        bool hit_border = FALSE;
+        bool hit_border = false;

 
         // end of the current column
         int xpos = 0;
 
 
         // end of the current column
         int xpos = 0;
 

-        // find the column where this event occured
-        int countCol = m_owner->GetColumnCount();
-        for (int j = 0; j < countCol; j++)
+        // find the column where this event occurred
+        int col,
+            countCol = m_owner->GetColumnCount();
+        for (col = 0; col < countCol; col++)

         {
         {

-            xpos += m_owner->GetColumnWidth( j );
-            m_column = j;
+            xpos += m_owner->GetColumnWidth( col );
+            m_column = col;

 
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border
 
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border

-                hit_border = TRUE;
+                hit_border = true;

                 break;
             }
 
                 break;
             }
 


@@ -1423,22 +1922,29 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             m_minX = xpos;
         }
 
             m_minX = xpos;
         }
 

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

         {
         {

-            if (hit_border)
+            if (hit_border && event.LeftDown())

             {
             {

-                m_isDragging = TRUE;
-                m_currentX = x;
-                DrawCurrent();
-                CaptureMouse();
+                if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
+                                   event.GetPosition()) )
+                {
+                    m_isDragging = true;
+                    m_currentX = x;
+                    CaptureMouse();
+                    DrawCurrent();
+                }
+                //else: column resizing was vetoed by the user code

             }
             }

-            else
+            else // click on a column

             {
             {

-                wxWindow *parent = GetParent();
-                wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, parent->GetId() );
-                le.SetEventObject( parent );
-                le.m_col = m_column;
-                parent->GetEventHandler()->ProcessEvent( le );
+                SendListEvent( event.LeftDown()
+                                    ? wxEVT_COMMAND_LIST_COL_CLICK
+                                    : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+                                event.GetPosition());

             }
         }
         else if (event.Moving())
             }
         }
         else if (event.Moving())


@@ -1464,6 +1970,24 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_owner->SetFocus();
 void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_owner->SetFocus();

+    m_owner->Update();
+}
+
+bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)
+{
+    wxWindow *parent = GetParent();
+    wxListEvent le( type, parent->GetId() );
+    le.SetEventObject( parent );
+    le.m_pointDrag = pos;
+
+    // the position should be relative to the parent window, not
+    // this one for compatibility with MSW and common sense: the
+    // user code doesn't know anything at all about this header
+    // window, so why should it get positions relative to it?
+    le.m_pointDrag.y -= GetSize().y;
+
+    le.m_col = m_column;
+    return !parent->GetEventHandler()->ProcessEvent( le ) || le.IsAllowed();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -1481,100 +2005,145 @@ void wxListRenameTimer::Notify()
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxListTextCtrl (internal)
+// wxListTextCtrlWrapper (internal)

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

-IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl);
-
-BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
-    EVT_CHAR           (wxListTextCtrl::OnChar)
-    EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)    
-    EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
+BEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler)
+    EVT_CHAR           (wxListTextCtrlWrapper::OnChar)
+    EVT_KEY_UP         (wxListTextCtrlWrapper::OnKeyUp)
+    EVT_KILL_FOCUS     (wxListTextCtrlWrapper::OnKillFocus)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxListTextCtrl::wxListTextCtrl( wxWindow *parent,
-                                const wxWindowID id,
-                                bool *accept,
-                                wxString *res,
-                                wxListMainWindow *owner,
-                                const wxString &value,
-                                const wxPoint &pos,
-                                const wxSize &size,
-                                int style,
-                                const wxValidator& validator,
-                                const wxString &name )
-              : wxTextCtrl( parent, id, value, pos, size, style, validator, name )
-{
-    m_res = res;
-    m_accept = accept;
+wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
+                                             wxTextCtrl *text,
+                                             size_t itemEdit)
+              : m_startValue(owner->GetItemText(itemEdit)),
+                m_itemEdited(itemEdit)
+{

     m_owner = owner;
     m_owner = owner;

-    (*m_accept) = FALSE;
-    (*m_res) = "";
-    m_startValue = value;
+    m_text = text;
+    m_finished = false;
+    m_aboutToFinish = false;
+
+    wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
+
+    m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
+                                  &rectLabel.x, &rectLabel.y);
+
+    m_text->Create(owner, wxID_ANY, m_startValue,
+                   wxPoint(rectLabel.x-4,rectLabel.y-4),
+                   wxSize(rectLabel.width+11,rectLabel.height+8));
+    m_text->PushEventHandler(this);

 }
 
 }
 

-void wxListTextCtrl::OnChar( wxKeyEvent &event )
+void wxListTextCtrlWrapper::Finish()

 {
 {

-    if (event.m_keyCode == WXK_RETURN)
+    if ( !m_finished )

     {
     {

-        (*m_accept) = TRUE;
-        (*m_res) = GetValue();
-
-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+        m_finished = true;

 
 

-        if ((*m_accept) && ((*m_res) != m_startValue))
-            m_owner->OnRenameAccept();
+        m_text->RemoveEventHandler(this);
+        m_owner->FinishEditing(m_text);

 
 

-        return;
+        delete this;

     }
     }

-    if (event.m_keyCode == WXK_ESCAPE)
+}
+
+bool wxListTextCtrlWrapper::AcceptChanges()
+{
+    const wxString value = m_text->GetValue();
+
+    if ( value == m_startValue )
+        // nothing changed, always accept
+        return true;
+
+    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
+        // vetoed by the user
+        return false;
+
+    // accepted, do rename the item
+    m_owner->SetItemText(m_itemEdited, value);
+
+    return true;
+}
+
+void wxListTextCtrlWrapper::AcceptChangesAndFinish()
+{
+    m_aboutToFinish = true;
+
+    // Notify the owner about the changes
+    AcceptChanges();
+
+    // Even if vetoed, close the control (consistent with MSW)
+    Finish();
+}
+
+void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )

     {
     {

-        (*m_accept) = FALSE;
-        (*m_res) = "";
+        case WXK_RETURN:
+            AcceptChangesAndFinish();
+            break;

 
 

-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+        case WXK_ESCAPE:
+            Finish();
+            m_owner->OnRenameCancelled( m_itemEdited );
+            break;

 
 

-        return;
+        default:
+            event.Skip();

     }
     }

-
-    event.Skip();

 }
 
 }
 

-void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
+void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )

 {
 {

+    if (m_finished)
+    {
+        event.Skip();
+        return;
+    }
+

     // auto-grow the textctrl:
     wxSize parentSize = m_owner->GetSize();
     // auto-grow the textctrl:
     wxSize parentSize = m_owner->GetSize();

-    wxPoint myPos = GetPosition();
-    wxSize mySize = GetSize();
+    wxPoint myPos = m_text->GetPosition();
+    wxSize mySize = m_text->GetSize();

     int sx, sy;
     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);
-    
+    m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
+    if (myPos.x + sx > parentSize.x)
+        sx = parentSize.x - myPos.x;
+    if (mySize.x > sx)
+        sx = mySize.x;
+    m_text->SetSize(sx, wxDefaultCoord);
+

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

-void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
+void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )

 {
 {

-    if (!wxPendingDelete.Member(this))
-        wxPendingDelete.Append(this);
+    if ( !m_finished && !m_aboutToFinish )
+    {
+        // We must finish regardless of success, otherwise we'll get
+        // focus problems:
+        Finish();
+
+        if ( !AcceptChanges() )
+            m_owner->OnRenameCancelled( m_itemEdited );
+    }

 
 

-    if ((*m_accept) && ((*m_res) != m_startValue))
-        m_owner->OnRenameAccept();
+    // We must let the native text control handle focus, too, otherwise
+    // it could have problems with the cursor (e.g., in wxGTK).
+    event.Skip();

 }
 
 //-----------------------------------------------------------------------------
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow)

 
 BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_PAINT          (wxListMainWindow::OnPaint)
 
 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_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)


@@ -1583,345 +2152,791 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
 END_EVENT_TABLE()
 
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
 END_EVENT_TABLE()
 

-wxListMainWindow::wxListMainWindow()
+void wxListMainWindow::Init()

 {
 {

-    m_mode = 0;
-    m_columns.DeleteContents( TRUE );
-    m_current = (wxListLineData *) NULL;
-    m_visibleLines = 0;
-    m_hilightBrush = (wxBrush *) NULL;
-    m_xScroll = 0;
-    m_yScroll = 0;
-    m_dirty = TRUE;
-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
+    m_dirty = true;
+    m_countVirt = 0;
+    m_lineFrom =
+    m_lineTo = (size_t)-1;
+    m_linesPerPage = 0;
+
+    m_headerWidth =
+    m_lineHeight = 0;
+
+    m_small_image_list = (wxImageListType *) NULL;
+    m_normal_image_list = (wxImageListType *) NULL;
+

     m_small_spacing = 30;
     m_normal_spacing = 40;
     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_hasFocus = false;

     m_dragCount = 0;
     m_dragCount = 0;

+    m_isCreated = false;

 
 

+    m_lastOnSame = false;
+    m_renameTimer = new wxListRenameTimer( this );
+    m_textctrlWrapper = NULL;
+
+    m_current =

     m_lineLastClicked =
     m_lineLastClicked =

-    m_lineBeforeLastClicked = (wxListLineData *)NULL;
-}
-
-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_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;
+    m_lineSelectSingleOnUp =
+    m_lineBeforeLastClicked = (size_t)-1;

 
 

-    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;
-    }
-    SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
+    m_freezeCount = 0;
+}

 
 

-    m_usedKeys = TRUE;
-    m_lastOnSame = FALSE;
-    m_renameTimer = new wxListRenameTimer( this );
-    m_renameAccept = FALSE;
+wxListMainWindow::wxListMainWindow()
+{
+    Init();

 
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+    m_highlightBrush =
+    m_highlightUnfocusedBrush = (wxBrush *) NULL;

 }
 
 }
 

-wxListMainWindow::~wxListMainWindow()
+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 )

 {
 {

-    DeleteEverything();
+    Init();
+
+    m_highlightBrush = new wxBrush
+                           (
+                            wxSystemSettings::GetColour
+                            (
+                                wxSYS_COLOUR_HIGHLIGHT
+                            ),
+                            wxSOLID
+                           );
+
+    m_highlightUnfocusedBrush = new wxBrush
+                                    (
+                                       wxSystemSettings::GetColour
+                                       (
+                                           wxSYS_COLOUR_BTNSHADOW
+                                       ),
+                                       wxSOLID
+                                    );
+
+    SetScrollbars( 0, 0, 0, 0, 0, 0 );

 
 

-    if (m_hilightBrush) delete m_hilightBrush;
+    wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );
+}
+
+wxListMainWindow::~wxListMainWindow()
+{
+    DoDeleteAllItems();
+    WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
+    WX_CLEAR_ARRAY(m_aColWidths);

 
 

+    delete m_highlightBrush;
+    delete m_highlightUnfocusedBrush;

     delete m_renameTimer;
 }
 
     delete m_renameTimer;
 }
 

-void wxListMainWindow::RefreshLine( wxListLineData *line )
+void wxListMainWindow::CacheLineData(size_t line)

 {
 {

-    if (m_dirty) return;
+    wxGenericListCtrl *listctrl = GetListCtrl();

 
 

-    if (!line) return;
+    wxListLineData *ld = GetDummyLine();

 
 

-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
-    line->GetExtent( x, y, w, h );
-    CalcScrolledPosition( x, y, &x, &y );
-    wxRect rect( x, y, w, h );
-    Refresh( TRUE, &rect );
+    size_t countCol = GetColumnCount();
+    for ( size_t col = 0; col < countCol; col++ )
+    {
+        ld->SetText(col, listctrl->OnGetItemText(line, col));
+        ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));
+    }
+
+    ld->SetAttr(listctrl->OnGetItemAttr(line));

 }
 
 }
 

-void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+wxListLineData *wxListMainWindow::GetDummyLine() const

 {
 {

-    // Note: a wxPaintDC must be constructed even if no drawing is
-    // done (a Windows requirement).
-    wxPaintDC dc( this );
-    PrepareDC( dc );
+    wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
+    wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );

 
 

-    int dev_x = 0;
-    int dev_y = 0;
-    CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
+    wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
+
+    // we need to recreate the dummy line if the number of columns in the
+    // control changed as it would have the incorrect number of fields
+    // otherwise
+    if ( !m_lines.IsEmpty() &&
+            m_lines[0].m_items.GetCount() != (size_t)GetColumnCount() )
+    {
+        self->m_lines.Clear();
+    }

 
 

-    if (m_dirty) return;
+    if ( m_lines.IsEmpty() )
+    {
+        wxListLineData *line = new wxListLineData(self);
+        self->m_lines.Add(line);

 
 

-    if (m_lines.GetCount() == 0) return;
+        // don't waste extra memory -- there never going to be anything
+        // else/more in this array
+        self->m_lines.Shrink();
+    }

 
 

-    dc.BeginDrawing();
+    return &m_lines[0];
+}

 
 

-    dc.SetFont( GetFont() );
+// ----------------------------------------------------------------------------
+// line geometry (report mode only)
+// ----------------------------------------------------------------------------

 
 

-    if (m_mode & wxLC_REPORT)
+wxCoord wxListMainWindow::GetLineHeight() const
+{
+    // we cache the line height as calling GetTextExtent() is slow
+    if ( !m_lineHeight )

     {
     {

-        wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-        wxSize clientSize = GetClientSize();
+        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);

 
 

-        int lineSpacing = 0;
-        wxListLineData *line = &m_lines[0];
-        int dummy = 0;
-        line->GetSize( dummy, lineSpacing );
-        lineSpacing += 1;
+        wxClientDC dc( self );
+        dc.SetFont( GetFont() );

 
 

-        int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
+        wxCoord y;
+        dc.GetTextExtent(_T("H"), NULL, &y);

 
 

-        size_t i_to = y_s / lineSpacing + m_visibleLines+2;
-        if (i_to >= m_lines.GetCount()) i_to = m_lines.GetCount();
-        size_t i;
-        for (i = y_s / lineSpacing; i < i_to; i++)
+        if ( m_small_image_list && m_small_image_list->GetImageCount() )

         {
         {

-            m_lines[i].Draw( &dc );
-            // Draw horizontal rule if required
-            if (GetWindowStyle() & wxLC_HRULES)
+            int iw = 0, ih = 0;
+            m_small_image_list->GetSize(0, iw, ih);
+            y = wxMax(y, ih);
+        }
+
+        y += EXTRA_HEIGHT;
+        self->m_lineHeight = y + LINE_SPACING;
+    }
+
+    return m_lineHeight;
+}
+
+wxCoord wxListMainWindow::GetLineY(size_t line) const
+{
+    wxASSERT_MSG( InReportView(), _T("only works in report mode") );
+
+    return LINE_SPACING + line * GetLineHeight();
+}
+
+wxRect wxListMainWindow::GetLineRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectAll;
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetHeaderWidth();
+    rect.height = GetLineHeight();
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectLabel;
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetColumnWidth(0);
+    rect.height = GetLineHeight();
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineIconRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectIcon;
+
+    wxListLineData *ld = GetLine(line);
+    wxASSERT_MSG( ld->HasImage(), _T("should have an image") );
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    GetImageSize(ld->GetImage(), rect.width, rect.height);
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const
+{
+    return InReportView() ? GetLineRect(line)
+                          : GetLine(line)->m_gi->m_rectHighlight;
+}
+
+long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
+{
+    wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") );
+
+    wxListLineData *ld = GetLine(line);
+
+    if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
+        return wxLIST_HITTEST_ONITEMICON;
+
+    // VS: Testing for "ld->HasText() || InReportView()" instead of
+    //     "ld->HasText()" is needed to make empty lines in report view
+    //     possible
+    if ( ld->HasText() || InReportView() )
+    {
+        wxRect rect = InReportView() ? GetLineRect(line)
+                                     : GetLineLabelRect(line);
+
+        if ( rect.Inside(x, y) )
+            return wxLIST_HITTEST_ONITEMLABEL;
+    }
+
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// highlight (selection) handling
+// ----------------------------------------------------------------------------
+
+bool wxListMainWindow::IsHighlighted(size_t line) const
+{
+    if ( IsVirtual() )
+    {
+        return m_selStore.IsSelected(line);
+    }
+    else // !virtual
+    {
+        wxListLineData *ld = GetLine(line);
+        wxCHECK_MSG( ld, false, _T("invalid index in IsHighlighted") );
+
+        return ld->IsHighlighted();
+    }
+}
+
+void wxListMainWindow::HighlightLines( size_t lineFrom,
+                                       size_t lineTo,
+                                       bool highlight )
+{
+    if ( IsVirtual() )
+    {
+        wxArrayInt linesChanged;
+        if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight,
+                                     &linesChanged) )
+        {
+            // meny items changed state, refresh everything
+            RefreshLines(lineFrom, lineTo);
+        }
+        else // only a few items changed state, refresh only them
+        {
+            size_t count = linesChanged.GetCount();
+            for ( size_t n = 0; n < count; n++ )

             {
             {

-                dc.SetPen(pen);
-                dc.SetBrush(* wxTRANSPARENT_BRUSH);
-                dc.DrawLine(0 - dev_x , i*lineSpacing , clientSize.x - dev_x , i*lineSpacing );
-           }
+                RefreshLine(linesChanged[n]);
+            }
+        }
+    }
+    else // iterate over all items in non report view
+    {
+        for ( size_t line = lineFrom; line <= lineTo; line++ )
+        {
+            if ( HighlightLine(line, highlight) )
+                RefreshLine(line);

         }
         }

+    }
+}

 
 

-        // Draw last horizontal rule
-        if ((i > (size_t) (y_s / lineSpacing)) && (GetWindowStyle() & wxLC_HRULES))
+bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
+{
+    bool changed;
+
+    if ( IsVirtual() )
+    {
+        changed = m_selStore.SelectItem(line, highlight);
+    }
+    else // !virtual
+    {
+        wxListLineData *ld = GetLine(line);
+        wxCHECK_MSG( ld, false, _T("invalid index in HighlightLine") );
+
+        changed = ld->Highlight(highlight);
+    }
+
+    if ( changed )
+    {
+        SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED
+                                    : wxEVT_COMMAND_LIST_ITEM_DESELECTED );
+    }
+
+    return changed;
+}
+
+void wxListMainWindow::RefreshLine( size_t line )
+{
+    if ( InReportView() )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        if ( line < visibleFrom || line > visibleTo )
+            return;
+    }
+
+    wxRect rect = GetLineRect(line);
+
+    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    RefreshRect( rect );
+}
+
+void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
+{
+    // we suppose that they are ordered by caller
+    wxASSERT_MSG( lineFrom <= lineTo, _T("indices in disorder") );
+
+    wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
+
+    if ( InReportView() )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        if ( lineFrom < visibleFrom )
+            lineFrom = visibleFrom;
+        if ( lineTo > visibleTo )
+            lineTo = visibleTo;
+
+        wxRect rect;
+        rect.x = 0;
+        rect.y = GetLineY(lineFrom);
+        rect.width = GetClientSize().x;
+        rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();
+
+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+        RefreshRect( rect );
+    }
+    else // !report
+    {
+        // TODO: this should be optimized...
+        for ( size_t line = lineFrom; line <= lineTo; line++ )

         {
         {

-            dc.SetPen(pen);
-            dc.SetBrush(* wxTRANSPARENT_BRUSH);
-            dc.DrawLine(0 - dev_x , i*lineSpacing , clientSize.x - dev_x , i*lineSpacing );
-       }
+            RefreshLine(line);
+        }
+    }
+}
+
+void wxListMainWindow::RefreshAfter( size_t lineFrom )
+{
+    if ( InReportView() )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        if ( lineFrom < visibleFrom )
+            lineFrom = visibleFrom;
+        else if ( lineFrom > visibleTo )
+            return;
+
+        wxRect rect;
+        rect.x = 0;
+        rect.y = GetLineY(lineFrom);
+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+
+        wxSize size = GetClientSize();
+        rect.width = size.x;
+
+        // refresh till the bottom of the window
+        rect.height = size.y - rect.y;
+
+        RefreshRect( rect );
+    }
+    else // !report
+    {
+        // TODO: how to do it more efficiently?
+        m_dirty = true;
+    }
+}
+
+void wxListMainWindow::RefreshSelected()
+{
+    if ( IsEmpty() )
+        return;
+
+    size_t from, to;
+    if ( InReportView() )
+    {
+        GetVisibleLinesRange(&from, &to);
+    }
+    else // !virtual
+    {
+        from = 0;
+        to = GetItemCount() - 1;
+    }
+
+    if ( HasCurrent() && m_current >= from && m_current <= to )
+        RefreshLine(m_current);
+
+    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);
+    }
+}
+
+void wxListMainWindow::Freeze()
+{
+    m_freezeCount++;
+}
+
+void wxListMainWindow::Thaw()
+{
+    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );
+
+    if ( --m_freezeCount == 0 )
+        Refresh();
+}
+
+void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    // Note: a wxPaintDC must be constructed even if no drawing is
+    // done (a Windows requirement).
+    wxPaintDC dc( this );
+
+    if ( IsEmpty() || m_freezeCount )
+        // 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 );
+
+    int dev_x, dev_y;
+    CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
+
+    dc.SetFont( GetFont() );
+
+    if ( InReportView() )
+    {
+        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);
+
+            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) );
+        }
+
+        if ( HasFlag(wxLC_HRULES) )
+        {
+            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxSize clientSize = GetClientSize();
+
+            // Don't draw the first one
+            for ( size_t i = visibleFrom + 1; 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 == GetItemCount() - 1 )
+            {
+                dc.SetPen( pen );
+                dc.SetBrush( *wxTRANSPARENT_BRUSH );
+                dc.DrawLine(0 - dev_x, (m_lineTo + 1) * lineHeight,
+                            clientSize.x - dev_x , (m_lineTo + 1) * lineHeight );
+            }
+        }

 
         // Draw vertical rules if required
 
         // Draw vertical rules if required

-        if ((GetWindowStyle() & wxLC_VRULES) && (GetItemCount() > 0))
+        if ( HasFlag(wxLC_VRULES) && !IsEmpty() )

         {
         {

-            int col = 0;
-            wxRect firstItemRect;
-            wxRect lastItemRect;
-            GetItemRect(0, firstItemRect);
-            GetItemRect(GetItemCount() - 1, lastItemRect);
+            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxRect firstItemRect, lastItemRect;
+
+            GetItemRect(visibleFrom, firstItemRect);
+            GetItemRect(visibleTo, lastItemRect);

             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);

-            for (col = 0; col < GetColumnCount(); col++)
+
+            for (int col = 0; col < GetColumnCount(); col++)

             {
                 int colWidth = GetColumnWidth(col);
             {
                 int colWidth = GetColumnWidth(col);

-                x += colWidth ;
-                dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y, x - dev_x, lastItemRect.GetBottom() + 1 - dev_y);
+                x += colWidth;
+                dc.DrawLine(x - dev_x - 2, firstItemRect.GetY() - 1 - dev_y,
+                            x - dev_x - 2, lastItemRect.GetBottom() + 1 - dev_y);

             }
         }
     }
             }
         }
     }

-    else
+    else // !report

     {
     {

-        for (size_t i = 0; i < m_lines.GetCount(); i++)
-            m_lines[i].Draw( &dc );
+        size_t count = GetItemCount();
+        for ( size_t i = 0; i < count; i++ )
+        {
+            GetLine(i)->Draw( &dc );
+        }

     }
 
     }
 

-    if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
-
-    dc.EndDrawing();
+#ifndef __WXMAC__
+    // Don't draw rect outline under Mac at all.
+    if ( HasCurrent() )
+    {
+        if ( m_hasFocus )
+        {
+            dc.SetPen( *wxBLACK_PEN );
+            dc.SetBrush( *wxTRANSPARENT_BRUSH );
+            dc.DrawRectangle( GetLineHighlightRect( m_current ) );
+        }
+    }
+#endif

 }
 
 }
 

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

 {
 {

-    for (size_t i = 0; i < m_lines.GetCount(); i++)
+    if ( IsSingleSel() )

     {
     {

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

         {
         {

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

         }
     }
         }
     }

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

 }
 
 }
 

-void wxListMainWindow::SendNotify( wxListLineData *line,
+void wxListMainWindow::SendNotify( size_t line,

                                    wxEventType command,
                                    wxEventType command,

-                                   wxPoint point )
+                                   const wxPoint& point )

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

-    le.m_itemIndex = GetIndexOfLine( line );
+    le.m_itemIndex = line;

 
     // set only for events which have position
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 
 
     // set only for events which have position
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 

-    line->GetItem( 0, le.m_item );
-    GetParent()->GetEventHandler()->ProcessEvent( le );
-//    GetParent()->GetEventHandler()->AddPendingEvent( le );
-}
-
-void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
-{
-//  SendNotify( line, wxEVT_COMMAND_LIST_ITEM_FOCUSSED );
-}
+    // 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::UnfocusLine( wxListLineData *WXUNUSED(line) )
-{
-//  SendNotify( line, wxEVT_COMMAND_LIST_ITEM_UNFOCUSSED );
+    GetParent()->GetEventHandler()->ProcessEvent( le );

 }
 
 }
 

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

 {
 {

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

 
 

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

 }
 
 }
 

-void wxListMainWindow::DeleteLine( wxListLineData *line )
+wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass)

 {
 {

-    SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
-}
+    wxCHECK_MSG( (item >= 0) && ((size_t)item < GetItemCount()), NULL,
+                 wxT("wrong index in wxGenericListCtrl::EditLabel()") );

 
 

-/* *** */
-
-void wxListMainWindow::EditLabel( long item )
-{
-    wxCHECK_RET( ((size_t)item < m_lines.GetCount()),
-                 wxT("wrong index in wxListCtrl::Edit()") );
+    wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
+                 wxT("EditLabel() needs a text control") );

 
 

-    m_currentEdit = &m_lines[(size_t)item];
+    size_t itemEdit = (size_t)item;

 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
 
     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 );
+    le.m_itemIndex = item;
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_MSG( data, NULL, _T("invalid index in EditLabel()") );
+    data->GetItem( 0, le.m_item );

 
 

-    if (!le.IsAllowed())
-        return;
+    if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+    {
+        // vetoed by user code
+        return NULL;
+    }

 
 

-    // 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);
-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
-    m_currentEdit->GetLabelExtent( x, y, w, h );
+    wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
+    m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
+    return m_textctrlWrapper->GetText();
+}

 
 

-    wxClientDC dc(this);
-    PrepareDC( dc );
-    x = dc.LogicalToDeviceX( x );
-    y = dc.LogicalToDeviceY( y );
+void wxListMainWindow::OnRenameTimer()
+{
+    wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") );

 
 

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

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_current, wxT("invalid m_current") );
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    le.SetEventObject( GetParent() );
+    le.m_itemIndex = itemEdit;
+
+    wxListLineData *data = GetLine(itemEdit);

 
 

-    Edit( m_lines.Index( *m_current ) );
+    wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );
+
+    data->GetItem( 0, le.m_item );
+    le.m_item.m_text = value;
+    return !GetParent()->GetEventHandler()->ProcessEvent( le ) ||
+                le.IsAllowed();

 }
 
 }
 

-void wxListMainWindow::OnRenameAccept()
+void wxListMainWindow::OnRenameCancelled(size_t itemEdit)

 {
 {

+    // let owner know that the edit was cancelled

     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );

+
+    le.SetEditCanceled(true);
+

     le.SetEventObject( GetParent() );
     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_RET( data, _T("invalid index in OnRenameCancelled()") );

 
 

-    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 );
+    GetEventHandler()->ProcessEvent( le );

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

+#ifdef __WXMAC__
+    // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
+    // shutdown the edit control when the mouse is clicked elsewhere on the
+    // listctrl because the order of events is different (or something like
+    // that), so explicitly end the edit if it is active.
+    if ( event.LeftDown() && m_textctrlWrapper )
+        m_textctrlWrapper->AcceptChangesAndFinish();
+#endif // __WXMAC__
+

     event.SetEventObject( GetParent() );
     event.SetEventObject( GetParent() );

-    if (GetParent()->GetEventHandler()->ProcessEvent( event)) return;
+    if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+        return;
+
+    if (event.GetEventType() == wxEVT_MOUSEWHEEL)
+    {
+        // let the base handle mouse wheel events.
+        event.Skip();
+        return;
+    }

 
 

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

 
     int x = event.GetX();
     int y = event.GetY();
     CalcUnscrolledPosition( x, y, &x, &y );
 
 
     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;

-    wxListLineData *line = (wxListLineData *) NULL;
-    for (size_t i = 0; i < m_lines.GetCount(); i++)
+
+    size_t count = GetItemCount(),
+           current;
+
+    if ( InReportView() )

     {
     {

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

     }
 
     if (event.Dragging())
     {
         if (m_dragCount == 0)
     }
 
     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 = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG
                                           : wxEVT_COMMAND_LIST_BEGIN_DRAG;
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );
 
         int command = event.RightIsDown() ? wxEVT_COMMAND_LIST_BEGIN_RDRAG
                                           : wxEVT_COMMAND_LIST_BEGIN_DRAG;
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );

+        le.m_itemIndex = m_lineLastClicked;

         le.m_pointDrag = m_dragStart;
         GetParent()->GetEventHandler()->ProcessEvent( le );
 
         le.m_pointDrag = m_dragStart;
         GetParent()->GetEventHandler()->ProcessEvent( le );
 


@@ -1932,180 +2947,232 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_dragCount = 0;
     }
 
         m_dragCount = 0;
     }
 

-    if (!line) return;
+    if ( !hitResult )
+    {
+        // outside of any item, reset the selection and bail out
+        HighlightAll(false);
+        return;
+    }

 
 

-    bool forceClick = FALSE;
+    bool forceClick = false;

     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();
     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();

-        m_lastOnSame = FALSE;
+        m_lastOnSame = false;

 
 

-        if ( line == m_lineBeforeLastClicked )
+        if ( current == m_lineLastClicked )

         {
         {

-            m_usedKeys = FALSE;
-
-            SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+            SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );

 
             return;
         }
         else
         {
 
             return;
         }
         else
         {

-            // the first click was on another item, so don't interpret this as
+            // The first click was on another item, so don't interpret this as

             // a double click, but as a simple click instead
             // a double click, but as a simple click instead

-            forceClick = TRUE;
+            forceClick = true;

         }
     }
 
         }
     }
 

-    if (event.LeftUp() && m_lastOnSame)
+    if (event.LeftUp())

     {
     {

-        m_usedKeys = FALSE;
-        if ((line == m_current) &&
-            (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
-            (m_mode & wxLC_EDIT_LABELS)  )
+        if (m_lineSelectSingleOnUp != (size_t)-1)

         {
         {

-            m_renameTimer->Start( 100, TRUE );
+            // select single line
+            HighlightAll( false );
+            ReverseHighlight(m_lineSelectSingleOnUp);

         }
         }

-        m_lastOnSame = FALSE;
-        return;
-    }

 
 

-    if (event.RightDown())
+        if (m_lastOnSame)
+        {
+            if ((current == m_current) &&
+                (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
+                HasFlag(wxLC_EDIT_LABELS) )
+            {
+                m_renameTimer->Start( 100, true );
+            }
+        }
+
+        m_lastOnSame = false;
+        m_lineSelectSingleOnUp = (size_t)-1;
+    }
+    else

     {
     {

-        SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
-                    event.GetPosition() );
-        return;
+        // This is necessary, because after a DnD operation in
+        // from and to ourself, the up event is swallowed by the
+        // DnD code. So on next non-up event (which means here and
+        // now) m_lineSelectSingleOnUp should be reset.
+        m_lineSelectSingleOnUp = (size_t)-1;

     }
     }

+    if (event.RightDown())
+    {
+        m_lineBeforeLastClicked = m_lineLastClicked;
+        m_lineLastClicked = current;
+
+        // If the item is already selected, do not update the selection.
+        // Multi-selections should not be cleared if a selected item is clicked.
+        if (!IsHighlighted(current))
+        {
+            HighlightAll(false);
+            ChangeCurrent(current);
+            ReverseHighlight(m_current);
+        }
+
+        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );

 
 

-    if (event.MiddleDown())
+        // Allow generation of context menu event
+        event.Skip();
+    }
+    else if (event.MiddleDown())

     {
     {

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

     }
     }

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

     {
         m_lineBeforeLastClicked = m_lineLastClicked;
     {
         m_lineBeforeLastClicked = m_lineLastClicked;

-        m_lineLastClicked = line;
+        m_lineLastClicked = current;
+
+        size_t oldCurrent = m_current;
+        bool oldWasSelected = IsHighlighted(m_current);

 
 

-        m_usedKeys = FALSE;
-        wxListLineData *oldCurrent = m_current;
-        if (m_mode & wxLC_SINGLE_SEL)
+        bool cmdModifierDown = event.CmdDown();
+        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )

         {
         {

-            m_current = line;
-            HilightAll( FALSE );
-            m_current->ReverseHilight();
-            RefreshLine( m_current );
+            if ( IsSingleSel() || !IsHighlighted(current) )
+            {
+                HighlightAll( false );
+
+                ChangeCurrent(current);
+
+                ReverseHighlight(m_current);
+            }
+            else // multi sel & current is highlighted & no mod keys
+            {
+                m_lineSelectSingleOnUp = current;
+                ChangeCurrent(current); // change focus
+            }

         }
         }

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

         {
         {

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

             {
             {

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

             }
             else if (event.ShiftDown())
             {
             }
             else if (event.ShiftDown())
             {

-                size_t j;
-
-                m_current = line;
+                ChangeCurrent(current);

 
 

-                int numOfCurrent = -1;
-                for (j = 0; j < m_lines.GetCount(); j++)
-                {
-                    wxListLineData *test_line = &m_lines[j];
-                    numOfCurrent++;
-                    if (test_line == oldCurrent) break;
-                }
-
-                int numOfLine = -1;
-
-                for (j = 0; j < m_lines.GetCount(); j++)
-                {
-                    wxListLineData *test_line = &m_lines[j];
-                    numOfLine++;
-                    if (test_line == line) break;
-                }
+                size_t lineFrom = oldCurrent,
+                       lineTo = current;

 
 

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

                 {
                 {

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

                 }
 
                 }
 

-                for (int i = 0; i <= numOfLine-numOfCurrent; i++)
-                {
-                    wxListLineData *test_line= &m_lines[numOfCurrent + i];
-                    test_line->Hilight(TRUE);
-                    RefreshLine( test_line );
-                }
+                HighlightLines(lineFrom, lineTo);

             }
             }

-            else
+            else // !ctrl, !shift

             {
             {

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

             }
         }
             }
         }

+

         if (m_current != oldCurrent)
         if (m_current != oldCurrent)

-        {

             RefreshLine( oldCurrent );
             RefreshLine( oldCurrent );

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

 
         // forceClick is only set if the previous click was on another item
 
         // forceClick is only set if the previous click was on another item

-        m_lastOnSame = !forceClick && (m_current == oldCurrent);
-
-        return;
+        m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;

     }
 }
 
     }
 }
 

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

 {
 {

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

 
 

-    int item_x = 0;
-    int item_y = 0;
-    int item_w = 0;
-    int item_h = 0;
-    m_current->GetExtent( item_x, item_y, item_w, item_h );
+    wxRect rect = GetLineRect(item);

 
 

-    int client_w = 0;
-    int client_h = 0;
+    int client_w, client_h;

     GetClientSize( &client_w, &client_h );
 
     GetClientSize( &client_w, &client_h );
 

-    int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL );
-    int view_y = m_yScroll*GetScrollPos( wxVERTICAL );
+    const int hLine = GetLineHeight();
+
+    int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL );
+    int view_y = hLine * GetScrollPos( wxVERTICAL );

 
 

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

     {
     {

-        if (item_y < view_y )
-            Scroll( -1, (item_y)/m_yScroll );
-        if (item_y+item_h+5 > view_y+client_h)
-            Scroll( -1, (item_y+item_h-client_h+15)/m_yScroll );
+        // the next we need the range of lines shown it might be different,
+        // so recalculate it
+        ResetVisibleLinesRange();
+
+        if (rect.y < view_y)
+            Scroll( -1, rect.y / hLine );
+        if (rect.y + rect.height + 5 > view_y + client_h)
+            Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );

     }
     }

-    else
+    else // !report

     {
     {

-        if (item_x-view_x < 5)
-            Scroll( (item_x-5)/m_xScroll, -1 );
-        if (item_x+item_w-5 > view_x+client_w)
-            Scroll( (item_x+item_w-client_w+15)/m_xScroll, -1 );
+        if (rect.x-view_x < 5)
+            Scroll( (rect.x - 5) / SCROLL_UNIT_X, -1 );
+        if (rect.x + rect.width - 5 > view_x + client_w)
+            Scroll( (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X, -1 );

     }
 }
 
     }
 }
 

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

 {
 {

-    if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE );
-    wxListLineData *oldCurrent = m_current;
-    m_current = newCurrent;
-    if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE );
+    wxCHECK_RET( newCurrent < (size_t)GetItemCount(),
+                 _T("invalid item index in OnArrowChar()") );
+
+    size_t oldCurrent = m_current;
+
+    // in single selection we just ignore Shift as we can't select several
+    // items anyhow
+    if ( event.ShiftDown() && !IsSingleSel() )
+    {
+        ChangeCurrent(newCurrent);
+
+        // refresh the old focus to remove it
+        RefreshLine( oldCurrent );
+
+        // 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();
 }
 
     MoveToFocus();
 }
 


@@ -2113,7 +3180,7 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 
 {
     wxWindow *parent = GetParent();
 

-    /* we propagate the key event up */
+    // propagate the key event upwards

     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;
     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;


@@ -2132,18 +3199,18 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 
 {
     wxWindow *parent = GetParent();
 

-    /* we send a list_key event up */
-    if ( m_current )
+    // send a list_key event up
+    if ( HasCurrent() )

     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );

-        le.m_itemIndex = GetIndexOfLine( m_current );
-        m_current->GetItem( 0, le.m_item );
-        le.m_code = (int)event.KeyCode();
+        le.m_itemIndex = m_current;
+        GetLine(m_current)->GetItem( 0, le.m_item );
+        le.m_code = event.GetKeyCode();

         le.SetEventObject( parent );
         parent->GetEventHandler()->ProcessEvent( le );
     }
 
         le.SetEventObject( parent );
         parent->GetEventHandler()->ProcessEvent( le );
     }
 

-    /* we propagate the char event up */
+    // propagate the char event upwards

     wxKeyEvent ke( wxEVT_CHAR );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;
     wxKeyEvent ke( wxEVT_CHAR );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;


@@ -2155,285 +3222,228 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 

-    if (event.KeyCode() == WXK_TAB)
+    if (event.GetKeyCode() == WXK_TAB)

     {
         wxNavigationKeyEvent nevent;
         nevent.SetWindowChange( event.ControlDown() );
         nevent.SetDirection( !event.ShiftDown() );
         nevent.SetEventObject( GetParent()->GetParent() );
         nevent.SetCurrentFocus( m_parent );
     {
         wxNavigationKeyEvent nevent;
         nevent.SetWindowChange( event.ControlDown() );
         nevent.SetDirection( !event.ShiftDown() );
         nevent.SetEventObject( GetParent()->GetParent() );
         nevent.SetCurrentFocus( m_parent );

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

     }
 
     }
 

-    /* no item -> nothing to do */
-    if (!m_current)
+    // no item -> nothing to do
+    if (!HasCurrent())

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

-    switch (event.KeyCode())
+    switch (event.GetKeyCode())

     {
         case WXK_UP:
     {
         case WXK_UP:

-        {
-            int index = m_lines.Index(*m_current);
-            if (index != wxNOT_FOUND && index > 0)
-                OnArrowChar( &m_lines[index-1], event.ShiftDown() );
+            if ( m_current > 0 )
+                OnArrowChar( m_current - 1, event );

             break;
             break;

-        }
+

         case WXK_DOWN:
         case WXK_DOWN:

-        {
-            int index = m_lines.Index(*m_current);
-            if (index != wxNOT_FOUND && (size_t)index < m_lines.GetCount()-1)
-                OnArrowChar( &m_lines[index+1], event.ShiftDown() );
+            if ( m_current < (size_t)GetItemCount() - 1 )
+                OnArrowChar( m_current + 1, event );

             break;
             break;

-        }
+

         case WXK_END:
         case WXK_END:

-        {
-            if (!m_lines.IsEmpty())
-                OnArrowChar( &m_lines.Last(), event.ShiftDown() );
+            if (!IsEmpty())
+                OnArrowChar( GetItemCount() - 1, event );

             break;
             break;

-        }
+

         case WXK_HOME:
         case WXK_HOME:

-        {
-            if (!m_lines.IsEmpty())
-                OnArrowChar( &m_lines[0], event.ShiftDown() );
+            if (!IsEmpty())
+                OnArrowChar( 0, event );

             break;
             break;

-        }
+

         case WXK_PRIOR:
         case WXK_PRIOR:

-        {
-            int steps = 0;
-            int index = m_lines.Index(*m_current);
-            if (m_mode & wxLC_REPORT)
-            {
-                steps = m_visibleLines-1;
-            }
-            else
-            {
-                steps = index % m_visibleLines;
-            }
-            if (index != wxNOT_FOUND)

             {
             {

-                index -= steps;
-                if (index < 0) index = 0;
-                OnArrowChar( &m_lines[index], event.ShiftDown() );
+                int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;
+
+                int index = m_current - steps;
+                if (index < 0)
+                    index = 0;
+
+                OnArrowChar( index, event );

             }
             break;
             }
             break;

-        }
+

         case WXK_NEXT:
         case WXK_NEXT:

-        {
-            int steps = 0;
-            int index = m_lines.Index(*m_current);
-            if (m_mode & wxLC_REPORT)

             {
             {

-                steps = m_visibleLines-1;
-            }
-            else
-            {
-                steps = m_visibleLines-(index % m_visibleLines)-1;
-            }
+                int steps = InReportView()
+                               ? m_linesPerPage - 1
+                               : m_linesPerPage - (m_current % m_linesPerPage) - 1;

 
 

-            if (index != wxNOT_FOUND)
-            {
-                index += steps;
-                if ((size_t)index >= m_lines.GetCount())
-                    index = m_lines.GetCount()-1;
-                OnArrowChar( &m_lines[index], event.ShiftDown() );
+                size_t index = m_current + steps;
+                size_t count = GetItemCount();
+                if ( index >= count )
+                    index = count - 1;
+
+                OnArrowChar( index, event );

             }
             break;
             }
             break;

-        }
+

         case WXK_LEFT:
         case WXK_LEFT:

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

             {
             {

-                int index = m_lines.Index(*m_current);
-                if (index != wxNOT_FOUND)
-                {
-                    index -= m_visibleLines;
-                    if (index < 0) index = 0;
-                    OnArrowChar( &m_lines[index], event.ShiftDown() );
-                }
+                int index = m_current - m_linesPerPage;
+                if (index < 0)
+                    index = 0;
+
+                OnArrowChar( index, event );

             }
             break;
             }
             break;

-        }
+

         case WXK_RIGHT:
         case WXK_RIGHT:

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

             {
             {

-                int index = m_lines.Index(*m_current);
-                if (index != wxNOT_FOUND)
-                {
-                    index += m_visibleLines;
-                    if ((size_t)index >= m_lines.GetCount())
-                        index = m_lines.GetCount()-1;
-                    OnArrowChar( &m_lines[index], event.ShiftDown() );
-                }
+                size_t index = m_current + m_linesPerPage;
+
+                size_t count = GetItemCount();
+                if ( index >= count )
+                    index = count - 1;
+
+                OnArrowChar( index, event );

             }
             break;
             }
             break;

-        }
+

         case WXK_SPACE:
         case WXK_SPACE:

-        {
-            if (m_mode & wxLC_SINGLE_SEL)
-            {
-                wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, GetParent()->GetId() );
-                le.SetEventObject( GetParent() );
-                le.m_itemIndex = GetIndexOfLine( m_current );
-                m_current->GetItem( 0, le.m_item );
-                GetParent()->GetEventHandler()->ProcessEvent( le );
-            }
-            else
-            {
-                m_current->ReverseHilight();
-                RefreshLine( m_current );
-            }
-            break;
-        }
-        case WXK_INSERT:
-        {
-            if (!(m_mode & wxLC_SINGLE_SEL))
+            if ( IsSingleSel() )

             {
             {

-                wxListLineData *oldCurrent = m_current;
-                m_current->ReverseHilight();
-                int index = m_lines.Index( *m_current ) + 1;
-                if ( (size_t)index < m_lines.GetCount() )
-                    m_current = &m_lines[index];
-                RefreshLine( oldCurrent );
-                RefreshLine( m_current );
-                UnfocusLine( oldCurrent );
-                FocusLine( m_current );
-                MoveToFocus();
+                SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+
+                if ( IsHighlighted(m_current) )
+                {
+                    // don't unselect the item in single selection mode
+                    break;
+                }
+                //else: select it in ReverseHighlight() below if unselected

             }
             }

+
+            ReverseHighlight(m_current);

             break;
             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::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
 
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {

-    m_hasFocus = TRUE;
-    RefreshLine( m_current );
-
-    if (!GetParent()) return;
+    if ( GetParent() )
+    {
+        wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
+        event.SetEventObject( GetParent() );
+        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+            return;
+    }

 
 

-#ifdef __WXGTK__
-    g_focusWindow = GetParent();
-#endif
+    // 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;

 
 

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

 }
 
 void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
 }
 
 void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {

-    m_hasFocus = FALSE;
-    RefreshLine( m_current );
-}
-
-void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-/*
-  We don't even allow the wxScrolledWindow::AdjustScrollbars() call
+    if ( GetParent() )
+    {
+        wxFocusEvent event( wxEVT_KILL_FOCUS, GetParent()->GetId() );
+        event.SetEventObject( GetParent() );
+        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+            return;
+    }

 
 

-*/
-    m_dirty = TRUE;
+    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 ( InReportView() && (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 ( InReportView() && 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() );

 
 

-int wxListMainWindow::GetIndexOfLine( const wxListLineData *line )
-{
-    int i = m_lines.Index(*line);
-    if (i == wxNOT_FOUND) return -1;
-    else return i;
+    wxCoord lw;
+    dc.GetTextExtent( s, &lw, NULL );
+
+    return lw + AUTOSIZE_COL_MARGIN;

 }
 
 }
 

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

 {
 {

-    m_dirty = TRUE;
+    m_dirty = true;

 
     // calc the spacing from the icon size
 
     // calc the spacing from the icon size

-    int width = 0,
-        height = 0;
+    int width = 0, height = 0;
+

     if ((imageList) && (imageList->GetImageCount()) )
     if ((imageList) && (imageList->GetImageCount()) )

-    {

         imageList->GetSize(0, width, height);
         imageList->GetSize(0, width, height);

-    }

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


@@ -2445,20 +3455,17 @@ void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
     {
         m_small_image_list = imageList;
         m_small_spacing = width + 14;
     {
         m_small_image_list = imageList;
         m_small_spacing = width + 14;

+        m_lineHeight = 0;  // ensure that the line height will be recalc'd

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

-    m_dirty = TRUE;
+    m_dirty = true;

     if (isSmall)
     if (isSmall)

-    {

         m_small_spacing = spacing;
         m_small_spacing = spacing;

-    }

     else
     else

-    {

         m_normal_spacing = spacing;
         m_normal_spacing = spacing;

-    }

 }
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )
 }
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )


@@ -2466,457 +3473,689 @@ int wxListMainWindow::GetItemSpacing( bool isSmall )
     return isSmall ? m_small_spacing : 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 )
 {

-    m_dirty = TRUE;
-    wxNode *node = m_columns.Nth( col );
-    if (node)
-    {
-        if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
-            item.m_width = GetTextLength( item.m_text )+7;
-        wxListHeaderData *column = (wxListHeaderData*)node->Data();
-        column->SetItem( item );
-    }
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

 
 

-    wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin;
+    wxCHECK_RET( node, _T("invalid column index in SetColumn") );
+
+    if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER )
+        item.m_width = GetTextLength( item.m_text );
+
+    wxListHeaderData *column = node->GetData();
+    column->SetItem( item );
+
+    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;

     if ( headerWin )
     if ( headerWin )

-        headerWin->m_dirty = TRUE;
+        headerWin->m_dirty = true;
+
+    m_dirty = true;
+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;

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

-    wxCHECK_RET( m_mode & wxLC_REPORT,
+    wxCHECK_RET( col >= 0 && col < GetColumnCount(),
+                 _T("invalid column index") );
+
+    wxCHECK_RET( InReportView(),

                  _T("SetColumnWidth() can only be called in report mode.") );
 
                  _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::compatibility_iterator node = m_columns.Item( col );
+    wxCHECK_RET( node, _T("no column?") );

 
 

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

 
     if (width == wxLIST_AUTOSIZE_USEHEADER)
     {
 
     if (width == wxLIST_AUTOSIZE_USEHEADER)
     {

-        // TODO do use the header
-        width = 80;
+        width = GetTextLength(column->GetText());

     }
     }

-    else if (width == wxLIST_AUTOSIZE)
+    else if ( width == wxLIST_AUTOSIZE )

     {
     {

-        wxClientDC dc(this);
-        dc.SetFont( GetFont() );
-        int max = 10;
-
-        for (size_t i = 0; i < m_lines.GetCount(); i++)
+        if ( IsVirtual() )
+        {
+            // TODO: determine the max width somehow...
+            width = WIDTH_COL_DEFAULT;
+        }
+        else // !virtual

         {
         {

-            wxListLineData *line = &m_lines[i];
-            wxNode *n = line->m_items.Nth( col );
-            if (n)
+            wxClientDC dc(this);
+            dc.SetFont( GetFont() );
+
+            int max = AUTOSIZE_COL_MARGIN;
+
+            //  if the cached column width isn't valid then recalculate it
+            if (m_aColWidths.Item(col)->bNeedsUpdate)

             {
             {

-                wxListItemData *item = (wxListItemData*)n->Data();
-                int current = 0, ix = 0, iy = 0;
-                wxCoord lx = 0, ly = 0;
-                if (item->HasImage())
-                {
-                    GetImageSize( item->GetImage(), ix, iy );
-                    current = ix + 5;
-                }
-                if (item->HasText())
+                for (size_t i = 0; i < count; i++)

                 {
                 {

-                    wxString str = item->GetText();
-                    dc.GetTextExtent( str, &lx, &ly );
-                    current += lx;
+                    wxListLineData *line = GetLine( i );
+                    wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
+
+                    wxCHECK_RET( n, _T("no subitem?") );
+
+                    wxListItemData *itemData = n->GetData();
+                    wxListItem      item;
+
+                    itemData->GetItem(item);
+                    int itemWidth = GetItemWidthWithImage(&item);
+                    if (itemWidth > max)
+                        max = itemWidth;

                 }
                 }

-                if (current > max) max = current;
+
+                m_aColWidths.Item(col)->bNeedsUpdate = false;
+                m_aColWidths.Item(col)->nMaxWidth = max;

             }
             }

+
+            max = m_aColWidths.Item(col)->nMaxWidth;
+            width = max + AUTOSIZE_COL_MARGIN;

         }
         }

-        width = max+10;

     }
 
     }
 

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

 
 

-    for (size_t i = 0; i < m_lines.GetCount(); i++)
+int wxListMainWindow::GetHeaderWidth() const
+{
+    if ( !m_headerWidth )

     {
     {

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

         {
         {

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

         }
     }
 
         }
     }
 

-    wxListHeaderWindow *headerWin = ((wxListCtrl*) GetParent())->m_headerWin;
-    if ( headerWin )
-        headerWin->m_dirty = TRUE;
+    return m_headerWidth;

 }
 
 }
 

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

 {
 {

-    wxNode *node = m_columns.Nth( col );
-    if (node)
-    {
-        wxListHeaderData *column = (wxListHeaderData*)node->Data();
-        column->GetItem( item );
-    }
-    else
-    {
-        item.m_format = 0;
-        item.m_width = 0;
-        item.m_text = _T("");
-        item.m_image = 0;
-        item.m_data = 0;
-    }
-}
+    wxListHeaderDataList::compatibility_iterator 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::compatibility_iterator 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;
-    if (item.m_itemId >= 0 && (size_t)item.m_itemId < m_lines.GetCount())
+    long id = item.m_itemId;
+    wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
+                 _T("invalid item index in SetItem") );
+
+    if ( !IsVirtual() )

     {
     {

-        wxListLineData *line = &m_lines[(size_t)item.m_itemId];
-        if (m_mode & wxLC_REPORT) item.m_width = GetColumnWidth( item.m_col )-3;
+        wxListLineData *line = GetLine((size_t)id);

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

+
+        // Set item state if user wants
+        if ( item.m_mask & wxLIST_MASK_STATE )
+            SetItemState( item.m_itemId, item.m_state, item.m_state );
+
+        if (InReportView())
+        {
+            //  update the Max Width Cache if needed
+            int width = GetItemWidthWithImage(&item);
+
+            if (width > m_aColWidths.Item(item.m_col)->nMaxWidth)
+                m_aColWidths.Item(item.m_col)->nMaxWidth = width;
+        }
+    }
+
+    // update the item on screen
+    wxRect rectItem;
+    GetItemRect(id, rectItem);
+    RefreshRect(rectItem);
+}
+
+void wxListMainWindow::SetItemStateAll(long state, long stateMask)
+{
+    if ( IsEmpty() )
+        return;
+
+    // first deal with selection
+    if ( stateMask & wxLIST_STATE_SELECTED )
+    {
+        // set/clear select state
+        if ( IsVirtual() )
+        {
+            // optimized version for virtual listctrl.
+            m_selStore.SelectRange(0, GetItemCount() - 1, state == wxLIST_STATE_SELECTED);
+            Refresh();
+        }
+        else if ( state & wxLIST_STATE_SELECTED )
+        {
+            const long count = GetItemCount();
+            for( long i = 0; i <  count; i++ )
+            {
+                SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+            }
+
+        }
+        else
+        {
+            // clear for non virtual (somewhat optimized by using GetNextItem())
+            long i = -1;
+            while ( (i = GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1 )
+            {
+                SetItemState( i, 0, wxLIST_STATE_SELECTED );
+            }
+        }

     }
     }

+
+    if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) )
+    {
+        // unfocus all: only one item can be focussed, so clearing focus for
+        // all items is simply clearing focus of the focussed item.
+        SetItemState(m_current, state, stateMask);
+    }
+    //(setting focus to all items makes no sense, so it is not handled here.)

 }
 
 }
 

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

 {
 {

-     wxCHECK_RET( item >= 0 && (size_t)item < m_lines.GetCount(),
-                  _T("invalid list ctrl item index in SetItem") );
+    if ( litem == -1 )
+    {
+        SetItemStateAll(state, stateMask);
+        return;
+    }

 
 

-    // 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

 
 

+    // do we need to change the focus?

     if ( stateMask & wxLIST_STATE_FOCUSED )
     {
     if ( stateMask & wxLIST_STATE_FOCUSED )
     {

-        wxListLineData *line = &m_lines[(size_t)item];

         if ( state & wxLIST_STATE_FOCUSED )
         {
             // don't do anything if this item is already focused
         if ( state & wxLIST_STATE_FOCUSED )
         {
             // don't do anything if this item is already focused

-            if ( line != m_current )
+            if ( item != m_current )

             {
             {

-                UnfocusLine( m_current );
-                m_current = line;
-                FocusLine( m_current );
-                if ( (m_mode & wxLC_SINGLE_SEL) && oldCurrent )
-                    oldCurrent->Hilight( FALSE );
+                ChangeCurrent(item);
+
+                if ( oldCurrent != (size_t)-1 )
+                {
+                    if ( IsSingleSel() )
+                    {
+                        HighlightLine(oldCurrent, false);
+                    }
+
+                    RefreshLine(oldCurrent);
+                }

 
                 RefreshLine( m_current );
 
                 RefreshLine( m_current );

-                if ( oldCurrent )
-                    RefreshLine( oldCurrent );

             }
         }
         else // unfocus
         {
             // don't do anything if this item is not focused
             }
         }
         else // unfocus
         {
             // don't do anything if this item is not focused

-            if ( line == m_current )
+            if ( item == m_current )

             {
             {

-                UnfocusLine( m_current );
-                m_current = NULL;
+                ResetCurrent();
+
+                if ( IsSingleSel() )
+                {
+                    // we must unselect the old current item as well or we
+                    // might end up with more than one selected item in a
+                    // single selection control
+                    HighlightLine(oldCurrent, false);
+                }
+
+                RefreshLine( oldCurrent );

             }
         }
     }
 
             }
         }
     }
 

+    // do we need to change the selection state?

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

-        if (!on && (m_mode & wxLC_SINGLE_SEL))
-            return;
-
-        wxListLineData *line = &m_lines[(size_t)item];
-        if (m_mode & wxLC_SINGLE_SEL)
-        {
-            UnfocusLine( m_current );
-            m_current = line;
-            FocusLine( m_current );
-            if (oldCurrent)
-                oldCurrent->Hilight( FALSE );
-            RefreshLine( m_current );
-            if (oldCurrent)
-                RefreshLine( oldCurrent );
-        }

 
 

-        if (on != line->IsHilighted())
+        if ( IsSingleSel() )

         {
         {

-            line->Hilight( on );
-            RefreshLine( line );
-        }
-    }
-}
+            if ( on )
+            {
+                // selecting the item also makes it the focused one in the
+                // single sel mode
+                if ( m_current != item )
+                {
+                    ChangeCurrent(item);

 
 

-int wxListMainWindow::GetItemState( long item, long stateMask )
-{
-    int ret = wxLIST_STATE_DONTCARE;
-    if (stateMask & wxLIST_STATE_FOCUSED)
-    {
-        if (item >= 0 && (size_t)item < m_lines.GetCount())
-        {
-            wxListLineData *line = &m_lines[(size_t)item];
-            if (line == m_current) ret |= wxLIST_STATE_FOCUSED;
-        }
-    }
-    if (stateMask & wxLIST_STATE_SELECTED)
-    {
-        if (item >= 0 && (size_t)item < m_lines.GetCount())
+                    if ( oldCurrent != (size_t)-1 )
+                    {
+                        HighlightLine( oldCurrent, false );
+                        RefreshLine( oldCurrent );
+                    }
+                }
+            }
+            else // off
+            {
+                // only the current item may be selected anyhow
+                if ( item != m_current )
+                    return;
+            }
+        }
+
+        if ( HighlightLine(item, on) )

         {
         {

-            wxListLineData *line = &m_lines[(size_t)item];
-            if (line->IsHilighted()) ret |= wxLIST_STATE_SELECTED;
+            RefreshLine(item);

         }
     }
         }
     }

-    return ret;

 }
 
 }
 

-void wxListMainWindow::GetItem( wxListItem &item )
+int wxListMainWindow::GetItemState( long item, long stateMask ) const

 {
 {

-    if (item.m_itemId >= 0 && (size_t)item.m_itemId < m_lines.GetCount())
+    wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0,
+                 _T("invalid list ctrl item index in GetItemState()") );
+
+    int ret = wxLIST_STATE_DONTCARE;
+
+    if ( stateMask & wxLIST_STATE_FOCUSED )

     {
     {

-        wxListLineData *line = &m_lines[(size_t)item.m_itemId];
-        line->GetItem( item.m_col, item );
+        if ( (size_t)item == m_current )
+            ret |= wxLIST_STATE_FOCUSED;

     }
     }

-    else
+
+    if ( stateMask & wxLIST_STATE_SELECTED )

     {
     {

-        item.m_mask = 0;
-        item.m_text = _T("");
-        item.m_image = 0;
-        item.m_data = 0;
+        if ( IsHighlighted(item) )
+            ret |= wxLIST_STATE_SELECTED;

     }
     }

+
+    return ret;

 }
 
 }
 

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

 {
 {

-    return m_lines.GetCount();
+    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 );
+
+    // Get item state if user wants it
+    if ( item.m_mask & wxLIST_MASK_STATE )
+        item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED |
+                                                 wxLIST_STATE_FOCUSED );

 }
 
 }
 

-void wxListMainWindow::GetItemRect( long index, wxRect &rect )
+// ----------------------------------------------------------------------------
+// item count
+// ----------------------------------------------------------------------------
+
+size_t wxListMainWindow::GetItemCount() const

 {
 {

-    if (index >= 0 && (size_t)index < m_lines.GetCount())
-    {
-        m_lines[(size_t)index].GetRect( rect );
-        this->CalcScrolledPosition(rect.x,rect.y,&rect.x,&rect.y);
-    }
-    else
-    {
-        rect.x = 0;
-        rect.y = 0;
-        rect.width = 0;
-        rect.height = 0;
-    }
+    return IsVirtual() ? m_countVirt : m_lines.GetCount();

 }
 
 }
 

-bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
+void wxListMainWindow::SetItemCount(long count)

 {
 {

-    wxRect rect;
-    this->GetItemRect(item,rect);
-    pos.x=rect.x; pos.y=rect.y;
-    return TRUE;
+    m_selStore.SetItemCount(count);
+    m_countVirt = count;
+
+    ResetVisibleLinesRange();
+
+    // scrollbars must be reset
+    m_dirty = true;

 }
 
 }
 

-int wxListMainWindow::GetSelectedItemCount()
+int wxListMainWindow::GetSelectedItemCount() const

 {
 {

-    int ret = 0;
-    for (size_t i = 0; i < m_lines.GetCount(); i++)
+    // deal with the quick case first
+    if ( IsSingleSel() )
+        return HasCurrent() ? IsHighlighted(m_current) : false;
+
+    // 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++ )

     {
     {

-        if (m_lines[i].IsHilighted()) ret++;
+        if ( GetLine(line)->IsHighlighted() )
+            countSel++;

     }
     }

-    return ret;
+
+    return countSel;

 }
 
 }
 

-void wxListMainWindow::SetMode( long mode )
-{
-    m_dirty = TRUE;
-    m_mode = mode;
+// ----------------------------------------------------------------------------
+// item position/size
+// ----------------------------------------------------------------------------

 
 

-    DeleteEverything();
+wxRect wxListMainWindow::GetViewRect() const
+{
+    wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
+                    _T("wxListCtrl::GetViewRect() only works in icon mode") );

 
 

-    if (m_mode & wxLC_REPORT)
+    // we need to find the longest/tallest label
+    wxCoord xMax = 0, yMax = 0;
+    const int count = GetItemCount();
+    if ( count )

     {
     {

-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        m_xScroll = 15;
-#else
-        m_xScroll = 0;
-#endif
-        m_yScroll = 15;
+        for ( int i = 0; i < count; i++ )
+        {
+            wxRect r;
+            GetItemRect(i, r);
+
+            wxCoord x = r.GetRight(),
+                    y = r.GetBottom();
+
+            if ( x > xMax )
+                xMax = x;
+            if ( y > yMax )
+                yMax = y;
+        }

     }
     }

-    else
+
+    // some fudge needed to make it look prettier
+    xMax += 2 * EXTRA_BORDER_X;
+    yMax += 2 * EXTRA_BORDER_Y;
+
+    // account for the scrollbars if necessary
+    const wxSize sizeAll = GetClientSize();
+    if ( xMax > sizeAll.x )
+        yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    if ( yMax > sizeAll.y )
+        xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
+    return wxRect(0, 0, xMax, yMax);
+}
+
+void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const
+{
+    wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
+                 _T("invalid index in GetItemRect") );
+
+    // ensure that we're laid out, otherwise we could return nonsense
+    if ( m_dirty )

     {
     {

-        m_xScroll = 15;
-        m_yScroll = 0;
+        wxConstCast(this, wxListMainWindow)->
+            RecalculatePositions(true /* no refresh */);

     }
     }

+
+    rect = GetLineRect((size_t)index);
+
+    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.IsEmpty()) 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 lineWidth = 0;
-    int lineHeight = 0;
-    int lineSpacing = 0;
-
-    wxListLineData *line = &m_lines[0];
-    line->CalculateSize( &dc, iconSpacing );
-    int dummy = 0;
-    line->GetSize( dummy, lineSpacing );
-    lineSpacing += 1;
-
-    int clientWidth = 0;
-    int clientHeight = 0;
-
-    if (m_mode & wxLC_REPORT)
-    {
-         // scroll one line per step
-         m_yScroll = lineSpacing;
-         
-        int x = 4;
-        int y = 1;
-        int entireHeight = m_lines.GetCount() * lineSpacing + 2;
-        int scroll_pos = GetScrollPos( wxVERTICAL );
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        int x_scroll_pos = GetScrollPos( wxHORIZONTAL );
-#else
-        SetScrollbars( m_xScroll, m_yScroll, 0, entireHeight/m_yScroll +1, 0, scroll_pos, TRUE );
-#endif
-        GetClientSize( &clientWidth, &clientHeight );
+    const size_t count = GetItemCount();

 
 

-        int entireWidth = 0 ;
-        for (size_t j = 0; j < m_lines.GetCount(); j++)
-        {
-            wxListLineData *line = &m_lines[j];
-            line->CalculateSize( &dc, iconSpacing );
-            line->SetPosition( &dc, x, y, clientWidth );
-            int col_x = 2;
-            for (int i = 0; i < GetColumnCount(); i++)
-            {
-                line->SetColumnPosition( i, col_x );
-                col_x += GetColumnWidth( i );
-            }
-            entireWidth = wxMax( entireWidth , col_x ) ;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-            line->SetPosition( &dc, x, y, col_x );
-#endif
-            y += lineSpacing;  // one pixel blank line between items
-        }
-        m_visibleLines = clientHeight / lineSpacing;
-#if wxUSE_GENERIC_LIST_EXTENSIONS
-        SetScrollbars( m_xScroll, m_yScroll, entireWidth/m_xScroll +1, entireHeight/m_yScroll +1, x_scroll_pos  , scroll_pos, TRUE );
-#endif
-    }
+    int iconSpacing;
+    if ( HasFlag(wxLC_ICON) )
+        iconSpacing = m_normal_spacing;
+    else if ( HasFlag(wxLC_SMALL_ICON) )
+        iconSpacing = m_small_spacing;

     else
     else

+        iconSpacing = 0;
+
+    // Note that we do not call GetClientSize() here but
+    // GetSize() and subtract 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 );
+
+    const int lineHeight = GetLineHeight();
+
+    if ( InReportView() )

     {
     {

-        // 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
+        // all lines have the same height and we scroll one line per step
+        int entireHeight = count * lineHeight + LINE_SPACING;

 
 

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

 
 

-        int entireWidth = 0;
+        ResetVisibleLinesRange();

 
 

-        for (int tries = 0; tries < 2; tries++)
+        SetScrollbars( SCROLL_UNIT_X, lineHeight,
+                       GetHeaderWidth() / SCROLL_UNIT_X,
+                       (entireHeight + lineHeight - 1) / lineHeight,
+                       GetScrollPos(wxHORIZONTAL),
+                       GetScrollPos(wxVERTICAL),
+                       true );
+    }
+    else // !report
+    {
+        // we have 3 different layout strategies: either layout all items
+        // horizontally/vertically (wxLC_ALIGN_XXX styles explicitly given) or
+        // to arrange them in top to bottom, left to right (don't ask me why
+        // not the other way round...) order
+        if ( HasFlag(wxLC_ALIGN_LEFT | wxLC_ALIGN_TOP) )

         {
         {

-            entireWidth = 0;
-            int x = 2;
-            int y = 2;
-            int maxWidth = 0;
-            m_visibleLines = 0;
-            int m_currentVisibleLines = 0;
-            for (size_t i = 0; i < m_lines.GetCount(); i++)
+            int x = EXTRA_BORDER_X;
+            int y = EXTRA_BORDER_Y;
+
+            wxCoord widthMax = 0;
+
+            size_t i;
+            for ( i = 0; i < count; i++ )

             {
             {

-                m_currentVisibleLines++;
-                wxListLineData *line = &m_lines[i];
+                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, iconSpacing );
+
+                wxSize sizeLine = GetLineSize(i);
+
+                if ( HasFlag(wxLC_ALIGN_TOP) )

                 {
                 {

-                    m_currentVisibleLines = 0;
-                    y = 2;
-                    x += maxWidth+6;
-                    entireWidth += maxWidth+6;
-                    maxWidth = 0;
+                    if ( sizeLine.x > widthMax )
+                        widthMax = sizeLine.x;
+
+                    y += sizeLine.y;

                 }
                 }

-                if (i == m_lines.GetCount()-1) entireWidth += maxWidth;
-                if ((tries == 0) && (entireWidth > clientWidth))
+                else // wxLC_ALIGN_LEFT

                 {
                 {

-                    clientHeight -= 15; // scrollbar height
-                    m_visibleLines = 0;
-                    m_currentVisibleLines = 0;
-                    break;
+                    x += sizeLine.x + MARGIN_BETWEEN_ROWS;
+                }
+            }
+
+            if ( HasFlag(wxLC_ALIGN_TOP) )
+            {
+                // traverse the items again and tweak their sizes so that they are
+                // all the same in a row
+                for ( i = 0; i < count; i++ )
+                {
+                    wxListLineData *line = GetLine(i);
+                    line->m_gi->ExtendWidth(widthMax);

                 }
                 }

-                if (i == m_lines.GetCount()-1) tries = 1;  // everything fits, no second try required

             }
             }

+
+            SetScrollbars
+            (
+                SCROLL_UNIT_X,
+                lineHeight,
+                (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,
+                (y + lineHeight) / lineHeight,
+                GetScrollPos( wxHORIZONTAL ),
+                GetScrollPos( wxVERTICAL ),
+                true
+            );

         }
         }

+        else // "flowed" arrangement, the most complicated case
+        {
+            // at first we try without any scrollbars, if the items don't fit into
+            // the window, we recalculate after subtracting the space taken by the
+            // scrollbar
+
+            int entireWidth = 0;
+
+            for (int tries = 0; tries < 2; tries++)
+            {
+                entireWidth = 2 * EXTRA_BORDER_X;
+
+                if (tries == 1)
+                {
+                    // Now we have decided that the items do not fit into the
+                    // client area, so we need a scrollbar
+                    entireWidth += SCROLL_UNIT_X;
+                }
+
+                int x = EXTRA_BORDER_X;
+                int y = EXTRA_BORDER_Y;
+                int maxWidthInThisRow = 0;

 
 

-        int scroll_pos = GetScrollPos( wxHORIZONTAL );
-        SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
+                m_linesPerPage = 0;
+                int currentlyVisibleLines = 0;
+
+                for (size_t i = 0; i < count; i++)
+                {
+                    currentlyVisibleLines++;
+                    wxListLineData *line = GetLine( i );
+                    line->CalculateSize( &dc, iconSpacing );
+                    line->SetPosition( x, y, iconSpacing );
+
+                    wxSize sizeLine = GetLineSize( i );
+
+                    if ( maxWidthInThisRow < sizeLine.x )
+                        maxWidthInThisRow = sizeLine.x;
+
+                    y += sizeLine.y;
+                    if (currentlyVisibleLines > m_linesPerPage)
+                        m_linesPerPage = currentlyVisibleLines;
+
+                    if ( y + sizeLine.y >= clientHeight )
+                    {
+                        currentlyVisibleLines = 0;
+                        y = EXTRA_BORDER_Y;
+                        maxWidthInThisRow += MARGIN_BETWEEN_ROWS;
+                        x += maxWidthInThisRow;
+                        entireWidth += maxWidthInThisRow;
+                        maxWidthInThisRow = 0;
+                    }
+
+                    // We have reached the last item.
+                    if ( i == count - 1 )
+                        entireWidth += maxWidthInThisRow;
+
+                    if ( (tries == 0) &&
+                            (entireWidth + SCROLL_UNIT_X > clientWidth) )
+                    {
+                        clientHeight -= wxSystemSettings::
+                                            GetMetric(wxSYS_HSCROLL_Y);
+                        m_linesPerPage = 0;
+                        break;
+                    }
+
+                    if ( i == count - 1 )
+                        tries = 1;  // Everything fits, no second try required.
+                }
+            }
+
+            SetScrollbars
+            (
+                SCROLL_UNIT_X,
+                lineHeight,
+                (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
+                0,
+                GetScrollPos( wxHORIZONTAL ),
+                0,
+                true
+            );
+        }

     }
     }

-}

 
 

-void wxListMainWindow::RealizeChanges()
-{
-    if (!m_current)
+    if ( !noRefresh )

     {
     {

-        if (!m_lines.IsEmpty())
-            m_current = &m_lines[0];
+        // FIXME: why should we call it from here?
+        UpdateCurrent();
+
+        RefreshAll();

     }
     }

-    if (m_current)
+}
+
+void wxListMainWindow::RefreshAll()
+{
+    m_dirty = false;
+    Refresh();
+
+    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
+    if ( headerWin && headerWin->m_dirty )

     {
     {

-        FocusLine( m_current );
-        // TODO: MSW doesn't automatically hilight the
-        //       first item.
-        // if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE );
+        headerWin->m_dirty = false;
+        headerWin->Refresh();

     }
 }
 
     }
 }
 

+void wxListMainWindow::UpdateCurrent()
+{
+    if ( !HasCurrent() && !IsEmpty() )
+        ChangeCurrent(0);
+}
+

 long wxListMainWindow::GetNextItem( long item,
                                     int WXUNUSED(geometry),
 long wxListMainWindow::GetNextItem( long item,
                                     int WXUNUSED(geometry),

-                                    int state )
+                                    int state ) const

 {
     long ret = item,
          max = GetItemCount();
 {
     long ret = item,
          max = GetItemCount();


@@ -2928,355 +4167,572 @@ long wxListMainWindow::GetNextItem( long item,
     // all selected items
     ret++;
     if ( ret == max )
     // all selected items
     ret++;
     if ( ret == max )

-    {
-        // this is not an error because the index was ok initially, just no
-        // such item
+        // this is not an error because the index was OK initially,
+        // just no such item

         return -1;
         return -1;

-    }

 
 

-    for (size_t i = (size_t)ret; i < m_lines.GetCount(); i++)
+    if ( !state )
+        // any will do
+        return (size_t)ret;
+
+    size_t count = GetItemCount();
+    for ( size_t line = (size_t)ret; line < count; line++ )

     {
     {

-        wxListLineData *line = &m_lines[i];
-        if ((state & wxLIST_STATE_FOCUSED) && (line == m_current))
-            return ret;
-        if ((state & wxLIST_STATE_SELECTED) && (line->IsHilighted()))
-            return ret;
-        if (!state)
-            return ret;
-        ret++;
+        if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) )
+            return line;
+
+        if ( (state & wxLIST_STATE_SELECTED) && IsHighlighted(line) )
+            return line;

     }
 
     return -1;
 }
 
     }
 
     return -1;
 }
 

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

 {
 {

-    m_dirty = TRUE;
-    if (index >= 0 && (size_t)index < m_lines.GetCount())
+    size_t count = GetItemCount();
+
+    wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count),
+                 _T("invalid item index in DeleteItem") );
+
+    size_t index = (size_t)lindex;
+
+    // we don't need to adjust the index for the previous items
+    if ( HasCurrent() && m_current >= index )
+    {
+        // if the current item is being deleted, we want the next one to
+        // become selected - unless there is no next one - so don't adjust
+        // m_current in this case
+        if ( m_current != index || m_current == count - 1 )
+            m_current--;
+    }
+
+    if ( InReportView() )
+    {
+    //  mark the Column Max Width cache as dirty if the items in the line
+    //  we're deleting contain the Max Column Width
+        wxListLineData * const line = GetLine(index);
+        wxListItemDataList::compatibility_iterator n;
+        wxListItemData *itemData;
+        wxListItem      item;
+        int             itemWidth;
+
+        for (size_t i = 0; i < m_columns.GetCount(); i++)
+        {
+            n = line->m_items.Item( i );
+            itemData = n->GetData();
+            itemData->GetItem(item);
+
+            itemWidth = GetItemWidthWithImage(&item);
+
+            if (itemWidth >= m_aColWidths.Item(i)->nMaxWidth)
+                m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }
+
+        ResetVisibleLinesRange();
+    }
+
+    if ( IsVirtual() )
+    {
+        m_countVirt--;
+        m_selStore.OnItemDelete(index);
+    }
+    else

     {
     {

-        wxListLineData *line = &m_lines[(size_t)index];
-        if (m_current == line) m_current = (wxListLineData *) NULL;
-        DeleteLine( line );
-        m_lines.RemoveAt( (size_t)index );
+        m_lines.RemoveAt( index );

     }
     }

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

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

-    wxCHECK_RET( col < (int)m_columns.GetCount(),
-               wxT("attempting to delete inexistent column in wxListView") );
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
+
+    wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
+
+    m_dirty = true;
+    delete node->GetData();
+    m_columns.Erase( node );
+
+    if ( !IsVirtual() )
+    {
+        // update all the items
+        for ( size_t i = 0; i < m_lines.GetCount(); i++ )
+        {
+            wxListLineData * const line = GetLine(i);
+            wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
+            delete n->GetData();
+            line->m_items.Erase(n);
+        }
+    }
+
+    if ( InReportView() )   //  we only cache max widths when in Report View
+    {
+        delete m_aColWidths.Item(col);
+        m_aColWidths.RemoveAt(col);
+    }

 
 

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

 }
 
 }
 

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

 {
 {

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

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

-    // notifications in this case: this is compatible with wxMSW and
-    // documented in DeleteAllItems() description
+    // notifications for each item deletion in this case but only one event
+    // for all of them: this is compatible with wxMSW and documented in
+    // DeleteAllItems() description

 
     wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 
 
     wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 

+    if ( IsVirtual() )
+    {
+        m_countVirt = 0;
+        m_selStore.Clear();
+    }
+
+    if ( InReportView() )
+    {
+        ResetVisibleLinesRange();
+        for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
+        {
+            m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }
+    }
+

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

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

 void wxListMainWindow::DeleteEverything()
 {
 void wxListMainWindow::DeleteEverything()
 {

-    DeleteAllItems();
+    WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
+    WX_CLEAR_ARRAY(m_aColWidths);

 
 

-    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") );

 
 

-    wxListLineData *oldCurrent = m_current;
-    m_current = (wxListLineData *) NULL;
-    if (index >= 0 && (size_t)index < m_lines.GetCount())
-        m_current = &m_lines[(size_t)index];
-    if (m_current) MoveToFocus();
-    m_current = oldCurrent;
+    // 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 */);
+
+    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;
-    for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++)
-    {
-        wxListLineData *line = &m_lines[i];
-        wxString s = line->GetText(0);
-        if (s == tmp)
-            return pos;
+    if (pos < 0)
+        pos = 0;

 
 

-        pos++;
+    size_t count = GetItemCount();
+    for ( size_t i = (size_t)pos; i < count; i++ )
+    {
+        wxListLineData *line = GetLine(i);
+        if ( line->GetText(0) == tmp )
+            return i;

     }
     }

-    return -1;
+
+    return wxNOT_FOUND;

 }
 
 }
 

-long wxListMainWindow::FindItem(long start, long data)
+long wxListMainWindow::FindItem(long start, wxUIntPtr data)

 {
     long pos = start;
 {
     long pos = start;

-    if (pos < 0) pos = 0;
-    for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++)
+    if (pos < 0)
+        pos = 0;
+
+    size_t count = GetItemCount();
+    for (size_t i = (size_t)pos; i < count; i++)

     {
     {

-        wxListLineData *line = &m_lines[i];
+        wxListLineData *line = GetLine(i);

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

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

     }
     }

-    return -1;
+
+    return wxNOT_FOUND;
+}
+
+long wxListMainWindow::FindItem( const wxPoint& pt )
+{
+    size_t topItem;
+    GetVisibleLinesRange( &topItem, NULL );
+
+    wxPoint p;
+    GetItemPosition( GetItemCount() - 1, p );
+    if ( p.y == 0 )
+        return topItem;
+
+    long id = (long)floor( pt.y * double(GetItemCount() - topItem - 1) / p.y + topItem );
+    if ( id >= 0 && id < (long)GetItemCount() )
+        return id;
+
+    return wxNOT_FOUND;

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

-    int count = 0;
-    for (size_t i = 0; i < m_lines.GetCount(); i++)
+    size_t count = GetItemCount();
+
+    if ( InReportView() )

     {
     {

-        wxListLineData *line = &m_lines[i];
-        long ret = line->IsHit( x, y );
-        if (ret) //  & flags) // No: flags is output-only so may be garbage at this point
+        size_t current = y / GetLineHeight();
+        if ( current < count )

         {
         {

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

         }
         }

-        count++;

     }
     }

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

 }
 
 }
 

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

 void wxListMainWindow::InsertItem( wxListItem &item )
 {
 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 );
+    int count = GetItemCount();
+    wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") );

 
 

-    if (m_mode & wxLC_REPORT)
-    {
-        line->InitItems( GetColumnCount() );
-        item.m_width = GetColumnWidth( 0 )-3;
-    }
-    else
-    {
-        line->InitItems( 1 );
-    }
+    if (item.m_itemId > count)
+        item.m_itemId = count;

 
 

-    line->SetItem( 0, item );
-    if ((item.m_itemId >= 0) && ((size_t)item.m_itemId < m_lines.GetCount()))
-    {
-        m_lines.Insert( line, (size_t)item.m_itemId );
-    }
-    else
+    size_t id = item.m_itemId;
+
+    m_dirty = true;
+
+    if ( InReportView() )

     {
     {

-        m_lines.Add( line );
-        item.m_itemId = m_lines.GetCount()-1;
+        ResetVisibleLinesRange();
+
+        // calculate the width of the item and adjust the max column width
+        wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
+        int width = GetItemWidthWithImage(&item);
+        item.SetWidth(width);
+        if (width > pWidthInfo->nMaxWidth)
+            pWidthInfo->nMaxWidth = width;

     }
     }

+
+    wxListLineData *line = new wxListLineData(this);
+
+    line->SetItem( item.m_col, item );
+
+    m_lines.Insert( line, id );
+
+    m_dirty = true;
+
+    // If an item is selected at or below the point of insertion, we need to
+    // increment the member variables because the current row's index has gone
+    // up by one
+    if ( HasCurrent() && m_current >= id )
+        m_current++;
+
+    SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
+
+    RefreshLines(id, GetItemCount() - 1);

 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {

-    m_dirty = TRUE;
-    if (m_mode & wxLC_REPORT)
+    m_dirty = true;
+    if ( InReportView() )

     {
         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 );
         wxListHeaderData *column = new wxListHeaderData( item );

-        if ((col >= 0) && (col < (int)m_columns.GetCount()))
+        wxColWidthInfo *colWidthInfo = new wxColWidthInfo();
+
+        bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
+        if ( insert )

         {
         {

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

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

+            m_aColWidths.Add( colWidthInfo );

         }
         }

-    }
-}

 
 

-wxListCtrlCompare list_ctrl_compare_func_2;
-long              list_ctrl_compare_data;
+        if ( !IsVirtual() )
+        {
+            // update all the items
+            for ( size_t i = 0; i < m_lines.GetCount(); i++ )
+            {
+                wxListLineData * const line = GetLine(i);
+                wxListItemData * const data = new wxListItemData(this);
+                if ( insert )
+                    line->m_items.Insert(col, data);
+                else
+                    line->m_items.Append(data);
+            }
+        }

 
 

-int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )
-{
-    wxListLineData *line1 = *arg1;
-    wxListLineData *line2 = *arg2;
-    wxListItem item;
-    line1->GetItem( 0, item );
-    long data1 = item.m_data;
-    line2->GetItem( 0, item );
-    long data2 = item.m_data;
-    return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
+        // invalidate it as it has to be recalculated
+        m_headerWidth = 0;
+    }

 }
 
 }
 

-void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
+int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)

 {
 {

-    list_ctrl_compare_func_2 = fn;
-    list_ctrl_compare_data = data;
-    m_lines.Sort( list_ctrl_compare_func_1 );
-    m_dirty = TRUE;
-}
+    int width = 0;
+    wxClientDC dc(this);

 
 

-void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
-{
-     wxScrolledWindow::OnScroll( event ) ;
+    dc.SetFont( GetFont() );

 
 

-#if wxUSE_GENERIC_LIST_EXTENSIONS
+    if (item->GetImage() != -1)
+    {
+        int ix, iy;
+        GetImageSize( item->GetImage(), ix, iy );
+        width += ix + 5;
+    }

 
 

-    if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
+    if (!item->GetText().empty())

     {
     {

-            wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ;
-            if ( lc )
-            {
-                    lc->m_headerWin->Refresh() ;
-#ifdef __WXMAC__
-                        lc->m_headerWin->MacUpdateImmediately() ;
-#endif
-            }
+        wxCoord w;
+        dc.GetTextExtent( item->GetText(), &w, NULL );
+        width += w;

     }
     }

-#endif
+
+    return width;

 }
 
 }
 

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

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+wxListCtrlCompare list_ctrl_compare_func_2;
+long              list_ctrl_compare_data;

 
 

-wxListItem::wxListItem()
+int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )

 {
 {

-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-
-    m_attr = NULL;
+    wxListLineData *line1 = *arg1;
+    wxListLineData *line2 = *arg2;
+    wxListItem item;
+    line1->GetItem( 0, item );
+    wxUIntPtr data1 = item.m_data;
+    line2->GetItem( 0, item );
+    wxUIntPtr data2 = item.m_data;
+    return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );

 }
 
 }
 

-void wxListItem::Clear()
+void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )

 {
 {

-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text = _T("");
-
-    if (m_attr) delete m_attr;
-    m_attr = NULL;
+    list_ctrl_compare_func_2 = fn;
+    list_ctrl_compare_data = data;
+    m_lines.Sort( list_ctrl_compare_func_1 );
+    m_dirty = true;

 }
 
 }
 

-void wxListItem::ClearAttributes()
+// ----------------------------------------------------------------------------
+// scrolling
+// ----------------------------------------------------------------------------
+
+void wxListMainWindow::OnScroll(wxScrollWinEvent& event)

 {
 {

-    if (m_attr) delete m_attr;
-    m_attr = NULL;
-}
+    // update our idea of which lines are shown when we redraw the window the
+    // next time
+    ResetVisibleLinesRange();

 
 

-// -------------------------------------------------------------------------------------
-// wxListEvent
-// -------------------------------------------------------------------------------------
+    // FIXME
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
+    wxScrolledWindow::OnScroll(event);
+#else
+    HandleOnScroll( event );
+#endif

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+    if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
+    {
+        wxGenericListCtrl* lc = GetListCtrl();
+        wxCHECK_RET( lc, _T("no listctrl window?") );

 
 

-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;
+        lc->m_headerWin->Refresh();
+        lc->m_headerWin->Update();
+    }

 }
 
 }
 

-void wxListEvent::CopyObject(wxObject& object_dest) const
+int wxListMainWindow::GetCountPerPage() const

 {
 {

-    wxListEvent *obj = (wxListEvent *)&object_dest;
+    if ( !m_linesPerPage )
+    {
+        wxConstCast(this, wxListMainWindow)->
+            m_linesPerPage = GetClientSize().y / GetLineHeight();
+    }

 
 

-    wxNotifyEvent::CopyObject(object_dest);
+    return m_linesPerPage;
+}

 
 

-    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;
+void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
+{
+    wxASSERT_MSG( InReportView(), _T("this is for report mode only") );

 
 

-    if ( m_item.HasAttributes() )
+    if ( m_lineFrom == (size_t)-1 )

     {
     {

-        obj->m_item.SetTextColour(m_item.GetTextColour());
+        size_t count = GetItemCount();
+        if ( count )
+        {
+            m_lineFrom = GetScrollPos(wxVERTICAL);
+
+            // this may happen if SetScrollbars() hadn't been called yet
+            if ( m_lineFrom >= count )
+                m_lineFrom = count - 1;
+
+            // 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;
+        }

     }
     }

+
+    wxASSERT_MSG( IsEmpty() ||
+                  (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()),
+                  _T("GetVisibleLinesRange() returns incorrect result") );
+
+    if ( from )
+        *from = m_lineFrom;
+    if ( to )
+        *to = m_lineTo;

 }
 
 // -------------------------------------------------------------------------------------
 }
 
 // -------------------------------------------------------------------------------------

-// wxListCtrl
+// wxGenericListCtrl

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

-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)

 
 

-BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
-  EVT_SIZE          (wxListCtrl::OnSize)
-  EVT_IDLE          (wxListCtrl::OnIdle)
+BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
+  EVT_SIZE(wxGenericListCtrl::OnSize)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxListCtrl::wxListCtrl()
+wxGenericListCtrl::wxGenericListCtrl()

 {
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
-    m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE;
+    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;

+    m_headerHeight = 0;
+}
+
+wxGenericListCtrl::~wxGenericListCtrl()
+{
+    if (m_ownsImageListNormal)
+        delete m_imageListNormal;
+    if (m_ownsImageListSmall)
+        delete m_imageListSmall;
+    if (m_ownsImageListState)
+        delete m_imageListState;
+}
+
+void wxGenericListCtrl::CalculateAndSetHeaderHeight()
+{
+    if ( m_headerWin )
+    {
+#ifdef __WXMAC__
+        SInt32 h;
+        GetThemeMetric( kThemeMetricListHeaderHeight, &h );
+#else
+        // we use 'g' to get the descent, too
+        int w, h, d;
+        m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d);
+        h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
+#endif
+
+        // only update if changed
+        if ( h != m_headerHeight )
+        {
+            m_headerHeight = h;
+
+            if ( HasHeader() )
+                ResizeReportView(true);
+            else    //why is this needed if it doesn't have a header?
+                m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
+        }
+    }

 }
 
 }
 

-wxListCtrl::~wxListCtrl()
+void wxGenericListCtrl::CreateHeaderWindow()

 {
 {

-    if (m_ownsImageListNormal) delete m_imageListNormal;
-    if (m_ownsImageListSmall) delete m_imageListSmall;
-    if (m_ownsImageListState) delete m_imageListState;
+    m_headerWin = new wxListHeaderWindow
+                      (
+                        this, wxID_ANY, m_mainWin,
+                        wxPoint(0,0),
+                        wxSize(GetClientSize().x, m_headerHeight),
+                        wxTAB_TRAVERSAL
+                      );
+    CalculateAndSetHeaderHeight();

 }
 
 }
 

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

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


@@ -3284,155 +4740,172 @@ bool wxListCtrl::Create(wxWindow *parent,
                         const wxValidator &validator,
                         const wxString &name)
 {
                         const wxValidator &validator,
                         const wxString &name)
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
-    m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE;
+    m_imageListNormal =
+    m_imageListSmall =
+    m_imageListState = (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)) )
+    m_headerHeight = 0;
+
+    if ( !(style & wxLC_MASK_TYPE) )

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

-    bool ret = wxControl::Create( parent, id, pos, size, style, validator, name );
-
+    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+        return false;

 
 

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

 
 

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

 
 

-    if (HasFlag(wxLC_REPORT))
+#ifdef  __WXMAC_CARBON__
+    // Human Interface Guidelines ask us for a special font in this case
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )

     {
     {

-        m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL );
-        if (HasFlag(wxLC_NO_HEADER))
-            m_headerWin->Show( FALSE );
+        wxFont font;
+        font.MacCreateThemeFont( kThemeViewsFont );
+        SetFont( font );

     }
     }

-    else
+#endif
+
+    if ( InReportView() )

     {
     {

-        m_headerWin = (wxListHeaderWindow *) NULL;
-    }
+        CreateHeaderWindow();

 
 

-    return ret;
-}
+#ifdef  __WXMAC_CARBON__
+        if (m_headerWin)
+        {
+            wxFont font;
+            font.MacCreateThemeFont( kThemeSmallSystemFont );
+            m_headerWin->SetFont( font );
+            CalculateAndSetHeaderHeight();
+        }
+#endif

 
 

-void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-    /* handled in OnIdle */
+        if ( HasFlag(wxLC_NO_HEADER) )
+            // VZ: why do we create it at all then?
+            m_headerWin->Show( false );
+    }
+
+    SetBestSize(size);

 
 

-    if (m_mainWin) m_mainWin->m_dirty = TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

+    wxASSERT_MSG( !(style & wxLC_VIRTUAL),
+                  _T("wxLC_VIRTUAL can't be [un]set") );
+

     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)

-    {

         flag |= style;
         flag |= style;

-    }

     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 );
-
-        m_mainWin->SetMode( flag );
+        // has the header visibility changed?
+        bool hasHeader = HasHeader();
+        bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);

 
 

-        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 );
 {
     m_mainWin->GetColumn( col, item );

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     m_mainWin->SetColumn( col, item );
 {
     m_mainWin->SetColumn( col, item );

-    return TRUE;
+    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 );
 {
     m_mainWin->SetColumnWidth( col, width );

-    return TRUE;
+    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 );
 {
     m_mainWin->GetItem( info );

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     m_mainWin->SetItem( info );
 {
     m_mainWin->SetItem( info );

-    return TRUE;
+    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;


@@ -3443,256 +4916,324 @@ long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageI
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;

-    };
+    }
+

     m_mainWin->SetItem(info);
     m_mainWin->SetItem(info);

-    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 );
 {
     m_mainWin->SetItemState( item, state, stateMask );

-    return TRUE;
+    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;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
     m_mainWin->SetItem( info );
 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
     m_mainWin->SetItem( info );

-    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
+wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const

 {
     wxListItem info;
 {
     wxListItem info;

+    info.m_mask = wxLIST_MASK_DATA;

     info.m_itemId = item;
     m_mainWin->GetItem( info );
     return info.m_data;
 }
 
     info.m_itemId = item;
     m_mainWin->GetItem( info );
     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;
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;
+}
+
+wxRect wxGenericListCtrl::GetViewRect() const
+{
+    return m_mainWin->GetViewRect();

 }
 
 }
 

-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 );
 {
     m_mainWin->GetItemRect( item, rect );

-    return TRUE;
+    if ( m_mainWin->HasHeader() )
+        rect.y += m_headerHeight + 1;
+    return true;

 }
 
 }
 

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

 {
     m_mainWin->GetItemPosition( item, pos );
 {
     m_mainWin->GetItemPosition( item, pos );

-    return TRUE;
+    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
+wxSize wxGenericListCtrl::GetItemSpacing() const
+{
+    const int spacing = m_mainWin->GetItemSpacing(HasFlag(wxLC_SMALL_ICON));
+
+    return wxSize(spacing, spacing);
+}
+
+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();
+}
+
+void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetFont( f );
+    m_mainWin->SetItem( info );
+}
+
+wxFont wxGenericListCtrl::GetItemFont( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetFont();
+}
+
+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;
+    size_t top;
+    m_mainWin->GetVisibleLinesRange(&top, NULL);
+    return (long)top;

 }
 
 }
 

-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)

-    {

         return m_imageListNormal;
         return m_imageListNormal;

-    }

     else if (which == wxIMAGE_LIST_SMALL)
     else if (which == wxIMAGE_LIST_SMALL)

-    {

         return m_imageListSmall;
         return m_imageListSmall;

-    }

     else if (which == wxIMAGE_LIST_STATE)
     else if (which == wxIMAGE_LIST_STATE)

-    {

         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 ( which == wxIMAGE_LIST_NORMAL )
     {

-        if (m_ownsImageListNormal) delete m_imageListNormal;
+        if (m_ownsImageListNormal)
+            delete m_imageListNormal;

         m_imageListNormal = imageList;
         m_imageListNormal = imageList;

-        m_ownsImageListNormal = FALSE;
+        m_ownsImageListNormal = false;

     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {

-        if (m_ownsImageListSmall) delete m_imageListSmall;
+        if (m_ownsImageListSmall)
+            delete m_imageListSmall;

         m_imageListSmall = imageList;
         m_imageListSmall = imageList;

-        m_ownsImageListSmall = FALSE;
+        m_ownsImageListSmall = false;

     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {

-        if (m_ownsImageListState) delete m_imageListState;
+        if (m_ownsImageListState)
+            delete m_imageListState;

         m_imageListState = imageList;
         m_imageListState = imageList;

-        m_ownsImageListState = FALSE;
+        m_ownsImageListState = false;

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

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

 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )

-        m_ownsImageListNormal = TRUE;
+        m_ownsImageListNormal = true;

     else if ( which == wxIMAGE_LIST_SMALL )
     else if ( which == wxIMAGE_LIST_SMALL )

-        m_ownsImageListSmall = TRUE;
+        m_ownsImageListSmall = true;

     else if ( which == wxIMAGE_LIST_STATE )
     else if ( which == wxIMAGE_LIST_STATE )

-        m_ownsImageListState = TRUE;
+        m_ownsImageListState = true;

 }
 
 }
 

-bool wxListCtrl::Arrange( int WXUNUSED(flag) )
+bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )

 {
     return 0;
 }
 
 {
     return 0;
 }
 

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

 {
     m_mainWin->DeleteItem( item );
 {
     m_mainWin->DeleteItem( item );

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     m_mainWin->DeleteAllItems();
 {
     m_mainWin->DeleteAllItems();

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

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

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

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

-    return TRUE;
+
+    // if we don't have the header any longer, we need to relayout the window
+    if ( !GetColumnCount() )
+        ResizeReportView(false /* no header */);
+    return true;

 }
 
 }
 

-void wxListCtrl::Edit( long item )
+wxTextCtrl *wxGenericListCtrl::EditLabel(long item,
+                                         wxClassInfo* textControlClass)

 {
 {

-    m_mainWin->Edit( item );
+    return m_mainWin->EditLabel( item, textControlClass );

 }
 
 }
 

-bool wxListCtrl::EnsureVisible( long item )
+wxTextCtrl *wxGenericListCtrl::GetEditControl() const
+{
+    return m_mainWin->GetEditControl();
+}
+
+bool wxGenericListCtrl::EnsureVisible( long item )

 {
     m_mainWin->EnsureVisible( item );
 {
     m_mainWin->EnsureVisible( item );

-    return TRUE;
+    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, wxUIntPtr 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& pt,

                            int WXUNUSED(direction))
 {
                            int WXUNUSED(direction))
 {

-    return 0;
+    return m_mainWin->FindItem( pt );

 }
 
 }
 

-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;


@@ -3701,7 +5242,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;


@@ -3710,7 +5251,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;


@@ -3720,16 +5261,23 @@ 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 a header before but have one now
+    // then we need to relayout the window
+    if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
+        ResizeReportView(true /* have header */);
+

     m_headerWin->Refresh();
 
     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;


@@ -3740,12 +5288,13 @@ long wxListCtrl::InsertColumn( long col, const wxString &heading,
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;
     }
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;
     }

+

     item.m_format = format;
 
     return InsertColumn( col, item );
 }
 
     item.m_format = format;
 
     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;
 }


@@ -3760,144 +5309,314 @@ 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 );
 {
     m_mainWin->SortItems( fn, data );

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

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

 
 

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

 
 

-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
+void wxGenericListCtrl::ResizeReportView(bool showHeader)
+{
+    int cw, ch;
+    GetClientSize( &cw, &ch );

 
 

-    if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER))
+    if ( showHeader )

     {
     {

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

     }
     }

-    else
+    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();
+void wxGenericListCtrl::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();

 
 

-    if ( m_headerWin && m_headerWin->m_dirty )
-    {
-        m_headerWin->m_dirty = FALSE;
-        m_headerWin->Refresh();
-    }
+    // do it only if needed
+    if ( !m_mainWin->m_dirty )
+        return;
+
+    m_mainWin->RecalculatePositions();

 }
 
 }
 

-bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
+// ----------------------------------------------------------------------------
+// font/colours
+// ----------------------------------------------------------------------------
+
+bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )

 {
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );
 {
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     if ( !wxWindow::SetForegroundColour( colour ) )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )

-        return FALSE;
+        return false;

 
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );
 
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     if (m_headerWin)
     }
 
     if (m_headerWin)

-    {

         m_headerWin->SetForegroundColour( colour );
         m_headerWin->SetForegroundColour( colour );

-    }

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     if ( !wxWindow::SetFont( font ) )
 {
     if ( !wxWindow::SetFont( font ) )

-        return FALSE;
+        return false;

 
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );
 
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );
     }
 
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );

+        CalculateAndSetHeaderHeight();

     }
 
     }
 

-    return TRUE;
+    Refresh();
+
+    return true;
+}
+
+#if _USE_VISATTR
+#include "wx/listbox.h"
+#endif
+
+// static
+wxVisualAttributes
+wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+#if _USE_VISATTR
+    // Use the same color scheme as wxListBox
+    return wxListBox::GetClassDefaultAttributes(variant);
+#else
+    wxUnusedVar(variant);
+    wxVisualAttributes attr;
+    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
+    attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    return attr;
+#endif

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// methods forwarded to m_mainWin
+// ----------------------------------------------------------------------------
+

 #if wxUSE_DRAG_AND_DROP
 
 #if wxUSE_DRAG_AND_DROP
 

-void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
+void wxGenericListCtrl::SetDropTarget( wxDropTarget *dropTarget )

 {
     m_mainWin->SetDropTarget( dropTarget );
 }
 
 {
     m_mainWin->SetDropTarget( dropTarget );
 }
 

-wxDropTarget *wxListCtrl::GetDropTarget() const
+wxDropTarget *wxGenericListCtrl::GetDropTarget() const

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

-#endif // wxUSE_DRAG_AND_DROP
+#endif

 
 

-bool wxListCtrl::SetCursor( const wxCursor &cursor )
+bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )

 {
 {

-    return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE;
+    return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : false;

 }
 
 }
 

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

 {
     return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour();
 }
 
 {
     return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour();
 }
 

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

 {
     return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
 }
 
 {
     return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
 }
 

-bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
+bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )

 {
 {

+#if wxUSE_MENUS

     return m_mainWin->PopupMenu( menu, x, y );
     return m_mainWin->PopupMenu( menu, x, y );

+#else
+    return false;
+#endif

 }
 
 }
 

-void wxListCtrl::SetFocus()
+void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const

 {
 {

-    /* The test in window.cpp fails as we are a composite
-       window, so it checks against "this", but not m_mainWin. */
-    if ( FindFocus() != this )
+    return m_mainWin->DoClientToScreen(x, y);
+}
+
+void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
+{
+    return m_mainWin->DoScreenToClient(x, y);
+}
+
+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 ( DoFindFocus() != this )

         m_mainWin->SetFocus();
 }
         m_mainWin->SetFocus();
 }

+
+wxSize wxGenericListCtrl::DoGetBestSize() const
+{
+    // Something is better than nothing...
+    // 100x80 is what the MSW version will get from the default
+    // wxControl::DoGetBestSize
+    return wxSize(100, 80);
+}
+
+// ----------------------------------------------------------------------------
+// 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
+{
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
+    return -1;
+}
+
+int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
+{
+    if (!column)
+        return OnGetItemImage(item);
+
+   return -1;
+}
+
+wxListItemAttr *
+wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(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);
+}
+
+// Generic wxListCtrl is more or less a container for two other
+// windows which drawings are done upon. These are namely
+// 'm_headerWin' and 'm_mainWin'.
+// Here we override 'virtual wxWindow::Refresh()' to mimic the
+// behaviour wxListCtrl has under wxMSW.
+//
+void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
+{
+    if (!rect)
+    {
+        // The easy case, no rectangle specified.
+        if (m_headerWin)
+            m_headerWin->Refresh(eraseBackground);
+
+        if (m_mainWin)
+            m_mainWin->Refresh(eraseBackground);
+    }
+    else
+    {
+        // Refresh the header window
+        if (m_headerWin)
+        {
+            wxRect rectHeader = m_headerWin->GetRect();
+            rectHeader.Intersect(*rect);
+            if (rectHeader.GetWidth() && rectHeader.GetHeight())
+            {
+                int x, y;
+                m_headerWin->GetPosition(&x, &y);
+                rectHeader.Offset(-x, -y);
+                m_headerWin->Refresh(eraseBackground, &rectHeader);
+            }
+        }
+
+        // Refresh the main window
+        if (m_mainWin)
+        {
+            wxRect rectMain = m_mainWin->GetRect();
+            rectMain.Intersect(*rect);
+            if (rectMain.GetWidth() && rectMain.GetHeight())
+            {
+                int x, y;
+                m_mainWin->GetPosition(&x, &y);
+                rectMain.Offset(-x, -y);
+                m_mainWin->Refresh(eraseBackground, &rectMain);
+            }
+        }
+    }
+}
+
+void wxGenericListCtrl::Freeze()
+{
+    m_mainWin->Freeze();
+}
+
+void wxGenericListCtrl::Thaw()
+{
+    m_mainWin->Thaw();
+}
+
+#endif // wxUSE_LISTCTRL
+