ignore WinCE projects and build directories

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 41beca006a6ace93a1dd1d02126d8ba537819be9..05663f5d8fab7b46d849a691c3ff1ce762ab1700 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -18,42 +18,36 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_LISTCTRL
 
 #endif
 
 #if wxUSE_LISTCTRL
 

-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/dynarray.h"
-    #include "wx/dcscreen.h"
-    #include "wx/textctrl.h"
-#endif
-
-// under Win32 we always use the native version and also may use the generic
-// one, however some things should be done only if we use only the generic
-// version
-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
-    #define HAVE_NATIVE_LISTCTRL
-#endif
-
-// if we have the native control, wx/listctrl.h declares it and not this one
-#ifdef HAVE_NATIVE_LISTCTRL
-    #include "wx/generic/listctrl.h"
-#else // !HAVE_NATIVE_LISTCTRL
-    #include "wx/listctrl.h"
+#include "wx/listctrl.h"

 
 

+#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)

     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
     IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
     IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
     IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
     IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)

-#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
+#endif

 
 

+#ifndef WX_PRECOMP
+    #include "wx/scrolwin.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/dynarray.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcscreen.h"
+    #include "wx/math.h"
+    #include "wx/settings.h"
+#endif
+
+#include "wx/imaglist.h"

 #include "wx/selstore.h"
 #include "wx/renderer.h"
 #include "wx/selstore.h"
 #include "wx/renderer.h"

-#include "wx/math.h"

 
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
     #include "wx/mac/private.h"


@@ -65,35 +59,6 @@
 #define _USE_VISATTR 0
 
 
 #define _USE_VISATTR 0
 
 

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
-#if WXWIN_COMPATIBILITY_2_4
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
-#endif
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
-

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


@@ -107,7 +72,11 @@ static const int SCROLL_UNIT_X = 15;
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label

+#ifdef __WXGTK__
+static const int EXTRA_WIDTH = 6;
+#else

 static const int EXTRA_WIDTH = 4;
 static const int EXTRA_WIDTH = 4;

+#endif

 static const int EXTRA_HEIGHT = 4;
 
 // margin between the window and the items
 static const int EXTRA_HEIGHT = 4;
 
 // margin between the window and the items


@@ -115,8 +84,8 @@ static const int EXTRA_BORDER_X = 2;
 static const int EXTRA_BORDER_Y = 2;
 
 // offset for the header window
 static const int EXTRA_BORDER_Y = 2;
 
 // offset for the header window

-static const int HEADER_OFFSET_X = 1;
-static const int HEADER_OFFSET_Y = 1;
+static const int HEADER_OFFSET_X = 0;
+static const int HEADER_OFFSET_Y = 0;

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


@@ -130,6 +99,9 @@ static const int WIDTH_COL_DEFAULT = 80;
 // the space between the image and the text in the report mode
 static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 
 // the space between the image and the text in the report mode
 static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 

+// the space between the image and the text in the report mode in header
+static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
+

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


@@ -157,7 +129,7 @@ WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListItemData
+class wxListItemData

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


@@ -227,7 +199,7 @@ protected:
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListHeaderData : public wxObject
+class wxListHeaderData : public wxObject

 {
 public:
     wxListHeaderData();
 {
 public:
     wxListHeaderData();


@@ -235,6 +207,7 @@ public:
     void SetItem( const wxListItem &item );
     void SetPosition( int x, int y );
     void SetWidth( int w );
     void SetItem( const wxListItem &item );
     void SetPosition( int x, int y );
     void SetWidth( int w );

+    void SetState( int state );

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


@@ -249,6 +222,7 @@ public:
     int GetImage() const;
     int GetWidth() const;
     int GetFormat() const;
     int GetImage() const;
     int GetWidth() const;
     int GetFormat() const;

+    int GetState() const;

 
 protected:
     long      m_mask;
 
 protected:
     long      m_mask;


@@ -259,6 +233,7 @@ protected:
     int       m_xpos,
               m_ypos;
     int       m_height;
     int       m_xpos,
               m_ypos;
     int       m_height;

+    int       m_state;

 
 private:
     void Init();
 
 private:
     void Init();


@@ -408,11 +383,11 @@ WX_DEFINE_OBJARRAY(wxListLineDataArray)
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 

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

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

-    wxCursor          *m_currentCursor;
+    const wxCursor    *m_currentCursor;

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


@@ -465,7 +440,7 @@ private:
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 

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

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


@@ -479,7 +454,7 @@ public:
 // wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
 //-----------------------------------------------------------------------------
 
 // wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     // NB: text must be a valid object but not Create()d yet
 {
 public:
     // NB: text must be a valid object but not Create()d yet


@@ -489,7 +464,7 @@ public:
 
     wxTextCtrl *GetText() const { return m_text; }
 
 
     wxTextCtrl *GetText() const { return m_text; }
 

-    void AcceptChangesAndFinish();
+    void EndEdit( bool discardChanges );

 
 protected:
     void OnChar( wxKeyEvent &event );
 
 protected:
     void OnChar( wxKeyEvent &event );


@@ -497,14 +472,13 @@ protected:
     void OnKillFocus( wxFocusEvent &event );
 
     bool AcceptChanges();
     void OnKillFocus( wxFocusEvent &event );
 
     bool AcceptChanges();

-    void Finish();
+    void Finish( bool setfocus );

 
 private:
     wxListMainWindow   *m_owner;
     wxTextCtrl         *m_text;
     wxString            m_startValue;
     size_t              m_itemEdited;
 
 private:
     wxListMainWindow   *m_owner;
     wxTextCtrl         *m_text;
     wxString            m_startValue;
     size_t              m_itemEdited;

-    bool                m_finished;

     bool                m_aboutToFinish;
 
     DECLARE_EVENT_TABLE()
     bool                m_aboutToFinish;
 
     DECLARE_EVENT_TABLE()


@@ -605,6 +579,8 @@ public:
     // bring the selected item into view, scrolling to it if necessary
     void MoveToItem(size_t item);
 
     // bring the selected item into view, scrolling to it if necessary
     void MoveToItem(size_t item);
 

+    bool ScrollList( int WXUNUSED(dx), int dy );
+

     // bring the current item into view
     void MoveToFocus() { MoveToItem(m_current); }
 
     // bring the current item into view
     void MoveToFocus() { MoveToItem(m_current); }
 


@@ -616,17 +592,12 @@ public:
         return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
     }
 
         return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
     }
 

-    void FinishEditing(wxTextCtrl *text)
+    void ResetTextControl(wxTextCtrl *text)

     {
         delete text;
         m_textctrlWrapper = NULL;
     {
         delete text;
         m_textctrlWrapper = NULL;

-        SetFocusIgnoringChildren();

     }
 
     }
 

-    // suspend/resume redrawing the control
-    void Freeze();
-    void Thaw();
-

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


@@ -638,6 +609,7 @@ public:
 
     void OnChar( wxKeyEvent &event );
     void OnKeyDown( wxKeyEvent &event );
 
     void OnChar( wxKeyEvent &event );
     void OnKeyDown( wxKeyEvent &event );

+    void OnKeyUp( wxKeyEvent &event );

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


@@ -648,7 +620,7 @@ public:
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
 
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
 

-    void SetImageList( wxImageListType *imageList, int which );
+    void SetImageList( wxImageList *imageList, int which );

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


@@ -706,7 +678,7 @@ public:
     long FindItem( long start, const wxString& str, bool partial = false );
     long FindItem( long start, wxUIntPtr data);
     long FindItem( const wxPoint& pt );
     long FindItem( long start, const wxString& str, bool partial = false );
     long FindItem( long start, wxUIntPtr data);
     long FindItem( const wxPoint& pt );

-    long HitTest( int x, int y, int &flags );
+    long HitTest( int x, int y, int &flags ) const;

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


@@ -757,6 +729,11 @@ public:
         return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
     }
 
         return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
     }
 

+    bool HasFocus() const
+    {
+        return m_hasFocus;
+    }
+

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


@@ -780,8 +757,8 @@ public:
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;

-    wxImageListType         *m_small_image_list;
-    wxImageListType         *m_normal_image_list;
+    wxImageList         *m_small_image_list;
+    wxImageList         *m_normal_image_list;

     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;
     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;


@@ -867,9 +844,6 @@ private:
     wxBrush *m_highlightBrush,
             *m_highlightUnfocusedBrush;
 
     wxBrush *m_highlightBrush,
             *m_highlightUnfocusedBrush;
 

-    // if this is > 0, the control is frozen and doesn't redraw itself
-    size_t m_freezeCount;
-

     // wrapper around the text control currently used for in place editing or
     // NULL if no item is being edited
     wxListTextCtrlWrapper *m_textctrlWrapper;
     // wrapper around the text control currently used for in place editing or
     // NULL if no item is being edited
     wxListTextCtrlWrapper *m_textctrlWrapper;


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

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

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


@@ -960,7 +934,7 @@ bool wxListItemData::IsHit( int x, int y ) const
 {
     wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") );
 
 {
     wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") );
 

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

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


@@ -1029,6 +1003,7 @@ void wxListHeaderData::Init()
     m_xpos = 0;
     m_ypos = 0;
     m_height = 0;
     m_xpos = 0;
     m_ypos = 0;
     m_height = 0;

+    m_state = 0;

 }
 
 wxListHeaderData::wxListHeaderData()
 }
 
 wxListHeaderData::wxListHeaderData()


@@ -1058,6 +1033,9 @@ void wxListHeaderData::SetItem( const wxListItem &item )
 
     if ( m_mask & wxLIST_MASK_WIDTH )
         SetWidth(item.m_width);
 
     if ( m_mask & wxLIST_MASK_WIDTH )
         SetWidth(item.m_width);

+
+    if ( m_mask & wxLIST_MASK_STATE )
+        SetState(item.m_state);

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


@@ -1076,6 +1054,11 @@ void wxListHeaderData::SetWidth( int w )
     m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
 }
 
     m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
 }
 

+void wxListHeaderData::SetState( int flag )
+{
+    m_state = flag;
+}
+

 void wxListHeaderData::SetFormat( int format )
 {
     m_format = format;
 void wxListHeaderData::SetFormat( int format )
 {
     m_format = format;


@@ -1098,6 +1081,7 @@ void wxListHeaderData::GetItem( wxListItem& item )
     item.m_image = m_image;
     item.m_format = m_format;
     item.m_width = m_width;
     item.m_image = m_image;
     item.m_format = m_format;
     item.m_width = m_width;

+    item.m_state = m_state;

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


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

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

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


@@ -1274,9 +1263,9 @@ void wxListLineData::SetPosition( int x, int y, int spacing )
             if ( item->HasText() )
             {
                 if (m_gi->m_rectAll.width > spacing)
             if ( item->HasText() )
             {
                 if (m_gi->m_rectAll.width > spacing)

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

                 else
                 else

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

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


@@ -1300,11 +1289,11 @@ void wxListLineData::SetPosition( int x, int y, int spacing )
             {
                 m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;
             {
                 m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;

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

             }
             else
             {
             }
             else
             {

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

             }
             break;
 
             }
             break;
 


@@ -1416,7 +1405,20 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )

+#ifdef __WXMAC__
+    {
+        if (m_owner->HasFocus()
+#if !defined(__WXUNIVERSAL__)
+                && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+        )
+            colText = *wxWHITE;
+        else
+            colText = *wxBLACK;
+    }
+#else

         colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
         colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

+#endif

     else if ( attr && attr->HasTextColour() )
         colText = attr->GetTextColour();
     else
     else if ( attr && attr->HasTextColour() )
         colText = attr->GetTextColour();
     else


@@ -1460,7 +1462,30 @@ void wxListLineData::Draw( wxDC *dc )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )

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

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

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

 
     // just for debugging to better see where the items are
 #if 0
 
     // just for debugging to better see where the items are
 #if 0


@@ -1500,10 +1525,34 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
     //       GetAttr() and move these lines into the loop below
     wxListItemAttr *attr = GetAttr();
     if ( SetAttributes(dc, attr, highlighted) )
     //       GetAttr() and move these lines into the loop below
     wxListItemAttr *attr = GetAttr();
     if ( SetAttributes(dc, attr, highlighted) )

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

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

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

 
     wxCoord x = rect.x + HEADER_OFFSET_X,
             yMid = rect.y + rect.height/2;
 
     wxCoord x = rect.x + HEADER_OFFSET_X,
             yMid = rect.y + rect.height/2;

+#ifdef __WXGTK__
+    // This probably needs to be done
+    // on all platforms as the icons
+    // otherwise nearly touch the border
+    x += 2;
+#endif

 
     size_t col = 0;
     for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
 
     size_t col = 0;
     for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();


@@ -1516,6 +1565,9 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
         int xOld = x;
         x += width;
 
         int xOld = x;
         x += width;
 

+        const int wText = width - 8;
+        wxDCClipper clipper(*dc, xOld, rect.y, wText, rect.height);
+

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


@@ -1529,17 +1581,22 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
         }
 
         if ( item->HasText() )
         }
 
         if ( item->HasText() )

-            DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width - 8);
+            DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, wText);

     }
 }
 
 void wxListLineData::DrawTextFormatted(wxDC *dc,
     }
 }
 
 void wxListLineData::DrawTextFormatted(wxDC *dc,

-                                       const wxString &text,
+                                       const wxString& textOrig,

                                        int col,
                                        int x,
                                        int yMid,
                                        int width)
 {
                                        int col,
                                        int x,
                                        int yMid,
                                        int width)
 {

+    // we don't support displaying multiple lines currently (and neither does
+    // wxMSW FWIW) so just merge all the lines
+    wxString text(textOrig);
+    text.Replace(_T("\n"), _T(" "));
+

     wxCoord w, h;
     dc->GetTextExtent(text, &w, &h);
 
     wxCoord w, h;
     dc->GetTextExtent(text, &w, &h);
 


@@ -1583,7 +1640,7 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
 
         // continue until we have enough space or only one character left
         wxCoord w_c, h_c;
 
         // continue until we have enough space or only one character left
         wxCoord w_c, h_c;

-        size_t len = text.Length();
+        size_t len = text.length();

         wxString drawntext = text.Left(len);
         while (len > 1)
         {
         wxString drawntext = text.Left(len);
         while (len > 1)
         {


@@ -1596,9 +1653,9 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
         }
 
         // if still not enough space, remove ellipsis characters
         }
 
         // if still not enough space, remove ellipsis characters

-        while (ellipsis.Length() > 0 && w + base_w > width)
+        while (ellipsis.length() > 0 && w + base_w > width)

         {
         {

-            ellipsis = ellipsis.Left(ellipsis.Length() - 1);
+            ellipsis = ellipsis.Left(ellipsis.length() - 1);

             dc->GetTextExtent(ellipsis, &base_w, &h);
         }
 
             dc->GetTextExtent(ellipsis, &base_w, &h);
         }
 


@@ -1697,11 +1754,26 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 

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

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

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

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


@@ -1729,14 +1801,21 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         m_owner->GetColumn( i, item );
         int wCol = item.m_width;
 
         m_owner->GetColumn( i, item );
         int wCol = item.m_width;
 

-        // the width of the rect to draw: make it smaller to fit entirely
-        // inside the column rect
-#ifdef __WXMAC__

         int cw = wCol;
         int ch = h;
         int cw = wCol;
         int ch = h;

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

 #endif
 
         wxRendererNative::Get().DrawHeaderButton
 #endif
 
         wxRendererNative::Get().DrawHeaderButton


@@ -1744,8 +1823,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                                     this,
                                     dc,
                                     wxRect(x, HEADER_OFFSET_Y, cw, ch),
                                     this,
                                     dc,
                                     wxRect(x, HEADER_OFFSET_Y, cw, ch),

-                                    m_parent->IsEnabled() ? 0
-                                                          : (int)wxCONTROL_DISABLED
+                                    flags

                                 );
 
         // see if we have enough space for the column label
                                 );
 
         // see if we have enough space for the column label


@@ -1757,17 +1835,16 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wLabel += 2 * EXTRA_WIDTH;
 
         // and the width of the icon, if any
         wLabel += 2 * EXTRA_WIDTH;
 
         // and the width of the icon, if any

-        static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;

         int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
         const int image = item.m_image;
         int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
         const int image = item.m_image;

-        wxImageListType *imageList;
+        wxImageList *imageList;

         if ( image != -1 )
         {
             imageList = m_owner->m_small_image_list;
             if ( imageList )
             {
                 imageList->GetSize(image, ix, iy);
         if ( image != -1 )
         {
             imageList = m_owner->m_small_image_list;
             if ( imageList )
             {
                 imageList->GetSize(image, ix, iy);

-                wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON;
+                wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;

             }
         }
         else
             }
         }
         else


@@ -1796,6 +1873,10 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 break;
         }
 
                 break;
         }
 

+        // draw the text and image clipping them so that they
+        // don't overwrite the column boundary
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+

         // if we have an image, draw it on the right of the label
         if ( imageList )
         {
         // if we have an image, draw it on the right of the label
         if ( imageList )
         {


@@ -1803,18 +1884,12 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                        (
                         image,
                         dc,
                        (
                         image,
                         dc,

-                        xAligned + wLabel - ix - MARGIN_BETWEEN_TEXT_AND_ICON,
+                        xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,

                         HEADER_OFFSET_Y + (h - 4 - iy)/2,
                         wxIMAGELIST_DRAW_TRANSPARENT
                        );
                         HEADER_OFFSET_Y + (h - 4 - iy)/2,
                         wxIMAGELIST_DRAW_TRANSPARENT
                        );

-
-            cw -= ix + MARGIN_BETWEEN_TEXT_AND_ICON;

         }
 
         }
 

-        // draw the text clipping it so that it doesn't overwrite the column
-        // boundary
-        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
-

         dc.DrawText( item.GetText(),
                      xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
 
         dc.DrawText( item.GetText(),
                      xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
 


@@ -1824,6 +1899,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
 void wxListHeaderWindow::DrawCurrent()
 {
 
 void wxListHeaderWindow::DrawCurrent()
 {

+#if 1
+    m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
+#else

     int x1 = m_currentX;
     int y1 = 0;
     m_owner->ClientToScreen( &x1, &y1 );
     int x1 = m_currentX;
     int y1 = 0;
     m_owner->ClientToScreen( &x1, &y1 );


@@ -1846,6 +1924,7 @@ void wxListHeaderWindow::DrawCurrent()
 
     dc.SetPen( wxNullPen );
     dc.SetBrush( wxNullBrush );
 
     dc.SetPen( wxNullPen );
     dc.SetBrush( wxNullBrush );

+#endif

 }
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 }
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )


@@ -1941,6 +2020,22 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             }
             else // click on a column
             {
             }
             else // click on a column
             {

+                // record the selected state of the columns
+                if (event.LeftDown())
+                {
+                    for (int i=0; i < m_owner->GetColumnCount(); i++)
+                    {
+                        wxListItem colItem;
+                        m_owner->GetColumn(i, colItem);
+                        long state = colItem.GetState();
+                        if (i == m_column)
+                            colItem.SetState(state | wxLIST_STATE_SELECTED);
+                        else
+                            colItem.SetState(state & ~wxLIST_STATE_SELECTED);
+                        m_owner->SetColumn(i, colItem);
+                    }
+                }
+

                 SendListEvent( event.LeftDown()
                                     ? wxEVT_COMMAND_LIST_COL_CLICK
                                     : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
                 SendListEvent( event.LeftDown()
                                     ? wxEVT_COMMAND_LIST_COL_CLICK
                                     : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,


@@ -2022,7 +2117,6 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
 {
     m_owner = owner;
     m_text = text;
 {
     m_owner = owner;
     m_text = text;

-    m_finished = false;

     m_aboutToFinish = false;
 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
     m_aboutToFinish = false;
 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);


@@ -2033,62 +2127,71 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
     m_text->Create(owner, wxID_ANY, m_startValue,
                    wxPoint(rectLabel.x-4,rectLabel.y-4),
                    wxSize(rectLabel.width+11,rectLabel.height+8));
     m_text->Create(owner, wxID_ANY, m_startValue,
                    wxPoint(rectLabel.x-4,rectLabel.y-4),
                    wxSize(rectLabel.width+11,rectLabel.height+8));

+    m_text->SetFocus();
+

     m_text->PushEventHandler(this);
 }
 
     m_text->PushEventHandler(this);
 }
 

-void wxListTextCtrlWrapper::Finish()
+void wxListTextCtrlWrapper::EndEdit(bool discardChanges)

 {
 {

-    if ( !m_finished )
+    m_aboutToFinish = true;
+    
+    if ( discardChanges )

     {
     {

-        m_finished = true;
-
-        m_text->RemoveEventHandler(this);
-        m_owner->FinishEditing(m_text);
+        m_owner->OnRenameCancelled(m_itemEdited);
+           
+        Finish( true );
+    }
+    else
+    {
+        // Notify the owner about the changes
+        AcceptChanges();

 
 

-        delete this;
+        // Even if vetoed, close the control (consistent with MSW)
+        Finish( true );

     }
 }
 
     }
 }
 

+void wxListTextCtrlWrapper::Finish( bool setfocus )
+{
+    m_text->RemoveEventHandler(this);
+    m_owner->ResetTextControl( m_text );
+
+    wxPendingDelete.Append( this );
+    
+    if (setfocus)
+        m_owner->SetFocusIgnoringChildren();
+}
+

 bool wxListTextCtrlWrapper::AcceptChanges()
 {
     const wxString value = m_text->GetValue();
 
 bool wxListTextCtrlWrapper::AcceptChanges()
 {
     const wxString value = m_text->GetValue();
 

-    if ( value == m_startValue )
-        // nothing changed, always accept
-        return true;
-
+    // notice that we should always call OnRenameAccept() to generate the "end
+    // label editing" event, even if the user hasn't really changed anything

     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )

+    {

         // vetoed by the user
         return false;
         // vetoed by the user
         return false;

+    }

 
 

-    // accepted, do rename the item
-    m_owner->SetItemText(m_itemEdited, value);
+    // accepted, do rename the item (unless nothing changed)
+    if ( value != m_startValue )
+        m_owner->SetItemText(m_itemEdited, value);

 
     return true;
 }
 
 
     return true;
 }
 

-void wxListTextCtrlWrapper::AcceptChangesAndFinish()
-{
-    m_aboutToFinish = true;
-
-    // Notify the owner about the changes
-    AcceptChanges();
-
-    // Even if vetoed, close the control (consistent with MSW)
-    Finish();
-}
-

 void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
 void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            AcceptChangesAndFinish();
+            EndEdit( false );

             break;
 
         case WXK_ESCAPE:
             break;
 
         case WXK_ESCAPE:

-            Finish();
-            m_owner->OnRenameCancelled( m_itemEdited );
+            EndEdit( true );

             break;
 
         default:
             break;
 
         default:


@@ -2098,41 +2201,35 @@ void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )
 
 void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )
 {
 
 void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )
 {

-    if (m_finished)
-    {
-        event.Skip();
-        return;
-    }
-
-    // auto-grow the textctrl:
-    wxSize parentSize = m_owner->GetSize();
-    wxPoint myPos = m_text->GetPosition();
-    wxSize mySize = m_text->GetSize();
-    int sx, sy;
-    m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
-    if (myPos.x + sx > parentSize.x)
-        sx = parentSize.x - myPos.x;
-    if (mySize.x > sx)
-        sx = mySize.x;
-    m_text->SetSize(sx, wxDefaultCoord);
-
+    if (m_aboutToFinish)
+    {
+        // auto-grow the textctrl:
+        wxSize parentSize = m_owner->GetSize();
+        wxPoint myPos = m_text->GetPosition();
+        wxSize mySize = m_text->GetSize();
+        int sx, sy;
+        m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
+        if (myPos.x + sx > parentSize.x)
+            sx = parentSize.x - myPos.x;
+       if (mySize.x > sx)
+            sx = mySize.x;
+       m_text->SetSize(sx, wxDefaultCoord);
+    }
+    

     event.Skip();
 }
 
 void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
 {
     event.Skip();
 }
 
 void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
 {

-    if ( !m_finished && !m_aboutToFinish )
+    if ( !m_aboutToFinish )

     {
     {

-        // We must finish regardless of success, otherwise we'll get
-        // focus problems:
-        Finish();
-

         if ( !AcceptChanges() )
             m_owner->OnRenameCancelled( m_itemEdited );
         if ( !AcceptChanges() )
             m_owner->OnRenameCancelled( m_itemEdited );

+
+        Finish( false );

     }
 
     }
 

-    // We must let the native text control handle focus, too, otherwise
-    // it could have problems with the cursor (e.g., in wxGTK).
+    // We must let the native text control handle focus

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


@@ -2147,6 +2244,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)

+  EVT_KEY_UP         (wxListMainWindow::OnKeyUp)

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


@@ -2163,8 +2261,8 @@ void wxListMainWindow::Init()
     m_headerWidth =
     m_lineHeight = 0;
 
     m_headerWidth =
     m_lineHeight = 0;
 

-    m_small_image_list = (wxImageListType *) NULL;
-    m_normal_image_list = (wxImageListType *) NULL;
+    m_small_image_list = (wxImageList *) NULL;
+    m_normal_image_list = (wxImageList *) NULL;

 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;


@@ -2181,8 +2279,6 @@ void wxListMainWindow::Init()
     m_lineLastClicked =
     m_lineSelectSingleOnUp =
     m_lineBeforeLastClicked = (size_t)-1;
     m_lineLastClicked =
     m_lineSelectSingleOnUp =
     m_lineBeforeLastClicked = (size_t)-1;

-
-    m_freezeCount = 0;

 }
 
 wxListMainWindow::wxListMainWindow()
 }
 
 wxListMainWindow::wxListMainWindow()


@@ -2205,22 +2301,22 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
     Init();
 
     m_highlightBrush = new wxBrush
     Init();
 
     m_highlightBrush = new wxBrush

-                           (
+                         (

                             wxSystemSettings::GetColour
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
                             wxSOLID
                             wxSystemSettings::GetColour
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
                             wxSOLID

-                           );
+                         );

 
     m_highlightUnfocusedBrush = new wxBrush
 
     m_highlightUnfocusedBrush = new wxBrush

-                                    (
-                                       wxSystemSettings::GetColour
-                                       (
-                                           wxSYS_COLOUR_BTNSHADOW
-                                       ),
-                                       wxSOLID
-                                    );
+                              (
+                                 wxSystemSettings::GetColour
+                                 (
+                                     wxSYS_COLOUR_BTNSHADOW
+                                 ),
+                                 wxSOLID
+                              );

 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 
 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 


@@ -2344,10 +2440,24 @@ wxRect wxListMainWindow::GetLineLabelRect(size_t line) const
     if ( !InReportView() )
         return GetLine(line)->m_gi->m_rectLabel;
 
     if ( !InReportView() )
         return GetLine(line)->m_gi->m_rectLabel;
 

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

     wxRect rect;
     wxRect rect;

-    rect.x = HEADER_OFFSET_X;
+    rect.x = image_x + HEADER_OFFSET_X;

     rect.y = GetLineY(line);
     rect.y = GetLineY(line);

-    rect.width = GetColumnWidth(0);
+    rect.width = GetColumnWidth(0) - image_x;

     rect.height = GetLineHeight();
 
     return rect;
     rect.height = GetLineHeight();
 
     return rect;


@@ -2381,7 +2491,7 @@ long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
 
     wxListLineData *ld = GetLine(line);
 
 
     wxListLineData *ld = GetLine(line);
 

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

         return wxLIST_HITTEST_ONITEMICON;
 
     // VS: Testing for "ld->HasText() || InReportView()" instead of
         return wxLIST_HITTEST_ONITEMICON;
 
     // VS: Testing for "ld->HasText() || InReportView()" instead of


@@ -2392,7 +2502,7 @@ long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);
 
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);
 

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

             return wxLIST_HITTEST_ONITEMLABEL;
     }
 
             return wxLIST_HITTEST_ONITEMLABEL;
     }
 


@@ -2587,32 +2697,23 @@ void wxListMainWindow::RefreshSelected()
     }
 }
 
     }
 }
 

-void wxListMainWindow::Freeze()
-{
-    m_freezeCount++;
-}
-
-void wxListMainWindow::Thaw()
-{
-    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );
-
-    if ( --m_freezeCount == 0 )
-        Refresh();
-}
-

 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     // Note: a wxPaintDC must be constructed even if no drawing is
     // done (a Windows requirement).
     wxPaintDC dc( this );
 
 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     // Note: a wxPaintDC must be constructed even if no drawing is
     // done (a Windows requirement).
     wxPaintDC dc( this );
 

-    if ( IsEmpty() || m_freezeCount )
+    if ( IsEmpty() )
+    {

         // nothing to draw or not the moment to draw it
         return;
         // nothing to draw or not the moment to draw it
         return;

+    }

 
     if ( m_dirty )
 
     if ( m_dirty )

+    {

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

+    }

 
     PrepareDC( dc );
 
 
     PrepareDC( dc );
 


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

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

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


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

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

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


@@ -2665,8 +2767,9 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 

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

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


@@ -2700,8 +2803,10 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;

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

             }
         }
     }
             }
         }
     }


@@ -2720,9 +2825,15 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         if ( m_hasFocus )
         {
     {
         if ( m_hasFocus )
         {

+            wxRect rect( GetLineHighlightRect( m_current ) );
+#ifndef __WXGTK20__

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

-            dc.DrawRectangle( GetLineHighlightRect( m_current ) );
+            dc.DrawRectangle( rect );
+#else
+            wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, wxCONTROL_CURRENT|wxCONTROL_FOCUSED );
+
+#endif

         }
     }
 #endif
         }
     }
 #endif


@@ -2741,9 +2852,10 @@ void wxListMainWindow::HighlightAll( bool on )
             RefreshLine(m_current);
         }
     }
             RefreshLine(m_current);
         }
     }

-    else // multi sel
+    else // multi selection

     {
     {

-        HighlightLines(0, GetItemCount() - 1, on);
+        if ( !IsEmpty() )
+            HighlightLines(0, GetItemCount() - 1, on);

     }
 }
 
     }
 }
 


@@ -2753,6 +2865,7 @@ void wxListMainWindow::SendNotify( size_t line,
 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );

+

     le.m_itemIndex = line;
 
     // set only for events which have position
     le.m_itemIndex = line;
 
     // set only for events which have position


@@ -2763,7 +2876,7 @@ void wxListMainWindow::SendNotify( size_t line,
     // program has it anyhow and if we did it would result in accessing all
     // the lines, even those which are not visible now and this is precisely
     // what we're trying to avoid
     // program has it anyhow and if we did it would result in accessing all
     // the lines, even those which are not visible now and this is precisely
     // what we're trying to avoid

-    if ( !IsVirtual() && (command != wxEVT_COMMAND_LIST_DELETE_ITEM) )
+    if ( !IsVirtual() )

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


@@ -2780,6 +2893,11 @@ void wxListMainWindow::ChangeCurrent(size_t current)
 {
     m_current = current;
 
 {
     m_current = current;
 

+    // as the current item changed, we shouldn't start editing it when the
+    // "slow click" timer expires as the click happened on another item
+    if ( m_renameTimer->IsRunning() )
+        m_renameTimer->Stop();
+

     SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);
 }
 
     SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);
 }
 


@@ -2809,8 +2927,15 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass
     // We have to call this here because the label in question might just have
     // been added and no screen update taken place.
     if ( m_dirty )
     // We have to call this here because the label in question might just have
     // been added and no screen update taken place.
     if ( m_dirty )

+    {

         wxSafeYield();
 
         wxSafeYield();
 

+        // Pending events dispatched by wxSafeYield might have changed the item
+        // count
+        if ( (size_t)item >= GetItemCount() )
+            return NULL;
+    }
+

     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
     m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
     return m_textctrlWrapper->GetText();
     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
     m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
     return m_textctrlWrapper->GetText();


@@ -2858,15 +2983,19 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {

+

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

-        m_textctrlWrapper->AcceptChangesAndFinish();
+        m_textctrlWrapper->EndEdit( false );

 #endif // __WXMAC__
 
 #endif // __WXMAC__
 

+    if ( event.LeftDown() )
+        SetFocusIgnoringChildren();
+

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


@@ -2879,7 +3008,20 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     }
 
     if ( !HasCurrent() || IsEmpty() )
     }
 
     if ( !HasCurrent() || IsEmpty() )

+    {
+        if (event.RightDown())
+        {
+            SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+
+            wxContextMenuEvent evtCtx(
+                wxEVT_CONTEXT_MENU,
+                GetParent()->GetId(),
+                ClientToScreen(event.GetPosition()));
+            evtCtx.SetEventObject(GetParent());
+            GetParent()->GetEventHandler()->ProcessEvent(evtCtx);
+        }

         return;
         return;

+    }

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


@@ -2949,15 +3091,33 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     if ( !hitResult )
     {
 
     if ( !hitResult )
     {

-        // outside of any item, reset the selection and bail out
-        HighlightAll(false);
+        // outside of any item
+        if (event.RightDown())
+        {
+            SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+
+            wxContextMenuEvent evtCtx(
+                wxEVT_CONTEXT_MENU,
+                GetParent()->GetId(),
+                ClientToScreen(event.GetPosition()));
+            evtCtx.SetEventObject(GetParent());
+            GetParent()->GetEventHandler()->ProcessEvent(evtCtx);
+        }
+        else
+        {
+            // reset the selection and bail out
+            HighlightAll(false);
+        }
+

         return;
     }
 
     bool forceClick = false;
     if (event.ButtonDClick())
     {
         return;
     }
 
     bool forceClick = false;
     if (event.ButtonDClick())
     {

-        m_renameTimer->Stop();
+        if ( m_renameTimer->IsRunning() )
+            m_renameTimer->Stop();
+

         m_lastOnSame = false;
 
         if ( current == m_lineLastClicked )
         m_lastOnSame = false;
 
         if ( current == m_lineLastClicked )


@@ -2989,7 +3149,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                 (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
                 HasFlag(wxLC_EDIT_LABELS) )
             {
                 (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
                 HasFlag(wxLC_EDIT_LABELS) )
             {

-                m_renameTimer->Start( 100, true );
+                if ( !InReportView() ||
+                        GetLineLabelRect(current).Contains(x, y) )
+                {
+                    int dclick = wxSystemSettings::GetMetric(wxSYS_DCLICK_MSEC);
+                    m_renameTimer->Start(dclick > 0 ? dclick : 250, true);
+                }

             }
         }
 
             }
         }
 


@@ -3115,16 +3280,65 @@ void wxListMainWindow::MoveToItem(size_t item)
             Scroll( -1, rect.y / hLine );
         if (rect.y + rect.height + 5 > view_y + client_h)
             Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );
             Scroll( -1, rect.y / hLine );
         if (rect.y + rect.height + 5 > view_y + client_h)
             Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );

+
+#ifdef __WXMAC__
+        // At least on Mac the visible lines value will get reset inside of
+        // Scroll *before* it actually scrolls the window because of the
+        // Update() that happens there, so it will still have the wrong value.
+        // So let's reset it again and wait for it to be recalculated in the
+        // next paint event.  I would expect this problem to show up in wxGTK
+        // too but couldn't duplicate it there.  Perhaps the order of events
+        // is different...  --Robin
+        ResetVisibleLinesRange();
+#endif

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

+        int sx = -1,
+            sy = -1;
+

         if (rect.x-view_x < 5)
         if (rect.x-view_x < 5)

-            Scroll( (rect.x - 5) / SCROLL_UNIT_X, -1 );
+            sx = (rect.x - 5) / SCROLL_UNIT_X;

         if (rect.x + rect.width - 5 > view_x + client_w)
         if (rect.x + rect.width - 5 > view_x + client_w)

-            Scroll( (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X, -1 );
+            sx = (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X;
+
+        if (rect.y-view_y < 5)
+            sy = (rect.y - 5) / hLine;
+        if (rect.y + rect.height - 5 > view_y + client_h)
+            sy = (rect.y + rect.height - client_h + hLine) / hLine;
+
+        Scroll(sx, sy);

     }
 }
 
     }
 }
 

+bool wxListMainWindow::ScrollList(int WXUNUSED(dx), int dy)
+{
+    if ( !InReportView() )
+    {
+        // TODO: this should work in all views but is not implemented now
+        return false;
+    }
+
+    size_t top, bottom;
+    GetVisibleLinesRange(&top, &bottom);
+
+    if ( bottom == (size_t)-1 )
+        return 0;
+
+    ResetVisibleLinesRange();
+
+    int hLine = GetLineHeight();
+
+    Scroll(-1, top + dy / hLine);
+
+#ifdef __WXMAC__
+    // see comment in MoveToItem() for why we do this
+    ResetVisibleLinesRange();
+#endif
+
+    return true;
+}
+

 // ----------------------------------------------------------------------------
 // keyboard handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // keyboard handling
 // ----------------------------------------------------------------------------


@@ -3157,7 +3371,8 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     else // !shift
     {
         // all previously selected items are unselected unless ctrl is held
     else // !shift
     {
         // all previously selected items are unselected unless ctrl is held

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

             HighlightAll(false);
 
         ChangeCurrent(newCurrent);
             HighlightAll(false);
 
         ChangeCurrent(newCurrent);


@@ -3165,10 +3380,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
         // refresh the old focus to remove it
         RefreshLine( oldCurrent );
 
         // refresh the old focus to remove it
         RefreshLine( oldCurrent );
 

-        if ( !event.ControlDown() )
-        {
+        // in single selection mode we must always have a selected item
+        if ( !event.ControlDown() || IsSingleSel() )

             HighlightLine( m_current, true );
             HighlightLine( m_current, true );

-        }

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


@@ -3195,6 +3409,25 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

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

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


@@ -3222,16 +3455,8 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 

-    if (event.GetKeyCode() == WXK_TAB)
-    {
-        wxNavigationKeyEvent nevent;
-        nevent.SetWindowChange( event.ControlDown() );
-        nevent.SetDirection( !event.ShiftDown() );
-        nevent.SetEventObject( GetParent()->GetParent() );
-        nevent.SetCurrentFocus( m_parent );
-        if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent ))
-            return;
-    }
+    if ( HandleAsNavigationKey(event) )
+        return;

 
     // no item -> nothing to do
     if (!HasCurrent())
 
     // no item -> nothing to do
     if (!HasCurrent())


@@ -3240,7 +3465,19 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         return;
     }
 
         return;
     }
 

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

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


@@ -3262,9 +3499,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
                 OnArrowChar( 0, event );
             break;
 
                 OnArrowChar( 0, event );
             break;
 

-        case WXK_PRIOR:
+        case WXK_PAGEUP:

             {
             {

-                int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;
+                int steps = InReportView() ? pageSize - 1
+                                           : m_current % pageSize;

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


@@ -3274,11 +3512,11 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             }
             break;
 
             }
             break;
 

-        case WXK_NEXT:
+        case WXK_PAGEDOWN:

             {
                 int steps = InReportView()
             {
                 int steps = InReportView()

-                               ? m_linesPerPage - 1
-                               : m_linesPerPage - (m_current % m_linesPerPage) - 1;
+                                ? pageSize - 1
+                                : pageSize - (m_current % pageSize) - 1;

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


@@ -3292,7 +3530,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_LEFT:
             if ( !InReportView() )
             {
         case WXK_LEFT:
             if ( !InReportView() )
             {

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

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


@@ -3303,7 +3541,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_RIGHT:
             if ( !InReportView() )
             {
         case WXK_RIGHT:
             if ( !InReportView() )
             {

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

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


@@ -3316,17 +3554,19 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_SPACE:
             if ( IsSingleSel() )
             {
         case WXK_SPACE:
             if ( IsSingleSel() )
             {

-                SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
-
-                if ( IsHighlighted(m_current) )
+                if ( event.ControlDown() )
+                {
+                    ReverseHighlight(m_current);
+                }
+                else // normal space press

                 {
                 {

-                    // don't unselect the item in single selection mode
-                    break;
+                    SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );

                 }
                 }

-                //else: select it in ReverseHighlight() below if unselected

             }
             }

-
-            ReverseHighlight(m_current);
+            else // multiple selection
+            {
+                ReverseHighlight(m_current);
+            }

             break;
 
         case WXK_RETURN:
             break;
 
         case WXK_RETURN:


@@ -3435,7 +3675,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
     return lw + AUTOSIZE_COL_MARGIN;
 }
 
     return lw + AUTOSIZE_COL_MARGIN;
 }
 

-void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
+void wxListMainWindow::SetImageList( wxImageList *imageList, int which )

 {
     m_dirty = true;
 
 {
     m_dirty = true;
 


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

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

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


@@ -3934,6 +4187,8 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const
 
 void wxListMainWindow::RecalculatePositions(bool noRefresh)
 {
 
 void wxListMainWindow::RecalculatePositions(bool noRefresh)
 {

+    const int lineHeight = GetLineHeight();
+

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


@@ -3967,8 +4222,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 

-    const int lineHeight = GetLineHeight();
-

     if ( InReportView() )
     {
         // all lines have the same height and we scroll one line per step
     if ( InReportView() )
     {
         // all lines have the same height and we scroll one line per step


@@ -4213,8 +4466,8 @@ void wxListMainWindow::DeleteItem( long lindex )
 
     if ( InReportView() )
     {
 
     if ( InReportView() )
     {

-    //  mark the Column Max Width cache as dirty if the items in the line
-    //  we're deleting contain the Max Column Width
+        //  mark the Column Max Width cache as dirty if the items in the line
+        //  we're deleting contain the Max Column Width

         wxListLineData * const line = GetLine(index);
         wxListItemDataList::compatibility_iterator n;
         wxListItemData *itemData;
         wxListLineData * const line = GetLine(index);
         wxListItemDataList::compatibility_iterator n;
         wxListItemData *itemData;


@@ -4236,6 +4489,8 @@ void wxListMainWindow::DeleteItem( long lindex )
         ResetVisibleLinesRange();
     }
 
         ResetVisibleLinesRange();
     }
 

+    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition );
+

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


@@ -4249,8 +4504,6 @@ void wxListMainWindow::DeleteItem( long lindex )
     // we need to refresh the (vert) scrollbar as the number of items changed
     m_dirty = true;
 
     // we need to refresh the (vert) scrollbar as the number of items changed
     m_dirty = true;
 

-    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
-

     RefreshAfter(index);
 }
 
     RefreshAfter(index);
 }
 


@@ -4353,10 +4606,13 @@ void wxListMainWindow::EnsureVisible( long index )
     MoveToItem((size_t)index);
 }
 
     MoveToItem((size_t)index);
 }
 

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

 {
 {

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

     long pos = start;
     long pos = start;

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

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


@@ -4364,8 +4620,17 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p
     for ( size_t i = (size_t)pos; i < count; i++ )
     {
         wxListLineData *line = GetLine(i);
     for ( size_t i = (size_t)pos; i < count; i++ )
     {
         wxListLineData *line = GetLine(i);

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

     }
 
     return wxNOT_FOUND;
     }
 
     return wxNOT_FOUND;


@@ -4407,7 +4672,7 @@ long wxListMainWindow::FindItem( const wxPoint& pt )
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-long wxListMainWindow::HitTest( int x, int y, int &flags )
+long wxListMainWindow::HitTest( int x, int y, int &flags ) const

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


@@ -4576,6 +4841,11 @@ int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData
 
 void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 {
 
 void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 {

+    // selections won't make sense any more after sorting the items so reset
+    // them
+    HighlightAll(false);
+    ResetCurrent();
+

     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );
     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );


@@ -4588,10 +4858,6 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

-    // update our idea of which lines are shown when we redraw the window the
-    // next time
-    ResetVisibleLinesRange();
-

     // FIXME
 #if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
     wxScrolledWindow::OnScroll(event);
     // FIXME
 #if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
     wxScrolledWindow::OnScroll(event);


@@ -4599,6 +4865,10 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
     HandleOnScroll( event );
 #endif
 
     HandleOnScroll( event );
 #endif
 

+    // update our idea of which lines are shown when we redraw the window the
+    // next time
+    ResetVisibleLinesRange();
+

     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
         wxGenericListCtrl* lc = GetListCtrl();
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
         wxGenericListCtrl* lc = GetListCtrl();


@@ -4670,9 +4940,9 @@ END_EVENT_TABLE()
 
 wxGenericListCtrl::wxGenericListCtrl()
 {
 
 wxGenericListCtrl::wxGenericListCtrl()
 {

-    m_imageListNormal = (wxImageListType *) NULL;
-    m_imageListSmall = (wxImageListType *) NULL;
-    m_imageListState = (wxImageListType *) NULL;
+    m_imageListNormal = (wxImageList *) NULL;
+    m_imageListSmall = (wxImageList *) NULL;
+    m_imageListState = (wxImageList *) NULL;

 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =


@@ -4742,7 +5012,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 {
     m_imageListNormal =
     m_imageListSmall =
 {
     m_imageListNormal =
     m_imageListSmall =

-    m_imageListState = (wxImageListType *) NULL;
+    m_imageListState = (wxImageList *) NULL;

     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;


@@ -4760,17 +5030,20 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 

+    // this window itself shouldn't get the focus, only m_mainWin should
+    SetCanFocus(false);
+

     // don't create the inner window with the border
     style &= ~wxBORDER_MASK;
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 
     // don't create the inner window with the border
     style &= ~wxBORDER_MASK;
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 

-#ifdef  __WXMAC_CARBON__
+#ifdef __WXMAC__

     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
         wxFont font;
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
         wxFont font;

-        font.MacCreateThemeFont( kThemeViewsFont );
+        font.MacCreateFromThemeFont( kThemeViewsFont );

         SetFont( font );
     }
 #endif
         SetFont( font );
     }
 #endif


@@ -4779,11 +5052,11 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     {
         CreateHeaderWindow();
 
     {
         CreateHeaderWindow();
 

-#ifdef  __WXMAC_CARBON__
+#ifdef __WXMAC__

         if (m_headerWin)
         {
             wxFont font;
         if (m_headerWin)
         {
             wxFont font;

-            font.MacCreateThemeFont( kThemeSmallSystemFont );
+            font.MacCreateFromThemeFont( kThemeSmallSystemFont );

             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }
             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }


@@ -4794,7 +5067,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
             m_headerWin->Show( false );
     }
 
             m_headerWin->Show( false );
     }
 

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -4935,11 +5208,18 @@ bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
 
 bool
 wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
 
 bool
 wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )

+{
+    return SetItemColumnImage(item, 0, image);
+}
+
+bool
+wxGenericListCtrl::SetItemColumnImage( long item, long column, int image )

 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;

+    info.m_col = column;

     m_mainWin->SetItem( info );
     return true;
 }
     m_mainWin->SetItem( info );
     return true;
 }


@@ -4963,7 +5243,7 @@ wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const
     return info.m_data;
 }
 
     return info.m_data;
 }
 

-bool wxGenericListCtrl::SetItemData( long item, long data )
+bool wxGenericListCtrl::SetItemPtrData( long item, wxUIntPtr data )

 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;


@@ -5019,10 +5299,12 @@ wxSize wxGenericListCtrl::GetItemSpacing() const
     return wxSize(spacing, spacing);
 }
 
     return wxSize(spacing, spacing);
 }
 

+#if WXWIN_COMPATIBILITY_2_6

 int wxGenericListCtrl::GetItemSpacing( bool isSmall ) const
 {
     return m_mainWin->GetItemSpacing( isSmall );
 }
 int wxGenericListCtrl::GetItemSpacing( bool isSmall ) const
 {
     return m_mainWin->GetItemSpacing( isSmall );
 }

+#endif // WXWIN_COMPATIBILITY_2_6

 
 void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col )
 {
 
 void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col )
 {


@@ -5056,6 +5338,16 @@ wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
     return info.GetBackgroundColour();
 }
 
     return info.GetBackgroundColour();
 }
 

+int wxGenericListCtrl::GetScrollPos( int orient ) const
+{
+    return m_mainWin->GetScrollPos( orient );
+}
+
+void wxGenericListCtrl::SetScrollPos( int orient, int pos, bool refresh )
+{
+    m_mainWin->SetScrollPos( orient, pos, refresh );
+}
+

 void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
 {
     wxListItem info;
 void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
 {
     wxListItem info;


@@ -5099,7 +5391,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const
     return m_mainWin->GetNextItem( item, geom, state );
 }
 
     return m_mainWin->GetNextItem( item, geom, state );
 }
 

-wxImageListType *wxGenericListCtrl::GetImageList(int which) const
+wxImageList *wxGenericListCtrl::GetImageList(int which) const

 {
     if (which == wxIMAGE_LIST_NORMAL)
         return m_imageListNormal;
 {
     if (which == wxIMAGE_LIST_NORMAL)
         return m_imageListNormal;


@@ -5108,10 +5400,10 @@ wxImageListType *wxGenericListCtrl::GetImageList(int which) const
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 

-    return (wxImageListType *) NULL;
+    return (wxImageList *) NULL;

 }
 
 }
 

-void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
+void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )

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


@@ -5138,7 +5430,7 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
     m_mainWin->SetImageList( imageList, which );
 }
 
     m_mainWin->SetImageList( imageList, which );
 }
 

-void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which)
+void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which)

 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )


@@ -5222,7 +5514,8 @@ long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& pt,
     return m_mainWin->FindItem( pt );
 }
 
     return m_mainWin->FindItem( pt );
 }
 

-long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )
+// TODO: sub item hit testing
+long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *) const

 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }
 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }


@@ -5294,9 +5587,9 @@ long wxGenericListCtrl::InsertColumn( long col, const wxString &heading,
     return InsertColumn( col, item );
 }
 
     return InsertColumn( col, item );
 }
 

-bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
+bool wxGenericListCtrl::ScrollList( int dx, int dy )

 {
 {

-    return 0;
+    return m_mainWin->ScrollList(dx, dy);

 }
 
 // Sort items.
 }
 
 // Sort items.


@@ -5337,10 +5630,10 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
     {
         m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
         if(ch > m_headerHeight)
     {
         m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
         if(ch > m_headerHeight)

-            m_mainWin->SetSize( 0, m_headerHeight + 1, 
+            m_mainWin->SetSize( 0, m_headerHeight + 1,

                                    cw, ch - m_headerHeight - 1 );
         else
                                    cw, ch - m_headerHeight - 1 );
         else

-            m_mainWin->SetSize( 0, m_headerHeight + 1, 
+            m_mainWin->SetSize( 0, m_headerHeight + 1,

                                    cw, 0);
     }
     else // no header window
                                    cw, 0);
     }
     else // no header window


@@ -5414,10 +5707,6 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     return true;
 }
 
     return true;
 }
 

-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-

 // static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 // static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)


@@ -5479,12 +5768,12 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 
 void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
 {
 
 void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
 {

-    return m_mainWin->DoClientToScreen(x, y);
+    m_mainWin->DoClientToScreen(x, y);

 }
 
 void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
 {
 }
 
 void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
 {

-    return m_mainWin->DoScreenToClient(x, y);
+    m_mainWin->DoScreenToClient(x, y);

 }
 
 void wxGenericListCtrl::SetFocus()
 }
 
 void wxGenericListCtrl::SetFocus()


@@ -5608,15 +5897,4 @@ void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
     }
 }
 
     }
 }
 

-void wxGenericListCtrl::Freeze()
-{
-    m_mainWin->Freeze();
-}
-
-void wxGenericListCtrl::Thaw()
-{
-    m_mainWin->Thaw();
-}
-

 #endif // wxUSE_LISTCTRL
 #endif // wxUSE_LISTCTRL

-