added SpinCtrl,

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 22f789c1964b753ad6efb3c657f387e57b3f2a9d..1855e79d9e32f456f24e6e93ea44b623067dd84d 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/dcscreen.h"
 #include "wx/app.h"
 
 #include "wx/dcscreen.h"
 #include "wx/app.h"

-#include "wx/generic/listctrl.h"
+#include "wx/listctrl.h"

 #include "wx/generic/imaglist.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/generic/imaglist.h"
 
 //-----------------------------------------------------------------------------


@@ -29,7 +29,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject);
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject);
 

-wxListItemData::wxListItemData(void)
+wxListItemData::wxListItemData()

 {
     m_image = -1;
     m_data = 0;
 {
     m_image = -1;
     m_data = 0;


@@ -92,12 +92,12 @@ void wxListItemData::SetColour( wxColour *col )
     m_colour = col;
 }
 
     m_colour = col;
 }
 

-bool wxListItemData::HasImage(void) const
+bool wxListItemData::HasImage() const

 {
     return (m_image >= 0);
 }
 
 {
     return (m_image >= 0);
 }
 

-bool wxListItemData::HasText(void) const
+bool wxListItemData::HasText() const

 {
     return (!m_text.IsNull());
 }
 {
     return (!m_text.IsNull());
 }


@@ -112,27 +112,27 @@ void wxListItemData::GetText( wxString &s )
     s = m_text;
 }
 
     s = m_text;
 }
 

-int wxListItemData::GetX( void ) const
+int wxListItemData::GetX() const

 {
     return m_xpos;
 }
 
 {
     return m_xpos;
 }
 

-int wxListItemData::GetY( void ) const
+int wxListItemData::GetY() const

 {
     return m_ypos;
 }
 
 {
     return m_ypos;
 }
 

-int wxListItemData::GetWidth(void) const
+int wxListItemData::GetWidth() const

 {
     return m_width;
 }
 
 {
     return m_width;
 }
 

-int wxListItemData::GetHeight(void) const
+int wxListItemData::GetHeight() const

 {
     return m_height;
 }
 
 {
     return m_height;
 }
 

-int wxListItemData::GetImage(void) const
+int wxListItemData::GetImage() const

 {
     return m_image;
 }
 {
     return m_image;
 }


@@ -142,9 +142,10 @@ void wxListItemData::GetItem( wxListItem &info )
     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(void)
+wxColour *wxListItemData::GetColour()

 {
     return m_colour;
 }
 {
     return m_colour;
 }


@@ -155,7 +156,7 @@ wxColour *wxListItemData::GetColour(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject);
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject);
 

-wxListHeaderData::wxListHeaderData(void)
+wxListHeaderData::wxListHeaderData()

 {
     m_mask = 0;
     m_image = 0;
 {
     m_mask = 0;
     m_image = 0;


@@ -208,12 +209,12 @@ void wxListHeaderData::SetFormat( int format )
     m_format = format;
 }
 
     m_format = format;
 }
 

-bool wxListHeaderData::HasImage(void) const
+bool wxListHeaderData::HasImage() const

 {
     return (m_image != 0);
 }
 
 {
     return (m_image != 0);
 }
 

-bool wxListHeaderData::HasText(void) const
+bool wxListHeaderData::HasText() const

 {
     return (m_text.Length() > 0);
 }
 {
     return (m_text.Length() > 0);
 }


@@ -237,17 +238,17 @@ void wxListHeaderData::GetText( wxString &s )
     s =  m_text;
 }
 
     s =  m_text;
 }
 

-int wxListHeaderData::GetImage(void) const
+int wxListHeaderData::GetImage() const

 {
     return m_image;
 }
 
 {
     return m_image;
 }
 

-int wxListHeaderData::GetWidth(void) const
+int wxListHeaderData::GetWidth() const

 {
     return m_width;
 }
 
 {
     return m_width;
 }
 

-int wxListHeaderData::GetFormat(void) const
+int wxListHeaderData::GetFormat() const

 {
     return m_format;
 }
 {
     return m_format;
 }


@@ -301,6 +302,14 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
                 m_bound_all.height = lh;
                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
                 m_bound_all.height = lh;

+                if (item->HasImage())
+                {
+                    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;
+               }

             }
             break;
         }
             }
             break;
         }


@@ -315,10 +324,9 @@ 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 lw,lh;
-                dc->GetTextExtent( s, &lw, &lh );
+                long lh;
+                dc->GetTextExtent( s, (long*) NULL, &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();
             }


@@ -329,85 +337,125 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 
 void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
 {
 
 void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
 {

-  m_bound_all.x = x;
-  m_bound_all.y = y;
-  switch (m_mode)
-  {
-    case wxLC_ICON:
-    {
-      AssignRect( m_bound_icon, 0, 0, 0, 0 );
-      AssignRect( m_bound_label, 0, 0, 0, 0 );
-      AssignRect( m_bound_hilight, m_bound_all );
-      wxNode *node = m_items.First();
-      if (node)
-      {
-        wxListItemData *item = (wxListItemData*)node->Data();
-        if (item->HasImage())
+    m_bound_all.x = x;
+    m_bound_all.y = y;
+    switch (m_mode)
+    {
+        case wxLC_ICON:

         {
         {

-          wxListItemData *item = (wxListItemData*)node->Data();
-          int w = 0;
-          int h = 0;
-          m_owner->GetImageSize( item->GetImage(), w, h );
-          m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2);
-          m_bound_icon.y = m_bound_all.y + m_spacing - h - 5;
-          m_bound_icon.width = w;
-          m_bound_icon.height = h;
-          if (!item->HasText())
-          {
-            AssignRect( m_bound_hilight, m_bound_icon );
-            m_bound_hilight.x -= 5;
-            m_bound_hilight.y -= 5;
-            m_bound_hilight.width += 9;
-            m_bound_hilight.height += 9;
-          }
+            AssignRect( m_bound_icon, 0, 0, 0, 0 );
+            AssignRect( m_bound_label, 0, 0, 0, 0 );
+            AssignRect( m_bound_hilight, m_bound_all );
+            wxNode *node = m_items.First();
+            if (node)
+            {
+                wxListItemData *item = (wxListItemData*)node->Data();
+                if (item->HasImage())
+                {
+                    wxListItemData *item = (wxListItemData*)node->Data();
+                    int w = 0;
+                    int h = 0;
+                    m_owner->GetImageSize( item->GetImage(), w, h );
+                    m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2);
+                    m_bound_icon.y = m_bound_all.y + m_spacing - h - 5;
+                    m_bound_icon.width = w;
+                    m_bound_icon.height = h;
+                    if (!item->HasText())
+                    {
+                        AssignRect( m_bound_hilight, m_bound_icon );
+                        m_bound_hilight.x -= 5;
+                        m_bound_hilight.y -= 5;
+                        m_bound_hilight.width += 9;
+                        m_bound_hilight.height += 9;
+                    }
+                }
+                if (item->HasText())
+                {
+                    wxString s;
+                    item->GetText( s );
+                    long lw,lh;
+                    dc->GetTextExtent( s, &lw, &lh );
+                    if (m_bound_all.width > m_spacing)
+                        m_bound_label.x = m_bound_all.x;
+                    else
+                        m_bound_label.x = m_bound_all.x +  (m_spacing/2) - lw/2;
+                    m_bound_label.y = m_bound_all.y + m_bound_all.height - lh;
+                    m_bound_label.width = lw;
+                    m_bound_label.height = lh;
+                    AssignRect( m_bound_hilight, m_bound_label );
+                    m_bound_hilight.x -= 2;
+                    m_bound_hilight.y -= 2;
+                    m_bound_hilight.width += 4;
+                    m_bound_hilight.height += 4;
+                }
+            }
+            break;

         }
         }

-        if (item->HasText())
+        case wxLC_LIST:

         {
         {

-          wxString s;
-          item->GetText( s );
-          long lw,lh;
-          dc->GetTextExtent( s, &lw, &lh );
-          if (m_bound_all.width > m_spacing)
-            m_bound_label.x = m_bound_all.x;
-          else
-            m_bound_label.x = m_bound_all.x +  (m_spacing/2) - lw/2;
-          m_bound_label.y = m_bound_all.y + m_bound_all.height - lh;
-          m_bound_label.width = lw;
-          m_bound_label.height = lh;
-          AssignRect( m_bound_hilight, m_bound_label );
-          m_bound_hilight.x -= 2;
-          m_bound_hilight.y -= 2;
-          m_bound_hilight.width += 4;
-          m_bound_hilight.height += 4;
+            AssignRect( m_bound_label, m_bound_all );
+            m_bound_all.x -= 2;
+            m_bound_all.y -= 2;
+            m_bound_all.width += 4;
+            m_bound_all.height += 3;
+            AssignRect( m_bound_hilight, m_bound_all );
+            AssignRect( m_bound_icon, 0, 0, 0, 0 );
+            wxNode *node = m_items.First();
+            if (node)
+            {
+                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;
+                    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;
+               }
+           }
+            break;
+        }
+        case wxLC_REPORT:
+        {
+            long lw,lh;
+            dc->GetTextExtent( "H", &lw, &lh );
+            m_bound_all.x = 0;
+            m_bound_all.y -= 0;
+            m_bound_all.height = lh+3;
+            m_bound_all.width = window_width;
+            AssignRect( m_bound_hilight, m_bound_all );
+            AssignRect( m_bound_label, m_bound_all );
+            AssignRect( m_bound_icon, 0, 0, 0, 0 );
+            wxNode *node = m_items.First();
+            if (node)
+            {
+                wxListItemData *item = (wxListItemData*)node->Data();
+                wxString s;
+                item->GetText( s );
+               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_icon.x = m_bound_all.x + 2;
+                    m_bound_icon.y = m_bound_all.y + 2;
+                   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;
+               }
+           }
+            break;

         }
         }

-      }
-      break;
-    }
-    case wxLC_LIST:
-    {
-      AssignRect( m_bound_label, m_bound_all );
-      m_bound_all.x -= 2;
-      m_bound_all.y -= 2;
-      m_bound_all.width += 4;
-      m_bound_all.height += 3;
-      AssignRect( m_bound_hilight, m_bound_all );
-      AssignRect( m_bound_icon, 0, 0, 0, 0 );
-      break;
-    }
-    case wxLC_REPORT:
-    {
-      long lw,lh;
-      dc->GetTextExtent( "H", &lw, &lh );
-      m_bound_all.x = 0;
-      m_bound_all.y -= 0;
-      m_bound_all.height = lh+3;
-      m_bound_all.width = window_width;
-      AssignRect( m_bound_hilight, m_bound_all );
-      AssignRect( m_bound_label, 0, 0, 0 ,0 );
-      AssignRect( m_bound_icon, 0, 0, 0, 0 );
-      break;

     }
     }

-  }

 }
 
 void wxListLineData::SetColumnPosition( int index, int x )
 }
 
 void wxListLineData::SetColumnPosition( int index, int x )


@@ -685,7 +733,7 @@ wxListHeaderWindow::wxListHeaderWindow( void )
     m_owner = (wxListMainWindow *) NULL;
     m_currentCursor = (wxCursor *) NULL;
     m_resizeCursor = (wxCursor *) NULL;
     m_owner = (wxListMainWindow *) NULL;
     m_currentCursor = (wxCursor *) NULL;
     m_resizeCursor = (wxCursor *) NULL;

-    m_isDraging = FALSE;
+    m_isDragging = FALSE;

 }
 
 wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
 }
 
 wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,


@@ -697,7 +745,8 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMain
 //  m_currentCursor = wxSTANDARD_CURSOR;
     m_currentCursor = (wxCursor *) NULL;
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 //  m_currentCursor = wxSTANDARD_CURSOR;
     m_currentCursor = (wxCursor *) NULL;
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );

-    m_isDraging = FALSE;
+    m_isDragging = FALSE;
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) );

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


@@ -713,7 +762,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
 
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)

-    dc->DrawRectangle( x, y+h, w, 1 );            // bottom (outer)
+    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)

 
     wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
   
 
     wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
   


@@ -780,7 +829,7 @@ void wxListHeaderWindow::DrawCurrent()
     m_owner->ClientToScreen( &x2, &y2 );
 
     wxScreenDC dc;
     m_owner->ClientToScreen( &x2, &y2 );
 
     wxScreenDC dc;

-    dc.SetLogicalFunction( wxXOR );
+    dc.SetLogicalFunction( wxINVERT );

     dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 
     dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 


@@ -796,13 +845,13 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
     int x = event.GetX();
     int y = event.GetY();
 {
     int x = event.GetX();
     int y = event.GetY();

-    if (m_isDraging)
+    if (m_isDragging)

     {
         DrawCurrent();
         if (event.ButtonUp())
         {
             ReleaseMouse();
     {
         DrawCurrent();
         if (event.ButtonUp())
         {
             ReleaseMouse();

-            m_isDraging = FALSE;
+            m_isDragging = FALSE;

             m_owner->SetColumnWidth( m_column, m_currentX-m_minX );
         }
         else
             m_owner->SetColumnWidth( m_column, m_currentX-m_minX );
         }
         else


@@ -826,22 +875,37 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     for (int j = 0; j < m_owner->GetColumnCount(); j++)
     {
         xpos += m_owner->GetColumnWidth( j );
     for (int j = 0; j < m_owner->GetColumnCount(); j++)
     {
         xpos += m_owner->GetColumnWidth( j );

+        m_column = j;

         if ((abs(x-xpos) < 3) && (y < 22))
         {
             hit_border = TRUE;
         if ((abs(x-xpos) < 3) && (y < 22))
         {
             hit_border = TRUE;

-            m_column = j;

             break;
         }
             break;
         }

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

         m_minX = xpos;
     }
 
         m_minX = xpos;
     }
 

-    if (event.LeftDown() && hit_border)
+    if (event.LeftDown())

     {
     {

-        m_isDraging = 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())
     }
 
     if (event.Moving())


@@ -898,6 +962,9 @@ wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
     m_res = res;
     m_accept = accept;
     m_owner = owner;
     m_res = res;
     m_accept = accept;
     m_owner = owner;

+    (*m_accept) = FALSE;
+    (*m_res) = "";
+    m_startValue = value;

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


@@ -906,17 +973,14 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();

-        m_owner->OnRenameAccept();
-//      Show( FALSE );
-        Destroy();
+       m_owner->SetFocus();

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

-//      Show( FALSE );
-        Destroy();
+       m_owner->SetFocus();

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


@@ -924,11 +988,12 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {

-    (*m_accept) = FALSE;
-    (*m_res) = "";
-//  Show( FALSE );
-    Destroy();
-    return;
+    if (wxPendingDelete.Member(this)) return;
+
+    wxPendingDelete.Append(this);
+    
+    if ((*m_accept) && ((*m_res) != m_startValue))
+        m_owner->OnRenameAccept();

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


@@ -942,11 +1007,12 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_SIZE           (wxListMainWindow::OnSize)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_SIZE           (wxListMainWindow::OnSize)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)

+  EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)

   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
 END_EVENT_TABLE()
 
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
 END_EVENT_TABLE()
 

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

 {
     m_mode = 0;
     m_lines.DeleteContents( TRUE );
 {
     m_mode = 0;
     m_lines.DeleteContents( TRUE );


@@ -1011,7 +1077,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
     SetBackgroundColour( *wxWHITE );
 }
 
     SetBackgroundColour( *wxWHITE );
 }
 

-wxListMainWindow::~wxListMainWindow( void )
+wxListMainWindow::~wxListMainWindow()

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


@@ -1138,32 +1204,37 @@ void wxListMainWindow::DeleteLine( wxListLineData *line )
     SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
 }
 
     SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
 }
 

-void wxListMainWindow::StartLabelEdit( wxListLineData *line )
-{
-    SendNotify( line, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT );
-}
+/* *** */

 
 

-void wxListMainWindow::RenameLine( wxListLineData *line, const wxString &newName )
+void wxListMainWindow::EditLabel( long item )

 {
 {

-    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    wxNode *node = m_lines.Nth( 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() );

     le.SetEventObject( GetParent() );
     le.SetEventObject( GetParent() );

-    le.m_itemIndex = GetIndexOfLine( line );
-    line->GetItem( 0, le.m_item );
-    le.m_item.m_text = newName;
+    le.m_itemIndex = GetIndexOfLine( m_currentEdit );
+    m_currentEdit->GetItem( 0, le.m_item );

     GetParent()->GetEventHandler()->ProcessEvent( le );
     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.
+    if (m_dirty) wxYield();

 
 

-void wxListMainWindow::OnRenameTimer()
-{
-    StartLabelEdit( m_current );

     wxString s;
     wxString s;

-    m_current->GetText( 0, s );
+    m_currentEdit->GetText( 0, s );

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

-    m_current->GetLabelExtent( x, y, w, h );
-
+    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 );


@@ -1174,9 +1245,30 @@ void wxListMainWindow::OnRenameTimer()
     text->SetFocus();
 }
 
     text->SetFocus();
 }
 

+void wxListMainWindow::OnRenameTimer()
+{
+    wxCHECK_RET( m_current, wxT("invalid m_current") );
+    
+    Edit( m_lines.IndexOf( m_current ) );
+}
+

 void wxListMainWindow::OnRenameAccept()
 {
 void wxListMainWindow::OnRenameAccept()
 {

-    RenameLine( m_current, m_renameRes );
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    le.SetEventObject( GetParent() );
+    le.m_itemIndex = GetIndexOfLine( m_currentEdit );
+    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;
+    SetItem( info );

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


@@ -1185,13 +1277,14 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     if (!m_current) return;
     if (m_dirty) return;
 
     if (!m_current) return;
     if (m_dirty) return;

+    if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || event.ButtonDClick()) ) return;

 
     wxClientDC dc(this);
     PrepareDC(dc);
     long x = dc.DeviceToLogicalX( (long)event.GetX() );
     long y = dc.DeviceToLogicalY( (long)event.GetY() );
     
 
     wxClientDC dc(this);
     PrepareDC(dc);
     long x = dc.DeviceToLogicalX( (long)event.GetX() );
     long y = dc.DeviceToLogicalY( (long)event.GetY() );
     

-    // Did we actually hit an item ?
+    /* Did we actually hit an item ? */

     long hitResult = 0;
     wxNode *node = m_lines.First();
     wxListLineData *line = (wxListLineData *) NULL;
     long hitResult = 0;
     wxNode *node = m_lines.First();
     wxListLineData *line = (wxListLineData *) NULL;


@@ -1204,23 +1297,29 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    if (!event.Dragging())
-        m_dragCount = 0;
-    else
-        m_dragCount++;
-
-    if (event.Dragging() && (m_dragCount > 3))
+    if (event.Dragging())

     {
     {

-        m_dragCount = 0;
+        if (m_dragCount == 0)
+           m_dragStart = wxPoint(x,y);
+       
+        m_dragCount++;
+       
+       if (m_dragCount != 3) return;

        
        

-        wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_DRAG, GetParent()->GetId() );
+       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.SetEventObject( GetParent() );

-       le.m_pointDrag.x = x;
-       le.m_pointDrag.y = y;
+       le.m_pointDrag = m_dragStart;

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

+    else
+    {
+        m_dragCount = 0;
+    }

 
     if (!line) return;
 
 
     if (!line) return;
 


@@ -1338,7 +1437,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxListMainWindow::MoveToFocus( void )
+void wxListMainWindow::MoveToFocus()

 {
     if (!m_current) return;
   
 {
     if (!m_current) return;
   


@@ -1356,15 +1455,15 @@ void wxListMainWindow::MoveToFocus( void )
     {
         int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
         if ((y > y_s) && (y+h < y_s+h_p)) return;
     {
         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 (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 );
-        if (x+w-5 > x_s+w_p) Scroll( (x+w-w_p+15)/m_xScroll, -1 );
+        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 ); }

     }
 }
 
     }
 }
 


@@ -1381,153 +1480,200 @@ void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
     UnfocusLine( oldCurrent );
 }
 
     UnfocusLine( oldCurrent );
 }
 

+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;
+    ke.m_controlDown = event.m_controlDown;
+    ke.m_altDown = event.m_altDown;
+    ke.m_metaDown = event.m_metaDown;
+    ke.m_keyCode = event.m_keyCode;
+    ke.m_x = event.m_x;
+    ke.m_y = event.m_y;
+    ke.SetEventObject( parent );
+    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    
+    event.Skip();
+}
+  

 void wxListMainWindow::OnChar( wxKeyEvent &event )
 {
 void wxListMainWindow::OnChar( wxKeyEvent &event )
 {

-  wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
-  le.m_code = event.KeyCode();
-  le.SetEventObject( GetParent() );
-  GetParent()->GetEventHandler()->ProcessEvent( le );
+    wxWindow *parent = GetParent();

   
   

-/*
-  if (event.KeyCode() == WXK_TAB)
-  {
-    if (event.ShiftDown())
-      TravPrev( &event );
-    else
-      TravNext( &event );
-    return;
-  }
-*/
-  if ( !m_current )
-  {
-      event.Skip();
-      return;
-  }
-
-  switch (event.KeyCode())
-  {
-    case WXK_UP:
-    {
-      wxNode *node = m_lines.Member( m_current )->Previous();
-      if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      break;
-    }
-    case WXK_DOWN:
-    {
-      wxNode *node = m_lines.Member( m_current )->Next();
-      if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      break;
-    }
-    case WXK_END:
-    {
-      wxNode *node = m_lines.Last();
-      OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      break;
-    }
-    case WXK_HOME:
-    {
-      wxNode *node = m_lines.First();
-      OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      break;
-    }
-    case WXK_PRIOR:
+    /* we send a list_key event up */
+    wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
+    le.m_code = event.KeyCode();
+    le.SetEventObject( parent );
+    parent->GetEventHandler()->ProcessEvent( le );
+
+    /* we propagate the char event up */
+    wxKeyEvent ke( wxEVT_CHAR );
+    ke.m_shiftDown = event.m_shiftDown;
+    ke.m_controlDown = event.m_controlDown;
+    ke.m_altDown = event.m_altDown;
+    ke.m_metaDown = event.m_metaDown;
+    ke.m_keyCode = event.m_keyCode;
+    ke.m_x = event.m_x;
+    ke.m_y = event.m_y;
+    ke.SetEventObject( parent );
+    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+  
+    if (event.KeyCode() == WXK_TAB)

     {
     {

-      int steps = 0;
-      if (m_mode & wxLC_REPORT) { steps = m_visibleLines-1; }
-      else
-      {
-        int pos = 0;
-        wxNode *node = m_lines.First();
-        for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
-        steps = pos % m_visibleLines;
-      }
-      wxNode *node = m_lines.Member( m_current );
-      for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous();
-      if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      break;
-    }
-    case WXK_NEXT:
-    {
-      int steps = 0;
-      if (m_mode & wxLC_REPORT) { steps = m_visibleLines-1; }
-      else
-      {
-        int pos = 0; wxNode *node = m_lines.First();
-        for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
-        steps = m_visibleLines-(pos % m_visibleLines)-1;
-      }
-      wxNode *node = m_lines.Member( m_current );
-      for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next();
-      if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      break;
-    }
-    case WXK_LEFT:
-    {
-      if (!(m_mode & wxLC_REPORT))
-      {
-        wxNode *node = m_lines.Member( m_current );
-        for (int i = 0; i <m_visibleLines; i++) if (node->Previous()) node = node->Previous();
-        if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      }
-      break;
-    }
-    case WXK_RIGHT:
-    {
-      if (!(m_mode & wxLC_REPORT))
-      {
-        wxNode *node = m_lines.Member( m_current );
-        for (int i = 0; i <m_visibleLines; i++) if (node->Next()) node = node->Next();
-        if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
-      }
-      break;
-    }
-    case WXK_SPACE:
-    {
-      m_current->ReverseHilight();
-      RefreshLine( m_current );
-    }
-    break;
-    case WXK_INSERT:
-    {
-      if (!(m_mode & wxLC_SINGLE_SEL))
-      {
-        wxListLineData *oldCurrent = m_current;
-        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 );
-      }
+        wxNavigationKeyEvent nevent;
+        nevent.SetDirection( !event.ShiftDown() );
+        nevent.SetCurrentFocus( m_parent );
+        if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;

     }
     }

-    break;
-    case WXK_RETURN:
-    case WXK_EXECUTE:
+  
+    /* no item -> nothing to do */
+    if (!m_current)

     {
     {

-      wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, GetParent()->GetId() );
-      le.SetEventObject( GetParent() );
-      le.m_itemIndex = GetIndexOfLine( m_current );
-      m_current->GetItem( 0, le.m_item );
-      GetParent()->GetEventHandler()->ProcessEvent( le );
+        event.Skip();
+        return;

     }
     }

-    break;
-    default:
+
+    switch (event.KeyCode())

     {
     {

-      event.Skip();
-      return;
+        case WXK_UP:
+        {
+            wxNode *node = m_lines.Member( m_current )->Previous();
+            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            break;
+        }
+        case WXK_DOWN:
+        {
+            wxNode *node = m_lines.Member( m_current )->Next();
+            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            break;
+        }
+        case WXK_END:
+        {
+            wxNode *node = m_lines.Last();
+            OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            break;
+        }
+        case WXK_HOME:
+        {
+            wxNode *node = m_lines.First();
+            OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            break;
+        }
+        case WXK_PRIOR:
+        {
+            int steps = 0;
+            if (m_mode & wxLC_REPORT) 
+           { 
+               steps = m_visibleLines-1; 
+           }
+            else
+            {
+                int pos = 0;
+                wxNode *node = m_lines.First();
+                for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
+                steps = pos % m_visibleLines;
+            }
+            wxNode *node = m_lines.Member( m_current );
+            for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous();
+            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            break;
+        }
+        case WXK_NEXT:
+        {
+            int steps = 0;
+            if (m_mode & wxLC_REPORT) 
+           { 
+               steps = m_visibleLines-1; 
+           }
+            else
+            {
+                int pos = 0; wxNode *node = m_lines.First();
+                for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
+                steps = m_visibleLines-(pos % m_visibleLines)-1;
+            }
+            wxNode *node = m_lines.Member( m_current );
+            for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next();
+            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            break;
+        }
+        case WXK_LEFT:
+        {
+            if (!(m_mode & wxLC_REPORT))
+            {
+                wxNode *node = m_lines.Member( m_current );
+                for (int i = 0; i <m_visibleLines; i++) if (node->Previous()) node = node->Previous();
+                if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            }
+            break;
+        }
+        case WXK_RIGHT:
+        {
+            if (!(m_mode & wxLC_REPORT))
+            {
+                wxNode *node = m_lines.Member( m_current );
+                for (int i = 0; i <m_visibleLines; i++) if (node->Next()) node = node->Next();
+                if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+            }
+            break;
+        }
+        case WXK_SPACE:
+        {
+            m_current->ReverseHilight();
+            RefreshLine( m_current );
+            break;
+        }
+        case WXK_INSERT:
+        {
+            if (!(m_mode & wxLC_SINGLE_SEL))
+            {
+                wxListLineData *oldCurrent = m_current;
+                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 );
+            }
+            break;
+        }
+        case WXK_RETURN:
+        case WXK_EXECUTE:
+        {
+            wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, GetParent()->GetId() );
+            le.SetEventObject( GetParent() );
+            le.m_itemIndex = GetIndexOfLine( m_current );
+            m_current->GetItem( 0, le.m_item );
+            GetParent()->GetEventHandler()->ProcessEvent( le );
+            break;
+        }
+        default:
+        {
+            event.Skip();
+            return;
+        }

     }
     }

-  }
-  m_usedKeys = TRUE;
+    m_usedKeys = TRUE;

 }
 
 }
 

+#ifdef __WXGTK__
+extern wxWindow *g_focusWindow;
+#endif
+

 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = TRUE;
     RefreshLine( m_current );
 
     if (!GetParent()) return;
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_hasFocus = TRUE;
     RefreshLine( m_current );
 
     if (!GetParent()) return;

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

 
     wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );
 
     wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
     event.SetEventObject( GetParent() );


@@ -1559,6 +1705,10 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }

+    if ((m_mode & wxLC_LIST) && (m_small_image_list))
+    {
+        m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
+    }

     if ((m_mode & wxLC_REPORT) && (m_small_image_list))
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     if ((m_mode & wxLC_REPORT) && (m_small_image_list))
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );


@@ -1578,6 +1728,11 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height )
         m_small_image_list->GetSize( index, width, height );
         return;
     }
         m_small_image_list->GetSize( index, width, height );
         return;
     }

+    if ((m_mode & wxLC_LIST) && (m_small_image_list))
+    {
+        m_small_image_list->GetSize( index, width, height );
+        return;
+    }

     if ((m_mode & wxLC_REPORT) && (m_small_image_list))
     {
         m_small_image_list->GetSize( index, width, height );
     if ((m_mode & wxLC_REPORT) && (m_small_image_list))
     {
         m_small_image_list->GetSize( index, width, height );


@@ -1654,7 +1809,44 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
 
     m_dirty = TRUE;
 
 
     m_dirty = TRUE;
 

-    wxNode *node = m_columns.Nth( col );
+    wxNode *node = (wxNode*) NULL;
+
+    if (width == wxLIST_AUTOSIZE_USEHEADER) width = 80;
+    if (width == wxLIST_AUTOSIZE)
+    {
+        wxClientDC dc(this);
+        dc.SetFont( GetFont() );
+        int max = 10;
+        node = m_lines.First();
+        while (node)
+        {
+            wxListLineData *line = (wxListLineData*)node->Data();
+            wxNode *n = line->m_items.Nth( col );
+            if (n)
+            {
+                wxListItemData *item = (wxListItemData*)n->Data();
+               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;
+            }
+            node = node->Next();
+        }
+       width = max+10;
+    }
+
+    node = m_columns.Nth( col );

     if (node)
     {
         wxListHeaderData *column = (wxListHeaderData*)node->Data();
     if (node)
     {
         wxListHeaderData *column = (wxListHeaderData*)node->Data();


@@ -1710,12 +1902,12 @@ int wxListMainWindow::GetColumnWidth( int col )
     }
 }
 
     }
 }
 

-int wxListMainWindow::GetColumnCount( void )
+int wxListMainWindow::GetColumnCount()

 {
     return m_columns.Number();
 }
 
 {
     return m_columns.Number();
 }
 

-int wxListMainWindow::GetCountPerPage( void )
+int wxListMainWindow::GetCountPerPage()

 {
     return m_visibleLines;
 }
 {
     return m_visibleLines;
 }


@@ -1748,7 +1940,7 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
             m_current = line;
             FocusLine( m_current );
             RefreshLine( m_current );
             m_current = line;
             FocusLine( m_current );
             RefreshLine( m_current );

-            RefreshLine( oldCurrent );
+            if (oldCurrent) RefreshLine( oldCurrent );

         }
     }
 
         }
     }
 


@@ -1766,9 +1958,9 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
                 UnfocusLine( m_current );
                 m_current = line;
                 FocusLine( m_current );
                 UnfocusLine( m_current );
                 m_current = line;
                 FocusLine( m_current );

-                oldCurrent->Hilight( FALSE );
+                if (oldCurrent) oldCurrent->Hilight( FALSE );

                 RefreshLine( m_current );
                 RefreshLine( m_current );

-                RefreshLine( oldCurrent );
+                if (oldCurrent) RefreshLine( oldCurrent );

             }
             bool on = state & wxLIST_STATE_SELECTED;
            if (on != line->IsHilighted())
             }
             bool on = state & wxLIST_STATE_SELECTED;
            if (on != line->IsHilighted())


@@ -1821,7 +2013,7 @@ void wxListMainWindow::GetItem( wxListItem &item )
     }
 }
 
     }
 }
 

-int wxListMainWindow::GetItemCount( void )
+int wxListMainWindow::GetItemCount()

 {
     return m_lines.Number();
 }
 {
     return m_lines.Number();
 }


@@ -1862,7 +2054,7 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxListMainWindow::GetSelectedItemCount( void )
+int wxListMainWindow::GetSelectedItemCount()

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


@@ -1894,12 +2086,12 @@ void wxListMainWindow::SetMode( long mode )
     }
 }
 
     }
 }
 

-long wxListMainWindow::GetMode( void ) const
+long wxListMainWindow::GetMode() const

 {
     return m_mode;
 }
 
 {
     return m_mode;
 }
 

-void wxListMainWindow::CalculatePositions( void )
+void wxListMainWindow::CalculatePositions()

 {
     if (!m_lines.First()) return;
 
 {
     if (!m_lines.First()) return;
 


@@ -1970,9 +2162,12 @@ void wxListMainWindow::CalculatePositions( void )
             int x = 5;  // painting is done at x-2
             int y = 5;  // painting is done at y-2
             int maxWidth = 0;
             int x = 5;  // painting is done at x-2
             int y = 5;  // painting is done at y-2
             int maxWidth = 0;

+            m_visibleLines = 0;
+           int m_currentVisibleLines = 0;

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

+               m_currentVisibleLines++;

                 wxListLineData *line = (wxListLineData*)node->Data();
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( &dc, x, y, clientWidth );
                 wxListLineData *line = (wxListLineData*)node->Data();
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( &dc, x, y, clientWidth );


@@ -1981,6 +2176,9 @@ void wxListMainWindow::CalculatePositions( void )
                 y += lineSpacing;
                 if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
                 {
                 y += lineSpacing;
                 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;
                     entireWidth += maxWidth+6;
                     y = 5;
                     x += maxWidth+6;
                     entireWidth += maxWidth+6;


@@ -1991,12 +2189,14 @@ void wxListMainWindow::CalculatePositions( void )
                 if ((tries == 0) && (entireWidth > clientWidth))
                 {
                     clientHeight -= 15; // scrollbar height
                 if ((tries == 0) && (entireWidth > clientWidth))
                 {
                     clientHeight -= 15; // scrollbar height

+                    m_visibleLines = 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 = (clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking"
+//        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 );


@@ -2021,6 +2221,7 @@ long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state
 {
     long ret = 0;
     if (item > 0) ret = item;
 {
     long ret = 0;
     if (item > 0) ret = item;

+    if(ret >= GetItemCount()) return -1;

     wxNode *node = m_lines.Nth( ret );
     while (node)
     {
     wxNode *node = m_lines.Nth( ret );
     while (node)
     {


@@ -2050,7 +2251,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(),

-               "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 );


@@ -2089,6 +2290,11 @@ void wxListMainWindow::DeleteEverything( void )
 
 void wxListMainWindow::EnsureVisible( long index )
 {
 
 void wxListMainWindow::EnsureVisible( long index )
 {

+    // We have to call this here because the label in
+    // question might just have been added and no screen
+    // update taken place.
+    if (m_dirty) wxYield();
+

     wxListLineData *oldCurrent = m_current;
     m_current = (wxListLineData *) NULL;
     int i = index;
     wxListLineData *oldCurrent = m_current;
     m_current = (wxListLineData *) NULL;
     int i = index;


@@ -2233,7 +2439,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
 

-wxListItem::wxListItem(void)
+wxListItem::wxListItem()

 {
     m_mask = 0;
     m_itemId = 0;
 {
     m_mask = 0;
     m_itemId = 0;


@@ -2276,7 +2482,7 @@ BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
   EVT_IDLE          (wxListCtrl::OnIdle)
 END_EVENT_TABLE()
 
   EVT_IDLE          (wxListCtrl::OnIdle)
 END_EVENT_TABLE()
 

-wxListCtrl::wxListCtrl(void)
+wxListCtrl::wxListCtrl()

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


@@ -2285,7 +2491,7 @@ wxListCtrl::wxListCtrl(void)
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 

-wxListCtrl::~wxListCtrl(void)
+wxListCtrl::~wxListCtrl()

 {
 }
 
 {
 }
 


@@ -2311,17 +2517,21 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
 
     bool ret = wxControl::Create( parent, id, pos, size, s, name );
 
 
     bool ret = wxControl::Create( parent, id, pos, size, s, name );
 

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     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 );
 

-    if (GetWindowStyleFlag() & wxLC_REPORT)
+    if (HasFlag(wxLC_REPORT))

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

+    SetBackgroundColour( *wxWHITE );
+

     return ret;
 }
 
     return ret;
 }
 


@@ -2334,7 +2544,7 @@ void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
 
 void wxListCtrl::SetSingleStyle( long style, bool add )
 {
 
 void wxListCtrl::SetSingleStyle( long style, bool add )
 {

-    long flag = GetWindowStyleFlag();
+    long flag = GetWindowStyle();

 
     if (add)
     {
 
     if (add)
     {


@@ -2357,39 +2567,45 @@ void wxListCtrl::SetSingleStyle( long style, bool add )
 
 void wxListCtrl::SetWindowStyleFlag( long flag )
 {
 
 void wxListCtrl::SetWindowStyleFlag( long flag )
 {

-    m_mainWin->DeleteEverything();
+    if (m_mainWin)
+    {
+        m_mainWin->DeleteEverything();

 
 

-    int width = 0;
-    int height = 0;
-    GetClientSize( &width, &height );
+        int width = 0;
+        int height = 0;
+        GetClientSize( &width, &height );

 
 

-    m_mainWin->SetMode( flag );
+        m_mainWin->SetMode( flag );

 
 

-    if (flag & wxLC_REPORT)
-    {
-        if (!(GetWindowStyleFlag() & wxLC_REPORT))
+        if (flag & wxLC_REPORT)

         {
         {

-//          m_mainWin->SetSize( 0, 24, width, height-24 );
-            if (!m_headerWin)
-            {
-                m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
-            }
-            else
+            if (!HasFlag(wxLC_REPORT))

             {
             {

-//              m_headerWin->SetSize( 0, 0, width, 23 );
-                m_headerWin->Show( TRUE );
+                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 );
+                }
+                else
+                {  
+                   if (flag & wxLC_NO_HEADER)
+                       m_headerWin->Show( FALSE );
+                   else
+                        m_headerWin->Show( TRUE );
+                } 

             }
         }
             }
         }

-    }
-    else
-    {
-        if (GetWindowStyleFlag() & wxLC_REPORT)
+        else

         {
         {

-//          m_mainWin->SetSize( 0, 0, width, height );
-            m_headerWin->Show( FALSE );
-        }
+            if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER)))
+            {
+                m_headerWin->Show( FALSE );
+            }
+       }

     }
     }

-
+    

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


@@ -2416,17 +2632,11 @@ bool wxListCtrl::SetColumnWidth( int col, int width )
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxListCtrl::GetCountPerPage(void) const
+int wxListCtrl::GetCountPerPage() const

 {
   return m_mainWin->GetCountPerPage();  // different from Windows ?
 }
 
 {
   return m_mainWin->GetCountPerPage();  // different from Windows ?
 }
 

-/*
-wxText& wxListCtrl::GetEditControl(void) const
-{
-}
-*/
-

 bool wxListCtrl::GetItem( wxListItem &info ) const
 {
     m_mainWin->GetItem( info );
 bool wxListCtrl::GetItem( wxListItem &info ) const
 {
     m_mainWin->GetItem( info );


@@ -2528,12 +2738,12 @@ bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(p
     return 0;
 }
 
     return 0;
 }
 

-int wxListCtrl::GetItemCount(void) const
+int wxListCtrl::GetItemCount() const

 {
     return m_mainWin->GetItemCount();
 }
 
 {
     return m_mainWin->GetItemCount();
 }
 

-int wxListCtrl::GetColumnCount(void) const
+int wxListCtrl::GetColumnCount() const

 {
     return m_mainWin->GetColumnCount();
 }
 {
     return m_mainWin->GetColumnCount();
 }


@@ -2548,13 +2758,13 @@ int wxListCtrl::GetItemSpacing( bool isSmall ) const
     return m_mainWin->GetItemSpacing( isSmall );
 }
 
     return m_mainWin->GetItemSpacing( isSmall );
 }
 

-int wxListCtrl::GetSelectedItemCount(void) const
+int wxListCtrl::GetSelectedItemCount() const

 {
     return m_mainWin->GetSelectedItemCount();
 }
 
 /*
 {
     return m_mainWin->GetSelectedItemCount();
 }
 
 /*

-wxColour wxListCtrl::GetTextColour(void) const
+wxColour wxListCtrl::GetTextColour() const

 {
 }
 
 {
 }
 


@@ -2563,7 +2773,7 @@ void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
 }
 */
 
 }
 */
 

-long wxListCtrl::GetTopItem(void) const
+long wxListCtrl::GetTopItem() const

 {
     return 0;
 }
 {
     return 0;
 }


@@ -2606,7 +2816,7 @@ bool wxListCtrl::DeleteItem( long item )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::DeleteAllItems(void)
+bool wxListCtrl::DeleteAllItems()

 {
     m_mainWin->DeleteAllItems();
     return TRUE;
 {
     m_mainWin->DeleteAllItems();
     return TRUE;


@@ -2631,11 +2841,10 @@ bool wxListCtrl::DeleteColumn( int col )
     return TRUE;
 }
 
     return TRUE;
 }
 

-/*
-wxText& wxListCtrl::Edit( long WXUNUSED(item ) )
+void wxListCtrl::Edit( long item )

 {
 {

+    m_mainWin->Edit( item );

 }
 }

-*/

 
 bool wxListCtrl::EnsureVisible( long item )
 {
 
 bool wxListCtrl::EnsureVisible( long item )
 {


@@ -2667,63 +2876,62 @@ 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 )
 {

-  wxListItem info;
-  info.m_text = label;
-  info.m_mask = wxLIST_MASK_TEXT;
-  info.m_itemId = index;
-  return InsertItem( info );
+    wxListItem info;
+    info.m_text = label;
+    info.m_mask = wxLIST_MASK_TEXT;
+    info.m_itemId = index;
+    return InsertItem( info );

 }
 
 long wxListCtrl::InsertItem( long index, int imageIndex )
 {
 }
 
 long wxListCtrl::InsertItem( long index, int imageIndex )
 {

-  wxListItem info;
-  info.m_mask = wxLIST_MASK_IMAGE;
-  info.m_image = imageIndex;
-  info.m_itemId = index;
-  return InsertItem( info );
+    wxListItem info;
+    info.m_mask = wxLIST_MASK_IMAGE;
+    info.m_image = imageIndex;
+    info.m_itemId = index;
+    return InsertItem( info );

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

-  wxListItem info;
-  info.m_text = label;
-  info.m_image = imageIndex;
-  info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
-  info.m_itemId = index;
-  return InsertItem( info );
+    wxListItem info;
+    info.m_text = label;
+    info.m_image = imageIndex;
+    info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
+    info.m_itemId = index;
+    return InsertItem( info );

 }
 
 long wxListCtrl::InsertColumn( long col, wxListItem &item )
 {
 }
 
 long wxListCtrl::InsertColumn( long col, wxListItem &item )
 {

-  m_mainWin->InsertColumn( col, item );
-  return 0;
+    m_mainWin->InsertColumn( col, item );
+    return 0;

 }
 
 long wxListCtrl::InsertColumn( long col, const wxString &heading,
                                int format, int width )
 {
 }
 
 long wxListCtrl::InsertColumn( long col, const wxString &heading,
                                int format, int width )
 {

-  wxListItem item;
-  item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
-  item.m_text = heading;
-  if (width >= -2)
-  {
-    item.m_mask |= wxLIST_MASK_WIDTH;
-    item.m_width = width;
-  }
-;
-  item.m_format = format;
+    wxListItem item;
+    item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
+    item.m_text = heading;
+    if (width >= -2)
+    {
+        item.m_mask |= wxLIST_MASK_WIDTH;
+        item.m_width = width;
+    }
+    item.m_format = format;

 
 

-  return InsertColumn( col, item );
+    return InsertColumn( col, item );

 }
 
 bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 {
 }
 
 bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 {

-  return 0;
+    return 0;

 }
 
 // Sort items.
 }
 
 // Sort items.


@@ -2738,79 +2946,103 @@ bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 
 bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data )
 {
 
 bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data )
 {

-  m_mainWin->SortItems( fn, data );
-  return TRUE;
+    m_mainWin->SortItems( fn, data );
+    return TRUE;

 }
 
 void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {
 }
 
 void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {

-  if (!m_mainWin->m_dirty) return;
-
-  int cw = 0;
-  int ch = 0;
-  GetClientSize( &cw, &ch );
-
-  int x = 0;
-  int y = 0;
-  int w = 0;
-  int h = 0;
-
-  if (GetWindowStyleFlag() & wxLC_REPORT)
-  {
-    m_headerWin->GetPosition( &x, &y );
-    m_headerWin->GetSize( &w, &h );
-    if ((x != 0) || (y != 0) || (w != cw) || (h != 23))
-      m_headerWin->SetSize( 0, 0, cw, 23 );
-
-    m_mainWin->GetPosition( &x, &y );
-    m_mainWin->GetSize( &w, &h );
-    if ((x != 0) || (y != 24) || (w != cw) || (h != ch-24))
-      m_mainWin->SetSize( 0, 24, cw, ch-24 );
-  }
-  else
-  {
-    m_mainWin->GetPosition( &x, &y );
-    m_mainWin->GetSize( &w, &h );
-    if ((x != 0) || (y != 24) || (w != cw) || (h != ch))
-      m_mainWin->SetSize( 0, 0, cw, ch );
-  }
-
-  m_mainWin->CalculatePositions();
-  m_mainWin->RealizeChanges();
-  m_mainWin->m_dirty = FALSE;
-  m_mainWin->Refresh();
-}
-
-void wxListCtrl::SetBackgroundColour( const wxColour &colour )
-{
-  if (m_mainWin)
-  {
-    m_mainWin->SetBackgroundColour( colour );
-    m_mainWin->m_dirty = TRUE;
-  }
-  if (m_headerWin)
-    m_headerWin->SetBackgroundColour( colour );
-}
-
-void wxListCtrl::SetForegroundColour( const wxColour &colour )
-{
-  if (m_mainWin)
-  {
-    m_mainWin->SetForegroundColour( colour );
-    m_mainWin->m_dirty = TRUE;
-  }
-  if (m_headerWin)
-    m_headerWin->SetForegroundColour( colour );
-}
-
-void wxListCtrl::SetFont( const wxFont &font )
-{
-  if (m_mainWin)
-  {
-    m_mainWin->SetFont( font );
-    m_mainWin->m_dirty = TRUE;
-  }
-  if (m_headerWin)
-    m_headerWin->SetFont( font );
+    if (!m_mainWin->m_dirty) return;
+
+    int cw = 0;
+    int ch = 0;
+    GetClientSize( &cw, &ch );
+
+    int x = 0;
+    int y = 0;
+    int w = 0;
+    int h = 0;
+
+    if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER))
+    {
+        m_headerWin->GetPosition( &x, &y );
+        m_headerWin->GetSize( &w, &h );
+        if ((x != 0) || (y != 0) || (w != cw) || (h != 23))
+            m_headerWin->SetSize( 0, 0, cw, 23 );
+
+        m_mainWin->GetPosition( &x, &y );
+        m_mainWin->GetSize( &w, &h );
+        if ((x != 0) || (y != 24) || (w != cw) || (h != ch-24))
+            m_mainWin->SetSize( 0, 24, cw, ch-24 );
+    }
+    else
+    {
+        m_mainWin->GetPosition( &x, &y );
+        m_mainWin->GetSize( &w, &h );
+        if ((x != 0) || (y != 24) || (w != cw) || (h != ch))
+            m_mainWin->SetSize( 0, 0, cw, ch );
+    }
+
+    m_mainWin->CalculatePositions();
+    m_mainWin->RealizeChanges();
+    m_mainWin->m_dirty = FALSE;
+    m_mainWin->Refresh();
+}
+
+bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
+{
+    if ( !wxWindow::SetBackgroundColour( colour ) )
+        return FALSE;
+
+    if (m_mainWin)
+    {
+        m_mainWin->SetBackgroundColour( colour );
+        m_mainWin->m_dirty = TRUE;
+    }
+    
+    if (m_headerWin)
+    {
+//        m_headerWin->SetBackgroundColour( colour );
+    }
+
+    return TRUE;
+}
+
+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 );
+    }
+
+    return TRUE;
+}
+
+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 );
+    }
+
+    return TRUE;

 }
 
 }