rtti api mods added

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 8ea3034af7b1661c2d396d09e03b976e0e62a7a8..21f74335b6130438d8b9a643415cb746e772bef2 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -8,6 +8,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -16,15 +23,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "listctrl.h"
     #pragma implementation "listctrlbase.h"
 #endif
 
     #pragma implementation "listctrl.h"
     #pragma implementation "listctrlbase.h"
 #endif
 

-#if 0
-    #include "listctrl.old.cpp"
-#else
-

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


@@ -34,17 +37,41 @@
 
 #if wxUSE_LISTCTRL
 
 
 #if wxUSE_LISTCTRL
 

-#include "wx/dcscreen.h"
-#include "wx/app.h"
-#include "wx/listctrl.h"
-#include "wx/generic/imaglist.h"
-#include "wx/dynarray.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+
+    #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
 

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

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


@@ -62,9 +89,15 @@ 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_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
 
 // ----------------------------------------------------------------------------
 // constants


@@ -78,7 +111,7 @@ static const int SCROLL_UNIT_X = 15;
 static const int SCROLL_UNIT_Y = 15;
 
 // the spacing between the lines (in report mode)
 static const int SCROLL_UNIT_Y = 15;
 
 // the spacing between the lines (in report mode)

-static const int LINE_SPACING = 1;
+static const int LINE_SPACING = 0;

 
 // extra margins around the text label
 static const int EXTRA_WIDTH = 3;
 
 // extra margins around the text label
 static const int EXTRA_WIDTH = 3;


@@ -95,6 +128,9 @@ static const int AUTOSIZE_COL_MARGIN = 10;
 static const int WIDTH_COL_DEFAULT = 80;
 static const int WIDTH_COL_MIN = 10;
 
 static const int WIDTH_COL_DEFAULT = 80;
 static const int WIDTH_COL_MIN = 10;
 

+// the space between the image and the text in the report mode
+static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
+

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


@@ -107,7 +143,7 @@ class WXDLLEXPORT wxListItemData
 {
 public:
     wxListItemData(wxListMainWindow *owner);
 {
 public:
     wxListItemData(wxListMainWindow *owner);

-    ~wxListItemData() { delete m_attr; delete m_rect; }
+    ~wxListItemData();

 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }


@@ -142,7 +178,8 @@ public:
 
     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:
     // the item image or -1
 
 public:
     // the item image or -1


@@ -175,16 +212,6 @@ protected:
 
 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 );


@@ -206,8 +233,18 @@ 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();

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


@@ -218,7 +255,7 @@ WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListItemDataList);
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListItemDataList);
 

-class WXDLLEXPORT wxListLineData
+class wxListLineData

 {
 public:
     // the list of subitems: only may have more than one item in report mode
 {
 public:
     // the list of subitems: only may have more than one item in report mode


@@ -237,25 +274,29 @@ public:
         wxRect m_rectIcon;
 
         // the part to be highlighted
         wxRect m_rectIcon;
 
         // the part to be highlighted

-        wxRect m_rectHilight;
+        wxRect m_rectHighlight;

     } *m_gi;
 
     // is this item selected? [NB: not used in virtual mode]
     } *m_gi;
 
     // is this item selected? [NB: not used in virtual mode]

-    bool m_hilighted;
+    bool m_highlighted;

 
     // back pointer to the list ctrl
     wxListMainWindow *m_owner;
 
 public:
 
     // back pointer to the list ctrl
     wxListMainWindow *m_owner;
 
 public:

-    wxListLineData( wxListMainWindow *owner, size_t line );
+    wxListLineData(wxListMainWindow *owner);

 
 

-    ~wxListLineData() { delete m_gi; }
+    ~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?
 
     // are we in report mode?
     inline bool InReportView() const;
 
     // are we in virtual report mode?

-    inline bool IsVirtal() const;
+    inline bool IsVirtual() const;

 
     // these 2 methods shouldn't be called for report view controls, in that
     // case we determine our position/size ourselves
 
     // these 2 methods shouldn't be called for report view controls, in that
     // case we determine our position/size ourselves


@@ -266,7 +307,12 @@ public:
     // remember the position this line appears at
     void SetPosition( int x, int y,  int window_width, int spacing );
 
     // remember the position this line appears at
     void SetPosition( int x, int y,  int window_width, int spacing );
 

-    long IsHit( int x, int y );
+    // wxListCtrl API
+
+    void SetImage( int image ) { SetImage(0, image); }
+    int GetImage() const { return GetImage(0); }
+    bool HasImage() const { return GetImage() != -1; }
+    bool HasText() const { return !GetText(0).empty(); }

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


@@ -274,42 +320,29 @@ public:
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 
     wxString GetText(int index) const;
     void SetText( int index, const wxString s );
 

-    void SetImage( int index, int image );
-    int GetImage( int index ) const;
-
-    // get the bound rect of this line
-    wxRect GetRect() const;
-
-    // get the bound rect of the label
-    wxRect GetLabelRect() const;
-
-    // get the bound rect of the items icon (only may be called if we do have
-    // an icon!)
-    wxRect GetIconRect() const;
-
-    // get the rect to be highlighted when the item has focus
-    wxRect GetHighlightRect() const;
-
-    // get the size of the total line rect
-    wxSize GetSize() const { return GetRect().GetSize(); }
+    wxListItemAttr *GetAttr() const;
+    void SetAttr(wxListItemAttr *attr);

 
     // return true if the highlighting really changed
 
     // return true if the highlighting really changed

-    bool Hilight( bool on );
-
-    void ReverseHilight();
+    bool Highlight( bool on );

 
 

-    // draw the line on the given DC
-    void Draw( wxDC *dc, int y = 0, int height = 0, bool highlighted = FALSE );
+    void ReverseHighlight();

 
 

-    bool IsHilighted() const
+    bool IsHighlighted() const

     {
     {

-        wxASSERT_MSG( !IsVirtal(), _T("unexpected call to IsHilighted") );
+        wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") );

 
 

-        return m_hilighted;
+        return m_highlighted;

     }
 
     }
 

-    // only for wxListMainWindow::CacheLineData()
-    void SetLineIndex(size_t line) { m_lineIndex = line; }
+    // draw the line on the given DC in icon/list mode
+    void Draw( wxDC *dc );
+
+    // the same in report mode
+    void DrawInReportMode( wxDC *dc,
+                           const wxRect& rect,
+                           const wxRect& rectHL,
+                           bool highlighted );

 
 private:
     // set the line to contain num items (only can be > 1 in report mode)
 
 private:
     // set the line to contain num items (only can be > 1 in report mode)


@@ -318,16 +351,21 @@ private:
     // get the mode (i.e. style)  of the list control
     inline int GetMode() const;
 
     // get the mode (i.e. style)  of the list control
     inline int GetMode() const;
 

-    void SetAttributes(wxDC *dc,
+    // prepare the DC for drawing with these item's attributes, return true if
+    // we need to draw the items background to highlight it, false otherwise
+    bool SetAttributes(wxDC *dc,

                        const wxListItemAttr *attr,
                        const wxListItemAttr *attr,

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

 
 

-    // the index of this line (only used in report mode)
-    size_t m_lineIndex;
-};
+    // 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 y, int width);

 
 

+    // these are only used by GetImage/SetImage above, we don't support images
+    // with subitems at the public API level yet
+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
+};

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


@@ -345,7 +383,7 @@ 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_column;
 
     // divider line position in logical (unscrolled) coords


@@ -357,7 +395,6 @@ protected:
 
 public:
     wxListHeaderWindow();
 
 public:
     wxListHeaderWindow();

-    virtual ~wxListHeaderWindow();

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


@@ -365,9 +402,10 @@ 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 AdjustDC(wxDC& dc);
 
     void DrawCurrent();
     void AdjustDC(wxDC& dc);
 


@@ -379,6 +417,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, wxPoint pos);
+

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


@@ -403,27 +448,23 @@ public:
 
 class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
 {
 
 class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
 {

-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" );
+    wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit);
+
+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;
+    wxString            m_startValue;
+    size_t              m_itemEdited;
+    bool                m_finished;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -435,7 +476,7 @@ WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListHeaderDataList);
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListHeaderDataList);
 

-class WXDLLEXPORT wxListMainWindow : public wxScrolledWindow
+class wxListMainWindow : public wxScrolledWindow

 {
 public:
     wxListMainWindow();
 {
 public:
     wxListMainWindow();


@@ -453,34 +494,92 @@ public:
     // return true if this is a virtual list control
     bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 
     // return true if this is a virtual list control
     bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 

+    // return true if the control is in report mode
+    bool InReportView() const { return HasFlag(wxLC_REPORT); }
+
+    // return true if we are in single selection mode, false if multi sel
+    bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); }
+

     // do we have a header window?
     bool HasHeader() const
         { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); }
 
     // do we have a header window?
     bool HasHeader() const
         { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); }
 

-    void HilightAll( bool on );
+    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
 
     // all these functions only do something if the line is currently visible
 
     // change the line "selected" state, return TRUE if it really changed

-    bool HilightLine( size_t line, bool hilight = TRUE);
+    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
 
     // toggle the line state and refresh it

-    void ReverseHilight( size_t line )
-        { HilightLine(line, !IsHilighted(line)); RefreshLine(line); }
+    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 one or several lines at once
     void RefreshLine( size_t line );
     void RefreshLines( size_t lineFrom, size_t lineTo );
 

-    // return true if the line is highlighted
-    bool IsHilighted(size_t line) const;
+    // refresh all selected items
+    void RefreshSelected();
+
+    // refresh all lines below the given one: the difference with
+    // RefreshLines() is that the index here might not be a valid one (happens
+    // when the last line is deleted)
+    void RefreshAfter( size_t lineFrom );
+
+    // the methods which are forwarded to wxListLineData itself in list/icon
+    // modes but are here because the lines don't store their positions in the
+    // report mode
+
+    // get the bound rect for the entire line
+    wxRect GetLineRect(size_t line) const;
+
+    // get the bound rect of the label
+    wxRect GetLineLabelRect(size_t line) const;
+
+    // get the bound rect of the items icon (only may be called if we do have
+    // an icon!)
+    wxRect GetLineIconRect(size_t line) const;
+
+    // get the rect to be highlighted when the item has focus
+    wxRect GetLineHighlightRect(size_t line) const;
+
+    // get the size of the total line rect
+    wxSize GetLineSize(size_t line) const
+        { return GetLineRect(line).GetSize(); }
+
+    // return the hit code for the corresponding position (in this line)
+    long HitTestLine(size_t line, int x, int y) const;
+
+    // bring the selected item into view, scrolling to it if necessary
+    void MoveToItem(size_t item);
+
+    // bring the current item into view
+    void MoveToFocus() { MoveToItem(m_current); }

 
 

+    // start editing the label of the given item

     void EditLabel( long item );
     void EditLabel( long item );

+
+    // suspend/resume redrawing the control
+    void Freeze();
+    void Thaw();
+
+    void SetFocus();
+

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

 
     // called to switch the selection from the current item to newCurrent,
     void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );
 
     // called to switch the selection from the current item to newCurrent,
     void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );


@@ -489,16 +588,15 @@ public:
     void OnKeyDown( wxKeyEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnKeyDown( wxKeyEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );

-    void OnSize( wxSizeEvent &event );

     void OnScroll(wxScrollWinEvent& event) ;
 
     void OnPaint( wxPaintEvent &event );
 
     void DrawImage( int index, wxDC *dc, int x, int y );
     void OnScroll(wxScrollWinEvent& event) ;
 
     void OnPaint( wxPaintEvent &event );
 
     void DrawImage( int index, wxDC *dc, int x, int y );

-    void GetImageSize( int index, int &width, int &height );
-    int GetTextLength( const wxString &s );
+    void GetImageSize( int index, int &width, int &height ) const;
+    int GetTextLength( const wxString &s ) const;

 
 

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

     void SetItemSpacing( int spacing, bool isSmall = FALSE );
     int GetItemSpacing( bool isSmall = FALSE );
 
     void SetItemSpacing( int spacing, bool isSmall = FALSE );
     int GetItemSpacing( bool isSmall = FALSE );
 


@@ -511,20 +609,40 @@ public:
     // returns the sum of the heights of all columns
     int GetHeaderWidth() const;
 
     // returns the sum of the heights of all columns
     int GetHeaderWidth() const;
 

-    int GetCountPerPage() { return m_linesPerPage; }
+    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 );
-    void GetItemRect( long index, wxRect &rect );
-    bool GetItemPosition( long item, wxPoint& pos );
-    int GetSelectedItemCount();
+    int GetItemState( long item, long stateMask ) const;
+    void GetItemRect( long index, wxRect &rect ) const;
+    bool GetItemPosition( long item, wxPoint& pos ) const;
+    int GetSelectedItemCount() const;
+
+    wxString GetItemText(long item) const
+    {
+        wxListItem info;
+        info.m_itemId = item;
+        GetItem( info );
+        return info.m_text;
+    }
+
+    void SetItemText(long item, const wxString& value)
+    {
+        wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
+        info.m_itemId = item;
+        info.m_text = value;
+        SetItem( info );
+    }

 
     // set the scrollbars and update the positions of the items
 
     // set the scrollbars and update the positions of the items

-    void CalculatePositions();
+    void RecalculatePositions(bool noRefresh = FALSE);

 
 

-    long GetNextItem( long item, int geometry, int state );
+    // 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 DeleteItem( long index );
     void DeleteAllItems();
     void DeleteColumn( int col );


@@ -541,6 +659,9 @@ public:
     bool IsEmpty() const { return GetItemCount() == 0; }
     void SetItemCount(long count);
 
     bool IsEmpty() const { return GetItemCount() == 0; }
     void SetItemCount(long count);
 

+    // change the current (== focused) item, send a notification event
+    void ChangeCurrent(size_t current);
+    void ResetCurrent() { ChangeCurrent((size_t)-1); }

     bool HasCurrent() const { return m_current != (size_t)-1; }
 
     // send out a wxListEvent
     bool HasCurrent() const { return m_current != (size_t)-1; }
 
     // send out a wxListEvent


@@ -548,15 +669,23 @@ public:
                      wxEventType command,
                      wxPoint point = wxDefaultPosition );
 
                      wxEventType command,
                      wxPoint point = wxDefaultPosition );
 

-    // called by wxListCtrl when its font changes
-    void OnFontChange() { m_lineHeight = 0; }
+    // override base class virtual to reset m_lineHeight when the font changes
+    virtual bool SetFont(const wxFont& font)
+    {
+        if ( !wxScrolledWindow::SetFont(font) )
+            return FALSE;
+
+        m_lineHeight = 0;
+
+        return TRUE;
+    }

 
     // these are for wxListLineData usage only
 
     // get the backpointer to the list ctrl
 
     // these are for wxListLineData usage only
 
     // get the backpointer to the list ctrl

-    wxListCtrl *GetListCtrl() const
+    wxGenericListCtrl *GetListCtrl() const

     {
     {

-        return wxStaticCast(GetParent(), wxListCtrl);
+        return wxStaticCast(GetParent(), wxGenericListCtrl);

     }
 
     // get the height of all lines (assuming they all do have the same height)
     }
 
     // get the height of all lines (assuming they all do have the same height)


@@ -565,8 +694,15 @@ public:
     // get the y position of the given line (only for report view)
     wxCoord GetLineY(size_t line) const;
 
     // get the y position of the given line (only for report view)
     wxCoord GetLineY(size_t line) const;
 

+    // get the brush to use for the item highlighting
+    wxBrush *GetHighlightBrush() const
+    {
+        return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
+    }
+

 //protected:
 //protected:

-    // the array of all line objects for a non virtual list control
+    // the array of all line objects for a non virtual list control (for the
+    // virtual list control we only ever use m_lines[0])

     wxListLineDataArray  m_lines;
 
     // the list of column objects
     wxListLineDataArray  m_lines;
 
     // the list of column objects


@@ -575,9 +711,6 @@ public:
     // currently focused item or -1
     size_t               m_current;
 
     // currently focused item or -1
     size_t               m_current;
 

-    // the item currently being edited or -1
-    size_t               m_currentEdit;
-

     // the number of lines per page
     int                  m_linesPerPage;
 
     // the number of lines per page
     int                  m_linesPerPage;
 


@@ -589,20 +722,17 @@ public:
     // call
     bool                 m_dirty;
 
     // call
     bool                 m_dirty;
 

-    wxBrush             *m_hilightBrush;
-    wxColour            *m_hilightColour;
+    wxColour            *m_highlightColour;

     int                  m_xScroll,
                          m_yScroll;
     int                  m_xScroll,
                          m_yScroll;

-    wxImageList         *m_small_image_list;
-    wxImageList         *m_normal_image_list;
+    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;
     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;
 
     bool                 m_lastOnSame;
     wxTimer             *m_renameTimer;

-    bool                 m_renameAccept;
-    wxString             m_renameRes;

     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;


@@ -613,15 +743,11 @@ public:
 
 protected:
     // the total count of items in a virtual list control
 
 protected:
     // the total count of items in a virtual list control

-    long m_countVirt;
-
-    // the first and last lines being shown on screen right now (inclusive)
-    size_t m_lineFrom,
-           m_lineTo;
+    size_t m_countVirt;

 
 

-    // the array containing the indices of all selected items, only used in
-    // virtual controls
-    wxArrayInt m_selections;
+    // the object maintaining the items selection state, only used in virtual
+    // controls
+    wxSelectionStore m_selStore;

 
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();


@@ -644,26 +770,35 @@ protected:
         return &m_lines[n];
     }
 
         return &m_lines[n];
     }
 

-    // get the first line: this one is special as we have it even in virtual
-    // list control (it is useful to cache it as we use it for measuring, hit
-    // testing &c)
-    wxListLineData *GetFirstLine() const;
+    // 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);
 
 
     // cache the line data of the n-th line in m_lines[0]
     void CacheLineData(size_t line);
 

-    // update m_lineFrom/To
-    void UpdateShownLinesRange();
+    // get the range of visible lines
+    void GetVisibleLinesRange(size_t *from, size_t *to);
+
+    // force us to recalculate the range of visible lines
+    void ResetVisibleLinesRange() { m_lineFrom = (size_t)-1; }
+
+    // get the colour to be used for drawing the rules
+    wxColour GetRuleColour() const
+    {
+#ifdef __WXMAC__
+        return *wxWHITE;
+#else
+        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
+#endif
+    }

 
 private:
     // initialize the current item if needed
     void UpdateCurrent();
 
 
 private:
     // initialize the current item if needed
     void UpdateCurrent();
 

-    // called when an item is [un]focuded, i.e. becomes [not] current
-    //
-    // currently unused
-    void OnFocusLine( size_t line );
-    void OnUnfocusLine( size_t line );
+    // 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 height of one line using the current font
     wxCoord m_lineHeight;


@@ -671,8 +806,23 @@ private:
     // the total header width or 0 if not calculated yet
     wxCoord m_headerWidth;
 
     // the total header width or 0 if not calculated yet
     wxCoord m_headerWidth;
 

-    DECLARE_DYNAMIC_CLASS(wxListMainWindow);
+    // the first and last lines being shown on screen right now (inclusive),
+    // both may be -1 if they must be calculated so never access them directly:
+    // use GetVisibleLinesRange() above instead
+    size_t m_lineFrom,
+           m_lineTo;
+
+    // the brushes to use for item highlighting when we do/don't have focus
+    wxBrush *m_highlightBrush,
+            *m_highlightUnfocusedBrush;
+
+    // if this is > 0, the control is frozen and doesn't redraw itself
+    size_t m_freezeCount;
+
+    DECLARE_DYNAMIC_CLASS(wxListMainWindow)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+
+    friend class wxGenericListCtrl;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -683,6 +833,18 @@ private:
 //  wxListItemData
 //-----------------------------------------------------------------------------
 
 //  wxListItemData
 //-----------------------------------------------------------------------------
 

+wxListItemData::~wxListItemData()
+{
+    // in the virtual list control the attributes are managed by the main
+    // program, so don't delete them
+    if ( !m_owner->IsVirtual() )
+    {
+        delete m_attr;
+    }
+
+    delete m_rect;
+}
+

 void wxListItemData::Init()
 {
     m_image = -1;
 void wxListItemData::Init()
 {
     m_image = -1;


@@ -697,7 +859,7 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
 
     m_owner = owner;
 
 
     m_owner = owner;
 

-    if ( owner->HasFlag(wxLC_REPORT) )
+    if ( owner->InReportView() )

     {
         m_rect = NULL;
     }
     {
         m_rect = NULL;
     }


@@ -807,12 +969,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;


@@ -820,22 +980,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;

 
 

-    SetWidth(item.m_width);
+    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 )


@@ -854,7 +1025,7 @@ void wxListHeaderData::SetWidth( int w )
     m_width = w;
     if (m_width < 0)
         m_width = WIDTH_COL_DEFAULT;
     m_width = w;
     if (m_width < 0)
         m_width = WIDTH_COL_DEFAULT;

-    if (m_width < WIDTH_COL_MIN)
+    else if (m_width < WIDTH_COL_MIN)

         m_width = WIDTH_COL_MIN;
 }
 
         m_width = WIDTH_COL_MIN;
 }
 


@@ -865,7 +1036,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


@@ -873,7 +1044,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;


@@ -903,7 +1074,7 @@ int wxListHeaderData::GetFormat() const
 
 inline int wxListLineData::GetMode() const
 {
 
 inline int wxListLineData::GetMode() const
 {

-    return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MODE_MASK;
+    return m_owner->GetListCtrl()->GetWindowStyleFlag() & wxLC_MASK_TYPE;

 }
 
 inline bool wxListLineData::InReportView() const
 }
 
 inline bool wxListLineData::InReportView() const


@@ -911,17 +1082,14 @@ inline bool wxListLineData::InReportView() const
     return m_owner->HasFlag(wxLC_REPORT);
 }
 
     return m_owner->HasFlag(wxLC_REPORT);
 }
 

-inline bool wxListLineData::IsVirtal() const
+inline bool wxListLineData::IsVirtual() const

 {
     return m_owner->IsVirtual();
 }
 
 {
     return m_owner->IsVirtual();
 }
 

-wxListLineData::wxListLineData( wxListMainWindow *owner, size_t line )
+wxListLineData::wxListLineData( wxListMainWindow *owner )

 {
     m_owner = owner;
 {
     m_owner = owner;

-    m_items.DeleteContents( TRUE );
-
-    SetLineIndex(line);

 
     if ( InReportView() )
     {
 
     if ( InReportView() )
     {


@@ -932,67 +1100,14 @@ wxListLineData::wxListLineData( wxListMainWindow *owner, size_t line )
         m_gi = new GeometryInfo;
     }
 
         m_gi = new GeometryInfo;
     }
 

-    m_hilighted = FALSE;
+    m_highlighted = FALSE;

 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 
 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 

-wxRect wxListLineData::GetRect() const
-{
-    if ( !InReportView() )
-        return m_gi->m_rectAll;
-
-    wxRect rect;
-    rect.x = HEADER_OFFSET_X;
-    rect.y = m_owner->GetLineY(m_lineIndex);
-    rect.width = m_owner->GetHeaderWidth();
-    rect.height = m_owner->GetLineHeight();
-
-    return rect;
-}
-
-wxRect wxListLineData::GetLabelRect() const
-{
-    if ( !InReportView() )
-        return m_gi->m_rectLabel;
-
-    wxRect rect;
-    rect.x = HEADER_OFFSET_X;
-    rect.y = m_owner->GetLineY(m_lineIndex);
-    rect.width = m_owner->GetColumnWidth(0);
-    rect.height = m_owner->GetLineHeight();
-
-    return rect;
-}
-
-wxRect wxListLineData::GetIconRect() const
-{
-    if ( !InReportView() )
-        return m_gi->m_rectIcon;
-
-    wxRect rect;
-
-    wxListItemDataList::Node *node = m_items.GetFirst();
-    wxCHECK_MSG( node, rect, _T("no subitems at all??") );
-
-    wxListItemData *item = node->GetData();
-    wxASSERT_MSG( item->HasImage(), _T("GetIconRect() called but no image") );
-
-    rect.x = HEADER_OFFSET_X;
-    rect.y = m_owner->GetLineY(m_lineIndex);
-    m_owner->GetImageSize(item->GetImage(), rect.width, rect.height);
-
-    return rect;
-}
-
-wxRect wxListLineData::GetHighlightRect() const
-{
-    return InReportView() ? GetRect() : m_gi->m_rectHilight;
-}
-

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

-    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();

     wxCHECK_RET( node, _T("no subitems at all??") );
 
     wxListItemData *item = node->GetData();
     wxCHECK_RET( node, _T("no subitems at all??") );
 
     wxListItemData *item = node->GetData();


@@ -1044,13 +1159,13 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 
                 if ( item->HasText() )
                 {
 
                 if ( item->HasText() )
                 {

-                    m_gi->m_rectHilight.width = m_gi->m_rectLabel.width;
-                    m_gi->m_rectHilight.height = m_gi->m_rectLabel.height;
+                    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
                 {
                 }
                 else // no text, highlight the icon
                 {

-                    m_gi->m_rectHilight.width = m_gi->m_rectIcon.width;
-                    m_gi->m_rectHilight.height = m_gi->m_rectIcon.height;
+                    m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
+                    m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;

                 }
             }
             break;
                 }
             }
             break;


@@ -1084,8 +1199,8 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                         m_gi->m_rectAll.height = h;
                 }
 
                         m_gi->m_rectAll.height = h;
                 }
 

-                m_gi->m_rectHilight.width = m_gi->m_rectAll.width;
-                m_gi->m_rectHilight.height = m_gi->m_rectAll.height;
+                m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
+                m_gi->m_rectHighlight.height = m_gi->m_rectAll.height;

             }
             break;
 
             }
             break;
 


@@ -1099,10 +1214,10 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 }
 
 void wxListLineData::SetPosition( int x, int y,
 }
 
 void wxListLineData::SetPosition( int x, int y,

-                                  int window_width,
+                                  int WXUNUSED(window_width),

                                   int spacing )
 {
                                   int spacing )
 {

-    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();

     wxCHECK_RET( node, _T("no subitems at all??") );
 
     wxListItemData *item = node->GetData();
     wxCHECK_RET( node, _T("no subitems at all??") );
 
     wxListItemData *item = node->GetData();


@@ -1116,8 +1231,8 @@ void wxListLineData::SetPosition( int x, int y,
 
             if ( item->HasImage() )
             {
 
             if ( item->HasImage() )
             {

-                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4
-                                    + (spacing - m_gi->m_rectIcon.width)/2;
+                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;
             }
 
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
             }
 


@@ -1128,13 +1243,13 @@ void wxListLineData::SetPosition( int x, int y,
                 else
                     m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing/2) - (m_gi->m_rectLabel.width/2);
                 m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height;
                 else
                     m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing/2) - (m_gi->m_rectLabel.width/2);
                 m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height;

-                m_gi->m_rectHilight.x = m_gi->m_rectLabel.x - 2;
-                m_gi->m_rectHilight.y = m_gi->m_rectLabel.y - 2;
+                m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2;
+                m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2;

             }
             else // no text, highlight the icon
             {
             }
             else // no text, highlight the icon
             {

-                m_gi->m_rectHilight.x = m_gi->m_rectIcon.x - 4;
-                m_gi->m_rectHilight.y = m_gi->m_rectIcon.y - 4;
+                m_gi->m_rectHighlight.x = m_gi->m_rectIcon.x - 4;
+                m_gi->m_rectHighlight.y = m_gi->m_rectIcon.y - 4;

             }
             break;
 
             }
             break;
 


@@ -1142,8 +1257,8 @@ void wxListLineData::SetPosition( int x, int y,
             m_gi->m_rectAll.x = x;
             m_gi->m_rectAll.y = y;
 
             m_gi->m_rectAll.x = x;
             m_gi->m_rectAll.y = y;
 

-            m_gi->m_rectHilight.x = m_gi->m_rectAll.x;
-            m_gi->m_rectHilight.y = m_gi->m_rectAll.y;
+            m_gi->m_rectHighlight.x = m_gi->m_rectAll.x;
+            m_gi->m_rectHighlight.y = m_gi->m_rectAll.y;

             m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2;
 
             if (item->HasImage())
             m_gi->m_rectLabel.y = m_gi->m_rectAll.y + 2;
 
             if (item->HasImage())


@@ -1167,25 +1282,6 @@ void wxListLineData::SetPosition( int x, int y,
     }
 }
 
     }
 }
 

-long wxListLineData::IsHit( int x, int y )
-{
-    wxListItemDataList::Node *node = m_items.GetFirst();
-    wxCHECK_MSG( node, 0, _T("no subitems at all??") );
-
-    wxListItemData *item = node->GetData();
-    if ( item->HasImage() && GetIconRect().Inside(x, y) )
-        return wxLIST_HITTEST_ONITEMICON;
-
-    if ( item->HasText() )
-    {
-        wxRect rect = InReportView() ? GetRect() : GetLabelRect();
-        if ( rect.Inside(x, y) )
-            return wxLIST_HITTEST_ONITEMLABEL;
-    }
-
-    return 0;
-}
-

 void wxListLineData::InitItems( int num )
 {
     for (int i = 0; i < num; i++)
 void wxListLineData::InitItems( int num )
 {
     for (int i = 0; i < num; i++)


@@ -1194,7 +1290,7 @@ void wxListLineData::InitItems( int num )
 
 void wxListLineData::SetItem( int index, const wxListItem &info )
 {
 
 void wxListLineData::SetItem( int index, const wxListItem &info )
 {

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

     wxCHECK_RET( node, _T("invalid column index in SetItem") );
 
     wxListItemData *item = node->GetData();
     wxCHECK_RET( node, _T("invalid column index in SetItem") );
 
     wxListItemData *item = node->GetData();


@@ -1203,7 +1299,7 @@ void wxListLineData::SetItem( int index, const wxListItem &info )
 
 void wxListLineData::GetItem( int index, wxListItem &info )
 {
 
 void wxListLineData::GetItem( int index, wxListItem &info )
 {

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

     if (node)
     {
         wxListItemData *item = node->GetData();
     if (node)
     {
         wxListItemData *item = node->GetData();


@@ -1215,7 +1311,7 @@ wxString wxListLineData::GetText(int index) const
 {
     wxString s;
 
 {
     wxString s;
 

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

     if (node)
     {
         wxListItemData *item = node->GetData();
     if (node)
     {
         wxListItemData *item = node->GetData();


@@ -1227,7 +1323,7 @@ wxString wxListLineData::GetText(int index) const
 
 void wxListLineData::SetText( int index, const wxString s )
 {
 
 void wxListLineData::SetText( int index, const wxString s )
 {

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

     if (node)
     {
         wxListItemData *item = node->GetData();
     if (node)
     {
         wxListItemData *item = node->GetData();


@@ -1237,7 +1333,7 @@ void wxListLineData::SetText( int index, const wxString s )
 
 void wxListLineData::SetImage( int index, int image )
 {
 
 void wxListLineData::SetImage( int index, int image )
 {

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

     wxCHECK_RET( node, _T("invalid column index in SetImage()") );
 
     wxListItemData *item = node->GetData();
     wxCHECK_RET( node, _T("invalid column index in SetImage()") );
 
     wxListItemData *item = node->GetData();


@@ -1246,177 +1342,268 @@ void wxListLineData::SetImage( int index, int image )
 
 int wxListLineData::GetImage( int index ) const
 {
 
 int wxListLineData::GetImage( int index ) const
 {

-    wxListItemDataList::Node *node = m_items.Item( index );
+    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();
 }
 
     wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") );
 
     wxListItemData *item = node->GetData();
     return item->GetImage();
 }
 

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

 {
 {

-    // don't use foregroud colour for drawing highlighted items - this might
-    // make them completely invisible (and there is no way to do bit
-    // arithmetics on wxColour, unfortunately)
-    if ( !hilight && attr && attr->HasTextColour() )
-    {
-        dc->SetTextForeground(attr->GetTextColour());
-    }
-    else
-    {
-        dc->SetTextForeground(colText);
-    }
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );

 
 

-    if ( attr && attr->HasFont() )
-    {
-        dc->SetFont(attr->GetFont());
-    }
-    else
-    {
-        dc->SetFont(font);
-    }
+    wxListItemData *item = node->GetData();
+    return item->GetAttr();

 }
 
 }
 

-void wxListLineData::Draw( wxDC *dc, int y, int height, bool hilighted )
+void wxListLineData::SetAttr(wxListItemAttr *attr)

 {
 {

-    wxRect rect = GetRect();
-    m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("invalid column index in SetAttr()") );

 
 

-    if ( !m_owner->IsExposed( rect ) )
-        return;
+    wxListItemData *item = node->GetData();
+    item->SetAttr(attr);
+}

 
 

+bool wxListLineData::SetAttributes(wxDC *dc,
+                                   const wxListItemAttr *attr,
+                                   bool highlighted)
+{

     wxWindow *listctrl = m_owner->GetParent();
 
     wxWindow *listctrl = m_owner->GetParent();
 

-    // use our own flag if we maintain it
-    if ( !m_owner->IsVirtual() )
-        hilighted = m_hilighted;
+    // fg colour

 
 

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

     wxColour colText;
     wxColour colText;

-    if ( hilighted )
+    if ( highlighted )

     {
     {

-        colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
+        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

     }
     else
     {
     }
     else
     {

-        colText = listctrl->GetForegroundColour();
+        if ( attr && attr->HasTextColour() )
+        {
+            colText = attr->GetTextColour();
+        }
+        else
+        {
+            colText = listctrl->GetForegroundColour();
+        }

     }
 
     }
 

-    // default font
-    wxFont font = listctrl->GetFont();
+    dc->SetTextForeground(colText);

 
 

-    // 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 = m_items.GetFirst()->GetData();
-    wxListItemAttr *attr = item->GetAttributes();
-    SetAttributes(dc, attr, colText, font, hilighted);
+    // font
+    wxFont font;
+    if ( attr && attr->HasFont() )
+    {
+        font = attr->GetFont();
+    }
+    else
+    {
+        font = listctrl->GetFont();
+    }

 
 

+    dc->SetFont(font);
+
+    // bg colour

     bool hasBgCol = attr && attr->HasBackgroundColour();
     bool hasBgCol = attr && attr->HasBackgroundColour();

-    if ( hilighted || hasBgCol )
+    if ( highlighted || hasBgCol )

     {
     {

-        if ( hilighted )
+        if ( highlighted )

         {
         {

-            dc->SetBrush( *m_owner->m_hilightBrush );
+            dc->SetBrush( *m_owner->GetHighlightBrush() );

         }
         else
         {
         }
         else
         {

-            if ( hasBgCol )
-                dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-            else
-                dc->SetBrush( * wxWHITE_BRUSH );
+            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));

         }
 
         }
 

-        dc->SetPen( * wxTRANSPARENT_PEN );
-        dc->DrawRectangle( GetHighlightRect() );
+        dc->SetPen( *wxTRANSPARENT_PEN );
+
+        return TRUE;

     }
 
     }
 

-    wxListItemDataList::Node *node = m_items.GetFirst();
+    return FALSE;
+}

 
 

-    if ( GetMode() == wxLC_REPORT)
-    {
-        size_t col = 0;
-        int x = HEADER_OFFSET_X;
+void wxListLineData::Draw( wxDC *dc )
+{
+    wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );

 
 

-        y += EXTRA_HEIGHT / 2;
+    bool highlighted = IsHighlighted();

 
 

-        while ( node )
-        {
-            wxListItemData *item = node->GetData();
+    wxListItemAttr *attr = GetAttr();

 
 

-            int xOld = x;
+    if ( SetAttributes(dc, attr, highlighted) )
+    {
+        dc->DrawRectangle( m_gi->m_rectHighlight );
+    }

 
 

-            if ( item->HasImage() )
-            {
-                int ix, iy;
-                m_owner->DrawImage( item->GetImage(), dc, x, y );
-                m_owner->GetImageSize( item->GetImage(), ix, iy );
-                x += ix + 5; // FIXME: what is "5"?
-            }
+    wxListItemData *item = node->GetData();
+    if (item->HasImage())
+    {
+        wxRect rectIcon = m_gi->m_rectIcon;
+        m_owner->DrawImage( item->GetImage(), dc,
+                            rectIcon.x, rectIcon.y );
+    }

 
 

-            int width = m_owner->GetColumnWidth(col++);
+    if (item->HasText())
+    {
+        wxRect rectLabel = m_gi->m_rectLabel;

 
 

-            dc->SetClippingRegion(x, y, width, height);
+        wxDCClipper clipper(*dc, rectLabel);
+        dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
+    }
+}

 
 

-            if ( item->HasText() )
-            {
-                dc->DrawText( item->GetText(), x, y + 1 );
-            }
+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 );
+    }

 
 

-            dc->DestroyClippingRegion();
+    wxCoord x = rect.x + HEADER_OFFSET_X,
+            y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;

 
 

-            x = xOld + width;
+    size_t col = 0;
+    for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+          node;
+          node = node->GetNext(), col++ )
+    {
+        wxListItemData *item = node->GetData();

 
 

-            node = node->GetNext();
+        int width = m_owner->GetColumnWidth(col);
+        int xOld = x;
+        x += width;
+
+        if ( item->HasImage() )
+        {
+            int ix, iy;
+            m_owner->DrawImage( item->GetImage(), dc, xOld, y );
+            m_owner->GetImageSize( item->GetImage(), ix, iy );
+
+            ix += IMAGE_MARGIN_IN_REPORT_MODE;
+
+            xOld += ix;
+            width -= ix;
+        }
+
+        wxDCClipper clipper(*dc, xOld, y, width - 8, rect.height);
+
+        if ( item->HasText() )
+        {
+            DrawTextFormatted(dc, item->GetText(), col, xOld, y, width - 8);

         }
     }
         }
     }

-    else // !report
+}
+
+void wxListLineData::DrawTextFormatted(wxDC *dc,
+                                       const wxString &text,
+                                       int col,
+                                       int x,
+                                       int y,
+                                       int width)
+{
+    wxString drawntext, ellipsis;
+    wxCoord w, h, base_w;
+    wxListItem item;
+
+    // determine if the string can fit inside the current width
+    dc->GetTextExtent(text, &w, &h);
+    if (w <= width)

     {
     {

-        if (node)
+        // it can, draw it using the items alignment
+        m_owner->GetColumn(col, item);
+        switch ( item.GetAlign() )

         {
         {

-            wxListItemData *item = node->GetData();
-            if (item->HasImage())
-            {
-                wxRect rectIcon = GetIconRect();
-                m_owner->DrawImage( item->GetImage(), dc,
-                                    rectIcon.x, rectIcon.y );
-            }
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                // fall through

 
 

-            if (item->HasText())
-            {
-                wxRect rectLabel = GetLabelRect();
-                dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
-            }
+            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;
+        }
+
+        dc->DrawText(text, x, y);
+    }
+    else // otherwise, truncate and add an ellipsis if possible
+    {
+        // determine the base width
+        ellipsis = wxString(wxT("..."));
+        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();
+        drawntext = text.Left(len);
+        while (len > 1)
+        {
+            dc->GetTextExtent(drawntext.Last(), &w_c, &h_c);
+            drawntext.RemoveLast();
+            len--;
+            w -= w_c;
+            if (w + base_w <= width)
+                break;
+        }
+
+        // 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);

         }
         }

+
+        // now draw the text
+        dc->DrawText(drawntext, x, y);
+        dc->DrawText(ellipsis, x + w, y);

     }
 }
 
     }
 }
 

-bool wxListLineData::Hilight( bool on )
+bool wxListLineData::Highlight( bool on )

 {
 {

-    wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Hilight") );
+    wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Highlight") );

 
 

-    if ( on == m_hilighted )
+    if ( on == m_highlighted )

         return FALSE;
 
         return FALSE;
 

-    m_hilighted = on;
+    m_highlighted = on;

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-void wxListLineData::ReverseHilight( void )
+void wxListLineData::ReverseHighlight( void )

 {
 {

-    Hilight(!IsHilighted());
+    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)


@@ -1424,86 +1611,47 @@ 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_resizeCursor = (wxCursor *) NULL;

     m_isDragging = FALSE;
     m_isDragging = FALSE;

+    m_dirty = FALSE;
+}
+
+wxListHeaderWindow::wxListHeaderWindow()
+{
+    Init();
+
+    m_owner = (wxListMainWindow *) NULL;
+    m_resizeCursor = (wxCursor *) NULL;

 }
 
 }
 

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

 {
 {

+    Init();
+

     m_owner = owner;
     m_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 ) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );

 }
 
 }
 

-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);
-#elif defined( __WXMAC__  )
-    const int m_corner = 1;
-
-    dc->SetBrush( *wxTRANSPARENT_BRUSH );
-
-    dc->SetPen( wxPen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
-    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
-    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
-
-    wxPen pen( wxColour( 0x88 , 0x88 , 0x88 ), 1, wxSOLID );
-
-    dc->SetPen( pen );
-    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
-    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
-
-    dc->SetPen( *wxWHITE_PEN );
-    dc->DrawRectangle( x, y, w-m_corner+1, 1 );   // top (outer)
-    dc->DrawRectangle( x, y, 1, h );              // left (outer)
-    dc->DrawLine( x, y+h-1, x+1, y+h-1 );
-    dc->DrawLine( x+w-1, y, x+w-1, y+1 );
-#else
-    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
 
 // shift the DC origin to match the position of the main window horz
 // scrollbar: this allows us to always use logical coords


@@ -1521,11 +1669,7 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
 
 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 );


@@ -1551,25 +1695,98 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     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
+        int cw = wCol - 2;
+
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(x, HEADER_OFFSET_Y, cw, h - 2),
+                                    m_parent->IsEnabled() ? 0
+                                                          : wxCONTROL_DISABLED
+                                );
+
+        // see if we have enough space for the column label
+
+        // for this we need the width of the text
+        wxCoord wLabel;
+        dc.GetTextExtent(item.GetText(), &wLabel, NULL);
+        wLabel += 2*EXTRA_WIDTH;
+
+        // and the width of the icon, if any
+        static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
+        int ix = 0,     // init them just to suppress the compiler warnings
+            iy = 0;
+        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;
+        }
+
+        // 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, HEADER_OFFSET_Y, cw, h-2 );
-        dc.SetClippingRegion( x, HEADER_OFFSET_Y, cw-5, h-4 );
-        dc.DrawText( item.GetText(), x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
-        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, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+
+        x += wCol;

     }
     }

+

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


@@ -1577,9 +1794,9 @@ void wxListHeaderWindow::DrawCurrent()
 {
     int x1 = m_currentX;
     int y1 = 0;
 {
     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 );


@@ -1608,6 +1825,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 
     if (m_isDragging)
     {
 
     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;
         // we don't draw the line beyond our window, but we allow dragging it
         // there
         int w = 0;


@@ -1625,6 +1844,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             m_isDragging = FALSE;
             m_dirty = TRUE;
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             m_isDragging = FALSE;
             m_dirty = TRUE;
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );

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

         }
         else
         {
         }
         else
         {


@@ -1647,8 +1867,9 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         int xpos = 0;
 
         // find the column where this event occured
         int xpos = 0;
 
         // find the column where this event occured

-        int countCol = m_owner->GetColumnCount();
-        for (int col = 0; col < countCol; col++)
+        int col,
+            countCol = m_owner->GetColumnCount();
+        for (col = 0; col < countCol; col++)

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


@@ -1669,22 +1890,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;
+                    DrawCurrent();
+                    CaptureMouse();
+                }
+                //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())


@@ -1712,6 +1940,23 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     m_owner->SetFocus();
 }
 
     m_owner->SetFocus();
 }
 

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

 //-----------------------------------------------------------------------------
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------


@@ -1730,72 +1975,99 @@ void wxListRenameTimer::Notify()
 // wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 
 // wxListTextCtrl (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)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
     EVT_CHAR           (wxListTextCtrl::OnChar)
     EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)
     EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 

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

     m_owner = owner;
     m_owner = owner;

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

 }
 
 }
 

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

 {
 {

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

     {
     {

-        (*m_accept) = TRUE;
-        (*m_res) = GetValue();
+        wxPendingDelete.Append(this);

 
 

-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+        m_finished = TRUE;

 
 

-        if ((*m_accept) && ((*m_res) != m_startValue))
-            m_owner->OnRenameAccept();
+        m_owner->SetFocus();
+    }
+}

 
 

-        return;
+bool wxListTextCtrl::AcceptChanges()
+{
+    const wxString value = GetValue();
+
+    if ( value == m_startValue )
+    {
+        // nothing changed, always accept
+        return TRUE;

     }
     }

-    if (event.m_keyCode == WXK_ESCAPE)
+
+    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )

     {
     {

-        (*m_accept) = FALSE;
-        (*m_res) = "";
+        // vetoed by the user
+        return FALSE;
+    }

 
 

-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+    // accepted, do rename the item
+    m_owner->SetItemText(m_itemEdited, value);

 
 

-        return;
-    }
+    return TRUE;
+}

 
 

-    event.Skip();
+void wxListTextCtrl::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            if ( !AcceptChanges() )
+            {
+                // vetoed by the user code
+                break;
+            }
+            //else: fall through
+
+        case WXK_ESCAPE:
+            Finish();
+            m_owner->OnRenameCancelled( m_itemEdited );
+            break;
+
+        default:
+            event.Skip();
+    }

 }
 
 void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 {
 }
 
 void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 {

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

     // auto-grow the textctrl:
     wxSize parentSize = m_owner->GetSize();
     wxPoint myPos = GetPosition();
     wxSize mySize = GetSize();
     int sx, sy;
     // auto-grow the textctrl:
     wxSize parentSize = m_owner->GetSize();
     wxPoint myPos = GetPosition();
     wxSize mySize = GetSize();
     int sx, sy;

-    GetTextExtent(GetValue() + _T("MM"), &sx, &sy); // FIXME: MM??
+    GetTextExtent(GetValue() + _T("MM"), &sx, &sy);

     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)


@@ -1805,24 +2077,28 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

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

 {
 {

-    if (!wxPendingDelete.Member(this))
-        wxPendingDelete.Append(this);
-
-    if ((*m_accept) && ((*m_res) != m_startValue))
-        m_owner->OnRenameAccept();
+    if ( !m_finished )
+    {
+        // We must finish regardless of success, otherwise we'll get focus problems
+        Finish();
+    
+        if ( !AcceptChanges() )
+            m_owner->OnRenameCancelled( m_itemEdited );
+    }
+        
+    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)


@@ -1833,18 +2109,17 @@ END_EVENT_TABLE()
 
 void wxListMainWindow::Init()
 {
 
 void wxListMainWindow::Init()
 {

-    m_columns.DeleteContents( TRUE );

     m_dirty = TRUE;
     m_countVirt = 0;
     m_lineFrom =
     m_dirty = TRUE;
     m_countVirt = 0;
     m_lineFrom =

-    m_lineTo = 0;
+    m_lineTo = (size_t)-1;

     m_linesPerPage = 0;
 
     m_headerWidth =
     m_lineHeight = 0;
 
     m_linesPerPage = 0;
 
     m_headerWidth =
     m_lineHeight = 0;
 

-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
+    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;


@@ -1855,12 +2130,12 @@ void wxListMainWindow::Init()
 
     m_lastOnSame = FALSE;
     m_renameTimer = new wxListRenameTimer( this );
 
     m_lastOnSame = FALSE;
     m_renameTimer = new wxListRenameTimer( this );

-    m_renameAccept = FALSE;

 
     m_current =
 
     m_current =

-    m_currentEdit =

     m_lineLastClicked =
     m_lineBeforeLastClicked = (size_t)-1;
     m_lineLastClicked =
     m_lineBeforeLastClicked = (size_t)-1;

+
+    m_freezeCount = 0;

 }
 
 void wxListMainWindow::InitScrolling()
 }
 
 void wxListMainWindow::InitScrolling()


@@ -1881,7 +2156,8 @@ wxListMainWindow::wxListMainWindow()
 {
     Init();
 
 {
     Init();
 

-    m_hilightBrush = (wxBrush *) NULL;
+    m_highlightBrush =
+    m_highlightUnfocusedBrush = (wxBrush *) NULL;

 
     m_xScroll =
     m_yScroll = 0;
 
     m_xScroll =
     m_yScroll = 0;


@@ -1898,30 +2174,49 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

-    m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
+    m_highlightBrush = new wxBrush
+                           (
+                            wxSystemSettings::GetColour
+                            (
+                                wxSYS_COLOUR_HIGHLIGHT
+                            ),
+                            wxSOLID
+                           );
+
+    m_highlightUnfocusedBrush = new wxBrush
+                                    (
+                                       wxSystemSettings::GetColour
+                                       (
+                                           wxSYS_COLOUR_BTNSHADOW
+                                       ),
+                                       wxSOLID
+                                    );
+

     wxSize sz = size;
     sz.y = 25;
 
     InitScrolling();
     SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
 
     wxSize sz = size;
     sz.y = 25;
 
     InitScrolling();
     SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );

 }
 
 wxListMainWindow::~wxListMainWindow()
 {
 }
 
 wxListMainWindow::~wxListMainWindow()
 {

-    DeleteEverything();
+    DoDeleteAllItems();
+    WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

 
 

-    delete m_hilightBrush;
+    delete m_highlightBrush;
+    delete m_highlightUnfocusedBrush;

 
     delete m_renameTimer;
 }
 
 void wxListMainWindow::CacheLineData(size_t line)
 {
 
     delete m_renameTimer;
 }
 
 void wxListMainWindow::CacheLineData(size_t line)
 {

-    wxListCtrl *listctrl = GetListCtrl();
+    wxGenericListCtrl *listctrl = GetListCtrl();

 
 

-    wxListLineData *ld = GetFirstLine();
+    wxListLineData *ld = GetDummyLine();

 
     size_t countCol = GetColumnCount();
     for ( size_t col = 0; col < countCol; col++ )
 
     size_t countCol = GetColumnCount();
     for ( size_t col = 0; col < countCol; col++ )


@@ -1929,30 +2224,44 @@ void wxListMainWindow::CacheLineData(size_t line)
         ld->SetText(col, listctrl->OnGetItemText(line, col));
     }
 
         ld->SetText(col, listctrl->OnGetItemText(line, col));
     }
 

-    ld->SetImage(0, listctrl->OnGetItemImage(line));
-    ld->SetLineIndex(line);
+    ld->SetImage(listctrl->OnGetItemImage(line));
+    ld->SetAttr(listctrl->OnGetItemAttr(line));

 }
 
 }
 

-wxListLineData *wxListMainWindow::GetFirstLine() const
+wxListLineData *wxListMainWindow::GetDummyLine() const

 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
 
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
 

-    if ( m_lines.IsEmpty() )
+    wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
+
+    wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
+
+    // we need to recreate the dummy line if the number of columns in the
+    // control changed as it would have the incorrect number of fields
+    // otherwise
+    if ( !m_lines.IsEmpty() &&
+            m_lines[0].m_items.GetCount() != (size_t)GetColumnCount() )

     {
     {

-        // normal controls are supposed to have something in m_lines
-        // already if it's not empty
-        wxASSERT_MSG( IsVirtual(), _T("logic error") );
+        self->m_lines.Clear();
+    }

 
 

-        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
-        wxListLineData *line = new wxListLineData( self, 0 );
+    if ( m_lines.IsEmpty() )
+    {
+        wxListLineData *line = new wxListLineData(self);

         self->m_lines.Add(line);
         self->m_lines.Add(line);

-    }

 
 

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

 
     return &m_lines[0];
 }
 
 
     return &m_lines[0];
 }
 

+// ----------------------------------------------------------------------------
+// line geometry (report mode only)
+// ----------------------------------------------------------------------------
+

 wxCoord wxListMainWindow::GetLineHeight() const
 {
     wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
 wxCoord wxListMainWindow::GetLineHeight() const
 {
     wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );


@@ -1970,8 +2279,16 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
         if ( y < SCROLL_UNIT_Y )
             y = SCROLL_UNIT_Y;
 
         if ( y < SCROLL_UNIT_Y )
             y = SCROLL_UNIT_Y;

-        y += EXTRA_HEIGHT;

 
 

+        if ( m_small_image_list && m_small_image_list->GetImageCount() )
+        {
+            int iw = 0;
+            int ih = 0;
+            m_small_image_list->GetSize(0, iw, ih);
+            y = wxMax(y, ih);
+        }
+
+        y += EXTRA_HEIGHT;

         self->m_lineHeight = y + LINE_SPACING;
     }
 
         self->m_lineHeight = y + LINE_SPACING;
     }
 


@@ -1985,59 +2302,153 @@ wxCoord wxListMainWindow::GetLineY(size_t line) const
     return LINE_SPACING + line*GetLineHeight();
 }
 
     return LINE_SPACING + line*GetLineHeight();
 }
 

-bool wxListMainWindow::IsHilighted(size_t line) const
+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() )
     {
 {
     if ( IsVirtual() )
     {

-        return m_selections.Index(line) != wxNOT_FOUND;
+        return m_selStore.IsSelected(line);

     }
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     }
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHilighted") );
+        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") );

 
 

-        return ld->IsHilighted();
+        return ld->IsHighlighted();

     }
 }
 
     }
 }
 

-bool wxListMainWindow::HilightLine( size_t line, bool hilight )
+void wxListMainWindow::HighlightLines( size_t lineFrom,
+                                       size_t lineTo,
+                                       bool highlight )

 {
 {

-    bool changed;
-

     if ( IsVirtual() )
     {
     if ( IsVirtual() )
     {

-        changed = FALSE;
-
-        int index = m_selections.Index(line);
-        if ( hilight )
+        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

         {
         {

-            if ( index == wxNOT_FOUND )
+            size_t count = linesChanged.GetCount();
+            for ( size_t n = 0; n < count; n++ )

             {
             {

-                m_selections.Add(line);
-                changed = TRUE;
+                RefreshLine(linesChanged[n]);

             }
         }
             }
         }

-        else // !hilight
+    }
+    else // iterate over all items in non report view
+    {
+        for ( size_t line = lineFrom; line <= lineTo; line++ )

         {
         {

-            if ( index != wxNOT_FOUND )
+            if ( HighlightLine(line, highlight) )

             {
             {

-                m_selections.RemoveAt((size_t)index);
-                changed = TRUE;
+                RefreshLine(line);

             }
         }
     }
             }
         }
     }

+}
+
+bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
+{
+    bool changed;
+
+    if ( IsVirtual() )
+    {
+        changed = m_selStore.SelectItem(line, highlight);
+    }

     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHilighted") );
+        wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") );

 
 

-        changed = ld->Hilight(hilight);
+        changed = ld->Highlight(highlight);

     }
 
     if ( changed )
     {
     }
 
     if ( changed )
     {

-        SendNotify( line, hilight ? wxEVT_COMMAND_LIST_ITEM_SELECTED
-                                  : wxEVT_COMMAND_LIST_ITEM_DESELECTED );
+        SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED
+                                    : wxEVT_COMMAND_LIST_ITEM_DESELECTED );

     }
 
     return changed;
     }
 
     return changed;


@@ -2045,7 +2456,16 @@ bool wxListMainWindow::HilightLine( size_t line, bool hilight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
 
 void wxListMainWindow::RefreshLine( size_t line )
 {

-    wxRect rect = GetLine(line)->GetRect();
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        if ( line < visibleFrom || line > visibleTo )
+            return;
+    }
+
+    wxRect rect = GetLineRect(line);

 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );
 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     RefreshRect( rect );


@@ -2056,18 +2476,23 @@ 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") );
 
     // we suppose that they are ordered by caller
     wxASSERT_MSG( lineFrom <= lineTo, _T("indices in disorder") );
 

+    wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
+

     if ( HasFlag(wxLC_REPORT) )
     {
     if ( HasFlag(wxLC_REPORT) )
     {

-        if ( lineFrom < m_lineFrom )
-            lineFrom = m_lineFrom;
-        if ( lineTo > m_lineTo )
-            lineTo = m_lineTo;
+        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;
 
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
         rect.width = GetClientSize().x;

-        rect.height = GetLineY(lineTo) - rect.y;
+        rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();

 
         CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
         RefreshRect( rect );
 
         CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
         RefreshRect( rect );


@@ -2082,21 +2507,98 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
     }
 }
 
     }
 }
 

+void wxListMainWindow::RefreshAfter( size_t lineFrom )
+{
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        if ( lineFrom < visibleFrom )
+            lineFrom = visibleFrom;
+        else if ( lineFrom > visibleTo )
+            return;
+
+        wxRect rect;
+        rect.x = 0;
+        rect.y = GetLineY(lineFrom);
+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+
+        wxSize size = GetClientSize();
+        rect.width = size.x;
+        // refresh till the bottom of the window
+        rect.height = size.y - rect.y;
+
+        RefreshRect( rect );
+    }
+    else // !report
+    {
+        // TODO: how to do it more efficiently?
+        m_dirty = TRUE;
+    }
+}
+
+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 )
+    {
+        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 );
 
 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 ( m_dirty )
+    if ( IsEmpty() || m_freezeCount )

     {
     {

-        // postpone redrawing until the next OnIdle() call to minimize flicker
+        // nothing to draw or not the moment to draw it

         return;
     }
 
         return;
     }
 

-    if ( IsEmpty() )
+    if ( m_dirty )

     {
     {

-        // empty control. nothing to draw
+        // delay the repainting until we calculate all the items positions

         return;
     }
 
         return;
     }
 


@@ -2111,59 +2613,77 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     if ( HasFlag(wxLC_REPORT) )
     {
 
     if ( HasFlag(wxLC_REPORT) )
     {

-        int lineSpacing = GetLineHeight();
+        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 = m_lineFrom; line <= m_lineTo; line++ )
+        for ( size_t line = visibleFrom; line <= visibleTo; line++ )

         {
         {

-            GetLine(line)->Draw( &dc,
-                                 GetLineY(line),
-                                 lineSpacing,
-                                 IsHilighted(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) )
         {
         }
 
         if ( HasFlag(wxLC_HRULES) )
         {

-#ifdef __WXMAC__
-            wxPen pen(wxWHITE, 1, wxSOLID);
-#else
-            wxPen pen(wxSystemSettings::
-                        GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-#endif
+            wxPen pen(GetRuleColour(), 1, wxSOLID);

             wxSize clientSize = GetClientSize();
 
             wxSize clientSize = GetClientSize();
 

-            for ( size_t i = m_lineFrom; i <= m_lineTo; i++ )
+            // Don't draw the first one
+            for ( size_t i = visibleFrom+1; i <= visibleTo; i++ )

             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );

-                dc.DrawLine(0 - dev_x, i*lineSpacing,
-                            clientSize.x - dev_x, i*lineSpacing);
+                dc.DrawLine(0 - dev_x, i*lineHeight,
+                            clientSize.x - dev_x, i*lineHeight);

             }
 
             // Draw last horizontal rule
             }
 
             // Draw last horizontal rule

-            if ( m_lineTo > m_lineFrom )
+            if ( visibleTo == GetItemCount() - 1 )

             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );

-                dc.DrawLine(0 - dev_x, m_lineTo*lineSpacing,
-                            clientSize.x - dev_x , m_lineTo*lineSpacing );
+                dc.DrawLine(0 - dev_x, (m_lineTo+1)*lineHeight,
+                            clientSize.x - dev_x , (m_lineTo+1)*lineHeight );

             }
         }
 
         // Draw vertical rules if required
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {
             }
         }
 
         // Draw vertical rules if required
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {

-#ifdef __WXMAC__
-            wxPen pen(wxWHITE, 1, wxSOLID);
-#else
-            wxPen pen(wxSystemSettings::
-                        GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-#endif
+            wxPen pen(GetRuleColour(), 1, wxSOLID);

 
             int col = 0;
             wxRect firstItemRect;
             wxRect lastItemRect;
 
             int col = 0;
             wxRect firstItemRect;
             wxRect lastItemRect;

-            GetItemRect(0, firstItemRect);
-            GetItemRect(GetItemCount() - 1, 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);


@@ -2171,8 +2691,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;

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

             }
         }
     }
             }
         }
     }


@@ -2185,56 +2705,42 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

-    if ( HasCurrent() && m_hasFocus )
+    if ( HasCurrent() )

     {
     {

-        wxRect rect;
-
-        if ( IsVirtual() )
-        {
-            // just offset the rect of the first line to position it correctly
-            wxListLineData *line = GetFirstLine();
-            rect = line->GetHighlightRect();
-            rect.y = GetLineY(m_current);
-        }
-        else
+        // don't draw rect outline under Max if we already have the background
+        // color but under other platforms only draw it if we do: it is a bit
+        // silly to draw "focus rect" if we don't have focus!
+#ifdef __WXMAC__
+        if ( !m_hasFocus )
+#else // !__WXMAC__
+        if ( m_hasFocus )
+#endif // __WXMAC__/!__WXMAC__

         {
         {

-            rect = GetLine(m_current)->GetHighlightRect();
+            dc.SetPen( *wxBLACK_PEN );
+            dc.SetBrush( *wxTRANSPARENT_BRUSH );
+            dc.DrawRectangle( GetLineHighlightRect(m_current) );

         }
         }

-#ifdef __WXMAC__
-        // no rect outline, we already have the background color
-#else
-        dc.SetPen( *wxBLACK_PEN );
-        dc.SetBrush( *wxTRANSPARENT_BRUSH );
-        dc.DrawRectangle( rect );
-#endif

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

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

 {
 {

-    bool needsRefresh = FALSE;
-
-    size_t count = GetItemCount();
-    for ( size_t line = 0; line < count; line++ )
+    if ( IsSingleSel() )

     {
     {

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

         {
         {

-            if ( HasFlag(wxLC_REPORT) )
-            {
-                needsRefresh = TRUE;
-            }
-            else
-            {
-                RefreshLine(line);
-            }
+            HighlightLine(m_current, FALSE);
+            RefreshLine(m_current);

         }
     }
         }
     }

-
-    if ( needsRefresh )
+    else // multi sel

     {
     {

-        RefreshLines( 0, count - 1 );
+        HighlightLines(0, GetItemCount() - 1, on);

     }
 }
 
     }
 }
 


@@ -2250,62 +2756,56 @@ void wxListMainWindow::SendNotify( size_t line,
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 
     if ( point != wxDefaultPosition )
         le.m_pointDrag = point;
 

-    GetLine(line)->GetItem( 0, le.m_item );
+    // 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
+

     GetParent()->GetEventHandler()->ProcessEvent( le );
 }
 
     GetParent()->GetEventHandler()->ProcessEvent( le );
 }
 

-void wxListMainWindow::OnFocusLine( size_t WXUNUSED(line) )
+void wxListMainWindow::ChangeCurrent(size_t current)

 {
 {

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

 
 

-void wxListMainWindow::OnUnfocusLine( size_t WXUNUSED(line) )
-{
-//  SendNotify( line, wxEVT_COMMAND_LIST_ITEM_UNFOCUSSED );
+    SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);

 }
 
 void wxListMainWindow::EditLabel( long item )
 {
     wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),
 }
 
 void wxListMainWindow::EditLabel( long item )
 {
     wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),

-                 wxT("wrong index in wxListCtrl::EditLabel()") );
+                 wxT("wrong index in wxGenericListCtrl::EditLabel()") );

 
 

-    m_currentEdit = (size_t)item;
+    size_t itemEdit = (size_t)item;

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

-    wxListLineData *data = GetLine(m_currentEdit);
+    wxListLineData *data = GetLine(itemEdit);

     wxCHECK_RET( data, _T("invalid index in EditLabel()") );
     data->GetItem( 0, le.m_item );
     wxCHECK_RET( data, _T("invalid index in EditLabel()") );
     data->GetItem( 0, le.m_item );

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

         return;
         return;

+    }

 
     // We have to call this here because the label in question might just have
     // been added and no screen update taken place.
 
     // 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)
+    if ( m_dirty )

         wxSafeYield();
 
         wxSafeYield();
 

-    wxClientDC dc(this);
-    PrepareDC( dc );
+    wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit);

 
 

-    wxString s = data->GetText(0);
-    wxRect rectLabel = data->GetLabelRect();
-
-    rectLabel.x = dc.LogicalToDeviceX( rectLabel.x );
-    rectLabel.y = dc.LogicalToDeviceY( rectLabel.y );
-
-    wxListTextCtrl *text = new wxListTextCtrl
-                               (
-                                this, -1,
-                                &m_renameAccept,
-                                &m_renameRes,
-                                this,
-                                s,
-                                wxPoint(rectLabel.x-4,rectLabel.y-4),
-                                wxSize(rectLabel.width+11,rectLabel.height+8)
-                               );

     text->SetFocus();
 }
 
     text->SetFocus();
 }
 


@@ -2316,28 +2816,51 @@ void wxListMainWindow::OnRenameTimer()
     EditLabel( m_current );
 }
 
     EditLabel( m_current );
 }
 

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

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

-    le.m_itemIndex = m_currentEdit;
+    le.m_itemIndex = itemEdit;

 
 

-    wxListLineData *data = GetLine(m_currentEdit);
-    wxCHECK_RET( data, _T("invalid index in OnRenameAccept()") );
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_MSG( data, FALSE, _T("invalid index in OnRenameAccept()") );

 
     data->GetItem( 0, le.m_item );
 
     data->GetItem( 0, le.m_item );

-    le.m_item.m_text = m_renameRes;
-    GetParent()->GetEventHandler()->ProcessEvent( le );
+    le.m_item.m_text = value;
+    return !GetParent()->GetEventHandler()->ProcessEvent( le ) ||
+                le.IsAllowed();
+}

 
 

-    if (!le.IsAllowed()) return;
+#ifdef __VMS__ // Ignore unreacheable code
+# pragma message disable initnotreach
+#endif

 
 

-    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 );
+void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
+{
+    // wxMSW seems not to notify the program about
+    // cancelled label edits.
+    return;
+
+    // let owner know that the edit was cancelled
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    
+    // These only exist for wxTreeCtrl, which should probably be changed
+    // le.m_editCancelled = TRUE;
+    // le.m_label = wxEmptyString;
+    
+    le.SetEventObject( GetParent() );
+    le.m_itemIndex = itemEdit;
+
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
+
+    data->GetItem( 0, le.m_item );
+
+    GetEventHandler()->ProcessEvent( le );

 }
 }

+#ifdef __VMS__
+# pragma message enable initnotreach
+#endif

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


@@ -2359,7 +2882,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     int y = event.GetY();
     CalcUnscrolledPosition( x, y, &x, &y );
 
     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;
 
     size_t count = GetItemCount(),
     long hitResult = 0;
 
     size_t count = GetItemCount(),


@@ -2367,10 +2890,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     if ( HasFlag(wxLC_REPORT) )
     {
 
     if ( HasFlag(wxLC_REPORT) )
     {

-        wxCoord lineHeight = GetLineHeight();
-
-        current = y / lineHeight;
-        hitResult = GetFirstLine()->IsHit( x, y % lineHeight );
+        current = y / GetLineHeight();
+        if ( current < count )
+            hitResult = HitTestLine(current, x, y);

     }
     else // !report
     {
     }
     else // !report
     {


@@ -2378,10 +2900,8 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         //       enumerating all items is still not a way to do it!!
         for ( current = 0; current < count; current++ )
         {
         //       enumerating all items is still not a way to do it!!
         for ( current = 0; current < count; current++ )
         {

-            wxListLineData *line = (wxListLineData *) NULL;
-            line = GetLine(current);
-            hitResult = line->IsHit( x, y );
-            if (hitResult)
+            hitResult = HitTestLine(current, x, y);
+            if ( hitResult )

                 break;
         }
     }
                 break;
         }
     }


@@ -2389,7 +2909,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     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++;
 


@@ -2401,6 +2926,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );

+        le.m_itemIndex = current;

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


@@ -2423,7 +2949,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_renameTimer->Stop();
         m_lastOnSame = FALSE;
 
         m_renameTimer->Stop();
         m_lastOnSame = FALSE;
 

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

         {
             SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
 
         {
             SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
 


@@ -2463,25 +2989,25 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
         size_t oldCurrent = m_current;
 
 
         size_t oldCurrent = m_current;
 

-        if ( HasFlag(wxLC_SINGLE_SEL) ||
-             !(event.ControlDown() || event.ShiftDown()) )
+        if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )

         {
         {

-            m_current = current;
-            HilightAll( FALSE );
+            HighlightAll( FALSE );

 
 

-            ReverseHilight(m_current);
+            ChangeCurrent(current);
+
+            ReverseHighlight(m_current);

         }
         }

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

         {
             if (event.ControlDown())
             {
         {
             if (event.ControlDown())
             {

-                m_current = current;
+                ChangeCurrent(current);

 
 

-                ReverseHilight(m_current);
+                ReverseHighlight(m_current);

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

-                m_current = current;
+                ChangeCurrent(current);

 
                 size_t lineFrom = oldCurrent,
                        lineTo = current;
 
                 size_t lineFrom = oldCurrent,
                        lineTo = current;


@@ -2492,17 +3018,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                     lineFrom = m_current;
                 }
 
                     lineFrom = m_current;
                 }
 

-                bool needsRefresh = FALSE;
-                for ( size_t i = lineFrom; i <= lineTo; i++ )
-                {
-                    if ( HilightLine(i, TRUE) )
-                        needsRefresh = TRUE;
-                }
-
-                if ( needsRefresh )
-                {
-                    RefreshLines(lineFrom, lineTo);
-                }
+                HighlightLines(lineFrom, lineTo);

             }
             else // !ctrl, !shift
             {
             }
             else // !ctrl, !shift
             {


@@ -2514,8 +3030,6 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         if (m_current != oldCurrent)
         {
             RefreshLine( oldCurrent );
         if (m_current != oldCurrent)
         {
             RefreshLine( oldCurrent );

-            OnUnfocusLine( oldCurrent );
-            OnFocusLine( 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


@@ -2523,13 +3037,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
     }
 }
 

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

 {
 {

-    if (!HasCurrent())
+    if ( item == (size_t)-1 )

         return;
 
         return;
 

-    wxListLineData *data = IsVirtual() ? GetFirstLine() : GetLine(m_current);
-    wxRect rect = data->GetRect();
+    wxRect rect = GetLineRect(item);

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


@@ -2539,14 +3052,16 @@ void wxListMainWindow::MoveToFocus()
 
     if ( HasFlag(wxLC_REPORT) )
     {
 
     if ( HasFlag(wxLC_REPORT) )
     {

+        // the next we need the range of lines shown it might be different, so
+        // recalculate it
+        ResetVisibleLinesRange();
+

         if (rect.y < view_y )
             Scroll( -1, rect.y/m_yScroll );
         if (rect.y+rect.height+5 > view_y+client_h)
             Scroll( -1, (rect.y+rect.height-client_h+SCROLL_UNIT_Y)/m_yScroll );
         if (rect.y < view_y )
             Scroll( -1, rect.y/m_yScroll );
         if (rect.y+rect.height+5 > view_y+client_h)
             Scroll( -1, (rect.y+rect.height-client_h+SCROLL_UNIT_Y)/m_yScroll );

-
-        UpdateShownLinesRange();

     }
     }

-    else
+    else // !report

     {
         if (rect.x-view_x < 5)
             Scroll( (rect.x-5)/m_xScroll, -1 );
     {
         if (rect.x-view_x < 5)
             Scroll( (rect.x-5)/m_xScroll, -1 );


@@ -2568,9 +3083,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow
 
     // in single selection we just ignore Shift as we can't select several
     // items anyhow

-    if ( event.ShiftDown() && !HasFlag(wxLC_SINGLE_SEL) )
+    if ( event.ShiftDown() && !IsSingleSel() )

     {
     {

-        m_current = newCurrent;
+        ChangeCurrent(newCurrent);

 
         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )
 
         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )


@@ -2579,33 +3094,25 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
             oldCurrent = m_current;
         }
 
             oldCurrent = m_current;
         }
 

-        bool needsRefresh = FALSE;
-        for ( size_t line = oldCurrent; line <= newCurrent; line++ )
-        {
-            if ( HilightLine( line ) )
-            {
-                needsRefresh = TRUE;
-            }
-        }
-
-        if ( needsRefresh )
-            RefreshLines( oldCurrent, newCurrent );
+        HighlightLines(oldCurrent, newCurrent);

     }
     else // !shift
     {
     }
     else // !shift
     {

-        m_current = newCurrent;
+        // all previously selected items are unselected unless ctrl is held
+        if ( !event.ControlDown() )
+            HighlightAll(FALSE);
+
+        ChangeCurrent(newCurrent);

 
 

-        HilightLine( oldCurrent, FALSE );
+        // refresh the old focus to remove it

         RefreshLine( oldCurrent );
 
         if ( !event.ControlDown() )
         {
         RefreshLine( oldCurrent );
 
         if ( !event.ControlDown() )
         {

-            HilightLine( m_current, TRUE );
+            HighlightLine( m_current, TRUE );

         }
     }
 
         }
     }
 

-    OnUnfocusLine( oldCurrent );
-    OnFocusLine( m_current );

     RefreshLine( m_current );
 
     MoveToFocus();
     RefreshLine( m_current );
 
     MoveToFocus();


@@ -2640,7 +3147,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
         le.m_itemIndex = m_current;
         GetLine(m_current)->GetItem( 0, le.m_item );
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
         le.m_itemIndex = m_current;
         GetLine(m_current)->GetItem( 0, le.m_item );

-        le.m_code = (int)event.KeyCode();
+        le.m_code = event.GetKeyCode();

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


@@ -2657,14 +3164,15 @@ 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 */
     }
 
     /* no item -> nothing to do */


@@ -2674,7 +3182,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         return;
     }
 
         return;
     }
 

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

     {
         case WXK_UP:
             if ( m_current > 0 )
     {
         case WXK_UP:
             if ( m_current > 0 )


@@ -2762,31 +3270,24 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_SPACE:
             break;
 
         case WXK_SPACE:

-            if ( HasFlag(wxLC_SINGLE_SEL) )
+            if ( IsSingleSel() )

             {
             {

-                wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
-                                GetParent()->GetId() );
-                le.SetEventObject( GetParent() );
-                le.m_itemIndex = m_current;
-                GetLine(m_current)->GetItem( 0, le.m_item );
-                GetParent()->GetEventHandler()->ProcessEvent( le );
-            }
-            else
-            {
-                ReverseHilight(m_current);
+                SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+
+                if ( IsHighlighted(m_current) )
+                {
+                    // don't unselect the item in single selection mode
+                    break;
+                }
+                //else: select it in ReverseHighlight() below if unselected

             }
             }

+
+            ReverseHighlight(m_current);

             break;
 
         case WXK_RETURN:
         case WXK_EXECUTE:
             break;
 
         case WXK_RETURN:
         case WXK_EXECUTE:

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

             break;
 
         default:
             break;
 
         default:


@@ -2798,24 +3299,42 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

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

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

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

 
 

-    if ( HasCurrent() )
-        RefreshLine( m_current );
+        RefreshSelected();
+    }

 
 

-    if (!GetParent())
+    if ( !GetParent() )

         return;
 
         return;
 

-#ifdef __WXGTK__
-    g_focusWindow = GetParent();
-#endif
-

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


@@ -2825,8 +3344,7 @@ void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = FALSE;
 
 {
     m_hasFocus = FALSE;
 

-    if ( HasCurrent() )
-        RefreshLine( m_current );
+    RefreshSelected();

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


@@ -2849,7 +3367,7 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
     }
 }
 
     }
 }
 

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

 {
     if ( HasFlag(wxLC_ICON) && m_normal_image_list )
     {
 {
     if ( HasFlag(wxLC_ICON) && m_normal_image_list )
     {


@@ -2874,9 +3392,9 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height )
     }
 }
 
     }
 }
 

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

 {
 {

-    wxClientDC dc( this );
+    wxClientDC dc( wxConstCast(this, wxListMainWindow) );

     dc.SetFont( GetFont() );
 
     wxCoord lw;
     dc.SetFont( GetFont() );
 
     wxCoord lw;


@@ -2885,7 +3403,7 @@ int wxListMainWindow::GetTextLength( const wxString &s )
     return lw + AUTOSIZE_COL_MARGIN;
 }
 
     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;
 


@@ -2907,6 +3425,7 @@ 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

     }
 }
 
     }
 }
 


@@ -2934,7 +3453,7 @@ int wxListMainWindow::GetItemSpacing( bool isSmall )
 
 void wxListMainWindow::SetColumn( int col, wxListItem &item )
 {
 
 void wxListMainWindow::SetColumn( int col, wxListItem &item )
 {

-    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

 
     wxCHECK_RET( node, _T("invalid column index in SetColumn") );
 
 
     wxCHECK_RET( node, _T("invalid column index in SetColumn") );
 


@@ -2963,8 +3482,11 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
                  _T("SetColumnWidth() can only be called in report mode.") );
 
     m_dirty = TRUE;
                  _T("SetColumnWidth() can only be called in report mode.") );
 
     m_dirty = TRUE;

+    wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
+    if ( headerWin )
+        headerWin->m_dirty = TRUE;

 
 

-    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

     wxCHECK_RET( node, _T("no column?") );
 
     wxListHeaderData *column = node->GetData();
     wxCHECK_RET( node, _T("no column?") );
 
     wxListHeaderData *column = node->GetData();


@@ -2992,7 +3514,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
             for ( size_t i = 0; i < count; i++ )
             {
                 wxListLineData *line = GetLine(i);
             for ( size_t i = 0; i < count; i++ )
             {
                 wxListLineData *line = GetLine(i);

-                wxListItemDataList::Node *n = line->m_items.Item( col );
+                wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );

 
                 wxCHECK_RET( n, _T("no subitem?") );
 
 
                 wxCHECK_RET( n, _T("no subitem?") );
 


@@ -3045,7 +3567,7 @@ int wxListMainWindow::GetHeaderWidth() const
 
 void wxListMainWindow::GetColumn( int col, wxListItem &item ) const
 {
 
 void wxListMainWindow::GetColumn( int col, wxListItem &item ) const
 {

-    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

     wxCHECK_RET( node, _T("invalid column index in GetColumn") );
 
     wxListHeaderData *column = node->GetData();
     wxCHECK_RET( node, _T("invalid column index in GetColumn") );
 
     wxListHeaderData *column = node->GetData();


@@ -3054,7 +3576,7 @@ void wxListMainWindow::GetColumn( int col, wxListItem &item ) const
 
 int wxListMainWindow::GetColumnWidth( int col ) const
 {
 
 int wxListMainWindow::GetColumnWidth( int col ) const
 {

-    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

     wxCHECK_MSG( node, 0, _T("invalid column index") );
 
     wxListHeaderData *column = node->GetData();
     wxCHECK_MSG( node, 0, _T("invalid column index") );
 
     wxListHeaderData *column = node->GetData();


@@ -3071,20 +3593,16 @@ void wxListMainWindow::SetItem( wxListItem &item )
     wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
                  _T("invalid item index in SetItem") );
 
     wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
                  _T("invalid item index in SetItem") );
 

-    if ( IsVirtual() )
-    {
-        // just refresh the line to show the new value of the text/image
-        RefreshLine((size_t)id);
-    }
-    else // !virtual
+    if ( !IsVirtual() )

     {
     {

-        m_dirty = TRUE;
-

         wxListLineData *line = GetLine((size_t)id);
         wxListLineData *line = GetLine((size_t)id);

-        if ( HasFlag(wxLC_REPORT) )
-            item.m_width = GetColumnWidth( item.m_col );

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

+
+    // update the item on screen
+    wxRect rectItem;
+    GetItemRect(id, rectItem);
+    RefreshRect(rectItem);

 }
 
 void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
 }
 
 void wxListMainWindow::SetItemState( long litem, long state, long stateMask )


@@ -3093,8 +3611,9 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                   _T("invalid list ctrl item index in SetItem") );
 
     size_t oldCurrent = m_current;
                   _T("invalid list ctrl item index in SetItem") );
 
     size_t oldCurrent = m_current;

-    size_t item = (size_t)litem;    // sdafe because of the check above
+    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 ( state & wxLIST_STATE_FOCUSED )
     if ( stateMask & wxLIST_STATE_FOCUSED )
     {
         if ( state & wxLIST_STATE_FOCUSED )


@@ -3102,13 +3621,15 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
             // don't do anything if this item is already focused
             if ( item != m_current )
             {
             // don't do anything if this item is already focused
             if ( item != m_current )
             {

-                OnUnfocusLine( m_current );
-                m_current = item;
-                OnFocusLine( m_current );
+                ChangeCurrent(item);

 
 

-                if ( HasFlag(wxLC_SINGLE_SEL) && (oldCurrent != (size_t)-1) )
+                if ( oldCurrent != (size_t)-1 )

                 {
                 {

-                    HilightLine(oldCurrent, FALSE);
+                    if ( IsSingleSel() )
+                    {
+                        HighlightLine(oldCurrent, FALSE);
+                    }
+

                     RefreshLine(oldCurrent);
                 }
 
                     RefreshLine(oldCurrent);
                 }
 


@@ -3120,17 +3641,27 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
             // don't do anything if this item is not focused
             if ( item == m_current )
             {
             // don't do anything if this item is not focused
             if ( item == m_current )
             {

-                OnUnfocusLine( m_current );
-                m_current = (size_t)-1;
+                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 ( HasFlag(wxLC_SINGLE_SEL) )
+        if ( IsSingleSel() )

         {
             if ( on )
             {
         {
             if ( on )
             {


@@ -3138,13 +3669,11 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                 // single sel mode
                 if ( m_current != item )
                 {
                 // single sel mode
                 if ( m_current != item )
                 {

-                    OnUnfocusLine( m_current );
-                    m_current = item;
-                    OnFocusLine( m_current );
+                    ChangeCurrent(item);

 
                     if ( oldCurrent != (size_t)-1 )
                     {
 
                     if ( oldCurrent != (size_t)-1 )
                     {

-                        HilightLine( oldCurrent, FALSE );
+                        HighlightLine( oldCurrent, FALSE );

                         RefreshLine( oldCurrent );
                     }
                 }
                         RefreshLine( oldCurrent );
                     }
                 }


@@ -3157,14 +3686,14 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
             }
         }
 
             }
         }
 

-        if ( HilightLine(item, on) )
+        if ( HighlightLine(item, on) )

         {
             RefreshLine(item);
         }
     }
 }
 
         {
             RefreshLine(item);
         }
     }
 }
 

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

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


@@ -3179,14 +3708,14 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
 
     if ( stateMask & wxLIST_STATE_SELECTED )
     {
 
     if ( stateMask & wxLIST_STATE_SELECTED )
     {

-        if ( IsHilighted(item) )
+        if ( IsHighlighted(item) )

             ret |= wxLIST_STATE_SELECTED;
     }
 
     return ret;
 }
 
             ret |= wxLIST_STATE_SELECTED;
     }
 
     return ret;
 }
 

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

 {
     wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
                  _T("invalid item index in GetItem") );
 {
     wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
                  _T("invalid item index in GetItem") );


@@ -3206,22 +3735,26 @@ size_t wxListMainWindow::GetItemCount() const
 
 void wxListMainWindow::SetItemCount(long count)
 {
 
 void wxListMainWindow::SetItemCount(long count)
 {

+    m_selStore.SetItemCount(count);

     m_countVirt = count;
 
     m_countVirt = count;
 

-    Refresh();
+    ResetVisibleLinesRange();
+
+    // scrollbars must be reset
+    m_dirty = TRUE;

 }
 
 }
 

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

 {
     // deal with the quick case first
 {
     // deal with the quick case first

-    if ( HasFlag(wxLC_SINGLE_SEL) )
+    if ( IsSingleSel() )

     {
     {

-        return m_current == (size_t)-1 ? FALSE : IsHilighted(m_current);
+        return HasCurrent() ? IsHighlighted(m_current) : FALSE;

     }
 
     // virtual controls remmebers all its selections itself
     if ( IsVirtual() )
     }
 
     // virtual controls remmebers all its selections itself
     if ( IsVirtual() )

-        return m_selections.GetCount();
+        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...
 
     // TODO: we probably should maintain the number of items selected even for
     //       non virtual controls as enumerating all lines is really slow...


@@ -3229,7 +3762,7 @@ int wxListMainWindow::GetSelectedItemCount()
     size_t count = GetItemCount();
     for ( size_t line = 0; line < count; line++ )
     {
     size_t count = GetItemCount();
     for ( size_t line = 0; line < count; line++ )
     {

-        if ( GetLine(line)->IsHilighted() )
+        if ( GetLine(line)->IsHighlighted() )

             countSel++;
     }
 
             countSel++;
     }
 


@@ -3240,16 +3773,17 @@ int wxListMainWindow::GetSelectedItemCount()
 // item position/size
 // ----------------------------------------------------------------------------
 
 // item position/size
 // ----------------------------------------------------------------------------
 

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

 {
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );
 
 {
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );
 

-    rect = GetLine((size_t)index)->GetRect();
+    rect = GetLineRect((size_t)index);
+

     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
 

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

 {
     wxRect rect;
     GetItemRect(item, rect);
 {
     wxRect rect;
     GetItemRect(item, rect);


@@ -3260,21 +3794,12 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
     return TRUE;
 }
 
     return TRUE;
 }
 

-// ----------------------------------------------------------------------------
-// geometry calculation
-// ----------------------------------------------------------------------------
-
-void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-    // wait for the next OnIdle() with geometry recalculation
-    m_dirty = TRUE;
-}
+// ----------------------------------------------------------------------------
+// geometry calculation
+// ----------------------------------------------------------------------------

 
 

-void wxListMainWindow::CalculatePositions()
+void wxListMainWindow::RecalculatePositions(bool noRefresh)

 {
 {

-    if ( IsEmpty() )
-        return;
-

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


@@ -3286,31 +3811,47 @@ void wxListMainWindow::CalculatePositions()
     else
         iconSpacing = 0;
 
     else
         iconSpacing = 0;
 

+    // Note that we do not call GetClientSize() here but
+    // GetSize() and substract the border size for sunken
+    // borders manually. This is technically incorrect,
+    // but we need to know the client area's size WITHOUT
+    // scrollbars here. Since we don't know if there are
+    // any scrollbars, we use GetSize() instead. Another
+    // solution would be to call SetScrollbars() here to
+    // remove the scrollbars and call GetClientSize() then,
+    // but this might result in flicker and - worse - will
+    // reset the scrollbars to 0 which is not good at all
+    // if you resize a dialog/window, but don't want to
+    // reset the window scrolling. RR.
+    // Furthermore, we actually do NOT subtract the border
+    // width as 2 pixels is just the extra space which we
+    // need around the actual content in the window. Other-
+    // wise the text would e.g. touch the upper border. RR.

     int clientWidth,
         clientHeight;
     int clientWidth,
         clientHeight;

-    GetClientSize( &clientWidth, &clientHeight );
+    GetSize( &clientWidth, &clientHeight );

 
     if ( HasFlag(wxLC_REPORT) )
     {
         // all lines have the same height
 
     if ( HasFlag(wxLC_REPORT) )
     {
         // all lines have the same height

-        int lineSpacing = GetLineHeight();
+        int lineHeight = GetLineHeight();

 
         // scroll one line per step
 
         // scroll one line per step

-        m_yScroll = lineSpacing;
+        m_yScroll = lineHeight;

 
         size_t lineCount = GetItemCount();
 
         size_t lineCount = GetItemCount();

-        int entireHeight = lineCount*lineSpacing + 2*LINE_SPACING;
+        int entireHeight = lineCount*lineHeight + LINE_SPACING;

 
 

-        m_linesPerPage = clientHeight / lineSpacing;
+        m_linesPerPage = clientHeight / lineHeight;
+
+        ResetVisibleLinesRange();

 
         SetScrollbars( m_xScroll, m_yScroll,
 
         SetScrollbars( m_xScroll, m_yScroll,

-                       (GetHeaderWidth() + m_xScroll - 1)/m_xScroll,
+                       GetHeaderWidth() / m_xScroll,

                        (entireHeight + m_yScroll - 1)/m_yScroll,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        TRUE );
                        (entireHeight + m_yScroll - 1)/m_yScroll,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        TRUE );

-
-        UpdateShownLinesRange();

     }
     else // !report
     {
     }
     else // !report
     {


@@ -3318,13 +3859,26 @@ void wxListMainWindow::CalculatePositions()
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
 
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
 

-        clientHeight -= 4;  // sunken frame
-
-        int entireWidth;
+        int entireWidth = 0;

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

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

             int x = 2;
             int y = 2;
             int maxWidth = 0;
             int x = 2;
             int y = 2;
             int maxWidth = 0;


@@ -3337,9 +3891,9 @@ void wxListMainWindow::CalculatePositions()
                 currentlyVisibleLines++;
                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );
                 currentlyVisibleLines++;
                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );

-                line->SetPosition( x, y, clientWidth, iconSpacing );
+                line->SetPosition( x, y, clientWidth, iconSpacing );  // Why clientWidth? (FIXME)

 
 

-                wxSize sizeLine = line->GetSize();
+                wxSize sizeLine = GetLineSize(i);

 
                 if ( maxWidth < sizeLine.x )
                     maxWidth = sizeLine.x;
 
                 if ( maxWidth < sizeLine.x )
                     maxWidth = sizeLine.x;


@@ -3348,8 +3902,8 @@ void wxListMainWindow::CalculatePositions()
                 if (currentlyVisibleLines > m_linesPerPage)
                     m_linesPerPage = currentlyVisibleLines;
 
                 if (currentlyVisibleLines > m_linesPerPage)
                     m_linesPerPage = currentlyVisibleLines;
 

-                // assume that the size of the next one is the same... (FIXME)
-                if ( y + sizeLine.y - 6 >= clientHeight )
+                // Assume that the size of the next one is the same... (FIXME)
+                if ( y + sizeLine.y >= clientHeight )

                 {
                     currentlyVisibleLines = 0;
                     y = 2;
                 {
                     currentlyVisibleLines = 0;
                     y = 2;


@@ -3357,17 +3911,21 @@ void wxListMainWindow::CalculatePositions()
                     entireWidth += maxWidth+6;
                     maxWidth = 0;
                 }
                     entireWidth += maxWidth+6;
                     maxWidth = 0;
                 }

+
+                // We have reached the last item.

                 if ( i == count - 1 )
                     entireWidth += maxWidth;
                 if ( i == count - 1 )
                     entireWidth += maxWidth;

-                if ((tries == 0) && (entireWidth > clientWidth))
+
+                if ( (tries == 0) && (entireWidth+SCROLL_UNIT_X > clientWidth) )

                 {
                 {

-                    clientHeight -= 15; // scrollbar height
+                    clientHeight -= 15; // We guess the scrollbar height. (FIXME)

                     m_linesPerPage = 0;
                     currentlyVisibleLines = 0;
                     break;
                 }
                     m_linesPerPage = 0;
                     currentlyVisibleLines = 0;
                     break;
                 }

+

                 if ( i == count - 1 )
                 if ( i == count - 1 )

-                    tries = 1;  // everything fits, no second try required
+                    tries = 1;  // Everything fits, no second try required.

             }
         }
 
             }
         }
 


@@ -3375,26 +3933,39 @@ void wxListMainWindow::CalculatePositions()
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }
 
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }
 

-    // FIXME: why should we call it from here?
-    UpdateCurrent();
+    if ( !noRefresh )
+    {
+        // FIXME: why should we call it from here?
+        UpdateCurrent();
+
+        RefreshAll();
+    }

 }
 
 }
 

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

 {
 {

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

     {
     {

-        m_current = 0;
+        headerWin->m_dirty = FALSE;
+        headerWin->Refresh();

     }
     }

+}

 
 

-    if ( m_current != (size_t)-1 )
+void wxListMainWindow::UpdateCurrent()
+{
+    if ( !HasCurrent() && !IsEmpty() )

     {
     {

-        OnFocusLine( m_current );
+        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();


@@ -3424,7 +3995,7 @@ long wxListMainWindow::GetNextItem( long item,
         if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) )
             return line;
 
         if ( (state & wxLIST_STATE_FOCUSED) && (line == m_current) )
             return line;
 

-        if ( (state & wxLIST_STATE_SELECTED) && IsHilighted(line) )
+        if ( (state & wxLIST_STATE_SELECTED) && IsHighlighted(line) )

             return line;
     }
 
             return line;
     }
 


@@ -3435,44 +4006,78 @@ long wxListMainWindow::GetNextItem( long item,
 // deleting stuff
 // ----------------------------------------------------------------------------
 
 // deleting stuff
 // ----------------------------------------------------------------------------
 

-void wxListMainWindow::DeleteItem( long index )
+void wxListMainWindow::DeleteItem( long lindex )

 {
     size_t count = GetItemCount();
 
 {
     size_t count = GetItemCount();
 

-    wxCHECK_RET( (index >= 0) && ((size_t)index < count),
+    wxCHECK_RET( (lindex >= 0) && ((size_t)lindex < count),

                  _T("invalid item index in DeleteItem") );
 
                  _T("invalid item index in DeleteItem") );
 

-    m_dirty = TRUE;
+    size_t index = (size_t)lindex;

 
 

-    // select the next item when the selected one is deleted
-    if ( m_current == (size_t)index )
+    // we don't need to adjust the index for the previous items
+    if ( HasCurrent() && m_current >= index )

     {
     {

-        // the last valid index after deleting the item will be count-2
-        if ( ++m_current >= count - 2 )
+        // 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 = count - 2;
+            m_current--;

         }
     }
 
         }
     }
 

-    SendNotify( (size_t)index, wxEVT_COMMAND_LIST_DELETE_ITEM );
+    if ( InReportView() )
+    {
+        ResetVisibleLinesRange();
+    }

 
 

-    if ( !IsVirtual() )
+    if ( IsVirtual() )
+    {
+        m_countVirt--;
+
+        m_selStore.OnItemDelete(index);
+    }
+    else

     {
     {

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

-    wxListHeaderDataList::Node *node = m_columns.Item( col );
+    wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

 
     wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
 
     m_dirty = TRUE;
 
     wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
 
     m_dirty = TRUE;

-    m_columns.DeleteNode( node );
+    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);
+        }
+    }
+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;

 }
 
 }
 

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

 {
     if ( IsEmpty() )
     {
 {
     if ( IsEmpty() )
     {


@@ -3480,8 +4085,7 @@ void wxListMainWindow::DeleteAllItems()
         return;
     }
 
         return;
     }
 

-    m_dirty = TRUE;
-    m_current = (size_t)-1;
+    ResetCurrent();

 
     // to make the deletion of all items faster, we don't send the
     // notifications for each item deletion in this case but only one event
 
     // to make the deletion of all items faster, we don't send the
     // notifications for each item deletion in this case but only one event


@@ -3492,16 +4096,33 @@ void wxListMainWindow::DeleteAllItems()
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
 

+    if ( IsVirtual() )
+    {
+        m_countVirt = 0;
+
+        m_selStore.Clear();
+    }
+
+    if ( InReportView() )
+    {
+        ResetVisibleLinesRange();
+    }
+

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

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

 
 

-    m_selections.Clear();
+    RecalculatePositions();

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

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

 
 

-    m_columns.Clear();
+    DeleteAllItems();

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


@@ -3514,14 +4135,13 @@ void wxListMainWindow::EnsureVisible( long index )
                  _T("invalid index in EnsureVisible") );
 
     // We have to call this here because the label in question might just have
                  _T("invalid index in EnsureVisible") );
 
     // 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();
+    // been added and its position is not known yet
+    if ( m_dirty )
+    {
+        RecalculatePositions(TRUE /* no refresh */);
+    }

 
 

-    size_t oldCurrent = m_current;
-    m_current = (size_t)index;
-    MoveToFocus();
-    m_current = oldCurrent;
+    MoveToItem((size_t)index);

 }
 
 long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
 }
 
 long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )


@@ -3566,14 +4186,26 @@ long wxListMainWindow::HitTest( int x, int y, int &flags )
     CalcUnscrolledPosition( x, y, &x, &y );
 
     size_t count = GetItemCount();
     CalcUnscrolledPosition( x, y, &x, &y );
 
     size_t count = GetItemCount();

-    for (size_t i = 0; i < count; i++)
+
+    if ( HasFlag(wxLC_REPORT) )

     {
     {

-        wxListLineData *line = GetLine(i);
-        long ret = line->IsHit( x, y );
-        if (ret)
+        size_t current = y / GetLineHeight();
+        if ( current < count )

         {
         {

-            flags = (int)ret;
-            return i;
+            flags = HitTestLine(current, x, y);
+            if ( flags )
+                return current;
+        }
+    }
+    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;

         }
     }
 
         }
     }
 


@@ -3598,7 +4230,10 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     int mode = 0;
     if ( HasFlag(wxLC_REPORT) )
 
     int mode = 0;
     if ( HasFlag(wxLC_REPORT) )

+    {

         mode = wxLC_REPORT;
         mode = wxLC_REPORT;

+        ResetVisibleLinesRange();
+    }

     else if ( HasFlag(wxLC_LIST) )
         mode = wxLC_LIST;
     else if ( HasFlag(wxLC_ICON) )
     else if ( HasFlag(wxLC_LIST) )
         mode = wxLC_LIST;
     else if ( HasFlag(wxLC_ICON) )


@@ -3610,11 +4245,17 @@ void wxListMainWindow::InsertItem( wxListItem &item )
         wxFAIL_MSG( _T("unknown mode") );
     }
 
         wxFAIL_MSG( _T("unknown mode") );
     }
 

-    wxListLineData *line = new wxListLineData( this, id );
+    wxListLineData *line = new wxListLineData(this);

 
     line->SetItem( 0, item );
 
     m_lines.Insert( line, id );
 
     line->SetItem( 0, item );
 
     m_lines.Insert( line, id );

+
+    m_dirty = TRUE;
+
+    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 )


@@ -3624,16 +4265,35 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
     {
         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()))
+        bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
+        if ( insert )

         {
         {

-            wxListHeaderDataList::Node *node = m_columns.Item( col );
+            wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );

             m_columns.Insert( node, column );
         }
         else
         {
             m_columns.Append( column );
         }
             m_columns.Insert( node, column );
         }
         else
         {
             m_columns.Append( column );
         }

+
+        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);
+            }
+        }
+
+        // invalidate it as it has to be recalculated
+        m_headerWidth = 0;

     }
 }
 
     }
 }
 


@@ -3670,8 +4330,9 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

-    // update our idea of which lines are shown before scrolling the window
-    UpdateShownLinesRange();
+    // update our idea of which lines are shown when we redraw the window the
+    // next time
+    ResetVisibleLinesRange();

 
     // FIXME
 #if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
 
     // FIXME
 #if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)


@@ -3682,150 +4343,78 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
 
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {

-        wxListCtrl* lc = GetListCtrl();
+        wxGenericListCtrl* lc = GetListCtrl();

         wxCHECK_RET( lc, _T("no listctrl window?") );
 
         wxCHECK_RET( lc, _T("no listctrl window?") );
 

-        lc->m_headerWin->Refresh() ;
-#ifdef __WXMAC__
-        lc->m_headerWin->MacUpdateImmediately() ;
-#endif
+        lc->m_headerWin->Refresh();
+        lc->m_headerWin->Update();

     }
 }
 
     }
 }
 

-void wxListMainWindow::UpdateShownLinesRange()
+int wxListMainWindow::GetCountPerPage() const

 {
 {

-    // only optimize redrawing for the report view using m_lineFrom/To
-    if ( !HasFlag(wxLC_REPORT) )
-        return;
-
-    size_t lineFromOld = m_lineFrom,
-           lineToOld = m_lineTo;
-
-    m_lineFrom = GetScrollPos(wxVERTICAL);
-
-    size_t count = GetItemCount();
-
-    wxASSERT_MSG( m_lineFrom < count, _T("invalid scroll position?") );
-
-    m_lineTo = m_lineFrom + m_linesPerPage - 1;
-    if ( m_lineTo >= count )
-        m_lineTo = count - 1;
-
-    if ( m_lineFrom != lineFromOld || m_lineTo != lineToOld )
+    if ( !m_linesPerPage )

     {
     {

-        m_dirty = TRUE;
+        wxConstCast(this, wxListMainWindow)->
+            m_linesPerPage = GetClientSize().y / GetLineHeight();

     }
     }

-}

 
 

-// -------------------------------------------------------------------------------------
-// wxListItem
-// -------------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-wxListItem::wxListItem()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-
-    m_attr = NULL;
+    return m_linesPerPage;

 }
 
 }
 

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

 {
 {

-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text = _T("");
-
-    ClearAttributes();
-}
+    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") );

 
 

-void wxListItem::ClearAttributes()
-{
-    if (m_attr)
+    if ( m_lineFrom == (size_t)-1 )

     {
     {

-        delete m_attr;
-        m_attr = NULL;
-    }
-}
-
-// -------------------------------------------------------------------------------------
-// wxListEvent
-// -------------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
-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;
-}
+        size_t count = GetItemCount();
+        if ( count )
+        {
+            m_lineFrom = GetScrollPos(wxVERTICAL);

 
 

-void wxListEvent::CopyObject(wxObject& object_dest) const
-{
-    wxListEvent *obj = (wxListEvent *)&object_dest;
+            // this may happen if SetScrollbars() hadn't been called yet
+            if ( m_lineFrom >= count )
+                m_lineFrom = count - 1;

 
 

-    wxNotifyEvent::CopyObject(object_dest);
+            // 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;
+        }
+    }

 
 

-    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;
+    wxASSERT_MSG( IsEmpty() ||
+                  (m_lineFrom <= m_lineTo && m_lineTo < GetItemCount()),
+                  _T("GetVisibleLinesRange() returns incorrect result") );

 
 

-    if ( m_item.HasAttributes() )
-    {
-        obj->m_item.SetTextColour(m_item.GetTextColour());
-    }
+    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_imageListNormal = (wxImageListType *) NULL;
+    m_imageListSmall = (wxImageListType *) NULL;
+    m_imageListState = (wxImageListType *) NULL;

 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =


@@ -3835,7 +4424,7 @@ wxListCtrl::wxListCtrl()
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 

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

 {
     if (m_ownsImageListNormal)
         delete m_imageListNormal;
 {
     if (m_ownsImageListNormal)
         delete m_imageListNormal;


@@ -3845,7 +4434,7 @@ wxListCtrl::~wxListCtrl()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

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

 {
     m_headerWin = new wxListHeaderWindow
                       (
 {
     m_headerWin = new wxListHeaderWindow
                       (


@@ -3856,7 +4445,7 @@ void wxListCtrl::CreateHeaderWindow()
                       );
 }
 
                       );
 }
 

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


@@ -3866,7 +4455,7 @@ bool wxListCtrl::Create(wxWindow *parent,
 {
     m_imageListNormal =
     m_imageListSmall =
 {
     m_imageListNormal =
     m_imageListSmall =

-    m_imageListState = (wxImageList *) NULL;
+    m_imageListState = (wxImageListType *) NULL;

     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = FALSE;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = FALSE;


@@ -3874,7 +4463,7 @@ bool wxListCtrl::Create(wxWindow *parent,
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 

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

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


@@ -3882,16 +4471,16 @@ bool wxListCtrl::Create(wxWindow *parent,
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return FALSE;
 
     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, -1, wxPoint(0,0), size, style );
 

-    if (HasFlag(wxLC_REPORT))
+    if ( HasFlag(wxLC_REPORT) )

     {
         CreateHeaderWindow();
 
     {
         CreateHeaderWindow();
 

-        if (HasFlag(wxLC_NO_HEADER))
+        if ( HasFlag(wxLC_NO_HEADER) )

         {
             // VZ: why do we create it at all then?
             m_headerWin->Show( FALSE );
         {
             // VZ: why do we create it at all then?
             m_headerWin->Show( FALSE );


@@ -3901,21 +4490,17 @@ bool wxListCtrl::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

-    /* handled in OnIdle */
+    wxASSERT_MSG( !(style & wxLC_VIRTUAL),
+                  _T("wxLC_VIRTUAL can't be [un]set") );

 
 

-    if (m_mainWin) m_mainWin->m_dirty = TRUE;
-}
-
-void wxListCtrl::SetSingleStyle( long style, bool add )
-{

     long flag = GetWindowStyle();
 
     if (add)
     {
         if (style & wxLC_MASK_TYPE)
     long flag = GetWindowStyle();
 
     if (add)
     {
         if (style & wxLC_MASK_TYPE)

-            flag &= ~wxLC_MASK_TYPE;
+            flag &= ~(wxLC_MASK_TYPE | wxLC_VIRTUAL);

         if (style & wxLC_MASK_ALIGN)
             flag &= ~wxLC_MASK_ALIGN;
         if (style & wxLC_MASK_SORT)
         if (style & wxLC_MASK_ALIGN)
             flag &= ~wxLC_MASK_ALIGN;
         if (style & wxLC_MASK_SORT)


@@ -3934,89 +4519,88 @@ void wxListCtrl::SetSingleStyle( long style, bool add )
     SetWindowStyleFlag( flag );
 }
 
     SetWindowStyleFlag( flag );
 }
 

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

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

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

 
 

-        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)
                 {
                     CreateHeaderWindow();
             {
                 if (!m_headerWin)
                 {
                     CreateHeaderWindow();

-
-                    if (HasFlag(wxLC_NO_HEADER))
-                        m_headerWin->Show( FALSE );

                 }
                 }

-                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 // !report
-        {
-            if ( m_mainWin->HasHeader() )
-            {
-                m_headerWin->Show( FALSE );
-            }
+
+            ResizeReportView(willHaveHeader);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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


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

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

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


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

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

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


@@ -4088,69 +4665,105 @@ bool wxListCtrl::SetItemData( long item, long data )
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     m_mainWin->GetItemRect( item, rect );
 {
     m_mainWin->GetItemRect( item, rect );

+    if ( m_mainWin->HasHeader() )
+        rect.y += HEADER_HEIGHT + 1;

     return TRUE;
 }
 
     return TRUE;
 }
 

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

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

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

 {
     return 0;
 }
 
 {
     return 0;
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
 {

-    return 0;
+    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)
     {


@@ -4164,10 +4777,10 @@ wxImageList *wxListCtrl::GetImageList(int which) const
     {
         return m_imageListState;
     }
     {
         return m_imageListState;
     }

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

 }
 
 }
 

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

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


@@ -4191,7 +4804,7 @@ void wxListCtrl::SetImageList( wxImageList *imageList, int which )
     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 )


@@ -4202,82 +4815,89 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
         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 );
     return TRUE;
 }
 
 {
     m_mainWin->DeleteItem( item );
     return TRUE;
 }
 

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

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

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

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

-        DeleteColumn(n);
+        DeleteColumn(0);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

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

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

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

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

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

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     m_mainWin->EditLabel( item );
 }
 
 {
     m_mainWin->EditLabel( item );
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -4286,7 +4906,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;


@@ -4295,7 +4915,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;


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

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

 {
 {

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

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

+
+    // if we hadn't had header before and have it now we need to relayout the
+    // window
+    if ( GetColumnCount() == 1 && 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;


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

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

 {
     return 0;
 }
 {
     return 0;
 }


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

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

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

-// OnIdle() handler: this is the place where we redraw the control
+// event handlers

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

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

 {
 {

-    // do it only if needed
-    if ( !m_mainWin->m_dirty )
+    if ( !m_mainWin )

         return;
 
         return;
 

-    int cw = 0;
-    int ch = 0;
+    ResizeReportView(m_mainWin->HasHeader());
+
+    m_mainWin->RecalculatePositions();
+}
+
+void wxGenericListCtrl::ResizeReportView(bool showHeader)
+{
+    int cw, ch;

     GetClientSize( &cw, &ch );
 
     GetClientSize( &cw, &ch );
 

-    if ( m_mainWin->HasHeader() )
+    if ( showHeader )

     {
         m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
         m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );
     {
         m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
         m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );


@@ -4374,24 +5008,24 @@ void wxListCtrl::OnIdle( wxIdleEvent & WXUNUSED(event) )
     {
         m_mainWin->SetSize( 0, 0, cw, ch );
     }
     {
         m_mainWin->SetSize( 0, 0, cw, ch );
     }

+}

 
 

-    m_mainWin->CalculatePositions();
-
-    m_mainWin->m_dirty = FALSE;
-    m_mainWin->Refresh();
+void wxGenericListCtrl::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+    
+    // do it only if needed
+    if ( !m_mainWin->m_dirty )
+        return;

 
 

-    if ( m_headerWin && m_headerWin->m_dirty )
-    {
-        m_headerWin->m_dirty = FALSE;
-        m_headerWin->Refresh();
-    }
+    m_mainWin->RecalculatePositions();

 }
 
 // ----------------------------------------------------------------------------
 // font/colours
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // font/colours
 // ----------------------------------------------------------------------------
 

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

 {
     if (m_mainWin)
     {
 {
     if (m_mainWin)
     {


@@ -4402,7 +5036,7 @@ bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
     return TRUE;
 }
 
     return TRUE;
 }
 

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

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


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

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

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


@@ -4437,9 +5071,6 @@ bool wxListCtrl::SetFont( const wxFont &font )
         m_headerWin->SetFont( font );
     }
 
         m_headerWin->SetFont( font );
     }
 

-    // invalidate it as the font changed
-    m_mainWin->OnFontChange();
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -4449,34 +5080,34 @@ bool wxListCtrl::SetFont( const wxFont &font )
 
 #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();
 }
 
 #endif // wxUSE_DRAG_AND_DROP
 
 {
     return m_mainWin->GetDropTarget();
 }
 
 #endif // wxUSE_DRAG_AND_DROP
 

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

 {
     return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE;
 }
 
 {
     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 );
 {
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );


@@ -4485,7 +5116,7 @@ bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS
 }
 

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

 {
     /* The test in window.cpp fails as we are a composite
        window, so it checks against "this", but not m_mainWin. */
 {
     /* The test in window.cpp fails as we are a composite
        window, so it checks against "this", but not m_mainWin. */


@@ -4497,30 +5128,109 @@ void wxListCtrl::SetFocus()
 // virtual list control support
 // ----------------------------------------------------------------------------
 
 // virtual list control support
 // ----------------------------------------------------------------------------
 

-wxString wxListCtrl::OnGetItemText(long item, long col) const
+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
 {
     // 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("not supposed to be called") );
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemText not supposed to be called") );

 
     return wxEmptyString;
 }
 
 
     return wxEmptyString;
 }
 

-int wxListCtrl::OnGetItemImage(long item) const
+int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const

 {
     // same as above
 {
     // same as above

-    wxFAIL_MSG( _T("not supposed to be called") );
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );

 
     return -1;
 }
 
 
     return -1;
 }
 

-void wxListCtrl::SetItemCount(long count)
+wxListItemAttr *wxGenericListCtrl::OnGetItemAttr(long item) const
+{
+    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+                  _T("invalid item index in OnGetItemAttr()") );
+
+    // no attributes by default
+    return NULL;
+}
+
+void wxGenericListCtrl::SetItemCount(long count)

 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 
     m_mainWin->SetItemCount(count);
 }
 
 {
     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
 
 #endif // wxUSE_LISTCTRL
 

-#endif