Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index ac046f88fdd61982930ada99946a2ab0c1268849..4b725aaad44544e02e7275c31257db6065a83d6d 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -23,11 +23,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "listctrl.h"
-    #pragma implementation "listctrlbase.h"
-#endif
-

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


@@ -69,8 +64,19 @@
 #endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
 
 #include "wx/selstore.h"
 #endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
 
 #include "wx/selstore.h"

-

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

+#include "wx/math.h"
+
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#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
+

 
 // ----------------------------------------------------------------------------
 // events
 
 // ----------------------------------------------------------------------------
 // events


@@ -82,8 +88,10 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_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)
 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_ITEM_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)


@@ -103,30 +111,34 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-// the height of the header window (FIXME: should depend on its font!)
-static const int HEADER_HEIGHT = 23;
+// // the height of the header window (FIXME: should depend on its font!)
+// static const int HEADER_HEIGHT = 23;

 
 

-// the scrollbar units

 static const int SCROLL_UNIT_X = 15;
 static const int SCROLL_UNIT_X = 15;

-static const int SCROLL_UNIT_Y = 15;

 
 // the spacing between the lines (in report mode)
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label
 
 // the spacing between the lines (in report mode)
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label

-static const int EXTRA_WIDTH = 3;
+static const int EXTRA_WIDTH = 4;

 static const int EXTRA_HEIGHT = 4;
 
 static const int EXTRA_HEIGHT = 4;
 

+// margin between the window and the items
+static const int EXTRA_BORDER_X = 2;
+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;
 
 // offset for the header window
 static const int HEADER_OFFSET_X = 1;
 static const int HEADER_OFFSET_Y = 1;
 

+// margin between rows of icons in [small] icon view
+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;


@@ -135,6 +147,25 @@ static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 // 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)
 //-----------------------------------------------------------------------------


@@ -147,7 +178,7 @@ public:
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }

-    void SetData( long data ) { m_data = data; }
+    void SetData( wxUIntPtr data ) { m_data = data; }

     void SetPosition( int x, int y );
     void SetSize( int width, int height );
 
     void SetPosition( int x, int y );
     void SetSize( int width, int height );
 


@@ -186,7 +217,7 @@ public:
     int m_image;
 
     // user data associated with the item
     int m_image;
 
     // user data associated with the item

-    long m_data;
+    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
 
     // 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


@@ -253,7 +284,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
 {


@@ -275,6 +306,18 @@ 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 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;
+            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;
 
     // is this item selected? [NB: not used in virtual mode]
     } *m_gi;
 
     // is this item selected? [NB: not used in virtual mode]


@@ -305,7 +348,7 @@ public:
     void CalculateSize( wxDC *dc, int spacing );
 
     // remember the position this line appears at
     void CalculateSize( wxDC *dc, int spacing );
 
     // remember the position this line appears at

-    void SetPosition( int x, int y,  int window_width, int spacing );
+    void SetPosition( int x, int y, int spacing );

 
     // wxListCtrl API
 
 
     // wxListCtrl API
 


@@ -318,7 +361,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);


@@ -369,7 +412,7 @@ private:
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+WX_DEFINE_OBJARRAY(wxListLineDataArray)

 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)


@@ -422,7 +465,7 @@ 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_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()


@@ -464,6 +507,7 @@ private:
     wxString            m_startValue;
     size_t              m_itemEdited;
     bool                m_finished;
     wxString            m_startValue;
     size_t              m_itemEdited;
     bool                m_finished;

+    bool                m_aboutToFinish;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -474,7 +518,7 @@ 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 wxScrolledWindow
 {


@@ -489,6 +533,8 @@ 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


@@ -502,20 +548,20 @@ public:
 
     // do we have a header window?
     bool HasHeader() const
 
     // do we have a header window?
     bool HasHeader() const

-        { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); }
+        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }

 
     void HighlightAll( bool on );
 
     // all these functions only do something if the line is currently visible
 
 
     void HighlightAll( bool on );
 
     // all these functions only do something if the line is currently visible
 

-    // change the line "selected" state, return TRUE if it really changed
-    bool HighlightLine( size_t line, bool highlight = TRUE);
+    // change the line "selected" state, return true if it really changed
+    bool HighlightLine( size_t line, bool highlight = true);

 
     // as HighlightLine() but do it for the range of lines: this is incredibly
     // more efficient for virtual list controls!
     //
     // NB: unlike HighlightLine() this one does refresh the lines on screen
 
     // as HighlightLine() but do it for the range of lines: this is incredibly
     // more efficient for virtual list controls!
     //
     // NB: unlike HighlightLine() this one does refresh the lines on screen

-    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = TRUE );
+    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true );

 
     // toggle the line state and refresh it
     void ReverseHighlight( size_t line )
 
     // toggle the line state and refresh it
     void ReverseHighlight( size_t line )


@@ -573,8 +619,6 @@ public:
     void Freeze();
     void Thaw();
 
     void Freeze();
     void Thaw();
 

-    void SetFocus();
-

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


@@ -597,8 +641,8 @@ public:
     int GetTextLength( const wxString &s ) const;
 
     void SetImageList( wxImageListType *imageList, int which );
     int GetTextLength( const wxString &s ) const;
 
     void SetImageList( wxImageListType *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 );

 
     void SetColumn( int col, wxListItem &item );
     void SetColumnWidth( int col, int width );
 
     void SetColumn( int col, wxListItem &item );
     void SetColumnWidth( int col, int width );


@@ -614,14 +658,17 @@ 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;
     int GetItemState( long item, long stateMask ) const;
     void GetItemRect( long index, wxRect &rect ) const;

+    wxRect GetViewRect() const;

     bool GetItemPosition( long item, wxPoint& pos ) const;
     int GetSelectedItemCount() const;
 
     wxString GetItemText(long item) const
     {
         wxListItem info;
     bool GetItemPosition( long item, wxPoint& pos ) const;
     int GetSelectedItemCount() const;
 
     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;


@@ -637,7 +684,7 @@ public:
     }
 
     // set the scrollbars and update the positions of the items
     }
 
     // set the scrollbars and update the positions of the items

-    void RecalculatePositions(bool noRefresh = FALSE);
+    void RecalculatePositions(bool noRefresh = false);

 
     // refresh the window and the header
     void RefreshAll();
 
     // refresh the window and the header
     void RefreshAll();


@@ -648,11 +695,13 @@ public:
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );

-    long FindItem( long start, const wxString& str, bool partial = FALSE );
-    long FindItem( long start, long data);
+    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 );
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     long HitTest( int x, int y, int &flags );
     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;


@@ -667,17 +716,17 @@ 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)
     {
         if ( !wxScrolledWindow::SetFont(font) )
 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {
         if ( !wxScrolledWindow::SetFont(font) )

-            return FALSE;
+            return false;

 
         m_lineHeight = 0;
 
 
         m_lineHeight = 0;
 

-        return TRUE;
+        return true;

     }
 
     // these are for wxListLineData usage only
     }
 
     // these are for wxListLineData usage only


@@ -723,8 +772,6 @@ public:
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;

-    int                  m_xScroll,
-                         m_yScroll;

     wxImageListType         *m_small_image_list;
     wxImageListType         *m_normal_image_list;
     int                  m_small_spacing;
     wxImageListType         *m_small_image_list;
     wxImageListType         *m_normal_image_list;
     int                  m_small_spacing;


@@ -736,10 +783,12 @@ 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:
     // the total count of items in a virtual list control
 
 protected:
     // the total count of items in a virtual list control


@@ -752,9 +801,6 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // intiialize m_[xy]Scroll
-    void InitScrolling();
-

     // get the line data for the given index
     wxListLineData *GetLine(size_t n) const
     {
     // get the line data for the given index
     wxListLineData *GetLine(size_t n) const
     {


@@ -786,11 +832,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:


@@ -915,7 +957,7 @@ void wxListItemData::SetSize( int width, int height )
 
 bool wxListItemData::IsHit( int x, int y ) const
 {
 
 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()).Inside(x, y);
 }


@@ -950,9 +992,19 @@ 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 )
     {


@@ -1022,11 +1074,7 @@ 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::SetFormat( int format )
 }
 
 void wxListHeaderData::SetFormat( int format )


@@ -1100,7 +1148,7 @@ wxListLineData::wxListLineData( wxListMainWindow *owner )
         m_gi = new GeometryInfo;
     }
 
         m_gi = new GeometryInfo;
     }
 

-    m_highlighted = FALSE;
+    m_highlighted = false;

 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }


@@ -1112,96 +1160,89 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 
     wxListItemData *item = node->GetData();
 
 
     wxListItemData *item = node->GetData();
 

+    wxString s;
+    wxCoord lw, lh;
+

     switch ( GetMode() )
     {
         case wxLC_ICON:
         case wxLC_SMALL_ICON:
     switch ( GetMode() )
     {
         case wxLC_ICON:
         case wxLC_SMALL_ICON:

-            {
-                m_gi->m_rectAll.width = spacing;
-
-                wxString s = item->GetText();
-
-                wxCoord lw, lh;
-                if ( s.empty() )
-                {
-                    lh =
-                    m_gi->m_rectLabel.width =
-                    m_gi->m_rectLabel.height = 0;
-                }
-                else // has label
-                {
-                    dc->GetTextExtent( s, &lw, &lh );
-                    if (lh < SCROLL_UNIT_Y)
-                        lh = SCROLL_UNIT_Y;
-                    lw += EXTRA_WIDTH;
-                    lh += EXTRA_HEIGHT;
-
-                    m_gi->m_rectAll.height = spacing + lh;
-                    if (lw > spacing)
-                        m_gi->m_rectAll.width = lw;
-
-                    m_gi->m_rectLabel.width = lw;
-                    m_gi->m_rectLabel.height = lh;
-                }
+            m_gi->m_rectAll.width = spacing;

 
 

-                if (item->HasImage())
-                {
-                    int w, h;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_gi->m_rectIcon.width = w + 8;
-                    m_gi->m_rectIcon.height = h + 8;
-
-                    if ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width )
-                        m_gi->m_rectAll.width = m_gi->m_rectIcon.width;
-                    if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 )
-                        m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4;
-                }
+            s = item->GetText();

 
 

-                if ( item->HasText() )
-                {
-                    m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width;
-                    m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height;
-                }
-                else // no text, highlight the icon
-                {
-                    m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
-                    m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;
-                }
+            if ( s.empty() )
+            {
+                lh =
+                m_gi->m_rectLabel.width =
+                m_gi->m_rectLabel.height = 0;

             }
             }

-            break;
-
-        case wxLC_LIST:
+            else // has label

             {
             {

-                wxString s = item->GetTextForMeasuring();
-
-                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 dc->GetTextExtent( s, &lw, &lh );

-                if (lh < SCROLL_UNIT_Y)
-                    lh = SCROLL_UNIT_Y;

                 lw += EXTRA_WIDTH;
                 lh += EXTRA_HEIGHT;
 
                 lw += EXTRA_WIDTH;
                 lh += EXTRA_HEIGHT;
 

+                m_gi->m_rectAll.height = spacing + lh;
+                if (lw > spacing)
+                    m_gi->m_rectAll.width = lw;
+

                 m_gi->m_rectLabel.width = lw;
                 m_gi->m_rectLabel.height = lh;
                 m_gi->m_rectLabel.width = lw;
                 m_gi->m_rectLabel.height = lh;

+            }
+
+            if (item->HasImage())
+            {
+                int w, h;
+                m_owner->GetImageSize( item->GetImage(), w, h );
+                m_gi->m_rectIcon.width = w + 8;
+                m_gi->m_rectIcon.height = h + 8;
+
+                if ( m_gi->m_rectIcon.width > m_gi->m_rectAll.width )
+                    m_gi->m_rectAll.width = m_gi->m_rectIcon.width;
+                if ( m_gi->m_rectIcon.height + lh > m_gi->m_rectAll.height - 4 )
+                    m_gi->m_rectAll.height = m_gi->m_rectIcon.height + lh + 4;
+            }

 
 

-                m_gi->m_rectAll.width = lw;
-                m_gi->m_rectAll.height = lh;
+            if ( item->HasText() )
+            {
+                m_gi->m_rectHighlight.width = m_gi->m_rectLabel.width;
+                m_gi->m_rectHighlight.height = m_gi->m_rectLabel.height;
+            }
+            else // no text, highlight the icon
+            {
+                m_gi->m_rectHighlight.width = m_gi->m_rectIcon.width;
+                m_gi->m_rectHighlight.height = m_gi->m_rectIcon.height;
+            }
+            break;

 
 

-                if (item->HasImage())
-                {
-                    int w, h;
-                    m_owner->GetImageSize( item->GetImage(), w, h );
-                    m_gi->m_rectIcon.width = w;
-                    m_gi->m_rectIcon.height = h;
-
-                    m_gi->m_rectAll.width += 4 + w;
-                    if (h > m_gi->m_rectAll.height)
-                        m_gi->m_rectAll.height = h;
-                }
+        case wxLC_LIST:
+            s = item->GetTextForMeasuring();

 
 

-                m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
-                m_gi->m_rectHighlight.height = m_gi->m_rectAll.height;
+            dc->GetTextExtent( s, &lw, &lh );
+            lw += EXTRA_WIDTH;
+            lh += EXTRA_HEIGHT;
+
+            m_gi->m_rectLabel.width = lw;
+            m_gi->m_rectLabel.height = lh;
+
+            m_gi->m_rectAll.width = lw;
+            m_gi->m_rectAll.height = lh;
+
+            if (item->HasImage())
+            {
+                int w, h;
+                m_owner->GetImageSize( item->GetImage(), w, h );
+                m_gi->m_rectIcon.width = w;
+                m_gi->m_rectIcon.height = h;
+
+                m_gi->m_rectAll.width += 4 + w;
+                if (h > m_gi->m_rectAll.height)
+                    m_gi->m_rectAll.height = h;

             }
             }

+
+            m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
+            m_gi->m_rectHighlight.height = m_gi->m_rectAll.height;

             break;
 
         case wxLC_REPORT:
             break;
 
         case wxLC_REPORT:


@@ -1213,9 +1254,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
     }
 }
 
     }
 }
 

-void wxListLineData::SetPosition( int x, int y,
-                                  int WXUNUSED(window_width),
-                                  int spacing )
+void wxListLineData::SetPosition( int x, int y, int spacing )

 {
     wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
     wxCHECK_RET( node, _T("no subitems at all??") );
 {
     wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
     wxCHECK_RET( node, _T("no subitems at all??") );


@@ -1321,7 +1360,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)


@@ -1425,10 +1464,10 @@ bool wxListLineData::SetAttributes(wxDC *dc,
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxListLineData::Draw( wxDC *dc )
 }
 
 void wxListLineData::Draw( wxDC *dc )


@@ -1445,20 +1484,31 @@ void wxListLineData::Draw( wxDC *dc )
         dc->DrawRectangle( m_gi->m_rectHighlight );
     }
 
         dc->DrawRectangle( m_gi->m_rectHighlight );
     }
 

+    // just for debugging to better see where the items are
+#if 0
+    dc->SetPen(*wxRED_PEN);
+    dc->SetBrush(*wxTRANSPARENT_BRUSH);
+    dc->DrawRectangle( m_gi->m_rectAll );
+    dc->SetPen(*wxGREEN_PEN);
+    dc->DrawRectangle( m_gi->m_rectIcon );
+#endif // 0
+

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

-        wxRect rectIcon = m_gi->m_rectIcon;
-        m_owner->DrawImage( item->GetImage(), dc,
-                            rectIcon.x, rectIcon.y );
+        // centre the image inside our rectangle, this looks nicer when items
+        // ae aligned in a row
+        const wxRect& rectIcon = m_gi->m_rectIcon;
+
+        m_owner->DrawImage(item->GetImage(), dc, rectIcon.x, rectIcon.y);

     }
 
     if (item->HasText())
     {
     }
 
     if (item->HasText())
     {

-        wxRect rectLabel = m_gi->m_rectLabel;
+        const wxRect& rectLabel = m_gi->m_rectLabel;

 
         wxDCClipper clipper(*dc, rectLabel);
 
         wxDCClipper clipper(*dc, rectLabel);

-        dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
+        dc->DrawText(item->GetText(), rectLabel.x, rectLabel.y);

     }
 }
 
     }
 }
 


@@ -1584,14 +1634,14 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
 
 bool wxListLineData::Highlight( bool on )
 {
 
 bool wxListLineData::Highlight( bool on )
 {

-    wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Highlight") );
+    wxCHECK_MSG( !IsVirtual(), false, _T("unexpected call to Highlight") );

 
     if ( on == m_highlighted )
 
     if ( on == m_highlighted )

-        return FALSE;
+        return false;

 
     m_highlighted = on;
 
 
     m_highlighted = on;
 

-    return TRUE;
+    return true;

 }
 
 void wxListLineData::ReverseHighlight( void )
 }
 
 void wxListLineData::ReverseHighlight( void )


@@ -1614,8 +1664,8 @@ END_EVENT_TABLE()
 void wxListHeaderWindow::Init()
 {
     m_currentCursor = (wxCursor *) NULL;
 void wxListHeaderWindow::Init()
 {
     m_currentCursor = (wxCursor *) NULL;

-    m_isDragging = FALSE;
-    m_dirty = FALSE;
+    m_isDragging = false;
+    m_dirty = false;

 }
 
 wxListHeaderWindow::wxListHeaderWindow()
 }
 
 wxListHeaderWindow::wxListHeaderWindow()


@@ -1640,7 +1690,18 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
     m_owner = owner;
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 
     m_owner = owner;
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 

-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+#if _USE_VISATTR
+    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );
+#else
+    SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+    SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+    if (!m_hasFont)
+        SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT ));
+#endif

 }
 
 wxListHeaderWindow::~wxListHeaderWindow()
 }
 
 wxListHeaderWindow::~wxListHeaderWindow()


@@ -1685,11 +1746,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.SetBackgroundMode(wxTRANSPARENT);
 
 
     dc.SetBackgroundMode(wxTRANSPARENT);
 

-    // do *not* use the listctrl colour for headers - one day we will have a
-    // function to set it separately
-    //dc.SetTextForeground( *wxBLACK );
-    dc.SetTextForeground(wxSystemSettings::
-                            GetSystemColour( wxSYS_COLOUR_WINDOWTEXT ));
+    dc.SetTextForeground(GetForegroundColour());

 
     int x = HEADER_OFFSET_X;
 
 
     int x = HEADER_OFFSET_X;
 


@@ -1702,22 +1759,28 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         // the width of the rect to draw: make it smaller to fit entirely
         // inside the column rect
 
         // the width of the rect to draw: make it smaller to fit entirely
         // inside the column rect

+#ifdef __WXMAC__
+        int cw = wCol ;
+        int ch = h ;
+#else

         int cw = wCol - 2;
         int cw = wCol - 2;

-
+        int ch = h-2 ;
+#endif

         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
                                     dc,

-                                    wxRect(x, HEADER_OFFSET_Y, cw, h - 2),
+                                    wxRect(x, HEADER_OFFSET_Y, cw, ch),

                                     m_parent->IsEnabled() ? 0
                                     m_parent->IsEnabled() ? 0

-                                                          : wxCONTROL_DISABLED
+                                                          : (int)wxCONTROL_DISABLED

                                 );
 
         // see if we have enough space for the column label
 
         // for this we need the width of the text
         wxCoord wLabel;
                                 );
 
         // see if we have enough space for the column label
 
         // for this we need the width of the text
         wxCoord wLabel;

-        dc.GetTextExtent(item.GetText(), &wLabel, NULL);
+        wxCoord hLabel;
+        dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);

         wLabel += 2*EXTRA_WIDTH;
 
         // and the width of the icon, if any
         wLabel += 2*EXTRA_WIDTH;
 
         // and the width of the icon, if any


@@ -1782,7 +1845,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
 
         dc.DrawText( item.GetText(),
         wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
 
         dc.DrawText( item.GetText(),

-                     xAligned + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+                     xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );

 
         x += wCol;
     }
 
         x += wCol;
     }


@@ -1841,8 +1904,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         if (event.ButtonUp())
         {
             ReleaseMouse();
         if (event.ButtonUp())
         {
             ReleaseMouse();

-            m_isDragging = FALSE;
-            m_dirty = TRUE;
+            m_isDragging = false;
+            m_dirty = true;

             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition());
         }
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition());
         }


@@ -1861,12 +1924,12 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     else // not dragging
     {
         m_minX = 0;
     else // not dragging
     {
         m_minX = 0;

-        bool hit_border = FALSE;
+        bool hit_border = false;

 
         // 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++)


@@ -1877,7 +1940,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border

-                hit_border = TRUE;
+                hit_border = true;

                 break;
             }
 
                 break;
             }
 


@@ -1900,10 +1963,10 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
                 if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
                                    event.GetPosition()) )
                 {
                 if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
                                    event.GetPosition()) )
                 {

-                    m_isDragging = TRUE;
+                    m_isDragging = true;

                     m_currentX = x;
                     m_currentX = x;

-                    DrawCurrent();

                     CaptureMouse();
                     CaptureMouse();

+                    DrawCurrent();

                 }
                 //else: column resizing was vetoed by the user code
             }
                 }
                 //else: column resizing was vetoed by the user code
             }


@@ -1938,9 +2001,10 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_owner->SetFocus();
 void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_owner->SetFocus();

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


@@ -1986,7 +2050,8 @@ wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit)
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;

-    m_finished = FALSE;
+    m_finished = false;
+    m_aboutToFinish = false;

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


@@ -2004,9 +2069,9 @@ void wxListTextCtrl::Finish()
     {
         wxPendingDelete.Append(this);
 
     {
         wxPendingDelete.Append(this);
 

-        m_finished = TRUE;
+        m_finished = true;

 
 

-        m_owner->SetFocus();
+        m_owner->SetFocusIgnoringChildren();

     }
 }
 
     }
 }
 


@@ -2017,19 +2082,19 @@ bool wxListTextCtrl::AcceptChanges()
     if ( value == m_startValue )
     {
         // nothing changed, always accept
     if ( value == m_startValue )
     {
         // nothing changed, always accept

-        return TRUE;
+        return true;

     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // vetoed by the user
     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // vetoed by the user

-        return FALSE;
+        return false;

     }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
 
     }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
 

-    return TRUE;
+    return true;

 }
 
 void wxListTextCtrl::OnChar( wxKeyEvent &event )
 }
 
 void wxListTextCtrl::OnChar( wxKeyEvent &event )


@@ -2037,12 +2102,12 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            if ( !AcceptChanges() )
-            {
-                // vetoed by the user code
-                break;
-            }
-            //else: fall through
+            m_aboutToFinish = true;
+            // Notify the owner about the changes
+            AcceptChanges();
+            // Even if vetoed, close the control (consistent with MSW)
+            Finish();
+            break;

 
         case WXK_ESCAPE:
             Finish();
 
         case WXK_ESCAPE:
             Finish();


@@ -2072,22 +2137,25 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;

-    SetSize(sx, -1);
+    SetSize(sx, wxDefaultCoord);

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

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

     {
     {

-        // We must finish regardless of success, otherwise we'll get focus problems
+        // We must finish regardless of success, otherwise we'll get
+        // focus problems:

         Finish();
         Finish();

-    
+

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

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

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


@@ -2109,7 +2177,7 @@ END_EVENT_TABLE()
 
 void wxListMainWindow::Init()
 {
 
 void wxListMainWindow::Init()
 {

-    m_dirty = TRUE;
+    m_dirty = true;

     m_countVirt = 0;
     m_lineFrom =
     m_lineTo = (size_t)-1;
     m_countVirt = 0;
     m_lineFrom =
     m_lineTo = (size_t)-1;


@@ -2124,43 +2192,27 @@ void wxListMainWindow::Init()
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

     m_dragCount = 0;
     m_dragCount = 0;

-    m_isCreated = FALSE;
+    m_isCreated = false;

 
 

-    m_lastOnSame = FALSE;
+    m_lastOnSame = false;

     m_renameTimer = new wxListRenameTimer( this );
 
     m_current =
     m_lineLastClicked =
     m_renameTimer = new wxListRenameTimer( this );
 
     m_current =
     m_lineLastClicked =

+    m_lineSelectSingleOnUp =

     m_lineBeforeLastClicked = (size_t)-1;
 
     m_freezeCount = 0;
 }
 
     m_lineBeforeLastClicked = (size_t)-1;
 
     m_freezeCount = 0;
 }
 

-void wxListMainWindow::InitScrolling()
-{
-    if ( HasFlag(wxLC_REPORT) )
-    {
-        m_xScroll = SCROLL_UNIT_X;
-        m_yScroll = SCROLL_UNIT_Y;
-    }
-    else
-    {
-        m_xScroll = SCROLL_UNIT_Y;
-        m_yScroll = 0;
-    }
-}
-

 wxListMainWindow::wxListMainWindow()
 {
     Init();
 
     m_highlightBrush =
     m_highlightUnfocusedBrush = (wxBrush *) NULL;
 wxListMainWindow::wxListMainWindow()
 {
     Init();
 
     m_highlightBrush =
     m_highlightUnfocusedBrush = (wxBrush *) NULL;

-
-    m_xScroll =
-    m_yScroll = 0;

 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,
 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,


@@ -2192,19 +2244,20 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                        wxSOLID
                                     );
 
                                        wxSOLID
                                     );
 

-    wxSize sz = size;
-    sz.y = 25;
-
-    InitScrolling();
-    SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
+    SetScrollbars( 0, 0, 0, 0, 0, 0 );

 
 

-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
+    wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );

 }
 
 wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 }
 
 wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

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


@@ -2264,8 +2317,6 @@ wxListLineData *wxListMainWindow::GetDummyLine() const
 
 wxCoord wxListMainWindow::GetLineHeight() const
 {
 
 wxCoord wxListMainWindow::GetLineHeight() const
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
-

     // we cache the line height as calling GetTextExtent() is slow
     if ( !m_lineHeight )
     {
     // we cache the line height as calling GetTextExtent() is slow
     if ( !m_lineHeight )
     {


@@ -2277,9 +2328,6 @@ wxCoord wxListMainWindow::GetLineHeight() const
         wxCoord y;
         dc.GetTextExtent(_T("H"), NULL, &y);
 
         wxCoord y;
         dc.GetTextExtent(_T("H"), NULL, &y);
 

-        if ( y < SCROLL_UNIT_Y )
-            y = SCROLL_UNIT_Y;
-

         if ( m_small_image_list && m_small_image_list->GetImageCount() )
         {
             int iw = 0;
         if ( m_small_image_list && m_small_image_list->GetImageCount() )
         {
             int iw = 0;


@@ -2297,7 +2345,7 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
 wxCoord wxListMainWindow::GetLineY(size_t line) const
 {
 
 wxCoord wxListMainWindow::GetLineY(size_t line) const
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _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();
 }


@@ -2389,7 +2437,7 @@ bool wxListMainWindow::IsHighlighted(size_t line) const
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") );
+        wxCHECK_MSG( ld, false, _T("invalid index in IsHighlighted") );

 
         return ld->IsHighlighted();
     }
 
         return ld->IsHighlighted();
     }


@@ -2440,7 +2488,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") );
+        wxCHECK_MSG( ld, false, _T("invalid index in HighlightLine") );

 
         changed = ld->Highlight(highlight);
     }
 
         changed = ld->Highlight(highlight);
     }


@@ -2456,7 +2504,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
 
 void wxListMainWindow::RefreshLine( size_t line )
 {

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2478,7 +2526,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
 
     wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
 
 
     wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2509,7 +2557,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
 
 void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {
 
 void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2534,7 +2582,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
     else // !report
     {
         // TODO: how to do it more efficiently?
     else // !report
     {
         // TODO: how to do it more efficiently?

-        m_dirty = TRUE;
+        m_dirty = true;

     }
 }
 
     }
 }
 


@@ -2611,7 +2659,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.SetFont( GetFont() );
 
 
     dc.SetFont( GetFont() );
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         int lineHeight = GetLineHeight();
 
     {
         int lineHeight = GetLineHeight();
 


@@ -2679,7 +2727,6 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             wxPen pen(GetRuleColour(), 1, wxSOLID);
 
         {
             wxPen pen(GetRuleColour(), 1, wxSOLID);
 

-            int col = 0;

             wxRect firstItemRect;
             wxRect lastItemRect;
             GetItemRect(visibleFrom, firstItemRect);
             wxRect firstItemRect;
             wxRect lastItemRect;
             GetItemRect(visibleFrom, firstItemRect);


@@ -2687,7 +2734,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);

-            for (col = 0; col < GetColumnCount(); col++)
+            for (int col = 0; col < GetColumnCount(); col++)

             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;


@@ -2705,22 +2752,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

+#ifndef __WXMAC__
+    // Don't draw rect outline under Mac at all.

     if ( HasCurrent() )
     {
     if ( HasCurrent() )
     {

-        // don't draw rect outline under Max if we already have the background
-        // color but under other platforms only draw it if we do: it is a bit
-        // silly to draw "focus rect" if we don't have focus!
-#ifdef __WXMAC__
-        if ( !m_hasFocus )
-#else // !__WXMAC__

         if ( m_hasFocus )
         if ( m_hasFocus )

-#endif // __WXMAC__/!__WXMAC__

         {
             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
             dc.DrawRectangle( GetLineHighlightRect(m_current) );
         }
     }
         {
             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
             dc.DrawRectangle( GetLineHighlightRect(m_current) );
         }
     }

+#endif

 
     dc.EndDrawing();
 }
 
     dc.EndDrawing();
 }


@@ -2734,7 +2777,7 @@ void wxListMainWindow::HighlightAll( bool on )
         // 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) )
         {

-            HighlightLine(m_current, FALSE);
+            HighlightLine(m_current, false);

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


@@ -2746,7 +2789,7 @@ void wxListMainWindow::HighlightAll( bool 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() );


@@ -2823,7 +2866,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()") );
+    wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );

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


@@ -2831,23 +2874,13 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
                 le.IsAllowed();
 }
 
                 le.IsAllowed();
 }
 

-#ifdef __VMS__ // Ignore unreacheable code
-# pragma message disable initnotreach
-#endif
-

 void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 {
 void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 {

-    // wxMSW seems not to notify the program about
-    // cancelled label edits.
-    return;
-

     // let owner know that the edit was cancelled
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
     // let owner know that the edit was cancelled
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );

-    
-    // These only exist for wxTreeCtrl, which should probably be changed
-    // le.m_editCancelled = TRUE;
-    // le.m_label = wxEmptyString;
-    
+
+    le.SetEditCanceled(true);
+

     le.SetEventObject( GetParent() );
     le.m_itemIndex = itemEdit;
 
     le.SetEventObject( GetParent() );
     le.m_itemIndex = itemEdit;
 


@@ -2858,9 +2891,6 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 
     GetEventHandler()->ProcessEvent( le );
 }
 
     GetEventHandler()->ProcessEvent( le );
 }

-#ifdef __VMS__
-# pragma message enable initnotreach
-#endif

 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {


@@ -2868,6 +2898,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
 
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
 

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

     if ( !HasCurrent() || IsEmpty() )
         return;
 
     if ( !HasCurrent() || IsEmpty() )
         return;
 


@@ -2888,7 +2925,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     size_t count = GetItemCount(),
            current;
 
     size_t count = GetItemCount(),
            current;
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         current = y / GetLineHeight();
         if ( current < count )
     {
         current = y / GetLineHeight();
         if ( current < count )


@@ -2926,7 +2963,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 );
 


@@ -2943,11 +2980,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
         return;
     }
 

-    bool forceClick = FALSE;
+    bool forceClick = false;

     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();
     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();

-        m_lastOnSame = FALSE;
+        m_lastOnSame = false;

 
         if ( current == m_lineLastClicked )
         {
 
         if ( current == m_lineLastClicked )
         {


@@ -2957,26 +2994,56 @@ 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
             // a double click, but as a simple click instead

-            forceClick = TRUE;
+            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)
+        {
+            // select single line
+            HighlightAll( false );
+            ReverseHighlight(m_lineSelectSingleOnUp);
+        }
+        if (m_lastOnSame)

         {
         {

-            m_renameTimer->Start( 100, TRUE );
+            if ((current == m_current) &&
+                (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
+                HasFlag(wxLC_EDIT_LABELS) )
+            {
+                m_renameTimer->Start( 100, true );
+            }

         }
         }

-        m_lastOnSame = FALSE;
+        m_lastOnSame = false;
+        m_lineSelectSingleOnUp = (size_t) -1;
+    }
+    else
+    {
+        // 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;

     }
     }

-    else if (event.RightDown())
+    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() );
         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())
     {


@@ -2988,18 +3055,28 @@ 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);

 
 

-        if ( IsSingleSel() || !(event.ControlDown() || 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
         {

-            if (event.ControlDown())
+            if (cmdModifierDown)

             {
                 ChangeCurrent(current);
 
             {
                 ChangeCurrent(current);
 


@@ -3033,7 +3110,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         // 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;

     }
 }
 
     }
 }
 


@@ -3047,26 +3124,28 @@ void wxListMainWindow::MoveToItem(size_t item)
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );
 
     int client_w, client_h;
     GetClientSize( &client_w, &client_h );
 

-    int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL );
-    int view_y = m_yScroll*GetScrollPos( wxVERTICAL );
+    const int hLine = GetLineHeight();

 
 

-    if ( HasFlag(wxLC_REPORT) )
+    int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
+    int view_y = hLine*GetScrollPos( wxVERTICAL );
+
+    if ( InReportView() )

     {
         // the next we need the range of lines shown it might be different, so
         // recalculate it
         ResetVisibleLinesRange();
 
         if (rect.y < view_y )
     {
         // the next we need the range of lines shown it might be different, so
         // recalculate it
         ResetVisibleLinesRange();
 
         if (rect.y < view_y )

-            Scroll( -1, rect.y/m_yScroll );
+            Scroll( -1, rect.y/hLine );

         if (rect.y+rect.height+5 > view_y+client_h)
         if (rect.y+rect.height+5 > view_y+client_h)

-            Scroll( -1, (rect.y+rect.height-client_h+SCROLL_UNIT_Y)/m_yScroll );
+            Scroll( -1, (rect.y+rect.height-client_h+hLine)/hLine );

     }
     else // !report
     {
         if (rect.x-view_x < 5)
     }
     else // !report
     {
         if (rect.x-view_x < 5)

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

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

-            Scroll( (rect.x+rect.width-client_w+SCROLL_UNIT_X)/m_xScroll, -1 );
+            Scroll( (rect.x+rect.width-client_w+SCROLL_UNIT_X)/SCROLL_UNIT_X, -1 );

     }
 }
 
     }
 }
 


@@ -3087,6 +3166,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     {
         ChangeCurrent(newCurrent);
 
     {
         ChangeCurrent(newCurrent);
 

+        // refresh the old focus to remove it
+        RefreshLine( oldCurrent );
+

         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )
         {
         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )
         {


@@ -3100,7 +3182,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     {
         // all previously selected items are unselected unless ctrl is held
         if ( !event.ControlDown() )
     {
         // all previously selected items are unselected unless ctrl is held
         if ( !event.ControlDown() )

-            HighlightAll(FALSE);
+            HighlightAll(false);

 
         ChangeCurrent(newCurrent);
 
 
         ChangeCurrent(newCurrent);
 


@@ -3109,7 +3191,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
 
         if ( !event.ControlDown() )
         {
 
         if ( !event.ControlDown() )
         {

-            HighlightLine( m_current, TRUE );
+            HighlightLine( m_current, true );

         }
     }
 
         }
     }
 


@@ -3206,15 +3288,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 
         case WXK_PRIOR:
             {
 
         case WXK_PRIOR:
             {

-                int steps = 0;
-                if ( HasFlag(wxLC_REPORT) )
-                {
-                    steps = m_linesPerPage - 1;
-                }
-                else
-                {
-                    steps = m_current % m_linesPerPage;
-                }
+                int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;

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


@@ -3226,15 +3300,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 
         case WXK_NEXT:
             {
 
         case WXK_NEXT:
             {

-                int steps = 0;
-                if ( HasFlag(wxLC_REPORT) )
-                {
-                    steps = m_linesPerPage - 1;
-                }
-                else
-                {
-                    steps = m_linesPerPage - (m_current % m_linesPerPage) - 1;
-                }
+                int steps = InReportView()
+                               ? m_linesPerPage - 1
+                               : m_linesPerPage - (m_current % m_linesPerPage) - 1;

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


@@ -3246,7 +3314,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_LEFT:
             break;
 
         case WXK_LEFT:

-            if ( !HasFlag(wxLC_REPORT) )
+            if ( !InReportView() )

             {
                 int index = m_current - m_linesPerPage;
                 if (index < 0)
             {
                 int index = m_current - m_linesPerPage;
                 if (index < 0)


@@ -3257,7 +3325,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_RIGHT:
             break;
 
         case WXK_RIGHT:

-            if ( !HasFlag(wxLC_REPORT) )
+            if ( !InReportView() )

             {
                 size_t index = m_current + m_linesPerPage;
 
             {
                 size_t index = m_current + m_linesPerPage;
 


@@ -3299,51 +3367,38 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

-void wxListMainWindow::SetFocus()
+void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )

 {
 {

-    // VS: wxListMainWindow derives from wxPanel (via wxScrolledWindow) and wxPanel
-    //     overrides SetFocus in such way that it does never change focus from
-    //     panel's child to the panel itself. Unfortunately, we must be able to change
-    //     focus to the panel from wxListTextCtrl because the text control should
-    //     disappear when the user clicks outside it.
-
-    wxWindow *oldFocus = FindFocus();
-
-    if ( oldFocus && oldFocus->GetParent() == this )
-    {
-        wxWindow::SetFocus();
-    }
-    else
+    if ( GetParent() )

     {
     {

-        wxScrolledWindow::SetFocus();
+        wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
+        event.SetEventObject( GetParent() );
+        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+            return;

     }
     }

-}

 
 

-void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
-{

     // wxGTK sends us EVT_SET_FOCUS events even if we had never got
     // EVT_KILL_FOCUS before which means that we finish by redrawing the items
     // which are already drawn correctly resulting in horrible flicker - avoid
     // it
     if ( !m_hasFocus )
     {
     // wxGTK sends us EVT_SET_FOCUS events even if we had never got
     // EVT_KILL_FOCUS before which means that we finish by redrawing the items
     // which are already drawn correctly resulting in horrible flicker - avoid
     // it
     if ( !m_hasFocus )
     {

-        m_hasFocus = TRUE;
+        m_hasFocus = true;

 
         RefreshSelected();
     }
 
         RefreshSelected();
     }

-
-    if ( !GetParent() )
-        return;
-
-    wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
-    event.SetEventObject( GetParent() );
-    GetParent()->GetEventHandler()->ProcessEvent( event );

 }
 
 void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
 }
 
 void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {

-    m_hasFocus = FALSE;
-
+    if ( GetParent() )
+    {
+        wxFocusEvent event( wxEVT_KILL_FOCUS, GetParent()->GetId() );
+        event.SetEventObject( GetParent() );
+        if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
+            return;
+    }
+    m_hasFocus = false;

     RefreshSelected();
 }
 
     RefreshSelected();
 }
 


@@ -3361,7 +3416,7 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }

-    else if ( HasFlag(wxLC_REPORT) && (m_small_image_list))
+    else if ( InReportView() && (m_small_image_list))

     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }


@@ -3381,7 +3436,7 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const
     {
         m_small_image_list->GetSize( index, width, height );
     }
     {
         m_small_image_list->GetSize( index, width, height );
     }

-    else if ( HasFlag(wxLC_REPORT) && m_small_image_list )
+    else if ( InReportView() && m_small_image_list )

     {
         m_small_image_list->GetSize( index, width, height );
     }
     {
         m_small_image_list->GetSize( index, width, height );
     }


@@ -3405,7 +3460,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
 
 void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
 {
 
 void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
 {

-    m_dirty = TRUE;
+    m_dirty = true;

 
     // calc the spacing from the icon size
     int width = 0,
 
     // calc the spacing from the icon size
     int width = 0,


@@ -3431,7 +3486,7 @@ void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
 
 void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 {
 
 void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 {

-    m_dirty = TRUE;
+    m_dirty = true;

     if (isSmall)
     {
         m_small_spacing = spacing;
     if (isSmall)
     {
         m_small_spacing = spacing;


@@ -3465,9 +3520,9 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item )
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )

-        headerWin->m_dirty = TRUE;
+        headerWin->m_dirty = true;

 
 

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -3478,13 +3533,13 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
     wxCHECK_RET( col >= 0 && col < GetColumnCount(),
                  _T("invalid column index") );
 
     wxCHECK_RET( col >= 0 && col < GetColumnCount(),
                  _T("invalid column index") );
 

-    wxCHECK_RET( HasFlag(wxLC_REPORT),
+    wxCHECK_RET( InReportView(),

                  _T("SetColumnWidth() can only be called in report mode.") );
 
                  _T("SetColumnWidth() can only be called in report mode.") );
 

-    m_dirty = TRUE;
+    m_dirty = true;

     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )

-        headerWin->m_dirty = TRUE;
+        headerWin->m_dirty = true;

 
     wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
     wxCHECK_RET( node, _T("no column?") );
 
     wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
     wxCHECK_RET( node, _T("no column?") );


@@ -3511,34 +3566,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;
         }
     }


@@ -3597,6 +3648,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


@@ -3605,10 +3669,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


@@ -3627,7 +3741,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                 {
                     if ( IsSingleSel() )
                     {
                 {
                     if ( IsSingleSel() )
                     {

-                        HighlightLine(oldCurrent, FALSE);
+                        HighlightLine(oldCurrent, false);

                     }
 
                     RefreshLine(oldCurrent);
                     }
 
                     RefreshLine(oldCurrent);


@@ -3648,7 +3762,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                     // we must unselect the old current item as well or we
                     // might end up with more than one selected item in a
                     // single selection control
                     // we must unselect the old current item as well or we
                     // might end up with more than one selected item in a
                     // single selection control

-                    HighlightLine(oldCurrent, FALSE);
+                    HighlightLine(oldCurrent, false);

                 }
 
                 RefreshLine( oldCurrent );
                 }
 
                 RefreshLine( oldCurrent );


@@ -3673,7 +3787,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
 
                     if ( oldCurrent != (size_t)-1 )
                     {
 
                     if ( oldCurrent != (size_t)-1 )
                     {

-                        HighlightLine( oldCurrent, FALSE );
+                        HighlightLine( oldCurrent, false );

                         RefreshLine( oldCurrent );
                     }
                 }
                         RefreshLine( oldCurrent );
                     }
                 }


@@ -3722,6 +3836,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,7 +3860,7 @@ void wxListMainWindow::SetItemCount(long count)
     ResetVisibleLinesRange();
 
     // scrollbars must be reset
     ResetVisibleLinesRange();
 
     // scrollbars must be reset

-    m_dirty = TRUE;
+    m_dirty = true;

 }
 
 int wxListMainWindow::GetSelectedItemCount() const
 }
 
 int wxListMainWindow::GetSelectedItemCount() const


@@ -3749,7 +3868,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
     }
 
     // virtual controls remmebers all its selections itself


@@ -3773,11 +3892,58 @@ int wxListMainWindow::GetSelectedItemCount() const
 // item position/size
 // ----------------------------------------------------------------------------
 
 // item position/size
 // ----------------------------------------------------------------------------
 

+wxRect wxListMainWindow::GetViewRect() const
+{
+    wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
+                    _T("wxListCtrl::GetViewRect() only works in icon mode") );
+
+    // we need to find the longest/tallest label
+    wxCoord xMax = 0,
+            yMax = 0;
+    const int count = GetItemCount();
+    if ( count )
+    {
+        for ( int i = 0; i < count; i++ )
+        {
+            wxRect r;
+            GetItemRect(i, r);
+
+            wxCoord x = r.GetRight(),
+                    y = r.GetBottom();
+
+            if ( x > xMax )
+                xMax = x;
+            if ( y > yMax )
+                yMax = y;
+        }
+    }
+
+    // some fudge needed to make it look prettier
+    xMax += 2*EXTRA_BORDER_X;
+    yMax += 2*EXTRA_BORDER_Y;
+
+    // account for the scrollbars if necessary
+    const wxSize sizeAll = GetClientSize();
+    if ( xMax > sizeAll.x )
+        yMax += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    if ( yMax > sizeAll.y )
+        xMax += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
+    return wxRect(0, 0, xMax, yMax);
+}
+

 void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const
 {
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );
 
 void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const
 {
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );
 

+    // ensure that we're laid out, otherwise we could return nonsense
+    if ( m_dirty )
+    {
+        wxConstCast(this, wxListMainWindow)->
+            RecalculatePositions(true /* no refresh */);
+    }
+

     rect = GetLineRect((size_t)index);
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
     rect = GetLineRect((size_t)index);
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);


@@ -3791,7 +3957,7 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const
     pos.x = rect.x;
     pos.y = rect.y;
 
     pos.x = rect.x;
     pos.y = rect.y;
 

-    return TRUE;
+    return true;

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


@@ -3803,6 +3969,8 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 

+    const size_t count = GetItemCount();
+

     int iconSpacing;
     if ( HasFlag(wxLC_ICON) )
         iconSpacing = m_normal_spacing;
     int iconSpacing;
     if ( HasFlag(wxLC_ICON) )
         iconSpacing = m_normal_spacing;


@@ -3812,7 +3980,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         iconSpacing = 0;
 
     // Note that we do not call GetClientSize() here but
         iconSpacing = 0;
 
     // Note that we do not call GetClientSize() here but

-    // GetSize() and substract the border size for sunken
+    // GetSize() and subtract the border size for sunken

     // borders manually. This is technically incorrect,
     // but we need to know the client area's size WITHOUT
     // scrollbars here. Since we don't know if there are
     // borders manually. This is technically incorrect,
     // but we need to know the client area's size WITHOUT
     // scrollbars here. Since we don't know if there are


@@ -3831,106 +3999,163 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 

-    if ( HasFlag(wxLC_REPORT) )
-    {
-        // all lines have the same height
-        int lineHeight = GetLineHeight();
-
-        // scroll one line per step
-        m_yScroll = lineHeight;
+    const int lineHeight = GetLineHeight();

 
 

-        size_t lineCount = GetItemCount();
-        int entireHeight = lineCount*lineHeight + LINE_SPACING;
+    if ( InReportView() )
+    {
+        // all lines have the same height and we scroll one line per step
+        int entireHeight = count*lineHeight + LINE_SPACING;

 
         m_linesPerPage = clientHeight / lineHeight;
 
         ResetVisibleLinesRange();
 
 
         m_linesPerPage = clientHeight / lineHeight;
 
         ResetVisibleLinesRange();
 

-        SetScrollbars( m_xScroll, m_yScroll,
-                       GetHeaderWidth() / m_xScroll,
-                       (entireHeight + m_yScroll - 1)/m_yScroll,
+        SetScrollbars( SCROLL_UNIT_X, lineHeight,
+                       GetHeaderWidth() / SCROLL_UNIT_X,
+                       (entireHeight + lineHeight - 1) / lineHeight,

                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),

-                       TRUE );
+                       true );

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

-        // at first we try without any scrollbar. if the items don't
-        // fit into the window, we recalculate after subtracting an
-        // approximated 15 pt for the horizontal scrollbar
-
-        int entireWidth = 0;
-
-        for (int tries = 0; tries < 2; tries++)
+        // we have 3 different layout strategies: either layout all items
+        // horizontally/vertically (wxLC_ALIGN_XXX styles explicitly given) or
+        // to arrange them in top to bottom, left to right (don't ask me why
+        // not the other way round...) order
+        if ( HasFlag(wxLC_ALIGN_LEFT | wxLC_ALIGN_TOP) )

         {
         {

-            // We start with 4 for the border around all items
-            entireWidth = 4;
-
-            if (tries == 1)
-            {
-                // Now we have decided that the items do not fit into the
-                // client area. Unfortunately, wxWindows sometimes thinks
-                // that it does fit and therefore NO horizontal scrollbar
-                // is inserted. This looks ugly, so we fudge here and make
-                // the calculated width bigger than was actually has been
-                // calculated. This ensures that wxScrolledWindows puts
-                // a scrollbar at the bottom of its client area.
-                entireWidth += SCROLL_UNIT_X;
-            }
+            int x = EXTRA_BORDER_X;
+            int y = EXTRA_BORDER_Y;

 
 

-            // Start at 2,2 so the text does not touch the border
-            int x = 2;
-            int y = 2;
-            int maxWidth = 0;
-            m_linesPerPage = 0;
-            int currentlyVisibleLines = 0;
+            wxCoord widthMax = 0;

 
 

-            size_t count = GetItemCount();
-            for (size_t i = 0; i < count; i++)
+            size_t i;
+            for ( i = 0; i < count; i++ )

             {
             {

-                currentlyVisibleLines++;

                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );
                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );

-                line->SetPosition( x, y, clientWidth, iconSpacing );  // Why clientWidth? (FIXME)
+                line->SetPosition( x, y, iconSpacing );

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

-                if ( maxWidth < sizeLine.x )
-                    maxWidth = sizeLine.x;
+                if ( HasFlag(wxLC_ALIGN_TOP) )
+                {
+                    if ( sizeLine.x > widthMax )
+                        widthMax = sizeLine.x;

 
 

-                y += sizeLine.y;
-                if (currentlyVisibleLines > m_linesPerPage)
-                    m_linesPerPage = currentlyVisibleLines;
+                    y += sizeLine.y;
+                }
+                else // wxLC_ALIGN_LEFT
+                {
+                    x += sizeLine.x + MARGIN_BETWEEN_ROWS;
+                }
+            }

 
 

-                // Assume that the size of the next one is the same... (FIXME)
-                if ( y + sizeLine.y >= clientHeight )
+            if ( HasFlag(wxLC_ALIGN_TOP) )
+            {
+                // traverse the items again and tweak their sizes so that they are
+                // all the same in a row
+                for ( i = 0; i < count; i++ )

                 {
                 {

-                    currentlyVisibleLines = 0;
-                    y = 2;
-                    x += maxWidth+6;
-                    entireWidth += maxWidth+6;
-                    maxWidth = 0;
+                    wxListLineData *line = GetLine(i);
+                    line->m_gi->ExtendWidth(widthMax);

                 }
                 }

+            }
+

 
 

-                // We have reached the last item.
-                if ( i == count - 1 )
-                    entireWidth += maxWidth;
+            SetScrollbars
+            (
+                SCROLL_UNIT_X,
+                lineHeight,
+                (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,
+                (y + lineHeight) / lineHeight,
+                GetScrollPos( wxHORIZONTAL ),
+                GetScrollPos( wxVERTICAL ),
+                true
+            );
+        }
+        else // "flowed" arrangement, the most complicated case
+        {
+            // at first we try without any scrollbars, if the items don't fit into
+            // the window, we recalculate after subtracting the space taken by the
+            // scrollbar
+
+            int entireWidth = 0;

 
 

-                if ( (tries == 0) && (entireWidth+SCROLL_UNIT_X > clientWidth) )
+            for (int tries = 0; tries < 2; tries++)
+            {
+                entireWidth = 2*EXTRA_BORDER_X;
+
+                if (tries == 1)

                 {
                 {

-                    clientHeight -= 15; // We guess the scrollbar height. (FIXME)
-                    m_linesPerPage = 0;
-                    currentlyVisibleLines = 0;
-                    break;
+                    // Now we have decided that the items do not fit into the
+                    // client area, so we need a scrollbar
+                    entireWidth += SCROLL_UNIT_X;

                 }
 
                 }
 

-                if ( i == count - 1 )
-                    tries = 1;  // Everything fits, no second try required.
+                int x = EXTRA_BORDER_X;
+                int y = EXTRA_BORDER_Y;
+                int maxWidthInThisRow = 0;
+
+                m_linesPerPage = 0;
+                int currentlyVisibleLines = 0;
+
+                for (size_t i = 0; i < count; i++)
+                {
+                    currentlyVisibleLines++;
+                    wxListLineData *line = GetLine(i);
+                    line->CalculateSize( &dc, iconSpacing );
+                    line->SetPosition( x, y, iconSpacing );
+
+                    wxSize sizeLine = GetLineSize(i);
+
+                    if ( maxWidthInThisRow < sizeLine.x )
+                        maxWidthInThisRow = sizeLine.x;
+
+                    y += sizeLine.y;
+                    if (currentlyVisibleLines > m_linesPerPage)
+                        m_linesPerPage = currentlyVisibleLines;
+
+                    if ( y + sizeLine.y >= clientHeight )
+                    {
+                        currentlyVisibleLines = 0;
+                        y = EXTRA_BORDER_Y;
+                        maxWidthInThisRow += MARGIN_BETWEEN_ROWS;
+                        x += maxWidthInThisRow;
+                        entireWidth += maxWidthInThisRow;
+                        maxWidthInThisRow = 0;
+                    }
+
+                    // We have reached the last item.
+                    if ( i == count - 1 )
+                        entireWidth += maxWidthInThisRow;
+
+                    if ( (tries == 0) &&
+                            (entireWidth + SCROLL_UNIT_X > clientWidth) )
+                    {
+                        clientHeight -= wxSystemSettings::
+                                            GetMetric(wxSYS_HSCROLL_Y);
+                        m_linesPerPage = 0;
+                        break;
+                    }
+
+                    if ( i == count - 1 )
+                        tries = 1;  // Everything fits, no second try required.
+                }

             }
             }

-        }

 
 

-        int scroll_pos = GetScrollPos( wxHORIZONTAL );
-        SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
+            SetScrollbars
+            (
+                SCROLL_UNIT_X,
+                lineHeight,
+                (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
+                0,
+                GetScrollPos( wxHORIZONTAL ),
+                0,
+                true
+            );
+        }

     }
 
     if ( !noRefresh )
     }
 
     if ( !noRefresh )


@@ -3944,13 +4169,13 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
 void wxListMainWindow::RefreshAll()
 {
 
 void wxListMainWindow::RefreshAll()
 {

-    m_dirty = FALSE;
+    m_dirty = false;

     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin && headerWin->m_dirty )
     {
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin && headerWin->m_dirty )
     {

-        headerWin->m_dirty = FALSE;
+        headerWin->m_dirty = false;

         headerWin->Refresh();
     }
 }
         headerWin->Refresh();
     }
 }


@@ -4029,6 +4254,26 @@ void wxListMainWindow::DeleteItem( long lindex )
 
     if ( InReportView() )
     {
 
     if ( InReportView() )
     {

+    //  mark the Column Max Width cache as dirty if the items in the line
+    //  we're deleting contain the Max Column Width
+        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();
     }
 


@@ -4044,7 +4289,7 @@ void wxListMainWindow::DeleteItem( long lindex )
     }
 
     // we need to refresh the (vert) scrollbar as the number of items changed
     }
 
     // we need to refresh the (vert) scrollbar as the number of items changed

-    m_dirty = TRUE;
+    m_dirty = true;

 
     SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
 
 
     SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
 


@@ -4057,7 +4302,7 @@ void wxListMainWindow::DeleteColumn( int col )
 
     wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
 
 
     wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
 

-    m_dirty = TRUE;
+    m_dirty = true;

     delete node->GetData();
     m_columns.Erase( node );
 
     delete node->GetData();
     m_columns.Erase( node );
 


@@ -4073,6 +4318,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;
 }


@@ -4106,6 +4357,10 @@ void wxListMainWindow::DoDeleteAllItems()
     if ( InReportView() )
     {
         ResetVisibleLinesRange();
     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();


@@ -4121,6 +4376,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();
 }


@@ -4138,7 +4394,7 @@ void wxListMainWindow::EnsureVisible( long index )
     // been added and its position is not known yet
     if ( m_dirty )
     {
     // 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);


@@ -4162,7 +4418,7 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-long wxListMainWindow::FindItem(long start, long data)
+long wxListMainWindow::FindItem(long start, wxUIntPtr data)

 {
     long pos = start;
     if (pos < 0)
 {
     long pos = start;
     if (pos < 0)


@@ -4181,13 +4437,29 @@ long wxListMainWindow::FindItem(long start, long data)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

+long wxListMainWindow::FindItem( const wxPoint& pt )
+{
+    size_t topItem;
+    GetVisibleLinesRange(&topItem, NULL);
+
+    wxPoint p;
+    GetItemPosition( GetItemCount()-1, p );
+    if( p.y == 0 )
+        return topItem;
+    long id = (long) floor( pt.y*double(GetItemCount()-topItem-1)/p.y+topItem );
+    if( id >= 0 && id < (long)GetItemCount() )
+        return id;
+
+    return wxNOT_FOUND;
+}
+

 long wxListMainWindow::HitTest( int x, int y, int &flags )
 {
     CalcUnscrolledPosition( x, y, &x, &y );
 
     size_t count = GetItemCount();
 
 long wxListMainWindow::HitTest( int x, int y, int &flags )
 {
     CalcUnscrolledPosition( x, y, &x, &y );
 
     size_t count = GetItemCount();
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t current = y / GetLineHeight();
         if ( current < count )
     {
         size_t current = y / GetLineHeight();
         if ( current < count )


@@ -4220,38 +4492,43 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
 
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
 

-    size_t count = GetItemCount();
-    wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId <= count,
-                 _T("invalid item index") );
+    int count = GetItemCount();
+    wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") );
+
+    if (item.m_itemId > count)
+        item.m_itemId = count;

 
     size_t id = item.m_itemId;
 
 
     size_t id = item.m_itemId;
 

-    m_dirty = TRUE;
+    m_dirty = true;

 
 

-    int mode = 0;
-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
     {

-        mode = wxLC_REPORT;

         ResetVisibleLinesRange();
         ResetVisibleLinesRange();

-    }
-    else if ( HasFlag(wxLC_LIST) )
-        mode = wxLC_LIST;
-    else if ( HasFlag(wxLC_ICON) )
-        mode = wxLC_ICON;
-    else if ( HasFlag(wxLC_SMALL_ICON) )
-        mode = wxLC_ICON;  // no typo
-    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);
 

-    line->SetItem( 0, item );
+    line->SetItem( item.m_col, item );

 
     m_lines.Insert( line, id );
 
 
     m_lines.Insert( line, id );
 

-    m_dirty = TRUE;
+    m_dirty = true;
+
+    // If an item is selected at or below the point of insertion, we need to
+    // increment the member variables because the current row's index has gone
+    // up by one
+    if ( HasCurrent() && m_current >= id )
+    {
+        m_current++;
+    }

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


@@ -4260,22 +4537,27 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {

-    m_dirty = TRUE;
-    if ( HasFlag(wxLC_REPORT) )
+    m_dirty = true;
+    if ( InReportView() )

     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             item.m_width = GetTextLength( item.m_text );
 
         wxListHeaderData *column = new wxListHeaderData( item );
     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             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() )


@@ -4297,6 +4579,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
 // ----------------------------------------------------------------------------


@@ -4310,9 +4616,9 @@ int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData
     wxListLineData *line2 = *arg2;
     wxListItem item;
     line1->GetItem( 0, item );
     wxListLineData *line2 = *arg2;
     wxListItem item;
     line1->GetItem( 0, item );

-    long data1 = item.m_data;
+    wxUIntPtr data1 = item.m_data;

     line2->GetItem( 0, item );
     line2->GetItem( 0, item );

-    long data2 = item.m_data;
+    wxUIntPtr data2 = item.m_data;

     return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
 }
 
     return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
 }
 


@@ -4321,7 +4627,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
     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 );

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -4335,7 +4641,7 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
     ResetVisibleLinesRange();
 
     // FIXME
     ResetVisibleLinesRange();
 
     // FIXME

-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)

     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );


@@ -4364,7 +4670,7 @@ int wxListMainWindow::GetCountPerPage() const
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") );
+    wxASSERT_MSG( InReportView(), _T("this is for report mode only") );

 
     if ( m_lineFrom == (size_t)-1 )
     {
 
     if ( m_lineFrom == (size_t)-1 )
     {


@@ -4418,10 +4724,11 @@ wxGenericListCtrl::wxGenericListCtrl()
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;

+    m_headerHeight = 0;

 }
 
 wxGenericListCtrl::~wxGenericListCtrl()
 }
 
 wxGenericListCtrl::~wxGenericListCtrl()


@@ -4434,15 +4741,42 @@ wxGenericListCtrl::~wxGenericListCtrl()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

+void wxGenericListCtrl::CalculateAndSetHeaderHeight()
+{
+    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;
+#endif
+        // only update if changed
+        if ( h != m_headerHeight )
+        {
+            m_headerHeight = h;
+
+            m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
+
+            if ( HasHeader() )
+                ResizeReportView(true);
+        }
+    }
+}
+

 void wxGenericListCtrl::CreateHeaderWindow()
 {
     m_headerWin = new wxListHeaderWindow
                       (
 void wxGenericListCtrl::CreateHeaderWindow()
 {
     m_headerWin = new wxListHeaderWindow
                       (

-                        this, -1, m_mainWin,
-                        wxPoint(0, 0),
-                        wxSize(GetClientSize().x, HEADER_HEIGHT),
+                        this, wxID_ANY, m_mainWin,
+                        wxPoint(0,0),
+                        wxSize(GetClientSize().x, m_headerHeight),

                         wxTAB_TRAVERSAL
                       );
                         wxTAB_TRAVERSAL
                       );

+    CalculateAndSetHeaderHeight();

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


@@ -4458,36 +4792,57 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     m_imageListState = (wxImageListType *) NULL;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_imageListState = (wxImageListType *) NULL;
     m_ownsImageListNormal =
     m_ownsImageListSmall =

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 

+    m_headerHeight = 0;
+

     if ( !(style & wxLC_MASK_TYPE) )
     {
         style = style | wxLC_LIST;
     }
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
     if ( !(style & wxLC_MASK_TYPE) )
     {
         style = style | wxLC_LIST;
     }
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )

-        return FALSE;
+        return 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, -1, wxPoint(0,0), size, style );
+    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );

 
 

-    if ( HasFlag(wxLC_REPORT) )
+#ifdef  __WXMAC_CARBON__
+    // Human Interface Guidelines ask us for a special font in this case
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
+    {
+        wxFont font ;
+        font.MacCreateThemeFont( kThemeViewsFont ) ;
+        SetFont( font ) ;
+    }
+#endif
+    if ( InReportView() )

     {
         CreateHeaderWindow();
     {
         CreateHeaderWindow();

-
+#ifdef  __WXMAC_CARBON__
+        if (m_headerWin)
+        {
+            wxFont font ;
+            font.MacCreateThemeFont( kThemeSmallSystemFont ) ;
+            m_headerWin->SetFont( font );
+            CalculateAndSetHeaderHeight();
+        }
+#endif

         if ( HasFlag(wxLC_NO_HEADER) )
         {
             // VZ: why do we create it at all then?
         if ( HasFlag(wxLC_NO_HEADER) )
         {
             // VZ: why do we create it at all then?

-            m_headerWin->Show( FALSE );
+            m_headerWin->Show( false );

         }
     }
 
         }
     }
 

-    return TRUE;
+    SetBestSize(size);
+
+    return true;

 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )
 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )


@@ -4526,8 +4881,8 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
         m_mainWin->DeleteEverything();
 
         // has the header visibility changed?
         m_mainWin->DeleteEverything();
 
         // has the header visibility changed?

-        bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
-             willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
+        bool hasHeader = HasHeader();
+        bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);

 
         if ( hasHeader != willHaveHeader )
         {
 
         if ( hasHeader != willHaveHeader )
         {


@@ -4537,7 +4892,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
                 if ( m_headerWin )
                 {
                     // don't delete, just hide, as we can reuse it later
                 if ( m_headerWin )
                 {
                     // don't delete, just hide, as we can reuse it later

-                    m_headerWin->Show(FALSE);
+                    m_headerWin->Show(false);

                 }
                 //else: nothing to do
             }
                 }
                 //else: nothing to do
             }


@@ -4549,7 +4904,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
                 }
                 else // already have it, just show
                 {
                 }
                 else // already have it, just show
                 {

-                    m_headerWin->Show( TRUE );
+                    m_headerWin->Show( true );

                 }
             }
 
                 }
             }
 


@@ -4563,13 +4918,13 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
 bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const
 {
     m_mainWin->GetColumn( col, item );
 bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const
 {
     m_mainWin->GetColumn( col, item );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )
 {
     m_mainWin->SetColumn( col, item );
 }
 
 bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )
 {
     m_mainWin->SetColumn( col, item );

-    return TRUE;
+    return true;

 }
 
 int wxGenericListCtrl::GetColumnWidth( int col ) const
 }
 
 int wxGenericListCtrl::GetColumnWidth( int col ) const


@@ -4580,7 +4935,7 @@ int wxGenericListCtrl::GetColumnWidth( int col ) const
 bool wxGenericListCtrl::SetColumnWidth( int col, int width )
 {
     m_mainWin->SetColumnWidth( col, width );
 bool wxGenericListCtrl::SetColumnWidth( int col, int width )
 {
     m_mainWin->SetColumnWidth( col, width );

-    return TRUE;
+    return true;

 }
 
 int wxGenericListCtrl::GetCountPerPage() const
 }
 
 int wxGenericListCtrl::GetCountPerPage() const


@@ -4591,13 +4946,13 @@ int wxGenericListCtrl::GetCountPerPage() const
 bool wxGenericListCtrl::GetItem( wxListItem &info ) const
 {
     m_mainWin->GetItem( info );
 bool wxGenericListCtrl::GetItem( wxListItem &info ) const
 {
     m_mainWin->GetItem( info );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetItem( wxListItem &info )
 {
     m_mainWin->SetItem( info );
 }
 
 bool wxGenericListCtrl::SetItem( wxListItem &info )
 {
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;

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


@@ -4613,7 +4968,7 @@ long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int
         info.m_mask |= wxLIST_MASK_IMAGE;
     };
     m_mainWin->SetItem(info);
         info.m_mask |= wxLIST_MASK_IMAGE;
     };
     m_mainWin->SetItem(info);

-    return TRUE;
+    return true;

 }
 
 int wxGenericListCtrl::GetItemState( long item, long stateMask ) const
 }
 
 int wxGenericListCtrl::GetItemState( long item, long stateMask ) const


@@ -4624,17 +4979,18 @@ int wxGenericListCtrl::GetItemState( long item, long stateMask ) const
 bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
 {
     m_mainWin->SetItemState( item, state, stateMask );
 bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
 {
     m_mainWin->SetItemState( item, state, stateMask );

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
+bool
+wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )

 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
     m_mainWin->SetItem( info );
 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;

 }
 
 wxString wxGenericListCtrl::GetItemText( long item ) const
 }
 
 wxString wxGenericListCtrl::GetItemText( long item ) const


@@ -4647,9 +5003,10 @@ void wxGenericListCtrl::SetItemText( long item, const wxString& str )
     m_mainWin->SetItemText(item, str);
 }
 
     m_mainWin->SetItemText(item, str);
 }
 

-long wxGenericListCtrl::GetItemData( long item ) const
+wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const

 {
     wxListItem info;
 {
     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;


@@ -4662,21 +5019,26 @@ bool wxGenericListCtrl::SetItemData( long item, long data )
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;
+}
+
+wxRect wxGenericListCtrl::GetViewRect() const
+{
+    return m_mainWin->GetViewRect();

 }
 
 bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const
 {
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )
 }
 
 bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const
 {
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )

-        rect.y += HEADER_HEIGHT + 1;
-    return TRUE;
+        rect.y += m_headerHeight + 1;
+    return true;

 }
 
 bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const
 {
     m_mainWin->GetItemPosition( item, pos );
 }
 
 bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const
 {
     m_mainWin->GetItemPosition( item, pos );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
 }
 
 bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )


@@ -4699,6 +5061,13 @@ void wxGenericListCtrl::SetItemSpacing( int spacing, bool isSmall )
     m_mainWin->SetItemSpacing( spacing, isSmall );
 }
 
     m_mainWin->SetItemSpacing( spacing, isSmall );
 }
 

+wxSize wxGenericListCtrl::GetItemSpacing() const
+{
+    const int spacing = m_mainWin->GetItemSpacing(HasFlag(wxLC_SMALL_ICON));
+
+    return wxSize(spacing, spacing);
+}
+

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


@@ -4736,6 +5105,22 @@ wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
     return info.GetBackgroundColour();
 }
 
     return info.GetBackgroundColour();
 }
 

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


@@ -4786,19 +5171,19 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
     {
         if (m_ownsImageListNormal) delete m_imageListNormal;
         m_imageListNormal = imageList;
     {
         if (m_ownsImageListNormal) delete m_imageListNormal;
         m_imageListNormal = imageList;

-        m_ownsImageListNormal = FALSE;
+        m_ownsImageListNormal = false;

     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
         if (m_ownsImageListSmall) delete m_imageListSmall;
         m_imageListSmall = imageList;
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
         if (m_ownsImageListSmall) delete m_imageListSmall;
         m_imageListSmall = imageList;

-        m_ownsImageListSmall = FALSE;
+        m_ownsImageListSmall = false;

     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
         if (m_ownsImageListState) delete m_imageListState;
         m_imageListState = imageList;
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
         if (m_ownsImageListState) delete m_imageListState;
         m_imageListState = imageList;

-        m_ownsImageListState = FALSE;
+        m_ownsImageListState = false;

     }
 
     m_mainWin->SetImageList( imageList, which );
     }
 
     m_mainWin->SetImageList( imageList, which );


@@ -4808,11 +5193,11 @@ void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which)
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )

-        m_ownsImageListNormal = TRUE;
+        m_ownsImageListNormal = true;

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

-        m_ownsImageListSmall = TRUE;
+        m_ownsImageListSmall = true;

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

-        m_ownsImageListState = TRUE;
+        m_ownsImageListState = true;

 }
 
 bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )
 }
 
 bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )


@@ -4823,13 +5208,13 @@ bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )
 bool wxGenericListCtrl::DeleteItem( long item )
 {
     m_mainWin->DeleteItem( item );
 bool wxGenericListCtrl::DeleteItem( long item )
 {
     m_mainWin->DeleteItem( item );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::DeleteAllItems()
 {
     m_mainWin->DeleteAllItems();
 }
 
 bool wxGenericListCtrl::DeleteAllItems()
 {
     m_mainWin->DeleteAllItems();

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::DeleteAllColumns()
 }
 
 bool wxGenericListCtrl::DeleteAllColumns()


@@ -4838,7 +5223,7 @@ bool wxGenericListCtrl::DeleteAllColumns()
     for ( size_t n = 0; n < count; n++ )
         DeleteColumn(0);
 
     for ( size_t n = 0; n < count; n++ )
         DeleteColumn(0);
 

-    return TRUE;
+    return true;

 }
 
 void wxGenericListCtrl::ClearAll()
 }
 
 void wxGenericListCtrl::ClearAll()


@@ -4853,10 +5238,10 @@ 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 )
 }
 
 void wxGenericListCtrl::Edit( long item )


@@ -4867,7 +5252,7 @@ void wxGenericListCtrl::Edit( long item )
 bool wxGenericListCtrl::EnsureVisible( long item )
 {
     m_mainWin->EnsureVisible( item );
 bool wxGenericListCtrl::EnsureVisible( long item )
 {
     m_mainWin->EnsureVisible( 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 )


@@ -4875,15 +5260,15 @@ long wxGenericListCtrl::FindItem( long start, const wxString& str,  bool partial
     return m_mainWin->FindItem( start, str, partial );
 }
 
     return m_mainWin->FindItem( start, str, partial );
 }
 

-long wxGenericListCtrl::FindItem( long start, long data )
+long wxGenericListCtrl::FindItem( long start, wxUIntPtr data )

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

-long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
+long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& pt,

                            int WXUNUSED(direction))
 {
                            int WXUNUSED(direction))
 {

-    return 0;
+    return m_mainWin->FindItem( pt );

 }
 
 long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )
 }
 
 long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )


@@ -4935,7 +5320,7 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
     // window
     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
     {
     // window
     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
     {

-        ResizeReportView(TRUE /* have header */);
+        ResizeReportView(true /* have header */);

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


@@ -4977,7 +5362,7 @@ bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )
 {
     m_mainWin->SortItems( fn, data );
 bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )
 {
     m_mainWin->SortItems( fn, data );

-    return TRUE;
+    return true;

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


@@ -5001,8 +5386,8 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
 
     if ( showHeader )
     {
 
     if ( showHeader )
     {

-        m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
-        m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );
+        m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
+        m_mainWin->SetSize( 0, m_headerHeight + 1, cw, ch - m_headerHeight - 1 );

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


@@ -5013,7 +5398,7 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
 void wxGenericListCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 void wxGenericListCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();

-    
+

     // do it only if needed
     if ( !m_mainWin->m_dirty )
         return;
     // do it only if needed
     if ( !m_mainWin->m_dirty )
         return;


@@ -5030,21 +5415,21 @@ bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
 }
 
 bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )

-        return FALSE;
+        return false;

 
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );
 
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     if (m_headerWin)
     }
 
     if (m_headerWin)


@@ -5052,26 +5437,52 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
         m_headerWin->SetForegroundColour( colour );
     }
 
         m_headerWin->SetForegroundColour( colour );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetFont( const wxFont &font )
 {
     if ( !wxWindow::SetFont( font ) )
 }
 
 bool wxGenericListCtrl::SetFont( const wxFont &font )
 {
     if ( !wxWindow::SetFont( font ) )

-        return FALSE;
+        return false;

 
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );
 
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );
     }
 
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );

+        CalculateAndSetHeaderHeight();

     }
 
     }
 

-    return TRUE;
+    Refresh();
+
+    return true;
+}
+
+
+
+#if _USE_VISATTR
+#include "wx/listbox.h"
+#endif
+
+//static
+wxVisualAttributes
+wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+#if _USE_VISATTR
+    // Use the same color scheme as wxListBox
+    return wxListBox::GetClassDefaultAttributes(variant);
+#else
+    wxUnusedVar(variant);
+    wxVisualAttributes attr;
+    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
+    attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    return attr;
+#endif

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


@@ -5094,7 +5505,7 @@ wxDropTarget *wxGenericListCtrl::GetDropTarget() const
 
 bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
 {
 
 bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
 {

-    return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE;
+    return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : false;

 }
 
 wxColour wxGenericListCtrl::GetBackgroundColour() const
 }
 
 wxColour wxGenericListCtrl::GetBackgroundColour() const


@@ -5112,7 +5523,7 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 #else
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 #else

-    return FALSE;
+    return false;

 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS
 }
 


@@ -5120,10 +5531,18 @@ 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 ( FindFocus() != this )
+    if ( DoFindFocus() != this )

         m_mainWin->SetFocus();
 }
 
         m_mainWin->SetFocus();
 }
 

+wxSize wxGenericListCtrl::DoGetBestSize() const
+{
+    // Something is better than nothing...
+    // 100x80 is what the MSW version will get from the default
+    // wxControl::DoGetBestSize
+    return wxSize(100,80);
+}
+

 // ----------------------------------------------------------------------------
 // virtual list control support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // virtual list control support
 // ----------------------------------------------------------------------------


@@ -5139,13 +5558,14 @@ wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col
 
 int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {
 
 int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {

-    // same as above
-    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );
-
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                wxT("List control has an image list, OnGetItemImage should be overridden."));

     return -1;
 }
 
     return -1;
 }
 

-wxListItemAttr *wxGenericListCtrl::OnGetItemAttr(long item) const
+wxListItemAttr *
+wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const

 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );