Added two stand alone makefiles for samples.

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 36d171b2cce316bbeeec40be7e2282fcf623f232..14d3131e83fd33b78ca60b1ed7cdb75faa12879f 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -23,6 +23,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
 //-----------------------------------------------------------------------------


@@ -324,9 +328,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 );
+                long 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();
             }


@@ -436,7 +441,7 @@ 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");
+               if (s.IsEmpty()) s = wxT("H");

                 long lw,lh;
                 dc->GetTextExtent( s, &lw, &lh );
                m_bound_label.width = lw;
                 long lw,lh;
                 dc->GetTextExtent( s, &lw, &lh );
                m_bound_label.width = lw;


@@ -578,9 +583,9 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
     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 );
     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 ))
     if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))

-    { 
+    {

         return;
     }
 
         return;
     }
 


@@ -599,7 +604,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
         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)
     {
     dc->SetBackgroundMode(wxTRANSPARENT);
     if (m_mode == wxLC_REPORT)
     {


@@ -691,7 +696,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 +770,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 +786,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() );


@@ -804,7 +819,12 @@ 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 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;
         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 +832,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();
 }


@@ -872,7 +896,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     m_minX = 0;
     bool hit_border = FALSE;
     int xpos = 0;
     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;
     {
         xpos += m_owner->GetColumnWidth( j );
         m_column = j;


@@ -956,7 +980,13 @@ 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,
 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
+#  if defined(__VISAGECPP__)
+    int style, const wxValidator* validator, const wxString &name ) :
+#  else

     int style, const wxValidator& validator, const wxString &name ) :
     int style, const wxValidator& validator, const wxString &name ) :

+#  endif
+#endif

   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {
     m_res = res;
   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {
     m_res = res;


@@ -991,7 +1021,7 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
     if (wxPendingDelete.Member(this)) return;
 
     wxPendingDelete.Append(this);
     if (wxPendingDelete.Member(this)) return;
 
     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 +1040,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 +1090,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


@@ -1080,7 +1115,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
 wxListMainWindow::~wxListMainWindow()
 {
     if (m_hilightBrush) delete m_hilightBrush;
 wxListMainWindow::~wxListMainWindow()
 {
     if (m_hilightBrush) delete m_hilightBrush;

-    
+

     delete m_renameTimer;
 }
 
     delete m_renameTimer;
 }
 


@@ -1112,13 +1147,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;


@@ -1133,7 +1168,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
        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();


@@ -1149,7 +1184,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();


@@ -1209,8 +1244,8 @@ void wxListMainWindow::DeleteLine( wxListLineData *line )
 void wxListMainWindow::EditLabel( long item )
 {
     wxNode *node = m_lines.Nth( item );
 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() );
     m_currentEdit = (wxListLineData*) node->Data();
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );


@@ -1218,10 +1253,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 +1269,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 +1282,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,9 +1295,9 @@ 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;
     wxListItem info;
     info.m_mask = wxLIST_MASK_TEXT;
     info.m_itemId = le.m_itemIndex;


@@ -1283,7 +1318,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     PrepareDC(dc);
     long x = dc.DeviceToLogicalX( (long)event.GetX() );
     long y = dc.DeviceToLogicalY( (long)event.GetY() );
     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();
     /* Did we actually hit an item ? */
     long hitResult = 0;
     wxNode *node = m_lines.First();


@@ -1328,9 +1363,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 +1387,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;


@@ -1403,12 +1438,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 +1475,30 @@ 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 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 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 (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;
     }
     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 ); }

     }
 }
 
     }
 }
 


@@ -1483,7 +1518,7 @@ void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
 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,14 +1530,14 @@ 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() );
     le.m_code = event.KeyCode();
     /* we send a list_key event up */
     wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
     le.m_code = event.KeyCode();


@@ -1520,7 +1555,7 @@ 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;
     if (event.KeyCode() == WXK_TAB)
     {
         wxNavigationKeyEvent nevent;


@@ -1528,7 +1563,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         nevent.SetCurrentFocus( m_parent );
         if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;
     }
         nevent.SetCurrentFocus( m_parent );
         if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;
     }

-  
+

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


@@ -1565,9 +1600,9 @@ 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
             {
            }
             else
             {


@@ -1584,9 +1619,9 @@ 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
             {
            }
             else
             {


@@ -1670,7 +1705,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 +1725,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

-  
+

 */
 }
 
 */
 }
 


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

-        return 0; 
+        return 0;

     }
 }
 
     }
 }
 


@@ -2076,7 +2111,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 +2140,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 +2164,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 );

+        int x_scroll_pos = GetScrollPos( wxHORIZONTAL );
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+#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,17 +2184,24 @@ 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 );
        clientHeight -= 4;  // sunken frame
 
         GetSize( &clientWidth, &clientHeight );
        clientHeight -= 4;  // sunken frame
 


@@ -2174,10 +2225,10 @@ void wxListMainWindow::CalculatePositions()
                 line->GetSize( lineWidth, lineHeight );
                 if (lineWidth > maxWidth) maxWidth = lineWidth;
                 y += lineSpacing;
                 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;
                     y = 5;
                     x += maxWidth+6;
                    m_currentVisibleLines = 0;
                     y = 5;
                     x += maxWidth+6;


@@ -2196,7 +2247,6 @@ void wxListMainWindow::CalculatePositions()
                 if (!node) tries = 1;  // everything fits, no second try required
             }
         }
                 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 );


@@ -2251,7 +2301,7 @@ 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 );
 
     m_dirty = TRUE;
     wxNode *node = m_columns.Nth( col );


@@ -2366,9 +2416,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,7 +2428,7 @@ 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()))
     {


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


@@ -2433,6 +2483,25 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
     m_lines.Sort( list_ctrl_compare_func_1 );
 }
 
     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
 // -------------------------------------------------------------------------------------
 // -------------------------------------------------------------------------------------
 // wxListItem
 // -------------------------------------------------------------------------------------


@@ -2497,7 +2566,13 @@ wxListCtrl::~wxListCtrl()
 
 bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,
 
 bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,

+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+      long style, const wxValidator *validator,
+#  else

       long style, const wxValidator &validator,
       long style, const wxValidator &validator,

+#  endif
+#endif

       const wxString &name )
 {
     m_imageListNormal = (wxImageList *) NULL;
       const wxString &name )
 {
     m_imageListNormal = (wxImageList *) NULL;


@@ -2520,7 +2595,7 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
 #if wxUSE_VALIDATORS
     SetValidator( validator );
 #endif
 #if wxUSE_VALIDATORS
     SetValidator( validator );
 #endif

-  
+

     if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER;
 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s );
     if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER;
 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s );


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

-                    m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, 
+                    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
                      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
                    if (HasFlag(wxLC_NO_HEADER))
                        m_headerWin->Show( FALSE );
                 }
                 else

-                {  
+                {

                    if (flag & 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
             }
         }
         else


@@ -2605,7 +2680,7 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
             }
        }
     }
             }
        }
     }

-    
+

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


@@ -2876,7 +2951,7 @@ long wxListCtrl::HitTest( const wxPoint &point, int &flags )
 long wxListCtrl::InsertItem( wxListItem& info )
 {
     m_mainWin->InsertItem( info );
 long wxListCtrl::InsertItem( wxListItem& info )
 {
     m_mainWin->InsertItem( info );

-    return 0;
+    return info.m_itemId;

 }
 
 long wxListCtrl::InsertItem( long index, const wxString &label )
 }
 
 long wxListCtrl::InsertItem( long index, const wxString &label )


@@ -2999,7 +3074,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 +3087,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 +3106,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 );