]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/listctrl.cpp
Unix compilation fixed
[wxWidgets.git] / src / msw / listctrl.cpp
index 5bb0d8f862d495a969635181024a7777a85c6d47..9aab81658ded1163bb1f3e5c7f01a58b9219943f 100644 (file)
@@ -19,6 +19,7 @@
 
 #ifdef __GNUG__
     #pragma implementation "listctrl.h"
+    #pragma implementation "listctrlbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
     #pragma hdrstop
 #endif
 
+#ifdef __WIN95__
+
 #ifndef WX_PRECOMP
-    #include "wx/wx.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
-#ifdef __WIN95__
-
+#include "wx/textctrl.h"
+#include "wx/imaglist.h"
 #include "wx/listctrl.h"
-#include "wx/log.h"
+#include "wx/dcclient.h"
 
 #include "wx/msw/private.h"
 
-#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
+#ifdef __GNUWIN32_OLD__
     #include "wx/msw/gnuwin32/extra.h"
 #else
     #include <commctrl.h>
                 (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
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
@@ -58,18 +72,72 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_
 static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& tvItem, HWND getFullInfo = 0);
 
 // ----------------------------------------------------------------------------
-// macros
+// events
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-#endif // USE_SHARED_LIBRARY
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
+
+IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+
+BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
+    EVT_PAINT(wxListCtrl::OnPaint)
+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
 // ----------------------------------------------------------------------------
@@ -79,6 +147,7 @@ void wxListCtrl::Init()
     m_imageListNormal = NULL;
     m_imageListSmall = NULL;
     m_imageListState = NULL;
+    m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE;
     m_baseStyle = 0;
     m_colCount = 0;
     m_textCtrl = NULL;
@@ -93,7 +162,10 @@ bool wxListCtrl::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
     SetName(name);
 
     int x = pos.x;
@@ -118,6 +190,10 @@ bool wxListCtrl::Create(wxWindow *parent,
 
     DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
                    LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+
     if ( wxStyleHasBorder(m_windowStyle) )
         wstyle |= WS_BORDER;
     m_baseStyle = wstyle;
@@ -159,20 +235,18 @@ bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
 
     if ( !m_hWnd )
     {
-        wxLogError(wxT("Can't create list control window."));
+        wxLogError(_("Can't create list control window, check that comctl32.dll is installed."));
 
         return FALSE;
     }
 
     // for comctl32.dll v 4.70+ we want to have this attribute because it's
     // prettier (and also because wxGTK does it like this)
-#ifdef ListView_SetExtendedListViewStyle
-    if ( wstyle & LVS_REPORT )
+    if ( (wstyle & LVS_REPORT) && wxTheApp->GetComCtl32Version() >= 470 )
     {
-        ListView_SetExtendedListViewStyle(GetHwnd(),
-                                          LVS_EX_FULLROWSELECT);
+        ::SendMessage(GetHwnd(), LVM_SETEXTENDEDLISTVIEWSTYLE,
+                      0, LVS_EX_FULLROWSELECT);
     }
-#endif // ListView_SetExtendedListViewStyle
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(GetParent()->GetForegroundColour());
@@ -202,15 +276,40 @@ void wxListCtrl::UpdateStyle()
     }
 }
 
+void wxListCtrl::FreeAllAttrs(bool dontRecreate)
+{
+    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()
 {
-    if (m_textCtrl)
+    FreeAllAttrs(TRUE /* no need to recreate hash any more */);
+
+    if ( m_textCtrl )
     {
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
         delete m_textCtrl;
         m_textCtrl = NULL;
     }
+
+    if (m_ownsImageListNormal) delete m_imageListNormal;
+    if (m_ownsImageListSmall) delete m_imageListSmall;
+    if (m_ownsImageListState) delete m_imageListState;
 }
 
 // ----------------------------------------------------------------------------
@@ -364,14 +463,28 @@ long wxListCtrl::ConvertToMSWStyle(long& oldStyle, long style) const
 // accessors
 // ----------------------------------------------------------------------------
 
-// Sets the background colour (GetBackgroundColour already implicit in
-// wxWindow class)
+// 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;
 
-    ListView_SetBkColor(GetHwnd(), PALETTERGB(col.Red(), col.Green(), col.Blue()));
+    // 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;
 }
@@ -482,13 +595,13 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
 // 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(GetHwnd());
 }
 
 // Gets the edit control for editing labels.
-wxTextCtrl* wxListCtrl::GetEditControl(void) const
+wxTextCtrl* wxListCtrl::GetEditControl() const
 {
     return m_textCtrl;
 }
@@ -516,6 +629,9 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     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;
@@ -546,33 +662,40 @@ bool wxListCtrl::SetItem(wxListItem& info)
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
 
+    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() )
     {
-        // FIXME it should be...
-        wxASSERT_MSG( !info.GetData(),
-                      _T("can't have custom attributes and client data") );
+        wxListItemAttr *attr = (wxListItemAttr *)m_attrs.Get(item.iItem);
 
-        item.mask |= LVIF_PARAM;
-        item.lParam = (long)info.GetAttributes();
+        if ( attr == NULL )
+            m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
+        else
+            *attr = *info.GetAttributes();
 
         m_hasAnyAttr = TRUE;
-    }
-    else if ( m_hasAnyAttr )
-    {
-        item.mask |= LVIF_PARAM;
-        item.lParam = 0;
+
+        // if the colour has changed, we must redraw the item
+        updateNow = TRUE;
     }
 
-    item.cchTextMax = 0;
-    bool ok = ListView_SetItem(GetHwnd(), &item) != 0;
-    if ( ok && (info.m_mask & wxLIST_MASK_IMAGE) )
+    if ( updateNow )
     {
-        // make the change visible
+        // we need this to make the change visible right now
         ListView_Update(GetHwnd(), item.iItem);
     }
 
-    return ok;
+    return TRUE;
 }
 
 long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
@@ -620,7 +743,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 }
 
 // Sets the item image
-bool wxListCtrl::SetItemImage(long item, int image, int selImage)
+bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
 {
     wxListItem info;
 
@@ -703,7 +826,7 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
     rect.x = rect2.left;
     rect.y = rect2.top;
     rect.width = rect2.right - rect2.left;
-    rect.height = rect2.bottom - rect2.left;
+    rect.height = rect2.bottom - rect2.top;
     return success;
 }
 
@@ -725,7 +848,7 @@ bool wxListCtrl::SetItemPosition(long item, const wxPoint& pos)
 }
 
 // Gets the number of items in the list control
-int wxListCtrl::GetItemCount(void) const
+int wxListCtrl::GetItemCount() const
 {
     return ListView_GetItemCount(GetHwnd());
 }
@@ -739,13 +862,13 @@ int wxListCtrl::GetItemSpacing(bool isSmall) const
 }
 
 // Gets the number of selected items in the list control
-int wxListCtrl::GetSelectedItemCount(void) const
+int wxListCtrl::GetSelectedItemCount() const
 {
     return ListView_GetSelectedCount(GetHwnd());
 }
 
 // Gets the text colour of the listview
-wxColour wxListCtrl::GetTextColour(void) const
+wxColour wxListCtrl::GetTextColour() const
 {
     COLORREF ref = ListView_GetTextColor(GetHwnd());
     wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
@@ -760,7 +883,7 @@ void wxListCtrl::SetTextColour(const wxColour& col)
 
 // 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(GetHwnd());
 }
@@ -824,21 +947,38 @@ void wxListCtrl::SetImageList(wxImageList *imageList, int which)
     if ( which == wxIMAGE_LIST_NORMAL )
     {
         flags = LVSIL_NORMAL;
+        if (m_ownsImageListNormal) delete m_imageListNormal;
         m_imageListNormal = imageList;
+        m_ownsImageListNormal = FALSE;
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
         flags = LVSIL_SMALL;
+        if (m_ownsImageListSmall) delete m_imageListSmall;
         m_imageListSmall = imageList;
+        m_ownsImageListSmall = FALSE;
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
         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
 // ----------------------------------------------------------------------------
@@ -878,7 +1018,7 @@ bool wxListCtrl::DeleteAllColumns()
     {
         if ( ListView_DeleteColumn(GetHwnd(), 0) == 0 )
         {
-            wxLogLastError("ListView_DeleteColumn");
+            wxLogLastError(wxT("ListView_DeleteColumn"));
 
             return FALSE;
         }
@@ -913,6 +1053,8 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 {
     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)
@@ -931,7 +1073,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 }
 
 // End label editing, optionally cancelling the edit
-bool wxListCtrl::EndEditLabel(bool cancel)
+bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
 {
     wxFAIL;
 
@@ -966,10 +1108,15 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
 
     findInfo.flags = LVFI_STRING;
     if ( partial )
-        findInfo.flags |= LVFI_STRING;
-    findInfo.psz = WXSTRINGCAST str;
+        findInfo.flags |= LVFI_PARTIAL;
+    findInfo.psz = str;
 
-    return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
+    // 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'
@@ -1048,20 +1195,18 @@ long wxListCtrl::InsertItem(wxListItem& info)
     // check whether it has any custom attributes
     if ( info.HasAttributes() )
     {
-        // FIXME it should be...
-        wxASSERT_MSG( !info.GetData(),
-                      _T("can't have custom attributes and client data") );
 
-        item.mask |= LVIF_PARAM;
-        item.lParam = (long)info.GetAttributes();
+        wxListItemAttr *attr;
+        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;
     }
-    else if ( m_hasAnyAttr )
-    {
-        item.mask |= LVIF_PARAM;
-        item.lParam = 0;
-    }
 
     return (long) ListView_InsertItem(GetHwnd(), & item);
 }
@@ -1231,7 +1376,15 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
     wxListEvent event(wxEVT_NULL, m_windowId);
     wxEventType eventType = wxEVT_NULL;
+
     NMHDR *nmhdr = (NMHDR *)lParam;
+
+    // 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:
@@ -1244,12 +1397,9 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 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;
-            }
+            event.m_itemIndex = nmLV->iItem;
+            event.m_pointDrag.x = nmLV->ptAction.x;
+            event.m_pointDrag.y = nmLV->ptAction.y;
             break;
 
         case LVN_BEGINLABELEDIT:
@@ -1257,50 +1407,30 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
                 LV_DISPINFO *info = (LV_DISPINFO *)lParam;
                 wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());
-                break;
             }
+            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;
-            }
+            eventType = wxEVT_COMMAND_LIST_COL_CLICK;
+            event.m_itemIndex = -1;
+            event.m_col = nmLV->iSubItem;
+            break;
 
         case LVN_DELETEALLITEMS:
-            // what's the sense of generating a wxWin event for this when
-            // it's absolutely not portable?
-#if 0
             eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
             event.m_itemIndex = -1;
-#endif // 0
 
-            // return TRUE to suppress all additional LVN_DELETEITEM
-            // notifications - this makes deleting all items from a list ctrl
-            // much faster (but we can't do it if we have any custom drawn
-            // items because we need to delete their attributes in
-            // LVN_DELETEITEM below)
-            if ( !m_hasAnyAttr )
-            {
-                *result = TRUE;
+            FreeAllAttrs();
 
-                return TRUE;
-            }
             break;
 
         case LVN_DELETEITEM:
-            {
-                eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
-                NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                event.m_itemIndex = hdr->iItem;
+            eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
+            event.m_itemIndex = nmLV->iItem;
 
-                if ( m_hasAnyAttr )
-                {
-                    wxListItemAttr *attr = (wxListItemAttr *)hdr->lParam;
-                    delete attr;
-                }
+            if ( m_hasAnyAttr )
+            {
+                delete (wxListItemAttr *)m_attrs.Delete(nmLV->iItem);
             }
             break;
 
@@ -1341,33 +1471,28 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
 
         case LVN_INSERTITEM:
-            {
-                eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
-                NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                event.m_itemIndex = hdr->iItem;
-                break;
-            }
+            eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
+            event.m_itemIndex = nmLV->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.
+            if ( (nmLV->uNewState & LVIS_SELECTED) && !(nmLV->uOldState & LVIS_SELECTED) )
             {
-                // 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;
+                eventType = wxEVT_COMMAND_LIST_ITEM_SELECTED;
+                event.m_itemIndex = nmLV->iItem;
             }
+            else if ( !(nmLV->uNewState & LVIS_SELECTED) && (nmLV->uOldState & LVIS_SELECTED) )
+            {
+                eventType = wxEVT_COMMAND_LIST_ITEM_DESELECTED;
+                event.m_itemIndex = nmLV->iItem;
+            }
+            else
+            {
+                return FALSE;
+            }
+            break;
 
         case LVN_KEYDOWN:
             {
@@ -1379,10 +1504,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                          wxLIST_NEXT_ALL,
                                          wxLIST_STATE_SELECTED);
 
-                // <Enter> or <Space> activate the selected item if any
-                if ( lItem != -1 && (wVKey == VK_RETURN || wVKey == VK_SPACE) )
+                // <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()) )
                 {
-                    // TODO this behaviour probably should be optional
                     eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
                     event.m_itemIndex = lItem;
                 }
@@ -1391,8 +1519,15 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
                     event.m_code = wxCharCodeMSWToWX(wVKey);
                 }
-                break;
+
+                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
@@ -1403,40 +1538,50 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             }
 
             // 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 )
             {
-                eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
-                NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                event.m_itemIndex = hdr->iItem;
+                // 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. */
-        {
-            // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(), don't do
-            // anything else
-            if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) {
-                return TRUE;
-            }
+            /* 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. */
+            {
+                // 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);
+                // 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 )
+                ::GetCursorPos(&(lvhti.pt));
+                ::ScreenToClient(GetHwnd(),&(lvhti.pt));
+                if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
                 {
-                    eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
-                    event.m_itemIndex = lvhti.iItem;
+                    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 0
@@ -1457,14 +1602,14 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             break;
 #endif // 0
 
-#ifdef NM_CUSTOMDRAW
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300
         case NM_CUSTOMDRAW:
             {
                 LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam;
                 NMCUSTOMDRAW& nmcd = lplvcd->nmcd;
                 switch( nmcd.dwDrawStage )
                 {
-                    case CDDS_PREPAINT :
+                    case CDDS_PREPAINT:
                         // if we've got any items with non standard attributes,
                         // notify us before painting each item
                         *result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
@@ -1473,34 +1618,72 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                     case CDDS_ITEMPREPAINT:
                         {
-                            if ( !nmcd.lItemlParam )
+                            wxListItemAttr *attr =
+                                (wxListItemAttr *)m_attrs.Get(nmcd.dwItemSpec);
+
+                            if ( !attr )
                             {
                                 // nothing to do for this item
                                 return CDRF_DODEFAULT;
                             }
 
-                            wxListItemAttr *attr =
-                                (wxListItemAttr *)nmcd.lItemlParam;
+                            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();
+                            }
 
-                            ::SelectObject(nmcd.hdc,
-                                (HFONT)((wxFont &)attr->GetFont()).
-                                    GetResourceHandle());
-                            lplvcd->clrText =
-                                wxColourToRGB(attr->GetTextColour());
-                            lplvcd->clrTextBk =
-                                wxColourToRGB(attr->GetBackgroundColour());
+                            if ( attr->HasBackgroundColour() )
+                            {
+                                colBack = attr->GetBackgroundColour();
+                            }
+                            else
+                            {
+                                colBack = GetBackgroundColour();
+                            }
 
-                            // if we wanted to set colours for individual
-                            // columns (subitems), we would have returned
-                            // CDRF_NOTIFYSUBITEMREDRAW from here
-                            *result = CDRF_NEWFONT;
+                            // 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);
+
+                                *result = CDRF_NEWFONT;
+                            }
+                            else
+                            {
+                                *result = CDRF_DODEFAULT;
+                            }
+
+                            lplvcd->clrText = wxColourToRGB(colText);
+                            lplvcd->clrTextBk = wxColourToRGB(colBack);
 
                             return TRUE;
                         }
+
+                    default:
+                        *result = CDRF_DODEFAULT;
+                        return TRUE;
                 }
             }
-            break;
-#endif // NM_CUSTOMDRAW
+//            break; // can never be reached
+#endif // _WIN32_IE >= 0x300
 
         default:
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
@@ -1518,8 +1701,16 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     // post processing
     // ---------------
 
-    switch ( (int)nmhdr->code )
+    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_GETDISPINFO:
             {
                 LV_DISPINFO *info = (LV_DISPINFO *)lParam;
@@ -1539,8 +1730,6 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 *result = event.IsAllowed();
                 return TRUE;
             }
-        default:
-            break;
     }
 
     *result = !event.IsAllowed();
@@ -1561,6 +1750,71 @@ wxChar *wxListCtrl::AddPool(const wxString& str)
     return (wxChar *)node->Data();
 }
 
+// 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::GetSystemColour(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;
+    for (i = 0; i < itemCount; 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 == (GetItemCount() - 1))
+            {
+                cy = itemRect.GetBottom();
+                dc.DrawLine(0, cy, clientSize.x, cy);
+            }
+        }
+    }
+    i = (GetItemCount() - 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());
+            }
+        }
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxListItem
 // ----------------------------------------------------------------------------
@@ -1582,7 +1836,30 @@ wxListItem::wxListItem()
     m_attr = NULL;
 }
 
-static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem, HWND getFullInfo)
+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(const wxListCtrl *WXUNUSED(ctrl), wxListItem& info, LV_ITEM& lvItem, HWND getFullInfo)
 {
     info.m_data = lvItem.lParam;
     info.m_mask = 0;