fixed STC under Win64: as wxStyledTextCtrl::SendMsg() used (32 bit) long arguments...

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1d9eda16d99584bba301a860b91b2151be9619c9..8c40c96c4831b094aebe2ed65bd45a3fbbb46bb3 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)


@@ -8,110 +8,57 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-   TODO
+// TODO
+//
+//   1. we need to implement searching/sorting for virtual controls somehow
+// 2. when changing selection the lines are refreshed twice

 
 

-   1. we need to implement searching/sorting for virtual controls somehow
-  ?2. when changing selection the lines are refreshed twice
- */
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listctrl.h"
-    #pragma implementation "listctrlbase.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #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__
 
 #ifdef __WXMAC__

-    #include "wx/mac/private.h"
+    #include "wx/osx/private.h"

 #endif
 
 
 #endif
 
 

-

 // NOTE: If using the wxListBox visual attributes works everywhere then this can
 // be removed, as well as the #else case below.
 #define _USE_VISATTR 0
 
 
 // NOTE: If using the wxListBox visual attributes works everywhere then this can
 // be removed, as well as the #else case below.
 #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
 // ----------------------------------------------------------------------------


@@ -125,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


@@ -133,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;


@@ -142,22 +93,43 @@ static const int MARGIN_BETWEEN_ROWS = 6;
 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 
 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 

-// default and minimal widths for the header columns
+// default width for the header columns

 static const int WIDTH_COL_DEFAULT = 80;
 static const int WIDTH_COL_DEFAULT = 80;

-static const int WIDTH_COL_MIN = 10;

 
 // 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
 // ============================================================================
 

+//-----------------------------------------------------------------------------
+//  wxColWidthInfo (internal)
+//-----------------------------------------------------------------------------
+
+struct wxColWidthInfo
+{
+    int     nMaxWidth;
+    bool    bNeedsUpdate;   //  only set to true when an item whose
+                            //  width == nMaxWidth is removed
+
+    wxColWidthInfo(int w = 0, bool needsUpdate = false)
+    {
+        nMaxWidth = w;
+        bNeedsUpdate = needsUpdate;
+    }
+};
+
+WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
+

 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListItemData
+class wxListItemData

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


@@ -206,9 +178,8 @@ public:
     // user data associated with the item
     wxUIntPtr m_data;
 
     // user data associated with the item
     wxUIntPtr m_data;
 

-    // the item coordinates are not used in report mode, instead this pointer
-    // is NULL and the owner window is used to retrieve the item position and
-    // size
+    // the item coordinates are not used in report mode; instead this pointer is
+    // NULL and the owner window is used to retrieve the item position and size

     wxRect *m_rect;
 
     // the list ctrl we are in
     wxRect *m_rect;
 
     // the list ctrl we are in


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

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

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


@@ -236,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;


@@ -250,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;


@@ -260,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();


@@ -271,7 +245,7 @@ private:
 
 WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListItemDataList);
+WX_DEFINE_LIST(wxListItemDataList)

 
 class wxListLineData
 {
 
 class wxListLineData
 {


@@ -294,18 +268,19 @@ public:
         // the part to be highlighted
         wxRect m_rectHighlight;
 
         // the part to be highlighted
         wxRect m_rectHighlight;
 

-        // extend all our rects to be centered inside theo ne of given width
+        // extend all our rects to be centered inside the one of given width

         void ExtendWidth(wxCoord w)
         {
             wxASSERT_MSG( m_rectAll.width <= w,
                             _T("width can only be increased") );
 
             m_rectAll.width = w;
         void ExtendWidth(wxCoord w)
         {
             wxASSERT_MSG( m_rectAll.width <= w,
                             _T("width can only be increased") );
 
             m_rectAll.width = w;

-            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width)/2;
-            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width)/2;
-            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width)/2;
+            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
+            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2;
+            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2;

         }
         }

-    } *m_gi;
+    }
+    *m_gi;

 
     // is this item selected? [NB: not used in virtual mode]
     bool m_highlighted;
 
     // is this item selected? [NB: not used in virtual mode]
     bool m_highlighted;


@@ -341,6 +316,9 @@ public:
 
     void SetImage( int image ) { SetImage(0, image); }
     int GetImage() const { return GetImage(0); }
 
     void SetImage( int image ) { SetImage(0, image); }
     int GetImage() const { return GetImage(0); }

+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
+

     bool HasImage() const { return GetImage() != -1; }
     bool HasText() const { return !GetText(0).empty(); }
 
     bool HasImage() const { return GetImage() != -1; }
     bool HasText() const { return !GetText(0).empty(); }
 


@@ -348,7 +326,7 @@ public:
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;

-    void SetText( int index, const wxString s );
+    void SetText( int index, const wxString& s );

 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);
 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);


@@ -389,27 +367,27 @@ private:
 
     // draw the text on the DC with the correct justification; also add an
     // ellipsis if the text is too large to fit in the current width
 
     // draw the text on the DC with the correct justification; also add an
     // ellipsis if the text is too large to fit in the current width

-    void DrawTextFormatted(wxDC *dc, const wxString &text, int col, int x, int y, int width);
-
-    // these are only used by GetImage/SetImage above, we don't support images
-    // with subitems at the public API level yet
-    void SetImage( int index, int image );
-    int GetImage( int index ) const;
+    void DrawTextFormatted(wxDC *dc,
+                           const wxString &text,
+                           int col,
+                           int x,
+                           int yMid,    // this is middle, not top, of the text
+                           int width);

 };
 
 };
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
+WX_DECLARE_OBJARRAY(wxListLineData, wxListLineDataArray);

 #include "wx/arrimpl.cpp"
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+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;
 


@@ -419,8 +397,8 @@ protected:
     // divider line position in logical (unscrolled) coords
     int m_currentX;
 
     // divider line position in logical (unscrolled) coords
     int m_currentX;
 

-    // minimal position beyond which the divider line can't be dragged in
-    // logical coords
+    // minimal position beyond which the divider line
+    // can't be dragged in logical coords

     int m_minX;
 
 public:
     int m_minX;
 
 public:


@@ -437,7 +415,7 @@ public:
     virtual ~wxListHeaderWindow();
 
     void DrawCurrent();
     virtual ~wxListHeaderWindow();
 
     void DrawCurrent();

-    void AdjustDC(wxDC& dc);
+    void AdjustDC( wxDC& dc );

 
     void OnPaint( wxPaintEvent &event );
     void OnMouse( wxMouseEvent &event );
 
     void OnPaint( wxPaintEvent &event );
     void OnMouse( wxMouseEvent &event );


@@ -452,9 +430,8 @@ private:
 
     // generate and process the list event of the given type, return true if
     // it wasn't vetoed, i.e. if we should proceed
 
     // generate and process the list event of the given type, return true if
     // it wasn't vetoed, i.e. if we should proceed

-    bool SendListEvent(wxEventType type, wxPoint pos);
+    bool SendListEvent(wxEventType type, const wxPoint& pos);

 
 

-    DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -462,7 +439,7 @@ private:
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 

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

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


@@ -473,13 +450,20 @@ public:
 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-//  wxListTextCtrl (internal)
+// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit);
+    // NB: text must be a valid object but not Create()d yet
+    wxListTextCtrlWrapper(wxListMainWindow *owner,
+                          wxTextCtrl *text,
+                          size_t itemEdit);
+
+    wxTextCtrl *GetText() const { return m_text; }
+
+    void EndEdit( bool discardChanges );

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


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

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

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

+    wxTextCtrl         *m_text;

     wxString            m_startValue;
     size_t              m_itemEdited;
     wxString            m_startValue;
     size_t              m_itemEdited;

-    bool                m_finished;
+    bool                m_aboutToFinish;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -504,9 +489,9 @@ private:
 
 WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListHeaderDataList);
+WX_DEFINE_LIST(wxListHeaderDataList)

 
 

-class wxListMainWindow : public wxScrolledWindow
+class wxListMainWindow : public wxScrolledCanvas

 {
 public:
     wxListMainWindow();
 {
 public:
     wxListMainWindow();


@@ -519,8 +504,6 @@ public:
 
     virtual ~wxListMainWindow();
 
 
     virtual ~wxListMainWindow();
 

-    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
-

     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 
     // return true if this is a virtual list control
     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 
     // return true if this is a virtual list control


@@ -595,15 +578,24 @@ 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); }
 
     // start editing the label of the given item
     // bring the current item into view
     void MoveToFocus() { MoveToItem(m_current); }
 
     // start editing the label of the given item

-    void EditLabel( long item );
+    wxTextCtrl *EditLabel(long item,
+                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+    wxTextCtrl *GetEditControl() const
+    {
+        return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
+    }

 
 

-    // suspend/resume redrawing the control
-    void Freeze();
-    void Thaw();
+    void ResetTextControl(wxTextCtrl *text)
+    {
+        delete text;
+        m_textctrlWrapper = NULL;
+    }

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


@@ -616,9 +608,10 @@ 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 OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );

-    void OnScroll(wxScrollWinEvent& event) ;
+    void OnScroll( wxScrollWinEvent& event );

 
     void OnPaint( wxPaintEvent &event );
 
 
     void OnPaint( wxPaintEvent &event );
 


@@ -626,7 +619,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 );
 


@@ -644,6 +637,7 @@ public:
     void SetItem( wxListItem &item );
     void GetItem( wxListItem &item ) const;
     void SetItemState( long item, long state, long stateMask );
     void SetItem( wxListItem &item );
     void GetItem( wxListItem &item ) const;
     void SetItemState( long item, long state, long stateMask );

+    void SetItemStateAll( long state, long stateMask );

     int GetItemState( long item, long stateMask ) const;
     void GetItemRect( long index, wxRect &rect ) const;
     wxRect GetViewRect() const;
     int GetItemState( long item, long stateMask ) const;
     void GetItemRect( long index, wxRect &rect ) const;
     wxRect GetViewRect() const;


@@ -653,6 +647,7 @@ public:
     wxString GetItemText(long item) const
     {
         wxListItem info;
     wxString GetItemText(long item) const
     {
         wxListItem info;

+        info.m_mask = wxLIST_MASK_TEXT;

         info.m_itemId = item;
         GetItem( info );
         return info.m_text;
         info.m_itemId = item;
         GetItem( info );
         return info.m_text;


@@ -682,9 +677,10 @@ 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 );
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );

+    int GetItemWidthWithImage(wxListItem * item);

     void SortItems( wxListCtrlCompare fn, long data );
 
     size_t GetItemCount() const;
     void SortItems( wxListCtrlCompare fn, long data );
 
     size_t GetItemCount() const;


@@ -699,12 +695,12 @@ public:
     // send out a wxListEvent
     void SendNotify( size_t line,
                      wxEventType command,
     // send out a wxListEvent
     void SendNotify( size_t line,
                      wxEventType command,

-                     wxPoint point = wxDefaultPosition );
+                     const wxPoint& point = wxDefaultPosition );

 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {
 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {

-        if ( !wxScrolledWindow::SetFont(font) )
+        if ( !wxScrolledCanvas::SetFont(font) )

             return false;
 
         m_lineHeight = 0;
             return false;
 
         m_lineHeight = 0;


@@ -732,6 +728,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])


@@ -755,8 +756,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;


@@ -766,12 +767,16 @@ public:
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;

+    ColWidthArray        m_aColWidths;

 
     // for double click logic
     size_t m_lineLastClicked,
 
     // for double click logic
     size_t m_lineLastClicked,

-           m_lineBeforeLastClicked;
+           m_lineBeforeLastClicked,
+           m_lineSelectSingleOnUp;

 
 protected:
 
 protected:

+    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
+

     // the total count of items in a virtual list control
     size_t m_countVirt;
 
     // the total count of items in a virtual list control
     size_t m_countVirt;
 


@@ -790,7 +795,6 @@ protected:
         if ( IsVirtual() )
         {
             wxConstCast(this, wxListMainWindow)->CacheLineData(n);
         if ( IsVirtual() )
         {
             wxConstCast(this, wxListMainWindow)->CacheLineData(n);

-

             n = 0;
         }
 
             n = 0;
         }
 


@@ -813,11 +817,7 @@ protected:
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {

-#ifdef __WXMAC__
-        return *wxWHITE;
-#else

         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);

-#endif

     }
 
 private:
     }
 
 private:


@@ -843,31 +843,23 @@ 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;
+

 
 

-    DECLARE_DYNAMIC_CLASS(wxListMainWindow)

     DECLARE_EVENT_TABLE()
 
     friend class wxGenericListCtrl;
 };
 
     DECLARE_EVENT_TABLE()
 
     friend class wxGenericListCtrl;
 };
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-//-----------------------------------------------------------------------------
-//  wxListItemData
-//-----------------------------------------------------------------------------

 
 wxListItemData::~wxListItemData()
 {
     // in the virtual list control the attributes are managed by the main
     // program, so don't delete them
     if ( !m_owner->IsVirtual() )
 
 wxListItemData::~wxListItemData()
 {
     // in the virtual list control the attributes are managed by the main
     // program, so don't delete them
     if ( !m_owner->IsVirtual() )

-    {

         delete m_attr;
         delete m_attr;

-    }

 
     delete m_rect;
 }
 
     delete m_rect;
 }


@@ -887,13 +879,9 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
     m_owner = owner;
 
     if ( owner->InReportView() )
     m_owner = owner;
 
     if ( owner->InReportView() )

-    {

         m_rect = NULL;
         m_rect = NULL;

-    }

     else
     else

-    {

         m_rect = new wxRect;
         m_rect = new wxRect;

-    }

 }
 
 void wxListItemData::SetItem( const wxListItem &info )
 }
 
 void wxListItemData::SetItem( const wxListItem &info )


@@ -908,7 +896,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());
     }


@@ -944,7 +932,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


@@ -977,9 +965,17 @@ int wxListItemData::GetHeight() const
 
 void wxListItemData::GetItem( wxListItem &info ) const
 {
 
 void wxListItemData::GetItem( wxListItem &info ) const
 {

-    info.m_text = m_text;
-    info.m_image = m_image;
-    info.m_data = m_data;
+    long mask = info.m_mask;
+    if ( !mask )
+        // by default, get everything for backwards compatibility
+        mask = -1;
+
+    if ( mask & wxLIST_MASK_TEXT )
+        info.m_text = m_text;
+    if ( mask & wxLIST_MASK_IMAGE )
+        info.m_image = m_image;
+    if ( mask & wxLIST_MASK_DATA )
+        info.m_data = m_data;

 
     if ( m_attr )
     {
 
     if ( m_attr )
     {


@@ -1005,6 +1001,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()


@@ -1034,6 +1031,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 )


@@ -1049,11 +1049,12 @@ void wxListHeaderData::SetHeight( int h )
 
 void wxListHeaderData::SetWidth( int w )
 {
 
 void wxListHeaderData::SetWidth( int w )
 {

-    m_width = w;
-    if (m_width < 0)
-        m_width = WIDTH_COL_DEFAULT;
-    else if (m_width < WIDTH_COL_MIN)
-        m_width = WIDTH_COL_MIN;
+    m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
+}
+
+void wxListHeaderData::SetState( int flag )
+{
+    m_state = flag;

 }
 
 void wxListHeaderData::SetFormat( int format )
 }
 
 void wxListHeaderData::SetFormat( int format )


@@ -1078,6 +1079,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


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

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

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


@@ -1119,13 +1126,9 @@ wxListLineData::wxListLineData( wxListMainWindow *owner )
     m_owner = owner;
 
     if ( InReportView() )
     m_owner = owner;
 
     if ( InReportView() )

-    {

         m_gi = NULL;
         m_gi = NULL;

-    }

     else // !report
     else // !report

-    {

         m_gi = new GeometryInfo;
         m_gi = new GeometryInfo;

-    }

 
     m_highlighted = false;
 
 
     m_highlighted = false;
 


@@ -1230,6 +1233,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 
         default:
             wxFAIL_MSG( _T("unknown mode") );
 
         default:
             wxFAIL_MSG( _T("unknown mode") );

+            break;

     }
 }
 
     }
 }
 


@@ -1257,9 +1261,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;


@@ -1283,11 +1287,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;
 


@@ -1297,6 +1301,7 @@ void wxListLineData::SetPosition( int x, int y, int spacing )
 
         default:
             wxFAIL_MSG( _T("unknown mode") );
 
         default:
             wxFAIL_MSG( _T("unknown mode") );

+            break;

     }
 }
 
     }
 }
 


@@ -1339,7 +1344,7 @@ wxString wxListLineData::GetText(int index) const
     return s;
 }
 
     return s;
 }
 

-void wxListLineData::SetText( int index, const wxString s )
+void wxListLineData::SetText( int index, const wxString& s )

 {
     wxListItemDataList::compatibility_iterator node = m_items.Item( index );
     if (node)
 {
     wxListItemDataList::compatibility_iterator node = m_items.Item( index );
     if (node)


@@ -1398,33 +1403,33 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )

+#ifdef __WXMAC__

     {
     {

-        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-    }
-    else
-    {
-        if ( attr && attr->HasTextColour() )
-        {
-            colText = attr->GetTextColour();
-        }
+        if (m_owner->HasFocus()
+#if !defined(__WXUNIVERSAL__)
+                && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+        )
+            colText = *wxWHITE;

         else
         else

-        {
-            colText = listctrl->GetForegroundColour();
-        }
+            colText = *wxBLACK;

     }
     }

+#else
+        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+#endif
+    else if ( attr && attr->HasTextColour() )
+        colText = attr->GetTextColour();
+    else
+        colText = listctrl->GetForegroundColour();

 
     dc->SetTextForeground(colText);
 
     // font
     wxFont font;
     if ( attr && attr->HasFont() )
 
     dc->SetTextForeground(colText);
 
     // font
     wxFont font;
     if ( attr && attr->HasFont() )

-    {

         font = attr->GetFont();
         font = attr->GetFont();

-    }

     else
     else

-    {

         font = listctrl->GetFont();
         font = listctrl->GetFont();

-    }

 
     dc->SetFont(font);
 
 
     dc->SetFont(font);
 


@@ -1433,13 +1438,9 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )

-        {

             dc->SetBrush( *m_owner->GetHighlightBrush() );
             dc->SetBrush( *m_owner->GetHighlightBrush() );

-        }

         else
         else

-        {
-            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-        }
+            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID));

 
         dc->SetPen( *wxTRANSPARENT_PEN );
 
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 


@@ -1459,9 +1460,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


@@ -1470,7 +1492,7 @@ void wxListLineData::Draw( wxDC *dc )
     dc->DrawRectangle( m_gi->m_rectAll );
     dc->SetPen(*wxGREEN_PEN);
     dc->DrawRectangle( m_gi->m_rectIcon );
     dc->DrawRectangle( m_gi->m_rectAll );
     dc->SetPen(*wxGREEN_PEN);
     dc->DrawRectangle( m_gi->m_rectIcon );

-#endif // 0
+#endif

 
     wxListItemData *item = node->GetData();
     if (item->HasImage())
 
     wxListItemData *item = node->GetData();
     if (item->HasImage())


@@ -1501,12 +1523,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,
 
     wxCoord x = rect.x + HEADER_OFFSET_X,

-            y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
+            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();


@@ -1519,11 +1563,14 @@ 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;

-            m_owner->DrawImage( item->GetImage(), dc, xOld, y );

             m_owner->GetImageSize( item->GetImage(), ix, iy );
             m_owner->GetImageSize( item->GetImage(), ix, iy );

+            m_owner->DrawImage( item->GetImage(), dc, xOld, yMid - iy/2 );

 
             ix += IMAGE_MARGIN_IN_REPORT_MODE;
 
 
             ix += IMAGE_MARGIN_IN_REPORT_MODE;
 


@@ -1531,38 +1578,38 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
             width -= ix;
         }
 
             width -= ix;
         }
 

-        wxDCClipper clipper(*dc, xOld, y, width - 8, rect.height);
-

         if ( item->HasText() )
         if ( item->HasText() )

-        {
-            DrawTextFormatted(dc, item->GetText(), col, xOld, y, 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 col,
                                        int x,

-                                       int y,
+                                       int yMid,

                                        int width)
 {
                                        int width)
 {

-    wxString drawntext, ellipsis;
-    wxCoord w, h, base_w;
-    wxListItem item;
+    // 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(" "));

 
 

-    // determine if the string can fit inside the current width
+    wxCoord w, h;

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

+
+    const wxCoord y = yMid - (h + 1)/2;
+
+    wxDCClipper clipper(*dc, x, y, width, h);
+
+    // determine if the string can fit inside the current width

     if (w <= width)
     {
         // it can, draw it using the items alignment
     if (w <= width)
     {
         // it can, draw it using the items alignment

+        wxListItem item;

         m_owner->GetColumn(col, item);
         switch ( item.GetAlign() )
         {
         m_owner->GetColumn(col, item);
         switch ( item.GetAlign() )
         {

-            default:
-                wxFAIL_MSG( _T("unknown list item format") );
-                // fall through
-

             case wxLIST_FORMAT_LEFT:
                 // nothing to do
                 break;
             case wxLIST_FORMAT_LEFT:
                 // nothing to do
                 break;


@@ -1574,6 +1621,10 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
             case wxLIST_FORMAT_CENTER:
                 x += (width - w) / 2;
                 break;
             case wxLIST_FORMAT_CENTER:
                 x += (width - w) / 2;
                 break;

+
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                break;

         }
 
         dc->DrawText(text, x, y);
         }
 
         dc->DrawText(text, x, y);


@@ -1581,13 +1632,14 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
     else // otherwise, truncate and add an ellipsis if possible
     {
         // determine the base width
     else // otherwise, truncate and add an ellipsis if possible
     {
         // determine the base width

-        ellipsis = wxString(wxT("..."));
+        wxString ellipsis(wxT("..."));
+        wxCoord base_w;

         dc->GetTextExtent(ellipsis, &base_w, &h);
 
         // continue until we have enough space or only one character left
         wxCoord w_c, h_c;
         dc->GetTextExtent(ellipsis, &base_w, &h);
 
         // continue until we have enough space or only one character left
         wxCoord w_c, h_c;

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

         while (len > 1)
         {
             dc->GetTextExtent(drawntext.Last(), &w_c, &h_c);
         while (len > 1)
         {
             dc->GetTextExtent(drawntext.Last(), &w_c, &h_c);


@@ -1599,9 +1651,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);
         }
 


@@ -1632,8 +1684,6 @@ void wxListLineData::ReverseHighlight( void )
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow)
-

 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)


@@ -1700,11 +1750,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) )


@@ -1714,8 +1779,6 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC( dc );
     AdjustDC( dc );
 
     PrepareDC( dc );
     AdjustDC( dc );
 

-    dc.BeginDrawing();
-

     dc.SetFont( GetFont() );
 
     // width and height of the entire header window
     dc.SetFont( GetFont() );
 
     // width and height of the entire header window


@@ -1723,12 +1786,10 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     GetClientSize( &w, &h );
     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
 
     GetClientSize( &w, &h );
     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
 

-    dc.SetBackgroundMode(wxTRANSPARENT);
-
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

     dc.SetTextForeground(GetForegroundColour());
 
     int x = HEADER_OFFSET_X;
     dc.SetTextForeground(GetForegroundColour());
 
     int x = HEADER_OFFSET_X;

-

     int numColumns = m_owner->GetColumnCount();
     wxListItem item;
     for ( int i = 0; i < numColumns && x < w; i++ )
     int numColumns = m_owner->GetColumnCount();
     wxListItem item;
     for ( int i = 0; i < numColumns && x < w; i++ )


@@ -1736,17 +1797,29 @@ 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
-        int cw = wCol - 2;
+        int cw = wCol;
+        int ch = h;
+
+        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
                                 (
                                     this,
                                     dc,
 
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,

-                                    wxRect(x, HEADER_OFFSET_Y, cw, h - 2),
-                                    m_parent->IsEnabled() ? 0
-                                                          : wxCONTROL_DISABLED
+                                    wxRect(x, HEADER_OFFSET_Y, cw, ch),
+                                    flags

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


@@ -1755,21 +1828,19 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxCoord wLabel;
         wxCoord hLabel;
         dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
         wxCoord wLabel;
         wxCoord hLabel;
         dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);

-        wLabel += 2*EXTRA_WIDTH;
+        wLabel += 2 * EXTRA_WIDTH;

 
         // and the width of the icon, if any
 
         // and the width of the icon, if any

-        static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
-        int ix = 0,     // init them just to suppress the compiler warnings
-            iy = 0;
+        int ix = 0, iy = 0;    // init them just to suppress the compiler warnings

         const int image = item.m_image;
         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


@@ -1798,6 +1869,9 @@ 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 )


@@ -1806,29 +1880,24 @@ 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 );
 
         x += wCol;
     }
         dc.DrawText( item.GetText(),
                      xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
 
         x += wCol;
     }

-
-    dc.EndDrawing();

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


@@ -1851,6 +1920,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 )


@@ -1903,7 +1973,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         // end of the current column
         int xpos = 0;
 
         // end of the current column
         int xpos = 0;
 

-        // find the column where this event occured
+        // find the column where this event occurred

         int col,
             countCol = m_owner->GetColumnCount();
         for (col = 0; col < countCol; col++)
         int col,
             countCol = m_owner->GetColumnCount();
         for (col = 0; col < countCol; col++)


@@ -1946,6 +2016,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,


@@ -1978,7 +2064,7 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     m_owner->Update();
 }
 
     m_owner->Update();
 }
 

-bool wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)
+bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)

 {
     wxWindow *parent = GetParent();
     wxListEvent le( type, parent->GetId() );
 {
     wxWindow *parent = GetParent();
     wxListEvent le( type, parent->GetId() );


@@ -2010,83 +2096,98 @@ void wxListRenameTimer::Notify()
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxListTextCtrl (internal)
+// wxListTextCtrlWrapper (internal)

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
-    EVT_CHAR           (wxListTextCtrl::OnChar)
-    EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)
-    EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
+BEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler)
+    EVT_CHAR           (wxListTextCtrlWrapper::OnChar)
+    EVT_KEY_UP         (wxListTextCtrlWrapper::OnKeyUp)
+    EVT_KILL_FOCUS     (wxListTextCtrlWrapper::OnKillFocus)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit)
+wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
+                                             wxTextCtrl *text,
+                                             size_t itemEdit)

               : m_startValue(owner->GetItemText(itemEdit)),
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;
               : m_startValue(owner->GetItemText(itemEdit)),
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;

-    m_finished = false;
+    m_text = text;
+    m_aboutToFinish = false;

 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
 
     m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
                                   &rectLabel.x, &rectLabel.y);
 
 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
 
     m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
                                   &rectLabel.x, &rectLabel.y);
 

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

 }
 
 }
 

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

 {
 {

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

     {
     {

-        wxPendingDelete.Append(this);
+        m_owner->OnRenameCancelled(m_itemEdited);

 
 

-        m_finished = true;
+        Finish( true );
+    }
+    else
+    {
+        // Notify the owner about the changes
+        AcceptChanges();

 
 

-        m_owner->SetFocusIgnoringChildren();
+        // Even if vetoed, close the control (consistent with MSW)
+        Finish( true );

     }
 }
 
     }
 }
 

-bool wxListTextCtrl::AcceptChanges()
+void wxListTextCtrlWrapper::Finish( bool setfocus )

 {
 {

-    const wxString value = GetValue();
+    m_text->RemoveEventHandler(this);
+    m_owner->ResetTextControl( m_text );

 
 

-    if ( value == m_startValue )
-    {
-        // nothing changed, always accept
-        return true;
-    }
+    wxPendingDelete.Append( this );
+
+    if (setfocus)
+        m_owner->SetFocus();
+}

 
 

+bool wxListTextCtrlWrapper::AcceptChanges()
+{
+    const wxString value = m_text->GetValue();
+
+    // 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) )
     {
         // vetoed by the user
         return false;
     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // 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 wxListTextCtrl::OnChar( wxKeyEvent &event )
+void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )

 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            if ( AcceptChanges() )
-            {
-                // Close the text control, changes were accepted
-                Finish();
-            }
-            // else do nothing, do not accept and do not close
-
+            EndEdit( false );

             break;
 
         case WXK_ESCAPE:
             break;
 
         case WXK_ESCAPE:

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

             break;
 
         default:
             break;
 
         default:


@@ -2094,43 +2195,37 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     }
 }
 
     }
 }
 

-void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
+void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )

 {
 {

-    if (m_finished)
+    if (m_aboutToFinish)

     {
     {

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

     }
 
     }
 

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

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

-void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
+void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )

 {
 {

-    if ( !m_finished )
+    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();
 }
 


@@ -2138,13 +2233,12 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
+BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledCanvas)

   EVT_PAINT          (wxListMainWindow::OnPaint)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_PAINT          (wxListMainWindow::OnPaint)
   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)


@@ -2161,8 +2255,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;


@@ -2173,12 +2267,12 @@ void wxListMainWindow::Init()
 
     m_lastOnSame = false;
     m_renameTimer = new wxListRenameTimer( this );
 
     m_lastOnSame = false;
     m_renameTimer = new wxListRenameTimer( this );

+    m_textctrlWrapper = NULL;

 
     m_current =
     m_lineLastClicked =
 
     m_current =
     m_lineLastClicked =

+    m_lineSelectSingleOnUp =

     m_lineBeforeLastClicked = (size_t)-1;
     m_lineBeforeLastClicked = (size_t)-1;

-
-    m_freezeCount = 0;

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


@@ -2195,31 +2289,28 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                     const wxSize& size,
                                     long style,
                                     const wxString &name )
                                     const wxSize& size,
                                     long style,
                                     const wxString &name )

-                : wxScrolledWindow( parent, id, pos, size,
+                : wxScrolledCanvas( parent, id, pos, size,

                                     style | wxHSCROLL | wxVSCROLL, name )
 {
     Init();
 
     m_highlightBrush = new wxBrush
                                     style | wxHSCROLL | wxVSCROLL, name )
 {
     Init();
 
     m_highlightBrush = new wxBrush

-                           (
+                         (

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

-                            wxSOLID
-                           );
+                            wxBRUSHSTYLE_SOLID
+                         );

 
     m_highlightUnfocusedBrush = new wxBrush
 
     m_highlightUnfocusedBrush = new wxBrush

-                                    (
-                                       wxSystemSettings::GetColour
-                                       (
-                                           wxSYS_COLOUR_BTNSHADOW
-                                       ),
-                                       wxSOLID
-                                    );
-
-    wxSize sz = size;
-    sz.y = 25;
+                              (
+                                 wxSystemSettings::GetColour
+                                 (
+                                     wxSYS_COLOUR_BTNSHADOW
+                                 ),
+                                 wxBRUSHSTYLE_SOLID
+                              );

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


@@ -2234,10 +2325,10 @@ wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;
 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;

-

     delete m_renameTimer;
 }
 
     delete m_renameTimer;
 }
 


@@ -2251,16 +2342,15 @@ void wxListMainWindow::CacheLineData(size_t line)
     for ( size_t col = 0; col < countCol; col++ )
     {
         ld->SetText(col, listctrl->OnGetItemText(line, col));
     for ( size_t col = 0; col < countCol; col++ )
     {
         ld->SetText(col, listctrl->OnGetItemText(line, col));

+        ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));

     }
 
     }
 

-    ld->SetImage(listctrl->OnGetItemImage(line));

     ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
     ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );

-

     wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
 
     wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
     wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
 
     wxListMainWindow *self = wxConstCast(this, wxListMainWindow);


@@ -2306,8 +2396,7 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
         if ( m_small_image_list && m_small_image_list->GetImageCount() )
         {
 
         if ( m_small_image_list && m_small_image_list->GetImageCount() )
         {

-            int iw = 0;
-            int ih = 0;
+            int iw = 0, ih = 0;

             m_small_image_list->GetSize(0, iw, ih);
             y = wxMax(y, ih);
         }
             m_small_image_list->GetSize(0, iw, ih);
             y = wxMax(y, ih);
         }


@@ -2323,7 +2412,7 @@ wxCoord wxListMainWindow::GetLineY(size_t line) const
 {
     wxASSERT_MSG( InReportView(), _T("only works in report mode") );
 
 {
     wxASSERT_MSG( InReportView(), _T("only works in report mode") );
 

-    return LINE_SPACING + line*GetLineHeight();
+    return LINE_SPACING + line * GetLineHeight();

 }
 
 wxRect wxListMainWindow::GetLineRect(size_t line) const
 }
 
 wxRect wxListMainWindow::GetLineRect(size_t line) const


@@ -2345,10 +2434,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;


@@ -2382,7 +2485,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


@@ -2393,7 +2496,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;
     }
 


@@ -2446,9 +2549,7 @@ void wxListMainWindow::HighlightLines( size_t lineFrom,
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )

-            {

                 RefreshLine(line);
                 RefreshLine(line);

-            }

         }
     }
 }
         }
     }
 }


@@ -2550,6 +2651,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
 
         wxSize size = GetClientSize();
         rect.width = size.x;
 
         wxSize size = GetClientSize();
         rect.width = size.x;

+

         // refresh till the bottom of the window
         rect.height = size.y - rect.y;
 
         // refresh till the bottom of the window
         rect.height = size.y - rect.y;
 


@@ -2579,32 +2681,13 @@ void wxListMainWindow::RefreshSelected()
     }
 
     if ( HasCurrent() && m_current >= from && m_current <= to )
     }
 
     if ( HasCurrent() && m_current >= from && m_current <= to )

-    {

         RefreshLine(m_current);
         RefreshLine(m_current);

-    }

 
     for ( size_t line = from; line <= to; line++ )
     {
         // NB: the test works as expected even if m_current == -1
         if ( line != m_current && IsHighlighted(line) )
 
     for ( size_t line = from; line <= to; line++ )
     {
         // NB: the test works as expected even if m_current == -1
         if ( line != m_current && IsHighlighted(line) )

-        {

             RefreshLine(line);
             RefreshLine(line);

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

     }
 }
 
     }
 }
 


@@ -2614,7 +2697,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     // done (a Windows requirement).
     wxPaintDC dc( this );
 
     // 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;


@@ -2631,8 +2714,6 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     int dev_x, dev_y;
     CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
 
     int dev_x, dev_y;
     CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
 

-    dc.BeginDrawing();
-

     dc.SetFont( GetFont() );
 
     if ( InReportView() )
     dc.SetFont( GetFont() );
 
     if ( InReportView() )


@@ -2643,8 +2724,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() )


@@ -2661,7 +2742,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


@@ -2676,46 +2758,49 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         if ( HasFlag(wxLC_HRULES) )
         {
 
         if ( HasFlag(wxLC_HRULES) )
         {

-            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxPen pen(GetRuleColour(), 1, wxPENSTYLE_SOLID);

             wxSize clientSize = GetClientSize();
 
             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 );

-                dc.DrawLine(0 - dev_x, i*lineHeight,
-                            clientSize.x - dev_x, i*lineHeight);
+                dc.DrawLine(0 - dev_x, i * lineHeight,
+                            clientSize.x - dev_x, i * lineHeight);

             }
 
             // Draw last horizontal rule
             if ( visibleTo == GetItemCount() - 1 )
             {
             }
 
             // Draw last horizontal rule
             if ( visibleTo == GetItemCount() - 1 )
             {

-                dc.SetPen(pen);
+                dc.SetPen( pen );

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

-                dc.DrawLine(0 - dev_x, (m_lineTo+1)*lineHeight,
-                            clientSize.x - dev_x , (m_lineTo+1)*lineHeight );
+                dc.DrawLine(0 - dev_x, (m_lineTo + 1) * lineHeight,
+                            clientSize.x - dev_x , (m_lineTo + 1) * lineHeight );

             }
         }
 
         // Draw vertical rules if required
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {
             }
         }
 
         // Draw vertical rules if required
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {

-            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxPen pen(GetRuleColour(), 1, wxPENSTYLE_SOLID);
+            wxRect firstItemRect, lastItemRect;

 
 

-            wxRect firstItemRect;
-            wxRect lastItemRect;

             GetItemRect(visibleFrom, firstItemRect);
             GetItemRect(visibleTo, lastItemRect);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);
             GetItemRect(visibleFrom, firstItemRect);
             GetItemRect(visibleTo, lastItemRect);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);

+

             for (int col = 0; col < GetColumnCount(); col++)
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;
             for (int col = 0; col < GetColumnCount(); col++)
             {
                 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);

             }
         }
     }
             }
         }
     }


@@ -2734,21 +2819,25 @@ 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

-
-    dc.EndDrawing();

 }
 
 void wxListMainWindow::HighlightAll( bool on )
 {
     if ( IsSingleSel() )
     {
 }
 
 void wxListMainWindow::HighlightAll( bool on )
 {
     if ( IsSingleSel() )
     {

-        wxASSERT_MSG( !on, _T("can't do this in a single sel control") );
+        wxASSERT_MSG( !on, _T("can't do this in a single selection control") );

 
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )
 
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )


@@ -2757,18 +2846,20 @@ 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);

     }
 }
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
     }
 }
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,

-                                   wxPoint point )
+                                   const wxPoint& point )

 {
     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


@@ -2779,7 +2870,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 )
         {


@@ -2796,36 +2887,52 @@ 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);
 }
 

-void wxListMainWindow::EditLabel( long item )
+wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass)

 {
 {

-    wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),
+    wxCHECK_MSG( (item >= 0) && ((size_t)item < GetItemCount()), NULL,

                  wxT("wrong index in wxGenericListCtrl::EditLabel()") );
 
                  wxT("wrong index in wxGenericListCtrl::EditLabel()") );
 

+    wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
+                 wxT("EditLabel() needs a text control") );
+

     size_t itemEdit = (size_t)item;
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_itemIndex = item;
     wxListLineData *data = GetLine(itemEdit);
     size_t itemEdit = (size_t)item;
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_itemIndex = item;
     wxListLineData *data = GetLine(itemEdit);

-    wxCHECK_RET( data, _T("invalid index in EditLabel()") );
+    wxCHECK_MSG( data, NULL, _T("invalid index in EditLabel()") );

     data->GetItem( 0, le.m_item );
     data->GetItem( 0, le.m_item );

+

     if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
     {
         // vetoed by user code
     if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
     {
         // vetoed by user code

-        return;
+        return NULL;

     }
 
     // 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();
 

-    wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit);
+        // Pending events dispatched by wxSafeYield might have changed the item
+        // count
+        if ( (size_t)item >= GetItemCount() )
+            return NULL;
+    }

 
 

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

 }
 
 void wxListMainWindow::OnRenameTimer()
 }
 
 void wxListMainWindow::OnRenameTimer()


@@ -2842,6 +2949,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
     le.m_itemIndex = itemEdit;
 
     wxListLineData *data = GetLine(itemEdit);
     le.m_itemIndex = itemEdit;
 
     wxListLineData *data = GetLine(itemEdit);

+

     wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );
 
     data->GetItem( 0, le.m_item );
     wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );
 
     data->GetItem( 0, le.m_item );


@@ -2864,27 +2972,50 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
     wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
 
     data->GetItem( 0, le.m_item );
     wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
 
     data->GetItem( 0, le.m_item );

-

     GetEventHandler()->ProcessEvent( le );
 }
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
     GetEventHandler()->ProcessEvent( le );
 }
 
 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 )
+        m_textctrlWrapper->EndEdit( false );
+#endif // __WXMAC__
+
+    if ( event.LeftDown() )
+        SetFocus();
+

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

-#if wxUSE_MOUSEWHEEL

     if (event.GetEventType() == wxEVT_MOUSEWHEEL)
     {
         // let the base handle mouse wheel events.
         event.Skip();
         return;
     }
     if (event.GetEventType() == wxEVT_MOUSEWHEEL)
     {
         // let the base handle mouse wheel events.
         event.Skip();
         return;
     }

-#endif
-    
+

     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;


@@ -2941,7 +3072,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );
 
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );

-        le.m_itemIndex = current;
+        le.m_itemIndex = m_lineLastClicked;

         le.m_pointDrag = m_dragStart;
         GetParent()->GetEventHandler()->ProcessEvent( le );
 
         le.m_pointDrag = m_dragStart;
         GetParent()->GetEventHandler()->ProcessEvent( le );
 


@@ -2955,13 +3086,32 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if ( !hitResult )
     {
         // outside of any item
     if ( !hitResult )
     {
         // 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 )


@@ -2972,26 +3122,65 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
         else
         {
         }
         else
         {

-            // the first click was on another item, so don't interpret this as
+            // The first click was on another item, so don't interpret this as

             // a double click, but as a simple click instead
             forceClick = true;
         }
     }
 
             // a double click, but as a simple click instead
             forceClick = true;
         }
     }
 

-    if (event.LeftUp() && m_lastOnSame)
+    if (event.LeftUp())

     {
     {

-        if ((current == m_current) &&
-            (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
-            HasFlag(wxLC_EDIT_LABELS)  )
+        if (m_lineSelectSingleOnUp != (size_t)-1)

         {
         {

-            m_renameTimer->Start( 100, true );
+            // select single line
+            HighlightAll( false );
+            ReverseHighlight(m_lineSelectSingleOnUp);

         }
         }

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

         m_lastOnSame = false;
         m_lastOnSame = false;

+        m_lineSelectSingleOnUp = (size_t)-1;

     }
     }

-    else if (event.RightDown())
+    else

     {
     {

-        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
-                    event.GetPosition() );
+        // This is necessary, because after a DnD operation in
+        // from and to ourself, the up event is swallowed by the
+        // DnD code. So on next non-up event (which means here and
+        // now) m_lineSelectSingleOnUp should be reset.
+        m_lineSelectSingleOnUp = (size_t)-1;
+    }
+    if (event.RightDown())
+    {
+        m_lineBeforeLastClicked = m_lineLastClicked;
+        m_lineLastClicked = current;
+
+        // If the item is already selected, do not update the selection.
+        // Multi-selections should not be cleared if a selected item is clicked.
+        if (!IsHighlighted(current))
+        {
+            HighlightAll(false);
+            ChangeCurrent(current);
+            ReverseHighlight(m_current);
+        }
+
+        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+
+        // Allow generation of context menu event
+        event.Skip();

     }
     else if (event.MiddleDown())
     {
     }
     else if (event.MiddleDown())
     {


@@ -3003,14 +3192,24 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;

+        bool oldWasSelected = IsHighlighted(m_current);
+

         bool cmdModifierDown = event.CmdDown();
         if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
         {
         bool cmdModifierDown = event.CmdDown();
         if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
         {

-            HighlightAll( false );
+            if ( IsSingleSel() || !IsHighlighted(current) )
+            {
+                HighlightAll( false );

 
 

-            ChangeCurrent(current);
+                ChangeCurrent(current);

 
 

-            ReverseHighlight(m_current);
+                ReverseHighlight(m_current);
+            }
+            else // multi sel & current is highlighted & no mod keys
+            {
+                m_lineSelectSingleOnUp = current;
+                ChangeCurrent(current); // change focus
+            }

         }
         else // multi sel & either ctrl or shift is down
         {
         }
         else // multi sel & either ctrl or shift is down
         {


@@ -3043,12 +3242,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         if (m_current != oldCurrent)
         }
 
         if (m_current != oldCurrent)

-        {

             RefreshLine( oldCurrent );
             RefreshLine( oldCurrent );

-        }

 
         // forceClick is only set if the previous click was on another item
 
         // forceClick is only set if the previous click was on another item

-        m_lastOnSame = !forceClick && (m_current == oldCurrent);
+        m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;

     }
 }
 
     }
 }
 


@@ -3064,29 +3261,78 @@ void wxListMainWindow::MoveToItem(size_t item)
 
     const int hLine = GetLineHeight();
 
 
     const int hLine = GetLineHeight();
 

-    int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
-    int view_y = hLine*GetScrollPos( wxVERTICAL );
+    int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL );
+    int view_y = hLine * GetScrollPos( wxVERTICAL );

 
     if ( InReportView() )
     {
 
     if ( InReportView() )
     {

-        // the next we need the range of lines shown it might be different, so
-        // recalculate it
+        // the next we need the range of lines shown it might be different,
+        // so recalculate it

         ResetVisibleLinesRange();
 
         ResetVisibleLinesRange();
 

-        if (rect.y < view_y )
-            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 );
+        if (rect.y < view_y)
+            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 );
-        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 - 5) / SCROLL_UNIT_X;
+        if (rect.x + rect.width - 5 > view_x + client_w)
+            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
 // ----------------------------------------------------------------------------


@@ -3119,7 +3365,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);


@@ -3127,10 +3374,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 );


@@ -3142,7 +3388,7 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 
 {
     wxWindow *parent = GetParent();
 

-    /* we propagate the key event up */
+    // propagate the key event upwards

     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;
     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;


@@ -3157,11 +3403,30 @@ 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();
 

-    /* we send a list_key event up */
+    // send a list_key event up

     if ( HasCurrent() )
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
     if ( HasCurrent() )
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );


@@ -3172,7 +3437,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         parent->GetEventHandler()->ProcessEvent( le );
     }
 
         parent->GetEventHandler()->ProcessEvent( le );
     }
 

-    /* we propagate the char event up */
+    // propagate the char event upwards

     wxKeyEvent ke( wxEVT_CHAR );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;
     wxKeyEvent ke( wxEVT_CHAR );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;


@@ -3184,25 +3449,29 @@ 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 */
+    // no item -> nothing to do

     if (!HasCurrent())
     {
         event.Skip();
         return;
     }
 
     if (!HasCurrent())
     {
         event.Skip();
         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 )


@@ -3224,9 +3493,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)


@@ -3236,11 +3506,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();


@@ -3254,7 +3524,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;
 


@@ -3265,7 +3535,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 )


@@ -3278,17 +3548,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:


@@ -3336,6 +3608,7 @@ void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
         if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
             return;
     }
         if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
             return;
     }

+

     m_hasFocus = false;
     RefreshSelected();
 }
     m_hasFocus = false;
     RefreshSelected();
 }


@@ -3396,17 +3669,15 @@ 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;
 
     // calc the spacing from the icon size
 {
     m_dirty = true;
 
     // calc the spacing from the icon size

-    int width = 0,
-        height = 0;
+    int width = 0, height = 0;
+

     if ((imageList) && (imageList->GetImageCount()) )
     if ((imageList) && (imageList->GetImageCount()) )

-    {

         imageList->GetSize(0, width, height);
         imageList->GetSize(0, width, height);

-    }

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


@@ -3426,13 +3697,9 @@ void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 {
     m_dirty = true;
     if (isSmall)
 {
     m_dirty = true;
     if (isSmall)

-    {

         m_small_spacing = spacing;
         m_small_spacing = spacing;

-    }

     else
     else

-    {

         m_normal_spacing = spacing;
         m_normal_spacing = spacing;

-    }

 }
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )
 }
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )


@@ -3489,6 +3756,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 )
     {


@@ -3504,34 +3784,30 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
 
             int max = AUTOSIZE_COL_MARGIN;
 
 
             int max = AUTOSIZE_COL_MARGIN;
 

-            for ( size_t i = 0; i < count; i++ )
+            //  if the cached column width isn't valid then recalculate it
+            if (m_aColWidths.Item(col)->bNeedsUpdate)

             {
             {

-                wxListLineData *line = GetLine(i);
-                wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
-
-                wxCHECK_RET( n, _T("no subitem?") );
+                for (size_t i = 0; i < count; i++)
+                {
+                    wxListLineData *line = GetLine( i );
+                    wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );

 
 

-                wxListItemData *item = n->GetData();
-                int current = 0;
+                    wxCHECK_RET( n, _T("no subitem?") );

 
 

-                if (item->HasImage())
-                {
-                    int ix, iy;
-                    GetImageSize( item->GetImage(), ix, iy );
-                    current += ix + 5;
-                }
+                    wxListItemData *itemData = n->GetData();
+                    wxListItem      item;

 
 

-                if (item->HasText())
-                {
-                    wxCoord w;
-                    dc.GetTextExtent( item->GetText(), &w, NULL );
-                    current += w;
+                    itemData->GetItem(item);
+                    int itemWidth = GetItemWidthWithImage(&item);
+                    if (itemWidth > max)
+                        max = itemWidth;

                 }
 
                 }
 

-                if (current > max)
-                    max = current;
+                m_aColWidths.Item(col)->bNeedsUpdate = false;
+                m_aColWidths.Item(col)->nMaxWidth = max;

             }
 
             }
 

+            max = m_aColWidths.Item(col)->nMaxWidth;

             width = max + AUTOSIZE_COL_MARGIN;
         }
     }
             width = max + AUTOSIZE_COL_MARGIN;
         }
     }


@@ -3590,6 +3866,19 @@ void wxListMainWindow::SetItem( wxListItem &item )
     {
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );
     {
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );

+
+        // Set item state if user wants
+        if ( item.m_mask & wxLIST_MASK_STATE )
+            SetItemState( item.m_itemId, item.m_state, item.m_state );
+
+        if (InReportView())
+        {
+            //  update the Max Width Cache if needed
+            int width = GetItemWidthWithImage(&item);
+
+            if (width > m_aColWidths.Item(item.m_col)->nMaxWidth)
+                m_aColWidths.Item(item.m_col)->nMaxWidth = width;
+        }

     }
 
     // update the item on screen
     }
 
     // update the item on screen


@@ -3598,10 +3887,60 @@ void wxListMainWindow::SetItem( wxListItem &item )
     RefreshRect(rectItem);
 }
 
     RefreshRect(rectItem);
 }
 

+void wxListMainWindow::SetItemStateAll(long state, long stateMask)
+{
+    if ( IsEmpty() )
+        return;
+
+    // first deal with selection
+    if ( stateMask & wxLIST_STATE_SELECTED )
+    {
+        // set/clear select state
+        if ( IsVirtual() )
+        {
+            // optimized version for virtual listctrl.
+            m_selStore.SelectRange(0, GetItemCount() - 1, state == wxLIST_STATE_SELECTED);
+            Refresh();
+        }
+        else if ( state & wxLIST_STATE_SELECTED )
+        {
+            const long count = GetItemCount();
+            for( long i = 0; i <  count; i++ )
+            {
+                SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+            }
+
+        }
+        else
+        {
+            // clear for non virtual (somewhat optimized by using GetNextItem())
+            long i = -1;
+            while ( (i = GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1 )
+            {
+                SetItemState( i, 0, wxLIST_STATE_SELECTED );
+            }
+        }
+    }
+
+    if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) )
+    {
+        // unfocus all: only one item can be focussed, so clearing focus for
+        // all items is simply clearing focus of the focussed item.
+        SetItemState(m_current, state, stateMask);
+    }
+    //(setting focus to all items makes no sense, so it is not handled here.)
+}
+

 void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
 {
 void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
 {

-     wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
-                  _T("invalid list ctrl item index in SetItem") );
+    if ( litem == -1 )
+    {
+        SetItemStateAll(state, stateMask);
+        return;
+    }
+
+    wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
+                 _T("invalid list ctrl item index in SetItem") );

 
     size_t oldCurrent = m_current;
     size_t item = (size_t)litem;    // safe because of the check above
 
     size_t oldCurrent = m_current;
     size_t item = (size_t)litem;    // safe because of the check above


@@ -3715,6 +4054,11 @@ void wxListMainWindow::GetItem( wxListItem &item ) const
 
     wxListLineData *line = GetLine((size_t)item.m_itemId);
     line->GetItem( item.m_col, item );
 
     wxListLineData *line = GetLine((size_t)item.m_itemId);
     line->GetItem( item.m_col, item );

+
+    // Get item state if user wants it
+    if ( item.m_mask & wxLIST_MASK_STATE )
+        item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED |
+                                                 wxLIST_STATE_FOCUSED );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -3741,9 +4085,7 @@ int wxListMainWindow::GetSelectedItemCount() const
 {
     // deal with the quick case first
     if ( IsSingleSel() )
 {
     // deal with the quick case first
     if ( IsSingleSel() )

-    {

         return HasCurrent() ? IsHighlighted(m_current) : false;
         return HasCurrent() ? IsHighlighted(m_current) : false;

-    }

 
     // virtual controls remmebers all its selections itself
     if ( IsVirtual() )
 
     // virtual controls remmebers all its selections itself
     if ( IsVirtual() )


@@ -3772,8 +4114,7 @@ wxRect wxListMainWindow::GetViewRect() const
                     _T("wxListCtrl::GetViewRect() only works in icon mode") );
 
     // we need to find the longest/tallest label
                     _T("wxListCtrl::GetViewRect() only works in icon mode") );
 
     // we need to find the longest/tallest label

-    wxCoord xMax = 0,
-            yMax = 0;
+    wxCoord xMax = 0, yMax = 0;

     const int count = GetItemCount();
     if ( count )
     {
     const int count = GetItemCount();
     if ( count )
     {


@@ -3793,8 +4134,8 @@ wxRect wxListMainWindow::GetViewRect() const
     }
 
     // some fudge needed to make it look prettier
     }
 
     // some fudge needed to make it look prettier

-    xMax += 2*EXTRA_BORDER_X;
-    yMax += 2*EXTRA_BORDER_Y;
+    xMax += 2 * EXTRA_BORDER_X;
+    yMax += 2 * EXTRA_BORDER_Y;

 
     // account for the scrollbars if necessary
     const wxSize sizeAll = GetClientSize();
 
     // account for the scrollbars if necessary
     const wxSize sizeAll = GetClientSize();


@@ -3840,15 +4181,17 @@ 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() );
 
     const size_t count = GetItemCount();
 
     int iconSpacing;
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 
     const size_t count = GetItemCount();
 
     int iconSpacing;

-    if ( HasFlag(wxLC_ICON) )
+    if ( HasFlag(wxLC_ICON) && m_normal_image_list )

         iconSpacing = m_normal_spacing;
         iconSpacing = m_normal_spacing;

-    else if ( HasFlag(wxLC_SMALL_ICON) )
+    else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list )

         iconSpacing = m_small_spacing;
     else
         iconSpacing = 0;
         iconSpacing = m_small_spacing;
     else
         iconSpacing = 0;


@@ -3873,12 +4216,10 @@ 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

-        int entireHeight = count*lineHeight + LINE_SPACING;
+        int entireHeight = count * lineHeight + LINE_SPACING;

 
         m_linesPerPage = clientHeight / lineHeight;
 
 
         m_linesPerPage = clientHeight / lineHeight;
 


@@ -3937,7 +4278,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 }
             }
 
                 }
             }
 

-

             SetScrollbars
             (
                 SCROLL_UNIT_X,
             SetScrollbars
             (
                 SCROLL_UNIT_X,


@@ -3959,7 +4299,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
             for (int tries = 0; tries < 2; tries++)
             {
 
             for (int tries = 0; tries < 2; tries++)
             {

-                entireWidth = 2*EXTRA_BORDER_X;
+                entireWidth = 2 * EXTRA_BORDER_X;

 
                 if (tries == 1)
                 {
 
                 if (tries == 1)
                 {


@@ -3978,11 +4318,11 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 for (size_t i = 0; i < count; i++)
                 {
                     currentlyVisibleLines++;
                 for (size_t i = 0; i < count; i++)
                 {
                     currentlyVisibleLines++;

-                    wxListLineData *line = GetLine(i);
+                    wxListLineData *line = GetLine( i );

                     line->CalculateSize( &dc, iconSpacing );
                     line->SetPosition( x, y, iconSpacing );
 
                     line->CalculateSize( &dc, iconSpacing );
                     line->SetPosition( x, y, iconSpacing );
 

-                    wxSize sizeLine = GetLineSize(i);
+                    wxSize sizeLine = GetLineSize( i );

 
                     if ( maxWidthInThisRow < sizeLine.x )
                         maxWidthInThisRow = sizeLine.x;
 
                     if ( maxWidthInThisRow < sizeLine.x )
                         maxWidthInThisRow = sizeLine.x;


@@ -4057,9 +4397,7 @@ void wxListMainWindow::RefreshAll()
 void wxListMainWindow::UpdateCurrent()
 {
     if ( !HasCurrent() && !IsEmpty() )
 void wxListMainWindow::UpdateCurrent()
 {
     if ( !HasCurrent() && !IsEmpty() )

-    {

         ChangeCurrent(0);
         ChangeCurrent(0);

-    }

 }
 
 long wxListMainWindow::GetNextItem( long item,
 }
 
 long wxListMainWindow::GetNextItem( long item,


@@ -4076,17 +4414,13 @@ long wxListMainWindow::GetNextItem( long item,
     // all selected items
     ret++;
     if ( ret == max )
     // all selected items
     ret++;
     if ( ret == max )

-    {
-        // this is not an error because the index was ok initially, just no
-        // such item
+        // this is not an error because the index was OK initially,
+        // just no such item

         return -1;
         return -1;

-    }

 
     if ( !state )
 
     if ( !state )

-    {

         // any will do
         return (size_t)ret;
         // any will do
         return (size_t)ret;

-    }

 
     size_t count = GetItemCount();
     for ( size_t line = (size_t)ret; line < count; line++ )
 
     size_t count = GetItemCount();
     for ( size_t line = (size_t)ret; line < count; line++ )


@@ -4121,20 +4455,39 @@ void wxListMainWindow::DeleteItem( long lindex )
         // become selected - unless there is no next one - so don't adjust
         // m_current in this case
         if ( m_current != index || m_current == count - 1 )
         // become selected - unless there is no next one - so don't adjust
         // m_current in this case
         if ( m_current != index || m_current == count - 1 )

-        {

             m_current--;
             m_current--;

-        }

     }
 
     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
+        wxListLineData * const line = GetLine(index);
+        wxListItemDataList::compatibility_iterator n;
+        wxListItemData *itemData;
+        wxListItem      item;
+        int             itemWidth;
+
+        for (size_t i = 0; i < m_columns.GetCount(); i++)
+        {
+            n = line->m_items.Item( i );
+            itemData = n->GetData();
+            itemData->GetItem(item);
+
+            itemWidth = GetItemWidthWithImage(&item);
+
+            if (itemWidth >= m_aColWidths.Item(i)->nMaxWidth)
+                m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }
+

         ResetVisibleLinesRange();
     }
 
         ResetVisibleLinesRange();
     }
 

+    SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition );
+

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

-

         m_selStore.OnItemDelete(index);
     }
     else
         m_selStore.OnItemDelete(index);
     }
     else


@@ -4145,8 +4498,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);
 }
 


@@ -4172,6 +4523,12 @@ void wxListMainWindow::DeleteColumn( int col )
         }
     }
 
         }
     }
 

+    if ( InReportView() )   //  we only cache max widths when in Report View
+    {
+        delete m_aColWidths.Item(col);
+        m_aColWidths.RemoveAt(col);
+    }
+

     // invalidate it as it has to be recalculated
     m_headerWidth = 0;
 }
     // invalidate it as it has to be recalculated
     m_headerWidth = 0;
 }


@@ -4179,10 +4536,8 @@ void wxListMainWindow::DeleteColumn( int col )
 void wxListMainWindow::DoDeleteAllItems()
 {
     if ( IsEmpty() )
 void wxListMainWindow::DoDeleteAllItems()
 {
     if ( IsEmpty() )

-    {

         // nothing to do - in particular, don't send the event
         return;
         // nothing to do - in particular, don't send the event
         return;

-    }

 
     ResetCurrent();
 
 
     ResetCurrent();
 


@@ -4198,13 +4553,16 @@ void wxListMainWindow::DoDeleteAllItems()
     if ( IsVirtual() )
     {
         m_countVirt = 0;
     if ( IsVirtual() )
     {
         m_countVirt = 0;

-

         m_selStore.Clear();
     }
 
     if ( InReportView() )
     {
         ResetVisibleLinesRange();
         m_selStore.Clear();
     }
 
     if ( InReportView() )
     {
         ResetVisibleLinesRange();

+        for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
+        {
+            m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }

     }
 
     m_lines.Clear();
     }
 
     m_lines.Clear();


@@ -4220,6 +4578,7 @@ void wxListMainWindow::DeleteAllItems()
 void wxListMainWindow::DeleteEverything()
 {
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 void wxListMainWindow::DeleteEverything()
 {
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

 
     DeleteAllItems();
 }
 
     DeleteAllItems();
 }


@@ -4236,17 +4595,18 @@ void wxListMainWindow::EnsureVisible( long index )
     // We have to call this here because the label in question might just have
     // been added and its position is not known yet
     if ( m_dirty )
     // We have to call this here because the label in question might just have
     // been added and its position is not known yet
     if ( m_dirty )

-    {

         RecalculatePositions(true /* no refresh */);
         RecalculatePositions(true /* no refresh */);

-    }

 
     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;
 


@@ -4254,8 +4614,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;


@@ -4283,20 +4652,21 @@ long wxListMainWindow::FindItem(long start, wxUIntPtr data)
 long wxListMainWindow::FindItem( const wxPoint& pt )
 {
     size_t topItem;
 long wxListMainWindow::FindItem( const wxPoint& pt )
 {
     size_t topItem;

-    GetVisibleLinesRange(&topItem, NULL);
+    GetVisibleLinesRange( &topItem, NULL );

 
     wxPoint p;
 
     wxPoint p;

-    GetItemPosition( GetItemCount()-1, p );
-    if( p.y == 0 )
+    GetItemPosition( GetItemCount() - 1, p );
+    if ( p.y == 0 )

         return topItem;
         return topItem;

-    long id = (long) floor( pt.y*double(GetItemCount()-topItem-1)/p.y+topItem );
-    if( id >= 0 && id < (long)GetItemCount() )
+
+    long id = (long)floor( pt.y * double(GetItemCount() - topItem - 1) / p.y + topItem );
+    if ( id >= 0 && id < (long)GetItemCount() )

         return id;
 
     return wxNOT_FOUND;
 }
 
         return id;
 
     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 );
 


@@ -4345,42 +4715,16 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     m_dirty = true;
 
 
     m_dirty = true;
 

-    #if 0
-    // this is unused variable
-    int mode = 0;
-    #endif

     if ( InReportView() )
     {
     if ( InReportView() )
     {

-        #if 0
-        // this is unused variable
-        mode = wxLC_REPORT;
-        #endif

         ResetVisibleLinesRange();
         ResetVisibleLinesRange();

-    }
-    else if ( HasFlag(wxLC_LIST) )
-        #if 0
-        // this is unused variable
-        mode = wxLC_LIST;
-        #else
-        {}
-        #endif
-    else if ( HasFlag(wxLC_ICON) )
-        #if 0
-        // this is unused variable
-        mode = wxLC_ICON;
-        #else
-        {}
-        #endif
-    else if ( HasFlag(wxLC_SMALL_ICON) )
-        #if 0
-        // this is unused variable
-        mode = wxLC_ICON;  // no typo
-        #else
-        {}
-        #endif
-    else
-    {
-        wxFAIL_MSG( _T("unknown mode") );
+
+        // calculate the width of the item and adjust the max column width
+        wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
+        int width = GetItemWidthWithImage(&item);
+        item.SetWidth(width);
+        if (width > pWidthInfo->nMaxWidth)
+            pWidthInfo->nMaxWidth = width;

     }
 
     wxListLineData *line = new wxListLineData(this);
     }
 
     wxListLineData *line = new wxListLineData(this);


@@ -4395,9 +4739,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     // increment the member variables because the current row's index has gone
     // up by one
     if ( HasCurrent() && m_current >= id )
     // increment the member variables because the current row's index has gone
     // up by one
     if ( HasCurrent() && m_current >= id )

-    {

         m_current++;
         m_current++;

-    }

 
     SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
 
 
     SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
 


@@ -4413,15 +4755,20 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
             item.m_width = GetTextLength( item.m_text );
 
         wxListHeaderData *column = new wxListHeaderData( item );
             item.m_width = GetTextLength( item.m_text );
 
         wxListHeaderData *column = new wxListHeaderData( item );

+        wxColWidthInfo *colWidthInfo = new wxColWidthInfo();
+

         bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
         if ( insert )
         {
         bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
         if ( insert )
         {

-            wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
+            wxListHeaderDataList::compatibility_iterator
+                node = m_columns.Item( col );

             m_columns.Insert( node, column );
             m_columns.Insert( node, column );

+            m_aColWidths.Insert( colWidthInfo, col );

         }
         else
         {
             m_columns.Append( column );
         }
         else
         {
             m_columns.Append( column );

+            m_aColWidths.Add( colWidthInfo );

         }
 
         if ( !IsVirtual() )
         }
 
         if ( !IsVirtual() )


@@ -4443,6 +4790,30 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
     }
 }
 
     }
 }
 

+int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
+{
+    int width = 0;
+    wxClientDC dc(this);
+
+    dc.SetFont( GetFont() );
+
+    if (item->GetImage() != -1)
+    {
+        int ix, iy;
+        GetImageSize( item->GetImage(), ix, iy );
+        width += ix + 5;
+    }
+
+    if (!item->GetText().empty())
+    {
+        wxCoord w;
+        dc.GetTextExtent( item->GetText(), &w, NULL );
+        width += w;
+    }
+
+    return width;
+}
+

 // ----------------------------------------------------------------------------
 // sorting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // sorting
 // ----------------------------------------------------------------------------


@@ -4464,6 +4835,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 );


@@ -4476,17 +4852,17 @@ 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
     // FIXME

-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
-    wxScrolledWindow::OnScroll(event);
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
+    wxScrolledCanvas::OnScroll(event);

 #else
     HandleOnScroll( event );
 #endif
 
 #else
     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();


@@ -4558,9 +4934,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 =


@@ -4585,20 +4961,25 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight()
 {
     if ( m_headerWin )
     {
 {
     if ( m_headerWin )
     {

+#ifdef __WXMAC__
+        SInt32 h;
+        GetThemeMetric( kThemeMetricListHeaderHeight, &h );
+#else

         // we use 'g' to get the descent, too
         int w, h, d;
         m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d);
         h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
         // we use 'g' to get the descent, too
         int w, h, d;
         m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d);
         h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;

+#endif

 
         // only update if changed
         if ( h != m_headerHeight )
         {
             m_headerHeight = h;
 
 
         // only update if changed
         if ( h != m_headerHeight )
         {
             m_headerHeight = h;
 

-            m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
-

             if ( HasHeader() )
                 ResizeReportView(true);
             if ( HasHeader() )
                 ResizeReportView(true);

+            else    //why is this needed if it doesn't have a header?
+                m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);

         }
     }
 }
         }
     }
 }


@@ -4608,7 +4989,7 @@ void wxGenericListCtrl::CreateHeaderWindow()
     m_headerWin = new wxListHeaderWindow
                       (
                         this, wxID_ANY, m_mainWin,
     m_headerWin = new wxListHeaderWindow
                       (
                         this, wxID_ANY, m_mainWin,

-                        wxPoint(0, 0),
+                        wxPoint(0,0),

                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL
                       );
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL
                       );


@@ -4625,7 +5006,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;


@@ -4643,32 +5024,44 @@ 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;
 
     // don't create the inner window with the border
     style &= ~wxBORDER_MASK;
 

-    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
+    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 )
     {
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {

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

     }
 #endif
     }
 #endif

+

     if ( InReportView() )
     {
         CreateHeaderWindow();
 
     if ( InReportView() )
     {
         CreateHeaderWindow();
 

-        if ( HasFlag(wxLC_NO_HEADER) )
+#ifdef __WXMAC__
+        if (m_headerWin)

         {
         {

+            wxFont font;
+            font.MacCreateFromThemeFont( kThemeSmallSystemFont );
+            m_headerWin->SetFont( font );
+            CalculateAndSetHeaderHeight();
+        }
+#endif
+
+        if ( HasFlag(wxLC_NO_HEADER) )

             // VZ: why do we create it at all then?
             m_headerWin->Show( false );
             // VZ: why do we create it at all then?
             m_headerWin->Show( false );

-        }

     }
 
     }
 

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

 
     return true;
 }
 
     return true;
 }


@@ -4691,15 +5084,21 @@ void wxGenericListCtrl::SetSingleStyle( long style, bool add )
     }
 
     if (add)
     }
 
     if (add)

-    {

         flag |= style;
         flag |= style;

+    else
+        flag &= ~style;
+
+    // some styles can be set without recreating everything (as happens in
+    // SetWindowStyleFlag() which calls wxListMainWindow::DeleteEverything())
+    if ( !(style & ~(wxLC_HRULES | wxLC_VRULES)) )
+    {
+        Refresh();
+        wxWindow::SetWindowStyleFlag(flag);

     }
     else
     {
     }
     else
     {

-        flag &= ~style;
+        SetWindowStyleFlag( flag );

     }
     }

-
-    SetWindowStyleFlag( flag );

 }
 
 void wxGenericListCtrl::SetWindowStyleFlag( long flag )
 }
 
 void wxGenericListCtrl::SetWindowStyleFlag( long flag )


@@ -4794,7 +5193,8 @@ long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;

-    };
+    }
+

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


@@ -4812,11 +5212,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;
 }


@@ -4834,12 +5241,13 @@ void wxGenericListCtrl::SetItemText( long item, const wxString& str )
 wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const
 {
     wxListItem info;
 wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const
 {
     wxListItem info;

+    info.m_mask = wxLIST_MASK_DATA;

     info.m_itemId = item;
     m_mainWin->GetItem( info );
     return info.m_data;
 }
 
     info.m_itemId = item;
     m_mainWin->GetItem( info );
     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;


@@ -4854,7 +5262,7 @@ wxRect wxGenericListCtrl::GetViewRect() const
     return m_mainWin->GetViewRect();
 }
 
     return m_mainWin->GetViewRect();
 }
 

-bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const
+bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const

 {
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )
 {
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )


@@ -4895,10 +5303,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 )
 {


@@ -4932,6 +5342,32 @@ 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;
+    info.m_itemId = item;
+    info.SetFont( f );
+    m_mainWin->SetItem( info );
+}
+
+wxFont wxGenericListCtrl::GetItemFont( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetFont();
+}
+

 int wxGenericListCtrl::GetSelectedItemCount() const
 {
     return m_mainWin->GetSelectedItemCount();
 int wxGenericListCtrl::GetSelectedItemCount() const
 {
     return m_mainWin->GetSelectedItemCount();


@@ -4959,40 +5395,38 @@ 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)
 {
     if (which == wxIMAGE_LIST_NORMAL)

-    {

         return m_imageListNormal;
         return m_imageListNormal;

-    }

     else if (which == wxIMAGE_LIST_SMALL)
     else if (which == wxIMAGE_LIST_SMALL)

-    {

         return m_imageListSmall;
         return m_imageListSmall;

-    }

     else if (which == wxIMAGE_LIST_STATE)
     else if (which == wxIMAGE_LIST_STATE)

-    {

         return m_imageListState;
         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 )
     {

-        if (m_ownsImageListNormal) delete m_imageListNormal;
+        if (m_ownsImageListNormal)
+            delete m_imageListNormal;

         m_imageListNormal = imageList;
         m_ownsImageListNormal = false;
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
         m_imageListNormal = imageList;
         m_ownsImageListNormal = false;
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {

-        if (m_ownsImageListSmall) delete m_imageListSmall;
+        if (m_ownsImageListSmall)
+            delete m_imageListSmall;

         m_imageListSmall = imageList;
         m_ownsImageListSmall = false;
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
         m_imageListSmall = imageList;
         m_ownsImageListSmall = false;
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {

-        if (m_ownsImageListState) delete m_imageListState;
+        if (m_ownsImageListState)
+            delete m_imageListState;

         m_imageListState = imageList;
         m_ownsImageListState = false;
     }
         m_imageListState = imageList;
         m_ownsImageListState = false;
     }


@@ -5000,7 +5434,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 )


@@ -5032,8 +5466,7 @@ bool wxGenericListCtrl::DeleteAllColumns()
 {
     size_t count = m_mainWin->m_columns.GetCount();
     for ( size_t n = 0; n < count; n++ )
 {
     size_t count = m_mainWin->m_columns.GetCount();
     for ( size_t n = 0; n < count; n++ )

-        DeleteColumn(0);
-
+        DeleteColumn( 0 );

     return true;
 }
 
     return true;
 }
 


@@ -5048,16 +5481,19 @@ bool wxGenericListCtrl::DeleteColumn( int col )
 
     // if we don't have the header any longer, we need to relayout the window
     if ( !GetColumnCount() )
 
     // if we don't have the header any longer, we need to relayout the window
     if ( !GetColumnCount() )

-    {

         ResizeReportView(false /* no header */);
         ResizeReportView(false /* no header */);

-    }
-

     return true;
 }
 
     return true;
 }
 

-void wxGenericListCtrl::Edit( long item )
+wxTextCtrl *wxGenericListCtrl::EditLabel(long item,
+                                         wxClassInfo* textControlClass)

 {
 {

-    m_mainWin->EditLabel( item );
+    return m_mainWin->EditLabel( item, textControlClass );
+}
+
+wxTextCtrl *wxGenericListCtrl::GetEditControl() const
+{
+    return m_mainWin->GetEditControl();

 }
 
 bool wxGenericListCtrl::EnsureVisible( long item )
 }
 
 bool wxGenericListCtrl::EnsureVisible( long item )


@@ -5066,7 +5502,7 @@ bool wxGenericListCtrl::EnsureVisible( long item )
     return true;
 }
 
     return true;
 }
 

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

 {
     return m_mainWin->FindItem( start, str, partial );
 }
 {
     return m_mainWin->FindItem( start, str, partial );
 }


@@ -5082,7 +5518,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 );
 }


@@ -5127,12 +5564,10 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
 
     m_mainWin->InsertColumn( col, item );
 
 
     m_mainWin->InsertColumn( col, item );
 

-    // if we hadn't had header before and have it now we need to relayout the
-    // window
+    // if we hadn't had a header before but have one now
+    // then we need to relayout the window

     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )

-    {

         ResizeReportView(true /* have header */);
         ResizeReportView(true /* have header */);

-    }

 
     m_headerWin->Refresh();
 
 
     m_headerWin->Refresh();
 


@@ -5150,14 +5585,15 @@ long wxGenericListCtrl::InsertColumn( long col, const wxString &heading,
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;
     }
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;
     }

+

     item.m_format = format;
 
     return InsertColumn( col, item );
 }
 
     item.m_format = format;
 
     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.


@@ -5186,7 +5622,6 @@ void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
         return;
 
     ResizeReportView(m_mainWin->HasHeader());
         return;
 
     ResizeReportView(m_mainWin->HasHeader());

-

     m_mainWin->RecalculatePositions();
 }
 
     m_mainWin->RecalculatePositions();
 }
 


@@ -5198,7 +5633,12 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
     if ( showHeader )
     {
         m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
     if ( showHeader )
     {
         m_headerWin->SetSize( 0, 0, cw, m_headerHeight );

-        m_mainWin->SetSize( 0, m_headerHeight + 1, cw, ch - m_headerHeight - 1 );
+        if(ch > m_headerHeight)
+            m_mainWin->SetSize( 0, m_headerHeight + 1,
+                                   cw, ch - m_headerHeight - 1 );
+        else
+            m_mainWin->SetSize( 0, m_headerHeight + 1,
+                                   cw, 0);

     }
     else // no header window
     {
     }
     else // no header window
     {


@@ -5244,9 +5684,7 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
     }
 
     if (m_headerWin)
     }
 
     if (m_headerWin)

-    {

         m_headerWin->SetForegroundColour( colour );
         m_headerWin->SetForegroundColour( colour );

-    }

 
     return true;
 }
 
     return true;
 }


@@ -5273,13 +5711,7 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     return true;
 }
 
     return true;
 }
 

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

 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 {
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 {


@@ -5312,7 +5744,7 @@ wxDropTarget *wxGenericListCtrl::GetDropTarget() const
     return m_mainWin->GetDropTarget();
 }
 
     return m_mainWin->GetDropTarget();
 }
 

-#endif // wxUSE_DRAG_AND_DROP
+#endif

 
 bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
 {
 
 bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
 {


@@ -5335,13 +5767,23 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
     return m_mainWin->PopupMenu( menu, x, y );
 #else
     return false;
     return m_mainWin->PopupMenu( menu, x, y );
 #else
     return false;

-#endif // wxUSE_MENUS
+#endif
+}
+
+void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
+{
+    m_mainWin->DoClientToScreen(x, y);
+}
+
+void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
+{
+    m_mainWin->DoScreenToClient(x, y);

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

-    /* The test in window.cpp fails as we are a composite
-       window, so it checks against "this", but not m_mainWin. */
+    // The test in window.cpp fails as we are a composite
+    // window, so it checks against "this", but not m_mainWin.

     if ( DoFindFocus() != this )
         m_mainWin->SetFocus();
 }
     if ( DoFindFocus() != this )
         m_mainWin->SetFocus();
 }


@@ -5351,7 +5793,7 @@ wxSize wxGenericListCtrl::DoGetBestSize() const
     // Something is better than nothing...
     // 100x80 is what the MSW version will get from the default
     // wxControl::DoGetBestSize
     // Something is better than nothing...
     // 100x80 is what the MSW version will get from the default
     // wxControl::DoGetBestSize

-    return wxSize(100,80);
+    return wxSize(100, 80);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -5371,10 +5813,18 @@ int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {
     wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
                 -1,
 {
     wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
                 -1,

-                wxT("List control has an image list, OnGetItemImage should be overridden."));
+                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));

     return -1;
 }
 
     return -1;
 }
 

+int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
+{
+    if (!column)
+        return OnGetItemImage(item);
+
+   return -1;
+}
+

 wxListItemAttr *
 wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {
 wxListItemAttr *
 wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {


@@ -5402,13 +5852,12 @@ void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 

-/*
- * Generic wxListCtrl is more or less a container for two other
- * windows which drawings are done upon. These are namely
- * 'm_headerWin' and 'm_mainWin'.
- * Here we override 'virtual wxWindow::Refresh()' to mimic the
- * behaviour wxListCtrl has under wxMSW.
- */
+// Generic wxListCtrl is more or less a container for two other
+// windows which drawings are done upon. These are namely
+// 'm_headerWin' and 'm_mainWin'.
+// Here we override 'virtual wxWindow::Refresh()' to mimic the
+// behaviour wxListCtrl has under wxMSW.
+//

 void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
 {
     if (!rect)
 void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
 {
     if (!rect)


@@ -5434,7 +5883,6 @@ void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
                 rectHeader.Offset(-x, -y);
                 m_headerWin->Refresh(eraseBackground, &rectHeader);
             }
                 rectHeader.Offset(-x, -y);
                 m_headerWin->Refresh(eraseBackground, &rectHeader);
             }

-

         }
 
         // Refresh the main window
         }
 
         // Refresh the main window


@@ -5453,15 +5901,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

-