X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b8558681e8c69b749f64b891111f5ea72c04550..c8b4eea8f23cd90e8b8390f2a742f0f828c57461:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index cded1af243..30ef6ea2a6 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -23,6 +23,10 @@
 #include "wx/listctrl.h"
 #include "wx/generic/imaglist.h"
 
+#ifndef wxUSE_GENERIC_LIST_EXTENSIONS
+#define wxUSE_GENERIC_LIST_EXTENSIONS 0
+#endif
+
 //-----------------------------------------------------------------------------
 //  wxListItemData
 //-----------------------------------------------------------------------------
@@ -37,14 +41,15 @@ wxListItemData::wxListItemData()
     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;
-    m_colour = info.m_colour;
+    m_attr = NULL;
+
     SetItem( info );
 }
 
@@ -53,7 +58,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;
-    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;
@@ -87,11 +100,6 @@ void wxListItemData::SetSize( int width, int height )
     if (height != -1) m_height = height;
 }
 
-void wxListItemData::SetColour( wxColour *col )
-{
-    m_colour = col;
-}
-
 bool wxListItemData::HasImage() const
 {
     return (m_image >= 0);
@@ -137,17 +145,21 @@ int wxListItemData::GetImage() const
     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_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,8 +294,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
             if (node)
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s;
-                item->GetText( s );
+                wxString s = item->GetText();
                 long lw,lh;
                 dc->GetTextExtent( s, &lw, &lh );
                 if (lw > m_spacing) m_bound_all.width = lw;
@@ -296,8 +307,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
             if (node)
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
-                wxString s;
-                item->GetText( s );
+                wxString s = item->GetText();
                 long lw,lh;
                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
@@ -307,9 +317,9 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                     int w = 0;
                     int h = 0;
                     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;
         }
@@ -324,9 +334,10 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                 wxString s;
                 item->GetText( s );
                 if (s.IsNull()) s = "H";
-                long lh;
-                dc->GetTextExtent( s, (long*) NULL, &lh );
+                long lw,lh;
+                dc->GetTextExtent( s, &lw, &lh );
                 item->SetSize( item->GetWidth(), lh );
+                m_bound_all.width += lw;
                 m_bound_all.height = lh;
                 node = node->Next();
             }
@@ -405,18 +416,18 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
             {
                 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;
-		    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_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:
@@ -436,23 +447,23 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s;
                 item->GetText( s );
-		if (s.IsEmpty()) s = _T("H");
+                if (s.IsEmpty()) s = wxT("H");
                 long 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;
-		    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_bound_label.x += 4 + w;
-		}
-	    }
+                    m_bound_label.x += 4 + w;
+                }
+            }
             break;
         }
     }
@@ -572,38 +583,91 @@ int wxListLineData::GetImage( int index )
     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 )
 {
     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 );
-    
+
     if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))
-    { 
+    {
         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 );
-            dc->SetPen( * wxTRANSPARENT_PEN );
         }
         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->SetBackgroundMode(wxTRANSPARENT);
+
     if (m_mode == wxLC_REPORT)
     {
-        wxString s;
         wxNode *node = m_items.First();
         while (node)
         {
@@ -619,12 +683,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
             }
             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();
@@ -642,13 +701,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
             }
             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 +710,11 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 void wxListLineData::Hilight( bool on )
 {
     if (on == m_hilighted) return;
+    m_hilighted = on;
     if (on)
         m_owner->SelectLine( this );
     else
         m_owner->DeselectLine( this );
-    m_hilighted = on;
 }
 
 void wxListLineData::ReverseHilight( void )
@@ -691,7 +744,7 @@ void wxListLineData::Draw( wxDC *dc )
 
 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));
 }
 
@@ -765,7 +818,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->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 +834,17 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     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() );
@@ -794,7 +857,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     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;
@@ -804,7 +869,13 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         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 );
@@ -812,7 +883,11 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         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;
+#endif
     }
     dc.EndDrawing();
 }
@@ -872,25 +947,40 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     m_minX = 0;
     bool hit_border = FALSE;
     int xpos = 0;
-    for (int j = 0; j < m_owner->GetColumnCount(); j++)
+    for (int j = 0; j < m_owner->GetColumnCount()-1; j++)
     {
         xpos += m_owner->GetColumnWidth( j );
+        m_column = j;
         if ((abs(x-xpos) < 3) && (y < 22))
         {
             hit_border = TRUE;
-            m_column = j;
+            break;
+        }
+        if (x-xpos < 0)
+        {
             break;
         }
         m_minX = xpos;
     }
 
-    if (event.LeftDown() && hit_border)
+    if (event.LeftDown())
     {
-        m_isDragging = TRUE;
-        m_currentX = x;
-        DrawCurrent();
-        CaptureMouse();
-        return;
+        if (hit_border)
+        {
+            m_isDragging = TRUE;
+            m_currentX = x;
+            DrawCurrent();
+            CaptureMouse();
+            return;
+        }
+        else
+        {
+            wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
+            le.SetEventObject( GetParent() );
+            le.m_col = m_column;
+            GetParent()->GetEventHandler()->ProcessEvent( le );
+            return;
+        }
     }
 
     if (event.Moving())
@@ -941,7 +1031,9 @@ 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,
+#if wxUSE_VALIDATORS
     int style, const wxValidator& validator, const wxString &name ) :
+#endif
   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {
     m_res = res;
@@ -958,14 +1050,14 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();
-	m_owner->SetFocus();
+        m_owner->SetFocus();
         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)
     {
         (*m_accept) = FALSE;
         (*m_res) = "";
-	m_owner->SetFocus();
+        m_owner->SetFocus();
         return;
     }
     event.Skip();
@@ -976,7 +1068,7 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
     if (wxPendingDelete.Member(this)) return;
 
     wxPendingDelete.Append(this);
-    
+
     if ((*m_accept) && ((*m_res) != m_startValue))
         m_owner->OnRenameAccept();
 }
@@ -995,6 +1087,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
+  EVT_SCROLLWIN                 (wxListMainWindow::OnScroll)
 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()
@@ -1044,7 +1137,11 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
 
     if (m_mode & wxLC_REPORT)
     {
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        m_xScroll = 15;
+#else
         m_xScroll = 0;
+#endif
         m_yScroll = 15;
     }
     else
@@ -1065,7 +1162,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
 wxListMainWindow::~wxListMainWindow()
 {
     if (m_hilightBrush) delete m_hilightBrush;
-    
+
     delete m_renameTimer;
 }
 
@@ -1097,13 +1194,13 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC( dc );
 
     if (m_dirty) return;
-    
+
     if (m_lines.GetCount() == 0) return;
 
     dc.BeginDrawing();
 
     dc.SetFont( GetFont() );
-    
+
     if (m_mode & wxLC_REPORT)
     {
         int lineSpacing = 0;
@@ -1111,18 +1208,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int dummy = 0;
         line->GetSize( dummy, lineSpacing );
         lineSpacing += 1;
-	
+
         int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
-	
+
         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();
-	}
+        }
     }
     else
     {
@@ -1134,7 +1231,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             node = node->Next();
         }
     }
-    
+
     if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
 
     dc.EndDrawing();
@@ -1162,6 +1259,7 @@ void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command )
     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) )
@@ -1194,8 +1292,8 @@ void wxListMainWindow::DeleteLine( wxListLineData *line )
 void wxListMainWindow::EditLabel( long item )
 {
     wxNode *node = m_lines.Nth( item );
-    wxCHECK_RET( node, _T("wrong index in wxListCtrl::Edit()") );
-    
+    wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") );
+
     m_currentEdit = (wxListLineData*) node->Data();
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
@@ -1203,10 +1301,10 @@ void wxListMainWindow::EditLabel( long item )
     le.m_itemIndex = GetIndexOfLine( m_currentEdit );
     m_currentEdit->GetItem( 0, le.m_item );
     GetParent()->GetEventHandler()->ProcessEvent( le );
-    
+
     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.
@@ -1219,7 +1317,7 @@ void wxListMainWindow::EditLabel( long item )
     int w = 0;
     int h = 0;
     m_currentEdit->GetLabelExtent( x, y, w, h );
-    
+
     wxClientDC dc(this);
     PrepareDC( dc );
     x = dc.LogicalToDeviceX( x );
@@ -1232,8 +1330,8 @@ void wxListMainWindow::EditLabel( long item )
 
 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 ) );
 }
 
@@ -1245,14 +1343,14 @@ void wxListMainWindow::OnRenameAccept()
     m_currentEdit->GetItem( 0, le.m_item );
     le.m_item.m_text = m_renameRes;
     GetParent()->GetEventHandler()->ProcessEvent( le );
-    
+
     if (!le.IsAllowed()) return;
-    
+
     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 );
 }
 
@@ -1268,7 +1366,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     PrepareDC(dc);
     long x = dc.DeviceToLogicalX( (long)event.GetX() );
     long y = dc.DeviceToLogicalY( (long)event.GetY() );
-    
+
     /* Did we actually hit an item ? */
     long hitResult = 0;
     wxNode *node = m_lines.First();
@@ -1285,21 +1383,21 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if (event.Dragging())
     {
         if (m_dragCount == 0)
-	    m_dragStart = wxPoint(x,y);
-	
+            m_dragStart = wxPoint(x,y);
+
         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() );
-	le.m_pointDrag = m_dragStart;
-	GetParent()->GetEventHandler()->ProcessEvent( le );
-	
-	return;
+        le.m_pointDrag = m_dragStart;
+        GetParent()->GetEventHandler()->ProcessEvent( le );
+
+        return;
     }
     else
     {
@@ -1313,9 +1411,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_usedKeys = FALSE;
         m_lastOnSame = FALSE;
         m_renameTimer->Stop();
-    
+
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
-    
+
        return;
     }
 
@@ -1337,13 +1435,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK );
         return;
     }
-  
+
     if (event.MiddleDown())
     {
         SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );
         return;
     }
-  
+
     if (event.LeftDown())
     {
         m_usedKeys = FALSE;
@@ -1366,7 +1464,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             else if (event.ControlDown())
             {
                 m_current = line;
-		
+
                 int numOfCurrent = -1;
                 node = m_lines.First();
                 while (node)
@@ -1376,7 +1474,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                     if (test_line == oldCurrent) break;
                     node = node->Next();
                 }
-		
+
                 int numOfLine = -1;
                 node = m_lines.First();
                 while (node)
@@ -1388,12 +1486,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                 }
 
                 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++)
                 {
@@ -1425,30 +1523,30 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 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 );
-    
+
     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 ); Refresh(); }
-        if (y+h+5 > y_s+h_p) { Scroll( -1, (y+h-h_p/2+h+15)/m_yScroll); Refresh(); }
+        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); }
     }
     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 ); Refresh(); }
-        if (x+w-5 > x_s+w_p) { Scroll( (x+w-w_p+15)/m_xScroll, -1 ); Refresh(); }
+        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 ); }
     }
 }
 
@@ -1468,7 +1566,7 @@ void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
 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;
@@ -1480,14 +1578,14 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
     ke.m_y = event.m_y;
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
-    
+
     event.Skip();
 }
-  
+
 void wxListMainWindow::OnChar( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
-  
+
     /* we send a list_key event up */
     wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
     le.m_code = event.KeyCode();
@@ -1505,7 +1603,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     ke.m_y = event.m_y;
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
-  
+
     if (event.KeyCode() == WXK_TAB)
     {
         wxNavigationKeyEvent nevent;
@@ -1513,7 +1611,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         nevent.SetCurrentFocus( m_parent );
         if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;
     }
-  
+
     /* no item -> nothing to do */
     if (!m_current)
     {
@@ -1550,10 +1648,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         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;
@@ -1569,10 +1667,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         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();
@@ -1645,6 +1743,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     m_usedKeys = TRUE;
 }
 
+#ifdef __WXGTK__
+extern wxWindow *g_focusWindow;
+#endif
+
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = TRUE;
@@ -1652,6 +1754,10 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 
     if (!GetParent()) return;
 
+#ifdef __WXGTK__
+    g_focusWindow = GetParent();
+#endif
+
     wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
     GetParent()->GetEventHandler()->ProcessEvent( event );
@@ -1667,7 +1773,7 @@ void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 /*
   We don't even allow the wxScrolledWindow::AdjustScrollbars() call
-  
+
 */
 }
 
@@ -1802,25 +1908,25 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
             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;
+                long lx = 0, ly = 0;
+                if (item->HasImage())
+                {
                     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();
         }
-	width = max+10;
+        width = max+10;
     }
 
     node = m_columns.Nth( col );
@@ -1875,7 +1981,7 @@ int wxListMainWindow::GetColumnWidth( int col )
     }
     else
     {
-        return 0; 
+        return 0;
     }
 }
 
@@ -1940,11 +2046,11 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
                 if (oldCurrent) RefreshLine( oldCurrent );
             }
             bool on = state & wxLIST_STATE_SELECTED;
-	    if (on != line->IsHilighted())
-	    {
+            if (on != line->IsHilighted())
+            {
                 line->Hilight( on );
                 RefreshLine( line );
-	    }
+            }
         }
     }
 }
@@ -2053,7 +2159,11 @@ void wxListMainWindow::SetMode( long mode )
 
     if (m_mode & wxLC_REPORT)
     {
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+        m_xScroll = 15;
+#else
         m_xScroll = 0;
+#endif
         m_yScroll = 15;
     }
     else
@@ -2078,11 +2188,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;
-  
+
     // 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;
@@ -2102,10 +2212,15 @@ void wxListMainWindow::CalculatePositions()
         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 );
+#endif
         GetClientSize( &clientWidth, &clientHeight );
 
         wxNode* node = m_lines.First();
+        int entireWidth = 0 ;
         while (node)
         {
             wxListLineData *line = (wxListLineData*)node->Data();
@@ -2117,19 +2232,26 @@ void wxListMainWindow::CalculatePositions()
                 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();
         }
-	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
-    
+
         GetSize( &clientWidth, &clientHeight );
-	clientHeight -= 4;  // sunken frame
+        clientHeight -= 4;  // sunken frame
 
         int entireWidth = 0;
 
@@ -2140,22 +2262,22 @@ void wxListMainWindow::CalculatePositions()
             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)
             {
-	        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;
+                if (m_currentVisibleLines > m_visibleLines)
+                    m_visibleLines = m_currentVisibleLines;
                 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;
@@ -2167,14 +2289,13 @@ void wxListMainWindow::CalculatePositions()
                 {
                     clientHeight -= 15; // scrollbar height
                     m_visibleLines = 0;
-	            m_currentVisibleLines = 0;
+                    m_currentVisibleLines = 0;
                     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 );
     }
@@ -2228,7 +2349,7 @@ void wxListMainWindow::DeleteItem( long index )
 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 );
@@ -2239,13 +2360,22 @@ void wxListMainWindow::DeleteAllItems( void )
 {
     m_dirty = TRUE;
     m_current = (wxListLineData *) NULL;
+
+    // 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
+#if 0
     wxNode *node = m_lines.First();
     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
+
         DeleteLine( line );
+
         node = node->Next();
     }
+#endif // 0
+
     m_lines.Clear();
 }
 
@@ -2343,9 +2473,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
-    
+
     wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush );
-    
+
     if (m_mode & wxLC_REPORT)
     {
         line->InitItems( GetColumnCount() );
@@ -2355,7 +2485,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     {
         line->InitItems( 1 );
     }
-    
+
     line->SetItem( 0, item );
     if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount()))
     {
@@ -2391,7 +2521,7 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 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);
@@ -2410,6 +2540,25 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
     m_lines.Sort( list_ctrl_compare_func_1 );
 }
 
+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
+}
+
 // -------------------------------------------------------------------------------------
 // wxListItem
 // -------------------------------------------------------------------------------------
@@ -2427,7 +2576,31 @@ wxListItem::wxListItem()
     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;
 }
 
 // -------------------------------------------------------------------------------------
@@ -2448,6 +2621,35 @@ wxListEvent::wxListEvent( wxEventType commandType, int id ):
     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
 // -------------------------------------------------------------------------------------
@@ -2474,7 +2676,9 @@ wxListCtrl::~wxListCtrl()
 
 bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,
+#if wxUSE_VALIDATORS
       long style, const wxValidator &validator,
+#endif
       const wxString &name )
 {
     m_imageListNormal = (wxImageList *) NULL;
@@ -2485,19 +2689,27 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
 
     long s = style;
 
-    if ((s & wxLC_REPORT == 0) &&
+#ifdef __VMS__
+#pragma message disable codcauunr
+   // VMS reports on this part the warning:
+   // statement either is unreachable or causes unreachable code
+#endif
+   if ((s & wxLC_REPORT == 0) &&
         (s & wxLC_LIST == 0) &&
         (s & wxLC_ICON == 0))
     {
         s = s | wxLC_LIST;
     }
+#ifdef __VMS__
+#pragma message enable codcauunr
+#endif
 
     bool ret = wxControl::Create( parent, id, pos, size, s, name );
 
 #if wxUSE_VALIDATORS
     SetValidator( validator );
 #endif
-  
+
     if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER;
 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s );
@@ -2560,24 +2772,29 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
             {
                 if (!m_headerWin)
                 {
-                    m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, 
-		      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
+                    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
-                {  
-                    m_headerWin->Show( TRUE );
-                } 
+                {
+                    if (flag & wxLC_NO_HEADER)
+                        m_headerWin->Show( FALSE );
+                    else
+                        m_headerWin->Show( TRUE );
+                }
             }
         }
         else
         {
-            if (HasFlag(wxLC_REPORT))
+            if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER)))
             {
                 m_headerWin->Show( FALSE );
             }
-	}
+        }
     }
-    
+
     wxWindow::SetWindowStyleFlag( flag );
 }
 
@@ -2735,15 +2952,15 @@ int wxListCtrl::GetSelectedItemCount() const
     return m_mainWin->GetSelectedItemCount();
 }
 
-/*
 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
 {
@@ -2798,7 +3015,7 @@ bool wxListCtrl::DeleteAllColumns()
 {
     for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
         DeleteColumn(n);
-	
+
     return TRUE;
 }
 
@@ -2848,7 +3065,7 @@ long wxListCtrl::HitTest( const wxPoint &point, int &flags )
 long wxListCtrl::InsertItem( wxListItem& info )
 {
     m_mainWin->InsertItem( info );
-    return 0;
+    return info.m_itemId;
 }
 
 long wxListCtrl::InsertItem( long index, const wxString &label )
@@ -2935,7 +3152,7 @@ void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
     int w = 0;
     int h = 0;
 
-    if (HasFlag(wxLC_REPORT))
+    if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER))
     {
         m_headerWin->GetPosition( &x, &y );
         m_headerWin->GetSize( &w, &h );
@@ -2971,7 +3188,7 @@ bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
         m_mainWin->SetBackgroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }
-    
+
     if (m_headerWin)
     {
 //        m_headerWin->SetBackgroundColour( colour );
@@ -2984,13 +3201,13 @@ bool wxListCtrl::SetForegroundColour( const wxColour &colour )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;
-    
+
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );
         m_mainWin->m_dirty = TRUE;
     }
-    
+
     if (m_headerWin)
     {
         m_headerWin->SetForegroundColour( colour );
@@ -3003,13 +3220,13 @@ bool wxListCtrl::SetFont( const wxFont &font )
 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;
-    
+
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );
         m_mainWin->m_dirty = TRUE;
     }
-    
+
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );