deTABified

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 2f4cccc30c081ca3669e533749e82fe0d1cacbe2..fa4ced72aa56492f71b9a5b001ebbabd91eb97c0 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -8,7 +8,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "listctrl.h"
+    #pragma implementation "listctrl.h"
+    #pragma implementation "listctrlbase.h"

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


@@ -23,6 +24,10 @@
 #include "wx/listctrl.h"
 #include "wx/generic/imaglist.h"
 
 #include "wx/listctrl.h"
 #include "wx/generic/imaglist.h"
 

+#ifndef wxUSE_GENERIC_LIST_EXTENSIONS
+#define wxUSE_GENERIC_LIST_EXTENSIONS 0
+#endif
+

 //-----------------------------------------------------------------------------
 //  wxListItemData
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxListItemData
 //-----------------------------------------------------------------------------


@@ -37,14 +42,15 @@ wxListItemData::wxListItemData()
     m_ypos = 0;
     m_width = 0;
     m_height = 0;
     m_ypos = 0;
     m_width = 0;
     m_height = 0;

-    m_colour = wxBLACK;
+    m_attr = NULL;

 }
 
 wxListItemData::wxListItemData( const wxListItem &info )
 {
     m_image = -1;
     m_data = 0;
 }
 
 wxListItemData::wxListItemData( const wxListItem &info )
 {
     m_image = -1;
     m_data = 0;

-    m_colour = info.m_colour;
+    m_attr = NULL;
+

     SetItem( info );
 }
 
     SetItem( info );
 }
 


@@ -53,7 +59,15 @@ void wxListItemData::SetItem( const wxListItem &info )
     if (info.m_mask & wxLIST_MASK_TEXT) m_text = info.m_text;
     if (info.m_mask & wxLIST_MASK_IMAGE) m_image = info.m_image;
     if (info.m_mask & wxLIST_MASK_DATA) m_data = info.m_data;
     if (info.m_mask & wxLIST_MASK_TEXT) m_text = info.m_text;
     if (info.m_mask & wxLIST_MASK_IMAGE) m_image = info.m_image;
     if (info.m_mask & wxLIST_MASK_DATA) m_data = info.m_data;

-    m_colour = info.m_colour;
+
+    if ( info.HasAttributes() )
+    {
+        if ( m_attr )
+            *m_attr = *info.GetAttributes();
+        else
+            m_attr = new wxListItemAttr(*info.GetAttributes());
+    }
+

     m_xpos = 0;
     m_ypos = 0;
     m_width = info.m_width;
     m_xpos = 0;
     m_ypos = 0;
     m_width = info.m_width;


@@ -87,11 +101,6 @@ void wxListItemData::SetSize( int width, int height )
     if (height != -1) m_height = height;
 }
 
     if (height != -1) m_height = height;
 }
 

-void wxListItemData::SetColour( wxColour *col )
-{
-    m_colour = col;
-}
-

 bool wxListItemData::HasImage() const
 {
     return (m_image >= 0);
 bool wxListItemData::HasImage() const
 {
     return (m_image >= 0);


@@ -137,17 +146,21 @@ int wxListItemData::GetImage() const
     return m_image;
 }
 
     return m_image;
 }
 

-void wxListItemData::GetItem( wxListItem &info )
+void wxListItemData::GetItem( wxListItem &info ) const

 {
     info.m_text = m_text;
     info.m_image = m_image;
     info.m_data = m_data;
 {
     info.m_text = m_text;
     info.m_image = m_image;
     info.m_data = m_data;

-    info.m_colour = m_colour;
-}

 
 

-wxColour *wxListItemData::GetColour()
-{
-    return m_colour;
+    if ( m_attr )
+    {
+        if ( m_attr->HasTextColour() )
+            info.SetTextColour(m_attr->GetTextColour());
+        if ( m_attr->HasBackgroundColour() )
+            info.SetBackgroundColour(m_attr->GetBackgroundColour());
+        if ( m_attr->HasFont() )
+            info.SetFont(m_attr->GetFont());
+    }

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


@@ -282,9 +295,8 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
             if (node)
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
             if (node)
             {
                 wxListItemData *item = (wxListItemData*)node->Data();

-                wxString s;
-                item->GetText( s );
-                long lw,lh;
+                wxString s = item->GetText();
+                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 if (lw > m_spacing) m_bound_all.width = lw;
             }
                 dc->GetTextExtent( s, &lw, &lh );
                 if (lw > m_spacing) m_bound_all.width = lw;
             }


@@ -296,20 +308,24 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
             if (node)
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
             if (node)
             {
                 wxListItemData *item = (wxListItemData*)node->Data();

-                wxString s;
-                item->GetText( s );
-                long lw,lh;
+                wxString s = item->GetText();
+                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
                 m_bound_all.height = lh;
                 if (item->HasImage())
                 {
                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
                 m_bound_all.height = lh;
                 if (item->HasImage())
                 {

+#ifdef __WIN16__

                     int w = 0;
                     int h = 0;
                     int w = 0;
                     int h = 0;

+#else
+                    wxCoord w = 0;
+                    wxCoord h = 0;
+#endif

                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_owner->GetImageSize( item->GetImage(), w, h );

-                   m_bound_all.width += 4 + w;
-                   if (h > m_bound_all.height) m_bound_all.height = h;
-               }
+                    m_bound_all.width += 4 + w;
+                    if (h > m_bound_all.height) m_bound_all.height = h;
+                }

             }
             break;
         }
             }
             break;
         }


@@ -324,9 +340,10 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                 wxString s;
                 item->GetText( s );
                 if (s.IsNull()) s = "H";
                 wxString s;
                 item->GetText( s );
                 if (s.IsNull()) s = "H";

-                long lh;
-                dc->GetTextExtent( s, (long*) NULL, &lh );
+                wxCoord lw,lh;
+                dc->GetTextExtent( s, &lw, &lh );

                 item->SetSize( item->GetWidth(), lh );
                 item->SetSize( item->GetWidth(), lh );

+                m_bound_all.width += lw;

                 m_bound_all.height = lh;
                 node = node->Next();
             }
                 m_bound_all.height = lh;
                 node = node->Next();
             }


@@ -373,7 +390,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
                 {
                     wxString s;
                     item->GetText( s );
                 {
                     wxString s;
                     item->GetText( s );

-                    long lw,lh;
+                    wxCoord lw,lh;

                     dc->GetTextExtent( s, &lw, &lh );
                     if (m_bound_all.width > m_spacing)
                         m_bound_label.x = m_bound_all.x;
                     dc->GetTextExtent( s, &lw, &lh );
                     if (m_bound_all.width > m_spacing)
                         m_bound_label.x = m_bound_all.x;


@@ -405,23 +422,23 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 if (item->HasImage())
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 if (item->HasImage())

-               {
+                {

                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;
                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;

-                   int w;
-                   int h;
+                    int w;
+                    int h;

                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;
                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;

-                   m_bound_label.x += 4 + w;
-                   m_bound_label.width -= 4 + w;
-               }
-           }
+                    m_bound_label.x += 4 + w;
+                    m_bound_label.width -= 4 + w;
+                }
+            }

             break;
         }
         case wxLC_REPORT:
         {
             break;
         }
         case wxLC_REPORT:
         {

-            long lw,lh;
+            wxCoord lw,lh;

             dc->GetTextExtent( "H", &lw, &lh );
             m_bound_all.x = 0;
             m_bound_all.y -= 0;
             dc->GetTextExtent( "H", &lw, &lh );
             m_bound_all.x = 0;
             m_bound_all.y -= 0;


@@ -436,23 +453,23 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s;
                 item->GetText( s );
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s;
                 item->GetText( s );

-               if (s.IsEmpty()) s = T("H");
-                long lw,lh;
+                if (s.IsEmpty()) s = wxT("H");
+                wxCoord lw,lh;

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

-               m_bound_label.width = lw;
-               m_bound_label.height = lh;
-               if (item->HasImage())
-               {
+                m_bound_label.width = lw;
+                m_bound_label.height = lh;
+                if (item->HasImage())
+                {

                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;
                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;

-                   int w;
-                   int h;
+                    int w;
+                    int h;

                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;
                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;

-                   m_bound_label.x += 4 + w;
-               }
-           }
+                    m_bound_label.x += 4 + w;
+                }
+            }

             break;
         }
     }
             break;
         }
     }


@@ -460,8 +477,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
 
 void wxListLineData::SetColumnPosition( int index, int x )
 {
 
 void wxListLineData::SetColumnPosition( int index, int x )
 {

-    int i = index;
-    wxNode *node = m_items.Nth( i );
+    wxNode *node = m_items.Nth( (size_t)index );

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


@@ -572,38 +588,91 @@ int wxListLineData::GetImage( int index )
     return -1;
 }
 
     return -1;
 }
 

+void wxListLineData::SetAttributes(wxDC *dc,
+                                   const wxListItemAttr *attr,
+                                   const wxColour& colText,
+                                   const wxFont& font,
+                                   bool hilight)
+{
+    // don't use foregroud colour for drawing highlighted items - this might
+    // make them completely invisible (and there is no way to do bit
+    // arithmetics on wxColour, unfortunately)
+    if ( !hilight && attr && attr->HasTextColour() )
+    {
+        dc->SetTextForeground(attr->GetTextColour());
+    }
+    else
+    {
+        dc->SetTextForeground(colText);
+    }
+
+    if ( attr && attr->HasFont() )
+    {
+        dc->SetFont(attr->GetFont());
+    }
+    else
+    {
+        dc->SetFont(font);
+    }
+}
+

 void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 {
 void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 {

-    long dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
-    long dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
-    long dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 );
-    long dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 );
-    
+    wxCoord dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
+    wxCoord dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
+    wxCoord dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 );
+    wxCoord dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 );
+

     if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))
     if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))

-    { 
+    {

         return;
     }
 
         return;
     }
 

-    if (paintBG)
+    wxWindow *listctrl = m_owner->GetParent();
+
+    // default foreground colour
+    wxColour colText;
+    if ( hilight )
+    {
+        colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
+    }
+    else
+    {
+        colText = listctrl->GetForegroundColour();
+    }
+
+    // default font
+    wxFont font = listctrl->GetFont();
+
+    // VZ: currently we set the colours/fonts only once, but like this (i.e.
+    //     using SetAttributes() inside the loop), it will be trivial to
+    //     customize the subitems (in report mode) too.
+    wxListItemData *item = (wxListItemData*)m_items.First()->Data();
+    wxListItemAttr *attr = item->GetAttributes();
+    SetAttributes(dc, attr, colText, font, hilight);
+
+    bool hasBgCol = attr && attr->HasBackgroundColour();
+    if ( paintBG || hasBgCol )

     {
         if (hilight)
         {
             dc->SetBrush( * m_hilightBrush );
     {
         if (hilight)
         {
             dc->SetBrush( * m_hilightBrush );

-            dc->SetPen( * wxTRANSPARENT_PEN );

         }
         else
         {
         }
         else
         {

-            dc->SetBrush( * wxWHITE_BRUSH );
-            dc->SetPen( * wxTRANSPARENT_PEN );
+            if ( hasBgCol )
+                dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+            else
+                dc->SetBrush( * wxWHITE_BRUSH );

         }
         }

+
+        dc->SetPen( * wxTRANSPARENT_PEN );

         dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
                            m_bound_hilight.width, m_bound_hilight.height );
     }
         dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
                            m_bound_hilight.width, m_bound_hilight.height );
     }

-    
-    dc->SetBackgroundMode(wxTRANSPARENT);
+

     if (m_mode == wxLC_REPORT)
     {
     if (m_mode == wxLC_REPORT)
     {

-        wxString s;

         wxNode *node = m_items.First();
         while (node)
         {
         wxNode *node = m_items.First();
         while (node)
         {


@@ -619,12 +688,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
             }
             if (item->HasText())
             {
             }
             if (item->HasText())
             {

-                item->GetText( s );
-                if (hilight)
-                    dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
-                else
-                    dc->SetTextForeground( *item->GetColour() );
-                dc->DrawText( s, x, item->GetY() );
+                dc->DrawText( item->GetText(), x, item->GetY() );

             }
             dc->DestroyClippingRegion();
             node = node->Next();
             }
             dc->DestroyClippingRegion();
             node = node->Next();


@@ -642,13 +706,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
             }
             if (item->HasText())
             {
             }
             if (item->HasText())
             {

-                wxString s;
-                item->GetText( s );
-                if (hilight)
-                    dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
-                else
-                    dc->SetTextForeground( * item->GetColour() );
-                dc->DrawText( s, m_bound_label.x, m_bound_label.y );
+                dc->DrawText( item->GetText(), m_bound_label.x, m_bound_label.y );

             }
         }
     }
             }
         }
     }


@@ -657,11 +715,11 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 void wxListLineData::Hilight( bool on )
 {
     if (on == m_hilighted) return;
 void wxListLineData::Hilight( bool on )
 {
     if (on == m_hilighted) return;

+    m_hilighted = on;

     if (on)
         m_owner->SelectLine( this );
     else
         m_owner->DeselectLine( this );
     if (on)
         m_owner->SelectLine( this );
     else
         m_owner->DeselectLine( this );

-    m_hilighted = on;

 }
 
 void wxListLineData::ReverseHilight( void )
 }
 
 void wxListLineData::ReverseHilight( void )


@@ -691,7 +749,7 @@ void wxListLineData::Draw( wxDC *dc )
 
 bool wxListLineData::IsInRect( int x, int y, const wxRect &rect )
 {
 
 bool wxListLineData::IsInRect( int x, int y, const wxRect &rect )
 {

-    return ((x >= rect.x) && (x <= rect.x+rect.width) && 
+    return ((x >= rect.x) && (x <= rect.x+rect.width) &&

             (y >= rect.y) && (y <= rect.y+rect.height));
 }
 
             (y >= rect.y) && (y <= rect.y+rect.height));
 }
 


@@ -765,7 +823,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 
     wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 
     wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );

-  
+

     dc->SetPen( pen );
     dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
     dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)
     dc->SetPen( pen );
     dc->DrawLine( x+w-m_corner, y, x+w-1, y+h );  // right (inner)
     dc->DrawRectangle( x+1, y+h-1, w-2, 1 );      // bottom (inner)


@@ -781,7 +839,17 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
     PrepareDC( dc );
 {
     wxPaintDC dc( this );
     PrepareDC( dc );

+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        if ( m_owner->GetMode() & wxLC_REPORT )
+        {
+                int x , y ;
+                int xpix , ypix ;

 
 

+                m_owner->GetScrollPixelsPerUnit( &xpix , &ypix ) ;
+                m_owner->ViewStart( &x, &y ) ;
+            dc.SetDeviceOrigin( -x * xpix, 0 );
+        }
+#endif

     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );
     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );


@@ -794,7 +862,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.SetTextForeground( *wxBLACK );
 
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.SetTextForeground( *wxBLACK );

-    if (m_foregroundColour.Ok()) dc.SetTextForeground( m_foregroundColour );
+
+    // do *not* use the listctrl colour for headers - one day we will have a
+    // function to set it separately

 
     x = 1;
     y = 1;
 
     x = 1;
     y = 1;


@@ -804,7 +874,13 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         m_owner->GetColumn( i, item );
         int cw = item.m_width-2;
     {
         m_owner->GetColumn( i, item );
         int cw = item.m_width-2;

-        if ((i+1 == numColumns) || (x+item.m_width > w-5)) cw = w-x-1;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        if ((i+1 == numColumns) || ( dc.LogicalToDeviceX(x+item.m_width) > w-5))
+            cw = dc.DeviceToLogicalX(w)-x-1;
+#else
+        if ((i+1 == numColumns) || (x+item.m_width > w-5))
+            cw = w-x-1;
+#endif

         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, y, cw, h-2 );
         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, y, cw, h-2 );


@@ -812,7 +888,11 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.DrawText( item.m_text, x+4, y+3 );
         dc.DestroyClippingRegion();
         x += item.m_width;
         dc.DrawText( item.m_text, x+4, y+3 );
         dc.DestroyClippingRegion();
         x += item.m_width;

+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        if (dc.LogicalToDeviceX(x) > w+5) break;
+#else

         if (x > w+5) break;
         if (x > w+5) break;

+#endif

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


@@ -843,8 +923,8 @@ void wxListHeaderWindow::DrawCurrent()
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {

-    int x = event.GetX();
-    int y = event.GetY();
+    wxCoord x = (wxCoord)event.GetX();
+    wxCoord y = (wxCoord)event.GetY();

     if (m_isDragging)
     {
         DrawCurrent();
     if (m_isDragging)
     {
         DrawCurrent();


@@ -876,36 +956,36 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     {
         xpos += m_owner->GetColumnWidth( j );
         m_column = j;
     {
         xpos += m_owner->GetColumnWidth( j );
         m_column = j;

-        if ((abs(x-xpos) < 3) && (y < 22))
+        if ((abs(x-xpos) < 3) && (y < 22) && (m_column < m_owner->GetColumnCount()-1))

         {
             hit_border = TRUE;
             break;
         }
         {
             hit_border = TRUE;
             break;
         }

-       if (x-xpos < 0)
-       {
-           break;
-       }
+        if (x-xpos < 0)
+        {
+            break;
+        }

         m_minX = xpos;
     }
 
     if (event.LeftDown())
     {
         if (hit_border)
         m_minX = xpos;
     }
 
     if (event.LeftDown())
     {
         if (hit_border)

-       {
+        {

             m_isDragging = TRUE;
             m_currentX = x;
             DrawCurrent();
             CaptureMouse();
             return;
             m_isDragging = TRUE;
             m_currentX = x;
             DrawCurrent();
             CaptureMouse();
             return;

-       }
-       else
-       {
+        }
+        else
+        {

             wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
             le.SetEventObject( GetParent() );
             wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
             le.SetEventObject( GetParent() );

-           le.m_col = m_column;
+            le.m_col = m_column;

             GetParent()->GetEventHandler()->ProcessEvent( le );
             GetParent()->GetEventHandler()->ProcessEvent( le );

-           return;
-       }
+            return;
+        }

     }
 
     if (event.Moving())
     }
 
     if (event.Moving())


@@ -953,11 +1033,18 @@ BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
     EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 
     EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 

-wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
-    bool *accept, wxString *res, wxListMainWindow *owner,
-    const wxString &value, const wxPoint &pos, const wxSize &size,
-    int style, const wxValidator& validator, const wxString &name ) :
-  wxTextCtrl( parent, id, value, pos, size, style, validator, name )
+wxListTextCtrl::wxListTextCtrl( wxWindow *parent,
+                                const wxWindowID id,
+                                bool *accept,
+                                wxString *res,
+                                wxListMainWindow *owner,
+                                const wxString &value,
+                                const wxPoint &pos,
+                                const wxSize &size,
+                                int style,
+                                const wxValidator& validator,
+                                const wxString &name )
+              : wxTextCtrl( parent, id, value, pos, size, style, validator, name )

 {
     m_res = res;
     m_accept = accept;
 {
     m_res = res;
     m_accept = accept;


@@ -973,25 +1060,34 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();

-       m_owner->SetFocus();
+        
+        if (!wxPendingDelete.Member(this))
+            wxPendingDelete.Append(this);
+
+        if ((*m_accept) && ((*m_res) != m_startValue))
+            m_owner->OnRenameAccept();
+            

         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)
     {
         (*m_accept) = FALSE;
         (*m_res) = "";
         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)
     {
         (*m_accept) = FALSE;
         (*m_res) = "";

-       m_owner->SetFocus();
+        
+        if (!wxPendingDelete.Member(this))
+            wxPendingDelete.Append(this);
+            

         return;
     }
         return;
     }

+    

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

-    if (wxPendingDelete.Member(this)) return;
+    if (!wxPendingDelete.Member(this))
+        wxPendingDelete.Append(this);

 
 

-    wxPendingDelete.Append(this);
-    

     if ((*m_accept) && ((*m_res) != m_startValue))
         m_owner->OnRenameAccept();
 }
     if ((*m_accept) && ((*m_res) != m_startValue))
         m_owner->OnRenameAccept();
 }


@@ -1010,6 +1106,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)

+  EVT_SCROLLWIN      (wxListMainWindow::OnScroll)

 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()
 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()


@@ -1059,7 +1156,11 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
 
     if (m_mode & wxLC_REPORT)
     {
 
     if (m_mode & wxLC_REPORT)
     {

+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        m_xScroll = 15;
+#else

         m_xScroll = 0;
         m_xScroll = 0;

+#endif

         m_yScroll = 15;
     }
     else
         m_yScroll = 15;
     }
     else


@@ -1074,18 +1175,22 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
     m_renameTimer = new wxListRenameTimer( this );
     m_renameAccept = FALSE;
 
     m_renameTimer = new wxListRenameTimer( this );
     m_renameAccept = FALSE;
 

-    SetBackgroundColour( *wxWHITE );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

 }
 
 wxListMainWindow::~wxListMainWindow()
 {
 }
 
 wxListMainWindow::~wxListMainWindow()
 {

+    DeleteEverything();
+

     if (m_hilightBrush) delete m_hilightBrush;
     if (m_hilightBrush) delete m_hilightBrush;

-    
+

     delete m_renameTimer;
 }
 
 void wxListMainWindow::RefreshLine( wxListLineData *line )
 {
     delete m_renameTimer;
 }
 
 void wxListMainWindow::RefreshLine( wxListLineData *line )
 {

+    if (m_dirty) return;
+

     int x = 0;
     int y = 0;
     int w = 0;
     int x = 0;
     int y = 0;
     int w = 0;


@@ -1112,13 +1217,13 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC( dc );
 
     if (m_dirty) return;
     PrepareDC( dc );
 
     if (m_dirty) return;

-    
+

     if (m_lines.GetCount() == 0) return;
 
     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );
     if (m_lines.GetCount() == 0) return;
 
     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );

-    
+

     if (m_mode & wxLC_REPORT)
     {
         int lineSpacing = 0;
     if (m_mode & wxLC_REPORT)
     {
         int lineSpacing = 0;


@@ -1126,18 +1231,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int dummy = 0;
         line->GetSize( dummy, lineSpacing );
         lineSpacing += 1;
         int dummy = 0;
         line->GetSize( dummy, lineSpacing );
         lineSpacing += 1;

-       
+

         int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
         int y_s = m_yScroll*GetScrollPos( wxVERTICAL );

-       
+

         wxNode *node = m_lines.Nth( y_s / lineSpacing );
         wxNode *node = m_lines.Nth( y_s / lineSpacing );

-       for (int i = 0; i < m_visibleLines+2; i++)
-       {
-           if (!node) break;
-           
+        for (int i = 0; i < m_visibleLines+2; i++)
+        {
+            if (!node) break;
+

             line = (wxListLineData*)node->Data();
             line->Draw( &dc );
             node = node->Next();
             line = (wxListLineData*)node->Data();
             line->Draw( &dc );
             node = node->Next();

-       }
+        }

     }
     else
     {
     }
     else
     {


@@ -1149,7 +1254,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             node = node->Next();
         }
     }
             node = node->Next();
         }
     }

-    
+

     if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
 
     dc.EndDrawing();
     if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
 
     dc.EndDrawing();


@@ -1177,6 +1282,7 @@ void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command )
     le.m_itemIndex = GetIndexOfLine( line );
     line->GetItem( 0, le.m_item );
     GetParent()->GetEventHandler()->ProcessEvent( le );
     le.m_itemIndex = GetIndexOfLine( line );
     line->GetItem( 0, le.m_item );
     GetParent()->GetEventHandler()->ProcessEvent( le );

+//    GetParent()->GetEventHandler()->AddPendingEvent( le );

 }
 
 void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
 }
 
 void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )


@@ -1208,9 +1314,9 @@ void wxListMainWindow::DeleteLine( wxListLineData *line )
 
 void wxListMainWindow::EditLabel( long item )
 {
 
 void wxListMainWindow::EditLabel( long item )
 {

-    wxNode *node = m_lines.Nth( item );
-    wxCHECK_RET( node, T("wrong index in wxListCtrl::Edit()") );
-    
+    wxNode *node = m_lines.Nth( (size_t)item );
+    wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") );
+

     m_currentEdit = (wxListLineData*) node->Data();
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     m_currentEdit = (wxListLineData*) node->Data();
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );


@@ -1218,10 +1324,10 @@ void wxListMainWindow::EditLabel( long item )
     le.m_itemIndex = GetIndexOfLine( m_currentEdit );
     m_currentEdit->GetItem( 0, le.m_item );
     GetParent()->GetEventHandler()->ProcessEvent( le );
     le.m_itemIndex = GetIndexOfLine( m_currentEdit );
     m_currentEdit->GetItem( 0, le.m_item );
     GetParent()->GetEventHandler()->ProcessEvent( le );

-    
+

     if (!le.IsAllowed())
         return;
     if (!le.IsAllowed())
         return;

-    
+

     // We have to call this here because the label in
     // question might just have been added and no screen
     // update taken place.
     // We have to call this here because the label in
     // question might just have been added and no screen
     // update taken place.


@@ -1234,7 +1340,7 @@ void wxListMainWindow::EditLabel( long item )
     int w = 0;
     int h = 0;
     m_currentEdit->GetLabelExtent( x, y, w, h );
     int w = 0;
     int h = 0;
     m_currentEdit->GetLabelExtent( x, y, w, h );

-    
+

     wxClientDC dc(this);
     PrepareDC( dc );
     x = dc.LogicalToDeviceX( x );
     wxClientDC dc(this);
     PrepareDC( dc );
     x = dc.LogicalToDeviceX( x );


@@ -1247,8 +1353,8 @@ void wxListMainWindow::EditLabel( long item )
 
 void wxListMainWindow::OnRenameTimer()
 {
 
 void wxListMainWindow::OnRenameTimer()
 {

-    wxCHECK_RET( m_current, T("invalid m_current") );
-    
+    wxCHECK_RET( m_current, wxT("invalid m_current") );
+

     Edit( m_lines.IndexOf( m_current ) );
 }
 
     Edit( m_lines.IndexOf( m_current ) );
 }
 


@@ -1260,14 +1366,14 @@ void wxListMainWindow::OnRenameAccept()
     m_currentEdit->GetItem( 0, le.m_item );
     le.m_item.m_text = m_renameRes;
     GetParent()->GetEventHandler()->ProcessEvent( le );
     m_currentEdit->GetItem( 0, le.m_item );
     le.m_item.m_text = m_renameRes;
     GetParent()->GetEventHandler()->ProcessEvent( le );

-    
+

     if (!le.IsAllowed()) return;
     if (!le.IsAllowed()) return;

-    
+

     wxListItem info;
     info.m_mask = wxLIST_MASK_TEXT;
     info.m_itemId = le.m_itemIndex;
     info.m_text = m_renameRes;
     wxListItem info;
     info.m_mask = wxLIST_MASK_TEXT;
     info.m_itemId = le.m_itemIndex;
     info.m_text = m_renameRes;

-    info.m_colour = le.m_item.m_colour;
+    info.SetTextColour(le.m_item.GetTextColour());

     SetItem( info );
 }
 
     SetItem( info );
 }
 


@@ -1281,9 +1387,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     wxClientDC dc(this);
     PrepareDC(dc);
 
     wxClientDC dc(this);
     PrepareDC(dc);

-    long x = dc.DeviceToLogicalX( (long)event.GetX() );
-    long y = dc.DeviceToLogicalY( (long)event.GetY() );
-    
+    wxCoord x = dc.DeviceToLogicalX( (wxCoord)event.GetX() );
+    wxCoord y = dc.DeviceToLogicalY( (wxCoord)event.GetY() );
+

     /* Did we actually hit an item ? */
     long hitResult = 0;
     wxNode *node = m_lines.First();
     /* Did we actually hit an item ? */
     long hitResult = 0;
     wxNode *node = m_lines.First();


@@ -1300,21 +1406,21 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if (event.Dragging())
     {
         if (m_dragCount == 0)
     if (event.Dragging())
     {
         if (m_dragCount == 0)

-           m_dragStart = wxPoint(x,y);
-       
+            m_dragStart = wxPoint(x,y);
+

         m_dragCount++;
         m_dragCount++;

-       
-       if (m_dragCount != 3) return;
-       
-       int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
-       if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-       
+
+        if (m_dragCount != 3) return;
+
+        int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+        if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+

         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );

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

     }
     else
     {
     }
     else
     {


@@ -1328,9 +1434,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_usedKeys = FALSE;
         m_lastOnSame = FALSE;
         m_renameTimer->Stop();
         m_usedKeys = FALSE;
         m_lastOnSame = FALSE;
         m_renameTimer->Stop();

-    
+

         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );

-    
+

        return;
     }
 
        return;
     }
 


@@ -1352,13 +1458,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK );
         return;
     }
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK );
         return;
     }

-  
+

     if (event.MiddleDown())
     {
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );
         return;
     }
     if (event.MiddleDown())
     {
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );
         return;
     }

-  
+

     if (event.LeftDown())
     {
         m_usedKeys = FALSE;
     if (event.LeftDown())
     {
         m_usedKeys = FALSE;


@@ -1372,16 +1478,16 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
         else
         {
         }
         else
         {

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

             {
                 m_current = line;
                 m_current->ReverseHilight();
                 RefreshLine( m_current );
             }
             {
                 m_current = line;
                 m_current->ReverseHilight();
                 RefreshLine( m_current );
             }

-            else if (event.ControlDown())
+            else if (event.ShiftDown())

             {
                 m_current = line;
             {
                 m_current = line;

-               
+

                 int numOfCurrent = -1;
                 node = m_lines.First();
                 while (node)
                 int numOfCurrent = -1;
                 node = m_lines.First();
                 while (node)


@@ -1391,7 +1497,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                     if (test_line == oldCurrent) break;
                     node = node->Next();
                 }
                     if (test_line == oldCurrent) break;
                     node = node->Next();
                 }

-               
+

                 int numOfLine = -1;
                 node = m_lines.First();
                 while (node)
                 int numOfLine = -1;
                 node = m_lines.First();
                 while (node)


@@ -1403,12 +1509,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 if (numOfLine < numOfCurrent)
                 }
 
                 if (numOfLine < numOfCurrent)

-                {  
-                   int i = numOfLine; 
-                   numOfLine = numOfCurrent; 
-                   numOfCurrent = i; 
-               }
-           
+                {
+                    int i = numOfLine;
+                    numOfLine = numOfCurrent;
+                    numOfCurrent = i;
+                }
+

                 wxNode *node = m_lines.Nth( numOfCurrent );
                 for (int i = 0; i <= numOfLine-numOfCurrent; i++)
                 {
                 wxNode *node = m_lines.Nth( numOfCurrent );
                 for (int i = 0; i <= numOfLine-numOfCurrent; i++)
                 {


@@ -1440,30 +1546,33 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 void wxListMainWindow::MoveToFocus()
 {
     if (!m_current) return;
 void wxListMainWindow::MoveToFocus()
 {
     if (!m_current) return;

-  
-    int x = 0;
-    int y = 0;
-    int w = 0;
-    int h = 0;
-    m_current->GetExtent( x, y, w, h );
-    
-    int w_p = 0;
-    int h_p = 0;
-    GetClientSize( &w_p, &h_p );
+
+    int item_x = 0;
+    int item_y = 0;
+    int item_w = 0;
+    int item_h = 0;
+    m_current->GetExtent( item_x, item_y, item_w, item_h );
+
+    int client_w = 0;
+    int client_h = 0;
+    GetClientSize( &client_w, &client_h );

     
     

+    int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL );
+    int view_y = m_yScroll*GetScrollPos( wxVERTICAL );
+

     if (m_mode & wxLC_REPORT)
     {
     if (m_mode & wxLC_REPORT)
     {

-        int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
-        if ((y > y_s) && (y+h < y_s+h_p)) return;
-        if (y-y_s < 5) { Scroll( -1, (y-5-h_p/2)/m_yScroll ); }
-        if (y+h+5 > y_s+h_p) { Scroll( -1, (y+h-h_p/2+h+15)/m_yScroll); }
+        if (item_y-5 < view_y ) 
+            Scroll( -1, (item_y-5)/m_yScroll ); 
+        if (item_y+item_h+5 > view_y+client_h) 
+            Scroll( -1, (item_y+item_h-client_h+15)/m_yScroll );

     }
     else
     {
     }
     else
     {

-        int x_s = m_xScroll*GetScrollPos( wxHORIZONTAL );
-        if ((x > x_s) && (x+w < x_s+w_p)) return;
-        if (x-x_s < 5) { Scroll( (x-5)/m_xScroll, -1 ); }
-        if (x+w-5 > x_s+w_p) { Scroll( (x+w-w_p+15)/m_xScroll, -1 ); }
+        if (item_x-view_x < 5) 
+            Scroll( (item_x-5)/m_xScroll, -1 );
+        if (item_x+item_w-5 > view_x+client_w) 
+            Scroll( (item_x+item_w-client_w+15)/m_xScroll, -1 );

     }
 }
 
     }
 }
 


@@ -1472,18 +1581,18 @@ void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
     if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE );
     wxListLineData *oldCurrent = m_current;
     m_current = newCurrent;
     if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE );
     wxListLineData *oldCurrent = m_current;
     m_current = newCurrent;

-    MoveToFocus();

     if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE );
     RefreshLine( m_current );
     RefreshLine( oldCurrent );
     FocusLine( m_current );
     UnfocusLine( oldCurrent );
     if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE );
     RefreshLine( m_current );
     RefreshLine( oldCurrent );
     FocusLine( m_current );
     UnfocusLine( oldCurrent );

+    MoveToFocus();

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

-  
+

     /* we propagate the key event up */
     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;
     /* we propagate the key event up */
     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;


@@ -1495,17 +1604,17 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
     ke.m_y = event.m_y;
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
     ke.m_y = event.m_y;
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;

-    
+

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

-  
+

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

-  
+

     /* we send a list_key event up */
     wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
     /* we send a list_key event up */
     wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );

-    le.m_code = event.KeyCode();
+    le.m_code = (int)event.KeyCode();

     le.SetEventObject( parent );
     parent->GetEventHandler()->ProcessEvent( le );
 
     le.SetEventObject( parent );
     parent->GetEventHandler()->ProcessEvent( le );
 


@@ -1520,15 +1629,16 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     ke.m_y = event.m_y;
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
     ke.m_y = event.m_y;
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;

-  
+

     if (event.KeyCode() == WXK_TAB)
     {
         wxNavigationKeyEvent nevent;
         nevent.SetDirection( !event.ShiftDown() );
     if (event.KeyCode() == WXK_TAB)
     {
         wxNavigationKeyEvent nevent;
         nevent.SetDirection( !event.ShiftDown() );

+        nevent.SetEventObject( GetParent()->GetParent() );

         nevent.SetCurrentFocus( m_parent );
         nevent.SetCurrentFocus( m_parent );

-        if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;
+        if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) return;

     }
     }

-  
+

     /* no item -> nothing to do */
     if (!m_current)
     {
     /* no item -> nothing to do */
     if (!m_current)
     {


@@ -1565,10 +1675,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_PRIOR:
         {
             int steps = 0;
         case WXK_PRIOR:
         {
             int steps = 0;

-            if (m_mode & wxLC_REPORT) 
-           { 
-               steps = m_visibleLines-1; 
-           }
+            if (m_mode & wxLC_REPORT)
+            {
+                steps = m_visibleLines-1;
+            }

             else
             {
                 int pos = 0;
             else
             {
                 int pos = 0;


@@ -1584,10 +1694,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_NEXT:
         {
             int steps = 0;
         case WXK_NEXT:
         {
             int steps = 0;

-            if (m_mode & wxLC_REPORT) 
-           { 
-               steps = m_visibleLines-1; 
-           }
+            if (m_mode & wxLC_REPORT)
+            {
+                steps = m_visibleLines-1;
+            }

             else
             {
                 int pos = 0; wxNode *node = m_lines.First();
             else
             {
                 int pos = 0; wxNode *node = m_lines.First();


@@ -1633,11 +1743,11 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
                 m_current->ReverseHilight();
                 wxNode *node = m_lines.Member( m_current )->Next();
                 if (node) m_current = (wxListLineData*)node->Data();
                 m_current->ReverseHilight();
                 wxNode *node = m_lines.Member( m_current )->Next();
                 if (node) m_current = (wxListLineData*)node->Data();

-                MoveToFocus();

                 RefreshLine( oldCurrent );
                 RefreshLine( m_current );
                 UnfocusLine( oldCurrent );
                 FocusLine( m_current );
                 RefreshLine( oldCurrent );
                 RefreshLine( m_current );
                 UnfocusLine( oldCurrent );
                 FocusLine( m_current );

+                MoveToFocus();

             }
             break;
         }
             }
             break;
         }


@@ -1670,7 +1780,7 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     RefreshLine( m_current );
 
     if (!GetParent()) return;
     RefreshLine( m_current );
 
     if (!GetParent()) return;

-    
+

 #ifdef __WXGTK__
     g_focusWindow = GetParent();
 #endif
 #ifdef __WXGTK__
     g_focusWindow = GetParent();
 #endif


@@ -1690,7 +1800,7 @@ void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 /*
   We don't even allow the wxScrolledWindow::AdjustScrollbars() call
 {
 /*
   We don't even allow the wxScrolledWindow::AdjustScrollbars() call

-  
+

 */
 }
 
 */
 }
 


@@ -1745,8 +1855,8 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height )
 int wxListMainWindow::GetTextLength( wxString &s )
 {
     wxClientDC dc( this );
 int wxListMainWindow::GetTextLength( wxString &s )
 {
     wxClientDC dc( this );

-    long lw = 0;
-    long lh = 0;
+    wxCoord lw = 0;
+    wxCoord lh = 0;

     dc.GetTextExtent( s, &lw, &lh );
     return lw + 6;
 }
     dc.GetTextExtent( s, &lw, &lh );
     return lw + 6;
 }


@@ -1825,25 +1935,25 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
             if (n)
             {
                 wxListItemData *item = (wxListItemData*)n->Data();
             if (n)
             {
                 wxListItemData *item = (wxListItemData*)n->Data();

-               int current = 0, ix = 0, iy = 0;
-               long lx = 0, ly = 0;
-               if (item->HasImage())
-               {
+                int current = 0, ix = 0, iy = 0;
+                wxCoord lx = 0, ly = 0;
+                if (item->HasImage())
+                {

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

-                   current = ix + 5;
-               }
-               if (item->HasText())
-               {
-                   wxString str;
-                   item->GetText( str );
-                   dc.GetTextExtent( str, &lx, &ly );
-                   current += lx;
-               }
-               if (current > max) max = current;
+                    current = ix + 5;
+                }
+                if (item->HasText())
+                {
+                    wxString str;
+                    item->GetText( str );
+                    dc.GetTextExtent( str, &lx, &ly );
+                    current += lx;
+                }
+                if (current > max) max = current;

             }
             node = node->Next();
         }
             }
             node = node->Next();
         }

-       width = max+10;
+        width = max+10;

     }
 
     node = m_columns.Nth( col );
     }
 
     node = m_columns.Nth( col );


@@ -1898,7 +2008,7 @@ int wxListMainWindow::GetColumnWidth( int col )
     }
     else
     {
     }
     else
     {

-        return 0; 
+        return 0;

     }
 }
 
     }
 }
 


@@ -1915,7 +2025,7 @@ int wxListMainWindow::GetCountPerPage()
 void wxListMainWindow::SetItem( wxListItem &item )
 {
     m_dirty = TRUE;
 void wxListMainWindow::SetItem( wxListItem &item )
 {
     m_dirty = TRUE;

-    wxNode *node = m_lines.Nth( item.m_itemId );
+    wxNode *node = m_lines.Nth( (size_t)item.m_itemId );

     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();


@@ -1932,7 +2042,7 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
 
     if (stateMask & wxLIST_STATE_FOCUSED)
     {
 
     if (stateMask & wxLIST_STATE_FOCUSED)
     {

-        wxNode *node = m_lines.Nth( item );
+        wxNode *node = m_lines.Nth( (size_t)item );

         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();
         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();


@@ -1946,10 +2056,10 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
 
     if (stateMask & wxLIST_STATE_SELECTED)
     {
 
     if (stateMask & wxLIST_STATE_SELECTED)
     {

-        bool on = state & wxLIST_STATE_SELECTED;
+        bool on = (state & wxLIST_STATE_SELECTED) != 0;

         if (!on && (m_mode & wxLC_SINGLE_SEL)) return;
 
         if (!on && (m_mode & wxLC_SINGLE_SEL)) return;
 

-        wxNode *node = m_lines.Nth( item );
+        wxNode *node = m_lines.Nth( (size_t)item );

         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();
         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();


@@ -1962,12 +2072,12 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
                 RefreshLine( m_current );
                 if (oldCurrent) RefreshLine( oldCurrent );
             }
                 RefreshLine( m_current );
                 if (oldCurrent) RefreshLine( oldCurrent );
             }

-            bool on = state & wxLIST_STATE_SELECTED;
-           if (on != line->IsHilighted())
-           {
+            bool on = (state & wxLIST_STATE_SELECTED) != 0;
+            if (on != line->IsHilighted())
+            {

                 line->Hilight( on );
                 RefreshLine( line );
                 line->Hilight( on );
                 RefreshLine( line );

-           }
+            }

         }
     }
 }
         }
     }
 }


@@ -1977,7 +2087,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
     int ret = wxLIST_STATE_DONTCARE;
     if (stateMask & wxLIST_STATE_FOCUSED)
     {
     int ret = wxLIST_STATE_DONTCARE;
     if (stateMask & wxLIST_STATE_FOCUSED)
     {

-        wxNode *node = m_lines.Nth( item );
+        wxNode *node = m_lines.Nth( (size_t)item );

         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();
         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();


@@ -1986,7 +2096,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
     }
     if (stateMask & wxLIST_STATE_SELECTED)
     {
     }
     if (stateMask & wxLIST_STATE_SELECTED)
     {

-        wxNode *node = m_lines.Nth( item );
+        wxNode *node = m_lines.Nth( (size_t)item );

         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();
         if (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();


@@ -1998,7 +2108,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
 
 void wxListMainWindow::GetItem( wxListItem &item )
 {
 
 void wxListMainWindow::GetItem( wxListItem &item )
 {

-    wxNode *node = m_lines.Nth( item.m_itemId );
+    wxNode *node = m_lines.Nth( (size_t)item.m_itemId );

     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();


@@ -2020,7 +2130,7 @@ int wxListMainWindow::GetItemCount()
 
 void wxListMainWindow::GetItemRect( long index, wxRect &rect )
 {
 
 void wxListMainWindow::GetItemRect( long index, wxRect &rect )
 {

-    wxNode *node = m_lines.Nth( index );
+    wxNode *node = m_lines.Nth( (size_t)index );

     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();


@@ -2037,7 +2147,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect )
 
 bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 {
 
 bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
 {

-    wxNode *node = m_lines.Nth( item );
+    wxNode *node = m_lines.Nth( (size_t)item );

     if (node)
     {
         wxRect rect;
     if (node)
     {
         wxRect rect;


@@ -2076,7 +2186,11 @@ void wxListMainWindow::SetMode( long mode )
 
     if (m_mode & wxLC_REPORT)
     {
 
     if (m_mode & wxLC_REPORT)
     {

+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        m_xScroll = 15;
+#else

         m_xScroll = 0;
         m_xScroll = 0;

+#endif

         m_yScroll = 15;
     }
     else
         m_yScroll = 15;
     }
     else


@@ -2101,11 +2215,11 @@ void wxListMainWindow::CalculatePositions()
     int iconSpacing = 0;
     if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing;
     if (m_mode & wxLC_SMALL_ICON) iconSpacing = m_small_spacing;
     int iconSpacing = 0;
     if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing;
     if (m_mode & wxLC_SMALL_ICON) iconSpacing = m_small_spacing;

-  
+

     // we take the first line (which also can be an icon or
     // an a text item in wxLC_ICON and wxLC_LIST modes) to
     // measure the size of the line
     // we take the first line (which also can be an icon or
     // an a text item in wxLC_ICON and wxLC_LIST modes) to
     // measure the size of the line

-  
+

     int lineWidth = 0;
     int lineHeight = 0;
     int lineSpacing = 0;
     int lineWidth = 0;
     int lineHeight = 0;
     int lineSpacing = 0;


@@ -2125,10 +2239,15 @@ void wxListMainWindow::CalculatePositions()
         int y = 1;
         int entireHeight = m_lines.Number() * lineSpacing + 2;
         int scroll_pos = GetScrollPos( wxVERTICAL );
         int y = 1;
         int entireHeight = m_lines.Number() * lineSpacing + 2;
         int scroll_pos = GetScrollPos( wxVERTICAL );

+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        int x_scroll_pos = GetScrollPos( wxHORIZONTAL );
+#else

         SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE );
         SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE );

+#endif

         GetClientSize( &clientWidth, &clientHeight );
 
         wxNode* node = m_lines.First();
         GetClientSize( &clientWidth, &clientHeight );
 
         wxNode* node = m_lines.First();

+        int entireWidth = 0 ;

         while (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();
         while (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();


@@ -2140,19 +2259,26 @@ void wxListMainWindow::CalculatePositions()
                 line->SetColumnPosition( i, col_x );
                 col_x += GetColumnWidth( i );
             }
                 line->SetColumnPosition( i, col_x );
                 col_x += GetColumnWidth( i );
             }

+            entireWidth = wxMax( entireWidth , col_x ) ;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+            line->SetPosition( &dc, x, y, col_x );
+#endif

             y += lineSpacing;  // one pixel blank line between items
             node = node->Next();
         }
             y += lineSpacing;  // one pixel blank line between items
             node = node->Next();
         }

-       m_visibleLines = clientHeight / lineSpacing;
+                m_visibleLines = clientHeight / lineSpacing;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+                SetScrollbars( m_xScroll, m_yScroll, entireWidth / m_xScroll , (entireHeight+15) / m_yScroll, x_scroll_pos  , scroll_pos, TRUE );
+#endif

     }
     else
     {
         // at first we try without any scrollbar. if the items don't
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
     }
     else
     {
         // at first we try without any scrollbar. if the items don't
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar

-    
+

         GetSize( &clientWidth, &clientHeight );
         GetSize( &clientWidth, &clientHeight );

-       clientHeight -= 4;  // sunken frame
+        clientHeight -= 4;  // sunken frame

 
         int entireWidth = 0;
 
 
         int entireWidth = 0;
 


@@ -2163,22 +2289,22 @@ void wxListMainWindow::CalculatePositions()
             int y = 5;  // painting is done at y-2
             int maxWidth = 0;
             m_visibleLines = 0;
             int y = 5;  // painting is done at y-2
             int maxWidth = 0;
             m_visibleLines = 0;

-           int m_currentVisibleLines = 0;
+            int m_currentVisibleLines = 0;

             wxNode *node = m_lines.First();
             while (node)
             {
             wxNode *node = m_lines.First();
             while (node)
             {

-               m_currentVisibleLines++;
+                m_currentVisibleLines++;

                 wxListLineData *line = (wxListLineData*)node->Data();
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( &dc, x, y, clientWidth );
                 line->GetSize( lineWidth, lineHeight );
                 if (lineWidth > maxWidth) maxWidth = lineWidth;
                 y += lineSpacing;
                 wxListLineData *line = (wxListLineData*)node->Data();
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( &dc, x, y, clientWidth );
                 line->GetSize( lineWidth, lineHeight );
                 if (lineWidth > maxWidth) maxWidth = lineWidth;
                 y += lineSpacing;

+                if (m_currentVisibleLines > m_visibleLines)
+                    m_visibleLines = m_currentVisibleLines;

                 if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
                 {
                 if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
                 {

-                   if (m_currentVisibleLines > m_visibleLines)
-                       m_visibleLines = m_currentVisibleLines;
-                   m_currentVisibleLines = 0;
+                    m_currentVisibleLines = 0;

                     y = 5;
                     x += maxWidth+6;
                     entireWidth += maxWidth+6;
                     y = 5;
                     x += maxWidth+6;
                     entireWidth += maxWidth+6;


@@ -2190,14 +2316,13 @@ void wxListMainWindow::CalculatePositions()
                 {
                     clientHeight -= 15; // scrollbar height
                     m_visibleLines = 0;
                 {
                     clientHeight -= 15; // scrollbar height
                     m_visibleLines = 0;

-                   m_currentVisibleLines = 0;
+                    m_currentVisibleLines = 0;

                     break;
                 }
                 if (!node) tries = 1;  // everything fits, no second try required
             }
         }
                     break;
                 }
                 if (!node) tries = 1;  // everything fits, no second try required
             }
         }

-//        m_visibleLines = (5+clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking"
-       
+

         int scroll_pos = GetScrollPos( wxHORIZONTAL );
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }
         int scroll_pos = GetScrollPos( wxHORIZONTAL );
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }


@@ -2217,28 +2342,48 @@ void wxListMainWindow::RealizeChanges( void )
     }
 }
 
     }
 }
 

-long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state )
+long wxListMainWindow::GetNextItem( long item,
+                                    int WXUNUSED(geometry),
+                                    int state )

 {
 {

-    long ret = 0;
-    if (item > 0) ret = item;
-    if(ret >= GetItemCount()) return -1;
-    wxNode *node = m_lines.Nth( ret );
+    long ret = item,
+         max = GetItemCount();
+    wxCHECK_MSG( (ret == -1) || (ret < max), -1,
+                 _T("invalid listctrl index in GetNextItem()") );
+
+    // notice that we start with the next item (or the first one if item == -1)
+    // and this is intentional to allow writing a simple loop to iterate over
+    // all selected items
+    ret++;
+    if ( ret == max )
+    {
+        // this is not an error because the index was ok initially, just no
+        // such item
+        return -1;
+    }
+
+    wxNode *node = m_lines.Nth( (size_t)ret );

     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();

-        if ((state & wxLIST_STATE_FOCUSED) && (line == m_current)) return ret;
-        if ((state & wxLIST_STATE_SELECTED) && (line->IsHilighted())) return ret;
-        if (!state) return ret;
+        if ((state & wxLIST_STATE_FOCUSED) && (line == m_current))
+            return ret;
+        if ((state & wxLIST_STATE_SELECTED) && (line->IsHilighted()))
+            return ret;
+        if (!state)
+            return ret;

         ret++;
         ret++;

+

         node = node->Next();
     }
         node = node->Next();
     }

+

     return -1;
 }
 
 void wxListMainWindow::DeleteItem( long index )
 {
     m_dirty = TRUE;
     return -1;
 }
 
 void wxListMainWindow::DeleteItem( long index )
 {
     m_dirty = TRUE;

-    wxNode *node = m_lines.Nth( index );
+    wxNode *node = m_lines.Nth( (size_t)index );

     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     if (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();


@@ -2251,40 +2396,33 @@ void wxListMainWindow::DeleteItem( long index )
 void wxListMainWindow::DeleteColumn( int col )
 {
     wxCHECK_RET( col < (int)m_columns.GetCount(),
 void wxListMainWindow::DeleteColumn( int col )
 {
     wxCHECK_RET( col < (int)m_columns.GetCount(),

-               T("attempting to delete inexistent column in wxListView") );
+               wxT("attempting to delete inexistent column in wxListView") );

 
     m_dirty = TRUE;
     wxNode *node = m_columns.Nth( col );
     if (node) m_columns.DeleteNode( node );
 }
 
 
     m_dirty = TRUE;
     wxNode *node = m_columns.Nth( col );
     if (node) m_columns.DeleteNode( node );
 }
 

-void wxListMainWindow::DeleteAllItems( void )
+void wxListMainWindow::DeleteAllItems()

 {
     m_dirty = TRUE;
     m_current = (wxListLineData *) NULL;
 {
     m_dirty = TRUE;
     m_current = (wxListLineData *) NULL;

-    wxNode *node = m_lines.First();
-    while (node)
-    {
-        wxListLineData *line = (wxListLineData*)node->Data();
-        DeleteLine( line );
-        node = node->Next();
-    }
+
+    // to make the deletion of all items faster, we don't send the
+    // notifications in this case: this is compatible with wxMSW and
+    // documented in DeleteAllItems() description
+
+    wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetParent()->GetId() );
+    event.SetEventObject( GetParent() );
+    GetParent()->GetEventHandler()->ProcessEvent( event );
+

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

-void wxListMainWindow::DeleteEverything( void )
+void wxListMainWindow::DeleteEverything()

 {
 {

-    m_dirty = TRUE;
-    m_current = (wxListLineData *) NULL;
-    wxNode *node = m_lines.First();
-    while (node)
-    {
-        wxListLineData *line = (wxListLineData*)node->Data();
-        DeleteLine( line );
-        node = node->Next();
-    }
-    m_lines.Clear();
-    m_current = (wxListLineData *) NULL;
+    DeleteAllItems();
+    

     m_columns.Clear();
 }
 
     m_columns.Clear();
 }
 


@@ -2297,8 +2435,7 @@ void wxListMainWindow::EnsureVisible( long index )
 
     wxListLineData *oldCurrent = m_current;
     m_current = (wxListLineData *) NULL;
 
     wxListLineData *oldCurrent = m_current;
     m_current = (wxListLineData *) NULL;

-    int i = index;
-    wxNode *node = m_lines.Nth( i );
+    wxNode *node = m_lines.Nth( (size_t)index );

     if (node) m_current = (wxListLineData*)node->Data();
     if (m_current) MoveToFocus();
     m_current = oldCurrent;
     if (node) m_current = (wxListLineData*)node->Data();
     if (m_current) MoveToFocus();
     m_current = oldCurrent;


@@ -2309,7 +2446,7 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p
     long pos = start;
     wxString tmp = str;
     if (pos < 0) pos = 0;
     long pos = start;
     wxString tmp = str;
     if (pos < 0) pos = 0;

-    wxNode *node = m_lines.Nth( pos );
+    wxNode *node = m_lines.Nth( (size_t)pos );

     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();


@@ -2326,7 +2463,7 @@ long wxListMainWindow::FindItem(long start, long data)
 {
     long pos = start;
     if (pos < 0) pos = 0;
 {
     long pos = start;
     if (pos < 0) pos = 0;

-    wxNode *node = m_lines.Nth( pos );
+    wxNode *node = m_lines.Nth( (size_t)pos );

     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();


@@ -2349,7 +2486,7 @@ long wxListMainWindow::HitTest( int x, int y, int &flags )
         long ret = line->IsHit( x, y );
         if (ret & flags)
         {
         long ret = line->IsHit( x, y );
         if (ret & flags)
         {

-            flags = ret;
+            flags = (int)ret;

             return count;
         }
         node = node->Next();
             return count;
         }
         node = node->Next();


@@ -2366,9 +2503,9 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     else if (m_mode & wxLC_LIST) mode = wxLC_LIST;
     else if (m_mode & wxLC_ICON) mode = wxLC_ICON;
     else if (m_mode & wxLC_SMALL_ICON) mode = wxLC_ICON;  // no typo
     else if (m_mode & wxLC_LIST) mode = wxLC_LIST;
     else if (m_mode & wxLC_ICON) mode = wxLC_ICON;
     else if (m_mode & wxLC_SMALL_ICON) mode = wxLC_ICON;  // no typo

-    
+

     wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush );
     wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush );

-    
+

     if (m_mode & wxLC_REPORT)
     {
         line->InitItems( GetColumnCount() );
     if (m_mode & wxLC_REPORT)
     {
         line->InitItems( GetColumnCount() );


@@ -2378,11 +2515,11 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     {
         line->InitItems( 1 );
     }
     {
         line->InitItems( 1 );
     }

-    
+

     line->SetItem( 0, item );
     if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount()))
     {
     line->SetItem( 0, item );
     if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount()))
     {

-        wxNode *node = m_lines.Nth( item.m_itemId );
+        wxNode *node = m_lines.Nth( (size_t)item.m_itemId );

         if (node) m_lines.Insert( node, line );
     }
     else
         if (node) m_lines.Insert( node, line );
     }
     else


@@ -2400,7 +2537,7 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
         wxListHeaderData *column = new wxListHeaderData( item );
         if ((col >= 0) && (col < (int)m_columns.GetCount()))
         {
         wxListHeaderData *column = new wxListHeaderData( item );
         if ((col >= 0) && (col < (int)m_columns.GetCount()))
         {

-            wxNode *node = m_columns.Nth( col );
+            wxNode *node = m_columns.Nth( (size_t)col );

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


@@ -2414,7 +2551,7 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 wxListCtrlCompare list_ctrl_compare_func_2;
 long              list_ctrl_compare_data;
 
 wxListCtrlCompare list_ctrl_compare_func_2;
 long              list_ctrl_compare_data;
 

-int list_ctrl_compare_func_1( const void *arg1, const void *arg2 )
+int LINKAGEMODE list_ctrl_compare_func_1( const void *arg1, const void *arg2 )

 {
     wxListLineData *line1 = *((wxListLineData**)arg1);
     wxListLineData *line2 = *((wxListLineData**)arg2);
 {
     wxListLineData *line1 = *((wxListLineData**)arg1);
     wxListLineData *line2 = *((wxListLineData**)arg2);


@@ -2431,6 +2568,26 @@ 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;
+}
+
+void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
+{
+        wxScrolledWindow::OnScroll( event ) ;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+
+    if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
+    {
+            wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ;
+            if ( lc )
+            {
+                    lc->m_headerWin->Refresh() ;
+#ifdef __WXMAC__
+                        lc->m_headerWin->MacUpdateImmediately() ;
+#endif
+            }
+    }
+#endif

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


@@ -2450,7 +2607,31 @@ wxListItem::wxListItem()
     m_data = 0;
     m_format = wxLIST_FORMAT_CENTRE;
     m_width = 0;
     m_data = 0;
     m_format = wxLIST_FORMAT_CENTRE;
     m_width = 0;

-    m_colour = wxBLACK;
+
+    m_attr = NULL;
+}
+
+void wxListItem::Clear()
+{
+    m_mask = 0;
+    m_itemId = 0;
+    m_col = 0;
+    m_state = 0;
+    m_stateMask = 0;
+    m_image = 0;
+    m_data = 0;
+    m_format = wxLIST_FORMAT_CENTRE;
+    m_width = 0;
+    m_text = wxEmptyString;
+
+    if (m_attr) delete m_attr;
+    m_attr = NULL;
+}
+
+void wxListItem::ClearAttributes()
+{
+    if (m_attr) delete m_attr;
+    m_attr = NULL;

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


@@ -2471,6 +2652,35 @@ wxListEvent::wxListEvent( wxEventType commandType, int id ):
     m_pointDrag.y = 0;
 }
 
     m_pointDrag.y = 0;
 }
 

+void wxListEvent::CopyObject(wxObject& object_dest) const
+{
+    wxListEvent *obj = (wxListEvent *)&object_dest;
+
+    wxNotifyEvent::CopyObject(object_dest);
+
+    obj->m_code = m_code;
+    obj->m_itemIndex = m_itemIndex;
+    obj->m_oldItemIndex = m_oldItemIndex;
+    obj->m_col = m_col;
+    obj->m_cancelled = m_cancelled;
+    obj->m_pointDrag = m_pointDrag;
+    obj->m_item.m_mask = m_item.m_mask;
+    obj->m_item.m_itemId = m_item.m_itemId;
+    obj->m_item.m_col = m_item.m_col;
+    obj->m_item.m_state = m_item.m_state;
+    obj->m_item.m_stateMask = m_item.m_stateMask;
+    obj->m_item.m_text = m_item.m_text;
+    obj->m_item.m_image = m_item.m_image;
+    obj->m_item.m_data = m_item.m_data;
+    obj->m_item.m_format = m_item.m_format;
+    obj->m_item.m_width = m_item.m_width;
+
+    if ( m_item.HasAttributes() )
+    {
+        obj->m_item.SetTextColour(m_item.GetTextColour());
+    }
+}
+

 // -------------------------------------------------------------------------------------
 // wxListCtrl
 // -------------------------------------------------------------------------------------
 // -------------------------------------------------------------------------------------
 // wxListCtrl
 // -------------------------------------------------------------------------------------


@@ -2495,10 +2705,13 @@ wxListCtrl::~wxListCtrl()
 {
 }
 
 {
 }
 

-bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxValidator &validator,
-      const wxString &name )
+bool wxListCtrl::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint &pos,
+                        const wxSize &size,
+                        long style,
+                        const wxValidator &validator,
+                        const wxString &name)

 {
     m_imageListNormal = (wxImageList *) NULL;
     m_imageListSmall = (wxImageList *) NULL;
 {
     m_imageListNormal = (wxImageList *) NULL;
     m_imageListSmall = (wxImageList *) NULL;


@@ -2506,31 +2719,31 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 

-    long s = style;
-
-    if ((s & wxLC_REPORT == 0) &&
-        (s & wxLC_LIST == 0) &&
-        (s & wxLC_ICON == 0))
+    if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) )

     {
     {

-        s = s | wxLC_LIST;
+        style = style | wxLC_LIST;

     }
     }

-
-    bool ret = wxControl::Create( parent, id, pos, size, s, name );
-
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif

   
   

-    if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER;
+    bool ret = wxControl::Create( parent, id, pos, size, style, validator, name );
+  
+    
+    if (style & wxSUNKEN_BORDER)
+        style -= wxSUNKEN_BORDER;

 
 

-    m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s );
+    m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );

 
     if (HasFlag(wxLC_REPORT))
 
     if (HasFlag(wxLC_REPORT))

+    {

         m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL );
         m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL );

+        if (HasFlag(wxLC_NO_HEADER))
+            m_headerWin->Show( FALSE );
+    }

     else
     else

+    {

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

+    }

 
 

-    SetBackgroundColour( *wxWHITE );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

 
     return ret;
 }
 
     return ret;
 }


@@ -2583,18 +2796,18 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
             {
                 if (!m_headerWin)
                 {
             {
                 if (!m_headerWin)
                 {

-                    m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, 
-                     wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
-                   if (HasFlag(wxLC_NO_HEADER))
-                       m_headerWin->Show( FALSE );
+                    m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin,
+                      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
+                    if (HasFlag(wxLC_NO_HEADER))
+                        m_headerWin->Show( FALSE );

                 }
                 else
                 }
                 else

-                {  
-                   if (flag & wxLC_NO_HEADER)
-                       m_headerWin->Show( FALSE );
-                   else
+                {
+                    if (flag & wxLC_NO_HEADER)
+                        m_headerWin->Show( FALSE );
+                    else

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

-                } 
+                }

             }
         }
         else
             }
         }
         else


@@ -2603,9 +2816,9 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
             {
                 m_headerWin->Show( FALSE );
             }
             {
                 m_headerWin->Show( FALSE );
             }

-       }
+        }

     }
     }

-    
+

     wxWindow::SetWindowStyleFlag( flag );
 }
 
     wxWindow::SetWindowStyleFlag( flag );
 }
 


@@ -2763,15 +2976,15 @@ int wxListCtrl::GetSelectedItemCount() const
     return m_mainWin->GetSelectedItemCount();
 }
 
     return m_mainWin->GetSelectedItemCount();
 }
 

-/*

 wxColour wxListCtrl::GetTextColour() const
 {
 wxColour wxListCtrl::GetTextColour() const
 {

+    return GetForegroundColour();

 }
 
 }
 

-void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
+void wxListCtrl::SetTextColour(const wxColour& col)

 {
 {

+    SetForegroundColour(col);

 }
 }

-*/

 
 long wxListCtrl::GetTopItem() const
 {
 
 long wxListCtrl::GetTopItem() const
 {


@@ -2826,7 +3039,7 @@ bool wxListCtrl::DeleteAllColumns()
 {
     for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
         DeleteColumn(n);
 {
     for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
         DeleteColumn(n);

-       
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -2909,7 +3122,10 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
 
 long wxListCtrl::InsertColumn( long col, wxListItem &item )
 {
 
 long wxListCtrl::InsertColumn( long col, wxListItem &item )
 {

+    wxASSERT( m_headerWin );

     m_mainWin->InsertColumn( col, item );
     m_mainWin->InsertColumn( col, item );

+    m_headerWin->Refresh();
+

     return 0;
 }
 
     return 0;
 }
 


@@ -2999,7 +3215,7 @@ bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
         m_mainWin->SetBackgroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }
         m_mainWin->SetBackgroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }

-    
+

     if (m_headerWin)
     {
 //        m_headerWin->SetBackgroundColour( colour );
     if (m_headerWin)
     {
 //        m_headerWin->SetBackgroundColour( colour );


@@ -3012,13 +3228,13 @@ bool wxListCtrl::SetForegroundColour( const wxColour &colour )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;

-    
+

     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }

-    
+

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


@@ -3031,13 +3247,13 @@ bool wxListCtrl::SetFont( const wxFont &font )
 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;
 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;

-    
+

     if (m_mainWin)
     {
         m_mainWin->SetFont( font );
         m_mainWin->m_dirty = TRUE;
     }
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );
         m_mainWin->m_dirty = TRUE;
     }

-    
+

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