fix for (too big) combobox height

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index a39a97debf29644a3c9979ac3add17b36ce605ba..f747968d69dbb5ca8a96971fcc93a97ca32e02f6 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -9,8 +9,17 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
     #pragma implementation "listctrl.h"
 #ifdef __GNUG__
     #pragma implementation "listctrl.h"

+    #pragma implementation "listctrlbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -24,32 +33,82 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#if defined(__WIN95__)
+#ifdef __WIN95__

 
 #include "wx/listctrl.h"
 #include "wx/log.h"
 
 #include "wx/msw/private.h"
 
 
 #include "wx/listctrl.h"
 #include "wx/log.h"
 
 #include "wx/msw/private.h"
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"
+#else

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

-#ifndef __TWIN32__
-    #ifdef __GNUWIN32__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
+#ifndef LVHT_ONITEM
+    #define LVHT_ONITEM \
+                (LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+

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

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-#endif // USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+
+// ============================================================================
+// 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
+// ----------------------------------------------------------------------------

 
 

-wxListCtrl::wxListCtrl()
+void wxListCtrl::Init()

 {
     m_imageListNormal = NULL;
     m_imageListSmall = NULL;
 {
     m_imageListNormal = NULL;
     m_imageListSmall = NULL;


@@ -57,6 +116,7 @@ wxListCtrl::wxListCtrl()
     m_baseStyle = 0;
     m_colCount = 0;
     m_textCtrl = NULL;
     m_baseStyle = 0;
     m_colCount = 0;
     m_textCtrl = NULL;

+    m_hasAnyAttr = FALSE;

 }
 
 bool wxListCtrl::Create(wxWindow *parent,
 }
 
 bool wxListCtrl::Create(wxWindow *parent,


@@ -67,13 +127,10 @@ bool wxListCtrl::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-    m_imageListNormal = NULL;
-    m_imageListSmall = NULL;
-    m_imageListState = NULL;
-    m_textCtrl = NULL;
-    m_colCount = 0;
-
+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif // wxUSE_VALIDATORS
+

     SetName(name);
 
     int x = pos.x;
     SetName(name);
 
     int x = pos.x;


@@ -96,35 +153,50 @@ bool wxListCtrl::Create(wxWindow *parent,
 
     m_windowId = (id == -1) ? NewControlId() : id;
 
 
     m_windowId = (id == -1) ? NewControlId() : id;
 

-    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+                   LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
+    if ( wxStyleHasBorder(m_windowStyle) )
+        wstyle |= WS_BORDER;
+    m_baseStyle = wstyle;
+
+    if ( !DoCreateControl(x, y, width, height) )
+        return FALSE;
+
+    if (parent)
+        parent->AddChild(this);
+
+    return TRUE;
+}
+
+bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
+{
+    DWORD wstyle = m_baseStyle;

 
     bool want3D;
 
     bool want3D;

-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);

 
     // Even with extended styles, need to combine with WS_BORDER
     // for them to look right.
 
     // Even with extended styles, need to combine with WS_BORDER
     // for them to look right.

-    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+    if ( want3D )

         wstyle |= WS_BORDER;
 
         wstyle |= WS_BORDER;
 

-    wstyle |= LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS   ;
-    m_baseStyle = wstyle;
-

     long oldStyle = 0; // Dummy
     wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
 
     // Create the ListView control.
     m_hWnd = (WXHWND)CreateWindowEx(exStyle,
                                     WC_LISTVIEW,
     long oldStyle = 0; // Dummy
     wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
 
     // Create the ListView control.
     m_hWnd = (WXHWND)CreateWindowEx(exStyle,
                                     WC_LISTVIEW,

-                                    "",
+                                    wxT(""),

                                     wstyle,
                                     wstyle,

-                                    x, y, width, height,
-                                    (HWND) parent->GetHWND(),
+                                    x, y, w, h,
+                                    GetWinHwnd(GetParent()),

                                     (HMENU)m_windowId,
                                     wxGetInstance(),
                                     NULL);
 
                                     (HMENU)m_windowId,
                                     wxGetInstance(),
                                     NULL);
 

-    if ( !m_hWnd ) {
-        wxLogError("Can't create list control window.");
+    if ( !m_hWnd )
+    {
+        wxLogError(wxT("Can't create list control window."));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -134,25 +206,63 @@ bool wxListCtrl::Create(wxWindow *parent,
 #ifdef ListView_SetExtendedListViewStyle
     if ( wstyle & LVS_REPORT )
     {
 #ifdef ListView_SetExtendedListViewStyle
     if ( wstyle & LVS_REPORT )
     {

-        ListView_SetExtendedListViewStyle((HWND)GetHWND(),
-                                           LVS_EX_FULLROWSELECT);
+        ListView_SetExtendedListViewStyle(GetHwnd(),
+                                          LVS_EX_FULLROWSELECT);

     }
 #endif // ListView_SetExtendedListViewStyle
 
     }
 #endif // ListView_SetExtendedListViewStyle
 

-    wxSystemSettings settings;
-    SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(parent->GetForegroundColour());
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(GetParent()->GetForegroundColour());

 
 

-    if (parent) parent->AddChild(this);
-
-    SubclassWin((WXHWND) m_hWnd);
+    SubclassWin(m_hWnd);

 
     return TRUE;
 }
 
 
     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);
+        }
+    }
+}
+
+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()
 {
 wxListCtrl::~wxListCtrl()
 {

-    if (m_textCtrl)
+    FreeAllAttrs(TRUE /* no need to recreate hash any more */);
+
+    if ( m_textCtrl )

     {
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
     {
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);


@@ -161,6 +271,10 @@ wxListCtrl::~wxListCtrl()
     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// set/get/change style
+// ----------------------------------------------------------------------------
+

 // Add or remove a single window style
 void wxListCtrl::SetSingleStyle(long style, bool add)
 {
 // Add or remove a single window style
 void wxListCtrl::SetSingleStyle(long style, bool add)
 {


@@ -170,11 +284,11 @@ void wxListCtrl::SetSingleStyle(long style, bool add)
     if ( add )
     {
         if ( style & wxLC_MASK_TYPE)
     if ( add )
     {
         if ( style & wxLC_MASK_TYPE)

-            flag = flag & ~wxLC_MASK_TYPE ;
+            flag = flag & ~wxLC_MASK_TYPE;

         if ( style & wxLC_MASK_ALIGN )
         if ( style & wxLC_MASK_ALIGN )

-            flag = flag & ~wxLC_MASK_ALIGN ;
+            flag = flag & ~wxLC_MASK_ALIGN;

         if ( style & wxLC_MASK_SORT )
         if ( style & wxLC_MASK_SORT )

-            flag = flag & ~wxLC_MASK_SORT ;
+            flag = flag & ~wxLC_MASK_SORT;

     }
 
     if ( flag & style )
     }
 
     if ( flag & style )


@@ -192,7 +306,7 @@ void wxListCtrl::SetSingleStyle(long style, bool add)
 
     m_windowStyle = flag;
 
 
     m_windowStyle = flag;
 

-    RecreateWindow();
+    UpdateStyle();

 }
 
 // Set the whole window style
 }
 
 // Set the whole window style


@@ -200,61 +314,7 @@ void wxListCtrl::SetWindowStyleFlag(long flag)
 {
     m_windowStyle = flag;
 
 {
     m_windowStyle = flag;
 

-    RecreateWindow();
-}
-
-void wxListCtrl::RecreateWindow()
-{
-    if ( GetHWND() )
-    {
-        long oldStyle = 0;
-        long style = ConvertToMSWStyle(oldStyle, m_windowStyle);
-        style |= m_baseStyle;
-        //      ::SetWindowLong((HWND) GetHWND(), GWL_STYLE, style);
-
-        // The following recreation of the window appears to be necessary
-        // because SetWindowLong doesn't seem to do it.
-
-        int x, y, width, height;
-        GetPosition(&x, &y);
-        GetSize(&width, &height);
-
-        UnsubclassWin();
-        ::DestroyWindow((HWND) GetHWND());
-
-        // 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 );
-
-        m_hWnd = (WXHWND) hWndListControl;
-        SubclassWin((WXHWND) m_hWnd);
-
-#ifdef ListView_SetExtendedListViewStyle
-        if ( style & LVS_REPORT )
-        {
-            ListView_SetExtendedListViewStyle((HWND)GetHWND(),
-                                              LVS_EX_FULLROWSELECT);
-        }
-#endif // ListView_SetExtendedListViewStyle
-
-        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);
-    }
+    UpdateStyle();

 }
 
 // Can be just a single style, or a bitlist
 }
 
 // Can be just a single style, or a bitlist


@@ -358,14 +418,32 @@ long wxListCtrl::ConvertToMSWStyle(long& oldStyle, long style) const
     return wstyle;
 }
 
     return wstyle;
 }
 

-// Sets the background colour (GetBackgroundColour already implicit in
-// wxWindow class)
+// ----------------------------------------------------------------------------
+// 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;
 
 bool wxListCtrl::SetBackgroundColour(const wxColour& col)
 {
     if ( !wxWindow::SetBackgroundColour(col) )
         return FALSE;
 

-    ListView_SetBkColor((HWND) 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;
 }
 
     return TRUE;
 }


@@ -381,11 +459,11 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
     if ( item.m_mask & wxLIST_MASK_TEXT )
     {
         lvCol.mask |= LVCF_TEXT;
     if ( item.m_mask & wxLIST_MASK_TEXT )
     {
         lvCol.mask |= LVCF_TEXT;

-        lvCol.pszText = new char[513];
+        lvCol.pszText = new wxChar[513];

         lvCol.cchTextMax = 512;
     }
 
         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;


@@ -447,13 +525,13 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
     }
     lvCol.mask |= LVCF_SUBITEM;
     lvCol.iSubItem = col;
     }
     lvCol.mask |= LVCF_SUBITEM;
     lvCol.iSubItem = col;

-    return (ListView_SetColumn((HWND) GetHWND(), col, & lvCol) != 0);
+    return (ListView_SetColumn(GetHwnd(), col, & lvCol) != 0);

 }
 
 // Gets the column width
 int wxListCtrl::GetColumnWidth(int col) const
 {
 }
 
 // Gets the column width
 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


@@ -469,20 +547,20 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
     else if ( width2 == wxLIST_AUTOSIZE_USEHEADER)
         width2 = LVSCW_AUTOSIZE_USEHEADER;
 
     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

 {
     return m_textCtrl;
 }
 {
     return m_textCtrl;
 }


@@ -491,11 +569,7 @@ wxTextCtrl* wxListCtrl::GetEditControl(void) const
 bool wxListCtrl::GetItem(wxListItem& info) const
 {
     LV_ITEM lvItem;
 bool wxListCtrl::GetItem(wxListItem& info) const
 {
     LV_ITEM lvItem;

-#ifdef __GNUWIN32__
-    memset(&lvItem, 0, sizeof(lvItem));
-#else
-    ZeroMemory(&lvItem, sizeof(lvItem)); // must set all fields to 0
-#endif
+    wxZeroMemory(lvItem);

 
     lvItem.iItem = info.m_itemId;
     lvItem.iSubItem = info.m_col;
 
     lvItem.iItem = info.m_itemId;
     lvItem.iSubItem = info.m_col;


@@ -503,7 +577,7 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     if ( info.m_mask & wxLIST_MASK_TEXT )
     {
         lvItem.mask |= LVIF_TEXT;
     if ( info.m_mask & wxLIST_MASK_TEXT )
     {
         lvItem.mask |= LVIF_TEXT;

-        lvItem.pszText = new char[513];
+        lvItem.pszText = new wxChar[513];

         lvItem.cchTextMax = 512;
     }
     else
         lvItem.cchTextMax = 512;
     }
     else


@@ -512,7 +586,7 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     }
 
     if (info.m_mask & wxLIST_MASK_DATA)
     }
 
     if (info.m_mask & wxLIST_MASK_DATA)

-        lvItem.mask |= LVIF_PARAM ;
+        lvItem.mask |= LVIF_PARAM;

 
     if ( info.m_mask & wxLIST_MASK_STATE )
     {
 
     if ( info.m_mask & wxLIST_MASK_STATE )
     {


@@ -543,8 +617,24 @@ bool wxListCtrl::SetItem(wxListItem& info)
 {
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
 {
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);

+
+    // check whether it has any custom attributes
+    if ( info.HasAttributes() )
+    {
+        m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
+
+        m_hasAnyAttr = TRUE;
+    }
+

     item.cchTextMax = 0;
     item.cchTextMax = 0;

-    return (ListView_SetItem((HWND) GetHWND(), &item) != 0);
+    bool ok = ListView_SetItem(GetHwnd(), &item) != 0;
+    if ( ok && (info.m_mask & wxLIST_MASK_IMAGE) )
+    {
+        // make the change visible
+        ListView_Update(GetHwnd(), item.iItem);
+    }
+
+    return ok;

 }
 
 long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
 }
 
 long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)


@@ -568,7 +658,7 @@ int wxListCtrl::GetItemState(long item, long stateMask) const
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_STATE ;
+    info.m_mask = wxLIST_MASK_STATE;

     info.m_stateMask = stateMask;
     info.m_itemId = item;
 
     info.m_stateMask = stateMask;
     info.m_itemId = item;
 


@@ -583,7 +673,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_STATE ;
+    info.m_mask = wxLIST_MASK_STATE;

     info.m_state = state;
     info.m_stateMask = stateMask;
     info.m_itemId = item;
     info.m_state = state;
     info.m_stateMask = stateMask;
     info.m_itemId = item;


@@ -596,7 +686,7 @@ bool wxListCtrl::SetItemImage(long item, int image, int selImage)
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_IMAGE ;
+    info.m_mask = wxLIST_MASK_IMAGE;

     info.m_image = image;
     info.m_itemId = item;
 
     info.m_image = image;
     info.m_itemId = item;
 


@@ -608,7 +698,7 @@ wxString wxListCtrl::GetItemText(long item) const
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_TEXT ;
+    info.m_mask = wxLIST_MASK_TEXT;

     info.m_itemId = item;
 
     if (!GetItem(info))
     info.m_itemId = item;
 
     if (!GetItem(info))


@@ -621,7 +711,7 @@ void wxListCtrl::SetItemText(long item, const wxString& str)
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_TEXT ;
+    info.m_mask = wxLIST_MASK_TEXT;

     info.m_itemId = item;
     info.m_text = str;
 
     info.m_itemId = item;
     info.m_text = str;
 


@@ -633,7 +723,7 @@ long wxListCtrl::GetItemData(long item) const
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_DATA ;
+    info.m_mask = wxLIST_MASK_DATA;

     info.m_itemId = item;
 
     if (!GetItem(info))
     info.m_itemId = item;
 
     if (!GetItem(info))


@@ -646,7 +736,7 @@ bool wxListCtrl::SetItemData(long item, long data)
 {
     wxListItem info;
 
 {
     wxListItem info;
 

-    info.m_mask = wxLIST_MASK_DATA ;
+    info.m_mask = wxLIST_MASK_DATA;

     info.m_itemId = item;
     info.m_data = data;
 
     info.m_itemId = item;
     info.m_data = data;
 


@@ -666,7 +756,11 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
     else if ( code == wxLIST_RECT_LABEL )
         code2 = LVIR_LABEL;
 
     else if ( code == wxLIST_RECT_LABEL )
         code2 = LVIR_LABEL;
 

-    bool success = (ListView_GetItemRect((HWND) GetHWND(), (int) item, &rect2, code2) != 0);
+#ifdef __WXWINE__
+    bool success = (ListView_GetItemRect(GetHwnd(), (int) item, &rect2 ) != 0);
+#else
+    bool success = (ListView_GetItemRect(GetHwnd(), (int) item, &rect2, code2) != 0);
+#endif

 
     rect.x = rect2.left;
     rect.y = rect2.top;
 
     rect.x = rect2.left;
     rect.y = rect2.top;


@@ -680,7 +774,7 @@ 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;


@@ -689,13 +783,13 @@ bool wxListCtrl::GetItemPosition(long item, wxPoint& pos) const
 // Sets the item position.
 bool wxListCtrl::SetItemPosition(long item, const wxPoint& pos)
 {
 // Sets the item position.
 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.


@@ -703,19 +797,19 @@ 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());
+    COLORREF ref = ListView_GetTextColor(GetHwnd());

     wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
     return col;
 }
     wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
     return col;
 }


@@ -723,14 +817,14 @@ wxColour wxListCtrl::GetTextColour(void) const
 // 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'.


@@ -765,7 +859,7 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
     if ( state & wxLIST_STATE_SELECTED )
         flags |= LVNI_SELECTED;
 
     if ( state & wxLIST_STATE_SELECTED )
         flags |= LVNI_SELECTED;
 

-    return (long) ListView_GetNextItem((HWND) GetHWND(), item, flags);
+    return (long) ListView_GetNextItem(GetHwnd(), item, flags);

 }
 
 
 }
 
 


@@ -804,11 +898,12 @@ void wxListCtrl::SetImageList(wxImageList *imageList, int which)
         flags = LVSIL_STATE;
         m_imageListState = imageList;
     }
         flags = LVSIL_STATE;
         m_imageListState = imageList;
     }

-    ListView_SetImageList((HWND) GetHWND(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
+    ListView_SetImageList(GetHwnd(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);

 }
 
 }
 

+// ----------------------------------------------------------------------------

 // Operations
 // Operations

-////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------

 
 // Arranges the items
 bool wxListCtrl::Arrange(int flag)
 
 // Arranges the items
 bool wxListCtrl::Arrange(int flag)


@@ -823,37 +918,45 @@ bool wxListCtrl::Arrange(int flag)
     else if ( flag == wxLIST_ALIGN_SNAP_TO_GRID )
         code = LVA_SNAPTOGRID;
 
     else if ( flag == wxLIST_ALIGN_SNAP_TO_GRID )
         code = LVA_SNAPTOGRID;
 

-    return (ListView_Arrange((HWND) GetHWND(), code) != 0);
+    return (ListView_Arrange(GetHwnd(), code) != 0);

 }
 
 // Deletes an item
 bool wxListCtrl::DeleteItem(long item)
 {
 }
 
 // Deletes an item
 bool wxListCtrl::DeleteItem(long item)
 {

-    return (ListView_DeleteItem((HWND) GetHWND(), (int) item) != 0);
+    return (ListView_DeleteItem(GetHwnd(), (int) item) != 0);

 }
 
 // Deletes all items
 bool wxListCtrl::DeleteAllItems()
 {
 }
 
 // Deletes all items
 bool wxListCtrl::DeleteAllItems()
 {

-    return (ListView_DeleteAllItems((HWND) GetHWND()) != 0);
+    return (ListView_DeleteAllItems(GetHwnd()) != 0);

 }
 
 // Deletes all items
 bool wxListCtrl::DeleteAllColumns()
 {
 }
 
 // Deletes all items
 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("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
 bool wxListCtrl::DeleteColumn(int col)
 {
 }
 
 // Deletes a column
 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 --;


@@ -872,7 +975,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 {
     wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
 
 {
     wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
 

-    HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), item);
+    HWND hWnd = (HWND) ListView_EditLabel(GetHwnd(), item);

 
     if (m_textCtrl)
     {
 
     if (m_textCtrl)
     {


@@ -896,7 +999,7 @@ bool wxListCtrl::EndEditLabel(bool cancel)
 
     /* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
      * ???
 
     /* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
      * ???

-     bool success = (ListView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0);
+     bool success = (ListView_EndEditLabelNow(GetHwnd(), cancel) != 0);

 
      if (m_textCtrl)
      {
 
      if (m_textCtrl)
      {


@@ -914,7 +1017,7 @@ bool wxListCtrl::EndEditLabel(bool cancel)
 // Ensures this item is visible
 bool wxListCtrl::EnsureVisible(long item)
 {
 // Ensures this item is visible
 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'
 }
 
 // Find an item whose label matches this string, starting from the item after 'start'


@@ -928,7 +1031,7 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
         findInfo.flags |= LVFI_STRING;
     findInfo.psz = WXSTRINGCAST str;
 
         findInfo.flags |= LVFI_STRING;
     findInfo.psz = WXSTRINGCAST str;
 

-    return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+    return ListView_FindItem(GetHwnd(), (int) start, & findInfo);

 }
 
 // Find an item whose data matches this data, starting from the item after 'start'
 }
 
 // Find an item whose data matches this data, starting from the item after 'start'


@@ -940,7 +1043,7 @@ long wxListCtrl::FindItem(long start, long data)
     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
 }
 
 // Find an item nearest this position in the specified direction, starting from


@@ -963,7 +1066,7 @@ long wxListCtrl::FindItem(long start, const wxPoint& pt, int direction)
     else if ( direction == wxLIST_FIND_RIGHT )
         findInfo.vkDirection = VK_RIGHT;
 
     else if ( direction == wxLIST_FIND_RIGHT )
         findInfo.vkDirection = VK_RIGHT;
 

-    return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+    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,


@@ -974,7 +1077,7 @@ long wxListCtrl::HitTest(const wxPoint& point, int& flags)
     hitTestInfo.pt.x = (int) point.x;
     hitTestInfo.pt.y = (int) point.y;
 
     hitTestInfo.pt.x = (int) point.x;
     hitTestInfo.pt.y = (int) point.y;
 

-    ListView_HitTest((HWND) GetHWND(), & hitTestInfo);
+    ListView_HitTest(GetHwnd(), & hitTestInfo);

 
     flags = 0;
     if ( hitTestInfo.flags & LVHT_ABOVE )
 
     flags = 0;
     if ( hitTestInfo.flags & LVHT_ABOVE )


@@ -994,7 +1097,7 @@ long wxListCtrl::HitTest(const wxPoint& point, int& flags)
     if ( hitTestInfo.flags & LVHT_TORIGHT )
         flags |= wxLIST_HITTEST_TORIGHT;
 
     if ( hitTestInfo.flags & LVHT_TORIGHT )
         flags |= wxLIST_HITTEST_TORIGHT;
 

-    return (long) hitTestInfo.iItem ;
+    return (long) hitTestInfo.iItem;

 }
 
 // Inserts an item, returning the index of the new item if successful,
 }
 
 // Inserts an item, returning the index of the new item if successful,


@@ -1004,7 +1107,15 @@ long wxListCtrl::InsertItem(wxListItem& info)
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
 
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
 

-    return (long) ListView_InsertItem((HWND) GetHWND(), & item);
+    // check whether it has any custom attributes
+    if ( info.HasAttributes() )
+    {
+        m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
+
+        m_hasAnyAttr = TRUE;
+    }
+
+    return (long) ListView_InsertItem(GetHwnd(), & item);

 }
 
 long wxListCtrl::InsertItem(long index, const wxString& label)
 }
 
 long wxListCtrl::InsertItem(long index, const wxString& label)


@@ -1083,22 +1194,24 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
     lvCol.mask |= LVCF_SUBITEM;
     lvCol.iSubItem = col;
 
     lvCol.mask |= LVCF_SUBITEM;
     lvCol.iSubItem = col;
 

-    bool success = ListView_InsertColumn((HWND) GetHWND(), col, & lvCol) != -1;
+    bool success = ListView_InsertColumn(GetHwnd(), col, & lvCol) != -1;

     if ( success )
     {
         m_colCount++;
     }
     else
     {
     if ( success )
     {
         m_colCount++;
     }
     else
     {

-        wxLogDebug("Failed to insert the column '%s' into listview!",
+        wxLogDebug(wxT("Failed to insert the column '%s' into listview!"),

                    lvCol.pszText);
     }
 
     return success;
 }
 
                    lvCol.pszText);
     }
 
     return success;
 }
 

-long wxListCtrl::InsertColumn(long col, const wxString& heading, int format,
-        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;
 {
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;


@@ -1120,7 +1233,7 @@ long wxListCtrl::InsertColumn(long col, const wxString& heading, int format,
 // to scroll. If in report view mode, y specifies the number of lines to scroll.
 bool wxListCtrl::ScrollList(int dx, int dy)
 {
 // to scroll. If in report view mode, y specifies the number of lines to scroll.
 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.


@@ -1136,9 +1249,13 @@ bool wxListCtrl::ScrollList(int dx, int dy)
 // data is arbitrary data to be passed to the sort function.
 bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {
 // data is arbitrary data to be passed to the sort function.
 bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {

-    return (ListView_SortItems((HWND) GetHWND(), (PFNLVCOMPARE) fn, data) != 0);
+    return (ListView_SortItems(GetHwnd(), (PFNLVCOMPARE) fn, data) != 0);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// message processing
+// ----------------------------------------------------------------------------
+

 bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 {
     if (cmd == EN_UPDATE)
 bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 {
     if (cmd == EN_UPDATE)


@@ -1155,15 +1272,19 @@ bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
         ProcessCommand(event);
         return TRUE;
     }
         ProcessCommand(event);
         return TRUE;
     }

-    else return FALSE;
+    else
+        return FALSE;

 }
 
 bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 }
 
 bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {

+    // prepare the event
+    // -----------------
+

     wxListEvent event(wxEVT_NULL, m_windowId);
     wxEventType eventType = wxEVT_NULL;
     wxListEvent event(wxEVT_NULL, m_windowId);
     wxEventType eventType = wxEVT_NULL;

-    NMHDR *hdr1 = (NMHDR *) lParam;
-    switch ( hdr1->code )
+    NMHDR *nmhdr = (NMHDR *)lParam;
+    switch ( nmhdr->code )

     {
         case LVN_BEGINRDRAG:
             eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
     {
         case LVN_BEGINRDRAG:
             eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;


@@ -1187,7 +1308,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             {
                 eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
                 LV_DISPINFO *info = (LV_DISPINFO *)lParam;
             {
                 eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
                 LV_DISPINFO *info = (LV_DISPINFO *)lParam;

-                wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
+                wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());

                 break;
             }
 
                 break;
             }
 


@@ -1199,40 +1320,64 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 event.m_col = hdr->iSubItem;
                 break;
             }
                 event.m_col = hdr->iSubItem;
                 break;
             }

+

         case LVN_DELETEALLITEMS:
         case LVN_DELETEALLITEMS:

-            {
-                eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
-                //      NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
-                event.m_itemIndex = -1;
-                break;
-            }
+            eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
+            event.m_itemIndex = -1;
+
+            FreeAllAttrs();
+
+            break;
+

         case LVN_DELETEITEM:
             {
                 eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
                 NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
                 event.m_itemIndex = hdr->iItem;
         case LVN_DELETEITEM:
             {
                 eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
                 NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
                 event.m_itemIndex = hdr->iItem;

-                break;
+
+                if ( m_hasAnyAttr )
+                {
+                    delete (wxListItemAttr *)m_attrs.Delete(hdr->iItem);
+                }

             }
             }

+            break;
+

         case LVN_ENDLABELEDIT:
             {
                 eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
                 LV_DISPINFO *info = (LV_DISPINFO *)lParam;
         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());
+                wxConvertFromMSWListItem(this, event.m_item, info->item);

                 if ( info->item.pszText == NULL || info->item.iItem == -1 )
                 if ( info->item.pszText == NULL || info->item.iItem == -1 )

-                    event.m_cancelled = TRUE;
-                break;
+                    return FALSE;

             }
             }

+            break;
+
+        case LVN_SETDISPINFO:
+            {
+                eventType = wxEVT_COMMAND_LIST_SET_INFO;
+                LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+                wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());
+            }
+            break;
+

         case LVN_GETDISPINFO:
         case LVN_GETDISPINFO:

+                // this provokes stack overflow: indeed, wxConvertFromMSWListItem()
+                // sends us WM_NOTIFY! As it doesn't do anything for now, just leave
+                // it out.
+#if 0

             {
             {

-                //      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;
                 // 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());
+                wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());

                 break;
             }
                 break;
             }

+#endif // 0
+                return FALSE;
+
+

         case LVN_INSERTITEM:
             {
                 eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
         case LVN_INSERTITEM:
             {
                 eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;


@@ -1240,6 +1385,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 event.m_itemIndex = hdr->iItem;
                 break;
             }
                 event.m_itemIndex = hdr->iItem;
                 break;
             }

+

         case LVN_ITEMCHANGED:
             {
                 // This needs to be sent to wxListCtrl as a rather more
         case LVN_ITEMCHANGED:
             {
                 // This needs to be sent to wxListCtrl as a rather more


@@ -1260,43 +1406,230 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     return FALSE;
                 break;
             }
                     return FALSE;
                 break;
             }

+

         case LVN_KEYDOWN:
             {
         case LVN_KEYDOWN:
             {

-                eventType = wxEVT_COMMAND_LIST_KEY_DOWN;

                 LV_KEYDOWN *info = (LV_KEYDOWN *)lParam;
                 LV_KEYDOWN *info = (LV_KEYDOWN *)lParam;

-                event.m_code = wxCharCodeMSWToWX(info->wVKey);
+                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
+                if ( lItem != -1 && (wVKey == VK_RETURN || wVKey == VK_SPACE) )
+                {
+                    // TODO this behaviour probably should be optional
+                    eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                    event.m_itemIndex = lItem;
+                }
+                else
+                {
+                    eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
+                    event.m_code = wxCharCodeMSWToWX(wVKey);
+                }

                 break;
             }
                 break;
             }

-        case LVN_SETDISPINFO:
+
+        case NM_DBLCLK:
+            // if the user processes it in wxEVT_COMMAND_LEFT_CLICK(), don't do
+            // anything else
+            if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )

             {
             {

-                eventType = wxEVT_COMMAND_LIST_SET_INFO;
-                LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-                wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
-                break;
+                return TRUE;
+            }
+
+            // else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event
+            // if it happened on an item (and not on empty place)
+            {
+                NM_LISTVIEW* hdr = (NM_LISTVIEW*)lParam;
+                if ( hdr->iItem == -1 )
+                {
+                    // not on item
+                    return FALSE;
+                }
+
+                eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+                event.m_itemIndex = hdr->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;
+            }
+
+            // 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;
+                }
+            }
+        }
+            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;
+                }
+
+                // 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

 
 

-        default :
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300
+        case NM_CUSTOMDRAW:
+            {
+                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
+                        *result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
+                                               : CDRF_DODEFAULT;
+                        return TRUE;
+
+                    case CDDS_ITEMPREPAINT:
+                        {
+                            wxListItemAttr *attr =
+                                (wxListItemAttr *)m_attrs.Get(nmcd.dwItemSpec);
+
+                            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();
+                            }
+
+                            // 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 // _WIN32_IE >= 0x300
+
+        default:

             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
 
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
 

+    // process the event
+    // -----------------
+

     event.SetEventObject( this );
     event.SetEventType(eventType);
 
     if ( !GetEventHandler()->ProcessEvent(event) )
         return FALSE;
 
     event.SetEventObject( this );
     event.SetEventType(eventType);
 
     if ( !GetEventHandler()->ProcessEvent(event) )
         return FALSE;
 

-    if (hdr1->code == LVN_GETDISPINFO)
+    // post processing
+    // ---------------
+
+    switch ( (int)nmhdr->code )

     {
     {

-        LV_DISPINFO *info = (LV_DISPINFO *)lParam;
-        if ( info->item.mask & LVIF_TEXT )
-        {
-            if ( !event.m_item.m_text.IsNull() )
+        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;
+                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 = wxStrlen(info->item.pszText) + 1;
+                    }
+                }
+                //    wxConvertToMSWListItem(this, event.m_item, info->item);
+                break;
+            }
+        case LVN_ENDLABELEDIT:

             {
             {

-                info->item.pszText = AddPool(event.m_item.m_text);
-                info->item.cchTextMax = strlen(info->item.pszText) + 1;
+                *result = event.IsAllowed();
+                return TRUE;

             }
             }

-        }
-        //    wxConvertToMSWListItem(this, event.m_item, info->item);

     }
 
     *result = !event.IsAllowed();
     }
 
     *result = !event.IsAllowed();


@@ -1304,7 +1637,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     return TRUE;
 }
 
     return TRUE;
 }
 

-char *wxListCtrl::AddPool(const wxString& str)
+wxChar *wxListCtrl::AddPool(const wxString& str)

 {
     // Remove the first element if 3 strings exist
     if ( m_stringPool.Number() == 3 )
 {
     // Remove the first element if 3 strings exist
     if ( m_stringPool.Number() == 3 )


@@ -1313,10 +1646,14 @@ char *wxListCtrl::AddPool(const wxString& str)
         delete[] (char *)node->Data();
         delete node;
     }
         delete[] (char *)node->Data();
         delete node;
     }

-    wxNode *node = m_stringPool.Add((char *) (const char *)str);
-    return (char *)node->Data();
+    wxNode *node = m_stringPool.Add(WXSTRINGCAST str);
+    return (wxChar *)node->Data();

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// wxListItem
+// ----------------------------------------------------------------------------
+

 // List item structure
 wxListItem::wxListItem()
 {
 // List item structure
 wxListItem::wxListItem()
 {


@@ -1330,6 +1667,31 @@ wxListItem::wxListItem()
 
     m_format = wxLIST_FORMAT_CENTRE;
     m_width = 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(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem, HWND getFullInfo)
 }
 
 static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem, HWND getFullInfo)


@@ -1352,12 +1714,12 @@ static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, L
 
         if ( needText )
         {
 
         if ( needText )
         {

-            lvItem.pszText = new char[513];
+            lvItem.pszText = new wxChar[513];

             lvItem.cchTextMax = 512;
         }
             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) ;
+        //    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 )
     }
 
     if ( lvItem.mask & LVIF_STATE )


@@ -1366,27 +1728,27 @@ static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, L
 
         if ( lvItem.stateMask & LVIS_CUT)
         {
 
         if ( lvItem.stateMask & LVIS_CUT)
         {

-            info.m_stateMask |= wxLIST_STATE_CUT ;
+            info.m_stateMask |= wxLIST_STATE_CUT;

             if ( lvItem.state & LVIS_CUT )
             if ( lvItem.state & LVIS_CUT )

-                info.m_state |= wxLIST_STATE_CUT ;
+                info.m_state |= wxLIST_STATE_CUT;

         }
         if ( lvItem.stateMask & LVIS_DROPHILITED)
         {
         }
         if ( lvItem.stateMask & LVIS_DROPHILITED)
         {

-            info.m_stateMask |= wxLIST_STATE_DROPHILITED ;
+            info.m_stateMask |= wxLIST_STATE_DROPHILITED;

             if ( lvItem.state & LVIS_DROPHILITED )
             if ( lvItem.state & LVIS_DROPHILITED )

-                info.m_state |= wxLIST_STATE_DROPHILITED ;
+                info.m_state |= wxLIST_STATE_DROPHILITED;

         }
         if ( lvItem.stateMask & LVIS_FOCUSED)
         {
         }
         if ( lvItem.stateMask & LVIS_FOCUSED)
         {

-            info.m_stateMask |= wxLIST_STATE_FOCUSED ;
+            info.m_stateMask |= wxLIST_STATE_FOCUSED;

             if ( lvItem.state & LVIS_FOCUSED )
             if ( lvItem.state & LVIS_FOCUSED )

-                info.m_state |= wxLIST_STATE_FOCUSED ;
+                info.m_state |= wxLIST_STATE_FOCUSED;

         }
         if ( lvItem.stateMask & LVIS_SELECTED)
         {
         }
         if ( lvItem.stateMask & LVIS_SELECTED)
         {

-            info.m_stateMask |= wxLIST_STATE_SELECTED ;
+            info.m_stateMask |= wxLIST_STATE_SELECTED;

             if ( lvItem.state & LVIS_SELECTED )
             if ( lvItem.state & LVIS_SELECTED )

-                info.m_state |= wxLIST_STATE_SELECTED ;
+                info.m_state |= wxLIST_STATE_SELECTED;

         }
     }
 
         }
     }
 


@@ -1411,14 +1773,14 @@ static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, L
         if (lvItem.pszText)
             delete[] lvItem.pszText;
     }
         if (lvItem.pszText)
             delete[] lvItem.pszText;
     }

-    lvItem.mask = oldMask ;
+    lvItem.mask = oldMask;

 }
 
 static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem)
 {
 }
 
 static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem)
 {

-    lvItem.iItem = (int) info.m_itemId ;
+    lvItem.iItem = (int) info.m_itemId;

 
 

-    lvItem.iImage = info.m_image ;
+    lvItem.iImage = info.m_image;

     lvItem.lParam = info.m_data;
     lvItem.stateMask = 0;
     lvItem.state = 0;
     lvItem.lParam = info.m_data;
     lvItem.stateMask = 0;
     lvItem.state = 0;


@@ -1427,10 +1789,10 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_
 
     if (info.m_mask & wxLIST_MASK_STATE)
     {
 
     if (info.m_mask & wxLIST_MASK_STATE)
     {

-        lvItem.mask |= LVIF_STATE ;
+        lvItem.mask |= LVIF_STATE;

         if (info.m_stateMask & wxLIST_STATE_CUT)
         {
         if (info.m_stateMask & wxLIST_STATE_CUT)
         {

-            lvItem.stateMask |= LVIS_CUT ;
+            lvItem.stateMask |= LVIS_CUT;

             if (info.m_state & wxLIST_STATE_CUT)
                 lvItem.state |= LVIS_CUT;
         }
             if (info.m_state & wxLIST_STATE_CUT)
                 lvItem.state |= LVIS_CUT;
         }


@@ -1456,14 +1818,14 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_
 
     if (info.m_mask & wxLIST_MASK_TEXT)
     {
 
     if (info.m_mask & wxLIST_MASK_TEXT)
     {

-        lvItem.mask |= LVIF_TEXT ;
+        lvItem.mask |= LVIF_TEXT;

         if ( ctrl->GetWindowStyleFlag() & wxLC_USER_TEXT )
         {
             lvItem.pszText = LPSTR_TEXTCALLBACK;
         }
         else
         {
         if ( ctrl->GetWindowStyleFlag() & wxLC_USER_TEXT )
         {
             lvItem.pszText = LPSTR_TEXTCALLBACK;
         }
         else
         {

-            lvItem.pszText = (char *) (const char *)info.m_text ;
+            lvItem.pszText = WXSTRINGCAST info.m_text;

             if ( lvItem.pszText )
                 lvItem.cchTextMax = info.m_text.Length();
             else
             if ( lvItem.pszText )
                 lvItem.cchTextMax = info.m_text.Length();
             else


@@ -1471,22 +1833,26 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_
         }
     }
     if (info.m_mask & wxLIST_MASK_IMAGE)
         }
     }
     if (info.m_mask & wxLIST_MASK_IMAGE)

-        lvItem.mask |= LVIF_IMAGE ;
+        lvItem.mask |= LVIF_IMAGE;

     if (info.m_mask & wxLIST_MASK_DATA)
     if (info.m_mask & wxLIST_MASK_DATA)

-        lvItem.mask |= LVIF_PARAM ;
+        lvItem.mask |= LVIF_PARAM;

 }
 
 }
 

+// ----------------------------------------------------------------------------

 // List event
 // List event

+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
 wxListEvent::wxListEvent(wxEventType commandType, int id)
 IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
 wxListEvent::wxListEvent(wxEventType commandType, int id)

-: wxNotifyEvent(commandType, id)
+           : wxNotifyEvent(commandType, id)

 {
     m_code = 0;
     m_itemIndex = 0;
 {
     m_code = 0;
     m_itemIndex = 0;

+    m_oldItemIndex = 0;

     m_col = 0;
     m_cancelled = FALSE;
 }
 
     m_col = 0;
     m_cancelled = FALSE;
 }
 

-#endif
+#endif // __WIN95__