]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/listctrl.cpp
Updates for Y positioning
[wxWidgets.git] / src / msw / listctrl.cpp
index 6d38a1c52605d323ccb50f1c2c084eea60315647..0646ed78148501e57b575d6e82760790e5e7cf1d 100644 (file)
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listctrl.cpp
+// Name:        src/msw/listctrl.cpp
 // Purpose:     wxListCtrl
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxListCtrl
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
 #ifdef __GNUG__
-#pragma implementation "listctrl.h"
+    #pragma implementation "listctrl.h"
+    #pragma implementation "listctrlbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #endif
 
+#if wxUSE_LISTCTRL && defined(__WIN95__)
+
 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP
-#include "wx.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #endif
 
-#if defined(__WIN95__)
-
+#include "wx/textctrl.h"
+#include "wx/imaglist.h"
 #include "wx/listctrl.h"
 #include "wx/listctrl.h"
+#include "wx/dcclient.h"
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 
-#ifndef __GNUWIN32__
-#include <commctrl.h>
+#if ((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+    #include "wx/msw/gnuwin32/extra.h"
+#else
+    #include <commctrl.h>
+#endif
+
+#ifndef LVHT_ONITEM
+    #define LVHT_ONITEM \
+                (LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)
+#endif
+
+#ifndef LVM_SETEXTENDEDLISTVIEWSTYLE
+    #define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
+#endif
+
+#ifndef LVS_EX_FULLROWSELECT
+    #define LVS_EX_FULLROWSELECT 0x00000020
+#endif
+
+#ifndef LVS_OWNERDATA
+    #define LVS_OWNERDATA 0x1000
+#endif
+
+// mingw32/cygwin don't have declarations for comctl32.dll 4.70+ stuff
+#ifndef NM_CACHEHINT
+    typedef struct tagNMLVCACHEHINT
+    {
+        NMHDR   hdr;
+        int     iFrom;
+        int     iTo;
+    } NMLVCACHEHINT;
+
+    #define NM_CACHEHINT NMLVCACHEHINT
 #endif
 
 #endif
 
-#ifdef __GNUWIN32__
-#include "wx/msw/gnuwin32/extra.h"
+#ifndef LVN_ODCACHEHINT
+    #define LVN_ODCACHEHINT (-113)
 #endif
 
 #endif
 
-static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& tvItem);
-static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& tvItem, HWND getFullInfo = 0);
+#ifndef ListView_GetHeader
+    #define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
+#endif
+
+#ifndef LVM_GETHEADER
+    #define LVM_GETHEADER (LVM_FIRST+31)
+#endif
+
+#ifndef Header_GetItemRect
+    #define Header_GetItemRect(w,i,r) \
+            (BOOL)SendMessage((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r))
+#endif
+
+#ifndef HDM_GETITEMRECT
+    #define HDM_GETITEMRECT (HDM_FIRST+7)
+#endif
+
+#ifndef LVCF_IMAGE
+    #define LVCF_IMAGE             0x0010
+#endif
+
+#ifndef LVCFMT_BITMAP_ON_RIGHT
+    #define LVCFMT_BITMAP_ON_RIGHT 0x1000
+#endif
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// convert our state and mask flags to LV_ITEM constants
+static void wxConvertToMSWFlags(long state, long mask, LV_ITEM& lvItem);
+
+// convert wxListItem to LV_ITEM
+static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
+                                   const wxListItem& info, LV_ITEM& lvItem);
+
+// convert LV_ITEM to wxListItem
+static void wxConvertFromMSWListItem(HWND hwndListCtrl,
+                                     wxListItem& info,
+                                     /* const */ LV_ITEM& lvItem);
+
+// convert our wxListItem to LV_COLUMN
+static void wxConvertToMSWListCol(int col, const wxListItem& item,
+                                  LV_COLUMN& lvCol);
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
 
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
 IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+
+BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
+    EVT_PAINT(wxListCtrl::OnPaint)
+END_EVENT_TABLE()
 
 
-wxListCtrl::wxListCtrl(void)
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxListCtrl construction
+// ----------------------------------------------------------------------------
+
+void wxListCtrl::Init()
 {
 {
-       m_imageListNormal = NULL;
-       m_imageListSmall = NULL;
-       m_imageListState = NULL;
-       m_baseStyle = 0;
+    m_imageListNormal = NULL;
+    m_imageListSmall = NULL;
+    m_imageListState = NULL;
+    m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE;
+    m_baseStyle = 0;
     m_colCount = 0;
     m_colCount = 0;
+    m_textCtrl = NULL;
+    m_hasAnyAttr = FALSE;
 }
 
 }
 
-bool wxListCtrl::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const wxValidator& validator, const wxString& name)
+bool wxListCtrl::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
 {
 {
-  m_imageListNormal = NULL;
-  m_imageListSmall = NULL;
-  m_imageListState = NULL;
-  m_colCount = 0;
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif // wxUSE_VALIDATORS
 
 
-  wxSystemSettings settings;
-  SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-  SetForegroundColour(parent->GetDefaultForegroundColour());
+    SetName(name);
 
 
-  SetValidator(validator);
-  SetName(name);
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
 
 
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    m_windowStyle = style;
 
 
-  m_windowStyle = style;
+    SetParent(parent);
 
 
-  SetParent(parent);
+    if (width <= 0)
+        width = 100;
+    if (height <= 0)
+        height = 30;
+    if (x < 0)
+        x = 0;
+    if (y < 0)
+        y = 0;
 
 
-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
+    m_windowId = (id == -1) ? NewControlId() : id;
 
 
-  m_windowId = (id == -1) ? NewControlId() : id;
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+                   LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
 
 
-  DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
-  
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
 
 
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
-    wstyle |= WS_BORDER;
+    if ( wxStyleHasBorder(m_windowStyle) )
+        wstyle |= WS_BORDER;
+    m_baseStyle = wstyle;
 
 
-  wstyle |= LVS_SHAREIMAGELISTS;
-  m_baseStyle = wstyle;
+    if ( !DoCreateControl(x, y, width, height) )
+        return FALSE;
 
 
-  long oldStyle = 0; // Dummy
-  wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
+    if (parent)
+        parent->AddChild(this);
 
 
-  // Create the ListView control.
-  HWND hWndListControl = CreateWindowEx(exStyle,
-    WC_LISTVIEW,
-    "",
-    wstyle,
-    x, y, width, height,
-    (HWND) parent->GetHWND(),
-    (HMENU)m_windowId,
-    wxGetInstance(),
-    NULL );
+    return TRUE;
+}
+
+bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
+{
+    DWORD wstyle = m_baseStyle;
+
+    bool want3D;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+
+    // Even with extended styles, need to combine with WS_BORDER
+    // for them to look right.
+    if ( want3D )
+        wstyle |= WS_BORDER;
+
+    long oldStyle = 0; // Dummy
+    wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
+
+    // Create the ListView control.
+    m_hWnd = (WXHWND)CreateWindowEx(exStyle,
+                                    WC_LISTVIEW,
+                                    wxT(""),
+                                    wstyle,
+                                    x, y, w, h,
+                                    GetWinHwnd(GetParent()),
+                                    (HMENU)m_windowId,
+                                    wxGetInstance(),
+                                    NULL);
+
+    if ( !m_hWnd )
+    {
+        wxLogError(_("Can't create list control window, check that comctl32.dll is installed."));
 
 
-  m_hWnd = (WXHWND) hWndListControl;
-  if (parent) parent->AddChild(this);
-  
-  SubclassWin((WXHWND) m_hWnd);
+        return FALSE;
+    }
 
 
-  return TRUE;
+    // for comctl32.dll v 4.70+ we want to have this attribute because it's
+    // prettier (and also because wxGTK does it like this)
+    if ( (wstyle & LVS_REPORT) && wxTheApp->GetComCtl32Version() >= 470 )
+    {
+        ::SendMessage(GetHwnd(), LVM_SETEXTENDEDLISTVIEWSTYLE,
+                      0, LVS_EX_FULLROWSELECT);
+    }
+
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(GetParent()->GetForegroundColour());
+
+    SubclassWin(m_hWnd);
+
+    return TRUE;
+}
+
+void wxListCtrl::UpdateStyle()
+{
+    if ( GetHWND() )
+    {
+        // The new window view style
+        long dummy;
+        DWORD dwStyleNew = ConvertToMSWStyle(dummy, m_windowStyle);
+        dwStyleNew |= m_baseStyle;
+
+        // Get the current window style.
+        DWORD dwStyleOld = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+
+        // Only set the window style if the view bits have changed.
+        if ( dwStyleOld != dwStyleNew )
+        {
+            ::SetWindowLong(GetHwnd(), GWL_STYLE, dwStyleNew);
+        }
+    }
 }
 
 }
 
-wxListCtrl::~wxListCtrl(void)
+void wxListCtrl::FreeAllAttrs(bool dontRecreate)
 {
 {
-       m_textCtrl.SetHWND((WXHWND) NULL);
+    if ( m_hasAnyAttr )
+    {
+        for ( wxNode *node = m_attrs.Next(); node; node = m_attrs.Next() )
+        {
+            delete (wxListItemAttr *)node->Data();
+        }
+
+        m_attrs.Destroy();
+        if ( !dontRecreate )
+        {
+            m_attrs.Create(wxKEY_INTEGER, 1000);        // just as def ctor
+        }
+
+        m_hasAnyAttr = FALSE;
+    }
 }
 
 }
 
+wxListCtrl::~wxListCtrl()
+{
+    FreeAllAttrs(TRUE /* no need to recreate hash any more */);
+
+    if ( m_textCtrl )
+    {
+        m_textCtrl->SetHWND(0);
+        m_textCtrl->UnsubclassWin();
+        delete m_textCtrl;
+        m_textCtrl = NULL;
+    }
+
+    if (m_ownsImageListNormal) delete m_imageListNormal;
+    if (m_ownsImageListSmall) delete m_imageListSmall;
+    if (m_ownsImageListState) delete m_imageListState;
+}
+
+// ----------------------------------------------------------------------------
+// set/get/change style
+// ----------------------------------------------------------------------------
+
 // Add or remove a single window style
 // Add or remove a single window style
-void wxListCtrl::SetSingleStyle(const long style, const bool add)
+void wxListCtrl::SetSingleStyle(long style, bool add)
 {
 {
-       long flag = GetWindowStyleFlag();
+    long flag = GetWindowStyleFlag();
 
 
-       // Get rid of conflicting styles
-       if ( add )
-       {
-               if ( style & wxLC_MASK_TYPE)
-                       flag = flag & ~wxLC_MASK_TYPE ;
-               if ( style & wxLC_MASK_ALIGN )
-                       flag = flag & ~wxLC_MASK_ALIGN ;
-               if ( style & wxLC_MASK_SORT )
-                       flag = flag & ~wxLC_MASK_SORT ;
+    // Get rid of conflicting styles
+    if ( add )
+    {
+        if ( style & wxLC_MASK_TYPE)
+            flag = flag & ~wxLC_MASK_TYPE;
+        if ( style & wxLC_MASK_ALIGN )
+            flag = flag & ~wxLC_MASK_ALIGN;
+        if ( style & wxLC_MASK_SORT )
+            flag = flag & ~wxLC_MASK_SORT;
     }
 
     }
 
-       if ( flag & style )
-       {
-               if ( !add )
-                       flag -= style;
-       }
-       else
-       {
-               if ( add )
-               {
-                       flag |= style;
-               }
-       }
+    if ( flag & style )
+    {
+        if ( !add )
+            flag -= style;
+    }
+    else
+    {
+        if ( add )
+        {
+            flag |= style;
+        }
+    }
 
 
-       m_windowStyle = flag;
+    m_windowStyle = flag;
 
 
-       RecreateWindow();
+    UpdateStyle();
 }
 
 // Set the whole window style
 }
 
 // Set the whole window style
-void wxListCtrl::SetWindowStyleFlag(const long flag)
+void wxListCtrl::SetWindowStyleFlag(long flag)
 {
 {
-       m_windowStyle = flag;
+    m_windowStyle = flag;
 
 
-       RecreateWindow();
+    UpdateStyle();
 }
 
 }
 
-void wxListCtrl::RecreateWindow(void)
+// Can be just a single style, or a bitlist
+long wxListCtrl::ConvertToMSWStyle(long& oldStyle, long style) const
 {
 {
-       if ( GetHWND() )
-       {
-         long oldStyle = 0;
-      long style = ConvertToMSWStyle(oldStyle, m_windowStyle);
-         style |= m_baseStyle;
-//      ::SetWindowLong((HWND) GetHWND(), GWL_STYLE, style);
+    long wstyle = 0;
+    if ( style & wxLC_ICON )
+    {
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_SMALLICON )
+            oldStyle -= LVS_SMALLICON;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_REPORT )
+            oldStyle -= LVS_REPORT;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_LIST )
+            oldStyle -= LVS_LIST;
+        wstyle |= LVS_ICON;
+    }
+
+    if ( style & wxLC_SMALL_ICON )
+    {
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_ICON )
+            oldStyle -= LVS_ICON;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_REPORT )
+            oldStyle -= LVS_REPORT;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_LIST )
+            oldStyle -= LVS_LIST;
+        wstyle |= LVS_SMALLICON;
+    }
+
+    if ( style & wxLC_LIST )
+    {
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_ICON )
+            oldStyle -= LVS_ICON;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_REPORT )
+            oldStyle -= LVS_REPORT;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_SMALLICON )
+            oldStyle -= LVS_SMALLICON;
+        wstyle |= LVS_LIST;
+    }
+
+    if ( style & wxLC_REPORT )
+    {
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_ICON )
+            oldStyle -= LVS_ICON;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_LIST )
+            oldStyle -= LVS_LIST;
+        if ( (oldStyle & LVS_TYPEMASK) == LVS_SMALLICON )
+            oldStyle -= LVS_SMALLICON;
+
+        wstyle |= LVS_REPORT;
+    }
 
 
-      // The following recreation of the window appears to be necessary
-         // because SetWindowLong doesn't seem to do it.
+    if ( style & wxLC_ALIGN_LEFT )
+    {
+        if ( oldStyle & LVS_ALIGNTOP )
+            oldStyle -= LVS_ALIGNTOP;
+        wstyle |= LVS_ALIGNLEFT;
+    }
 
 
-      int x, y, width, height;
-      GetPosition(&x, &y);
-      GetSize(&width, &height);
+    if ( style & wxLC_ALIGN_TOP )
+    {
+        if ( oldStyle & LVS_ALIGNLEFT )
+            oldStyle -= LVS_ALIGNLEFT;
+        wstyle |= LVS_ALIGNTOP;
+    }
 
 
-      UnsubclassWin();
-      ::DestroyWindow((HWND) GetHWND());
+    if ( style & wxLC_AUTOARRANGE )
+        wstyle |= LVS_AUTOARRANGE;
 
 
-      // Experimental
-      // Recreate the ListView control: unfortunately I can't
-         // make it work by using SetWindowLong.
-      bool want3D;
-      WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
-      HWND hWndListControl = CreateWindowEx(exStyle,
-        WC_LISTVIEW,
-        "",
-        style,
-        x, y, width, height,
-        (HWND) GetParent()->GetHWND(),
-        (HMENU)m_windowId,
-        wxGetInstance(),
-        NULL );
+    if ( style & wxLC_NO_SORT_HEADER )
+        wstyle |= LVS_NOSORTHEADER;
 
 
-      m_hWnd = (WXHWND) hWndListControl;
-      SubclassWin((WXHWND) m_hWnd);
+    if ( style & wxLC_NO_HEADER )
+        wstyle |= LVS_NOCOLUMNHEADER;
 
 
-      if ( m_imageListNormal )
-           SetImageList(m_imageListNormal, wxIMAGE_LIST_NORMAL);
-      if ( m_imageListSmall )
-           SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
-      if ( m_imageListState )
-           SetImageList(m_imageListState, wxIMAGE_LIST_STATE);
-       }
+    if ( style & wxLC_EDIT_LABELS )
+        wstyle |= LVS_EDITLABELS;
+
+    if ( style & wxLC_SINGLE_SEL )
+        wstyle |= LVS_SINGLESEL;
+
+    if ( style & wxLC_SORT_ASCENDING )
+    {
+        if ( oldStyle & LVS_SORTDESCENDING )
+            oldStyle -= LVS_SORTDESCENDING;
+        wstyle |= LVS_SORTASCENDING;
+    }
+
+    if ( style & wxLC_SORT_DESCENDING )
+    {
+        if ( oldStyle & LVS_SORTASCENDING )
+            oldStyle -= LVS_SORTASCENDING;
+        wstyle |= LVS_SORTDESCENDING;
+    }
+
+#if !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+    if ( style & wxLC_VIRTUAL )
+    {
+        int ver = wxTheApp->GetComCtl32Version();
+        if ( ver < 470 )
+        {
+            wxLogWarning(_("Please install a newer version of comctl32.dll\n(at least version 4.70 is required but you have %d.%02d)\nor this program won't operate correctly."),
+                        ver / 100, ver % 100);
+        }
+
+        wstyle |= LVS_OWNERDATA;
+    }
+#endif
+
+    return wstyle;
 }
 
 }
 
-// Can be just a single style, or a bitlist
-long wxListCtrl::ConvertToMSWStyle(long& oldStyle, const long style) const
-{
-  long wstyle = 0;
-  if ( style & wxLC_ICON )
-  {
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_SMALLICON )
-               oldStyle -= LVS_SMALLICON;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_REPORT )
-               oldStyle -= LVS_REPORT;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_LIST )
-               oldStyle -= LVS_LIST;
-       wstyle |= LVS_ICON;
-  }
-
-  if ( style & wxLC_SMALL_ICON )
-  {
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_ICON )
-               oldStyle -= LVS_ICON;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_REPORT )
-               oldStyle -= LVS_REPORT;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_LIST )
-               oldStyle -= LVS_LIST;
-       wstyle |= LVS_SMALLICON;
-  }
-
-  if ( style & wxLC_LIST )
-  {
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_ICON )
-               oldStyle -= LVS_ICON;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_REPORT )
-               oldStyle -= LVS_REPORT;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_SMALLICON )
-               oldStyle -= LVS_SMALLICON;
-       wstyle |= LVS_LIST;
-  }
-
-  if ( style & wxLC_REPORT )
-  {
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_ICON )
-               oldStyle -= LVS_ICON;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_LIST )
-               oldStyle -= LVS_LIST;
-       if ( (oldStyle & LVS_TYPEMASK) == LVS_SMALLICON )
-               oldStyle -= LVS_SMALLICON;
-       wstyle |= LVS_REPORT;
-  }
-
-  if ( style & wxLC_ALIGN_LEFT )
-  {
-       if ( oldStyle & LVS_ALIGNTOP )
-               oldStyle -= LVS_ALIGNTOP;
-       wstyle |= LVS_ALIGNLEFT;
-  }
-
-  if ( style & wxLC_ALIGN_TOP )
-  {
-       if ( oldStyle & LVS_ALIGNLEFT )
-               oldStyle -= LVS_ALIGNLEFT;
-       wstyle |= LVS_ALIGNTOP;
-  }
-
-  if ( style & wxLC_AUTOARRANGE )
-       wstyle |= LVS_AUTOARRANGE;
-
-  // Apparently, no such style (documentation wrong?)
-/*
-  if ( style & wxLC_BUTTON )
-       wstyle |= LVS_BUTTON;
-*/
-
-  if ( style & wxLC_NO_SORT_HEADER )
-       wstyle |= LVS_NOSORTHEADER;
-
-  if ( style & wxLC_NO_HEADER )
-       wstyle |= LVS_NOCOLUMNHEADER;
-
-  if ( style & wxLC_EDIT_LABELS )
-       wstyle |= LVS_EDITLABELS;
-
-  if ( style & wxLC_SINGLE_SEL )
-       wstyle |= LVS_SINGLESEL;
-
-  if ( style & wxLC_SORT_ASCENDING )
-  {
-       if ( oldStyle & LVS_SORTDESCENDING )
-               oldStyle -= LVS_SORTDESCENDING;
-       wstyle |= LVS_SORTASCENDING;
-  }
-
-  if ( style & wxLC_SORT_DESCENDING )
-  {
-       if ( oldStyle & LVS_SORTASCENDING )
-               oldStyle -= LVS_SORTASCENDING;
-       wstyle |= LVS_SORTDESCENDING;
-  }
-
-  return wstyle;
-}
-
-// Sets the background colour (GetBackgroundColour already implicit in
-// wxWindow class)
-void wxListCtrl::SetBackgroundColour(const wxColour& col)
-{
-       wxWindow::SetBackgroundColour(col);
-
-       ListView_SetBkColor((HWND) GetHWND(), PALETTERGB(col.Red(), col.Green(), col.Blue()));
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+// Sets the foreground, i.e. text, colour
+bool wxListCtrl::SetForegroundColour(const wxColour& col)
+{
+    if ( !wxWindow::SetForegroundColour(col) )
+        return FALSE;
+
+    ListView_SetTextColor(GetHwnd(), wxColourToRGB(col));
+
+    return TRUE;
+}
+
+// Sets the background colour
+bool wxListCtrl::SetBackgroundColour(const wxColour& col)
+{
+    if ( !wxWindow::SetBackgroundColour(col) )
+        return FALSE;
+
+    // we set the same colour for both the "empty" background and the items
+    // background
+    COLORREF color = wxColourToRGB(col);
+    ListView_SetBkColor(GetHwnd(), color);
+    ListView_SetTextBkColor(GetHwnd(), color);
+
+    return TRUE;
 }
 
 // Gets information about this column
 }
 
 // Gets information about this column
-bool wxListCtrl::GetColumn(const int col, wxListItem& item) const
+bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 {
 {
-       LV_COLUMN lvCol;
-       lvCol.mask = 0;
-       lvCol.fmt = 0;
-       lvCol.pszText = NULL;
+    LV_COLUMN lvCol;
+    wxZeroMemory(lvCol);
 
 
-       if ( item.m_mask & wxLIST_MASK_TEXT )
-       {
-               lvCol.mask |= LVCF_TEXT;
-               lvCol.pszText = new char[513];
-               lvCol.cchTextMax = 512;
-       }
+    if ( item.m_mask & wxLIST_MASK_TEXT )
+    {
+        lvCol.mask |= LVCF_TEXT;
+        lvCol.pszText = new wxChar[513];
+        lvCol.cchTextMax = 512;
+    }
 
 
-       bool success = (ListView_GetColumn((HWND) GetHWND(), col, & lvCol) != 0);
+    bool success = ListView_GetColumn(GetHwnd(), col, & lvCol) != 0;
 
 
-//     item.m_subItem = lvCol.iSubItem;
-       item.m_width = lvCol.cx;
+    //  item.m_subItem = lvCol.iSubItem;
+    item.m_width = lvCol.cx;
 
 
-       if ( (item.m_mask & wxLIST_MASK_TEXT) && lvCol.pszText )
-       {
-               item.m_text = lvCol.pszText;
-               delete[] lvCol.pszText;
-       }
+    if ( (item.m_mask & wxLIST_MASK_TEXT) && lvCol.pszText )
+    {
+        item.m_text = lvCol.pszText;
+        delete[] lvCol.pszText;
+    }
 
 
-       if ( item.m_mask & wxLIST_MASK_FORMAT )
-       {
-               if (lvCol.fmt == LVCFMT_LEFT)
-                       item.m_format = wxLIST_FORMAT_LEFT;
-               else if (lvCol.fmt == LVCFMT_RIGHT)
-                       item.m_format = wxLIST_FORMAT_RIGHT;
-               else if (lvCol.fmt == LVCFMT_CENTER)
-                       item.m_format = wxLIST_FORMAT_CENTRE;
+    if ( item.m_mask & wxLIST_MASK_FORMAT )
+    {
+        if (lvCol.fmt == LVCFMT_LEFT)
+            item.m_format = wxLIST_FORMAT_LEFT;
+        else if (lvCol.fmt == LVCFMT_RIGHT)
+            item.m_format = wxLIST_FORMAT_RIGHT;
+        else if (lvCol.fmt == LVCFMT_CENTER)
+            item.m_format = wxLIST_FORMAT_CENTRE;
     }
 
     }
 
-       return success;
+    return success;
 }
 
 // Sets information about this column
 }
 
 // Sets information about this column
-bool wxListCtrl::SetColumn(const int col, wxListItem& item)
-{
-       LV_COLUMN lvCol;
-       lvCol.mask = 0;
-       lvCol.fmt = 0;
-       lvCol.pszText = NULL;
-
-       if ( item.m_mask & wxLIST_MASK_TEXT )
-       {
-               lvCol.mask |= LVCF_TEXT;
-               lvCol.pszText = WXSTRINGCAST item.m_text;
-               lvCol.cchTextMax = 0; // Ignored
-       }
-       if ( item.m_mask & wxLIST_MASK_FORMAT )
-       {
-               lvCol.mask |= LVCF_FMT;
-
-               if ( item.m_format == wxLIST_FORMAT_LEFT )
-                       lvCol.fmt = LVCFMT_LEFT;
-               if ( item.m_format == wxLIST_FORMAT_RIGHT )
-                       lvCol.fmt = LVCFMT_RIGHT;
-               if ( item.m_format == wxLIST_FORMAT_CENTRE )
-                       lvCol.fmt = LVCFMT_CENTER;
-    }
-
-       if ( item.m_mask & wxLIST_MASK_WIDTH )
-       {
-               lvCol.mask |= LVCF_WIDTH;
-               lvCol.cx = item.m_width;
-
-               if ( lvCol.cx == wxLIST_AUTOSIZE)
-                       lvCol.cx = LVSCW_AUTOSIZE;
-               else if ( lvCol.cx == wxLIST_AUTOSIZE_USEHEADER)
-                       lvCol.cx = LVSCW_AUTOSIZE_USEHEADER;
-       }
-       lvCol.mask |= LVCF_SUBITEM;
-       lvCol.iSubItem = col;
-       return (ListView_SetColumn((HWND) GetHWND(), col, & lvCol) != 0);
+bool wxListCtrl::SetColumn(int col, wxListItem& item)
+{
+    LV_COLUMN lvCol;
+    wxConvertToMSWListCol(col, item, lvCol);
+
+    return ListView_SetColumn(GetHwnd(), col, &lvCol) != 0;
 }
 
 // Gets the column width
 }
 
 // Gets the column width
-int wxListCtrl::GetColumnWidth(const int col) const
+int wxListCtrl::GetColumnWidth(int col) const
 {
 {
-       return ListView_GetColumnWidth((HWND) GetHWND(), col);
+    return ListView_GetColumnWidth(GetHwnd(), col);
 }
 
 // Sets the column width
 }
 
 // Sets the column width
-bool wxListCtrl::SetColumnWidth(const int col, const int width)
+bool wxListCtrl::SetColumnWidth(int col, int width)
 {
 {
-       int col2 = col;
-       if ( m_windowStyle & wxLC_LIST )
-               col2 = -1;
+    int col2 = col;
+    if ( m_windowStyle & wxLC_LIST )
+        col2 = -1;
 
 
-       int width2 = width;
-       if ( width2 == wxLIST_AUTOSIZE)
-               width2 = LVSCW_AUTOSIZE;
-       else if ( width2 == wxLIST_AUTOSIZE_USEHEADER)
-               width2 = LVSCW_AUTOSIZE_USEHEADER;
+    int width2 = width;
+    if ( width2 == wxLIST_AUTOSIZE)
+        width2 = LVSCW_AUTOSIZE;
+    else if ( width2 == wxLIST_AUTOSIZE_USEHEADER)
+        width2 = LVSCW_AUTOSIZE_USEHEADER;
 
 
-       return (ListView_SetColumnWidth((HWND) GetHWND(), col2, width2) != 0);
+    return ListView_SetColumnWidth(GetHwnd(), col2, width2) != 0;
 }
 
 // Gets the number of items that can fit vertically in the
 // visible area of the list control (list or report view)
 // or the total number of items in the list control (icon
 // or small icon view)
 }
 
 // Gets the number of items that can fit vertically in the
 // visible area of the list control (list or report view)
 // or the total number of items in the list control (icon
 // or small icon view)
-int wxListCtrl::GetCountPerPage(void) const
+int wxListCtrl::GetCountPerPage() const
 {
 {
-       return ListView_GetCountPerPage((HWND) GetHWND());
+    return ListView_GetCountPerPage(GetHwnd());
 }
 
 // Gets the edit control for editing labels.
 }
 
 // Gets the edit control for editing labels.
-wxTextCtrl& wxListCtrl::GetEditControl(void) const
+wxTextCtrl* wxListCtrl::GetEditControl() const
 {
 {
-       HWND hWnd = (HWND) ListView_GetEditControl((HWND) GetHWND());
-       ((wxListCtrl *)this)->m_textCtrl.SetHWND((WXHWND) hWnd);
-       return (wxTextCtrl&)m_textCtrl;
+    return m_textCtrl;
 }
 
 // Gets information about the item
 bool wxListCtrl::GetItem(wxListItem& info) const
 {
 }
 
 // Gets information about the item
 bool wxListCtrl::GetItem(wxListItem& info) const
 {
-       LV_ITEM lvItem;
-       lvItem.pszText = NULL;
-       if ( info.m_mask & wxLIST_MASK_TEXT )
-       {
-               lvItem.pszText = new char[513];
-               lvItem.cchTextMax = 512;
-       }
-       bool success = (::SendMessage((HWND) GetHWND(), LVM_GETITEM, 0, (LPARAM)& lvItem) != 0);
-
-       if ( !success )
-       {
-        if (lvItem.pszText)
-                       delete[] lvItem.pszText;
+    LV_ITEM lvItem;
+    wxZeroMemory(lvItem);
+
+    lvItem.iItem = info.m_itemId;
+    lvItem.iSubItem = info.m_col;
 
 
-               return FALSE;
-       }
+    if ( info.m_mask & wxLIST_MASK_TEXT )
+    {
+        lvItem.mask |= LVIF_TEXT;
+        lvItem.pszText = new wxChar[513];
+        lvItem.cchTextMax = 512;
+    }
+    else
+    {
+        lvItem.pszText = NULL;
+    }
 
 
-    wxConvertFromMSWListItem(this, info, lvItem);
+    if (info.m_mask & wxLIST_MASK_DATA)
+        lvItem.mask |= LVIF_PARAM;
+
+    if (info.m_mask & wxLIST_MASK_IMAGE)
+        lvItem.mask |= LVIF_IMAGE;
+
+    if ( info.m_mask & wxLIST_MASK_STATE )
+    {
+        lvItem.mask |= LVIF_STATE;
+        // the other bits are hardly interesting anyhow
+        lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
+    }
+
+    bool success = ListView_GetItem((HWND)GetHWND(), &lvItem) != 0;
+    if ( !success )
+    {
+        wxLogError(_("Couldn't retrieve information about list control item %d."),
+                lvItem.iItem);
+    }
+    else
+    {
+        // give NULL as hwnd as we already have everything we need
+        wxConvertFromMSWListItem(NULL, info, lvItem);
+    }
 
     if (lvItem.pszText)
 
     if (lvItem.pszText)
-               delete[] lvItem.pszText;
+        delete[] lvItem.pszText;
 
 
-       return success;
+    return success;
 }
 
 // Sets information about the item
 bool wxListCtrl::SetItem(wxListItem& info)
 {
 }
 
 // Sets information about the item
 bool wxListCtrl::SetItem(wxListItem& info)
 {
-       LV_ITEM item;
+    LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
     wxConvertToMSWListItem(this, info, item);
-       item.cchTextMax = 0;
-       return (ListView_SetItem((HWND) GetHWND(), &item) != 0);
+
+    // we could be changing only the attribute in which case we don't need to
+    // call ListView_SetItem() at all
+    if ( item.mask )
+    {
+        item.cchTextMax = 0;
+        if ( !ListView_SetItem(GetHwnd(), &item) )
+        {
+            wxLogDebug(_T("ListView_SetItem() failed"));
+
+            return FALSE;
+        }
+    }
+
+    // we need to update the item immediately to show the new image
+    bool updateNow = (info.m_mask & wxLIST_MASK_IMAGE) != 0;
+
+    // check whether it has any custom attributes
+    if ( info.HasAttributes() )
+    {
+        wxListItemAttr *attr = (wxListItemAttr *)m_attrs.Get(item.iItem);
+
+        if ( attr == NULL )
+            m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
+        else
+            *attr = *info.GetAttributes();
+
+        m_hasAnyAttr = TRUE;
+
+        // if the colour has changed, we must redraw the item
+        updateNow = TRUE;
+    }
+
+    if ( updateNow )
+    {
+        // we need this to make the change visible right now
+        RefreshItem(item.iItem);
+    }
+
+    return TRUE;
 }
 
 }
 
-long wxListCtrl::SetItem(const long index, const int col, const wxString& label, const int imageId)
+long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
 {
 {
-       wxListItem info;
-       info.m_text = label;
-       info.m_mask = wxLIST_MASK_TEXT;
-       info.m_itemId = index;
-       info.m_col = col;
-       if ( imageId > -1 )
-       {
-               info.m_image = imageId;
-               info.m_mask |= wxLIST_MASK_IMAGE;
-       }
-       return SetItem(info);
+    wxListItem info;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = index;
+    info.m_col = col;
+    if ( imageId > -1 )
+    {
+        info.m_image = imageId;
+        info.m_mask |= wxLIST_MASK_IMAGE;
+    }
+    return SetItem(info);
 }
 
 
 // Gets the item state
 }
 
 
 // Gets the item state
-int wxListCtrl::GetItemState(const long item, const long stateMask) const
+int wxListCtrl::GetItemState(long item, long stateMask) const
 {
 {
-       wxListItem info;
+    wxListItem info;
 
 
-       info.m_mask = wxLIST_MASK_STATE ;
-       info.m_stateMask = stateMask;
-       info.m_itemId = item;
+    info.m_mask = wxLIST_MASK_STATE;
+    info.m_stateMask = stateMask;
+    info.m_itemId = item;
 
 
-       if (!GetItem(info))
-               return 0;
+    if (!GetItem(info))
+        return 0;
 
 
-       return info.m_state;
+    return info.m_state;
 }
 
 // Sets the item state
 }
 
 // Sets the item state
-bool wxListCtrl::SetItemState(const long item, const long state, const long stateMask)
+bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 {
 {
-       wxListItem info;
+    // NB: don't use SetItem() here as it doesn't work with the virtual list
+    //     controls
+    LV_ITEM lvItem;
+    wxZeroMemory(lvItem);
+
+    wxConvertToMSWFlags(state, stateMask, lvItem);
+
+    // for the virtual list controls we need to refresh the previously focused
+    // item manually when changing focus without changing selection
+    // programmatically because otherwise it keeps its focus rectangle until
+    // next repaint (yet another comctl32 bug)
+    long focusOld;
+    if ( IsVirtual() &&
+         (stateMask & wxLIST_STATE_FOCUSED) &&
+         (state & wxLIST_STATE_FOCUSED) )
+    {
+        focusOld = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
+    }
+    else
+    {
+        focusOld = -1;
+    }
 
 
-       info.m_mask = wxLIST_MASK_STATE ;
-       info.m_state = state;
-       info.m_stateMask = stateMask;
-       info.m_itemId = item;
+    if ( !::SendMessage(GetHwnd(), LVM_SETITEMSTATE,
+                        (WPARAM)item, (LPARAM)&lvItem) )
+    {
+        wxLogLastError(_T("ListView_SetItemState"));
 
 
-       return SetItem(info);
+        return FALSE;
+    }
+
+    if ( focusOld != -1 )
+    {
+        // no need to refresh the item if it was previously selected, it would
+        // only result in annoying flicker
+        if ( !(GetItemState(focusOld,
+                            wxLIST_STATE_SELECTED) & wxLIST_STATE_SELECTED) )
+        {
+            RefreshItem(focusOld);
+        }
+    }
+
+    return TRUE;
 }
 
 // Sets the item image
 }
 
 // Sets the item image
-bool wxListCtrl::SetItemImage(const long item, const int image, const int selImage)
+bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
 {
 {
-       wxListItem info;
+    wxListItem info;
 
 
-       info.m_mask = wxLIST_MASK_IMAGE ;
-       info.m_image = image;
-       info.m_itemId = item;
+    info.m_mask = wxLIST_MASK_IMAGE;
+    info.m_image = image;
+    info.m_itemId = item;
 
 
-       return SetItem(info);
+    return SetItem(info);
 }
 
 // Gets the item text
 }
 
 // Gets the item text
-wxString wxListCtrl::GetItemText(const long item) const
+wxString wxListCtrl::GetItemText(long item) const
 {
 {
-       wxListItem info;
+    wxListItem info;
 
 
-       info.m_mask = wxLIST_MASK_TEXT ;
-       info.m_itemId = item;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = item;
 
 
-       if (!GetItem(info))
-               return wxString("");
-       return info.m_text;
+    if (!GetItem(info))
+        return wxString("");
+    return info.m_text;
 }
 
 // Sets the item text
 }
 
 // Sets the item text
-void wxListCtrl::SetItemText(const long item, const wxString& str)
+void wxListCtrl::SetItemText(long item, const wxString& str)
 {
 {
-       wxListItem info;
+    wxListItem info;
 
 
-       info.m_mask = wxLIST_MASK_TEXT ;
-       info.m_itemId = item;
-       info.m_text = str;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = item;
+    info.m_text = str;
 
 
-       SetItem(info);
+    SetItem(info);
 }
 
 // Gets the item data
 }
 
 // Gets the item data
-long wxListCtrl::GetItemData(const long item) const
+long wxListCtrl::GetItemData(long item) const
 {
 {
-       wxListItem info;
+    wxListItem info;
 
 
-       info.m_mask = wxLIST_MASK_DATA ;
-       info.m_itemId = item;
+    info.m_mask = wxLIST_MASK_DATA;
+    info.m_itemId = item;
 
 
-       if (!GetItem(info))
-               return 0;
-       return info.m_data;
+    if (!GetItem(info))
+        return 0;
+    return info.m_data;
 }
 
 // Sets the item data
 }
 
 // Sets the item data
-bool wxListCtrl::SetItemData(const long item, long data)
+bool wxListCtrl::SetItemData(long item, long data)
 {
 {
-       wxListItem info;
+    wxListItem info;
 
 
-       info.m_mask = wxLIST_MASK_DATA ;
-       info.m_itemId = item;
-       info.m_data = data;
+    info.m_mask = wxLIST_MASK_DATA;
+    info.m_itemId = item;
+    info.m_data = data;
 
 
-       return SetItem(info);
+    return SetItem(info);
 }
 
 // Gets the item rectangle
 }
 
 // Gets the item rectangle
-bool wxListCtrl::GetItemRect(const long item, wxRectangle& rect, const int code) const
+bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
 {
-       RECT rect2;
+    RECT rectWin;
+
+    int codeWin;
+    if ( code == wxLIST_RECT_BOUNDS )
+        codeWin = LVIR_BOUNDS;
+    else if ( code == wxLIST_RECT_ICON )
+        codeWin = LVIR_ICON;
+    else if ( code == wxLIST_RECT_LABEL )
+        codeWin = LVIR_LABEL;
+    else
+    {
+        wxFAIL_MSG( _T("incorrect code in GetItemRect()") );
 
 
-       int code2 = LVIR_BOUNDS;
-       if ( code == wxLIST_RECT_BOUNDS )
-               code2 = LVIR_BOUNDS;
-       else if ( code == wxLIST_RECT_ICON )
-               code2 = LVIR_ICON;
-       else if ( code == wxLIST_RECT_LABEL )
-               code2 = LVIR_LABEL;
+        codeWin = LVIR_BOUNDS;
+    }
 
 
-       bool success = (ListView_GetItemRect((HWND) GetHWND(), (int) item, &rect2, code2) != 0);
+#ifdef __WXWINE__
+    bool success = ListView_GetItemRect(GetHwnd(), (int) item, &rectWin ) != 0;
+#else
+    bool success = ListView_GetItemRect(GetHwnd(), (int) item, &rectWin, codeWin) != 0;
+#endif
+
+    rect.x = rectWin.left;
+    rect.y = rectWin.top;
+    rect.width = rectWin.right - rectWin.left;
+    rect.height = rectWin.bottom - rectWin.top;
 
 
-       rect.x = rect2.left;
-       rect.y = rect2.top;
-       rect.width = rect2.right - rect2.left;
-       rect.height = rect2.bottom - rect2.left;
-       return success;
+    return success;
 }
 
 // Gets the item position
 }
 
 // Gets the item position
-bool wxListCtrl::GetItemPosition(const long item, wxPoint& pos) const
+bool wxListCtrl::GetItemPosition(long item, wxPoint& pos) const
 {
 {
-       POINT pt;
+    POINT pt;
 
 
-       bool success = (ListView_GetItemPosition((HWND) GetHWND(), (int) item, &pt) != 0);
+    bool success = (ListView_GetItemPosition(GetHwnd(), (int) item, &pt) != 0);
 
 
-       pos.x = pt.x; pos.y = pt.y;
-       return success;
+    pos.x = pt.x; pos.y = pt.y;
+    return success;
 }
 
 // Sets the item position.
 }
 
 // Sets the item position.
-bool wxListCtrl::SetItemPosition(const long item, const wxPoint& pos)
+bool wxListCtrl::SetItemPosition(long item, const wxPoint& pos)
 {
 {
-       return (ListView_SetItemPosition((HWND) GetHWND(), (int) item, pos.x, pos.y) != 0);
+    return (ListView_SetItemPosition(GetHwnd(), (int) item, pos.x, pos.y) != 0);
 }
 
 // Gets the number of items in the list control
 }
 
 // Gets the number of items in the list control
-int wxListCtrl::GetItemCount(void) const
+int wxListCtrl::GetItemCount() const
 {
 {
-       return ListView_GetItemCount((HWND) GetHWND());
+    return ListView_GetItemCount(GetHwnd());
 }
 
 // Retrieves the spacing between icons in pixels.
 }
 
 // Retrieves the spacing between icons in pixels.
@@ -641,34 +912,34 @@ int wxListCtrl::GetItemCount(void) const
 // view, otherwise the large icon view.
 int wxListCtrl::GetItemSpacing(bool isSmall) const
 {
 // view, otherwise the large icon view.
 int wxListCtrl::GetItemSpacing(bool isSmall) const
 {
-       return ListView_GetItemSpacing((HWND) GetHWND(), (BOOL) isSmall);
+    return ListView_GetItemSpacing(GetHwnd(), (BOOL) isSmall);
 }
 
 // Gets the number of selected items in the list control
 }
 
 // Gets the number of selected items in the list control
-int wxListCtrl::GetSelectedItemCount(void) const
+int wxListCtrl::GetSelectedItemCount() const
 {
 {
-       return ListView_GetSelectedCount((HWND) GetHWND());
+    return ListView_GetSelectedCount(GetHwnd());
 }
 
 // Gets the text colour of the listview
 }
 
 // Gets the text colour of the listview
-wxColour wxListCtrl::GetTextColour(void) const
+wxColour wxListCtrl::GetTextColour() const
 {
 {
-       COLORREF ref = ListView_GetTextColor((HWND) GetHWND());
-       wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
-       return col;
+    COLORREF ref = ListView_GetTextColor(GetHwnd());
+    wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
+    return col;
 }
 
 // Sets the text colour of the listview
 void wxListCtrl::SetTextColour(const wxColour& col)
 {
 }
 
 // Sets the text colour of the listview
 void wxListCtrl::SetTextColour(const wxColour& col)
 {
-       ListView_SetTextColor((HWND) GetHWND(), PALETTERGB(col.Red(), col.Blue(), col.Green()));
+    ListView_SetTextColor(GetHwnd(), PALETTERGB(col.Red(), col.Green(), col.Blue()));
 }
 
 // Gets the index of the topmost visible item when in
 // list or report view
 }
 
 // Gets the index of the topmost visible item when in
 // list or report view
-long wxListCtrl::GetTopItem(void) const
+long wxListCtrl::GetTopItem() const
 {
 {
-       return (long) ListView_GetTopIndex((HWND) GetHWND());
+    return (long) ListView_GetTopIndex(GetHwnd());
 }
 
 // Searches for an item, starting from 'item'.
 }
 
 // Searches for an item, starting from 'item'.
@@ -679,119 +950,173 @@ long wxListCtrl::GetTopItem(void) const
 // item can be -1 to find the first item that matches the
 // specified flags.
 // Returns the item or -1 if unsuccessful.
 // item can be -1 to find the first item that matches the
 // specified flags.
 // Returns the item or -1 if unsuccessful.
-long wxListCtrl::GetNextItem(const long item, int geom, int state) const
+long wxListCtrl::GetNextItem(long item, int geom, int state) const
 {
 {
-       long flags = 0;
-
-       if ( geom == wxLIST_NEXT_ABOVE )
-               flags |= LVNI_ABOVE;
-       if ( geom == wxLIST_NEXT_ALL )
-               flags |= LVNI_ALL;
-       if ( geom == wxLIST_NEXT_BELOW )
-               flags |= LVNI_BELOW;
-       if ( geom == wxLIST_NEXT_LEFT )
-               flags |= LVNI_TOLEFT;
-       if ( geom == wxLIST_NEXT_RIGHT )
-               flags |= LVNI_TORIGHT;
-
-       if ( state & wxLIST_STATE_CUT )
-               flags |= LVNI_CUT;
-       if ( state & wxLIST_STATE_DROPHILITED )
-               flags |= LVNI_DROPHILITED;
-       if ( state & wxLIST_STATE_FOCUSED )
-               flags |= LVNI_FOCUSED;
-       if ( state & wxLIST_STATE_SELECTED )
-               flags |= LVNI_SELECTED;
-
-       return (long) ListView_GetNextItem((HWND) GetHWND(), item, flags);
+    long flags = 0;
+
+    if ( geom == wxLIST_NEXT_ABOVE )
+        flags |= LVNI_ABOVE;
+    if ( geom == wxLIST_NEXT_ALL )
+        flags |= LVNI_ALL;
+    if ( geom == wxLIST_NEXT_BELOW )
+        flags |= LVNI_BELOW;
+    if ( geom == wxLIST_NEXT_LEFT )
+        flags |= LVNI_TOLEFT;
+    if ( geom == wxLIST_NEXT_RIGHT )
+        flags |= LVNI_TORIGHT;
+
+    if ( state & wxLIST_STATE_CUT )
+        flags |= LVNI_CUT;
+    if ( state & wxLIST_STATE_DROPHILITED )
+        flags |= LVNI_DROPHILITED;
+    if ( state & wxLIST_STATE_FOCUSED )
+        flags |= LVNI_FOCUSED;
+    if ( state & wxLIST_STATE_SELECTED )
+        flags |= LVNI_SELECTED;
+
+    return (long) ListView_GetNextItem(GetHwnd(), item, flags);
 }
 
 
 }
 
 
-wxImageList *wxListCtrl::GetImageList(const int which) const
+wxImageList *wxListCtrl::GetImageList(int which) const
 {
 {
-       if ( which == wxIMAGE_LIST_NORMAL )
+    if ( which == wxIMAGE_LIST_NORMAL )
     {
     {
-               return m_imageListNormal;
-       }
-       else if ( which == wxIMAGE_LIST_SMALL )
+        return m_imageListNormal;
+    }
+    else if ( which == wxIMAGE_LIST_SMALL )
     {
     {
-               return m_imageListSmall;
-       }
-       else if ( which == wxIMAGE_LIST_STATE )
+        return m_imageListSmall;
+    }
+    else if ( which == wxIMAGE_LIST_STATE )
     {
     {
-               return m_imageListState;
-       }
-       return NULL;
+        return m_imageListState;
+    }
+    return NULL;
 }
 
 }
 
-void wxListCtrl::SetImageList(wxImageList *imageList, const int which)
+void wxListCtrl::SetImageList(wxImageList *imageList, int which)
 {
 {
-       int flags = 0;
-       if ( which == wxIMAGE_LIST_NORMAL )
+    int flags = 0;
+    if ( which == wxIMAGE_LIST_NORMAL )
     {
     {
-               flags = LVSIL_NORMAL;
-               m_imageListNormal = imageList;
-       }
-       else if ( which == wxIMAGE_LIST_SMALL )
+        flags = LVSIL_NORMAL;
+        if (m_ownsImageListNormal) delete m_imageListNormal;
+        m_imageListNormal = imageList;
+        m_ownsImageListNormal = FALSE;
+    }
+    else if ( which == wxIMAGE_LIST_SMALL )
     {
     {
-               flags = LVSIL_SMALL;
-               m_imageListSmall = imageList;
-       }
-       else if ( which == wxIMAGE_LIST_STATE )
+        flags = LVSIL_SMALL;
+        if (m_ownsImageListSmall) delete m_imageListSmall;
+        m_imageListSmall = imageList;
+        m_ownsImageListSmall = FALSE;
+    }
+    else if ( which == wxIMAGE_LIST_STATE )
     {
     {
-               flags = LVSIL_STATE;
-               m_imageListState = imageList;
-       }
-       ListView_SetImageList((HWND) GetHWND(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
+        flags = LVSIL_STATE;
+        if (m_ownsImageListState) delete m_imageListState;
+        m_imageListState = imageList;
+        m_ownsImageListState = FALSE;
+    }
+    ListView_SetImageList(GetHwnd(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
+}
+
+void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
+{
+    SetImageList(imageList, which);
+    if ( which == wxIMAGE_LIST_NORMAL )
+        m_ownsImageListNormal = TRUE;
+    else if ( which == wxIMAGE_LIST_SMALL )
+        m_ownsImageListSmall = TRUE;
+    else if ( which == wxIMAGE_LIST_STATE )
+        m_ownsImageListState = TRUE;
 }
 
 }
 
+// ----------------------------------------------------------------------------
 // Operations
 // Operations
-////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------
 
 // Arranges the items
 
 // Arranges the items
-bool wxListCtrl::Arrange(const int flag)
+bool wxListCtrl::Arrange(int flag)
 {
 {
-       UINT code = 0;
-       if ( flag == wxLIST_ALIGN_LEFT )
-               code = LVA_ALIGNLEFT;
-       else if ( flag == wxLIST_ALIGN_TOP )
-               code = LVA_ALIGNTOP;
-       else if ( flag == wxLIST_ALIGN_DEFAULT )
-               code = LVA_DEFAULT;
-       else if ( flag == wxLIST_ALIGN_SNAP_TO_GRID )
-               code = LVA_SNAPTOGRID;
-
-       return (ListView_Arrange((HWND) GetHWND(), code) != 0);
+    UINT code = 0;
+    if ( flag == wxLIST_ALIGN_LEFT )
+        code = LVA_ALIGNLEFT;
+    else if ( flag == wxLIST_ALIGN_TOP )
+        code = LVA_ALIGNTOP;
+    else if ( flag == wxLIST_ALIGN_DEFAULT )
+        code = LVA_DEFAULT;
+    else if ( flag == wxLIST_ALIGN_SNAP_TO_GRID )
+        code = LVA_SNAPTOGRID;
+
+    return (ListView_Arrange(GetHwnd(), code) != 0);
 }
 
 // Deletes an item
 }
 
 // Deletes an item
-bool wxListCtrl::DeleteItem(const long item)
+bool wxListCtrl::DeleteItem(long item)
 {
 {
-       return (ListView_DeleteItem((HWND) GetHWND(), (int) item) != 0);
+    if ( !ListView_DeleteItem(GetHwnd(), (int) item) )
+    {
+        wxLogLastError(_T("ListView_DeleteItem"));
+        return FALSE;
+    }
+
+    // the virtual list control doesn't refresh itself correctly, help it
+    if ( IsVirtual() )
+    {
+        // we need to refresh all the lines below the one which was deleted
+        wxRect rectItem;
+        if ( item > 0 && GetItemCount() )
+        {
+            GetItemRect(item - 1, rectItem);
+        }
+        else
+        {
+            rectItem.y =
+            rectItem.height = 0;
+        }
+
+        wxRect rectWin = GetRect();
+        rectWin.height = rectWin.GetBottom() - rectItem.GetBottom();
+        rectWin.y = rectItem.GetBottom();
+
+        RefreshRect(rectWin);
+    }
+
+    return TRUE;
 }
 
 // Deletes all items
 }
 
 // Deletes all items
-bool wxListCtrl::DeleteAllItems(void)
+bool wxListCtrl::DeleteAllItems()
 {
 {
-       return (ListView_DeleteAllItems((HWND) GetHWND()) != 0);
+    return ListView_DeleteAllItems(GetHwnd()) != 0;
 }
 
 // Deletes all items
 }
 
 // Deletes all items
-bool wxListCtrl::DeleteAllColumns(void)
+bool wxListCtrl::DeleteAllColumns()
 {
 {
-       int i;
-    for ( i = 0; i < m_colCount; i++)
+    while ( m_colCount > 0 )
     {
     {
-         if (ListView_DeleteColumn((HWND) GetHWND(), 0) != 0)
-        m_colCount --;
+        if ( ListView_DeleteColumn(GetHwnd(), 0) == 0 )
+        {
+            wxLogLastError(wxT("ListView_DeleteColumn"));
+
+            return FALSE;
+        }
+
+        m_colCount--;
     }
     }
-    return (m_colCount == 0);
+
+    wxASSERT_MSG( m_colCount == 0, wxT("no columns should be left") );
+
+    return TRUE;
 }
 
 // Deletes a column
 }
 
 // Deletes a column
-bool wxListCtrl::DeleteColumn(const int col)
+bool wxListCtrl::DeleteColumn(int col)
 {
 {
-       bool success = (ListView_DeleteColumn((HWND) GetHWND(), col) != 0);
+    bool success = (ListView_DeleteColumn(GetHwnd(), col) != 0);
 
     if ( success && (m_colCount > 0) )
         m_colCount --;
 
     if ( success && (m_colCount > 0) )
         m_colCount --;
@@ -799,74 +1124,102 @@ bool wxListCtrl::DeleteColumn(const int col)
 }
 
 // Clears items, and columns if there are any.
 }
 
 // Clears items, and columns if there are any.
-void wxListCtrl::ClearAll(void)
+void wxListCtrl::ClearAll()
 {
     DeleteAllItems();
     if ( m_colCount > 0 )
         DeleteAllColumns();
 }
 
 {
     DeleteAllItems();
     if ( m_colCount > 0 )
         DeleteAllColumns();
 }
 
-// Edits a label
-wxTextCtrl& wxListCtrl::Edit(const long item)
+wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 {
 {
-       HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), (int) item);
-       m_textCtrl.SetHWND((WXHWND) hWnd);
-       return m_textCtrl;
+    wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
+
+    // VS: ListView_EditLabel requires that the list has focus.
+    SetFocus();
+    HWND hWnd = (HWND) ListView_EditLabel(GetHwnd(), item);
+
+    if (m_textCtrl)
+    {
+        m_textCtrl->SetHWND(0);
+        m_textCtrl->UnsubclassWin();
+        delete m_textCtrl;
+        m_textCtrl = NULL;
+    }
+
+    m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject();
+    m_textCtrl->SetHWND((WXHWND) hWnd);
+    m_textCtrl->SubclassWin((WXHWND) hWnd);
+
+    return m_textCtrl;
+}
+
+// End label editing, optionally cancelling the edit
+bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return FALSE;
 }
 
 // Ensures this item is visible
 }
 
 // Ensures this item is visible
-bool wxListCtrl::EnsureVisible(const long item)
+bool wxListCtrl::EnsureVisible(long item)
 {
 {
-       return (ListView_EnsureVisible((HWND) GetHWND(), (int) item, FALSE) != 0);
+    return ListView_EnsureVisible(GetHwnd(), (int) item, FALSE) != 0;
 }
 
 // Find an item whose label matches this string, starting from the item after 'start'
 // or the beginning if 'start' is -1.
 }
 
 // Find an item whose label matches this string, starting from the item after 'start'
 // or the beginning if 'start' is -1.
-long wxListCtrl::FindItem(const long start, const wxString& str, const bool partial)
+long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
 {
 {
-       LV_FINDINFO findInfo;
-
-       findInfo.flags = LVFI_STRING;
-       if ( partial )
-               findInfo.flags |= LVFI_STRING;
-       findInfo.psz = WXSTRINGCAST str;
-
-       return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+    LV_FINDINFO findInfo;
+
+    findInfo.flags = LVFI_STRING;
+    if ( partial )
+        findInfo.flags |= LVFI_PARTIAL;
+    findInfo.psz = str;
+
+    // ListView_FindItem() excludes the first item from search and to look
+    // through all the items you need to start from -1 which is unnatural and
+    // inconsistent with the generic version - so we adjust the index
+    if (start != -1)
+        start --;
+    return ListView_FindItem(GetHwnd(), (int) start, &findInfo);
 }
 
 // Find an item whose data matches this data, starting from the item after 'start'
 // or the beginning if 'start' is -1.
 }
 
 // Find an item whose data matches this data, starting from the item after 'start'
 // or the beginning if 'start' is -1.
-long wxListCtrl::FindItem(const long start, const long data)
+long wxListCtrl::FindItem(long start, long data)
 {
 {
-       LV_FINDINFO findInfo;
+    LV_FINDINFO findInfo;
 
 
-       findInfo.flags = LVFI_PARAM;
-       findInfo.lParam = data;
+    findInfo.flags = LVFI_PARAM;
+    findInfo.lParam = data;
 
 
-       return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+    return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
 }
 
 // Find an item nearest this position in the specified direction, starting from
 // the item after 'start' or the beginning if 'start' is -1.
 }
 
 // Find an item nearest this position in the specified direction, starting from
 // the item after 'start' or the beginning if 'start' is -1.
-long wxListCtrl::FindItem(const long start, const wxPoint& pt, const int direction)
+long wxListCtrl::FindItem(long start, const wxPoint& pt, int direction)
 {
 {
-       LV_FINDINFO findInfo;
-
-       findInfo.flags = LVFI_NEARESTXY;
-       findInfo.pt.x = pt.x;
-       findInfo.pt.y = pt.y;
-       findInfo.vkDirection = VK_RIGHT;
-
-       if ( direction == wxLIST_FIND_UP )
-               findInfo.vkDirection = VK_UP;
-       else if ( direction == wxLIST_FIND_DOWN )
-               findInfo.vkDirection = VK_DOWN;
-       else if ( direction == wxLIST_FIND_LEFT )
-               findInfo.vkDirection = VK_LEFT;
-       else if ( direction == wxLIST_FIND_RIGHT )
-               findInfo.vkDirection = VK_RIGHT;
-
-       return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+    LV_FINDINFO findInfo;
+
+    findInfo.flags = LVFI_NEARESTXY;
+    findInfo.pt.x = pt.x;
+    findInfo.pt.y = pt.y;
+    findInfo.vkDirection = VK_RIGHT;
+
+    if ( direction == wxLIST_FIND_UP )
+        findInfo.vkDirection = VK_UP;
+    else if ( direction == wxLIST_FIND_DOWN )
+        findInfo.vkDirection = VK_DOWN;
+    else if ( direction == wxLIST_FIND_LEFT )
+        findInfo.vkDirection = VK_LEFT;
+    else if ( direction == wxLIST_FIND_RIGHT )
+        findInfo.vkDirection = VK_RIGHT;
+
+    return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
 }
 
 // Determines which item (if any) is at the specified point,
 }
 
 // Determines which item (if any) is at the specified point,
@@ -874,133 +1227,150 @@ long wxListCtrl::FindItem(const long start, const wxPoint& pt, const int directi
 long wxListCtrl::HitTest(const wxPoint& point, int& flags)
 {
     LV_HITTESTINFO hitTestInfo;
 long wxListCtrl::HitTest(const wxPoint& point, int& flags)
 {
     LV_HITTESTINFO hitTestInfo;
-       hitTestInfo.pt.x = (int) point.x;
-       hitTestInfo.pt.y = (int) point.y;
-
-    ListView_HitTest((HWND) GetHWND(), & hitTestInfo);
-
-       flags = 0;
-       if ( hitTestInfo.flags & LVHT_ABOVE )
-               flags |= wxLIST_HITTEST_ABOVE;
-       if ( hitTestInfo.flags & LVHT_BELOW )
-               flags |= wxLIST_HITTEST_BELOW;
-       if ( hitTestInfo.flags & LVHT_NOWHERE )
-               flags |= wxLIST_HITTEST_NOWHERE;
-       if ( hitTestInfo.flags & LVHT_ONITEMICON )
-               flags |= wxLIST_HITTEST_ONITEMICON;
-       if ( hitTestInfo.flags & LVHT_ONITEMLABEL )
-               flags |= wxLIST_HITTEST_ONITEMLABEL;
-       if ( hitTestInfo.flags & LVHT_ONITEMSTATEICON )
-               flags |= wxLIST_HITTEST_ONITEMSTATEICON;
-       if ( hitTestInfo.flags & LVHT_TOLEFT )
-               flags |= wxLIST_HITTEST_TOLEFT;
-       if ( hitTestInfo.flags & LVHT_TORIGHT )
-               flags |= wxLIST_HITTEST_TORIGHT;
-
-       return (long) hitTestInfo.iItem ;
+    hitTestInfo.pt.x = (int) point.x;
+    hitTestInfo.pt.y = (int) point.y;
+
+    ListView_HitTest(GetHwnd(), & hitTestInfo);
+
+    flags = 0;
+    if ( hitTestInfo.flags & LVHT_ABOVE )
+        flags |= wxLIST_HITTEST_ABOVE;
+    if ( hitTestInfo.flags & LVHT_BELOW )
+        flags |= wxLIST_HITTEST_BELOW;
+    if ( hitTestInfo.flags & LVHT_NOWHERE )
+        flags |= wxLIST_HITTEST_NOWHERE;
+    if ( hitTestInfo.flags & LVHT_ONITEMICON )
+        flags |= wxLIST_HITTEST_ONITEMICON;
+    if ( hitTestInfo.flags & LVHT_ONITEMLABEL )
+        flags |= wxLIST_HITTEST_ONITEMLABEL;
+    if ( hitTestInfo.flags & LVHT_ONITEMSTATEICON )
+        flags |= wxLIST_HITTEST_ONITEMSTATEICON;
+    if ( hitTestInfo.flags & LVHT_TOLEFT )
+        flags |= wxLIST_HITTEST_TOLEFT;
+    if ( hitTestInfo.flags & LVHT_TORIGHT )
+        flags |= wxLIST_HITTEST_TORIGHT;
+
+    return (long) hitTestInfo.iItem;
 }
 
 // Inserts an item, returning the index of the new item if successful,
 // -1 otherwise.
 }
 
 // Inserts an item, returning the index of the new item if successful,
 // -1 otherwise.
-// TOD: Should also have some further convenience functions
-// which don't require setting a wxListItem object
 long wxListCtrl::InsertItem(wxListItem& info)
 {
 long wxListCtrl::InsertItem(wxListItem& info)
 {
-       LV_ITEM item;
-       wxConvertToMSWListItem(this, info, item);
+    wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual controls") );
+
+    LV_ITEM item;
+    wxConvertToMSWListItem(this, info, item);
+
+    // check whether it has any custom attributes
+    if ( info.HasAttributes() )
+    {
+
+        wxListItemAttr *attr;
+        attr = (wxListItemAttr*) m_attrs.Get(item.iItem);
 
 
-       return (long) ListView_InsertItem((HWND) GetHWND(), & item);
+        if (attr == NULL)
+
+            m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
+
+        else *attr = *info.GetAttributes();
+
+        m_hasAnyAttr = TRUE;
+    }
+
+    return (long) ListView_InsertItem(GetHwnd(), & item);
 }
 
 }
 
-long wxListCtrl::InsertItem(const long index, const wxString& label)
+long wxListCtrl::InsertItem(long index, const wxString& label)
 {
 {
-       wxListItem info;
-       info.m_text = label;
-       info.m_mask = wxLIST_MASK_TEXT;
-       info.m_itemId = index;
-       return InsertItem(info);
+    wxListItem info;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = index;
+    return InsertItem(info);
 }
 
 // Inserts an image item
 }
 
 // Inserts an image item
-long wxListCtrl::InsertItem(const long index, const int imageIndex)
+long wxListCtrl::InsertItem(long index, int imageIndex)
 {
 {
-       wxListItem info;
-       info.m_image = imageIndex;
-       info.m_mask = wxLIST_MASK_IMAGE;
-       info.m_itemId = index;
-       return InsertItem(info);
+    wxListItem info;
+    info.m_image = imageIndex;
+    info.m_mask = wxLIST_MASK_IMAGE;
+    info.m_itemId = index;
+    return InsertItem(info);
 }
 
 // Inserts an image/string item
 }
 
 // Inserts an image/string item
-long wxListCtrl::InsertItem(const long index, const wxString& label, const int imageIndex)
+long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
 {
 {
-       wxListItem info;
-       info.m_image = imageIndex;
-       info.m_text = label;
-       info.m_mask = wxLIST_MASK_IMAGE | wxLIST_MASK_TEXT;
-       info.m_itemId = index;
-       return InsertItem(info);
+    wxListItem info;
+    info.m_image = imageIndex;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_IMAGE | wxLIST_MASK_TEXT;
+    info.m_itemId = index;
+    return InsertItem(info);
 }
 
 // For list view mode (only), inserts a column.
 }
 
 // For list view mode (only), inserts a column.
-long wxListCtrl::InsertColumn(const long col, wxListItem& item)
-{
-       LV_COLUMN lvCol;
-       lvCol.mask = 0;
-       lvCol.fmt = 0;
-       lvCol.pszText = NULL;
-
-       if ( item.m_mask & wxLIST_MASK_TEXT )
-       {
-               lvCol.mask |= LVCF_TEXT;
-               lvCol.pszText = WXSTRINGCAST item.m_text;
-               lvCol.cchTextMax = 0; // Ignored
-       }
-       if ( item.m_mask & wxLIST_MASK_FORMAT )
-       {
-               lvCol.mask |= LVCF_FMT;
-
-               if ( item.m_format == wxLIST_FORMAT_LEFT )
-                       lvCol.fmt = LVCFMT_LEFT;
-               if ( item.m_format == wxLIST_FORMAT_RIGHT )
-                       lvCol.fmt = LVCFMT_RIGHT;
-               if ( item.m_format == wxLIST_FORMAT_CENTRE )
-                       lvCol.fmt = LVCFMT_CENTER;
-    }
-
-       if ( item.m_mask & wxLIST_MASK_WIDTH )
-       {
-               lvCol.mask |= LVCF_WIDTH;
-               lvCol.cx = item.m_width;
-
-               if ( lvCol.cx == wxLIST_AUTOSIZE)
-                       lvCol.cx = LVSCW_AUTOSIZE;
-               else if ( lvCol.cx == wxLIST_AUTOSIZE_USEHEADER)
-                       lvCol.cx = LVSCW_AUTOSIZE_USEHEADER;
-       }
-       lvCol.mask |= LVCF_SUBITEM;
-       lvCol.iSubItem = col;
-
-       bool success = (ListView_InsertColumn((HWND) GetHWND(), col, & lvCol) != 0);
+long wxListCtrl::InsertColumn(long col, wxListItem& item)
+{
+    LV_COLUMN lvCol;
+    wxConvertToMSWListCol(col, item, lvCol);
+
+    if ( !(lvCol.mask & LVCF_WIDTH) )
+    {
+        // always give some width to the new column: this one is compatible
+        // with the generic version
+        lvCol.mask |= LVCF_WIDTH;
+        lvCol.cx = 80;
+    }
+
+    // when we insert a column which can contain an image, we must specify this
+    // flag right now as doing it later in SetColumn() has no effect
+    //
+    // we use LVCFMT_BITMAP_ON_RIGHT by default because without it there is no
+    // way to dynamically set/clear the bitmap as the column without a bitmap
+    // on the left looks ugly (there is a hole)
+    //
+    // unfortunately with my version of comctl32.dll (5.80), the left column
+    // image is always on the left and it seems that it's a "feature" - I
+    // didn't find any way to work around it in any case
+    if ( lvCol.mask & LVCF_IMAGE )
+    {
+        lvCol.mask |= LVCF_FMT;
+        lvCol.fmt |= LVCFMT_BITMAP_ON_RIGHT;
+    }
+
+    bool success = ListView_InsertColumn(GetHwnd(), col, &lvCol) != -1;
     if ( success )
     if ( success )
-        m_colCount ++;
+    {
+        m_colCount++;
+    }
+    else
+    {
+        wxLogDebug(wxT("Failed to insert the column '%s' into listview!"),
+                   lvCol.pszText);
+    }
+
     return success;
 }
 
     return success;
 }
 
-long wxListCtrl::InsertColumn(const long col, const wxString& heading, const int format,
-    const int width)
+long wxListCtrl::InsertColumn(long col,
+                              const wxString& heading,
+                              int format,
+                              int width)
 {
 {
-       wxListItem item;
-       item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
-       item.m_text = heading;
-       if ( width > -1 )
-       {
-               item.m_mask |= wxLIST_MASK_WIDTH;
-               item.m_width = width;
-       }
-       item.m_format = format;
+    wxListItem item;
+    item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
+    item.m_text = heading;
+    if ( width > -1 )
+    {
+        item.m_mask |= wxLIST_MASK_WIDTH;
+        item.m_width = width;
+    }
+    item.m_format = format;
 
 
-       return InsertColumn(col, item);
+    return InsertColumn(col, item);
 }
 
 // Scrolls the list control. If in icon, small icon or report view mode,
 }
 
 // Scrolls the list control. If in icon, small icon or report view mode,
@@ -1008,9 +1378,9 @@ long wxListCtrl::InsertColumn(const long col, const wxString& heading, const int
 // specifies the number of columns to scroll.
 // If in icon, small icon or list view mode, y specifies the number of pixels
 // to scroll. If in report view mode, y specifies the number of lines to scroll.
 // specifies the number of columns to scroll.
 // If in icon, small icon or list view mode, y specifies the number of pixels
 // to scroll. If in report view mode, y specifies the number of lines to scroll.
-bool wxListCtrl::ScrollList(const int dx, const int dy)
+bool wxListCtrl::ScrollList(int dx, int dy)
 {
 {
-       return (ListView_Scroll((HWND) GetHWND(), dx, dy) != 0);
+    return (ListView_Scroll(GetHwnd(), dx, dy) != 0);
 }
 
 // Sort items.
 }
 
 // Sort items.
@@ -1024,189 +1394,759 @@ bool wxListCtrl::ScrollList(const int dx, const int 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)
+
+// FIXME: this is horrible and MT-unsafe and everything else but I don't have
+//        time for anything better right now (VZ)
+static long gs_sortData = 0;
+static wxListCtrl *gs_sortCtrl = NULL;
+static wxListCtrlCompare gs_sortFunction = NULL;
+
+int wxCMPFUNC_CONV wxListCtrlCompareFn(const void *arg1, const void *arg2)
 {
 {
-       return (ListView_SortItems((HWND) GetHWND(), (PFNLVCOMPARE) fn, data) != 0);
+    int n1 = *(const int *)arg1,
+        n2 = *(const int *)arg2;
+
+    return gs_sortFunction(gs_sortCtrl->GetItemData(n1),
+                           gs_sortCtrl->GetItemData(n2),
+                           gs_sortData);
 }
 
 }
 
-bool wxListCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {
 {
-  if (cmd == EN_UPDATE)
-  {
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
-    event.SetEventObject( this );
-    ProcessCommand(event);
+    // sort the attributes too
+    if ( m_hasAnyAttr )
+    {
+        int n,
+            count = GetItemCount();
+        int *aItems = new int[count];
+        for ( n = 0; n < count; n++ )
+        {
+            aItems[n] = n;
+        }
+
+        gs_sortData = data;
+        gs_sortCtrl = this;
+        gs_sortFunction = fn;
+
+        qsort(aItems, count, sizeof(int), wxListCtrlCompareFn);
+
+        gs_sortData = 0;
+        gs_sortCtrl = NULL;
+        gs_sortFunction = NULL;
+
+        wxHashTable attrsNew(wxKEY_INTEGER, 1000);
+        for ( n = 0; n < count; n++ )
+        {
+            wxObject *attr = m_attrs.Delete(aItems[n]);
+            if ( attr )
+            {
+                attrsNew.Put(n, attr);
+            }
+        }
+
+        m_attrs.Destroy();
+        m_attrs = attrsNew;
+
+        delete [] aItems;
+    }
+
+    if ( !ListView_SortItems(GetHwnd(), (PFNLVCOMPARE)fn, data) )
+    {
+        wxLogDebug(_T("ListView_SortItems() failed"));
+
+        return FALSE;
+    }
+
     return TRUE;
     return TRUE;
-  }
-  else if (cmd == EN_KILLFOCUS)
-  {
-    wxCommandEvent event(wxEVT_KILL_FOCUS, id);
-    event.SetEventObject( this );
-    ProcessCommand(event);
+}
+
+
+
+// ----------------------------------------------------------------------------
+// message processing
+// ----------------------------------------------------------------------------
+
+bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
+{
+    if (cmd == EN_UPDATE)
+    {
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
+        event.SetEventObject( this );
+        ProcessCommand(event);
+        return TRUE;
+    }
+    else if (cmd == EN_KILLFOCUS)
+    {
+        wxCommandEvent event(wxEVT_KILL_FOCUS, id);
+        event.SetEventObject( this );
+        ProcessCommand(event);
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
+{
+    // prepare the event
+    // -----------------
+
+    wxListEvent event(wxEVT_NULL, m_windowId);
+    event.SetEventObject(this);
+
+    wxEventType eventType = wxEVT_NULL;
+
+    NMHDR *nmhdr = (NMHDR *)lParam;
+
+    // if your compiler is as broken as this, you should really change it: this
+    // code is needed for normal operation! #ifdef below is only useful for
+    // automatic rebuilds which are done with a very old compiler version
+#ifdef HDN_BEGINTRACKA
+
+    // check for messages from the header (in report view)
+    HWND hwndHdr = ListView_GetHeader(GetHwnd());
+
+    // is it a message from the header?
+    if ( nmhdr->hwndFrom == hwndHdr )
+    {
+        HD_NOTIFY *nmHDR = (HD_NOTIFY *)nmhdr;
+
+        event.m_itemIndex = -1;
+
+        switch ( nmhdr->code )
+        {
+            // yet another comctl32.dll bug: under NT/W2K it sends Unicode
+            // TRACK messages even to ANSI programs: on my system I get
+            // HDN_BEGINTRACKW and HDN_ENDTRACKA and no HDN_TRACK at all!
+            //
+            // work around is to simply catch both versions and hope that it
+            // works (why should this message exist in ANSI and Unicode is
+            // beyond me as it doesn't deal with strings at all...)
+            case HDN_BEGINTRACKA:
+            case HDN_BEGINTRACKW:
+                eventType = wxEVT_COMMAND_LIST_COL_BEGIN_DRAG;
+                // fall through
+
+            case HDN_TRACKA:
+            case HDN_TRACKW:
+                if ( eventType == wxEVT_NULL )
+                    eventType = wxEVT_COMMAND_LIST_COL_DRAGGING;
+                // fall through
+
+            case HDN_ENDTRACKA:
+            case HDN_ENDTRACKW:
+                if ( eventType == wxEVT_NULL )
+                    eventType = wxEVT_COMMAND_LIST_COL_END_DRAG;
+                event.m_col = nmHDR->iItem;
+                break;
+
+            case NM_RCLICK:
+                {
+                    eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
+                    event.m_col = -1;
+
+                    // find the column clicked: we have to search for it
+                    // ourselves as the notification message doesn't provide
+                    // this info
+
+                    // where did the click occur?
+                    POINT ptClick;
+                    if ( !::GetCursorPos(&ptClick) )
+                    {
+                        wxLogLastError(_T("GetCursorPos"));
+                    }
+
+                    if ( !::ScreenToClient(hwndHdr, &ptClick) )
+                    {
+                        wxLogLastError(_T("ScreenToClient(listctrl header)"));
+                    }
+
+                    event.m_pointDrag.x = ptClick.x;
+                    event.m_pointDrag.y = ptClick.y;
+
+                    int colCount = Header_GetItemCount(hwndHdr);
+
+                    RECT rect;
+                    for ( int col = 0; col < colCount; col++ )
+                    {
+                        if ( Header_GetItemRect(hwndHdr, col, &rect) )
+                        {
+                            if ( ::PtInRect(&rect, ptClick) )
+                            {
+                                event.m_col = col;
+                                break;
+                            }
+                        }
+                    }
+                }
+                break;
+
+            default:
+                return wxControl::MSWOnNotify(idCtrl, lParam, result);
+        }
+    }
+    else
+#endif // defined(HDN_BEGINTRACKA)
+        if ( nmhdr->hwndFrom == GetHwnd() )
+    {
+        // almost all messages use NM_LISTVIEW
+        NM_LISTVIEW *nmLV = (NM_LISTVIEW *)nmhdr;
+
+        // this is true for almost all events
+        event.m_item.m_data = nmLV->lParam;
+
+        switch ( nmhdr->code )
+        {
+            case LVN_BEGINRDRAG:
+                eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+                // fall through
+
+            case LVN_BEGINDRAG:
+                if ( eventType == wxEVT_NULL )
+                {
+                    eventType = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+                }
+
+                event.m_itemIndex = nmLV->iItem;
+                event.m_pointDrag.x = nmLV->ptAction.x;
+                event.m_pointDrag.y = nmLV->ptAction.y;
+                break;
+
+            case LVN_BEGINLABELEDIT:
+                {
+                    eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
+                    LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+                    wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item);
+                    event.m_itemIndex = event.m_item.m_itemId;
+                }
+                break;
+
+            case LVN_COLUMNCLICK:
+                eventType = wxEVT_COMMAND_LIST_COL_CLICK;
+                event.m_itemIndex = -1;
+                event.m_col = nmLV->iSubItem;
+                break;
+
+            case LVN_DELETEALLITEMS:
+                eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
+                event.m_itemIndex = -1;
+
+                FreeAllAttrs();
+
+                break;
+
+            case LVN_DELETEITEM:
+                eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
+                event.m_itemIndex = nmLV->iItem;
+
+                if ( m_hasAnyAttr )
+                {
+                    delete (wxListItemAttr *)m_attrs.Delete(nmLV->iItem);
+                }
+                break;
+
+            case LVN_ENDLABELEDIT:
+                {
+                    eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
+                    LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+                    wxConvertFromMSWListItem(NULL, event.m_item, info->item);
+                    if ( info->item.pszText == NULL || info->item.iItem == -1 )
+                        return FALSE;
+
+                    event.m_itemIndex = event.m_item.m_itemId;
+                }
+                break;
+
+            case LVN_SETDISPINFO:
+                {
+                    eventType = wxEVT_COMMAND_LIST_SET_INFO;
+                    LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+                    wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item);
+                }
+                break;
+
+            case LVN_INSERTITEM:
+                eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
+                event.m_itemIndex = nmLV->iItem;
+                break;
+
+            case LVN_ITEMCHANGED:
+                // we translate this catch all message into more interesting
+                // (and more easy to process) wxWindows events
+
+                // first of all, we deal with the state change events only
+                if ( nmLV->uChanged & LVIF_STATE )
+                {
+                    // temp vars for readability
+                    const UINT stOld = nmLV->uOldState;
+                    const UINT stNew = nmLV->uNewState;
+
+                    // has the focus changed?
+                    if ( !(stOld & LVIS_FOCUSED) && (stNew & LVIS_FOCUSED) )
+                    {
+                        eventType = wxEVT_COMMAND_LIST_ITEM_FOCUSED;
+                        event.m_itemIndex = nmLV->iItem;
+                    }
+
+                    if ( (stNew & LVIS_SELECTED) != (stOld & LVIS_SELECTED) )
+                    {
+                        if ( eventType != wxEVT_NULL )
+                        {
+                            // focus and selection have both changed: send the
+                            // focus event from here and the selection one
+                            // below
+                            event.SetEventType(eventType);
+                            (void)GetEventHandler()->ProcessEvent(event);
+                        }
+                        else // no focus event to send
+                        {
+                            // then need to set m_itemIndex as it wasn't done
+                            // above
+                            event.m_itemIndex = nmLV->iItem;
+                        }
+
+                        eventType = stNew & LVIS_SELECTED
+                                        ? wxEVT_COMMAND_LIST_ITEM_SELECTED
+                                        : wxEVT_COMMAND_LIST_ITEM_DESELECTED;
+                    }
+                }
+
+                if ( eventType == wxEVT_NULL )
+                {
+                    // not an interesting event for us
+                    return FALSE;
+                }
+
+                break;
+
+            case LVN_KEYDOWN:
+                {
+                    LV_KEYDOWN *info = (LV_KEYDOWN *)lParam;
+                    WORD wVKey = info->wVKey;
+
+                    // get the current selection
+                    long lItem = GetNextItem(-1,
+                                             wxLIST_NEXT_ALL,
+                                             wxLIST_STATE_SELECTED);
+
+                    // <Enter> or <Space> activate the selected item if any (but
+                    // not with Shift and/or Ctrl as then they have a predefined
+                    // meaning for the list view)
+                    if ( lItem != -1 &&
+                         (wVKey == VK_RETURN || wVKey == VK_SPACE) &&
+                         !(wxIsShiftDown() || wxIsCtrlDown()) )
+                    {
+                        eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                    }
+                    else
+                    {
+                        eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
+
+                        // wxCharCodeMSWToWX() returns 0 if the key is an ASCII
+                        // value which should be used as is
+                        int code = wxCharCodeMSWToWX(wVKey);
+                        event.m_code = code ? code : wVKey;
+                    }
+
+                    event.m_itemIndex =
+                    event.m_item.m_itemId = lItem;
+
+                    if ( lItem != -1 )
+                    {
+                        // fill the other fields too
+                        event.m_item.m_text = GetItemText(lItem);
+                        event.m_item.m_data = GetItemData(lItem);
+                    }
+                }
+                break;
+
+            case NM_DBLCLK:
+                // if the user processes it in wxEVT_COMMAND_LEFT_CLICK(), don't do
+                // anything else
+                if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+                {
+                    return TRUE;
+                }
+
+                // else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event
+                // if it happened on an item (and not on empty place)
+                if ( nmLV->iItem == -1 )
+                {
+                    // not on item
+                    return FALSE;
+                }
+
+                eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                event.m_itemIndex = nmLV->iItem;
+                event.m_item.m_text = GetItemText(nmLV->iItem);
+                event.m_item.m_data = GetItemData(nmLV->iItem);
+                break;
+
+            case NM_RCLICK:
+                // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(),
+                // don't do anything else
+                if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+                {
+                    return TRUE;
+                }
+
+                // else translate it into wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK event
+                LV_HITTESTINFO lvhti;
+                wxZeroMemory(lvhti);
+
+                ::GetCursorPos(&(lvhti.pt));
+                ::ScreenToClient(GetHwnd(),&(lvhti.pt));
+                if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
+                {
+                    if ( lvhti.flags & LVHT_ONITEM )
+                    {
+                        eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
+                        event.m_itemIndex = lvhti.iItem;
+                        event.m_pointDrag.x = lvhti.pt.x;
+                        event.m_pointDrag.y = lvhti.pt.y;
+                    }
+                }
+                break;
+
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 \
+        && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+            case NM_CUSTOMDRAW:
+                *result = OnCustomDraw(lParam);
+
+                return TRUE;
+#endif // _WIN32_IE >= 0x300
+
+            case LVN_ODCACHEHINT:
+                {
+                    const NM_CACHEHINT *cacheHint = (NM_CACHEHINT *)lParam;
+
+                    eventType = wxEVT_COMMAND_LIST_CACHE_HINT;
+
+                    // we get some really stupid cache hints like ones for items in
+                    // range 0..0 for an empty control or, after deleting an item,
+                    // for items in invalid range - filter this garbage out
+                    if ( cacheHint->iFrom < cacheHint->iTo )
+                    {
+                        event.m_oldItemIndex = cacheHint->iFrom;
+
+                        long iMax = GetItemCount();
+                        event.m_itemIndex = cacheHint->iTo < iMax ? cacheHint->iTo
+                                                                  : iMax - 1;
+                    }
+                    else
+                    {
+                        return FALSE;
+                    }
+                }
+                break;
+
+            case LVN_GETDISPINFO:
+                if ( IsVirtual() )
+                {
+                    LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+
+                    LV_ITEM& lvi = info->item;
+                    long item = lvi.iItem;
+
+                    if ( lvi.mask & LVIF_TEXT )
+                    {
+                        wxString text = OnGetItemText(item, lvi.iSubItem);
+                        wxStrncpy(lvi.pszText, text, lvi.cchTextMax);
+                    }
+
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 \
+        && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 1 ) )
+                    if ( lvi.mask & LVIF_IMAGE )
+                    {
+                        lvi.iImage = OnGetItemImage(item);
+                    }
+#endif
+
+                    // a little dose of healthy paranoia: as we never use
+                    // LVM_SETCALLBACKMASK we're not supposed to get these ones
+                    wxASSERT_MSG( !(lvi.mask & LVIF_STATE),
+                                  _T("we don't support state callbacks yet!") );
+
+                    return TRUE;
+                }
+                // fall through
+
+            default:
+                return wxControl::MSWOnNotify(idCtrl, lParam, result);
+        }
+    }
+    else
+    {
+        // where did this one come from?
+        return FALSE;
+    }
+
+    // process the event
+    // -----------------
+
+    event.SetEventType(eventType);
+
+    if ( !GetEventHandler()->ProcessEvent(event) )
+        return FALSE;
+
+    // post processing
+    // ---------------
+
+    switch ( nmhdr->code )
+    {
+        case LVN_DELETEALLITEMS:
+            // always return TRUE to suppress all additional LVN_DELETEITEM
+            // notifications - this makes deleting all items from a list ctrl
+            // much faster
+            *result = TRUE;
+
+            return TRUE;
+
+        case LVN_ENDLABELEDIT:
+            // logic here is inversed compared to all the other messages
+            *result = event.IsAllowed();
+
+            return TRUE;
+    }
+
+    *result = !event.IsAllowed();
+
     return TRUE;
     return TRUE;
-  }
-  else return FALSE;
-}
-
-bool wxListCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
-{
-       wxListEvent event(wxEVT_NULL, m_windowId);
-       wxEventType eventType = wxEVT_NULL;
-       NMHDR *hdr1 = (NMHDR *) lParam;
-       switch ( hdr1->code )
-       {
-               case LVN_BEGINDRAG:
-               {
-                       eventType = wxEVT_COMMAND_LIST_BEGIN_DRAG;
-                       NM_LISTVIEW *hdr = (NM_LISTVIEW *)lParam;
-                       event.m_itemIndex = hdr->iItem;
-                       event.m_pointDrag.x = hdr->ptAction.x;
-                       event.m_pointDrag.y = hdr->ptAction.y;
-                       break;
-               }
-               case LVN_BEGINLABELEDIT:
-               {
-                       eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
-                       LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                       wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
-                       break;
-               }
-               case LVN_BEGINRDRAG:
-               {
-                       eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-                       NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                       event.m_itemIndex = hdr->iItem;
-                       event.m_pointDrag.x = hdr->ptAction.x;
-                       event.m_pointDrag.y = hdr->ptAction.y;
-                       break;
-               }
-               case LVN_COLUMNCLICK:
-               {
-                       eventType = wxEVT_COMMAND_LIST_COL_CLICK;
-                       NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                       event.m_itemIndex = -1;
-                       event.m_col = hdr->iSubItem;
-                       break;
-               }
-               case LVN_DELETEALLITEMS:
-               {
-                       eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
-//                     NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                       event.m_itemIndex = -1;
-                       break;
-               }
-               case LVN_DELETEITEM:
-               {
-                       eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
-                       NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                       event.m_itemIndex = hdr->iItem;
-                       break;
-               }
-               case LVN_ENDLABELEDIT:
-               {
-                       eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
-                       LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                       wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
-                       if ( info->item.pszText == NULL || info->item.iItem == -1 )
-                               event.m_cancelled = TRUE;
-                       break;
-               }
-               case LVN_GETDISPINFO:
-               {
-//                     return FALSE;
-                       // TODO: some text buffering here, I think
-                       // TODO: API for getting Windows to retrieve values
-                       // on demand.
-                       eventType = wxEVT_COMMAND_LIST_GET_INFO;
-                       LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                       wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
-                       break;
-               }
-               case LVN_INSERTITEM:
-               {
-                       eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
-                       NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                       event.m_itemIndex = hdr->iItem;
-                       break;
-               }
-               case LVN_ITEMCHANGED:
-               {
-                       // This needs to be sent to wxListCtrl as a rather more
-                       // concrete event. For now, just detect a selection
-                       // or deselection.
-                       NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                       if ( (hdr->uNewState & LVIS_SELECTED) && !(hdr->uOldState & LVIS_SELECTED) )
-                       {
-                         eventType = wxEVT_COMMAND_LIST_ITEM_SELECTED;
-                         event.m_itemIndex = hdr->iItem;
-                       }
-                       else if ( !(hdr->uNewState & LVIS_SELECTED) && (hdr->uOldState & LVIS_SELECTED) )
-                       {
-                         eventType = wxEVT_COMMAND_LIST_ITEM_DESELECTED;
-                         event.m_itemIndex = hdr->iItem;
-                       }
-                       else
-                               return FALSE;
-                       break;
-               }
-               case LVN_KEYDOWN:
-               {
-                       eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
-                       LV_KEYDOWN *info = (LV_KEYDOWN *)lParam;
-                       event.m_code = wxCharCodeMSWToWX(info->wVKey);
-                       break;
-               }
-               case LVN_SETDISPINFO:
-               {
-                       eventType = wxEVT_COMMAND_LIST_SET_INFO;
-                       LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                       wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
-                       break;
-               }
-
-               default :
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
-       }
-
-       event.SetEventObject( this );
-       event.SetEventType(eventType);
-
-       if ( !GetEventHandler()->ProcessEvent(event) )
-               return FALSE;
-
-       if (hdr1->code == LVN_GETDISPINFO)
-       {
-               LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-               if ( info->item.mask & LVIF_TEXT )
-               {
-                       if ( !event.m_item.m_text.IsNull() )
-                       {
-                         info->item.pszText = AddPool(event.m_item.m_text);
-                         info->item.cchTextMax = strlen(info->item.pszText) + 1;
-                       }
-               }
-//             wxConvertToMSWListItem(this, event.m_item, info->item);
-       }
-
-       return TRUE;
-}
-
-char *wxListCtrl::AddPool(const wxString& str)
-{
-       // Remove the first element if 3 strings exist
-       if ( m_stringPool.Number() == 3 )
-       {
-               wxNode *node = m_stringPool.First();
-               delete[] (char *)node->Data();
-               delete node;
-       }
-       wxNode *node = m_stringPool.Add((char *) (const char *)str);
-       return (char *)node->Data();
 }
 
 }
 
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300
+
+WXLPARAM wxListCtrl::OnCustomDraw(WXLPARAM lParam)
+{
+    LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam;
+    NMCUSTOMDRAW& nmcd = lplvcd->nmcd;
+    switch ( nmcd.dwDrawStage )
+    {
+        case CDDS_PREPAINT:
+            // if we've got any items with non standard attributes,
+            // notify us before painting each item
+            //
+            // for virtual controls, always suppose that we have attributes as
+            // there is no way to check for this
+            return IsVirtual() || m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
+                                               : CDRF_DODEFAULT;
+
+        case CDDS_ITEMPREPAINT:
+            {
+                size_t item = (size_t)nmcd.dwItemSpec;
+                if ( item >= (size_t)GetItemCount() )
+                {
+                    // we get this message with item == 0 for an empty control,
+                    // we must ignore it as calling OnGetItemAttr() would be
+                    // wrong
+                    return CDRF_DODEFAULT;
+                }
+
+                wxListItemAttr *attr =
+                    IsVirtual() ? OnGetItemAttr(item)
+                                : (wxListItemAttr *)m_attrs.Get(item);
+
+                if ( !attr )
+                {
+                    // nothing to do for this item
+                    return CDRF_DODEFAULT;
+                }
+
+                HFONT hFont;
+                wxColour colText, colBack;
+                if ( attr->HasFont() )
+                {
+                    wxFont font = attr->GetFont();
+                    hFont = (HFONT)font.GetResourceHandle();
+                }
+                else
+                {
+                    hFont = 0;
+                }
+
+                if ( attr->HasTextColour() )
+                {
+                    colText = attr->GetTextColour();
+                }
+                else
+                {
+                    colText = GetTextColour();
+                }
+
+                if ( attr->HasBackgroundColour() )
+                {
+                    colBack = attr->GetBackgroundColour();
+                }
+                else
+                {
+                    colBack = GetBackgroundColour();
+                }
+
+                lplvcd->clrText = wxColourToRGB(colText);
+                lplvcd->clrTextBk = wxColourToRGB(colBack);
+
+                // note that if we wanted to set colours for
+                // individual columns (subitems), we would have
+                // returned CDRF_NOTIFYSUBITEMREDRAW from here
+                if ( hFont )
+                {
+                    ::SelectObject(nmcd.hdc, hFont);
+
+                    return CDRF_NEWFONT;
+                }
+            }
+            // fall through to return CDRF_DODEFAULT
+
+        default:
+            return CDRF_DODEFAULT;
+    }
+}
+
+#endif // NM_CUSTOMDRAW supported
+
+// Necessary for drawing hrules and vrules, if specified
+void wxListCtrl::OnPaint(wxPaintEvent& event)
+{
+    wxPaintDC dc(this);
+
+    wxControl::OnPaint(event);
+
+    // Reset the device origin since it may have been set
+    dc.SetDeviceOrigin(0, 0);
+
+    bool drawHRules = ((GetWindowStyle() & wxLC_HRULES) != 0);
+    bool drawVRules = ((GetWindowStyle() & wxLC_VRULES) != 0);
+
+    if (!drawHRules && !drawVRules)
+        return;
+    if ((GetWindowStyle() & wxLC_REPORT) == 0)
+        return;
+
+    wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+    dc.SetPen(pen);
+    dc.SetBrush(* wxTRANSPARENT_BRUSH);
+
+    wxSize clientSize = GetClientSize();
+    wxRect itemRect;
+    int cy=0;
+
+    int itemCount = GetItemCount();
+    int i;
+    if (drawHRules)
+    {
+        long top = GetTopItem();
+        for (i = top; i < top + GetCountPerPage() + 1; i++)
+        {
+            if (GetItemRect(i, itemRect))
+            {
+                cy = itemRect.GetTop();
+                if (i != 0) // Don't draw the first one
+                {
+                    dc.DrawLine(0, cy, clientSize.x, cy);
+                }
+                // Draw last line
+                if (i == itemCount - 1)
+                {
+                    cy = itemRect.GetBottom();
+                    dc.DrawLine(0, cy, clientSize.x, cy);
+                }
+            }
+        }
+    }
+    i = itemCount - 1;
+    if (drawVRules && (i > -1))
+    {
+        wxRect firstItemRect;
+        GetItemRect(0, firstItemRect);
+
+        if (GetItemRect(i, itemRect))
+        {
+            int col;
+            int x = itemRect.GetX();
+            for (col = 0; col < GetColumnCount(); col++)
+            {
+                int colWidth = GetColumnWidth(col);
+                x += colWidth ;
+                dc.DrawLine(x, firstItemRect.GetY() - 2, x, itemRect.GetBottom());
+            }
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// virtual list controls
+// ----------------------------------------------------------------------------
+
+wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
+{
+    // this is a pure virtual function, in fact - which is not really pure
+    // because the controls which are not virtual don't need to implement it
+    wxFAIL_MSG( _T("not supposed to be called") );
+
+    return wxEmptyString;
+}
+
+int wxListCtrl::OnGetItemImage(long WXUNUSED(item)) const
+{
+    // same as above
+    wxFAIL_MSG( _T("not supposed to be called") );
+
+    return -1;
+}
+
+wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
+{
+    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+                  _T("invalid item index in OnGetItemAttr()") );
+
+    // no attributes by default
+    return NULL;
+}
+
+void wxListCtrl::SetItemCount(long count)
+{
+    wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
+
+    if ( !::SendMessage(GetHwnd(), LVM_SETITEMCOUNT, (WPARAM)count, 0) )
+    {
+        wxLogLastError(_T("ListView_SetItemCount"));
+    }
+}
+
+void wxListCtrl::RefreshItem(long item)
+{
+    // strangely enough, ListView_Update() results in much more flicker here
+    // than a dumb Refresh() -- why?
+#if 0
+    if ( !ListView_Update(GetHwnd(), item) )
+    {
+        wxLogLastError(_T("ListView_Update"));
+    }
+#else // 1
+    wxRect rect;
+    GetItemRect(item, rect);
+    RefreshRect(rect);
+#endif // 0/1
+}
+
+void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+{
+    wxRect rect1, rect2;
+    GetItemRect(itemFrom, rect1);
+    GetItemRect(itemTo, rect2);
+
+    wxRect rect = rect1;
+    rect.height = rect2.GetBottom() - rect1.GetTop();
+
+    RefreshRect(rect);
+}
+
+// ----------------------------------------------------------------------------
+// wxListItem
+// ----------------------------------------------------------------------------
+
 // List item structure
 // List item structure
-wxListItem::wxListItem(void)
+wxListItem::wxListItem()
 {
     m_mask = 0;
     m_itemId = 0;
 {
     m_mask = 0;
     m_itemId = 0;
@@ -1214,167 +2154,237 @@ wxListItem::wxListItem(void)
     m_state = 0;
     m_stateMask = 0;
     m_image = 0;
     m_state = 0;
     m_stateMask = 0;
     m_image = 0;
-       m_data = 0;
-
-       m_format = wxLIST_FORMAT_CENTRE;
-       m_width = 0;
-}
-
-static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem, HWND getFullInfo)
-{
-       info.m_data = lvItem.lParam;
-       info.m_mask = 0;
-       info.m_state = 0;
-       info.m_stateMask = 0;
-       info.m_itemId = lvItem.iItem;
-
-       long oldMask = lvItem.mask;
-
-       bool needText = FALSE;
-       if (getFullInfo != 0)
-       {
-               if ( lvItem.mask & LVIF_TEXT )
-                       needText = FALSE;
-               else
-                       needText = TRUE;
-
-               if ( needText )
-               {
-                       lvItem.pszText = new char[513];
-                       lvItem.cchTextMax = 512;
-               }
-//             lvItem.mask |= TVIF_HANDLE | TVIF_STATE | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM ;
-               lvItem.mask |= LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM ;
-               ::SendMessage(getFullInfo, LVM_GETITEM, 0, (LPARAM)& lvItem) ;
-       }
-
-       if ( lvItem.mask & LVIF_STATE )
-       {
-               info.m_mask |= wxLIST_MASK_STATE;
-
-       if ( lvItem.stateMask & LVIS_CUT)
-               {
-                       info.m_stateMask |= wxLIST_STATE_CUT ;
-                       if ( lvItem.state & LVIS_CUT )
-                               info.m_state |= wxLIST_STATE_CUT ;
-               }
-       if ( lvItem.stateMask & LVIS_DROPHILITED)
-               {
-                       info.m_stateMask |= wxLIST_STATE_DROPHILITED ;
-                       if ( lvItem.state & LVIS_DROPHILITED )
-                               info.m_state |= wxLIST_STATE_DROPHILITED ;
-               }
-       if ( lvItem.stateMask & LVIS_FOCUSED)
-               {
-                       info.m_stateMask |= wxLIST_STATE_FOCUSED ;
-                       if ( lvItem.state & LVIS_FOCUSED )
-                               info.m_state |= wxLIST_STATE_FOCUSED ;
-               }
-       if ( lvItem.stateMask & LVIS_SELECTED)
-               {
-                       info.m_stateMask |= wxLIST_STATE_SELECTED ;
-                       if ( lvItem.state & LVIS_SELECTED )
-                               info.m_state |= wxLIST_STATE_SELECTED ;
-               }
-       }
-
-       if ( lvItem.mask & LVIF_TEXT )
-       {
-               info.m_mask |= wxLIST_MASK_TEXT;
-               info.m_text = lvItem.pszText;
-       }
-       if ( lvItem.mask & LVIF_IMAGE )
-       {
-               info.m_mask |= wxLIST_MASK_IMAGE;
-               info.m_image = lvItem.iImage;
-       }
-       if ( lvItem.mask & LVIF_PARAM )
-               info.m_mask |= wxLIST_MASK_DATA;
-       if ( lvItem.mask & LVIF_DI_SETITEM )
-               info.m_mask |= wxLIST_SET_ITEM;
-       info.m_col = lvItem.iSubItem;
-
-       if (needText)
-       {
-               if (lvItem.pszText)
-                       delete[] lvItem.pszText;
-       }
-       lvItem.mask = oldMask ;
-}
-
-static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem)
-{
-       lvItem.iItem = (int) info.m_itemId ;
-
-       lvItem.iImage = info.m_image ;
-       lvItem.lParam = info.m_data;
-       lvItem.stateMask = 0;
-       lvItem.state = 0;
-       lvItem.mask = 0;
-       lvItem.iSubItem = info.m_col;
-
-       if (info.m_mask & wxLIST_MASK_STATE)
-       {
-               lvItem.mask |= LVIF_STATE ;
-               if (info.m_stateMask & wxLIST_STATE_CUT)
-               {
-               lvItem.stateMask |= LVIS_CUT ;
-                       if (info.m_state & wxLIST_STATE_CUT)
-                               lvItem.state |= LVIS_CUT;
-               }
-               if (info.m_stateMask & wxLIST_STATE_DROPHILITED)
-               {
-               lvItem.stateMask |= LVIS_DROPHILITED;
-                       if (info.m_state & wxLIST_STATE_DROPHILITED)
-                       lvItem.state |= LVIS_DROPHILITED;
-               }
-               if (info.m_stateMask & wxLIST_STATE_FOCUSED)
-               {
-               lvItem.stateMask |= LVIS_FOCUSED;
-                       if (info.m_state & wxLIST_STATE_FOCUSED)
-                       lvItem.state |= LVIS_FOCUSED;
-               }
-               if (info.m_stateMask & wxLIST_STATE_SELECTED)
-               {
-               lvItem.stateMask |= LVIS_SELECTED;
-                       if (info.m_state & wxLIST_STATE_SELECTED)
-                       lvItem.state |= LVIS_SELECTED;
-               }
-       }
-
-       if (info.m_mask & wxLIST_MASK_TEXT)
-       {
-               lvItem.mask |= LVIF_TEXT ;
-               if ( ctrl->GetWindowStyleFlag() & wxLC_USER_TEXT )
-               {
-                       lvItem.pszText = LPSTR_TEXTCALLBACK;
-               }
-               else
-               {
-                       lvItem.pszText = (char *) (const char *)info.m_text ;
-                       if ( lvItem.pszText )
-                               lvItem.cchTextMax = info.m_text.Length();
-                       else
-                               lvItem.cchTextMax = 0;
-               }
-       }
-       if (info.m_mask & wxLIST_MASK_IMAGE)
-               lvItem.mask |= LVIF_IMAGE ;
-       if (info.m_mask & wxLIST_MASK_DATA)
-               lvItem.mask |= LVIF_PARAM ;
-}
-
-// List event
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxCommandEvent)
-
-wxListEvent::wxListEvent(wxEventType commandType, int id):
-  wxCommandEvent(commandType, id)
-{
-       m_code = 0;
-       m_itemIndex = 0;
-       m_col = 0;
-       m_cancelled = FALSE;
+    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 = wxEmptyString;
+
+    if (m_attr) delete m_attr;
+    m_attr = NULL;
+}
+
+void wxListItem::ClearAttributes()
+{
+    if (m_attr) delete m_attr;
+    m_attr = NULL;
+}
+
+static void wxConvertFromMSWListItem(HWND hwndListCtrl,
+                                     wxListItem& info,
+                                     LV_ITEM& lvItem)
+{
+    info.m_data = lvItem.lParam;
+    info.m_mask = 0;
+    info.m_state = 0;
+    info.m_stateMask = 0;
+    info.m_itemId = lvItem.iItem;
+
+    long oldMask = lvItem.mask;
+
+    bool needText = FALSE;
+    if (hwndListCtrl != 0)
+    {
+        if ( lvItem.mask & LVIF_TEXT )
+            needText = FALSE;
+        else
+            needText = TRUE;
+
+        if ( needText )
+        {
+            lvItem.pszText = new wxChar[513];
+            lvItem.cchTextMax = 512;
+        }
+        lvItem.mask |= LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
+        ::SendMessage(hwndListCtrl, LVM_GETITEM, 0, (LPARAM)& lvItem);
+    }
+
+    if ( lvItem.mask & LVIF_STATE )
+    {
+        info.m_mask |= wxLIST_MASK_STATE;
+
+        if ( lvItem.stateMask & LVIS_CUT)
+        {
+            info.m_stateMask |= wxLIST_STATE_CUT;
+            if ( lvItem.state & LVIS_CUT )
+                info.m_state |= wxLIST_STATE_CUT;
+        }
+        if ( lvItem.stateMask & LVIS_DROPHILITED)
+        {
+            info.m_stateMask |= wxLIST_STATE_DROPHILITED;
+            if ( lvItem.state & LVIS_DROPHILITED )
+                info.m_state |= wxLIST_STATE_DROPHILITED;
+        }
+        if ( lvItem.stateMask & LVIS_FOCUSED)
+        {
+            info.m_stateMask |= wxLIST_STATE_FOCUSED;
+            if ( lvItem.state & LVIS_FOCUSED )
+                info.m_state |= wxLIST_STATE_FOCUSED;
+        }
+        if ( lvItem.stateMask & LVIS_SELECTED)
+        {
+            info.m_stateMask |= wxLIST_STATE_SELECTED;
+            if ( lvItem.state & LVIS_SELECTED )
+                info.m_state |= wxLIST_STATE_SELECTED;
+        }
+    }
+
+    if ( lvItem.mask & LVIF_TEXT )
+    {
+        info.m_mask |= wxLIST_MASK_TEXT;
+        info.m_text = lvItem.pszText;
+    }
+    if ( lvItem.mask & LVIF_IMAGE )
+    {
+        info.m_mask |= wxLIST_MASK_IMAGE;
+        info.m_image = lvItem.iImage;
+    }
+    if ( lvItem.mask & LVIF_PARAM )
+        info.m_mask |= wxLIST_MASK_DATA;
+    if ( lvItem.mask & LVIF_DI_SETITEM )
+        info.m_mask |= wxLIST_SET_ITEM;
+    info.m_col = lvItem.iSubItem;
+
+    if (needText)
+    {
+        if (lvItem.pszText)
+            delete[] lvItem.pszText;
+    }
+    lvItem.mask = oldMask;
+}
+
+static void wxConvertToMSWFlags(long state, long stateMask, LV_ITEM& lvItem)
+{
+    if (stateMask & wxLIST_STATE_CUT)
+    {
+        lvItem.stateMask |= LVIS_CUT;
+        if (state & wxLIST_STATE_CUT)
+            lvItem.state |= LVIS_CUT;
+    }
+    if (stateMask & wxLIST_STATE_DROPHILITED)
+    {
+        lvItem.stateMask |= LVIS_DROPHILITED;
+        if (state & wxLIST_STATE_DROPHILITED)
+            lvItem.state |= LVIS_DROPHILITED;
+    }
+    if (stateMask & wxLIST_STATE_FOCUSED)
+    {
+        lvItem.stateMask |= LVIS_FOCUSED;
+        if (state & wxLIST_STATE_FOCUSED)
+            lvItem.state |= LVIS_FOCUSED;
+    }
+    if (stateMask & wxLIST_STATE_SELECTED)
+    {
+        lvItem.stateMask |= LVIS_SELECTED;
+        if (state & wxLIST_STATE_SELECTED)
+            lvItem.state |= LVIS_SELECTED;
+    }
 }
 
 }
 
+static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
+                                   const wxListItem& info,
+                                   LV_ITEM& lvItem)
+{
+    lvItem.iItem = (int) info.m_itemId;
+
+    lvItem.iImage = info.m_image;
+    lvItem.lParam = info.m_data;
+    lvItem.stateMask = 0;
+    lvItem.state = 0;
+    lvItem.mask = 0;
+    lvItem.iSubItem = info.m_col;
+
+    if (info.m_mask & wxLIST_MASK_STATE)
+    {
+        lvItem.mask |= LVIF_STATE;
+
+        wxConvertToMSWFlags(info.m_state, info.m_stateMask, lvItem);
+    }
+
+    if (info.m_mask & wxLIST_MASK_TEXT)
+    {
+        lvItem.mask |= LVIF_TEXT;
+        if ( ctrl->GetWindowStyleFlag() & wxLC_USER_TEXT )
+        {
+            lvItem.pszText = LPSTR_TEXTCALLBACK;
+        }
+        else
+        {
+            // pszText is not const, hence the cast
+            lvItem.pszText = (wxChar *)info.m_text.c_str();
+            if ( lvItem.pszText )
+                lvItem.cchTextMax = info.m_text.Length();
+            else
+                lvItem.cchTextMax = 0;
+        }
+    }
+    if (info.m_mask & wxLIST_MASK_IMAGE)
+        lvItem.mask |= LVIF_IMAGE;
+    if (info.m_mask & wxLIST_MASK_DATA)
+        lvItem.mask |= LVIF_PARAM;
+}
+
+static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,
+                                  LV_COLUMN& lvCol)
+{
+    wxZeroMemory(lvCol);
+
+    if ( item.m_mask & wxLIST_MASK_TEXT )
+    {
+        lvCol.mask |= LVCF_TEXT;
+        lvCol.pszText = (wxChar *)item.m_text.c_str(); // cast is safe
+    }
+
+    if ( item.m_mask & wxLIST_MASK_FORMAT )
+    {
+        lvCol.mask |= LVCF_FMT;
+
+        if ( item.m_format == wxLIST_FORMAT_LEFT )
+            lvCol.fmt = LVCFMT_LEFT;
+        else if ( item.m_format == wxLIST_FORMAT_RIGHT )
+            lvCol.fmt = LVCFMT_RIGHT;
+        else if ( item.m_format == wxLIST_FORMAT_CENTRE )
+            lvCol.fmt = LVCFMT_CENTER;
+    }
+
+    if ( item.m_mask & wxLIST_MASK_WIDTH )
+    {
+        lvCol.mask |= LVCF_WIDTH;
+        if ( item.m_width == wxLIST_AUTOSIZE)
+            lvCol.cx = LVSCW_AUTOSIZE;
+        else if ( item.m_width == wxLIST_AUTOSIZE_USEHEADER)
+            lvCol.cx = LVSCW_AUTOSIZE_USEHEADER;
+        else
+            lvCol.cx = item.m_width;
+    }
+
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 \
+        && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 1 ) )
+    if ( item.m_mask & wxLIST_MASK_IMAGE )
+    {
+        if ( wxTheApp->GetComCtl32Version() >= 470 )
+        {
+            lvCol.mask |= LVCF_IMAGE;
+            lvCol.iImage = item.m_image;
+        }
+        //else: it doesn't support item images anyhow
+    }
 #endif
 #endif
+}
 
 
+#endif // wxUSE_LISTCTRL