]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/listctrl.cpp
changes to match listctrl.h changes (forgot to commit yesterday, sorry)
[wxWidgets.git] / src / msw / listctrl.cpp
index 73a2997beafabda9075187f9da4671a425e4cd6d..bdab497417cd78cb47a104aee087da37a449075d 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listctrl.cpp
+// Name:        src/msw/listctrl.cpp
 // Purpose:     wxListCtrl
 // Author:      Julian Smart
 // Modified by:
     #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
+
+#ifndef LVN_ODCACHEHINT
+    #define LVN_ODCACHEHINT (-113)
+#endif
+
+#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
 // ----------------------------------------------------------------------------
@@ -84,6 +125,10 @@ 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
 // ----------------------------------------------------------------------------
@@ -101,13 +146,22 @@ 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)
 
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
 IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
+IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
 END_EVENT_TABLE()
@@ -116,41 +170,6 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxListEvent
-// ----------------------------------------------------------------------------
-
-void wxListEvent::CopyObject(wxObject& object_dest) const
-{
-    wxListEvent *obj = (wxListEvent *)&object_dest;
-
-    wxNotifyEvent::CopyObject(object_dest);
-
-    obj->m_code = m_code;
-    obj->m_itemIndex = m_itemIndex;
-    obj->m_oldItemIndex = m_oldItemIndex;
-    obj->m_col = m_col;
-    obj->m_cancelled = m_cancelled;
-    obj->m_pointDrag = m_pointDrag;
-    obj->m_item.m_mask = m_item.m_mask;
-    obj->m_item.m_itemId = m_item.m_itemId;
-    obj->m_item.m_col = m_item.m_col;
-    obj->m_item.m_state = m_item.m_state;
-    obj->m_item.m_stateMask = m_item.m_stateMask;
-    obj->m_item.m_text = m_item.m_text;
-    obj->m_item.m_image = m_item.m_image;
-    obj->m_item.m_data = m_item.m_data;
-    obj->m_item.m_format = m_item.m_format;
-    obj->m_item.m_width = m_item.m_width;
-
-    if ( m_item.HasAttributes() )
-    {
-        obj->m_item.SetTextColour(m_item.GetTextColour());
-        obj->m_item.SetBackgroundColour(m_item.GetBackgroundColour());
-        obj->m_item.SetFont(m_item.GetFont());
-    }
-}
-
 // ----------------------------------------------------------------------------
 // wxListCtrl construction
 // ----------------------------------------------------------------------------
@@ -463,20 +482,19 @@ long wxListCtrl::ConvertToMSWStyle(long& oldStyle, long style) const
         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)\n"
-                           "or this program won't operate correctly."),
+            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;
 }
@@ -515,9 +533,7 @@ bool wxListCtrl::SetBackgroundColour(const wxColour& col)
 bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 {
     LV_COLUMN lvCol;
-    lvCol.mask = 0;
-    lvCol.fmt = 0;
-    lvCol.pszText = NULL;
+    wxZeroMemory(lvCol);
 
     if ( item.m_mask & wxLIST_MASK_TEXT )
     {
@@ -526,7 +542,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
         lvCol.cchTextMax = 512;
     }
 
-    bool success = (ListView_GetColumn(GetHwnd(), col, & lvCol) != 0);
+    bool success = ListView_GetColumn(GetHwnd(), col, & lvCol) != 0;
 
     //  item.m_subItem = lvCol.iSubItem;
     item.m_width = lvCol.cx;
@@ -554,41 +570,9 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 bool wxListCtrl::SetColumn(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;
-    }
+    wxConvertToMSWListCol(col, item, lvCol);
 
-    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(GetHwnd(), col, & lvCol) != 0);
+    return ListView_SetColumn(GetHwnd(), col, &lvCol) != 0;
 }
 
 // Gets the column width
@@ -610,7 +594,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
     else if ( width2 == wxLIST_AUTOSIZE_USEHEADER)
         width2 = LVSCW_AUTOSIZE_USEHEADER;
 
-    return (ListView_SetColumnWidth(GetHwnd(), col2, width2) != 0);
+    return ListView_SetColumnWidth(GetHwnd(), col2, width2) != 0;
 }
 
 // Gets the number of items that can fit vertically in the
@@ -685,12 +669,17 @@ bool wxListCtrl::SetItem(wxListItem& info)
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
 
-    item.cchTextMax = 0;
-    if ( !ListView_SetItem(GetHwnd(), &item) )
+    // we could be changing only the attribute in which case we don't need to
+    // call ListView_SetItem() at all
+    if ( item.mask )
     {
-        wxLogDebug(_T("ListView_SetItem() failed"));
+        item.cchTextMax = 0;
+        if ( !ListView_SetItem(GetHwnd(), &item) )
+        {
+            wxLogDebug(_T("ListView_SetItem() failed"));
 
-        return FALSE;
+            return FALSE;
+        }
     }
 
     // we need to update the item immediately to show the new image
@@ -715,7 +704,7 @@ bool wxListCtrl::SetItem(wxListItem& info)
     if ( updateNow )
     {
         // we need this to make the change visible right now
-        ListView_Update(GetHwnd(), item.iItem);
+        RefreshItem(item.iItem);
     }
 
     return TRUE;
@@ -762,6 +751,21 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 
     wxConvertToMSWFlags(state, stateMask, lvItem);
 
+    // for the virtual list controls we need to refresh the previously focused
+    // item manually when changing focus 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;
+    }
+
     if ( !::SendMessage(GetHwnd(), LVM_SETITEMSTATE,
                         (WPARAM)item, (LPARAM)&lvItem) )
     {
@@ -770,6 +774,11 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
         return FALSE;
     }
 
+    if ( focusOld != -1 )
+    {
+        RefreshItem(focusOld);
+    }
+
     return TRUE;
 }
 
@@ -838,26 +847,33 @@ bool wxListCtrl::SetItemData(long item, long data)
 // Gets the item rectangle
 bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
-    RECT rect2;
+    RECT rectWin;
 
-    int code2 = LVIR_BOUNDS;
+    int codeWin;
     if ( code == wxLIST_RECT_BOUNDS )
-        code2 = LVIR_BOUNDS;
+        codeWin = LVIR_BOUNDS;
     else if ( code == wxLIST_RECT_ICON )
-        code2 = LVIR_ICON;
+        codeWin = LVIR_ICON;
     else if ( code == wxLIST_RECT_LABEL )
-        code2 = LVIR_LABEL;
+        codeWin = LVIR_LABEL;
+    else
+    {
+        wxFAIL_MSG( _T("incorrect code in GetItemRect()") );
+
+        codeWin = LVIR_BOUNDS;
+    }
 
 #ifdef __WXWINE__
-    bool success = (ListView_GetItemRect(GetHwnd(), (int) item, &rect2 ) != 0);
+    bool success = ListView_GetItemRect(GetHwnd(), (int) item, &rectWin ) != 0;
 #else
-    bool success = (ListView_GetItemRect(GetHwnd(), (int) item, &rect2, code2) != 0);
+    bool success = ListView_GetItemRect(GetHwnd(), (int) item, &rectWin, codeWin) != 0;
 #endif
 
-    rect.x = rect2.left;
-    rect.y = rect2.top;
-    rect.width = rect2.right - rect2.left;
-    rect.height = rect2.bottom - rect2.top;
+    rect.x = rectWin.left;
+    rect.y = rectWin.top;
+    rect.width = rectWin.right - rectWin.left;
+    rect.height = rectWin.bottom - rectWin.top;
+
     return success;
 }
 
@@ -1033,13 +1049,41 @@ bool wxListCtrl::Arrange(int flag)
 // Deletes an item
 bool wxListCtrl::DeleteItem(long item)
 {
-    return (ListView_DeleteItem(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
 bool wxListCtrl::DeleteAllItems()
 {
-    return (ListView_DeleteAllItems(GetHwnd()) != 0);
+    return ListView_DeleteAllItems(GetHwnd()) != 0;
 }
 
 // Deletes all items
@@ -1084,7 +1128,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 {
     wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
 
-    // VS: ListView_EditLabel requires that the list has focus.  
+    // VS: ListView_EditLabel requires that the list has focus.
     SetFocus();
     HWND hWnd = (HWND) ListView_EditLabel(GetHwnd(), item);
 
@@ -1264,49 +1308,33 @@ long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
 long wxListCtrl::InsertColumn(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;
+    wxConvertToMSWListCol(col, item, lvCol);
 
-        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;
-    }
-
-    lvCol.mask |= LVCF_WIDTH;
-    if ( item.m_mask & wxLIST_MASK_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;
-    }
-    else
+    if ( !(lvCol.mask & LVCF_WIDTH) )
     {
         // always give some width to the new column: this one is compatible
-        // with wxGTK
+        // with the generic version
+        lvCol.mask |= LVCF_WIDTH;
         lvCol.cx = 80;
     }
 
-    lvCol.mask |= LVCF_SUBITEM;
-    lvCol.iSubItem = col;
+    // 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;
+    bool success = ListView_InsertColumn(GetHwnd(), col, &lvCol) != -1;
     if ( success )
     {
         m_colCount++;
@@ -1359,11 +1387,74 @@ bool wxListCtrl::ScrollList(int dx, int dy)
 // or zero if the two items are equivalent.
 
 // data is arbitrary data to be passed to the sort function.
+
+// 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)
+{
+    int n1 = *(const int *)arg1,
+        n2 = *(const int *)arg2;
+
+    return gs_sortFunction(gs_sortCtrl->GetItemData(n1),
+                           gs_sortCtrl->GetItemData(n2),
+                           gs_sortData);
+}
+
 bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {
-    return (ListView_SortItems(GetHwnd(), (PFNLVCOMPARE) fn, data) != 0);
+    // 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;
 }
 
+
+
 // ----------------------------------------------------------------------------
 // message processing
 // ----------------------------------------------------------------------------
@@ -1394,176 +1485,296 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     // -----------------
 
     wxListEvent event(wxEVT_NULL, m_windowId);
+    event.SetEventObject(this);
+
     wxEventType eventType = wxEVT_NULL;
 
     NMHDR *nmhdr = (NMHDR *)lParam;
 
-    // almost all messages use NM_LISTVIEW
-    NM_LISTVIEW *nmLV = (NM_LISTVIEW *)nmhdr;
+    // 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 LVM_FIRST
 
-    // this is true for almost all events
-    event.m_item.m_data = nmLV->lParam;
+    // check for messages from the header (in report view)
+    HWND hwndHdr = ListView_GetHeader(GetHwnd());
 
-    switch ( nmhdr->code )
+    // is it a message from the header?
+    if ( nmhdr->hwndFrom == hwndHdr )
     {
-        case LVN_BEGINRDRAG:
-            eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-            // fall through
+        NMHEADER *nmHDR = (NMHEADER *)nmhdr;
+        event.m_itemIndex = -1;
 
-        case LVN_BEGINDRAG:
-            if ( eventType == wxEVT_NULL )
-            {
-                eventType = wxEVT_COMMAND_LIST_BEGIN_DRAG;
-            }
+        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;
 
-            event.m_itemIndex = nmLV->iItem;
-            event.m_pointDrag.x = nmLV->ptAction.x;
-            event.m_pointDrag.y = nmLV->ptAction.y;
-            break;
+                    // find the column clicked: we have to search for it
+                    // ourselves as the notification message doesn't provide
+                    // this info
 
-        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;
+                    // where did the click occur?
+                    POINT ptClick;
+                    if ( !::GetCursorPos(&ptClick) )
+                    {
+                        wxLogLastError(_T("GetCursorPos"));
+                    }
 
-        case LVN_COLUMNCLICK:
-            eventType = wxEVT_COMMAND_LIST_COL_CLICK;
-            event.m_itemIndex = -1;
-            event.m_col = nmLV->iSubItem;
-            break;
+                    if ( !::ScreenToClient(hwndHdr, &ptClick) )
+                    {
+                        wxLogLastError(_T("ScreenToClient(listctrl header)"));
+                    }
 
-        case LVN_DELETEALLITEMS:
-            eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
-            event.m_itemIndex = -1;
+                    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(LVM_FIRST)
+        if ( nmhdr->hwndFrom == GetHwnd() )
+    {
+        // almost all messages use NM_LISTVIEW
+        NM_LISTVIEW *nmLV = (NM_LISTVIEW *)nmhdr;
 
-            FreeAllAttrs();
+        // this is true for almost all events
+        event.m_item.m_data = nmLV->lParam;
 
-            break;
+        switch ( nmhdr->code )
+        {
+            case LVN_BEGINRDRAG:
+                eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+                // fall through
 
-        case LVN_DELETEITEM:
-            eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
-            event.m_itemIndex = nmLV->iItem;
+            case LVN_BEGINDRAG:
+                if ( eventType == wxEVT_NULL )
+                {
+                    eventType = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+                }
 
-            if ( m_hasAnyAttr )
-            {
-                delete (wxListItemAttr *)m_attrs.Delete(nmLV->iItem);
-            }
-            break;
+                event.m_itemIndex = nmLV->iItem;
+                event.m_pointDrag.x = nmLV->ptAction.x;
+                event.m_pointDrag.y = nmLV->ptAction.y;
+                break;
 
-        case LVN_ENDLABELEDIT:
-            {
-                eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
-                LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item);
-                if ( info->item.pszText == NULL || info->item.iItem == -1 )
-                    return FALSE;
+            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;
 
-                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_SETDISPINFO:
-            {
-                eventType = wxEVT_COMMAND_LIST_SET_INFO;
-                LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item);
-            }
-            break;
+            case LVN_DELETEALLITEMS:
+                eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
+                event.m_itemIndex = -1;
 
-        case LVN_INSERTITEM:
-            eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
-            event.m_itemIndex = nmLV->iItem;
-            break;
+                FreeAllAttrs();
 
-        case LVN_ITEMCHANGED:
-            // This needs to be sent to wxListCtrl as a rather more concrete
-            // event. For now, just detect a selection or deselection.
-            if ( (nmLV->uNewState & LVIS_SELECTED) && !(nmLV->uOldState & LVIS_SELECTED) )
-            {
-                eventType = wxEVT_COMMAND_LIST_ITEM_SELECTED;
+                break;
+
+            case LVN_DELETEITEM:
+                eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
                 event.m_itemIndex = nmLV->iItem;
-            }
-            else if ( !(nmLV->uNewState & LVIS_SELECTED) && (nmLV->uOldState & LVIS_SELECTED) )
-            {
-                eventType = wxEVT_COMMAND_LIST_ITEM_DESELECTED;
+
+                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;
-            }
-            else
-            {
-                return FALSE;
-            }
-            break;
+                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()) )
+            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 )
                 {
-                    eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                    // 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;
+                    }
                 }
-                else
+
+                if ( eventType == wxEVT_NULL )
                 {
-                    eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
-                    event.m_code = wxCharCodeMSWToWX(wVKey);
+                    // not an interesting event for us
+                    return FALSE;
                 }
 
-                event.m_itemIndex =
-                event.m_item.m_itemId = lItem;
+                break;
 
-                if ( lItem != -1 )
+            case LVN_KEYDOWN:
                 {
-                    // fill the other fields too
-                    event.m_item.m_text = GetItemText(lItem);
-                    event.m_item.m_data = GetItemData(lItem);
+                    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;
+                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;
-            }
+            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;
-            }
+                // 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:
-            /* TECH NOTE: NM_RCLICK isn't really good enough here. We want to
-               subclass and check for the actual WM_RBUTTONDOWN message,
-               because NM_RCLICK waits for the WM_RBUTTONUP message as well
-               before firing off. We want to have notify events for both down
-               -and- up. */
-            {
+                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) )
@@ -1587,70 +1798,84 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         event.m_pointDrag.y = lvhti.pt.y;
                     }
                 }
-            }
-            break;
+                break;
 
-#if 0
-        case NM_MCLICK: // ***** THERE IS NO NM_MCLICK. Subclass anyone? ******
-            {
-                // if the user processes it in wxEVT_COMMAND_MIDDLE_CLICK(), don't do
-                // anything else
-                if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
-                {
-                    return TRUE;
-                }
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 \
+        && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+            case NM_CUSTOMDRAW:
+                *result = OnCustomDraw(lParam);
 
-                // else translate it into wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK event
-                eventType = wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
-                NMITEMACTIVATE* hdr = (NMITEMACTIVATE*)lParam;
-                event.m_itemIndex = hdr->iItem;
-            }
-            break;
-#endif // 0
-
-#if defined(_WIN32_IE) && _WIN32_IE >= 0x300
-        case NM_CUSTOMDRAW:
-            *result = OnCustomDraw(lParam);
-
-            return TRUE;
+                return TRUE;
 #endif // _WIN32_IE >= 0x300
 
-        case LVN_GETDISPINFO:
-            if ( IsVirtual() )
-            {
-                LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+            case LVN_ODCACHEHINT:
+                {
+                    const NM_CACHEHINT *cacheHint = (NM_CACHEHINT *)lParam;
 
-                LV_ITEM& lvi = info->item;
-                long item = lvi.iItem;
+                    eventType = wxEVT_COMMAND_LIST_CACHE_HINT;
 
-                if ( lvi.mask & LVIF_TEXT )
-                {
-                    wxString text = OnGetItemText(item, lvi.iSubItem);
-                    wxStrncpy(lvi.pszText, text, lvi.cchTextMax);
+                    // 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;
 
-                if ( lvi.mask & LVIF_IMAGE )
+            case LVN_GETDISPINFO:
+                if ( IsVirtual() )
                 {
-                    lvi.iImage = OnGetItemImage(item);
-                }
+                    LV_DISPINFO *info = (LV_DISPINFO *)lParam;
 
-                // 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!") );
+                    LV_ITEM& lvi = info->item;
+                    long item = lvi.iItem;
 
-                return TRUE;
-            }
-            // fall through
+                    if ( lvi.mask & LVIF_TEXT )
+                    {
+                        wxString text = OnGetItemText(item, lvi.iSubItem);
+                        wxStrncpy(lvi.pszText, text, lvi.cchTextMax);
+                    }
 
-        default:
-            return wxControl::MSWOnNotify(idCtrl, lParam, result);
+#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.SetEventObject( this );
     event.SetEventType(eventType);
 
     if ( !GetEventHandler()->ProcessEvent(event) )
@@ -1670,10 +1895,10 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             return TRUE;
 
         case LVN_ENDLABELEDIT:
-            {
-                *result = event.IsAllowed();
-                return TRUE;
-            }
+            // logic here is inversed compared to all the other messages
+            *result = event.IsAllowed();
+
+            return TRUE;
     }
 
     *result = !event.IsAllowed();
@@ -1799,24 +2024,28 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
     int itemCount = GetItemCount();
     int i;
-    for (i = 0; i < itemCount; i++)
+    if (drawHRules)
     {
-        if (GetItemRect(i, itemRect))
+        long top = GetTopItem();
+        for (i = top; i < top + GetCountPerPage() + 1; i++)
         {
-            cy = itemRect.GetTop();
-            if (i != 0) // Don't draw the first one
-            {
-                dc.DrawLine(0, cy, clientSize.x, cy);
-            }
-            // Draw last line
-            if (i == (GetItemCount() - 1))
+            if (GetItemRect(i, itemRect))
             {
-                cy = itemRect.GetBottom();
-                dc.DrawLine(0, cy, clientSize.x, cy);
+                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 = (GetItemCount() - 1);
+    i = itemCount - 1;
     if (drawVRules && (i > -1))
     {
         wxRect firstItemRect;
@@ -1840,7 +2069,7 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 // virtual list controls
 // ----------------------------------------------------------------------------
 
-wxString wxListCtrl::OnGetItemText(long item, long col) const
+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
@@ -1849,7 +2078,7 @@ wxString wxListCtrl::OnGetItemText(long item, long col) const
     return wxEmptyString;
 }
 
-int wxListCtrl::OnGetItemImage(long item) const
+int wxListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {
     // same as above
     wxFAIL_MSG( _T("not supposed to be called") );
@@ -1857,7 +2086,7 @@ int wxListCtrl::OnGetItemImage(long item) const
     return -1;
 }
 
-wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );
@@ -1878,18 +2107,30 @@ void wxListCtrl::SetItemCount(long count)
 
 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)
 {
-    for ( long item = itemFrom; item <= itemTo; item++ )
-    {
-        RefreshItem(item);
-    }
+    wxRect rect1, rect2;
+    GetItemRect(itemFrom, rect1);
+    GetItemRect(itemTo, rect2);
+
+    wxRect rect = rect1;
+    rect.height = rect2.GetBottom() - rect1.GetTop();
+
+    RefreshRect(rect);
 }
 
 // ----------------------------------------------------------------------------
@@ -2090,20 +2331,52 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
         lvItem.mask |= LVIF_PARAM;
 }
 
-// ----------------------------------------------------------------------------
-// List event
-// ----------------------------------------------------------------------------
+static void wxConvertToMSWListCol(int col, const wxListItem& item,
+                                  LV_COLUMN& lvCol)
+{
+    wxZeroMemory(lvCol);
 
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+    if ( item.m_mask & wxLIST_MASK_TEXT )
+    {
+        lvCol.mask |= LVCF_TEXT;
+        lvCol.pszText = (wxChar *)item.m_text.c_str(); // cast is safe
+    }
 
-wxListEvent::wxListEvent(wxEventType commandType, int id)
-           : wxNotifyEvent(commandType, id)
-{
-    m_code = 0;
-    m_itemIndex = 0;
-    m_oldItemIndex = 0;
-    m_col = 0;
-    m_cancelled = FALSE;
+    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 // wxUSE_LISTCTRL