Bring back double border

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 595d70345b52e924fdbe295452e9c61bd929d071..67562c04aa3c3c3458f30ae4c3c9e11520db88f2 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/listctrl.cpp
+// Name:        src/generic/listctrl.cpp

 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling
 //              Vadim Zeitlin (virtual list control support)
 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling
 //              Vadim Zeitlin (virtual list control support)


@@ -8,182 +8,127 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifdef __GNUG__
-    #pragma implementation "listctrl.h"
-    #pragma implementation "listctrlbase.h"
-#endif

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_LISTCTRL
 
 #endif
 
 #if wxUSE_LISTCTRL
 

-#include "wx/dcscreen.h"
-#include "wx/app.h"

 #include "wx/listctrl.h"
 #include "wx/listctrl.h"

+
+#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)
+    // if we have a native version, its implementation file does all this
+    IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
+    IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+
+    IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/scrolwin.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/dynarray.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcscreen.h"
+    #include "wx/math.h"
+#endif
+

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

-#include "wx/dynarray.h"
+#include "wx/selstore.h"
+#include "wx/renderer.h"

 
 

-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"

 #endif
 
 #endif
 

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

 
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_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_CACHE_HINT)
+// NOTE: If using the wxListBox visual attributes works everywhere then this can
+// be removed, as well as the #else case below.
+#define _USE_VISATTR 0
+

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-// the height of the header window (FIXME: should depend on its font!)
-static const int HEADER_HEIGHT = 23;
+// // the height of the header window (FIXME: should depend on its font!)
+// static const int HEADER_HEIGHT = 23;

 
 

-// the scrollbar units

 static const int SCROLL_UNIT_X = 15;
 static const int SCROLL_UNIT_X = 15;

-static const int SCROLL_UNIT_Y = 15;

 
 // the spacing between the lines (in report mode)
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label
 
 // the spacing between the lines (in report mode)
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label

-static const int EXTRA_WIDTH = 3;
+#ifdef __WXGTK__
+static const int EXTRA_WIDTH = 6;
+#else
+static const int EXTRA_WIDTH = 4;
+#endif

 static const int EXTRA_HEIGHT = 4;
 
 static const int EXTRA_HEIGHT = 4;
 

+// margin between the window and the items
+static const int EXTRA_BORDER_X = 2;
+static const int EXTRA_BORDER_Y = 2;
+

 // offset for the header window
 static const int HEADER_OFFSET_X = 1;
 static const int HEADER_OFFSET_Y = 1;
 
 // offset for the header window
 static const int HEADER_OFFSET_X = 1;
 static const int HEADER_OFFSET_Y = 1;
 

+// margin between rows of icons in [small] icon view
+static const int MARGIN_BETWEEN_ROWS = 6;
+

 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 
 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 

-// default and minimal widths for the header columns
+// default width for the header columns

 static const int WIDTH_COL_DEFAULT = 80;
 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;
+
+// the space between the image and the text in the report mode in header
+static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;

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

-// ----------------------------------------------------------------------------
-// wxSelectionStore
-// ----------------------------------------------------------------------------
-
-int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
-
-WX_DEFINE_SORTED_EXPORTED_ARRAY(size_t, wxIndexArray);
+//-----------------------------------------------------------------------------
+//  wxColWidthInfo (internal)
+//-----------------------------------------------------------------------------

 
 

-// this class is used to store the selected items in the virtual list control
-// (but it is not tied to list control and so can be used with other controls
-// such as wxListBox in wxUniv)
-//
-// the idea is to make it really smart later (i.e. store the selections as an
-// array of ranes + individual items) but, as I don't have time to do it now
-// (this would require writing code to merge/break ranges and much more) keep
-// it simple but define a clean interface to it which allows it to be made
-// smarter later
-class WXDLLEXPORT wxSelectionStore
+struct wxColWidthInfo

 {
 {

-public:
-    wxSelectionStore() : m_itemsSel(wxSizeTCmpFn) { Init(); }
-
-    // set the total number of items we handle
-    void SetItemCount(size_t count) { m_count = count; }
-
-    // special case of SetItemCount(0)
-    void Clear() { m_itemsSel.Clear(); m_count = 0; }
-
-    // must be called when a new item is inserted/added
-    void OnItemAdd(size_t item) { wxFAIL_MSG( _T("TODO") ); }
-
-    // must be called when an item is deleted
-    void OnItemDelete(size_t item);
-
-    // select one item, use SelectRange() insted if possible!
-    //
-    // returns true if the items selection really changed
-    bool SelectItem(size_t item, bool select = TRUE);
-
-    // select the range of items
-    //
-    // return true and fill the itemsChanged array with the indices of items
-    // which have changed state if "few" of them did, otherwise return false
-    // (meaning that too many items changed state to bother counting them
-    // individually)
-    bool SelectRange(size_t itemFrom, size_t itemTo,
-                     bool select = TRUE,
-                     wxArrayInt *itemsChanged = NULL);
-
-    // return true if the given item is selected
-    bool IsSelected(size_t item) const;
+    int     nMaxWidth;
+    bool    bNeedsUpdate;   //  only set to true when an item whose
+                            //  width == nMaxWidth is removed

 
 

-    // return the total number of selected items
-    size_t GetSelectedCount() const
+    wxColWidthInfo(int w = 0, bool needsUpdate = false)

     {
     {

-        return m_defaultState ? m_count - m_itemsSel.GetCount()
-                              : m_itemsSel.GetCount();
+        nMaxWidth = w;
+        bNeedsUpdate = needsUpdate;

     }
     }

-
-private:
-    // (re)init
-    void Init() { m_defaultState = FALSE; }
-
-    // the total number of items we handle
-    size_t m_count;
-
-    // the default state: normally, FALSE (i.e. off) but maybe set to TRUE if
-    // there are more selected items than non selected ones - this allows to
-    // handle selection of all items efficiently
-    bool m_defaultState;
-
-    // the array of items whose selection state is different from default
-    wxIndexArray m_itemsSel;
-
-    DECLARE_NO_COPY_CLASS(wxSelectionStore)

 };
 
 };
 

+WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
+

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

-class WXDLLEXPORT wxListItemData
+class wxListItemData

 {
 public:
     wxListItemData(wxListMainWindow *owner);
 {
 public:
     wxListItemData(wxListMainWindow *owner);


@@ -191,7 +136,7 @@ public:
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }

-    void SetData( long data ) { m_data = data; }
+    void SetData( wxUIntPtr data ) { m_data = data; }

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


@@ -230,11 +175,10 @@ public:
     int m_image;
 
     // user data associated with the item
     int m_image;
 
     // user data associated with the item

-    long m_data;
+    wxUIntPtr m_data;

 
 

-    // the item coordinates are not used in report mode, instead this pointer
-    // is NULL and the owner window is used to retrieve the item position and
-    // size
+    // the item coordinates are not used in report mode; instead this pointer is
+    // NULL and the owner window is used to retrieve the item position and size

     wxRect *m_rect;
 
     // the list ctrl we are in
     wxRect *m_rect;
 
     // the list ctrl we are in


@@ -254,24 +198,15 @@ protected:
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListHeaderData : public wxObject
+class 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 );
     void SetItem( const wxListItem &item );
     void SetPosition( int x, int y );
     void SetWidth( int w );
 public:
     wxListHeaderData();
     wxListHeaderData( const wxListItem &info );
     void SetItem( const wxListItem &item );
     void SetPosition( int x, int y );
     void SetWidth( int w );

+    void SetState( int state );

     void SetFormat( int format );
     void SetHeight( int h );
     bool HasImage() const;
     void SetFormat( int format );
     void SetHeight( int h );
     bool HasImage() const;


@@ -286,20 +221,32 @@ public:
     int GetImage() const;
     int GetWidth() const;
     int GetFormat() const;
     int GetImage() const;
     int GetWidth() const;
     int GetFormat() const;

+    int GetState() const;
+
+protected:
+    long      m_mask;
+    int       m_image;
+    wxString  m_text;
+    int       m_format;
+    int       m_width;
+    int       m_xpos,
+              m_ypos;
+    int       m_height;
+    int       m_state;

 
 private:
 
 private:

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

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

-WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
+WX_DECLARE_EXPORTED_LIST(wxListItemData, wxListItemDataList);

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListItemDataList);
+WX_DEFINE_LIST(wxListItemDataList)

 
 

-class WXDLLEXPORT wxListLineData
+class wxListLineData

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


@@ -319,7 +266,20 @@ public:
 
         // the part to be highlighted
         wxRect m_rectHighlight;
 
         // the part to be highlighted
         wxRect m_rectHighlight;

-    } *m_gi;
+
+        // extend all our rects to be centered inside the one of given width
+        void ExtendWidth(wxCoord w)
+        {
+            wxASSERT_MSG( m_rectAll.width <= w,
+                            _T("width can only be increased") );
+
+            m_rectAll.width = w;
+            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
+            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2;
+            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2;
+        }
+    }
+    *m_gi;

 
     // is this item selected? [NB: not used in virtual mode]
     bool m_highlighted;
 
     // is this item selected? [NB: not used in virtual mode]
     bool m_highlighted;


@@ -330,7 +290,11 @@ public:
 public:
     wxListLineData(wxListMainWindow *owner);
 
 public:
     wxListLineData(wxListMainWindow *owner);
 

-    ~wxListLineData() { delete m_gi; }
+    ~wxListLineData()
+    {
+        WX_CLEAR_LIST(wxListItemDataList, m_items);
+        delete m_gi;
+    }

 
     // are we in report mode?
     inline bool InReportView() const;
 
     // are we in report mode?
     inline bool InReportView() const;


@@ -345,12 +309,15 @@ public:
     void CalculateSize( wxDC *dc, int spacing );
 
     // remember the position this line appears at
     void CalculateSize( wxDC *dc, int spacing );
 
     // remember the position this line appears at

-    void SetPosition( int x, int y,  int window_width, int spacing );
+    void SetPosition( int x, int y, int spacing );

 
     // wxListCtrl API
 
     void SetImage( int image ) { SetImage(0, image); }
     int GetImage() const { return GetImage(0); }
 
     // wxListCtrl API
 
     void SetImage( int image ) { SetImage(0, image); }
     int GetImage() const { return GetImage(0); }

+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
+

     bool HasImage() const { return GetImage() != -1; }
     bool HasText() const { return !GetText(0).empty(); }
 
     bool HasImage() const { return GetImage() != -1; }
     bool HasText() const { return !GetText(0).empty(); }
 


@@ -358,7 +325,7 @@ public:
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;

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

 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);
 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);


@@ -397,41 +364,44 @@ private:
                        const wxListItemAttr *attr,
                        bool highlight);
 
                        const wxListItemAttr *attr,
                        bool highlight);
 

-    // these are only used by GetImage/SetImage above, we don't support images
-    // with subitems at the public API level yet
-    void SetImage( int index, int image );
-    int GetImage( int index ) const;
+    // draw the text on the DC with the correct justification; also add an
+    // ellipsis if the text is too large to fit in the current width
+    void DrawTextFormatted(wxDC *dc,
+                           const wxString &text,
+                           int col,
+                           int x,
+                           int yMid,    // this is middle, not top, of the text
+                           int width);

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

-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+WX_DEFINE_OBJARRAY(wxListLineDataArray)

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

-class WXDLLEXPORT wxListHeaderWindow : public wxWindow
+class wxListHeaderWindow : public wxWindow

 {
 protected:
     wxListMainWindow  *m_owner;
 {
 protected:
     wxListMainWindow  *m_owner;

-    wxCursor          *m_currentCursor;
+    const wxCursor    *m_currentCursor;

     wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 
     wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 

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

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

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

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

-    virtual ~wxListHeaderWindow();

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


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

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

 
 

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

     void DrawCurrent();
     void DrawCurrent();

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

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


@@ -453,6 +424,13 @@ public:
     bool m_dirty;
 
 private:
     bool m_dirty;
 
 private:

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

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


@@ -461,7 +439,7 @@ private:
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListRenameTimer: public wxTimer
+class wxListRenameTimer: public wxTimer

 {
 private:
     wxListMainWindow *m_owner;
 {
 private:
     wxListMainWindow *m_owner;


@@ -472,32 +450,37 @@ public:
 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

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

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

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

 {
 {

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

 public:
 public:

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

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

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

 private:
 private:

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

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -505,11 +488,11 @@ private:
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 

-WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
+WX_DECLARE_EXPORTED_LIST(wxListHeaderData, wxListHeaderDataList);

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListHeaderDataList);
+WX_DEFINE_LIST(wxListHeaderDataList)

 
 

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

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


@@ -535,20 +518,20 @@ public:
 
     // do we have a header window?
     bool HasHeader() const
 
     // do we have a header window?
     bool HasHeader() const

-        { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); }
+        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }

 
     void HighlightAll( bool on );
 
     // all these functions only do something if the line is currently visible
 
 
     void HighlightAll( bool on );
 
     // all these functions only do something if the line is currently visible
 

-    // change the line "selected" state, return TRUE if it really changed
-    bool HighlightLine( size_t line, bool highlight = TRUE);
+    // change the line "selected" state, return true if it really changed
+    bool HighlightLine( size_t line, bool highlight = true);

 
     // as HighlightLine() but do it for the range of lines: this is incredibly
     // more efficient for virtual list controls!
     //
     // NB: unlike HighlightLine() this one does refresh the lines on screen
 
     // as HighlightLine() but do it for the range of lines: this is incredibly
     // more efficient for virtual list controls!
     //
     // NB: unlike HighlightLine() this one does refresh the lines on screen

-    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = TRUE );
+    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true );

 
     // toggle the line state and refresh it
     void ReverseHighlight( size_t line )
 
     // toggle the line state and refresh it
     void ReverseHighlight( size_t line )


@@ -561,6 +544,9 @@ public:
     void RefreshLine( size_t line );
     void RefreshLines( size_t lineFrom, size_t lineTo );
 
     void RefreshLine( size_t line );
     void RefreshLines( size_t lineFrom, size_t lineTo );
 

+    // refresh all selected items
+    void RefreshSelected();
+

     // refresh all lines below the given one: the difference with
     // RefreshLines() is that the index here might not be a valid one (happens
     // when the last line is deleted)
     // 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)


@@ -596,9 +582,28 @@ public:
     // bring the current item into view
     void MoveToFocus() { MoveToItem(m_current); }
 
     // bring the current item into view
     void MoveToFocus() { MoveToItem(m_current); }
 

-    void EditLabel( long item );
+    // start editing the label of the given item
+    wxTextCtrl *EditLabel(long item,
+                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+    wxTextCtrl *GetEditControl() const
+    {
+        return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
+    }
+
+    void FinishEditing(wxTextCtrl *text)
+    {
+        delete text;
+        m_textctrlWrapper = NULL;
+        SetFocusIgnoringChildren();
+    }
+
+    // suspend/resume redrawing the control
+    void Freeze();
+    void Thaw();
+

     void OnRenameTimer();
     void OnRenameTimer();

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

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


@@ -607,9 +612,10 @@ public:
 
     void OnChar( wxKeyEvent &event );
     void OnKeyDown( wxKeyEvent &event );
 
     void OnChar( wxKeyEvent &event );
     void OnKeyDown( wxKeyEvent &event );

+    void OnKeyUp( wxKeyEvent &event );

     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );

-    void OnScroll(wxScrollWinEvent& event) ;
+    void OnScroll( wxScrollWinEvent& event );

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


@@ -618,8 +624,8 @@ public:
     int GetTextLength( const wxString &s ) const;
 
     void SetImageList( wxImageList *imageList, int which );
     int GetTextLength( const wxString &s ) const;
 
     void SetImageList( wxImageList *imageList, int which );

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

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


@@ -633,61 +639,85 @@ public:
     int GetCountPerPage() const;
 
     void SetItem( wxListItem &item );
     int GetCountPerPage() const;
 
     void SetItem( wxListItem &item );

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

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

-    int GetItemState( long item, long stateMask );
-    void GetItemRect( long index, wxRect &rect );
-    bool GetItemPosition( long item, wxPoint& pos );
-    int GetSelectedItemCount();
+    void SetItemStateAll( long state, long stateMask );
+    int GetItemState( long item, long stateMask ) const;
+    void GetItemRect( long index, wxRect &rect ) const;
+    wxRect GetViewRect() const;
+    bool GetItemPosition( long item, wxPoint& pos ) const;
+    int GetSelectedItemCount() const;
+
+    wxString GetItemText(long item) const
+    {
+        wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
+        info.m_itemId = item;
+        GetItem( info );
+        return info.m_text;
+    }
+
+    void SetItemText(long item, const wxString& value)
+    {
+        wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
+        info.m_itemId = item;
+        info.m_text = value;
+        SetItem( info );
+    }

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

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

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

-    long GetNextItem( long item, int geometry, int state );
+    long GetNextItem( long item, int geometry, int state ) const;

     void DeleteItem( long index );
     void DeleteAllItems();
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );
     void DeleteItem( long index );
     void DeleteAllItems();
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );

-    long FindItem( long start, const wxString& str, bool partial = FALSE );
-    long FindItem( long start, long data);
-    long HitTest( int x, int y, int &flags );
+    long FindItem( long start, const wxString& str, bool partial = false );
+    long FindItem( long start, wxUIntPtr data);
+    long FindItem( const wxPoint& pt );
+    long HitTest( int x, int y, int &flags ) const;

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

+    int GetItemWidthWithImage(wxListItem * item);

     void SortItems( wxListCtrlCompare fn, long data );
 
     size_t GetItemCount() const;
     bool IsEmpty() const { return GetItemCount() == 0; }
     void SetItemCount(long count);
 
     void SortItems( wxListCtrlCompare fn, long data );
 
     size_t GetItemCount() const;
     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
     void SendNotify( size_t line,
                      wxEventType command,
     bool HasCurrent() const { return m_current != (size_t)-1; }
 
     // send out a wxListEvent
     void SendNotify( size_t line,
                      wxEventType command,

-                     wxPoint point = wxDefaultPosition );
+                     const wxPoint& point = wxDefaultPosition );

 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {
         if ( !wxScrolledWindow::SetFont(font) )
 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {
         if ( !wxScrolledWindow::SetFont(font) )

-            return FALSE;
+            return false;

 
         m_lineHeight = 0;
 
 
         m_lineHeight = 0;
 

-        return TRUE;
+        return true;

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

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

     {
     {

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

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


@@ -696,8 +726,20 @@ 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;
+    }
+
+    bool HasFocus() const
+    {
+        return m_hasFocus;
+    }
+

 //protected:
 //protected:

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

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


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

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

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


@@ -720,10 +759,7 @@ public:
     // call
     bool                 m_dirty;
 
     // call
     bool                 m_dirty;
 

-    wxBrush             *m_highlightBrush;

     wxColour            *m_highlightColour;
     wxColour            *m_highlightColour;

-    int                  m_xScroll,
-                         m_yScroll;

     wxImageList         *m_small_image_list;
     wxImageList         *m_normal_image_list;
     int                  m_small_spacing;
     wxImageList         *m_small_image_list;
     wxImageList         *m_normal_image_list;
     int                  m_small_spacing;


@@ -732,17 +768,19 @@ public:
 
     bool                 m_lastOnSame;
     wxTimer             *m_renameTimer;
 
     bool                 m_lastOnSame;
     wxTimer             *m_renameTimer;

-    bool                 m_renameAccept;
-    wxString             m_renameRes;

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

+    ColWidthArray        m_aColWidths;

 
     // for double click logic
     size_t m_lineLastClicked,
 
     // for double click logic
     size_t m_lineLastClicked,

-           m_lineBeforeLastClicked;
+           m_lineBeforeLastClicked,
+           m_lineSelectSingleOnUp;

 
 protected:
 
 protected:

+    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
+

     // the total count of items in a virtual list control
     size_t m_countVirt;
 
     // the total count of items in a virtual list control
     size_t m_countVirt;
 


@@ -753,9 +791,6 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // intiialize m_[xy]Scroll
-    void InitScrolling();
-

     // get the line data for the given index
     wxListLineData *GetLine(size_t n) const
     {
     // get the line data for the given index
     wxListLineData *GetLine(size_t n) const
     {


@@ -764,7 +799,6 @@ protected:
         if ( IsVirtual() )
         {
             wxConstCast(this, wxListMainWindow)->CacheLineData(n);
         if ( IsVirtual() )
         {
             wxConstCast(this, wxListMainWindow)->CacheLineData(n);

-

             n = 0;
         }
 
             n = 0;
         }
 


@@ -787,11 +821,7 @@ protected:
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {

-#ifdef __WXMAC__
-        return *wxWHITE;
-#else
-        return wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT);
-#endif
+        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);

     }
 
 private:
     }
 
 private:


@@ -801,12 +831,6 @@ private:
     // delete all items but don't refresh: called from dtor
     void DoDeleteAllItems();
 
     // delete all items but don't refresh: called from dtor
     void DoDeleteAllItems();
 

-    // called when an item is [un]focuded, i.e. becomes [not] current
-    //
-    // currently unused
-    void OnFocusLine( size_t line );
-    void OnUnfocusLine( size_t line );
-

     // the height of one line using the current font
     wxCoord m_lineHeight;
 
     // the height of one line using the current font
     wxCoord m_lineHeight;
 


@@ -819,201 +843,31 @@ private:
     size_t m_lineFrom,
            m_lineTo;
 
     size_t m_lineFrom,
            m_lineTo;
 

-    DECLARE_DYNAMIC_CLASS(wxListMainWindow);
-    DECLARE_EVENT_TABLE()
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxSelectionStore
-// ----------------------------------------------------------------------------
-
-bool wxSelectionStore::IsSelected(size_t item) const
-{
-    bool isSel = m_itemsSel.Index(item) != wxNOT_FOUND;
-
-    // if the default state is to be selected, being in m_itemsSel means that
-    // the item is not selected, so we have to inverse the logic
-    return m_defaultState ? !isSel : isSel;
-}
-
-bool wxSelectionStore::SelectItem(size_t item, bool select)
-{
-    // search for the item ourselves as like this we get the index where to
-    // insert it later if needed, so we do only one search in the array instead
-    // of two (adding item to a sorted array requires a search)
-    size_t index = m_itemsSel.IndexForInsert(item);
-    bool isSel = index < m_itemsSel.GetCount() && m_itemsSel[index] == item;
-
-    if ( select != m_defaultState )
-    {
-        if ( !isSel )
-        {
-            m_itemsSel.AddAt(item, index);
-
-            return TRUE;
-        }
-    }
-    else // reset to default state
-    {
-        if ( isSel )
-        {
-            m_itemsSel.RemoveAt(index);
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-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?
-    if ( itemTo - itemFrom > m_count/2 )
-    {
-        if ( select != m_defaultState )
-        {
-            // the default state now becomes the same as 'select'
-            m_defaultState = select;
-
-            // so all the old selections (which had state select) shouldn't be
-            // selected any more, but all the other ones should
-            wxIndexArray selOld = m_itemsSel;
-            m_itemsSel.Empty();
-
-            // TODO: it should be possible to optimize the searches a bit
-            //       knowing the possible range
-
-            size_t item;
-            for ( item = 0; item < itemFrom; item++ )
-            {
-                if ( selOld.Index(item) == wxNOT_FOUND )
-                    m_itemsSel.Add(item);
-            }
-
-            for ( item = itemTo + 1; item < m_count; item++ )
-            {
-                if ( selOld.Index(item) == wxNOT_FOUND )
-                    m_itemsSel.Add(item);
-            }
-
-            // many items (> half) changed state
-            itemsChanged = NULL;
-        }
-        else // select == m_defaultState
-        {
-            // get the inclusive range of items between itemFrom and itemTo
-            size_t count = m_itemsSel.GetCount(),
-                   start = m_itemsSel.IndexForInsert(itemFrom),
-                   end = m_itemsSel.IndexForInsert(itemTo);
-
-            if ( start == count || m_itemsSel[start] < itemFrom )
-            {
-                start++;
-            }
-
-            if ( end == count || m_itemsSel[end] > itemTo )
-            {
-                end--;
-            }
-
-            if ( start <= end )
-            {
-                // delete all of them (from end to avoid changing indices)
-                for ( int i = end; i >= (int)start; i-- )
-                {
-                    if ( itemsChanged )
-                    {
-                        if ( itemsChanged->GetCount() > MANY_ITEMS )
-                        {
-                            // stop counting (see comment below)
-                            itemsChanged = NULL;
-                        }
-
-                        itemsChanged->Add(m_itemsSel[i]);
-                    }
-
-                    m_itemsSel.RemoveAt(i);
-                }
-            }
-        }
-    }
-    else // "few" items change state
-    {
-        if ( itemsChanged )
-        {
-            itemsChanged->Empty();
-        }
-
-        // just add the items to the selection
-        for ( size_t item = itemFrom; item <= itemTo; item++ )
-        {
-            if ( SelectItem(item, select) && itemsChanged )
-            {
-                itemsChanged->Add(item);
-
-                if ( itemsChanged->GetCount() > MANY_ITEMS )
-                {
-                    // stop counting them, we'll just eat gobs of memory
-                    // for nothing at all - faster to refresh everything in
-                    // this case
-                    itemsChanged = NULL;
-                }
-            }
-        }
-    }
-
-    // we set it to NULL if there are many items changing state
-    return itemsChanged != NULL;
-}
+    // the brushes to use for item highlighting when we do/don't have focus
+    wxBrush *m_highlightBrush,
+            *m_highlightUnfocusedBrush;

 
 

-void wxSelectionStore::OnItemDelete(size_t item)
-{
-    size_t count = m_itemsSel.GetCount(),
-           i = m_itemsSel.IndexForInsert(item);
+    // if this is > 0, the control is frozen and doesn't redraw itself
+    size_t m_freezeCount;

 
 

-    if ( i < count && m_itemsSel[i] == item )
-    {
-        // this item itself was in m_itemsSel, remove it from there
-        m_itemsSel.RemoveAt(i);
+    // wrapper around the text control currently used for in place editing or
+    // NULL if no item is being edited
+    wxListTextCtrlWrapper *m_textctrlWrapper;

 
 

-        count--;
-    }

 
 

-    // and adjust the index of all which follow it
-    while ( i < count )
-    {
-        // all following elements must be greater than the one we deleted
-        wxASSERT_MSG( m_itemsSel[i] > item, _T("logic error") );
+    DECLARE_DYNAMIC_CLASS(wxListMainWindow)
+    DECLARE_EVENT_TABLE()

 
 

-        m_itemsSel[i++]--;
-    }
-}
+    friend class wxGenericListCtrl;
+};

 
 

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

-    }

 
     delete m_rect;
 }
 
     delete m_rect;
 }


@@ -1033,13 +887,9 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
     m_owner = owner;
 
     if ( owner->InReportView() )
     m_owner = owner;
 
     if ( owner->InReportView() )

-    {

         m_rect = NULL;
         m_rect = NULL;

-    }

     else
     else

-    {

         m_rect = new wxRect;
         m_rect = new wxRect;

-    }

 }
 
 void wxListItemData::SetItem( const wxListItem &info )
 }
 
 void wxListItemData::SetItem( const wxListItem &info )


@@ -1054,7 +904,7 @@ void wxListItemData::SetItem( const wxListItem &info )
     if ( info.HasAttributes() )
     {
         if ( m_attr )
     if ( info.HasAttributes() )
     {
         if ( m_attr )

-            *m_attr = *info.GetAttributes();
+            m_attr->AssignFrom(*info.GetAttributes());

         else
             m_attr = new wxListItemAttr(*info.GetAttributes());
     }
         else
             m_attr = new wxListItemAttr(*info.GetAttributes());
     }


@@ -1088,9 +938,9 @@ void wxListItemData::SetSize( int width, int height )
 
 bool wxListItemData::IsHit( int x, int y ) const
 {
 
 bool wxListItemData::IsHit( int x, int y ) const
 {

-    wxCHECK_MSG( m_rect, FALSE, _T("can't be called in this mode") );
+    wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") );

 
 

-    return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Inside(x, y);
+    return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Contains(x, y);

 }
 
 int wxListItemData::GetX() const
 }
 
 int wxListItemData::GetX() const


@@ -1123,9 +973,17 @@ int wxListItemData::GetHeight() const
 
 void wxListItemData::GetItem( wxListItem &info ) const
 {
 
 void wxListItemData::GetItem( wxListItem &info ) const
 {

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

 
     if ( m_attr )
     {
 
     if ( m_attr )
     {


@@ -1142,35 +1000,48 @@ 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_ypos = 0;
     m_height = 0;
     m_format = 0;
     m_width = 0;
     m_xpos = 0;
     m_ypos = 0;
     m_height = 0;

+    m_state = 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);
+
+    if ( m_mask & wxLIST_MASK_STATE )
+        SetState(item.m_state);

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


@@ -1186,11 +1057,12 @@ void wxListHeaderData::SetHeight( int h )
 
 void wxListHeaderData::SetWidth( int w )
 {
 
 void wxListHeaderData::SetWidth( int w )
 {

-    m_width = w;
-    if (m_width < 0)
-        m_width = WIDTH_COL_DEFAULT;
-    if (m_width < WIDTH_COL_MIN)
-        m_width = WIDTH_COL_MIN;
+    m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
+}
+
+void wxListHeaderData::SetState( int flag )
+{
+    m_state = flag;

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


@@ -1200,7 +1072,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


@@ -1208,13 +1080,14 @@ 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_image = m_image;
     item.m_format = m_format;
     item.m_width = m_width;
 {
     item.m_mask = m_mask;
     item.m_text = m_text;
     item.m_image = m_image;
     item.m_format = m_format;
     item.m_width = m_width;

+    item.m_state = m_state;

 }
 
 int wxListHeaderData::GetImage() const
 }
 
 int wxListHeaderData::GetImage() const


@@ -1232,6 +1105,11 @@ int wxListHeaderData::GetFormat() const
     return m_format;
 }
 
     return m_format;
 }
 

+int wxListHeaderData::GetState() const
+{
+    return m_state;
+}
+

 //-----------------------------------------------------------------------------
 //  wxListLineData
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxListLineData
 //-----------------------------------------------------------------------------


@@ -1254,119 +1132,107 @@ inline bool wxListLineData::IsVirtual() const
 wxListLineData::wxListLineData( wxListMainWindow *owner )
 {
     m_owner = owner;
 wxListLineData::wxListLineData( wxListMainWindow *owner )
 {
     m_owner = owner;

-    m_items.DeleteContents( TRUE );

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

-    {

         m_gi = NULL;
         m_gi = NULL;

-    }

     else // !report
     else // !report

-    {

         m_gi = new GeometryInfo;
         m_gi = new GeometryInfo;

-    }

 
 

-    m_highlighted = FALSE;
+    m_highlighted = false;

 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 
 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {
 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 
 void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 {

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

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

+    wxString s;
+    wxCoord lw, lh;
+

     switch ( GetMode() )
     {
         case wxLC_ICON:
         case wxLC_SMALL_ICON:
     switch ( GetMode() )
     {
         case wxLC_ICON:
         case wxLC_SMALL_ICON:

-            {
-                m_gi->m_rectAll.width = spacing;
+            m_gi->m_rectAll.width = spacing;

 
 

-                wxString s = item->GetText();
+            s = item->GetText();

 
 

-                wxCoord lw, lh;
-                if ( s.empty() )
-                {
-                    lh =
-                    m_gi->m_rectLabel.width =
-                    m_gi->m_rectLabel.height = 0;
-                }
-                else // has label
-                {
-                    dc->GetTextExtent( s, &lw, &lh );
-                    if (lh < SCROLL_UNIT_Y)
-                        lh = SCROLL_UNIT_Y;
-                    lw += EXTRA_WIDTH;
-                    lh += EXTRA_HEIGHT;
-
-                    m_gi->m_rectAll.height = spacing + lh;
-                    if (lw > spacing)
-                        m_gi->m_rectAll.width = lw;
-
-                    m_gi->m_rectLabel.width = lw;
-                    m_gi->m_rectLabel.height = lh;
-                }
-
-                if (item->HasImage())
-                {
-                    int w, h;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_gi->m_rectIcon.width = w + 8;
-                    m_gi->m_rectIcon.height = h + 8;
-
-                    if ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width )
-                        m_gi->m_rectAll.width = m_gi->m_rectIcon.width;
-                    if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 )
-                        m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4;
-                }
-
-                if ( item->HasText() )
-                {
-                    m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width;
-                    m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height;
-                }
-                else // no text, highlight the icon
-                {
-                    m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
-                    m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;
-                }
+            if ( s.empty() )
+            {
+                lh =
+                m_gi->m_rectLabel.width =
+                m_gi->m_rectLabel.height = 0;

             }
             }

-            break;
-
-        case wxLC_LIST:
+            else // has label

             {
             {

-                wxString s = item->GetTextForMeasuring();
-
-                wxCoord lw,lh;

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

-                if (lh < SCROLL_UNIT_Y)
-                    lh = SCROLL_UNIT_Y;

                 lw += EXTRA_WIDTH;
                 lh += EXTRA_HEIGHT;
 
                 lw += EXTRA_WIDTH;
                 lh += EXTRA_HEIGHT;
 

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

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

+            }

 
 

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

 
 

-                if (item->HasImage())
-                {
-                    int w, h;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_gi->m_rectIcon.width = w;
-                    m_gi->m_rectIcon.height = h;
-
-                    m_gi->m_rectAll.width += 4 + w;
-                    if (h > m_gi->m_rectAll.height)
-                        m_gi->m_rectAll.height = h;
-                }
+            if ( item->HasText() )
+            {
+                m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width;
+                m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height;
+            }
+            else // no text, highlight the icon
+            {
+                m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
+                m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;
+            }
+            break;
+
+        case wxLC_LIST:
+            s = item->GetTextForMeasuring();
+
+            dc->GetTextExtent( s, &lw, &lh );
+            lw += EXTRA_WIDTH;
+            lh += EXTRA_HEIGHT;

 
 

-                m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
-                m_gi->m_rectHighlight.height = m_gi->m_rectAll.height;
+            m_gi->m_rectLabel.width = lw;
+            m_gi->m_rectLabel.height = lh;
+
+            m_gi->m_rectAll.width = lw;
+            m_gi->m_rectAll.height = lh;
+
+            if (item->HasImage())
+            {
+                int w, h;
+                m_owner->GetImageSize( item->GetImage(), w, h );
+                m_gi->m_rectIcon.width = w;
+                m_gi->m_rectIcon.height = h;
+
+                m_gi->m_rectAll.width += 4 + w;
+                if (h > m_gi->m_rectAll.height)
+                    m_gi->m_rectAll.height = h;

             }
             }

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

             break;
 
         case wxLC_REPORT:
             break;
 
         case wxLC_REPORT:


@@ -1375,14 +1241,13 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 
         default:
             wxFAIL_MSG( _T("unknown mode") );
 
         default:
             wxFAIL_MSG( _T("unknown mode") );

+            break;

     }
 }
 
     }
 }
 

-void wxListLineData::SetPosition( int x, int y,
-                                  int window_width,
-                                  int spacing )
+void wxListLineData::SetPosition( int x, int y, int spacing )

 {
 {

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

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


@@ -1396,17 +1261,17 @@ void wxListLineData::SetPosition( int x, int y,
 
             if ( item->HasImage() )
             {
 
             if ( item->HasImage() )
             {

-                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4
-                                    + (spacing - m_gi->m_rectIcon.width)/2;
+                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 +
+                    (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2;

                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
             }
 
             if ( item->HasText() )
             {
                 if (m_gi->m_rectAll.width > spacing)
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
             }
 
             if ( item->HasText() )
             {
                 if (m_gi->m_rectAll.width > spacing)

-                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
+                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2);

                 else
                 else

-                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing/2) - (m_gi->m_rectLabel.width/2);
+                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2) + (spacing / 2) - (m_gi->m_rectLabel.width / 2);

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


@@ -1430,11 +1295,11 @@ void wxListLineData::SetPosition( int x, int y,
             {
                 m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;
             {
                 m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;

-                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 6 + m_gi->m_rectIcon.width;
+                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 4 + (EXTRA_WIDTH/2) + m_gi->m_rectIcon.width;

             }
             else
             {
             }
             else
             {

-                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
+                m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2);

             }
             break;
 
             }
             break;
 


@@ -1444,6 +1309,7 @@ void wxListLineData::SetPosition( int x, int y,
 
         default:
             wxFAIL_MSG( _T("unknown mode") );
 
         default:
             wxFAIL_MSG( _T("unknown mode") );

+            break;

     }
 }
 
     }
 }
 


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

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

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


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

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

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


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

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

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


@@ -1486,9 +1352,9 @@ wxString wxListLineData::GetText(int index) const
     return s;
 }
 
     return s;
 }
 

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

 {
 {

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

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


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

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

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


@@ -1507,7 +1373,7 @@ void wxListLineData::SetImage( int index, int image )
 
 int wxListLineData::GetImage( int index ) const
 {
 
 int wxListLineData::GetImage( int index ) const
 {

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

     wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") );
 
     wxListItemData *item = node->GetData();
     wxCHECK_MSG( node, -1, _T("invalid column index in GetImage()") );
 
     wxListItemData *item = node->GetData();


@@ -1516,7 +1382,7 @@ int wxListLineData::GetImage( int index ) const
 
 wxListItemAttr *wxListLineData::GetAttr() const
 {
 
 wxListItemAttr *wxListLineData::GetAttr() const
 {

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

     wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
 
     wxListItemData *item = node->GetData();
     wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
 
     wxListItemData *item = node->GetData();


@@ -1525,7 +1391,7 @@ wxListItemAttr *wxListLineData::GetAttr() const
 
 void wxListLineData::SetAttr(wxListItemAttr *attr)
 {
 
 void wxListLineData::SetAttr(wxListItemAttr *attr)
 {

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

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


@@ -1545,33 +1411,33 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )

+#ifdef __WXMAC__

     {
     {

-        colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-    }
-    else
-    {
-        if ( attr && attr->HasTextColour() )
-        {
-            colText = attr->GetTextColour();
-        }
+        if (m_owner->HasFocus()
+#ifdef __WXMAC__
+                && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+        )
+            colText = *wxWHITE;

         else
         else

-        {
-            colText = listctrl->GetForegroundColour();
-        }
+            colText = *wxBLACK;

     }
     }

+#else
+        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+#endif
+    else if ( attr && attr->HasTextColour() )
+        colText = attr->GetTextColour();
+    else
+        colText = listctrl->GetForegroundColour();

 
     dc->SetTextForeground(colText);
 
     // font
     wxFont font;
     if ( attr && attr->HasFont() )
 
     dc->SetTextForeground(colText);
 
     // font
     wxFont font;
     if ( attr && attr->HasFont() )

-    {

         font = attr->GetFont();
         font = attr->GetFont();

-    }

     else
     else

-    {

         font = listctrl->GetFont();
         font = listctrl->GetFont();

-    }

 
     dc->SetFont(font);
 
 
     dc->SetFont(font);
 


@@ -1580,25 +1446,21 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )

-        {
-            dc->SetBrush( *m_owner->m_highlightBrush );
-        }
+            dc->SetBrush( *m_owner->GetHighlightBrush() );

         else
         else

-        {

             dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
             dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));

-        }

 
         dc->SetPen( *wxTRANSPARENT_PEN );
 
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxListLineData::Draw( wxDC *dc )
 {
 }
 
 void wxListLineData::Draw( wxDC *dc )
 {

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

     wxCHECK_RET( node, _T("no subitems at all??") );
 
     bool highlighted = IsHighlighted();
     wxCHECK_RET( node, _T("no subitems at all??") );
 
     bool highlighted = IsHighlighted();


@@ -1606,22 +1468,56 @@ void wxListLineData::Draw( wxDC *dc )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )

+#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) )

     {
         dc->DrawRectangle( m_gi->m_rectHighlight );
     }
     {
         dc->DrawRectangle( m_gi->m_rectHighlight );
     }

+#else
+    {
+        if (highlighted)
+        {
+            int flags = wxCONTROL_SELECTED;
+            if (m_owner->HasFocus()
+#ifdef __WXMAC__
+                && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+            )
+                flags |= wxCONTROL_FOCUSED;
+            wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, m_gi->m_rectHighlight, flags );
+
+        }
+        else
+        {
+            dc->DrawRectangle( m_gi->m_rectHighlight );
+        }
+    }
+#endif
+
+    // just for debugging to better see where the items are
+#if 0
+    dc->SetPen(*wxRED_PEN);
+    dc->SetBrush(*wxTRANSPARENT_BRUSH);
+    dc->DrawRectangle( m_gi->m_rectAll );
+    dc->SetPen(*wxGREEN_PEN);
+    dc->DrawRectangle( m_gi->m_rectIcon );
+#endif

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

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

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

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

     }
 }
 
     }
 }
 


@@ -1630,65 +1526,162 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
                                        const wxRect& rectHL,
                                        bool highlighted )
 {
                                        const wxRect& rectHL,
                                        bool highlighted )
 {

-    // use our own flag if we maintain it
-    if ( !IsVirtual() )
-        highlighted = m_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) )
     // TODO: later we should support setting different attributes for
     //       different columns - to do it, just add "col" argument to
     //       GetAttr() and move these lines into the loop below
     wxListItemAttr *attr = GetAttr();
     if ( SetAttributes(dc, attr, highlighted) )

+#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) )

     {
         dc->DrawRectangle( rectHL );
     }
     {
         dc->DrawRectangle( rectHL );
     }

+#else
+    {
+        if (highlighted)
+        {
+            int flags = wxCONTROL_SELECTED;
+            if (m_owner->HasFocus()
+#ifdef __WXMAC__
+                && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+            )
+                flags |= wxCONTROL_FOCUSED;
+            wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, rectHL, flags );
+        }
+        else
+        {
+            dc->DrawRectangle( rectHL );
+        }
+    }
+#endif

 
 

-    wxListItemDataList::Node *node = m_items.GetFirst();
-    wxCHECK_RET( node, _T("no subitems at all??") );
-
-    size_t col = 0;

     wxCoord x = rect.x + HEADER_OFFSET_X,
     wxCoord x = rect.x + HEADER_OFFSET_X,

-            y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
+            yMid = rect.y + rect.height/2;
+#ifdef __WXGTK__
+    // This probably needs to be done
+    // on all platforms as the icons
+    // otherwise nearly touch the border
+    x += 2;
+#endif

 
 

-    while ( node )
+    size_t col = 0;
+    for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
+          node;
+          node = node->GetNext(), col++ )

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

+        int width = m_owner->GetColumnWidth(col);

         int xOld = x;
         int xOld = x;

+        x += width;

 
         if ( item->HasImage() )
         {
             int ix, iy;
 
         if ( item->HasImage() )
         {
             int ix, iy;

-            m_owner->DrawImage( item->GetImage(), dc, x, y );

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

-            x += ix + 5; // FIXME: what is "5"?
-        }
+            m_owner->DrawImage( item->GetImage(), dc, xOld, yMid - iy/2 );

 
 

-        int width = m_owner->GetColumnWidth(col++);
+            ix += IMAGE_MARGIN_IN_REPORT_MODE;

 
 

-        wxDCClipper clipper(*dc, x, y, width, rect.height);
+            xOld += ix;
+            width -= ix;
+        }

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

+            DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width - 8);
+    }
+}
+
+void wxListLineData::DrawTextFormatted(wxDC *dc,
+                                       const wxString& textOrig,
+                                       int col,
+                                       int x,
+                                       int yMid,
+                                       int width)
+{
+    // we don't support displaying multiple lines currently (and neither does
+    // wxMSW FWIW) so just merge all the lines
+    wxString text(textOrig);
+    text.Replace(_T("\n"), _T(" "));
+
+    wxCoord w, h;
+    dc->GetTextExtent(text, &w, &h);
+
+    const wxCoord y = yMid - (h + 1)/2;
+
+    wxDCClipper clipper(*dc, x, y, width, h);
+
+    // determine if the string can fit inside the current width
+    if (w <= width)
+    {
+        // it can, draw it using the items alignment
+        wxListItem item;
+        m_owner->GetColumn(col, item);
+        switch ( item.GetAlign() )

         {
         {

-            dc->DrawText( item->GetText(), x, y );
+            case wxLIST_FORMAT_LEFT:
+                // nothing to do
+                break;
+
+            case wxLIST_FORMAT_RIGHT:
+                x += width - w;
+                break;
+
+            case wxLIST_FORMAT_CENTER:
+                x += (width - w) / 2;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                break;

         }
 
         }
 

-        x = xOld + width;
+        dc->DrawText(text, x, y);
+    }
+    else // otherwise, truncate and add an ellipsis if possible
+    {
+        // determine the base width
+        wxString ellipsis(wxT("..."));
+        wxCoord base_w;
+        dc->GetTextExtent(ellipsis, &base_w, &h);
+
+        // continue until we have enough space or only one character left
+        wxCoord w_c, h_c;
+        size_t len = text.length();
+        wxString drawntext = text.Left(len);
+        while (len > 1)
+        {
+            dc->GetTextExtent(drawntext.Last(), &w_c, &h_c);
+            drawntext.RemoveLast();
+            len--;
+            w -= w_c;
+            if (w + base_w <= width)
+                break;
+        }

 
 

-        node = node->GetNext();
+        // if still not enough space, remove ellipsis characters
+        while (ellipsis.length() > 0 && w + base_w > width)
+        {
+            ellipsis = ellipsis.Left(ellipsis.length() - 1);
+            dc->GetTextExtent(ellipsis, &base_w, &h);
+        }
+
+        // now draw the text
+        dc->DrawText(drawntext, x, y);
+        dc->DrawText(ellipsis, x + w, y);

     }
 }
 
 bool wxListLineData::Highlight( bool on )
 {
     }
 }
 
 bool wxListLineData::Highlight( bool on )
 {

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

 
     if ( on == m_highlighted )
 
     if ( on == m_highlighted )

-        return FALSE;
+        return false;

 
     m_highlighted = on;
 
 
     m_highlighted = on;
 

-    return TRUE;
+    return true;

 }
 
 void wxListLineData::ReverseHighlight( void )
 }
 
 void wxListLineData::ReverseHighlight( void )


@@ -1700,7 +1693,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)


@@ -1708,88 +1701,58 @@ BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
 END_EVENT_TABLE()
 
     EVT_SET_FOCUS     (wxListHeaderWindow::OnSetFocus)
 END_EVENT_TABLE()
 

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

 {
 {

-    m_owner = (wxListMainWindow *) NULL;

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

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

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

-    m_isDragging = FALSE;

 }
 
 }
 

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

 {
 {

+    Init();
+

     m_owner = owner;
     m_owner = owner;

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

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

-    m_isDragging = FALSE;
-    m_dirty = FALSE;

 
 

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

 }
 
 }
 

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

 {
     delete m_resizeCursor;
 }
 
 {
     delete m_resizeCursor;
 }
 

-void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
-{
-#ifdef __WXGTK__
-    GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
-                                               : GTK_STATE_INSENSITIVE;
-
-    x = dc->XLOG2DEV( x );
-
-    gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window,
-                   state, GTK_SHADOW_OUT,
-                   (GdkRectangle*) NULL, m_wxwindow, "button",
-                   x-1, y-1, w+2, h+2);
-#elif defined( __WXMAC__  )
-    const int m_corner = 1;
-
-    dc->SetBrush( *wxTRANSPARENT_BRUSH );
-
-    dc->SetPen( wxPen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
-    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
-    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
-
-    wxPen pen( wxColour( 0x88 , 0x88 , 0x88 ), 1, wxSOLID );
-
-    dc->SetPen( pen );
-    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
-    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
-
-    dc->SetPen( *wxWHITE_PEN );
-    dc->DrawRectangle( x, y, w-m_corner+1, 1 );   // top (outer)
-    dc->DrawRectangle( x, y, 1, h );              // left (outer)
-    dc->DrawLine( x, y+h-1, x+1, y+h-1 );
-    dc->DrawLine( x+w-1, y, x+w-1, y+1 );
-#else // !GTK, !Mac
-    const int m_corner = 1;
-
-    dc->SetBrush( *wxTRANSPARENT_BRUSH );
-
-    dc->SetPen( *wxBLACK_PEN );
-    dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
-    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
-
-    wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
-
-    dc->SetPen( pen );
-    dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
-    dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
-
-    dc->SetPen( *wxWHITE_PEN );
-    dc->DrawRectangle( x, y, w-m_corner+1, 1 );   // top (outer)
-    dc->DrawRectangle( x, y, 1, h );              // left (outer)
-    dc->DrawLine( x, y+h-1, x+1, y+h-1 );
-    dc->DrawLine( x+w-1, y, x+w-1, y+1 );
+#ifdef __WXUNIVERSAL__
+#include "wx/univ/renderer.h"
+#include "wx/univ/theme.h"

 #endif
 #endif

-}

 
 // shift the DC origin to match the position of the main window horz
 // scrollbar: this allows us to always use logical coords
 
 // shift the DC origin to match the position of the main window horz
 // scrollbar: this allows us to always use logical coords


@@ -1798,26 +1761,35 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 

-    int x;
-    m_owner->GetViewStart( &x, NULL );
+    int view_start;
+    m_owner->GetViewStart( &view_start, NULL );
+
+
+    int org_x = 0;
+    int org_y = 0;
+    dc.GetDeviceOrigin( &org_x, &org_y );

 
     // account for the horz scrollbar offset
 
     // account for the horz scrollbar offset

-    dc.SetDeviceOrigin( -x * xpix, 0 );
+#ifdef __WXGTK__
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+    {
+        // Maybe we just have to check for m_signX
+        // in the DC, but I leave the #ifdef __WXGTK__
+        // for now
+        dc.SetDeviceOrigin( org_x + (view_start * xpix), org_y );
+    }
+    else
+#endif
+        dc.SetDeviceOrigin( org_x - (view_start * xpix), org_y );

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

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

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

-#endif

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

-    dc.BeginDrawing();
-

     dc.SetFont( GetFont() );
 
     // width and height of the entire header window
     dc.SetFont( GetFont() );
 
     // width and height of the entire header window


@@ -1826,46 +1798,126 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
 
     dc.SetBackgroundMode(wxTRANSPARENT);

-
-    // do *not* use the listctrl colour for headers - one day we will have a
-    // function to set it separately
-    //dc.SetTextForeground( *wxBLACK );
-    dc.SetTextForeground(wxSystemSettings::
-                            GetSystemColour( wxSYS_COLOUR_WINDOWTEXT ));
+    dc.SetTextForeground(GetForegroundColour());

 
     int x = HEADER_OFFSET_X;
 
     int x = HEADER_OFFSET_X;

-

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

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

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

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

 
 

-        int xEnd = x + wCol;
+        // the width of the rect to draw: make it smaller to fit entirely
+        // inside the column rect
+#ifdef __WXMAC__
+        int cw = wCol;
+        int ch = h;
+#else
+        int cw = wCol - 2;
+        int ch = h - 2;
+#endif

 
 

-        dc.SetPen( *wxWHITE_PEN );
+        int flags = 0;
+        if (!m_parent->IsEnabled())
+            flags |= wxCONTROL_DISABLED;

 
 

-        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;
+// NB: The code below is not really Mac-specific, but since we are close
+// to 2.8 release and I don't have time to test on other platforms, I
+// defined this only for wxMac. If this behavior is desired on
+// other platforms, please go ahead and revise or remove the #ifdef.
+#ifdef __WXMAC__
+        if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) &&
+                (item.m_state & wxLIST_STATE_SELECTED) )
+            flags |= wxCONTROL_SELECTED;
+#endif

 
 

-        if (xEnd > w+5)
-            break;
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(x, HEADER_OFFSET_Y, cw, ch),
+                                    flags
+                                );
+
+        // see if we have enough space for the column label
+
+        // for this we need the width of the text
+        wxCoord wLabel;
+        wxCoord hLabel;
+        dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
+        wLabel += 2 * EXTRA_WIDTH;
+
+        // and the width of the icon, if any
+        int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
+        const int image = item.m_image;
+        wxImageList *imageList;
+        if ( image != -1 )
+        {
+            imageList = m_owner->m_small_image_list;
+            if ( imageList )
+            {
+                imageList->GetSize(image, ix, iy);
+                wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
+            }
+        }
+        else
+        {
+            imageList = NULL;
+        }
+
+        // ignore alignment if there is not enough space anyhow
+        int xAligned;
+        switch ( wLabel < cw ? item.GetAlign() : wxLIST_FORMAT_LEFT )
+        {
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                // fall through
+
+            case wxLIST_FORMAT_LEFT:
+                xAligned = x;
+                break;
+
+            case wxLIST_FORMAT_RIGHT:
+                xAligned = x + cw - wLabel;
+                break;
+
+            case wxLIST_FORMAT_CENTER:
+                xAligned = x + (cw - wLabel) / 2;
+                break;
+        }
+
+        // draw the text and image clipping them so that they
+        // don't overwrite the column boundary
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+
+        // if we have an image, draw it on the right of the label
+        if ( imageList )
+        {
+            imageList->Draw
+                       (
+                        image,
+                        dc,
+                        xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,
+                        HEADER_OFFSET_Y + (h - 4 - iy)/2,
+                        wxIMAGELIST_DRAW_TRANSPARENT
+                       );
+        }
+
+        dc.DrawText( item.GetText(),
+                     xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
+
+        x += wCol;

     }
     }

-    dc.EndDrawing();

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

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

 
 

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

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


@@ -1894,6 +1946,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 
     if (m_isDragging)
     {
 
     if (m_isDragging)
     {

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

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


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

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

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

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

         }
         else
         {
         }
         else
         {


@@ -1927,14 +1982,15 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     else // not dragging
     {
         m_minX = 0;
     else // not dragging
     {
         m_minX = 0;

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

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

-        // find the column where this event occured
-        int countCol = m_owner->GetColumnCount();
-        for (int col = 0; col < countCol; col++)
+        // find the column where this event occurred
+        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;


@@ -1942,7 +1998,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border

-                hit_border = TRUE;
+                hit_border = true;

                 break;
             }
 
                 break;
             }
 


@@ -1955,22 +2011,45 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             m_minX = xpos;
         }
 
             m_minX = xpos;
         }
 

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

         {
         {

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

             {
             {

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

             }
             }

-            else
+            else // click on a column

             {
             {

-                wxWindow *parent = GetParent();
-                wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, parent->GetId() );
-                le.SetEventObject( parent );
-                le.m_col = m_column;
-                parent->GetEventHandler()->ProcessEvent( le );
+                // record the selected state of the columns
+                if (event.LeftDown())
+                {
+                    for (int i=0; i < m_owner->GetColumnCount(); i++)
+                    {
+                        wxListItem colItem;
+                        m_owner->GetColumn(i, colItem);
+                        long state = colItem.GetState();
+                        if (i == m_column)
+                            colItem.SetState(state | wxLIST_STATE_SELECTED);
+                        else
+                            colItem.SetState(state & ~wxLIST_STATE_SELECTED);
+                        m_owner->SetColumn(i, colItem);
+                    }
+                }
+
+                SendListEvent( event.LeftDown()
+                                    ? wxEVT_COMMAND_LIST_COL_CLICK
+                                    : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+                                event.GetPosition());

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


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

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

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


@@ -2013,104 +2110,149 @@ void wxListRenameTimer::Notify()
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

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

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

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

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

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

     m_owner = owner;
     m_owner = owner;

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

 }
 
 }
 

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

 {
 {

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

     {
     {

-        (*m_accept) = TRUE;
-        (*m_res) = GetValue();
+        m_finished = true;
+
+        m_text->RemoveEventHandler(this);
+        m_owner->FinishEditing(m_text);

 
 

-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+        wxPendingDelete.Append( this );
+    }
+}

 
 

-        if ((*m_accept) && ((*m_res) != m_startValue))
-            m_owner->OnRenameAccept();
+bool wxListTextCtrlWrapper::AcceptChanges()
+{
+    const wxString value = m_text->GetValue();

 
 

-        return;
+    // notice that we should always call OnRenameAccept() to generate the "end
+    // label editing" event, even if the user hasn't really changed anything
+    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
+    {
+        // vetoed by the user
+        return false;

     }
     }

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

     {
     {

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

 
 

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

 
 

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

     }
     }

-
-    event.Skip();

 }
 
 }
 

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

 {
 {

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

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

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

     int sx, sy;
     int sx, sy;

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

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

-    SetSize(sx, -1);
+    m_text->SetSize(sx, wxDefaultCoord);

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

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

 {
 {

-    if (!wxPendingDelete.Member(this))
-        wxPendingDelete.Append(this);
+    if ( !m_finished && !m_aboutToFinish )
+    {
+        if ( !AcceptChanges() )
+            m_owner->OnRenameCancelled( m_itemEdited );
+
+        Finish();
+    }

 
 

-    if ((*m_accept) && ((*m_res) != m_startValue))
-        m_owner->OnRenameAccept();
+    // We must let the native text control handle focus
+    event.Skip();

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

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

 
 BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_PAINT          (wxListMainWindow::OnPaint)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
 
 BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_PAINT          (wxListMainWindow::OnPaint)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)

+  EVT_KEY_UP         (wxListMainWindow::OnKeyUp)

   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)


@@ -2118,8 +2260,7 @@ END_EVENT_TABLE()
 
 void wxListMainWindow::Init()
 {
 
 void wxListMainWindow::Init()
 {

-    m_columns.DeleteContents( TRUE );
-    m_dirty = TRUE;
+    m_dirty = true;

     m_countVirt = 0;
     m_lineFrom =
     m_lineTo = (size_t)-1;
     m_countVirt = 0;
     m_lineFrom =
     m_lineTo = (size_t)-1;


@@ -2134,42 +2275,28 @@ void wxListMainWindow::Init()
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

     m_dragCount = 0;
     m_dragCount = 0;

-    m_isCreated = FALSE;
+    m_isCreated = false;

 
 

-    m_lastOnSame = FALSE;
+    m_lastOnSame = false;

     m_renameTimer = new wxListRenameTimer( this );
     m_renameTimer = new wxListRenameTimer( this );

-    m_renameAccept = FALSE;
+    m_textctrlWrapper = NULL;

 
     m_current =
 
     m_current =

-    m_currentEdit =

     m_lineLastClicked =
     m_lineLastClicked =

+    m_lineSelectSingleOnUp =

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

-}

 
 

-void wxListMainWindow::InitScrolling()
-{
-    if ( HasFlag(wxLC_REPORT) )
-    {
-        m_xScroll = SCROLL_UNIT_X;
-        m_yScroll = SCROLL_UNIT_Y;
-    }
-    else
-    {
-        m_xScroll = SCROLL_UNIT_Y;
-        m_yScroll = 0;
-    }
+    m_freezeCount = 0;

 }
 
 wxListMainWindow::wxListMainWindow()
 {
     Init();
 
 }
 
 wxListMainWindow::wxListMainWindow()
 {
     Init();
 

-    m_highlightBrush = (wxBrush *) NULL;
-
-    m_xScroll =
-    m_yScroll = 0;
+    m_highlightBrush =
+    m_highlightUnfocusedBrush = (wxBrush *) NULL;

 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,
 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,


@@ -2183,28 +2310,47 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

-    m_highlightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
-    wxSize sz = size;
-    sz.y = 25;
-
-    InitScrolling();
-    SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
-
-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+    m_highlightBrush = new wxBrush
+                         (
+                            wxSystemSettings::GetColour
+                            (
+                                wxSYS_COLOUR_HIGHLIGHT
+                            ),
+                            wxSOLID
+                         );
+
+    m_highlightUnfocusedBrush = new wxBrush
+                              (
+                                 wxSystemSettings::GetColour
+                                 (
+                                     wxSYS_COLOUR_BTNSHADOW
+                                 ),
+                                 wxSOLID
+                              );
+
+    SetScrollbars( 0, 0, 0, 0, 0, 0 );
+
+    wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );

 }
 
 wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();
 }
 
 wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();

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

 
     delete m_highlightBrush;
 
     delete m_highlightBrush;

-
+    delete m_highlightUnfocusedBrush;

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

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

 
     wxListLineData *ld = GetDummyLine();
 
 
     wxListLineData *ld = GetDummyLine();
 


@@ -2212,25 +2358,36 @@ void wxListMainWindow::CacheLineData(size_t line)
     for ( size_t col = 0; col < countCol; col++ )
     {
         ld->SetText(col, listctrl->OnGetItemText(line, col));
     for ( size_t col = 0; col < countCol; col++ )
     {
         ld->SetText(col, listctrl->OnGetItemText(line, col));

+        ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));

     }
 
     }
 

-    ld->SetImage(listctrl->OnGetItemImage(line));

     ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
     ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );

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

 
 

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

     {
     {

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

 
 

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

         wxListLineData *line = new wxListLineData(self);
         self->m_lines.Add(line);
         wxListLineData *line = new wxListLineData(self);
         self->m_lines.Add(line);

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

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


@@ -2242,8 +2399,6 @@ wxListLineData *wxListMainWindow::GetDummyLine() const
 
 wxCoord wxListMainWindow::GetLineHeight() const
 {
 
 wxCoord wxListMainWindow::GetLineHeight() const
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
-

     // we cache the line height as calling GetTextExtent() is slow
     if ( !m_lineHeight )
     {
     // we cache the line height as calling GetTextExtent() is slow
     if ( !m_lineHeight )
     {


@@ -2255,10 +2410,14 @@ wxCoord wxListMainWindow::GetLineHeight() const
         wxCoord y;
         dc.GetTextExtent(_T("H"), NULL, &y);
 
         wxCoord y;
         dc.GetTextExtent(_T("H"), NULL, &y);
 

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

 
 

+        y += EXTRA_HEIGHT;

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


@@ -2267,9 +2426,9 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
 wxCoord wxListMainWindow::GetLineY(size_t line) const
 {
 
 wxCoord wxListMainWindow::GetLineY(size_t line) const
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
+    wxASSERT_MSG( InReportView(), _T("only works in report mode") );

 
 

-    return LINE_SPACING + line*GetLineHeight();
+    return LINE_SPACING + line * GetLineHeight();

 }
 
 wxRect wxListMainWindow::GetLineRect(size_t line) const
 }
 
 wxRect wxListMainWindow::GetLineRect(size_t line) const


@@ -2291,6 +2450,20 @@ wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
     if ( !InReportView() )
         return GetLine(line)->m_gi->m_rectLabel;
 
     if ( !InReportView() )
         return GetLine(line)->m_gi->m_rectLabel;
 

+    int image_x = 0;
+    wxListLineData *data = GetLine(line);
+    wxListItemDataList::compatibility_iterator node = data->m_items.GetFirst();
+    if (node)
+    {
+        wxListItemData *item = node->GetData();
+        if ( item->HasImage() )
+        {
+            int ix, iy;
+            GetImageSize( item->GetImage(), ix, iy );
+            image_x = 3 + ix + IMAGE_MARGIN_IN_REPORT_MODE;
+        }
+    }
+

     wxRect rect;
     rect.x = HEADER_OFFSET_X;
     rect.y = GetLineY(line);
     wxRect rect;
     rect.x = HEADER_OFFSET_X;
     rect.y = GetLineY(line);


@@ -2324,17 +2497,22 @@ wxRect wxListMainWindow::GetLineHighlightRect(size_t line) const
 
 long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
 {
 
 long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
 {

+    wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") );
+

     wxListLineData *ld = GetLine(line);
 
     wxListLineData *ld = GetLine(line);
 

-    if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
+    if ( ld->HasImage() && GetLineIconRect(line).Contains(x, y) )

         return wxLIST_HITTEST_ONITEMICON;
 
         return wxLIST_HITTEST_ONITEMICON;
 

-    if ( ld->HasText() )
+    // 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);
 
     {
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);
 

-        if ( rect.Inside(x, y) )
+        if ( rect.Contains(x, y) )

             return wxLIST_HITTEST_ONITEMLABEL;
     }
 
             return wxLIST_HITTEST_ONITEMLABEL;
     }
 


@@ -2354,7 +2532,7 @@ bool wxListMainWindow::IsHighlighted(size_t line) const
     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 IsHighlighted") );

 
         return ld->IsHighlighted();
     }
 
         return ld->IsHighlighted();
     }


@@ -2387,9 +2565,7 @@ void wxListMainWindow::HighlightLines( size_t lineFrom,
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )

-            {

                 RefreshLine(line);
                 RefreshLine(line);

-            }

         }
     }
 }
         }
     }
 }


@@ -2405,7 +2581,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);
     }


@@ -2421,6 +2597,15 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
 
 void wxListMainWindow::RefreshLine( size_t line )
 {

+    if ( InReportView() )
+    {
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        if ( line < visibleFrom || line > visibleTo )
+            return;
+    }
+

     wxRect rect = GetLineRect(line);
 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
     wxRect rect = GetLineRect(line);
 
     CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );


@@ -2434,7 +2619,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
 
     wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
 
 
     wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
 

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

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2465,61 +2650,98 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
 
 void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {
 
 void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {

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

     {
     {

-        size_t visibleFrom;
-        GetVisibleLinesRange(&visibleFrom, NULL);
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);

 
         if ( lineFrom < visibleFrom )
             lineFrom = visibleFrom;
 
         if ( lineFrom < visibleFrom )
             lineFrom = visibleFrom;

+        else if ( lineFrom > visibleTo )
+            return;

 
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
 
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);

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

 
         wxSize size = GetClientSize();
         rect.width = size.x;
 
         wxSize size = GetClientSize();
         rect.width = size.x;

+

         // refresh till the bottom of the window
         rect.height = size.y - rect.y;
 
         // 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?
         RefreshRect( rect );
     }
     else // !report
     {
         // TODO: how to do it more efficiently?

-        m_dirty = TRUE;
+        m_dirty = true;

     }
 }
 
     }
 }
 

+void wxListMainWindow::RefreshSelected()
+{
+    if ( IsEmpty() )
+        return;
+
+    size_t from, to;
+    if ( InReportView() )
+    {
+        GetVisibleLinesRange(&from, &to);
+    }
+    else // !virtual
+    {
+        from = 0;
+        to = GetItemCount() - 1;
+    }
+
+    if ( HasCurrent() && m_current >= from && m_current <= to )
+        RefreshLine(m_current);
+
+    for ( size_t line = from; line <= to; line++ )
+    {
+        // NB: the test works as expected even if m_current == -1
+        if ( line != m_current && IsHighlighted(line) )
+            RefreshLine(line);
+    }
+}
+
+void wxListMainWindow::Freeze()
+{
+    m_freezeCount++;
+}
+
+void wxListMainWindow::Thaw()
+{
+    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );
+
+    if ( --m_freezeCount == 0 )
+        Refresh();
+}
+

 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     // Note: a wxPaintDC must be constructed even if no drawing is
     // done (a Windows requirement).
     wxPaintDC dc( this );
 
 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() )
-    {
-        // empty control. nothing to draw
+    if ( IsEmpty() || m_freezeCount )
+        // nothing to draw or not the moment to draw it

         return;
         return;

-    }

 
     if ( m_dirty )
 
     if ( m_dirty )

-    {

         // delay the repainting until we calculate all the items positions
         return;
         // delay the repainting until we calculate all the items positions
         return;

-    }

 
     PrepareDC( dc );
 
     int dev_x, dev_y;
     CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
 
 
     PrepareDC( dc );
 
     int dev_x, dev_y;
     CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
 

-    dc.BeginDrawing();
-

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

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

     {
         int lineHeight = GetLineHeight();
 
     {
         int lineHeight = GetLineHeight();
 


@@ -2527,8 +2749,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
 
         wxRect rectLine;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
 
         wxRect rectLine;

-        wxCoord xOrig, yOrig;
-        CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
+        int xOrig = dc.LogicalToDeviceX( 0 );
+        int yOrig = dc.LogicalToDeviceY( 0 );

 
         // tell the caller cache to cache the data
         if ( IsVirtual() )
 
         // tell the caller cache to cache the data
         if ( IsVirtual() )


@@ -2545,7 +2767,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             rectLine = GetLineRect(line);
 
         {
             rectLine = GetLineRect(line);
 

-            if ( !IsExposed(rectLine.x - xOrig, rectLine.y - yOrig,
+
+            if ( !IsExposed(rectLine.x + xOrig, rectLine.y + yOrig,

                             rectLine.width, rectLine.height) )
             {
                 // don't redraw unaffected lines to avoid flicker
                             rectLine.width, rectLine.height) )
             {
                 // don't redraw unaffected lines to avoid flicker


@@ -2563,21 +2786,23 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 

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

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

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

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

-            if ( visibleTo > visibleFrom )
+            if ( visibleTo == GetItemCount() - 1 )

             {
             {

-                dc.SetPen(pen);
+                dc.SetPen( pen );

                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );

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

             }
         }
 
             }
         }
 


@@ -2585,21 +2810,22 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {
             wxPen pen(GetRuleColour(), 1, wxSOLID);
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {
             wxPen pen(GetRuleColour(), 1, wxSOLID);

+            wxRect firstItemRect, lastItemRect;

 
 

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

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

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

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

-                dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y,
-                            x - dev_x, lastItemRect.GetBottom() + 1 - dev_y);
+                int x_pos = x - dev_x;
+                if (col < GetColumnCount()-1) x_pos -= 2;
+                dc.DrawLine(x_pos, firstItemRect.GetY() - 1 - dev_y,
+                            x_pos, lastItemRect.GetBottom() + 1 - dev_y);

             }
         }
     }
             }
         }
     }


@@ -2612,30 +2838,36 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

-    if ( HasCurrent() && m_hasFocus )
+#ifndef __WXMAC__
+    // Don't draw rect outline under Mac at all.
+    if ( HasCurrent() )

     {
     {

-#ifdef __WXMAC__
-        // no rect outline, we already have the background color
+        if ( m_hasFocus )
+        {
+            wxRect rect( GetLineHighlightRect( m_current ) );
+#ifndef __WXGTK20__
+            dc.SetPen( *wxBLACK_PEN );
+            dc.SetBrush( *wxTRANSPARENT_BRUSH );
+            dc.DrawRectangle( rect );

 #else
 #else

-        dc.SetPen( *wxBLACK_PEN );
-        dc.SetBrush( *wxTRANSPARENT_BRUSH );
-        dc.DrawRectangle( GetLineHighlightRect(m_current) );
+            wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, wxCONTROL_CURRENT|wxCONTROL_FOCUSED );
+

 #endif
 #endif

+        }

     }
     }

-
-    dc.EndDrawing();
+#endif

 }
 
 void wxListMainWindow::HighlightAll( bool on )
 {
     if ( IsSingleSel() )
     {
 }
 
 void wxListMainWindow::HighlightAll( bool on )
 {
     if ( IsSingleSel() )
     {

-        wxASSERT_MSG( !on, _T("can't do this in a single sel control") );
+        wxASSERT_MSG( !on, _T("can't do this in a single selection control") );

 
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )
         {
 
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )
         {

-            HighlightLine(m_current, FALSE);
+            HighlightLine(m_current, false);

             RefreshLine(m_current);
         }
     }
             RefreshLine(m_current);
         }
     }


@@ -2647,78 +2879,84 @@ void wxListMainWindow::HighlightAll( bool on )
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,

-                                   wxPoint point )
+                                   const wxPoint& point )

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

+

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

-    if ( command != wxEVT_COMMAND_LIST_DELETE_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() )

     {
     {

-        GetLine(line)->GetItem( 0, le.m_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 );
 }
 
     }
     //else: there may be no more such item
 
     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 );
+    // as the current item changed, we shouldn't start editing it when the
+    // "slow click" timer expires as the click happened on another item
+    if ( m_renameTimer->IsRunning() )
+        m_renameTimer->Stop();
+
+    SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);

 }
 
 }
 

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

 {
 {

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

 
 

-    m_currentEdit = (size_t)item;
+    wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
+                 wxT("EditLabel() needs a text control") );
+
+    size_t itemEdit = (size_t)item;

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

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

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

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

 
 

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

 
     // We have to call this here because the label in question might just have
     // been added and no screen update taken place.
 
     // We have to call this here because the label in question might just have
     // been added and no screen update taken place.

-    if (m_dirty)
+    if ( m_dirty )
+    {

         wxSafeYield();
 
         wxSafeYield();
 

-    wxClientDC dc(this);
-    PrepareDC( dc );
-
-    wxString s = data->GetText(0);
-    wxRect rectLabel = GetLineLabelRect(m_currentEdit);
-
-    rectLabel.x = dc.LogicalToDeviceX( rectLabel.x );
-    rectLabel.y = dc.LogicalToDeviceY( rectLabel.y );
+        // Pending events dispatched by wxSafeYield might have changed the item
+        // count
+        if ( (size_t)item >= GetItemCount() )
+            return NULL;
+    }

 
 

-    wxListTextCtrl *text = new wxListTextCtrl
-                               (
-                                this, -1,
-                                &m_renameAccept,
-                                &m_renameRes,
-                                this,
-                                s,
-                                wxPoint(rectLabel.x-4,rectLabel.y-4),
-                                wxSize(rectLabel.width+11,rectLabel.height+8)
-                               );
-    text->SetFocus();
+    wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
+    m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
+    return m_textctrlWrapper->GetText();

 }
 
 void wxListMainWindow::OnRenameTimer()
 }
 
 void wxListMainWindow::OnRenameTimer()


@@ -2728,37 +2966,75 @@ void wxListMainWindow::OnRenameTimer()
     EditLabel( m_current );
 }
 
     EditLabel( m_current );
 }
 

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

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

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

 
 

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

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

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

 
 

-    if (!le.IsAllowed()) return;
+void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
+{
+    // let owner know that the edit was cancelled
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );

 
 

-    wxListItem info;
-    info.m_mask = wxLIST_MASK_TEXT;
-    info.m_itemId = le.m_itemIndex;
-    info.m_text = m_renameRes;
-    info.SetTextColour(le.m_item.GetTextColour());
-    SetItem( info );
+    le.SetEditCanceled(true);
+
+    le.SetEventObject( GetParent() );
+    le.m_itemIndex = itemEdit;
+
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
+
+    data->GetItem( 0, le.m_item );
+    GetEventHandler()->ProcessEvent( le );

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

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

     event.SetEventObject( GetParent() );
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
 
     event.SetEventObject( GetParent() );
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
 

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

     if ( !HasCurrent() || IsEmpty() )
     if ( !HasCurrent() || IsEmpty() )

+    {
+        if (event.RightDown())
+        {
+            SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+            // Allow generation of context menu event
+            event.Skip();
+        }

         return;
         return;

+    }

 
     if (m_dirty)
         return;
 
     if (m_dirty)
         return;


@@ -2777,7 +3053,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     size_t count = GetItemCount(),
            current;
 
     size_t count = GetItemCount(),
            current;
 

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

     {
         current = y / GetLineHeight();
         if ( current < count )
     {
         current = y / GetLineHeight();
         if ( current < count )


@@ -2798,7 +3074,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++;
 


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

+        le.m_itemIndex = m_lineLastClicked;

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


@@ -2823,16 +3105,30 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if ( !hitResult )
     {
         // outside of any item
     if ( !hitResult )
     {
         // outside of any item

+        if (event.RightDown())
+        {
+            SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+            // Allow generation of context menu event
+            event.Skip();
+        }
+        else
+        {
+            // reset the selection and bail out
+            HighlightAll(false);
+        }
+

         return;
     }
 
         return;
     }
 

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

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

-        m_renameTimer->Stop();
-        m_lastOnSame = FALSE;
+        if ( m_renameTimer->IsRunning() )
+            m_renameTimer->Stop();

 
 

-        if ( current == m_lineBeforeLastClicked )
+        m_lastOnSame = false;
+
+        if ( current == m_lineLastClicked )

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


@@ -2840,26 +3136,68 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
         else
         {
         }
         else
         {

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

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

-            forceClick = TRUE;
+            forceClick = true;

         }
     }
 
         }
     }
 

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

     {
     {

-        if ((current == m_current) &&
-            (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
-            HasFlag(wxLC_EDIT_LABELS)  )
+        if (m_lineSelectSingleOnUp != (size_t)-1)

         {
         {

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

         }
         }

-        m_lastOnSame = FALSE;
+
+        if (m_lastOnSame)
+        {
+            if ((current == m_current) &&
+                (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
+                HasFlag(wxLC_EDIT_LABELS) )
+            {
+                if (InReportView())
+                {
+                    wxRect label = GetLineLabelRect( current );
+                    if (label.Contains( x, y ))
+                        m_renameTimer->Start( 250, true );
+
+                }
+                else
+                    m_renameTimer->Start( 250, true );
+            }
+        }
+
+        m_lastOnSame = false;
+        m_lineSelectSingleOnUp = (size_t)-1;
+    }
+    else
+    {
+        // This is necessary, because after a DnD operation in
+        // from and to ourself, the up event is swallowed by the
+        // DnD code. So on next non-up event (which means here and
+        // now) m_lineSelectSingleOnUp should be reset.
+        m_lineSelectSingleOnUp = (size_t)-1;

     }
     }

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

     {
     {

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

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


@@ -2871,25 +3209,36 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;

+        bool oldWasSelected = IsHighlighted(m_current);
+
+        bool cmdModifierDown = event.CmdDown();
+        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
+        {
+            if ( IsSingleSel() || !IsHighlighted(current) )
+            {
+                HighlightAll( false );

 
 

-        if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )
-        {
-            HighlightAll( FALSE );
-            m_current = current;
+                ChangeCurrent(current);

 
 

-            ReverseHighlight(m_current);
+                ReverseHighlight(m_current);
+            }
+            else // multi sel & current is highlighted & no mod keys
+            {
+                m_lineSelectSingleOnUp = current;
+                ChangeCurrent(current); // change focus
+            }

         }
         else // multi sel & either ctrl or shift is down
         {
         }
         else // multi sel & either ctrl or shift is down
         {

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

             {
             {

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


@@ -2910,14 +3259,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         if (m_current != oldCurrent)
         }
 
         if (m_current != oldCurrent)

-        {

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

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

     }
 }
 
     }
 }
 


@@ -2931,26 +3276,28 @@ void wxListMainWindow::MoveToItem(size_t item)
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );
 
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );
 

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

 
 

-    if ( HasFlag(wxLC_REPORT) )
+    int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL );
+    int view_y = hLine * GetScrollPos( wxVERTICAL );
+
+    if ( InReportView() )

     {
     {

-        // the next we need the range of lines shown it might be different, so
-        // recalculate it
+        // the next we need the range of lines shown it might be different,
+        // so recalculate it

         ResetVisibleLinesRange();
 
         ResetVisibleLinesRange();
 

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

     }
     else // !report
     {
         if (rect.x-view_x < 5)
     }
     else // !report
     {
         if (rect.x-view_x < 5)

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

     }
 }
 
     }
 }
 


@@ -2969,7 +3316,10 @@ 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);
+
+        // refresh the old focus to remove it
+        RefreshLine( oldCurrent );

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


@@ -2983,22 +3333,20 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     else // !shift
     {
         // all previously selected items are unselected unless ctrl is held
     else // !shift
     {
         // all previously selected items are unselected unless ctrl is held

-        if ( !event.ControlDown() )
-            HighlightAll(FALSE);
+        // in a multiselection control
+        if ( !event.ControlDown() || IsSingleSel() )
+            HighlightAll(false);

 
 

-        m_current = newCurrent;
+        ChangeCurrent(newCurrent);

 
 

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

         RefreshLine( oldCurrent );
 
         RefreshLine( oldCurrent );
 

-        if ( !event.ControlDown() )
-        {
-            HighlightLine( m_current, TRUE );
-        }
+        // in single selection mode we must always have a selected item
+        if ( !event.ControlDown() || IsSingleSel() )
+            HighlightLine( m_current, true );

     }
 
     }
 

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

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


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

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

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


@@ -3023,22 +3371,41 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxListMainWindow::OnKeyUp( wxKeyEvent &event )
+{
+    wxWindow *parent = GetParent();
+
+    // propagate the key event upwards
+    wxKeyEvent ke( wxEVT_KEY_UP );
+    ke.m_shiftDown = event.m_shiftDown;
+    ke.m_controlDown = event.m_controlDown;
+    ke.m_altDown = event.m_altDown;
+    ke.m_metaDown = event.m_metaDown;
+    ke.m_keyCode = event.m_keyCode;
+    ke.m_x = event.m_x;
+    ke.m_y = event.m_y;
+    ke.SetEventObject( parent );
+    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+
+    event.Skip();
+}
+

 void wxListMainWindow::OnChar( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 
 void wxListMainWindow::OnChar( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 

-    /* we send a list_key event up */
+    // send a list_key event up

     if ( HasCurrent() )
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
         le.m_itemIndex = m_current;
         GetLine(m_current)->GetItem( 0, le.m_item );
     if ( HasCurrent() )
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
         le.m_itemIndex = m_current;
         GetLine(m_current)->GetItem( 0, le.m_item );

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

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

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

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


@@ -3050,24 +3417,37 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 

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

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

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

     }
 
     }
 

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

     if (!HasCurrent())
     {
         event.Skip();
         return;
     }
 
     if (!HasCurrent())
     {
         event.Skip();
         return;
     }
 

-    switch (event.KeyCode())
+    // don't use m_linesPerPage directly as it might not be computed yet
+    const int pageSize = GetCountPerPage();
+    wxCHECK_RET( pageSize, _T("should have non zero page size") );
+
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+    {
+        if (event.GetKeyCode() == WXK_RIGHT)
+            event.m_keyCode = WXK_LEFT;
+        else if (event.GetKeyCode() == WXK_LEFT)
+            event.m_keyCode = WXK_RIGHT;
+    }
+
+    switch ( event.GetKeyCode() )

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


@@ -3089,17 +3469,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
                 OnArrowChar( 0, event );
             break;
 
                 OnArrowChar( 0, event );
             break;
 

-        case WXK_PRIOR:
+        case WXK_PAGEUP:

             {
             {

-                int steps = 0;
-                if ( HasFlag(wxLC_REPORT) )
-                {
-                    steps = m_linesPerPage - 1;
-                }
-                else
-                {
-                    steps = m_current % m_linesPerPage;
-                }
+                int steps = InReportView() ? pageSize - 1
+                                           : m_current % pageSize;

 
                 int index = m_current - steps;
                 if (index < 0)
 
                 int index = m_current - steps;
                 if (index < 0)


@@ -3109,17 +3482,11 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             }
             break;
 
             }
             break;
 

-        case WXK_NEXT:
+        case WXK_PAGEDOWN:

             {
             {

-                int steps = 0;
-                if ( HasFlag(wxLC_REPORT) )
-                {
-                    steps = m_linesPerPage - 1;
-                }
-                else
-                {
-                    steps = m_linesPerPage - (m_current % m_linesPerPage) - 1;
-                }
+                int steps = InReportView()
+                                ? pageSize - 1
+                                : pageSize - (m_current % pageSize) - 1;

 
                 size_t index = m_current + steps;
                 size_t count = GetItemCount();
 
                 size_t index = m_current + steps;
                 size_t count = GetItemCount();


@@ -3131,9 +3498,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_LEFT:
             break;
 
         case WXK_LEFT:

-            if ( !HasFlag(wxLC_REPORT) )
+            if ( !InReportView() )

             {
             {

-                int index = m_current - m_linesPerPage;
+                int index = m_current - pageSize;

                 if (index < 0)
                     index = 0;
 
                 if (index < 0)
                     index = 0;
 


@@ -3142,9 +3509,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_RIGHT:
             break;
 
         case WXK_RIGHT:

-            if ( !HasFlag(wxLC_REPORT) )
+            if ( !InReportView() )

             {
             {

-                size_t index = m_current + m_linesPerPage;
+                size_t index = m_current + pageSize;

 
                 size_t count = GetItemCount();
                 if ( index >= count )
 
                 size_t count = GetItemCount();
                 if ( index >= count )


@@ -3157,14 +3524,16 @@ 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 );
+                if ( event.ControlDown() )
+                {
+                    ReverseHighlight(m_current);
+                }
+                else // normal space press
+                {
+                    SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
+                }

             }
             }

-            else
+            else // multiple selection

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


@@ -3172,14 +3541,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 
         case WXK_RETURN:
         case WXK_EXECUTE:
 
         case WXK_RETURN:
         case WXK_EXECUTE:

-            {
-                wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
-                                GetParent()->GetId() );
-                le.SetEventObject( GetParent() );
-                le.m_itemIndex = 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:


@@ -3191,35 +3553,40 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK__
-extern wxWindow *g_focusWindow;
-#endif
-

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

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

 
 

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

 
 

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

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

-    m_hasFocus = FALSE;
+    if ( GetParent() )
+    {
+        wxFocusEvent event( wxEVT_KILL_FOCUS, GetParent()->GetId() );
+        event.SetEventObject( GetParent() );
+        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+            return;
+    }

 
 

-    if ( HasCurrent() )
-        RefreshLine( m_current );
+    m_hasFocus = false;
+    RefreshSelected();

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


@@ -3236,7 +3603,7 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }

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

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


@@ -3256,7 +3623,7 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const
     {
         m_small_image_list->GetSize( index, width, height );
     }
     {
         m_small_image_list->GetSize( index, width, height );
     }

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

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


@@ -3280,15 +3647,13 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
 
 void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
 {
 
 void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
 {

-    m_dirty = TRUE;
+    m_dirty = true;

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

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

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

-    {

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

-    }

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


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

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

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

-    m_dirty = TRUE;
+    m_dirty = true;

     if (isSmall)
     if (isSmall)

-    {

         m_small_spacing = spacing;
         m_small_spacing = spacing;

-    }

     else
     else

-    {

         m_normal_spacing = spacing;
         m_normal_spacing = spacing;

-    }

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


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

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

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


@@ -3339,9 +3701,9 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item )
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )

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

 
 

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -3352,12 +3714,15 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
     wxCHECK_RET( col >= 0 && col < GetColumnCount(),
                  _T("invalid column index") );
 
     wxCHECK_RET( col >= 0 && col < GetColumnCount(),
                  _T("invalid column index") );
 

-    wxCHECK_RET( HasFlag(wxLC_REPORT),
+    wxCHECK_RET( InReportView(),

                  _T("SetColumnWidth() can only be called in report mode.") );
 
                  _T("SetColumnWidth() can only be called in report mode.") );
 

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

 
 

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

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


@@ -3367,6 +3732,19 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
     if (width == wxLIST_AUTOSIZE_USEHEADER)
     {
         width = GetTextLength(column->GetText());
     if (width == wxLIST_AUTOSIZE_USEHEADER)
     {
         width = GetTextLength(column->GetText());

+        width += 2*EXTRA_WIDTH;
+
+        // check for column header's image availability
+        const int image = column->GetImage();
+        if ( image != -1 )
+        {
+            if ( m_small_image_list )
+            {
+                int ix = 0, iy = 0;
+                m_small_image_list->GetSize(image, ix, iy);
+                width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
+            }
+        }

     }
     else if ( width == wxLIST_AUTOSIZE )
     {
     }
     else if ( width == wxLIST_AUTOSIZE )
     {


@@ -3382,34 +3760,30 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
 
             int max = AUTOSIZE_COL_MARGIN;
 
 
             int max = AUTOSIZE_COL_MARGIN;
 

-            for ( size_t i = 0; i < count; i++ )
+            //  if the cached column width isn't valid then recalculate it
+            if (m_aColWidths.Item(col)->bNeedsUpdate)

             {
             {

-                wxListLineData *line = GetLine(i);
-                wxListItemDataList::Node *n = line->m_items.Item( col );
-
-                wxCHECK_RET( n, _T("no subitem?") );
+                for (size_t i = 0; i < count; i++)
+                {
+                    wxListLineData *line = GetLine( i );
+                    wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );

 
 

-                wxListItemData *item = n->GetData();
-                int current = 0;
+                    wxCHECK_RET( n, _T("no subitem?") );

 
 

-                if (item->HasImage())
-                {
-                    int ix, iy;
-                    GetImageSize( item->GetImage(), ix, iy );
-                    current += ix + 5;
-                }
+                    wxListItemData *itemData = n->GetData();
+                    wxListItem      item;

 
 

-                if (item->HasText())
-                {
-                    wxCoord w;
-                    dc.GetTextExtent( item->GetText(), &w, NULL );
-                    current += w;
+                    itemData->GetItem(item);
+                    int itemWidth = GetItemWidthWithImage(&item);
+                    if (itemWidth > max)
+                        max = itemWidth;

                 }
 
                 }
 

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

             }
 
             }
 

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

             width = max + AUTOSIZE_COL_MARGIN;
         }
     }
             width = max + AUTOSIZE_COL_MARGIN;
         }
     }


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

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

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


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

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

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


@@ -3468,28 +3842,86 @@ void wxListMainWindow::SetItem( wxListItem &item )
     {
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );
     {
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );

+
+        // Set item state if user wants
+        if ( item.m_mask & wxLIST_MASK_STATE )
+            SetItemState( item.m_itemId, item.m_state, item.m_state );
+
+        if (InReportView())
+        {
+            //  update the Max Width Cache if needed
+            int width = GetItemWidthWithImage(&item);
+
+            if (width > m_aColWidths.Item(item.m_col)->nMaxWidth)
+                m_aColWidths.Item(item.m_col)->nMaxWidth = width;
+        }

     }
 
     }
 

-    if ( InReportView() )
+    // update the item on screen
+    wxRect rectItem;
+    GetItemRect(id, rectItem);
+    RefreshRect(rectItem);
+}
+
+void wxListMainWindow::SetItemStateAll(long state, long stateMask)
+{
+    if ( IsEmpty() )
+        return;
+
+    // first deal with selection
+    if ( stateMask & wxLIST_STATE_SELECTED )

     {
     {

-        // just refresh the line to show the new value of the text/image
-        RefreshLine((size_t)id);
+        // set/clear select state
+        if ( IsVirtual() )
+        {
+            // optimized version for virtual listctrl.
+            m_selStore.SelectRange(0, GetItemCount() - 1, state == wxLIST_STATE_SELECTED);
+            Refresh();
+        }
+        else if ( state & wxLIST_STATE_SELECTED )
+        {
+            const long count = GetItemCount();
+            for( long i = 0; i <  count; i++ )
+            {
+                SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+            }
+
+        }
+        else
+        {
+            // clear for non virtual (somewhat optimized by using GetNextItem())
+            long i = -1;
+            while ( (i = GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1 )
+            {
+                SetItemState( i, 0, wxLIST_STATE_SELECTED );
+            }
+        }

     }
     }

-    else // !report
+
+    if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) )

     {
     {

-        // refresh everything (resulting in horrible flicker - FIXME!)
-        m_dirty = TRUE;
+        // unfocus all: only one item can be focussed, so clearing focus for
+        // all items is simply clearing focus of the focussed item.
+        SetItemState(m_current, state, stateMask);

     }
     }

+    //(setting focus to all items makes no sense, so it is not handled here.)

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

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

 
     size_t oldCurrent = m_current;
 
     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 )


@@ -3497,13 +3929,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);
                 }
 


@@ -3515,12 +3949,22 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
             // don't do anything if this item is not focused
             if ( item == m_current )
             {
             // don't do anything if this item is not focused
             if ( item == m_current )
             {

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

             }
         }
     }
 
             }
         }
     }
 

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

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


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

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

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

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

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


@@ -3559,7 +4001,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
     }
 }
 
     }
 }
 

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

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


@@ -3581,13 +4023,18 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
     return ret;
 }
 
     return ret;
 }
 

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

 {
     wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
                  _T("invalid item index in GetItem") );
 
     wxListLineData *line = GetLine((size_t)item.m_itemId);
     line->GetItem( item.m_col, item );
 {
     wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
                  _T("invalid item index in GetItem") );
 
     wxListLineData *line = GetLine((size_t)item.m_itemId);
     line->GetItem( item.m_col, item );

+
+    // Get item state if user wants it
+    if ( item.m_mask & wxLIST_MASK_STATE )
+        item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED |
+                                                 wxLIST_STATE_FOCUSED );

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


@@ -3607,16 +4054,14 @@ void wxListMainWindow::SetItemCount(long count)
     ResetVisibleLinesRange();
 
     // scrollbars must be reset
     ResetVisibleLinesRange();
 
     // scrollbars must be reset

-    m_dirty = TRUE;
+    m_dirty = true;

 }
 
 }
 

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

 {
     // deal with the quick case first
     if ( IsSingleSel() )
 {
     // deal with the quick case first
     if ( IsSingleSel() )

-    {
-        return HasCurrent() ? IsHighlighted(m_current) : FALSE;
-    }
+        return HasCurrent() ? IsHighlighted(m_current) : false;

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


@@ -3639,17 +4084,63 @@ int wxListMainWindow::GetSelectedItemCount()
 // item position/size
 // ----------------------------------------------------------------------------
 
 // item position/size
 // ----------------------------------------------------------------------------
 

-void wxListMainWindow::GetItemRect( long index, wxRect &rect )
+wxRect wxListMainWindow::GetViewRect() const
+{
+    wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
+                    _T("wxListCtrl::GetViewRect() only works in icon mode") );
+
+    // we need to find the longest/tallest label
+    wxCoord xMax = 0, yMax = 0;
+    const int count = GetItemCount();
+    if ( count )
+    {
+        for ( int i = 0; i < count; i++ )
+        {
+            wxRect r;
+            GetItemRect(i, r);
+
+            wxCoord x = r.GetRight(),
+                    y = r.GetBottom();
+
+            if ( x > xMax )
+                xMax = x;
+            if ( y > yMax )
+                yMax = y;
+        }
+    }
+
+    // some fudge needed to make it look prettier
+    xMax += 2 * EXTRA_BORDER_X;
+    yMax += 2 * EXTRA_BORDER_Y;
+
+    // account for the scrollbars if necessary
+    const wxSize sizeAll = GetClientSize();
+    if ( xMax > sizeAll.x )
+        yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    if ( yMax > sizeAll.y )
+        xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
+    return wxRect(0, 0, xMax, yMax);
+}
+
+void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const

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

+    // ensure that we're laid out, otherwise we could return nonsense
+    if ( m_dirty )
+    {
+        wxConstCast(this, wxListMainWindow)->
+            RecalculatePositions(true /* no refresh */);
+    }
+

     rect = GetLineRect((size_t)index);
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
 
     rect = GetLineRect((size_t)index);
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
 

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

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


@@ -3657,7 +4148,7 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
     pos.x = rect.x;
     pos.y = rect.y;
 
     pos.x = rect.x;
     pos.y = rect.y;
 

-    return TRUE;
+    return true;

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


@@ -3666,9 +4157,13 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 
 void wxListMainWindow::RecalculatePositions(bool noRefresh)
 {
 
 void wxListMainWindow::RecalculatePositions(bool noRefresh)
 {

+    const int lineHeight = GetLineHeight();
+

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

+    const size_t count = GetItemCount();
+

     int iconSpacing;
     if ( HasFlag(wxLC_ICON) )
         iconSpacing = m_normal_spacing;
     int iconSpacing;
     if ( HasFlag(wxLC_ICON) )
         iconSpacing = m_normal_spacing;


@@ -3677,93 +4172,180 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
     else
         iconSpacing = 0;
 
     else
         iconSpacing = 0;
 

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

     int clientWidth,
         clientHeight;
     int clientWidth,
         clientHeight;

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

 
 

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

     {
     {

-        // all lines have the same height
-        int lineHeight = GetLineHeight();
-
-        // scroll one line per step
-        m_yScroll = lineHeight;
-
-        size_t lineCount = GetItemCount();
-        int entireHeight = lineCount*lineHeight + LINE_SPACING;
+        // all lines have the same height and we scroll one line per step
+        int entireHeight = count * lineHeight + LINE_SPACING;

 
         m_linesPerPage = clientHeight / lineHeight;
 
         ResetVisibleLinesRange();
 
 
         m_linesPerPage = clientHeight / lineHeight;
 
         ResetVisibleLinesRange();
 

-        SetScrollbars( m_xScroll, m_yScroll,
-                       (GetHeaderWidth() + m_xScroll - 1)/m_xScroll,
-                       (entireHeight + m_yScroll - 1)/m_yScroll,
+        SetScrollbars( SCROLL_UNIT_X, lineHeight,
+                       GetHeaderWidth() / SCROLL_UNIT_X,
+                       (entireHeight + lineHeight - 1) / lineHeight,

                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),

-                       TRUE );
+                       true );

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

-        // at first we try without any scrollbar. if the items don't
-        // fit into the window, we recalculate after subtracting an
-        // approximated 15 pt for the horizontal scrollbar
-
-        clientHeight -= 4;  // sunken frame
+        // we have 3 different layout strategies: either layout all items
+        // horizontally/vertically (wxLC_ALIGN_XXX styles explicitly given) or
+        // to arrange them in top to bottom, left to right (don't ask me why
+        // not the other way round...) order
+        if ( HasFlag(wxLC_ALIGN_LEFT | wxLC_ALIGN_TOP) )
+        {
+            int x = EXTRA_BORDER_X;
+            int y = EXTRA_BORDER_Y;

 
 

-        int entireWidth = 0;
+            wxCoord widthMax = 0;

 
 

-        for (int tries = 0; tries < 2; tries++)
-        {
-            entireWidth = 0;
-            int x = 2;
-            int y = 2;
-            int maxWidth = 0;
-            m_linesPerPage = 0;
-            int currentlyVisibleLines = 0;
-
-            size_t count = GetItemCount();
-            for (size_t i = 0; i < count; i++)
+            size_t i;
+            for ( i = 0; i < count; i++ )

             {
             {

-                currentlyVisibleLines++;

                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );
                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );

-                line->SetPosition( x, y, clientWidth, iconSpacing );
+                line->SetPosition( x, y, iconSpacing );

 
                 wxSize sizeLine = GetLineSize(i);
 
 
                 wxSize sizeLine = GetLineSize(i);
 

-                if ( maxWidth < sizeLine.x )
-                    maxWidth = sizeLine.x;
-
-                y += sizeLine.y;
-                if (currentlyVisibleLines > m_linesPerPage)
-                    m_linesPerPage = currentlyVisibleLines;
+                if ( HasFlag(wxLC_ALIGN_TOP) )
+                {
+                    if ( sizeLine.x > widthMax )
+                        widthMax = sizeLine.x;

 
 

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

                 {
                 {

-                    currentlyVisibleLines = 0;
-                    y = 2;
-                    x += maxWidth+6;
-                    entireWidth += maxWidth+6;
-                    maxWidth = 0;
+                    x += sizeLine.x + MARGIN_BETWEEN_ROWS;

                 }
                 }

-                if ( i == count - 1 )
-                    entireWidth += maxWidth;
-                if ((tries == 0) && (entireWidth > clientWidth))
+            }
+
+            if ( HasFlag(wxLC_ALIGN_TOP) )
+            {
+                // traverse the items again and tweak their sizes so that they are
+                // all the same in a row
+                for ( i = 0; i < count; i++ )

                 {
                 {

-                    clientHeight -= 15; // scrollbar height
-                    m_linesPerPage = 0;
-                    currentlyVisibleLines = 0;
-                    break;
+                    wxListLineData *line = GetLine(i);
+                    line->m_gi->ExtendWidth(widthMax);

                 }
                 }

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

             }
             }

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

         }
         }

+        else // "flowed" arrangement, the most complicated case
+        {
+            // at first we try without any scrollbars, if the items don't fit into
+            // the window, we recalculate after subtracting the space taken by the
+            // scrollbar
+
+            int entireWidth = 0;
+
+            for (int tries = 0; tries < 2; tries++)
+            {
+                entireWidth = 2 * EXTRA_BORDER_X;
+
+                if (tries == 1)
+                {
+                    // Now we have decided that the items do not fit into the
+                    // client area, so we need a scrollbar
+                    entireWidth += SCROLL_UNIT_X;
+                }
+
+                int x = EXTRA_BORDER_X;
+                int y = EXTRA_BORDER_Y;
+                int maxWidthInThisRow = 0;
+
+                m_linesPerPage = 0;
+                int currentlyVisibleLines = 0;
+
+                for (size_t i = 0; i < count; i++)
+                {
+                    currentlyVisibleLines++;
+                    wxListLineData *line = GetLine( i );
+                    line->CalculateSize( &dc, iconSpacing );
+                    line->SetPosition( x, y, iconSpacing );
+
+                    wxSize sizeLine = GetLineSize( i );
+
+                    if ( maxWidthInThisRow < sizeLine.x )
+                        maxWidthInThisRow = sizeLine.x;
+
+                    y += sizeLine.y;
+                    if (currentlyVisibleLines > m_linesPerPage)
+                        m_linesPerPage = currentlyVisibleLines;
+
+                    if ( y + sizeLine.y >= clientHeight )
+                    {
+                        currentlyVisibleLines = 0;
+                        y = EXTRA_BORDER_Y;
+                        maxWidthInThisRow += MARGIN_BETWEEN_ROWS;
+                        x += maxWidthInThisRow;
+                        entireWidth += maxWidthInThisRow;
+                        maxWidthInThisRow = 0;
+                    }
+
+                    // We have reached the last item.
+                    if ( i == count - 1 )
+                        entireWidth += maxWidthInThisRow;
+
+                    if ( (tries == 0) &&
+                            (entireWidth + SCROLL_UNIT_X > clientWidth) )
+                    {
+                        clientHeight -= wxSystemSettings::
+                                            GetMetric(wxSYS_HSCROLL_Y);
+                        m_linesPerPage = 0;
+                        break;
+                    }
+
+                    if ( i == count - 1 )
+                        tries = 1;  // Everything fits, no second try required.
+                }
+            }

 
 

-        int scroll_pos = GetScrollPos( wxHORIZONTAL );
-        SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
+            SetScrollbars
+            (
+                SCROLL_UNIT_X,
+                lineHeight,
+                (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
+                0,
+                GetScrollPos( wxHORIZONTAL ),
+                0,
+                true
+            );
+        }

     }
 
     if ( !noRefresh )
     }
 
     if ( !noRefresh )


@@ -3777,13 +4359,13 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
 void wxListMainWindow::RefreshAll()
 {
 
 void wxListMainWindow::RefreshAll()
 {

-    m_dirty = FALSE;
+    m_dirty = false;

     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;

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

     {
     {

-        headerWin->m_dirty = FALSE;
+        headerWin->m_dirty = false;

         headerWin->Refresh();
     }
 }
         headerWin->Refresh();
     }
 }


@@ -3791,19 +4373,12 @@ void wxListMainWindow::RefreshAll()
 void wxListMainWindow::UpdateCurrent()
 {
     if ( !HasCurrent() && !IsEmpty() )
 void wxListMainWindow::UpdateCurrent()
 {
     if ( !HasCurrent() && !IsEmpty() )

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

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

-                                    int state )
+                                    int state ) const

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


@@ -3815,17 +4390,13 @@ long wxListMainWindow::GetNextItem( long item,
     // all selected items
     ret++;
     if ( ret == max )
     // all selected items
     ret++;
     if ( ret == max )

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

         return -1;
         return -1;

-    }

 
     if ( !state )
 
     if ( !state )

-    {

         // any will do
         return (size_t)ret;
         // any will do
         return (size_t)ret;

-    }

 
     size_t count = GetItemCount();
     for ( size_t line = (size_t)ret; line < count; line++ )
 
     size_t count = GetItemCount();
     for ( size_t line = (size_t)ret; line < count; line++ )


@@ -3860,20 +4431,39 @@ void wxListMainWindow::DeleteItem( long lindex )
         // 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 )
         // 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--;
             m_current--;

-        }

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

+        //  mark the Column Max Width cache as dirty if the items in the line
+        //  we're deleting contain the Max Column Width
+        wxListLineData * const line = GetLine(index);
+        wxListItemDataList::compatibility_iterator n;
+        wxListItemData *itemData;
+        wxListItem      item;
+        int             itemWidth;
+
+        for (size_t i = 0; i < m_columns.GetCount(); i++)
+        {
+            n = line->m_items.Item( i );
+            itemData = n->GetData();
+            itemData->GetItem(item);
+
+            itemWidth = GetItemWidthWithImage(&item);
+
+            if (itemWidth >= m_aColWidths.Item(i)->nMaxWidth)
+                m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }
+

         ResetVisibleLinesRange();
     }
 
         ResetVisibleLinesRange();
     }
 

+    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition );
+

     if ( IsVirtual() )
     {
         m_countVirt--;
     if ( IsVirtual() )
     {
         m_countVirt--;

-

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


@@ -3881,30 +4471,49 @@ void wxListMainWindow::DeleteItem( long lindex )
         m_lines.RemoveAt( index );
     }
 
         m_lines.RemoveAt( index );
     }
 

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

 
     RefreshAfter(index);
 }
 
 void wxListMainWindow::DeleteColumn( int col )
 {
 
     RefreshAfter(index);
 }
 
 void wxListMainWindow::DeleteColumn( int col )
 {

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

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

-    m_dirty = TRUE;
-    m_columns.DeleteNode( node );
+    m_dirty = true;
+    delete node->GetData();
+    m_columns.Erase( node );
+
+    if ( !IsVirtual() )
+    {
+        // update all the items
+        for ( size_t i = 0; i < m_lines.GetCount(); i++ )
+        {
+            wxListLineData * const line = GetLine(i);
+            wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
+            delete n->GetData();
+            line->m_items.Erase(n);
+        }
+    }
+
+    if ( InReportView() )   //  we only cache max widths when in Report View
+    {
+        delete m_aColWidths.Item(col);
+        m_aColWidths.RemoveAt(col);
+    }
+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;

 }
 
 void wxListMainWindow::DoDeleteAllItems()
 {
     if ( IsEmpty() )
 }
 
 void wxListMainWindow::DoDeleteAllItems()
 {
     if ( IsEmpty() )

-    {

         // nothing to do - in particular, don't send the event
         return;
         // nothing to do - in particular, don't send the event
         return;

-    }

 
     ResetCurrent();
 
 
     ResetCurrent();
 


@@ -3920,13 +4529,16 @@ void wxListMainWindow::DoDeleteAllItems()
     if ( IsVirtual() )
     {
         m_countVirt = 0;
     if ( IsVirtual() )
     {
         m_countVirt = 0;

-

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

+        for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
+        {
+            m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }

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


@@ -3941,9 +4553,10 @@ void wxListMainWindow::DeleteAllItems()
 
 void wxListMainWindow::DeleteEverything()
 {
 
 void wxListMainWindow::DeleteEverything()
 {

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

 
 

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

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


@@ -3958,19 +4571,18 @@ void wxListMainWindow::EnsureVisible( long index )
     // We have to call this here because the label in question might just have
     // been added and its position is not known yet
     if ( m_dirty )
     // We have to call this here because the label in question might just have
     // been added and its position is not known yet
     if ( m_dirty )

-    {
-        m_dirty = FALSE;
-
-        RecalculatePositions(TRUE /* no refresh */);
-    }
+        RecalculatePositions(true /* no refresh */);

 
     MoveToItem((size_t)index);
 }
 
 
     MoveToItem((size_t)index);
 }
 

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

 {
 {

+    if (str.empty())
+        return wxNOT_FOUND;
+

     long pos = start;
     long pos = start;

-    wxString tmp = str;
+    wxString str_upper = str.Upper();

     if (pos < 0)
         pos = 0;
 
     if (pos < 0)
         pos = 0;
 


@@ -3978,14 +4590,23 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p
     for ( size_t i = (size_t)pos; i < count; i++ )
     {
         wxListLineData *line = GetLine(i);
     for ( size_t i = (size_t)pos; i < count; i++ )
     {
         wxListLineData *line = GetLine(i);

-        if ( line->GetText(0) == tmp )
-            return i;
+        wxString line_upper = line->GetText(0).Upper();
+        if (!partial)
+        {
+            if (line_upper == str_upper )
+                return i;
+        }
+        else
+        {
+            if (line_upper.find(str_upper) == 0)
+                return i;
+        }

     }
 
     return wxNOT_FOUND;
 }
 
     }
 
     return wxNOT_FOUND;
 }
 

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

 {
     long pos = start;
     if (pos < 0)
 {
     long pos = start;
     if (pos < 0)


@@ -4004,22 +4625,43 @@ long wxListMainWindow::FindItem(long start, long data)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

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

 {
     CalcUnscrolledPosition( x, y, &x, &y );
 
 {
     CalcUnscrolledPosition( x, y, &x, &y );
 

-    if ( HasFlag(wxLC_REPORT) )
+    size_t count = GetItemCount();
+
+    if ( InReportView() )

     {
         size_t current = y / GetLineHeight();
     {
         size_t current = y / GetLineHeight();

-        flags = HitTestLine(current, x, y);
-        if ( flags )
-            return current;
+        if ( current < count )
+        {
+            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!!
     }
     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!!

-        size_t count = GetItemCount();

         for ( size_t current = 0; current < count; current++ )
         {
             flags = HitTestLine(current, x, y);
         for ( size_t current = 0; current < count; current++ )
         {
             flags = HitTestLine(current, x, y);


@@ -4039,56 +4681,113 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
 
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
 

-    size_t count = GetItemCount();
-    wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId <= count,
-                 _T("invalid item index") );
+    int count = GetItemCount();
+    wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") );
+
+    if (item.m_itemId > count)
+        item.m_itemId = count;

 
     size_t id = item.m_itemId;
 
 
     size_t id = item.m_itemId;
 

-    m_dirty = TRUE;
+    m_dirty = true;

 
 

-    int mode = 0;
-    if ( HasFlag(wxLC_REPORT) )
-        mode = wxLC_REPORT;
-    else if ( HasFlag(wxLC_LIST) )
-        mode = wxLC_LIST;
-    else if ( HasFlag(wxLC_ICON) )
-        mode = wxLC_ICON;
-    else if ( HasFlag(wxLC_SMALL_ICON) )
-        mode = wxLC_ICON;  // no typo
-    else
+    if ( InReportView() )

     {
     {

-        wxFAIL_MSG( _T("unknown mode") );
+        ResetVisibleLinesRange();
+
+        // calculate the width of the item and adjust the max column width
+        wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
+        int width = GetItemWidthWithImage(&item);
+        item.SetWidth(width);
+        if (width > pWidthInfo->nMaxWidth)
+            pWidthInfo->nMaxWidth = width;

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

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

 
     m_lines.Insert( line, id );
 
 
     m_lines.Insert( line, id );
 

-    m_dirty = TRUE;
+    m_dirty = true;
+
+    // If an item is selected at or below the point of insertion, we need to
+    // increment the member variables because the current row's index has gone
+    // up by one
+    if ( HasCurrent() && m_current >= id )
+        m_current++;
+
+    SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
+

     RefreshLines(id, GetItemCount() - 1);
 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
     RefreshLines(id, GetItemCount() - 1);
 }
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {

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

     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             item.m_width = GetTextLength( item.m_text );
     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             item.m_width = GetTextLength( item.m_text );

+

         wxListHeaderData *column = new wxListHeaderData( item );
         wxListHeaderData *column = new wxListHeaderData( item );

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

         {
         {

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

             m_columns.Insert( node, column );
             m_columns.Insert( node, column );

+            m_aColWidths.Insert( colWidthInfo, col );

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

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

         }
         }

+
+        // invalidate it as it has to be recalculated
+        m_headerWidth = 0;
+    }
+}
+
+int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
+{
+    int width = 0;
+    wxClientDC dc(this);
+
+    dc.SetFont( GetFont() );
+
+    if (item->GetImage() != -1)
+    {
+        int ix, iy;
+        GetImageSize( item->GetImage(), ix, iy );
+        width += ix + 5;
+    }
+
+    if (!item->GetText().empty())
+    {
+        wxCoord w;
+        dc.GetTextExtent( item->GetText(), &w, NULL );
+        width += w;

     }
     }

+
+    return width;

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


@@ -4104,18 +4803,23 @@ int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData
     wxListLineData *line2 = *arg2;
     wxListItem item;
     line1->GetItem( 0, item );
     wxListLineData *line2 = *arg2;
     wxListItem item;
     line1->GetItem( 0, item );

-    long data1 = item.m_data;
+    wxUIntPtr data1 = item.m_data;

     line2->GetItem( 0, item );
     line2->GetItem( 0, item );

-    long data2 = item.m_data;
+    wxUIntPtr data2 = item.m_data;

     return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
 }
 
 void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 {
     return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
 }
 
 void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 {

+    // selections won't make sense any more after sorting the items so reset
+    // them
+    HighlightAll(false);
+    ResetCurrent();
+

     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );
     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -4124,26 +4828,24 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

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

     // FIXME
     // FIXME

-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)

     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
 #endif
 
     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
 #endif
 

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

     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {

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

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

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

     }
 }
 
     }
 }
 


@@ -4160,7 +4862,7 @@ int wxListMainWindow::GetCountPerPage() const
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") );
+    wxASSERT_MSG( InReportView(), _T("this is for report mode only") );

 
     if ( m_lineFrom == (size_t)-1 )
     {
 
     if ( m_lineFrom == (size_t)-1 )
     {


@@ -4197,111 +4899,16 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 }
 
 // -------------------------------------------------------------------------------------
 }
 
 // -------------------------------------------------------------------------------------

-// wxListItem
-// -------------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-wxListItem::wxListItem()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-
-    m_attr = NULL;
-}
-
-void wxListItem::Clear()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = 0;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text = _T("");
-
-    ClearAttributes();
-}
-
-void wxListItem::ClearAttributes()
-{
-    if (m_attr)
-    {
-        delete m_attr;
-        m_attr = NULL;
-    }
-}
-
-// -------------------------------------------------------------------------------------
-// wxListEvent
-// -------------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
-wxListEvent::wxListEvent( wxEventType commandType, int id )
-           : wxNotifyEvent( commandType, id )
-{
-    m_code = 0;
-    m_itemIndex = 0;
-    m_oldItemIndex = 0;
-    m_col = 0;
-    m_cancelled = FALSE;
-    m_pointDrag.x = 0;
-    m_pointDrag.y = 0;
-}
-
-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
+// wxGenericListCtrl

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

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

 
 

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

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

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

 {
     m_imageListNormal = (wxImageList *) NULL;
     m_imageListSmall = (wxImageList *) NULL;
 {
     m_imageListNormal = (wxImageList *) NULL;
     m_imageListSmall = (wxImageList *) NULL;


@@ -4309,17 +4916,15 @@ wxListCtrl::wxListCtrl()
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

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

+    m_headerHeight = 0;

 }
 
 }
 

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

 {
 {

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

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


@@ -4328,18 +4933,46 @@ wxListCtrl::~wxListCtrl()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

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

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

-                        this, -1, m_mainWin,
-                        wxPoint(0, 0),
-                        wxSize(GetClientSize().x, HEADER_HEIGHT),
+                        this, wxID_ANY, m_mainWin,
+                        wxPoint(0,0),
+                        wxSize(GetClientSize().x, m_headerHeight),

                         wxTAB_TRAVERSAL
                       );
                         wxTAB_TRAVERSAL
                       );

+    CalculateAndSetHeaderHeight();

 }
 
 }
 

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

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


@@ -4352,39 +4985,64 @@ bool wxListCtrl::Create(wxWindow *parent,
     m_imageListState = (wxImageList *) NULL;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_imageListState = (wxImageList *) NULL;
     m_ownsImageListNormal =
     m_ownsImageListSmall =

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

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

+    m_headerHeight = 0;
+

     if ( !(style & wxLC_MASK_TYPE) )
     {
         style = style | wxLC_LIST;
     }
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
     if ( !(style & wxLC_MASK_TYPE) )
     {
         style = style | wxLC_LIST;
     }
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )

-        return FALSE;
+        return false;
+
+    // this window itself shouldn't get the focus, only m_mainWin should
+    SetCanFocus(false);

 
     // don't create the inner window with the border
 
     // don't create the inner window with the border

-    style &= ~wxSUNKEN_BORDER;
+    style &= ~wxBORDER_MASK;
+
+    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );

 
 

-    m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
+#ifdef  __WXMAC_CARBON__
+    // Human Interface Guidelines ask us for a special font in this case
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
+    {
+        wxFont font;
+        font.MacCreateThemeFont( kThemeViewsFont );
+        SetFont( font );
+    }
+#endif

 
 

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

     {
         CreateHeaderWindow();
 
     {
         CreateHeaderWindow();
 

-        if ( HasFlag(wxLC_NO_HEADER) )
+#ifdef  __WXMAC_CARBON__
+        if (m_headerWin)

         {
         {

-            // VZ: why do we create it at all then?
-            m_headerWin->Show( FALSE );
+            wxFont font;
+            font.MacCreateThemeFont( kThemeSmallSystemFont );
+            m_headerWin->SetFont( font );
+            CalculateAndSetHeaderHeight();

         }
         }

+#endif
+
+        if ( HasFlag(wxLC_NO_HEADER) )
+            // VZ: why do we create it at all then?
+            m_headerWin->Show( false );

     }
 
     }
 

-    return TRUE;
+    SetInitialSize(size);
+
+    return true;

 }
 
 }
 

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

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


@@ -4402,26 +5060,22 @@ void wxListCtrl::SetSingleStyle( long style, bool add )
     }
 
     if (add)
     }
 
     if (add)

-    {

         flag |= style;
         flag |= style;

-    }

     else
     else

-    {

         flag &= ~style;
         flag &= ~style;

-    }

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

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

 {
     if (m_mainWin)
     {
         m_mainWin->DeleteEverything();
 
         // has the header visibility changed?
 {
     if (m_mainWin)
     {
         m_mainWin->DeleteEverything();
 
         // has the header visibility changed?

-        bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
-             willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
+        bool hasHeader = HasHeader();
+        bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);

 
         if ( hasHeader != willHaveHeader )
         {
 
         if ( hasHeader != willHaveHeader )
         {


@@ -4431,7 +5085,7 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
                 if ( m_headerWin )
                 {
                     // don't delete, just hide, as we can reuse it later
                 if ( m_headerWin )
                 {
                     // don't delete, just hide, as we can reuse it later

-                    m_headerWin->Show(FALSE);
+                    m_headerWin->Show(false);

                 }
                 //else: nothing to do
             }
                 }
                 //else: nothing to do
             }


@@ -4443,7 +5097,7 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
                 }
                 else // already have it, just show
                 {
                 }
                 else // already have it, just show
                 {

-                    m_headerWin->Show( TRUE );
+                    m_headerWin->Show( true );

                 }
             }
 
                 }
             }
 


@@ -4454,47 +5108,47 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
     wxWindow::SetWindowStyleFlag( flag );
 }
 
     wxWindow::SetWindowStyleFlag( flag );
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

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

 {
     m_mainWin->SetColumnWidth( col, width );
 {
     m_mainWin->SetColumnWidth( col, width );

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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


@@ -4505,257 +5159,344 @@ long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageI
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;

-    };
+    }
+

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

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

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

-    return TRUE;
+    return true;
+}
+
+bool
+wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
+{
+    return SetItemColumnImage(item, 0, image);

 }
 
 }
 

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

 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;

+    info.m_col = column;

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
     wxListItem info;
 {
     wxListItem info;

+    info.m_mask = wxLIST_MASK_DATA;

     info.m_itemId = item;
     m_mainWin->GetItem( info );
     return info.m_data;
 }
 
     info.m_itemId = item;
     m_mainWin->GetItem( info );
     return info.m_data;
 }
 

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

 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const
+wxRect wxGenericListCtrl::GetViewRect() const
+{
+    return m_mainWin->GetViewRect();
+}
+
+bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const

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

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

 }
 
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     return 0;
 }
 
 {
     return 0;
 }
 

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

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

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

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

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

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

-int wxListCtrl::GetItemSpacing( bool isSmall ) const
+wxSize wxGenericListCtrl::GetItemSpacing() const
+{
+    const int spacing = m_mainWin->GetItemSpacing(HasFlag(wxLC_SMALL_ICON));
+
+    return wxSize(spacing, spacing);
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+int wxGenericListCtrl::GetItemSpacing( bool isSmall ) const

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

+#endif // WXWIN_COMPATIBILITY_2_6
+
+void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetTextColour( col );
+    m_mainWin->SetItem( info );
+}
+
+wxColour wxGenericListCtrl::GetItemTextColour( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetTextColour();
+}
+
+void wxGenericListCtrl::SetItemBackgroundColour( long item, const wxColour &col )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetBackgroundColour( col );
+    m_mainWin->SetItem( info );
+}
+
+wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetBackgroundColour();
+}
+
+int wxGenericListCtrl::GetScrollPos( int orient ) const
+{
+    return m_mainWin->GetScrollPos( orient );
+}
+
+void wxGenericListCtrl::SetScrollPos( int orient, int pos, bool refresh )
+{
+    m_mainWin->SetScrollPos( orient, pos, refresh );
+}
+
+void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetFont( f );
+    m_mainWin->SetItem( info );
+}
+
+wxFont wxGenericListCtrl::GetItemFont( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetFont();
+}

 
 

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

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

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

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

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

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

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

 {
 {

-    return 0;
+    size_t top;
+    m_mainWin->GetVisibleLinesRange(&top, NULL);
+    return (long)top;

 }
 
 }
 

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

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

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

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

-    {

         return m_imageListNormal;
         return m_imageListNormal;

-    }

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

-    {

         return m_imageListSmall;
         return m_imageListSmall;

-    }

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

-    {

         return m_imageListState;
         return m_imageListState;

-    }
+

     return (wxImageList *) NULL;
 }
 
     return (wxImageList *) NULL;
 }
 

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

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

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

         m_imageListNormal = imageList;
         m_imageListNormal = imageList;

-        m_ownsImageListNormal = FALSE;
+        m_ownsImageListNormal = false;

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

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

         m_imageListSmall = imageList;
         m_imageListSmall = imageList;

-        m_ownsImageListSmall = FALSE;
+        m_ownsImageListSmall = false;

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

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

         m_imageListState = imageList;
         m_imageListState = imageList;

-        m_ownsImageListState = FALSE;
+        m_ownsImageListState = false;

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

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

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

-        m_ownsImageListNormal = TRUE;
+        m_ownsImageListNormal = true;

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

-        m_ownsImageListSmall = TRUE;
+        m_ownsImageListSmall = true;

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

-        m_ownsImageListState = TRUE;
+        m_ownsImageListState = true;

 }
 
 }
 

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

 {
     return 0;
 }
 
 {
     return 0;
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     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);
-
-    return TRUE;
+        DeleteColumn( 0 );
+    return true;

 }
 
 }
 

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

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

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

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

-    return TRUE;
+
+    // if we don't have the header any longer, we need to relayout the window
+    if ( !GetColumnCount() )
+        ResizeReportView(false /* no header */);
+    return true;
+}
+
+wxTextCtrl *wxGenericListCtrl::EditLabel(long item,
+                                         wxClassInfo* textControlClass)
+{
+    return m_mainWin->EditLabel( item, textControlClass );

 }
 
 }
 

-void wxListCtrl::Edit( long item )
+wxTextCtrl *wxGenericListCtrl::GetEditControl() const

 {
 {

-    m_mainWin->EditLabel( item );
+    return m_mainWin->GetEditControl();

 }
 
 }
 

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

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

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

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

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

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

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

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

 }
 
 }
 

-long wxListCtrl::HitTest( const wxPoint &point, int &flags )
+// TODO: sub item hit testing
+long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *) const

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

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

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

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

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


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

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

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


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

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

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


@@ -4783,16 +5524,23 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

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

 {
 {

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

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

+
+    // if we hadn't had a header before but have one now
+    // then we need to relayout the window
+    if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
+        ResizeReportView(true /* have header */);
+

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

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

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


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

+

     item.m_format = format;
 
     return InsertColumn( col, item );
 }
 
     item.m_format = format;
 
     return InsertColumn( col, item );
 }
 

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

 {
     return 0;
 }
 {
     return 0;
 }


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

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

 {
     m_mainWin->SortItems( fn, data );
 {
     m_mainWin->SortItems( fn, data );

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 

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

 {
     if ( !m_mainWin )
         return;
 
     ResizeReportView(m_mainWin->HasHeader());
 {
     if ( !m_mainWin )
         return;
 
     ResizeReportView(m_mainWin->HasHeader());

-

     m_mainWin->RecalculatePositions();
 }
 
     m_mainWin->RecalculatePositions();
 }
 

-void wxListCtrl::ResizeReportView(bool showHeader)
+void wxGenericListCtrl::ResizeReportView(bool showHeader)

 {
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     if ( showHeader )
     {
 {
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     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, m_headerHeight );
+        if(ch > m_headerHeight)
+            m_mainWin->SetSize( 0, m_headerHeight + 1,
+                                   cw, ch - m_headerHeight - 1 );
+        else
+            m_mainWin->SetSize( 0, m_headerHeight + 1,
+                                   cw, 0);

     }
     else // no header window
     {
     }
     else // no header window
     {


@@ -4859,9 +5612,9 @@ void wxListCtrl::ResizeReportView(bool showHeader)
     }
 }
 
     }
 }
 

-void wxListCtrl::OnIdle( wxIdleEvent & event )
+void wxGenericListCtrl::OnInternalIdle()

 {
 {

-    event.Skip();
+    wxWindow::OnInternalIdle();

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


@@ -4874,53 +5627,71 @@ void wxListCtrl::OnIdle( wxIdleEvent & event )
 // font/colours
 // ----------------------------------------------------------------------------
 
 // font/colours
 // ----------------------------------------------------------------------------
 

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

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

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

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

-        return FALSE;
+        return false;

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

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

     }
 
     if (m_headerWin)
     }
 
     if (m_headerWin)

-    {

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

-    }

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

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

-        return FALSE;
+        return false;

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

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

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

+        CalculateAndSetHeaderHeight();

     }
 
     }
 

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

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


@@ -4929,72 +5700,99 @@ bool wxListCtrl::SetFont( const wxFont &font )
 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 

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

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

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

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

-#endif // wxUSE_DRAG_AND_DROP
+#endif

 
 

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

 {
 {

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

 }
 
 }
 

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

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

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

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

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

 {
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 #else
 {
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 #else

-    return FALSE;
-#endif // wxUSE_MENUS
+    return false;
+#endif
+}
+
+void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
+{
+    m_mainWin->DoClientToScreen(x, y);

 }
 
 }
 

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

 {
 {

-    /* The test in window.cpp fails as we are a composite
-       window, so it checks against "this", but not m_mainWin. */
-    if ( FindFocus() != this )
+    m_mainWin->DoScreenToClient(x, y);
+}
+
+void wxGenericListCtrl::SetFocus()
+{
+    // The test in window.cpp fails as we are a composite
+    // window, so it checks against "this", but not m_mainWin.
+    if ( DoFindFocus() != this )

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

+wxSize wxGenericListCtrl::DoGetBestSize() const
+{
+    // Something is better than nothing...
+    // 100x80 is what the MSW version will get from the default
+    // wxControl::DoGetBestSize
+    return wxSize(100, 80);
+}
+

 // ----------------------------------------------------------------------------
 // virtual list control support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // virtual list control support
 // ----------------------------------------------------------------------------
 

-wxString wxListCtrl::OnGetItemText(long item, long col) const
+wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const

 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it
 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it

-    wxFAIL_MSG( _T("not supposed to be called") );
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemText not supposed to be called") );

 
     return wxEmptyString;
 }
 
 
     return wxEmptyString;
 }
 

-int wxListCtrl::OnGetItemImage(long item) const
+int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const

 {
 {

-    // same as above
-    wxFAIL_MSG( _T("not supposed to be called") );
-
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));

     return -1;
 }
 
     return -1;
 }
 

-wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
+{
+    if (!column)
+        return OnGetItemImage(item);
+
+   return -1;
+}
+
+wxListItemAttr *
+wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const

 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );


@@ -5003,21 +5801,80 @@ wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
     return NULL;
 }
 
     return NULL;
 }
 

-void wxListCtrl::SetItemCount(long count)
+void wxGenericListCtrl::SetItemCount(long count)

 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 
     m_mainWin->SetItemCount(count);
 }
 
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 
     m_mainWin->SetItemCount(count);
 }
 

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

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

-void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)

 {
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 
 {
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 

+// Generic wxListCtrl is more or less a container for two other
+// windows which drawings are done upon. These are namely
+// 'm_headerWin' and 'm_mainWin'.
+// Here we override 'virtual wxWindow::Refresh()' to mimic the
+// behaviour wxListCtrl has under wxMSW.
+//
+void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
+{
+    if (!rect)
+    {
+        // The easy case, no rectangle specified.
+        if (m_headerWin)
+            m_headerWin->Refresh(eraseBackground);
+
+        if (m_mainWin)
+            m_mainWin->Refresh(eraseBackground);
+    }
+    else
+    {
+        // Refresh the header window
+        if (m_headerWin)
+        {
+            wxRect rectHeader = m_headerWin->GetRect();
+            rectHeader.Intersect(*rect);
+            if (rectHeader.GetWidth() && rectHeader.GetHeight())
+            {
+                int x, y;
+                m_headerWin->GetPosition(&x, &y);
+                rectHeader.Offset(-x, -y);
+                m_headerWin->Refresh(eraseBackground, &rectHeader);
+            }
+        }
+
+        // Refresh the main window
+        if (m_mainWin)
+        {
+            wxRect rectMain = m_mainWin->GetRect();
+            rectMain.Intersect(*rect);
+            if (rectMain.GetWidth() && rectMain.GetHeight())
+            {
+                int x, y;
+                m_mainWin->GetPosition(&x, &y);
+                rectMain.Offset(-x, -y);
+                m_mainWin->Refresh(eraseBackground, &rectMain);
+            }
+        }
+    }
+}
+
+void wxGenericListCtrl::Freeze()
+{
+    m_mainWin->Freeze();
+}
+
+void wxGenericListCtrl::Thaw()
+{
+    m_mainWin->Thaw();
+}
+

 #endif // wxUSE_LISTCTRL
 #endif // wxUSE_LISTCTRL