typo fixes

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index e625f22269310f93baf1f87cde385e81d52f5dfc..3b9727dd864989005a96761bddb5164fbf3146f9 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -9,38 +9,10 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*

-   FIXME for virtual list controls
+   TODO

 
 

-  +1. clicking on the item with a mouse is awfully slow, what is going on?
-      note that selecting with keyboard seems to be much faster
-   => fixed HighlightAll() - iterating over 1000000 items *is* slow
-
-   2. background colour is wrong?
- */
-
-/*
-   TODO for better virtual list control support:
-
-   1. less dumb line caching, we should cache at least all those visible
-      in the control itself and probably twice as many (we might also need to
-      cache the first one always for geometry calculations?)
-
-  +2. storing selections: we can't use an array to store the selected indices
-      like right now as selecting all in a control with 1000000 items is not
-      doable like this - instead, store selections as collection of individual
-      items and ranges
-
-   => wxSelectionStore
-
-   3. we need to implement searching/sorting somehow
-
-   4. the idea of storing the line index in the line itself is really stupid,
-      we shouldn't need it - but for this we have to get rid of all calles to
-      wxListLineData::GetFoo() and replace them with something like
-        if ( IsVirtual()
-            ... we have it ourselves ...
-        else
-            line->GetFoo();
+   1. we need to implement searching/sorting for virtual controls somehow
+  ?2. when changing selection the lines are refreshed twice

  */
 
 // ============================================================================
  */
 
 // ============================================================================


@@ -65,15 +37,22 @@
 
 #if wxUSE_LISTCTRL
 
 
 #if wxUSE_LISTCTRL
 

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

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/dynarray.h"
+#include "wx/listctrl.h"

 
 

-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
+#if defined(__WXGTK__)
+    #include <gtk/gtk.h>
+    #include "wx/gtk/win_gtk.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -93,9 +72,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


@@ -126,6 +111,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
 // ============================================================================


@@ -136,7 +124,7 @@ static const int WIDTH_COL_MIN = 10;
 
 int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
 
 
 int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
 

-WX_DEFINE_SORTED_EXPORTED_ARRAY(size_t, wxIndexArray);
+WX_DEFINE_SORTED_EXPORTED_ARRAY_LONG(size_t, wxIndexArray);

 
 // this class is used to store the selected items in the virtual list control
 // (but it is not tied to list control and so can be used with other controls
 
 // this class is used to store the selected items in the virtual list control
 // (but it is not tied to list control and so can be used with other controls


@@ -170,7 +158,14 @@ public:
     bool SelectItem(size_t item, bool select = TRUE);
 
     // select the range of items
     bool SelectItem(size_t item, bool select = TRUE);
 
     // select the range of items

-    void SelectRange(size_t itemFrom, size_t itemTo, bool select = TRUE);
+    //
+    // return true and fill the itemsChanged array with the indices of items
+    // which have changed state if "few" of them did, otherwise return false
+    // (meaning that too many items changed state to bother counting them
+    // individually)
+    bool SelectRange(size_t itemFrom, size_t itemTo,
+                     bool select = TRUE,
+                     wxArrayInt *itemsChanged = NULL);

 
     // return true if the given item is selected
     bool IsSelected(size_t item) const;
 
     // return true if the given item is selected
     bool IsSelected(size_t item) const;


@@ -208,7 +203,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; }


@@ -243,7 +238,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


@@ -276,16 +272,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 );


@@ -307,8 +293,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();

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


@@ -348,7 +344,7 @@ public:
     wxListMainWindow *m_owner;
 
 public:
     wxListMainWindow *m_owner;
 
 public:

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

 
     ~wxListLineData() { delete m_gi; }
 
 
     ~wxListLineData() { delete m_gi; }
 


@@ -367,7 +363,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 );


@@ -375,33 +376,14 @@ 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
     bool Highlight( bool on );
 
     void ReverseHighlight();
 
 
     // return true if the highlighting really changed
     bool Highlight( bool on );
 
     void ReverseHighlight();
 

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

     bool IsHighlighted() const
     {
         wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") );
     bool IsHighlighted() const
     {
         wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") );


@@ -409,8 +391,14 @@ public:
         return m_highlighted;
     }
 
         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)


@@ -419,17 +407,18 @@ 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 highlight);
 
                        bool highlight);
 

-    // the index of this line (only used in report mode)
-    size_t m_lineIndex;
+    // these are only used by GetImage/SetImage above, we don't support images
+    // with subitems at the public API level yet
+    void SetImage( int index, int image );
+    int GetImage( int index ) const;

 };
 
 };
 

-

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


@@ -446,7 +435,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


@@ -458,7 +447,6 @@ protected:
 
 public:
     wxListHeaderWindow();
 
 public:
     wxListHeaderWindow();

-    virtual ~wxListHeaderWindow();

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


@@ -468,6 +456,8 @@ public:
                         long style = 0,
                         const wxString &name = "wxlistctrlcolumntitles" );
 
                         long style = 0,
                         const wxString &name = "wxlistctrlcolumntitles" );
 

+    virtual ~wxListHeaderWindow();
+

     void DoDrawRect( wxDC *dc, int x, int y, int w, int h );
     void DrawCurrent();
     void AdjustDC(wxDC& dc);
     void DoDrawRect( wxDC *dc, int x, int y, int w, int h );
     void DrawCurrent();
     void AdjustDC(wxDC& dc);


@@ -480,6 +470,11 @@ public:
     bool m_dirty;
 
 private:
     bool m_dirty;
 
 private:

+    // common part of all ctors
+    void Init();
+
+    void SendListEvent(wxEventType type, wxPoint pos);
+

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


@@ -509,6 +504,7 @@ private:
     wxString           *m_res;
     wxListMainWindow   *m_owner;
     wxString            m_startValue;
     wxString           *m_res;
     wxListMainWindow   *m_owner;
     wxString            m_startValue;

+    bool                m_finished;

 
 public:
     wxListTextCtrl() {}
 
 public:
     wxListTextCtrl() {}


@@ -524,7 +520,7 @@ public:
     void OnKillFocus( wxFocusEvent &event );
 
 private:
     void OnKillFocus( wxFocusEvent &event );
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxListTextCtrl);
+    DECLARE_DYNAMIC_CLASS(wxListTextCtrl)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -554,6 +550,9 @@ 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); }
 
     // return true if we are in single selection mode, false if multi sel
     bool IsSingleSel() const { return HasFlag(wxLC_SINGLE_SEL); }
 


@@ -578,19 +577,64 @@ public:
     void ReverseHighlight( size_t line )
         { HighlightLine(line, !IsHighlighted(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 IsHighlighted(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 OnRenameAccept();
 
     void OnMouse( wxMouseEvent &event );
     void OnRenameTimer();
     void OnRenameAccept();
 
     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 );


@@ -604,8 +648,8 @@ public:
     void OnPaint( wxPaintEvent &event );
 
     void DrawImage( int index, wxDC *dc, int x, int y );
     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 SetItemSpacing( int spacing, bool isSmall = FALSE );
 
     void SetImageList( wxImageList *imageList, int which );
     void SetItemSpacing( int spacing, bool isSmall = FALSE );


@@ -620,7 +664,7 @@ 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 GetItem( wxListItem &item );
 
     void SetItem( wxListItem &item );
     void GetItem( wxListItem &item );


@@ -631,7 +675,7 @@ public:
     int GetSelectedItemCount();
 
     // set the scrollbars and update the positions of the items
     int GetSelectedItemCount();
 
     // set the scrollbars and update the positions of the items

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

 
     // refresh the window and the header
     void RefreshAll();
 
     // refresh the window and the header
     void RefreshAll();


@@ -653,7 +697,9 @@ public:
     bool IsEmpty() const { return GetItemCount() == 0; }
     void SetItemCount(long count);
 
     bool IsEmpty() const { return GetItemCount() == 0; }
     void SetItemCount(long count);
 

-    void ResetCurrent() { m_current = (size_t)-1; }
+    // 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


@@ -686,6 +732,12 @@ 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:
     // the array of all line objects for a non virtual list control
     wxListLineDataArray  m_lines;
 //protected:
     // the array of all line objects for a non virtual list control
     wxListLineDataArray  m_lines;


@@ -710,7 +762,6 @@ public:
     // call
     bool                 m_dirty;
 
     // call
     bool                 m_dirty;
 

-    wxBrush             *m_highlightBrush;

     wxColour            *m_highlightColour;
     int                  m_xScroll,
                          m_yScroll;
     wxColour            *m_highlightColour;
     int                  m_xScroll,
                          m_yScroll;


@@ -780,7 +831,7 @@ protected:
 #ifdef __WXMAC__
         return *wxWHITE;
 #else
 #ifdef __WXMAC__
         return *wxWHITE;
 #else

-        return wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT);
+        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);

 #endif
     }
 
 #endif
     }
 


@@ -788,11 +839,8 @@ private:
     // initialize the current item if needed
     void UpdateCurrent();
 
     // 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;


@@ -806,7 +854,14 @@ private:
     size_t m_lineFrom,
            m_lineTo;
 
     size_t m_lineFrom,
            m_lineTo;
 

-    DECLARE_DYNAMIC_CLASS(wxListMainWindow);
+    // 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()
 };
 


@@ -856,12 +911,19 @@ bool wxSelectionStore::SelectItem(size_t item, bool select)
     return FALSE;
 }
 
     return FALSE;
 }
 

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

 {
 {

+    // 100 is hardcoded but it shouldn't matter much: the important thing is
+    // that we don't refresh everything when really few (e.g. 1 or 2) items
+    // change state
+    static const size_t MANY_ITEMS = 100;
+

     wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
 
     // are we going to have more [un]selected items than the other ones?
     wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
 
     // are we going to have more [un]selected items than the other ones?

-    if ( itemTo - itemFrom > m_count / 2 )
+    if ( itemTo - itemFrom > m_count/2 )

     {
         if ( select != m_defaultState )
         {
     {
         if ( select != m_defaultState )
         {


@@ -888,6 +950,9 @@ void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
                 if ( selOld.Index(item) == wxNOT_FOUND )
                     m_itemsSel.Add(item);
             }
                 if ( selOld.Index(item) == wxNOT_FOUND )
                     m_itemsSel.Add(item);
             }

+
+            // many items (> half) changed state
+            itemsChanged = NULL;

         }
         else // select == m_defaultState
         {
         }
         else // select == m_defaultState
         {


@@ -911,6 +976,19 @@ void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
                 // delete all of them (from end to avoid changing indices)
                 for ( int i = end; i >= (int)start; i-- )
                 {
                 // delete all of them (from end to avoid changing indices)
                 for ( int i = end; i >= (int)start; i-- )
                 {

+                    if ( itemsChanged )
+                    {
+                        if ( itemsChanged->GetCount() > MANY_ITEMS )
+                        {
+                            // stop counting (see comment below)
+                            itemsChanged = NULL;
+                        }
+                        else
+                        {
+                            itemsChanged->Add(m_itemsSel[i]);
+                        }
+                    }
+

                     m_itemsSel.RemoveAt(i);
                 }
             }
                     m_itemsSel.RemoveAt(i);
                 }
             }


@@ -918,12 +996,31 @@ void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
     }
     else // "few" items change state
     {
     }
     else // "few" items change state
     {

+        if ( itemsChanged )
+        {
+            itemsChanged->Empty();
+        }
+

         // just add the items to the selection
         for ( size_t item = itemFrom; item <= itemTo; item++ )
         {
         // just add the items to the selection
         for ( size_t item = itemFrom; item <= itemTo; item++ )
         {

-            SelectItem(item, select);
+            if ( SelectItem(item, select) && itemsChanged )
+            {
+                itemsChanged->Add(item);
+
+                if ( itemsChanged->GetCount() > MANY_ITEMS )
+                {
+                    // stop counting them, we'll just eat gobs of memory
+                    // for nothing at all - faster to refresh everything in
+                    // this case
+                    itemsChanged = NULL;
+                }
+            }

         }
     }
         }
     }

+
+    // we set it to NULL if there are many items changing state
+    return itemsChanged != NULL;

 }
 
 void wxSelectionStore::OnItemDelete(size_t item)
 }
 
 void wxSelectionStore::OnItemDelete(size_t item)


@@ -935,6 +1032,8 @@ void wxSelectionStore::OnItemDelete(size_t item)
     {
         // this item itself was in m_itemsSel, remove it from there
         m_itemsSel.RemoveAt(i);
     {
         // this item itself was in m_itemsSel, remove it from there
         m_itemsSel.RemoveAt(i);

+
+        count--;

     }
 
     // and adjust the index of all which follow it
     }
 
     // and adjust the index of all which follow it


@@ -951,6 +1050,18 @@ void wxSelectionStore::OnItemDelete(size_t item)
 //  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;


@@ -965,7 +1076,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;
     }


@@ -1075,12 +1186,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;


@@ -1088,22 +1197,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 )


@@ -1122,7 +1242,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;
 }
 


@@ -1133,7 +1253,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


@@ -1141,7 +1261,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;


@@ -1184,13 +1304,11 @@ 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_items.DeleteContents( TRUE );
 
 {
     m_owner = owner;
     m_items.DeleteContents( TRUE );
 

-    SetLineIndex(line);
-

     if ( InReportView() )
     {
         m_gi = NULL;
     if ( InReportView() )
     {
         m_gi = NULL;


@@ -1205,59 +1323,6 @@ wxListLineData::wxListLineData( wxListMainWindow *owner, size_t line )
     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_rectHighlight;
-}
-

 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {
     wxListItemDataList::Node *node = m_items.GetFirst();
 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {
     wxListItemDataList::Node *node = m_items.GetFirst();


@@ -1435,25 +1500,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++)


@@ -1521,145 +1567,168 @@ int wxListLineData::GetImage( int index ) const
     return item->GetImage();
 }
 
     return item->GetImage();
 }
 

-void wxListLineData::SetAttributes(wxDC *dc,
-                                   const wxListItemAttr *attr,
-                                   const wxColour& colText,
-                                   const wxFont& font,
-                                   bool highlight)
+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 ( !highlight && attr && attr->HasTextColour() )
-    {
-        dc->SetTextForeground(attr->GetTextColour());
-    }
-    else
-    {
-        dc->SetTextForeground(colText);
-    }
+    wxListItemDataList::Node *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 highlighted )
+void wxListLineData::SetAttr(wxListItemAttr *attr)

 {
 {

-    wxRect rect = GetRect();
-    m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    wxListItemDataList::Node *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() )
-        highlighted = m_highlighted;
+    // 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;
     if ( highlighted )
     {
     wxColour colText;
     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);
+
+    // font
+    wxFont font;
+    if ( attr && attr->HasFont() )
+    {
+        font = attr->GetFont();
+    }
+    else
+    {
+        font = listctrl->GetFont();
+    }

 
 

-    // 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, highlighted);
+    dc->SetFont(font);

 
 

+    // bg colour

     bool hasBgCol = attr && attr->HasBackgroundColour();
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )
         {
     bool hasBgCol = attr && attr->HasBackgroundColour();
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )
         {

-            dc->SetBrush( *m_owner->m_highlightBrush );
+            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;

     }
 
     }
 

+    return FALSE;
+}
+
+void wxListLineData::Draw( wxDC *dc )
+{

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

+    wxCHECK_RET( node, _T("no subitems at all??") );

 
 

-    if ( GetMode() == wxLC_REPORT)
+    bool highlighted = IsHighlighted();
+
+    wxListItemAttr *attr = GetAttr();
+
+    if ( SetAttributes(dc, attr, highlighted) )

     {
     {

-        size_t col = 0;
-        int x = HEADER_OFFSET_X;
+        dc->DrawRectangle( m_gi->m_rectHighlight );
+    }

 
 

-        y += (LINE_SPACING + EXTRA_HEIGHT) / 2;
+    wxListItemData *item = node->GetData();
+    if (item->HasImage())
+    {
+        wxRect rectIcon = m_gi->m_rectIcon;
+        m_owner->DrawImage( item->GetImage(), dc,
+                            rectIcon.x, rectIcon.y );
+    }

 
 

-        while ( node )
-        {
-            wxListItemData *item = node->GetData();
+    if (item->HasText())
+    {
+        wxRect rectLabel = m_gi->m_rectLabel;

 
 

-            int xOld = x;
+        wxDCClipper clipper(*dc, rectLabel);
+        dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
+    }
+}

 
 

-            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"?
-            }
+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 );
+    }

 
 

-            int width = m_owner->GetColumnWidth(col++);
+    wxListItemDataList::Node *node = m_items.GetFirst();
+    wxCHECK_RET( node, _T("no subitems at all??") );

 
 

-            dc->SetClippingRegion(x, y, width, height);
+    size_t col = 0;
+    wxCoord x = rect.x + HEADER_OFFSET_X,
+            y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;

 
 

-            if ( item->HasText() )
-            {
-                dc->DrawText( item->GetText(), x, y + 1 );
-            }
+    while ( node )
+    {
+        wxListItemData *item = node->GetData();

 
 

-            dc->DestroyClippingRegion();
+        int width = m_owner->GetColumnWidth(col++);
+        int xOld = x;
+        x += width;

 
 

-            x = xOld + width;
+        if ( item->HasImage() )
+        {
+            int ix, iy;
+            m_owner->DrawImage( item->GetImage(), dc, xOld, y );
+            m_owner->GetImageSize( item->GetImage(), ix, iy );

 
 

-            node = node->GetNext();
+            ix += IMAGE_MARGIN_IN_REPORT_MODE;
+
+            xOld += ix;
+            width -= ix;

         }
         }

-    }
-    else // !report
-    {
-        if (node)
-        {
-            wxListItemData *item = node->GetData();
-            if (item->HasImage())
-            {
-                wxRect rectIcon = GetIconRect();
-                m_owner->DrawImage( item->GetImage(), dc,
-                                    rectIcon.x, rectIcon.y );
-            }

 
 

-            if (item->HasText())
-            {
-                wxRect rectLabel = GetLabelRect();
-                dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
-            }
+        wxDCClipper clipper(*dc, xOld, y, width, rect.height);
+
+        if ( item->HasText() )
+        {
+            dc->DrawText( item->GetText(), xOld, y );

         }
         }

+
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -1684,7 +1753,7 @@ void wxListLineData::ReverseHighlight( void )
 //  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)


@@ -1692,37 +1761,46 @@ 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;
 }
 
 void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 {
 {
     delete m_resizeCursor;
 }
 
 void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 {

-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)

     GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
                                                : GTK_STATE_INSENSITIVE;
 
     GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
                                                : GTK_STATE_INSENSITIVE;
 


@@ -1730,14 +1808,15 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 
     gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window,
                    state, GTK_SHADOW_OUT,
 
     gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window,
                    state, GTK_SHADOW_OUT,

-                   (GdkRectangle*) NULL, m_wxwindow, "button",
+                   (GdkRectangle*) NULL, m_wxwindow,
+                   (char *)"button", // const_cast

                    x-1, y-1, w+2, h+2);
 #elif defined( __WXMAC__  )
     const int m_corner = 1;
 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
 
                    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->SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );

     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 


@@ -1761,7 +1840,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 
     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 );
+    wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );

 
     dc->SetPen( pen );
     dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
 
     dc->SetPen( pen );
     dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)


@@ -1791,7 +1870,7 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

-#ifdef __WXGTK__
+#if defined(__WXGTK__)

     wxClientDC dc( this );
 #else
     wxPaintDC dc( this );
     wxClientDC dc( this );
 #else
     wxPaintDC dc( this );


@@ -1821,25 +1900,53 @@ 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;

 
         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );
 
         dc.SetPen( *wxWHITE_PEN );
 
         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;

 
 

-        if (xEnd > w+5)
-            break;
+        // if we have an image, draw it on the right of the label
+        int image = item.m_image;
+        if ( image != -1 )
+        {
+            wxImageList *imageList = m_owner->m_small_image_list;
+            if ( imageList )
+            {
+                int ix, iy;
+                imageList->GetSize(image, ix, iy);
+
+                imageList->Draw
+                           (
+                            image,
+                            dc,
+                            x + cw - ix - 1,
+                            HEADER_OFFSET_Y + (h - 4 - iy)/2,
+                            wxIMAGELIST_DRAW_TRANSPARENT
+                           );
+
+                cw -= ix + 2;
+            }
+            //else: ignore the column image
+        }
+
+        // draw the text clipping it so that it doesn't overwrite the column
+        // boundary
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+
+        dc.DrawText( item.GetText(),
+                     x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+
+        x += wCol;

     }
     }

+

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


@@ -1847,9 +1954,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 );


@@ -1878,6 +1985,9 @@ 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;


@@ -1895,6 +2005,8 @@ 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
         {


@@ -1917,8 +2029,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;


@@ -1939,22 +2052,26 @@ 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();
             {
                 m_isDragging = TRUE;
                 m_currentX = x;
                 DrawCurrent();
                 CaptureMouse();

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

             }
             }

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


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

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

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


@@ -2000,7 +2134,7 @@ void wxListRenameTimer::Notify()
 // wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 
 // wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl);
+IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl)

 
 BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
     EVT_CHAR           (wxListTextCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
     EVT_CHAR           (wxListTextCtrl::OnChar)


@@ -2027,6 +2161,7 @@ wxListTextCtrl::wxListTextCtrl( wxWindow *parent,
     (*m_accept) = FALSE;
     (*m_res) = "";
     m_startValue = value;
     (*m_accept) = FALSE;
     (*m_res) = "";
     m_startValue = value;

+    m_finished = FALSE;

 }
 
 void wxListTextCtrl::OnChar( wxKeyEvent &event )
 }
 
 void wxListTextCtrl::OnChar( wxKeyEvent &event )


@@ -2039,9 +2174,12 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
         if (!wxPendingDelete.Member(this))
             wxPendingDelete.Append(this);
 
         if (!wxPendingDelete.Member(this))
             wxPendingDelete.Append(this);
 

-        if ((*m_accept) && ((*m_res) != m_startValue))
+        if ((*m_res) != m_startValue)

             m_owner->OnRenameAccept();
 
             m_owner->OnRenameAccept();
 

+        m_finished = TRUE;
+        m_owner->SetFocus();
+

         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)
         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)


@@ -2052,6 +2190,9 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
         if (!wxPendingDelete.Member(this))
             wxPendingDelete.Append(this);
 
         if (!wxPendingDelete.Member(this))
             wxPendingDelete.Append(this);
 

+        m_finished = TRUE;
+        m_owner->SetFocus();
+

         return;
     }
 
         return;
     }
 


@@ -2060,12 +2201,18 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
 
 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)


@@ -2075,12 +2222,21 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

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

 {
 {

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

     if (!wxPendingDelete.Member(this))
         wxPendingDelete.Append(this);
 
     if (!wxPendingDelete.Member(this))
         wxPendingDelete.Append(this);
 

-    if ((*m_accept) && ((*m_res) != m_startValue))
+    (*m_accept) = TRUE;
+    (*m_res) = GetValue();
+
+    if ((*m_res) != m_startValue)

         m_owner->OnRenameAccept();
 }
 
         m_owner->OnRenameAccept();
 }
 


@@ -2088,7 +2244,7 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 //  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)


@@ -2130,6 +2286,8 @@ void wxListMainWindow::Init()
     m_currentEdit =
     m_lineLastClicked =
     m_lineBeforeLastClicked = (size_t)-1;
     m_currentEdit =
     m_lineLastClicked =
     m_lineBeforeLastClicked = (size_t)-1;

+
+    m_freezeCount = 0;

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


@@ -2150,7 +2308,8 @@ wxListMainWindow::wxListMainWindow()
 {
     Init();
 
 {
     Init();
 

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

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


@@ -2167,21 +2326,39 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

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

 
     delete m_highlightBrush;
 
     delete m_highlightBrush;

+    delete m_highlightUnfocusedBrush;

 
     delete m_renameTimer;
 }
 
     delete m_renameTimer;
 }


@@ -2198,8 +2375,8 @@ 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::GetDummyLine() const
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const


@@ -2213,15 +2390,17 @@ wxListLineData *wxListMainWindow::GetDummyLine() const
         wxASSERT_MSG( IsVirtual(), _T("logic error") );
 
         wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
         wxASSERT_MSG( IsVirtual(), _T("logic error") );
 
         wxListMainWindow *self = wxConstCast(this, wxListMainWindow);

-        wxListLineData *line = new wxListLineData( self, 0 );
+        wxListLineData *line = new wxListLineData(self);

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

-    m_lines[0].SetLineIndex(0);
-

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


@@ -2254,6 +2433,84 @@ wxCoord wxListMainWindow::GetLineY(size_t line) const
     return LINE_SPACING + line*GetLineHeight();
 }
 
     return LINE_SPACING + line*GetLineHeight();
 }
 

+wxRect wxListMainWindow::GetLineRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectAll;
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetHeaderWidth();
+    rect.height = GetLineHeight();
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectLabel;
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    rect.width = GetColumnWidth(0);
+    rect.height = GetLineHeight();
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineIconRect(size_t line) const
+{
+    if ( !InReportView() )
+        return GetLine(line)->m_gi->m_rectIcon;
+
+    wxListLineData *ld = GetLine(line);
+    wxASSERT_MSG( ld->HasImage(), _T("should have an image") );
+
+    wxRect rect;
+    rect.x = HEADER_OFFSET_X;
+    rect.y = GetLineY(line);
+    GetImageSize(ld->GetImage(), rect.width, rect.height);
+
+    return rect;
+}
+
+wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const
+{
+    return InReportView() ? GetLineRect(line)
+                          : GetLine(line)->m_gi->m_rectHighlight;
+}
+
+long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
+{
+    wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") );
+
+    wxListLineData *ld = GetLine(line);
+
+    if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
+        return wxLIST_HITTEST_ONITEMICON;
+
+    // VS: Testing for "ld->HasText() || InReportView()" instead of
+    //     "ld->HasText()" is needed to make empty lines in report view
+    //     possible
+    if ( ld->HasText() || InReportView() )
+    {
+        wxRect rect = InReportView() ? GetLineRect(line)
+                                     : GetLineLabelRect(line);
+
+        if ( rect.Inside(x, y) )
+            return wxLIST_HITTEST_ONITEMLABEL;
+    }
+
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// highlight (selection) handling
+// ----------------------------------------------------------------------------
+

 bool wxListMainWindow::IsHighlighted(size_t line) const
 {
     if ( IsVirtual() )
 bool wxListMainWindow::IsHighlighted(size_t line) const
 {
     if ( IsVirtual() )


@@ -2269,25 +2526,37 @@ bool wxListMainWindow::IsHighlighted(size_t line) const
     }
 }
 
     }
 }
 

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

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

-        m_selStore.SelectRange(lineFrom, lineTo, highlight);
-        RefreshLines(lineFrom, lineTo);
+        wxArrayInt linesChanged;
+        if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight,
+                                     &linesChanged) )
+        {
+            // meny items changed state, refresh everything
+            RefreshLines(lineFrom, lineTo);
+        }
+        else // only a few items changed state, refresh only them
+        {
+            size_t count = linesChanged.GetCount();
+            for ( size_t n = 0; n < count; n++ )
+            {
+                RefreshLine(linesChanged[n]);
+            }
+        }

     }
     }

-    else
+    else // iterate over all items in non report view

     {
     {

-        // do it the dumb way
-        bool needsRefresh = FALSE;

         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )

-                needsRefresh = TRUE;
+            {
+                RefreshLine(line);
+            }

         }
         }

-
-        if ( needsRefresh )
-            RefreshLines(lineFrom, lineTo);

     }
 }
 
     }
 }
 


@@ -2302,7 +2571,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

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

 
         changed = ld->Highlight(highlight);
     }
 
         changed = ld->Highlight(highlight);
     }


@@ -2310,7 +2579,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
     if ( changed )
     {
         SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED
     if ( changed )
     {
         SendNotify( line, highlight ? wxEVT_COMMAND_LIST_ITEM_SELECTED

-                                  : wxEVT_COMMAND_LIST_ITEM_DESELECTED );
+                                    : wxEVT_COMMAND_LIST_ITEM_DESELECTED );

     }
 
     return changed;
     }
 
     return changed;


@@ -2318,7 +2587,16 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 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 );


@@ -2329,6 +2607,8 @@ 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) )
     {
         size_t visibleFrom, visibleTo;
     if ( HasFlag(wxLC_REPORT) )
     {
         size_t visibleFrom, visibleTo;


@@ -2343,7 +2623,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
         rect.width = GetClientSize().x;
         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 );


@@ -2358,15 +2638,96 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
     }
 }
 
     }
 }
 

+void wxListMainWindow::RefreshAfter( size_t lineFrom )
+{
+    if ( HasFlag(wxLC_REPORT) )
+    {
+        size_t visibleFrom;
+        GetVisibleLinesRange(&visibleFrom, NULL);
+
+        if ( lineFrom < visibleFrom )
+            lineFrom = visibleFrom;
+
+        wxRect rect;
+        rect.x = 0;
+        rect.y = GetLineY(lineFrom);
+
+        wxSize size = GetClientSize();
+        rect.width = size.x;
+        // refresh till the bottom of the window
+        rect.height = size.y - rect.y;
+
+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &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 ( IsEmpty() )
+    if ( IsEmpty() || m_freezeCount )
+    {
+        // nothing to draw or not the moment to draw it
+        return;
+    }
+
+    if ( m_dirty )

     {
     {

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

         return;
     }
 
         return;
     }
 


@@ -2385,12 +2746,37 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
 
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);

+
+        wxRect rectLine;
+        wxCoord xOrig, yOrig;
+        CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
+
+        // tell the caller cache to cache the data
+        if ( IsVirtual() )
+        {
+            wxListEvent evCache(wxEVT_COMMAND_LIST_CACHE_HINT,
+                                GetParent()->GetId());
+            evCache.SetEventObject( GetParent() );
+            evCache.m_oldItemIndex = visibleFrom;
+            evCache.m_itemIndex = visibleTo;
+            GetParent()->GetEventHandler()->ProcessEvent( evCache );
+        }
+

         for ( size_t line = visibleFrom; line <= visibleTo; line++ )
         {
         for ( size_t line = visibleFrom; line <= visibleTo; line++ )
         {

-            GetLine(line)->Draw( &dc,
-                                 GetLineY(line),
-                                 lineHeight,
-                                 IsHighlighted(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) )


@@ -2447,28 +2833,21 @@ 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 = GetDummyLine();
-            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();


@@ -2505,18 +2884,28 @@ 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 )
 }
 
 void wxListMainWindow::EditLabel( long item )


@@ -2542,14 +2931,10 @@ void wxListMainWindow::EditLabel( long item )
     if (m_dirty)
         wxSafeYield();
 
     if (m_dirty)
         wxSafeYield();
 

-    wxClientDC dc(this);
-    PrepareDC( dc );
-

     wxString s = data->GetText(0);
     wxString s = data->GetText(0);

-    wxRect rectLabel = data->GetLabelRect();
+    wxRect rectLabel = GetLineLabelRect(m_currentEdit);

 
 

-    rectLabel.x = dc.LogicalToDeviceX( rectLabel.x );
-    rectLabel.y = dc.LogicalToDeviceY( rectLabel.y );
+    CalcScrolledPosition(rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y);

 
     wxListTextCtrl *text = new wxListTextCtrl
                                (
 
     wxListTextCtrl *text = new wxListTextCtrl
                                (


@@ -2614,7 +2999,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(),


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

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

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


@@ -2633,10 +3017,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;
         }
     }


@@ -2644,7 +3026,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++;
 


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

+#ifdef __WXGTK__
+        // FIXME: wxGTK generates bad sequence of events prior to doubleclick
+        //        ("down, up, down, double, up" while other ports
+        //        do "down, up, double, up"). We have to have this hack
+        //        in place till somebody fixes wxGTK...

         if ( current == m_lineBeforeLastClicked )
         if ( current == m_lineBeforeLastClicked )

+#else
+        if ( current == m_lineLastClicked )
+#endif

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


@@ -2721,7 +3116,8 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )
         {
             HighlightAll( FALSE );
         if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )
         {
             HighlightAll( FALSE );

-            m_current = current;
+
+            ChangeCurrent(current);

 
             ReverseHighlight(m_current);
         }
 
             ReverseHighlight(m_current);
         }


@@ -2729,13 +3125,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         {
             if (event.ControlDown())
             {
         {
             if (event.ControlDown())
             {

-                m_current = current;
+                ChangeCurrent(current);

 
                 ReverseHighlight(m_current);
             }
             else if (event.ShiftDown())
             {
 
                 ReverseHighlight(m_current);
             }
             else if (event.ShiftDown())
             {

-                m_current = current;
+                ChangeCurrent(current);

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


@@ -2758,8 +3154,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


@@ -2767,24 +3161,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
     }
 }
 

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

 {
 {

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

         return;
 
         return;
 

-    wxRect rect;
-
-    if ( IsVirtual() )
-    {
-        // just offset the rect of the first line to position it correctly
-        wxListLineData *line = GetDummyLine();
-        rect = line->GetRect();
-        rect.y = GetLineY(m_current);
-    }
-    else
-    {
-        rect = GetLine(m_current)->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 );


@@ -2827,7 +3209,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     // items anyhow
     if ( event.ShiftDown() && !IsSingleSel() )
     {
     // items anyhow
     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 )


@@ -2844,7 +3226,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
         if ( !event.ControlDown() )
             HighlightAll(FALSE);
 
         if ( !event.ControlDown() )
             HighlightAll(FALSE);
 

-        m_current = newCurrent;
+        ChangeCurrent(newCurrent);

 
         HighlightLine( oldCurrent, FALSE );
         RefreshLine( oldCurrent );
 
         HighlightLine( oldCurrent, FALSE );
         RefreshLine( oldCurrent );


@@ -2855,8 +3237,6 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
         }
     }
 
         }
     }
 

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

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


@@ -2915,7 +3295,8 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         nevent.SetDirection( !event.ShiftDown() );
         nevent.SetEventObject( GetParent()->GetParent() );
         nevent.SetCurrentFocus( m_parent );
         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 */


@@ -3015,29 +3396,22 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_SPACE:
             if ( IsSingleSel() )
             {
         case WXK_SPACE:
             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
-            {
-                ReverseHighlight(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:


@@ -3049,24 +3423,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 );


@@ -3076,8 +3468,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 )


@@ -3100,7 +3491,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 )
     {


@@ -3125,9 +3516,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;


@@ -3214,6 +3605,9 @@ 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 );
     wxCHECK_RET( node, _T("no column?") );
 
     wxListHeaderDataList::Node *node = m_columns.Item( col );
     wxCHECK_RET( node, _T("no column?") );


@@ -3322,19 +3716,21 @@ 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() )
+    if ( !IsVirtual() )
+    {
+        wxListLineData *line = GetLine((size_t)id);
+        line->SetItem( item.m_col, item );
+    }
+
+    if ( InReportView() )

     {
         // just refresh the line to show the new value of the text/image
         RefreshLine((size_t)id);
     }
     {
         // just refresh the line to show the new value of the text/image
         RefreshLine((size_t)id);
     }

-    else // !virtual
+    else // !report

     {
     {

+        // refresh everything (resulting in horrible flicker - FIXME!)

         m_dirty = TRUE;
         m_dirty = TRUE;

-
-        wxListLineData *line = GetLine((size_t)id);
-        if ( HasFlag(wxLC_REPORT) )
-            item.m_width = GetColumnWidth( item.m_col );
-        line->SetItem( item.m_col, item );

     }
 }
 
     }
 }
 


@@ -3344,8 +3740,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 )


@@ -3353,13 +3750,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 ( IsSingleSel() && (oldCurrent != (size_t)-1) )
+                if ( oldCurrent != (size_t)-1 )

                 {
                 {

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

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


@@ -3371,12 +3770,14 @@ 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();
+
+                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;


@@ -3389,9 +3790,7 @@ 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 )
                     {


@@ -3460,7 +3859,10 @@ void wxListMainWindow::SetItemCount(long count)
     m_selStore.SetItemCount(count);
     m_countVirt = count;
 
     m_selStore.SetItemCount(count);
     m_countVirt = count;
 

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

 }
 
 int wxListMainWindow::GetSelectedItemCount()
 }
 
 int wxListMainWindow::GetSelectedItemCount()


@@ -3497,15 +3899,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect )
     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") );
 

-    if ( HasFlag(wxLC_REPORT) )
-    {
-        rect = GetDummyLine()->GetRect();
-        rect.y = GetLineY((size_t)index);
-    }
-    else
-    {
-        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);
 }


@@ -3525,11 +3919,8 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 // geometry calculation
 // ----------------------------------------------------------------------------
 
 // geometry calculation
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    if ( IsEmpty() )
-        return;
-

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


@@ -3541,9 +3932,25 @@ void wxListMainWindow::RecalculatePositions()
     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) )
     {
 
     if ( HasFlag(wxLC_REPORT) )
     {


@@ -3566,18 +3973,6 @@ void wxListMainWindow::RecalculatePositions()
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        TRUE );
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        TRUE );

-
-        // FIXME: wxGTK::wxScrolledWindow doesn't have SetTargetRect()
-#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
-        // we must have an integer number of lines on screen and so we fit
-        // the real control size to the line height
-        wxRect rect;
-        rect.x = 0;
-        rect.y = LINE_SPACING;
-        rect.width = clientWidth;
-        rect.height = ((clientHeight - LINE_SPACING) / lineHeight)*lineHeight;
-        SetTargetRect(rect);
-#endif

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


@@ -3585,13 +3980,26 @@ void wxListMainWindow::RecalculatePositions()
         // 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 = 0;
 
         for (int tries = 0; tries < 2; tries++)
         {
         int entireWidth = 0;
 
         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;


@@ -3604,9 +4012,9 @@ void wxListMainWindow::RecalculatePositions()
                 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;


@@ -3615,8 +4023,8 @@ void wxListMainWindow::RecalculatePositions()
                 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;


@@ -3624,17 +4032,21 @@ void wxListMainWindow::RecalculatePositions()
                     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.

             }
         }
 
             }
         }
 


@@ -3642,10 +4054,13 @@ void wxListMainWindow::RecalculatePositions()
         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();
+        RefreshAll();
+    }

 }
 
 void wxListMainWindow::RefreshAll()
 }
 
 void wxListMainWindow::RefreshAll()


@@ -3654,7 +4069,7 @@ void wxListMainWindow::RefreshAll()
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;

-    if ( headerWin )
+    if ( headerWin && headerWin->m_dirty )

     {
         headerWin->m_dirty = FALSE;
         headerWin->Refresh();
     {
         headerWin->m_dirty = FALSE;
         headerWin->Refresh();


@@ -3665,12 +4080,7 @@ void wxListMainWindow::UpdateCurrent()
 {
     if ( !HasCurrent() && !IsEmpty() )
     {
 {
     if ( !HasCurrent() && !IsEmpty() )
     {

-        m_current = 0;
-    }
-
-    if ( m_current != (size_t)-1 )
-    {
-        OnFocusLine( m_current );
+        ChangeCurrent(0);

     }
 }
 
     }
 }
 


@@ -3726,26 +4136,26 @@ void wxListMainWindow::DeleteItem( long lindex )
 
     size_t index = (size_t)lindex;
 
 
     size_t index = (size_t)lindex;
 

-    m_dirty = TRUE;
-
-    // select the next item when the selected one is deleted
-    if ( m_current == 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( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
+    if ( InReportView() )
+    {
+        ResetVisibleLinesRange();
+    }

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

-        if ( m_lineTo == --m_countVirt )
-        {
-            m_lineTo--;
-        }
+        m_countVirt--;

 
         m_selStore.OnItemDelete(index);
     }
 
         m_selStore.OnItemDelete(index);
     }


@@ -3753,6 +4163,13 @@ void wxListMainWindow::DeleteItem( long lindex )
     {
         m_lines.RemoveAt( 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 )


@@ -3763,9 +4180,12 @@ void wxListMainWindow::DeleteColumn( int col )
 
     m_dirty = TRUE;
     m_columns.DeleteNode( node );
 
     m_dirty = TRUE;
     m_columns.DeleteNode( node );

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

 }
 
 }
 

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

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


@@ -3773,8 +4193,6 @@ void wxListMainWindow::DeleteAllItems()
         return;
     }
 
         return;
     }
 

-    m_dirty = TRUE;
-

     ResetCurrent();
 
     // to make the deletion of all items faster, we don't send the
     ResetCurrent();
 
     // to make the deletion of all items faster, we don't send the


@@ -3790,12 +4208,22 @@ void wxListMainWindow::DeleteAllItems()
     {
         m_countVirt = 0;
 
     {
         m_countVirt = 0;
 

+        m_selStore.Clear();
+    }
+
+    if ( InReportView() )
+    {

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

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

 
 

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

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


@@ -3815,14 +4243,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) )


@@ -3867,14 +4294,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;

         }
     }
 
         }
     }
 


@@ -3911,11 +4350,14 @@ 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;
+    RefreshLines(id, GetItemCount() - 1);

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


@@ -3935,6 +4377,9 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
         {
             m_columns.Append( column );
         }
         {
             m_columns.Append( column );
         }

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

     }
 }
 
     }
 }
 


@@ -3987,11 +4432,20 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
         wxListCtrl* lc = GetListCtrl();
         wxCHECK_RET( lc, _T("no listctrl window?") );
 
         wxListCtrl* lc = GetListCtrl();
         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();
+    }
+}
+
+int wxListMainWindow::GetCountPerPage() const
+{
+    if ( !m_linesPerPage )
+    {
+        wxConstCast(this, wxListMainWindow)->
+            m_linesPerPage = GetClientSize().y / GetLineHeight();

     }
     }

+
+    return m_linesPerPage;

 }
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 }
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)


@@ -4000,17 +4454,32 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 
     if ( m_lineFrom == (size_t)-1 )
     {
 
     if ( m_lineFrom == (size_t)-1 )
     {

-        m_lineFrom = GetScrollPos(wxVERTICAL);
-

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

+        if ( count )
+        {
+            m_lineFrom = GetScrollPos(wxVERTICAL);

 
 

-        wxASSERT_MSG( m_lineFrom < count, _T("invalid scroll position?") );
+            // this may happen if SetScrollbars() hadn't been called yet
+            if ( m_lineFrom >= count )
+                m_lineFrom = count - 1;

 
 

-        m_lineTo = m_lineFrom + m_linesPerPage - 1;
-        if ( m_lineTo >= count )
-            m_lineTo = count - 1;
+            // we redraw one extra line but this is needed to make the redrawing
+            // logic work when there is a fractional number of lines on screen
+            m_lineTo = m_lineFrom + m_linesPerPage;
+            if ( m_lineTo >= count )
+                m_lineTo = count - 1;
+        }
+        else // empty control
+        {
+            m_lineFrom = 0;
+            m_lineTo = (size_t)-1;
+        }

     }
 
     }
 

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

     if ( from )
         *from = m_lineFrom;
     if ( to )
     if ( from )
         *from = m_lineFrom;
     if ( to )


@@ -4025,17 +4494,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
 wxListItem::wxListItem()
 {
 
 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;
     m_attr = NULL;

+
+    Clear();

 }
 
 void wxListItem::Clear()
 }
 
 void wxListItem::Clear()


@@ -4045,11 +4506,11 @@ void wxListItem::Clear()
     m_col = 0;
     m_state = 0;
     m_stateMask = 0;
     m_col = 0;
     m_state = 0;
     m_stateMask = 0;

-    m_image = 0;
+    m_image = -1;

     m_data = 0;
     m_format = wxLIST_FORMAT_CENTRE;
     m_width = 0;
     m_data = 0;
     m_format = wxLIST_FORMAT_CENTRE;
     m_width = 0;

-    m_text = _T("");
+    m_text.clear();

 
     ClearAttributes();
 }
 
     ClearAttributes();
 }


@@ -4063,58 +4524,14 @@ void wxListItem::ClearAttributes()
     }
 }
 
     }
 }
 

-// -------------------------------------------------------------------------------------
-// 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;
-}
-
-void wxListEvent::CopyObject(wxObject& object_dest) const
-{
-    wxListEvent *obj = (wxListEvent *)&object_dest;
-
-    wxNotifyEvent::CopyObject(object_dest);
-
-    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;
-
-    if ( m_item.HasAttributes() )
-    {
-        obj->m_item.SetTextColour(m_item.GetTextColour());
-    }
-}
-

 // -------------------------------------------------------------------------------------
 // wxListCtrl
 // -------------------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
 // -------------------------------------------------------------------------------------
 // wxListCtrl
 // -------------------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
+
+IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)

 
 BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
   EVT_SIZE(wxListCtrl::OnSize)
 
 BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
   EVT_SIZE(wxListCtrl::OnSize)


@@ -4137,9 +4554,6 @@ wxListCtrl::wxListCtrl()
 
 wxListCtrl::~wxListCtrl()
 {
 
 wxListCtrl::~wxListCtrl()
 {

-    if ( m_mainWin )
-        m_mainWin->ResetCurrent();
-

     if (m_ownsImageListNormal)
         delete m_imageListNormal;
     if (m_ownsImageListSmall)
     if (m_ownsImageListNormal)
         delete m_imageListNormal;
     if (m_ownsImageListSmall)


@@ -4239,36 +4653,35 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
     {
         m_mainWin->DeleteEverything();
 
     {
         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);

         }
     }
 
         }
     }
 


@@ -4522,7 +4935,7 @@ bool wxListCtrl::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;
 }


@@ -4659,10 +5072,17 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
     if ( !m_mainWin )
         return;
 
     if ( !m_mainWin )
         return;
 

+    ResizeReportView(m_mainWin->HasHeader());
+
+    m_mainWin->RecalculatePositions();
+}
+
+void wxListCtrl::ResizeReportView(bool showHeader)
+{

     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int 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 );


@@ -4671,8 +5091,6 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
     {
         m_mainWin->SetSize( 0, 0, cw, ch );
     }
     {
         m_mainWin->SetSize( 0, 0, cw, ch );
     }

-
-    m_mainWin->RecalculatePositions();

 }
 
 void wxListCtrl::OnIdle( wxIdleEvent & event )
 }
 
 void wxListCtrl::OnIdle( wxIdleEvent & event )


@@ -4810,6 +5228,15 @@ int wxListCtrl::OnGetItemImage(long item) const
     return -1;
 }
 
     return -1;
 }
 

+wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+{
+    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+                  _T("invalid item index in OnGetItemAttr()") );
+
+    // no attributes by default
+    return NULL;
+}
+

 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );


@@ -4817,4 +5244,24 @@ void wxListCtrl::SetItemCount(long count)
     m_mainWin->SetItemCount(count);
 }
 
     m_mainWin->SetItemCount(count);
 }
 

+void wxListCtrl::RefreshItem(long item)
+{
+    m_mainWin->RefreshLine(item);
+}
+
+void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+{
+    m_mainWin->RefreshLines(itemFrom, itemTo);
+}
+
+void wxListCtrl::Freeze()
+{
+    m_mainWin->Freeze();
+}
+
+void wxListCtrl::Thaw()
+{
+    m_mainWin->Thaw();
+}
+

 #endif // wxUSE_LISTCTRL
 #endif // wxUSE_LISTCTRL