added GenerateNow()

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 5bed03921da555c67400ff8911c4414dc0aedb0e..1d9eda16d99584bba301a860b91b2151be9619c9 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -69,8 +69,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 +93,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)


@@ -106,15 +119,13 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
 // // 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;
 
 // margin between the window and the items
 static const int EXTRA_HEIGHT = 4;
 
 // margin between the window and the items


@@ -154,7 +165,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 );
 


@@ -193,7 +204,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


@@ -282,6 +293,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 theo ne 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]


@@ -496,6 +519,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


@@ -509,20 +534,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 )


@@ -580,8 +605,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);


@@ -604,8 +627,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 );


@@ -645,7 +668,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();


@@ -656,8 +679,9 @@ 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 );


@@ -681,11 +705,11 @@ public:
     virtual bool SetFont(const wxFont& font)
     {
         if ( !wxScrolledWindow::SetFont(font) )
     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


@@ -918,7 +942,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);
 }


@@ -1103,7 +1127,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 );
 }


@@ -1115,96 +1139,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;

+            }

 
 

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

 
 

-                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;
-                }
+            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;
+
+        case wxLC_LIST:
+            s = item->GetTextForMeasuring();
+
+            dc->GetTextExtent( s, &lw, &lh );
+            lw += EXTRA_WIDTH;
+            lh += EXTRA_HEIGHT;

 
 

-                m_gi->m_rectHighlight.width = m_gi->m_rectAll.width;
-                m_gi->m_rectHighlight.height = m_gi->m_rectAll.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:


@@ -1426,10 +1443,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 )


@@ -1446,20 +1463,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);

     }
 }
 
     }
 }
 


@@ -1585,14 +1613,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 )


@@ -1615,8 +1643,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()


@@ -1641,7 +1669,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()


@@ -1686,11 +1725,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;
 


@@ -1718,7 +1753,8 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         // for this we need the width of the text
         wxCoord wLabel;
 
         // 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


@@ -1783,7 +1819,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;
     }


@@ -1842,8 +1878,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());
         }


@@ -1862,7 +1898,7 @@ 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;


@@ -1878,7 +1914,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;
             }
 


@@ -1901,10 +1937,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
             }


@@ -1939,6 +1975,7 @@ 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, wxPoint pos)


@@ -1987,7 +2024,7 @@ 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;

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


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

-        m_finished = TRUE;
+        m_finished = true;

 
 

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

     }
 }
 
     }
 }
 


@@ -2018,19 +2055,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 )


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

-            if ( !AcceptChanges() )
+            if ( AcceptChanges() )

             {
             {

-                // vetoed by the user code
-                break;
+                // Close the text control, changes were accepted
+                Finish();

             }
             }

-            //else: fall through
+            // else do nothing, do not accept and do not close
+
+            break;

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


@@ -2073,7 +2112,7 @@ 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();
 }
 
     event.Skip();
 }


@@ -2082,13 +2121,16 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
     if ( !m_finished )
     {
 {
     if ( !m_finished )
     {

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


@@ -2110,7 +2152,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;


@@ -2125,11 +2167,11 @@ 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_renameTimer = new wxListRenameTimer( this );
 
     m_current =


@@ -2179,9 +2221,13 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
     wxSize sz = size;
     sz.y = 25;
 
     wxSize sz = size;
     sz.y = 25;
 

-    SetScrollbars( SCROLL_UNIT_X, SCROLL_UNIT_Y, 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()
 }
 
 wxListMainWindow::~wxListMainWindow()


@@ -2247,8 +2293,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 )
     {


@@ -2260,9 +2304,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;


@@ -2280,7 +2321,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();
 }


@@ -2372,7 +2413,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();
     }


@@ -2423,7 +2464,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);
     }


@@ -2439,7 +2480,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);


@@ -2461,7 +2502,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);


@@ -2492,7 +2533,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);


@@ -2517,7 +2558,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;

     }
 }
 
     }
 }
 


@@ -2594,7 +2635,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();
 


@@ -2662,7 +2703,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);


@@ -2670,7 +2710,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;


@@ -2688,22 +2728,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();
 }


@@ -2717,7 +2753,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);
         }
     }


@@ -2806,7 +2842,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;


@@ -2814,23 +2850,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;
 


@@ -2841,9 +2867,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 )
 {


@@ -2851,6 +2874,15 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
 
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
 

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

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


@@ -2871,7 +2903,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,11 +2958,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 )
         {


@@ -2942,7 +2974,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         {
             // the first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead
         {
             // the first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead

-            forceClick = TRUE;
+            forceClick = true;

         }
     }
 
         }
     }
 


@@ -2952,9 +2984,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
             HasFlag(wxLC_EDIT_LABELS)  )
         {
             (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
             HasFlag(wxLC_EDIT_LABELS)  )
         {

-            m_renameTimer->Start( 100, TRUE );
+            m_renameTimer->Start( 100, true );

         }
         }

-        m_lastOnSame = FALSE;
+        m_lastOnSame = false;

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


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

-
-        if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )
+        bool cmdModifierDown = event.CmdDown();
+        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )

         {
         {

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

 
             ChangeCurrent(current);
 
 
             ChangeCurrent(current);
 


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


@@ -3030,19 +3062,21 @@ 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 );
 

+    const int hLine = GetLineHeight();
+

     int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
     int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );

-    int view_y = SCROLL_UNIT_Y*GetScrollPos( wxVERTICAL );
+    int view_y = hLine*GetScrollPos( wxVERTICAL );

 
 

-    if ( HasFlag(wxLC_REPORT) )
+    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/SCROLL_UNIT_Y );
+            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)/SCROLL_UNIT_Y );
+            Scroll( -1, (rect.y+rect.height-client_h+hLine)/hLine );

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


@@ -3070,6 +3104,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 )
         {


@@ -3083,7 +3120,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);
 


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

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

         }
     }
 
         }
     }
 


@@ -3189,15 +3226,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)


@@ -3209,15 +3238,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();


@@ -3229,7 +3252,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)


@@ -3240,7 +3263,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;
 


@@ -3282,51 +3305,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 )
+    if ( GetParent() )

     {
     {

-        wxWindow::SetFocus();
-    }
-    else
-    {
-        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();
 }
 


@@ -3344,7 +3354,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 );
     }


@@ -3364,7 +3374,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 );
     }


@@ -3388,7 +3398,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,


@@ -3414,7 +3424,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;


@@ -3448,9 +3458,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;


@@ -3461,13 +3471,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?") );


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

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

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


@@ -3631,7 +3641,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 );


@@ -3656,7 +3666,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 );
                     }
                 }


@@ -3724,7 +3734,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


@@ -3732,7 +3742,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


@@ -3805,7 +3815,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const
     if ( m_dirty )
     {
         wxConstCast(this, wxListMainWindow)->
     if ( m_dirty )
     {
         wxConstCast(this, wxListMainWindow)->

-            RecalculatePositions(TRUE /* no refresh */);
+            RecalculatePositions(true /* no refresh */);

     }
 
     rect = GetLineRect((size_t)index);
     }
 
     rect = GetLineRect((size_t)index);


@@ -3821,7 +3831,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;

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


@@ -3844,7 +3854,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


@@ -3863,11 +3873,11 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 

-    if ( HasFlag(wxLC_REPORT) )
+    const int lineHeight = GetLineHeight();
+
+    if ( InReportView() )

     {
         // all lines have the same height and we scroll one line per step
     {
         // all lines have the same height and we scroll one line per step

-        int lineHeight = GetLineHeight();
-

         int entireHeight = count*lineHeight + LINE_SPACING;
 
         m_linesPerPage = clientHeight / lineHeight;
         int entireHeight = count*lineHeight + LINE_SPACING;
 
         m_linesPerPage = clientHeight / lineHeight;


@@ -3879,7 +3889,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                        (entireHeight + lineHeight - 1) / lineHeight,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        (entireHeight + lineHeight - 1) / lineHeight,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),

-                       TRUE );
+                       true );

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


@@ -3892,7 +3902,10 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
             int x = EXTRA_BORDER_X;
             int y = EXTRA_BORDER_Y;
 
             int x = EXTRA_BORDER_X;
             int y = EXTRA_BORDER_Y;
 

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

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


@@ -3902,6 +3915,9 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
                 if ( HasFlag(wxLC_ALIGN_TOP) )
                 {
 
                 if ( HasFlag(wxLC_ALIGN_TOP) )
                 {

+                    if ( sizeLine.x > widthMax )
+                        widthMax = sizeLine.x;
+

                     y += sizeLine.y;
                 }
                 else // wxLC_ALIGN_LEFT
                     y += sizeLine.y;
                 }
                 else // wxLC_ALIGN_LEFT


@@ -3910,15 +3926,27 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 }
             }
 
                 }
             }
 

+            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++ )
+                {
+                    wxListLineData *line = GetLine(i);
+                    line->m_gi->ExtendWidth(widthMax);
+                }
+            }
+
+

             SetScrollbars
             (
                 SCROLL_UNIT_X,
             SetScrollbars
             (
                 SCROLL_UNIT_X,

-                SCROLL_UNIT_Y,
+                lineHeight,

                 (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,

-                (y + SCROLL_UNIT_Y) / SCROLL_UNIT_Y,
+                (y + lineHeight) / lineHeight,

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

-                TRUE
+                true

             );
         }
         else // "flowed" arrangement, the most complicated case
             );
         }
         else // "flowed" arrangement, the most complicated case


@@ -3927,13 +3955,11 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
             // the window, we recalculate after subtracting the space taken by the
             // scrollbar
 
             // the window, we recalculate after subtracting the space taken by the
             // scrollbar
 

-            int entireWidth = 0,
-                entireHeight = 0;
+            int entireWidth = 0;

 
             for (int tries = 0; tries < 2; tries++)
             {
                 entireWidth = 2*EXTRA_BORDER_X;
 
             for (int tries = 0; tries < 2; tries++)
             {
                 entireWidth = 2*EXTRA_BORDER_X;

-                entireHeight = 2*EXTRA_BORDER_Y;

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


@@ -3985,7 +4011,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                         clientHeight -= wxSystemSettings::
                                             GetMetric(wxSYS_HSCROLL_Y);
                         m_linesPerPage = 0;
                         clientHeight -= wxSystemSettings::
                                             GetMetric(wxSYS_HSCROLL_Y);
                         m_linesPerPage = 0;

-                        currentlyVisibleLines = 0;

                         break;
                     }
 
                         break;
                     }
 


@@ -3997,12 +4022,12 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
             SetScrollbars
             (
                 SCROLL_UNIT_X,
             SetScrollbars
             (
                 SCROLL_UNIT_X,

-                SCROLL_UNIT_Y,
+                lineHeight,

                 (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 0,
                 GetScrollPos( wxHORIZONTAL ),
                 0,
                 (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 0,
                 GetScrollPos( wxHORIZONTAL ),
                 0,

-                TRUE
+                true

             );
         }
     }
             );
         }
     }


@@ -4018,13 +4043,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();
     }
 }


@@ -4118,7 +4143,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 );
 


@@ -4131,7 +4156,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 );
 


@@ -4212,7 +4237,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);


@@ -4236,7 +4261,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)


@@ -4255,13 +4280,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 )


@@ -4294,26 +4335,49 @@ 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;

 
 

+    #if 0
+    // this is unused variable

     int mode = 0;
     int mode = 0;

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

     {
     {

+        #if 0
+        // this is unused variable

         mode = wxLC_REPORT;
         mode = wxLC_REPORT;

+        #endif

         ResetVisibleLinesRange();
     }
     else if ( HasFlag(wxLC_LIST) )
         ResetVisibleLinesRange();
     }
     else if ( HasFlag(wxLC_LIST) )

+        #if 0
+        // this is unused variable

         mode = wxLC_LIST;
         mode = wxLC_LIST;

+        #else
+        {}
+        #endif

     else if ( HasFlag(wxLC_ICON) )
     else if ( HasFlag(wxLC_ICON) )

+        #if 0
+        // this is unused variable

         mode = wxLC_ICON;
         mode = wxLC_ICON;

+        #else
+        {}
+        #endif

     else if ( HasFlag(wxLC_SMALL_ICON) )
     else if ( HasFlag(wxLC_SMALL_ICON) )

+        #if 0
+        // this is unused variable

         mode = wxLC_ICON;  // no typo
         mode = wxLC_ICON;  // no typo

+        #else
+        {}
+        #endif

     else
     {
         wxFAIL_MSG( _T("unknown mode") );
     else
     {
         wxFAIL_MSG( _T("unknown mode") );


@@ -4321,11 +4385,19 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     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);
 


@@ -4334,8 +4406,8 @@ 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 );
     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             item.m_width = GetTextLength( item.m_text );


@@ -4384,9 +4456,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 );
 }
 


@@ -4395,7 +4467,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;

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


@@ -4438,7 +4510,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 )
     {


@@ -4492,7 +4564,7 @@ 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;


@@ -4511,18 +4583,31 @@ wxGenericListCtrl::~wxGenericListCtrl()
 
 void wxGenericListCtrl::CalculateAndSetHeaderHeight()
 {
 
 void wxGenericListCtrl::CalculateAndSetHeaderHeight()
 {

-    // we use the letter "H" for calculating the needed space, basing on the current font
-    int w, h;
-    m_headerWin->GetTextExtent(wxT("H"), &w, &h);
-    m_headerHeight = h + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
-    m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
+    if ( m_headerWin )
+    {
+        // 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;
+
+        // 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,
+                        this, wxID_ANY, m_mainWin,

                         wxPoint(0, 0),
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL
                         wxPoint(0, 0),
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL


@@ -4543,36 +4628,49 @@ 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();
 
         if ( HasFlag(wxLC_NO_HEADER) )
         {
             // VZ: why do we create it at all then?
     {
         CreateHeaderWindow();
 
         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 )


@@ -4611,8 +4709,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 )
         {


@@ -4622,7 +4720,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
             }


@@ -4634,7 +4732,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 );

                 }
             }
 
                 }
             }
 


@@ -4648,13 +4746,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


@@ -4665,7 +4763,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


@@ -4676,13 +4774,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 )


@@ -4698,7 +4796,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


@@ -4709,17 +4807,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


@@ -4732,7 +4831,7 @@ 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;
     info.m_itemId = item;
 {
     wxListItem info;
     info.m_itemId = item;


@@ -4747,7 +4846,7 @@ 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
 }
 
 wxRect wxGenericListCtrl::GetViewRect() const


@@ -4760,13 +4859,13 @@ bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )
         rect.y += m_headerHeight + 1;
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )
         rect.y += m_headerHeight + 1;

-    return TRUE;
+    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) )


@@ -4883,19 +4982,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 );


@@ -4905,11 +5004,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) )


@@ -4920,13 +5019,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()


@@ -4935,7 +5034,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()


@@ -4950,10 +5049,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 )


@@ -4964,7 +5063,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 )


@@ -4972,15 +5071,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 )


@@ -5032,7 +5131,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();


@@ -5074,7 +5173,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;

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


@@ -5110,7 +5209,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;


@@ -5127,21 +5226,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)


@@ -5149,18 +5248,18 @@ 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)
     }
 
     if (m_headerWin)


@@ -5171,7 +5270,30 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
 
     Refresh();
 
 
     Refresh();
 

-    return TRUE;
+    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

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


@@ -5194,7 +5316,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


@@ -5212,7 +5334,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
 }
 


@@ -5220,10 +5342,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
 // ----------------------------------------------------------------------------


@@ -5239,13 +5369,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()") );