submenu preparation in two methods encapsulated

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 5e7ce897adeb7f15ee9e0929f6c8b48534ce777e..d1e2359f2376a6abaea03d3a025084c63992a9a5 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -47,10 +47,28 @@
     #include "wx/textctrl.h"
 #endif
 
     #include "wx/textctrl.h"
 #endif
 

-#include "wx/imaglist.h"
-#include "wx/listctrl.h"
+// under Win32 we always use the native version and also may use the generic
+// one, however some things should be done only if we use only the generic
+// version
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #define HAVE_NATIVE_LISTCTRL
+#endif
+
+// if we have the native control, wx/listctrl.h declares it and not this one
+#ifdef HAVE_NATIVE_LISTCTRL
+    #include "wx/generic/listctrl.h"
+#else // !HAVE_NATIVE_LISTCTRL
+    #include "wx/listctrl.h"
+
+    // if we have a native version, its implementation file does all this
+    IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
+    IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)

 
 

-#ifdef __WXGTK__
+    IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
+#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
+
+#if defined(__WXGTK__)

     #include <gtk/gtk.h>
     #include "wx/gtk/win_gtk.h"
 #endif
     #include <gtk/gtk.h>
     #include "wx/gtk/win_gtk.h"
 #endif


@@ -124,7 +142,7 @@ static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 
 int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
 
 
 int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
 

-WX_DEFINE_SORTED_EXPORTED_ARRAY(size_t, wxIndexArray);
+WX_DEFINE_SORTED_EXPORTED_ARRAY_LONG(size_t, wxIndexArray);

 
 // this class is used to store the selected items in the virtual list control
 // (but it is not tied to list control and so can be used with other controls
 
 // this class is used to store the selected items in the virtual list control
 // (but it is not tied to list control and so can be used with other controls


@@ -144,7 +162,7 @@ public:
     void SetItemCount(size_t count) { m_count = count; }
 
     // special case of SetItemCount(0)
     void SetItemCount(size_t count) { m_count = count; }
 
     // special case of SetItemCount(0)

-    void Clear() { m_itemsSel.Clear(); m_count = 0; }
+    void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = FALSE; }

 
     // must be called when a new item is inserted/added
     void OnItemAdd(size_t item) { wxFAIL_MSG( _T("TODO") ); }
 
     // must be called when a new item is inserted/added
     void OnItemAdd(size_t item) { wxFAIL_MSG( _T("TODO") ); }


@@ -413,6 +431,10 @@ private:
                        const wxListItemAttr *attr,
                        bool highlight);
 
                        const wxListItemAttr *attr,
                        bool highlight);
 

+    // draw the text on the DC with the correct justification; also add an
+    // ellipsis if the text is too large to fit in the current width
+    void DrawTextFormatted(wxDC *dc, const wxString &text, int col, int x, int y, int width);
+

     // these are only used by GetImage/SetImage above, we don't support images
     // with subitems at the public API level yet
     void SetImage( int index, int image );
     // these are only used by GetImage/SetImage above, we don't support images
     // with subitems at the public API level yet
     void SetImage( int index, int image );


@@ -435,7 +457,7 @@ protected:
     wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 
     wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 

-    // column being resized
+    // column being resized or -1

     int m_column;
 
     // divider line position in logical (unscrolled) coords
     int m_column;
 
     // divider line position in logical (unscrolled) coords


@@ -454,7 +476,7 @@ public:
                         const wxPoint &pos = wxDefaultPosition,
                         const wxSize &size = wxDefaultSize,
                         long style = 0,
                         const wxPoint &pos = wxDefaultPosition,
                         const wxSize &size = wxDefaultSize,
                         long style = 0,

-                        const wxString &name = "wxlistctrlcolumntitles" );
+                        const wxString &name = wxT("wxlistctrlcolumntitles") );

 
     virtual ~wxListHeaderWindow();
 
 
     virtual ~wxListHeaderWindow();
 


@@ -473,6 +495,8 @@ private:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    void SendListEvent(wxEventType type, wxPoint pos);
+

     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()
 };


@@ -497,28 +521,23 @@ public:
 
 class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
 {
 
 class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
 {

-private:
-    bool               *m_accept;
-    wxString           *m_res;
-    wxListMainWindow   *m_owner;
-    wxString            m_startValue;
-    bool                m_finished;
-

 public:
 public:

-    wxListTextCtrl() {}
-    wxListTextCtrl( wxWindow *parent, const wxWindowID id,
-                    bool *accept, wxString *res, wxListMainWindow *owner,
-                    const wxString &value = "",
-                    const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-                    int style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString &name = "listctrltextctrl" );
+    wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit);
+
+protected:

     void OnChar( wxKeyEvent &event );
     void OnKeyUp( wxKeyEvent &event );
     void OnKillFocus( wxFocusEvent &event );
 
     void OnChar( wxKeyEvent &event );
     void OnKeyUp( wxKeyEvent &event );
     void OnKillFocus( wxFocusEvent &event );
 

+    bool AcceptChanges();
+    void Finish();
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxListTextCtrl);
+    wxListMainWindow   *m_owner;
+    wxString            m_startValue;
+    size_t              m_itemEdited;
+    bool                m_finished;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -627,8 +646,10 @@ public:
     void Freeze();
     void Thaw();
 
     void Freeze();
     void Thaw();
 

+    void SetFocus();
+

     void OnRenameTimer();
     void OnRenameTimer();

-    void OnRenameAccept();
+    bool OnRenameAccept(size_t itemEdit, const wxString& value);

 
     void OnMouse( wxMouseEvent &event );
 
 
     void OnMouse( wxMouseEvent &event );
 


@@ -647,7 +668,7 @@ public:
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
 
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
 

-    void SetImageList( wxImageList *imageList, int which );
+    void SetImageList( wxImageListType *imageList, int which );

     void SetItemSpacing( int spacing, bool isSmall = FALSE );
     int GetItemSpacing( bool isSmall = FALSE );
 
     void SetItemSpacing( int spacing, bool isSmall = FALSE );
     int GetItemSpacing( bool isSmall = FALSE );
 


@@ -663,12 +684,29 @@ public:
     int GetCountPerPage() const;
 
     void SetItem( wxListItem &item );
     int GetCountPerPage() const;
 
     void SetItem( wxListItem &item );

-    void GetItem( wxListItem &item );
+    void GetItem( wxListItem &item ) const;

     void SetItemState( long item, long state, long stateMask );
     void SetItemState( long item, long state, long stateMask );

-    int GetItemState( long item, long stateMask );
-    void GetItemRect( long index, wxRect &rect );
-    bool GetItemPosition( long item, wxPoint& pos );
-    int GetSelectedItemCount();
+    int GetItemState( long item, long stateMask ) const;
+    void GetItemRect( long index, wxRect &rect ) const;
+    bool GetItemPosition( long item, wxPoint& pos ) const;
+    int GetSelectedItemCount() const;
+
+    wxString GetItemText(long item) const
+    {
+        wxListItem info;
+        info.m_itemId = item;
+        GetItem( info );
+        return info.m_text;
+    }
+
+    void SetItemText(long item, const wxString& value)
+    {
+        wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
+        info.m_itemId = item;
+        info.m_text = value;
+        SetItem( info );
+    }

 
     // set the scrollbars and update the positions of the items
     void RecalculatePositions(bool noRefresh = FALSE);
 
     // set the scrollbars and update the positions of the items
     void RecalculatePositions(bool noRefresh = FALSE);


@@ -676,7 +714,7 @@ public:
     // refresh the window and the header
     void RefreshAll();
 
     // refresh the window and the header
     void RefreshAll();
 

-    long GetNextItem( long item, int geometry, int state );
+    long GetNextItem( long item, int geometry, int state ) const;

     void DeleteItem( long index );
     void DeleteAllItems();
     void DeleteColumn( int col );
     void DeleteItem( long index );
     void DeleteAllItems();
     void DeleteColumn( int col );


@@ -717,9 +755,9 @@ public:
     // these are for wxListLineData usage only
 
     // get the backpointer to the list ctrl
     // these are for wxListLineData usage only
 
     // get the backpointer to the list ctrl

-    wxListCtrl *GetListCtrl() const
+    wxGenericListCtrl *GetListCtrl() const

     {
     {

-        return wxStaticCast(GetParent(), wxListCtrl);
+        return wxStaticCast(GetParent(), wxGenericListCtrl);

     }
 
     // get the height of all lines (assuming they all do have the same height)
     }
 
     // get the height of all lines (assuming they all do have the same height)


@@ -735,7 +773,8 @@ public:
     }
 
 //protected:
     }
 
 //protected:

-    // the array of all line objects for a non virtual list control
+    // the array of all line objects for a non virtual list control (for the
+    // virtual list control we only ever use m_lines[0])

     wxListLineDataArray  m_lines;
 
     // the list of column objects
     wxListLineDataArray  m_lines;
 
     // the list of column objects


@@ -744,9 +783,6 @@ public:
     // currently focused item or -1
     size_t               m_current;
 
     // currently focused item or -1
     size_t               m_current;
 

-    // the item currently being edited or -1
-    size_t               m_currentEdit;
-

     // the number of lines per page
     int                  m_linesPerPage;
 
     // the number of lines per page
     int                  m_linesPerPage;
 


@@ -761,16 +797,14 @@ public:
     wxColour            *m_highlightColour;
     int                  m_xScroll,
                          m_yScroll;
     wxColour            *m_highlightColour;
     int                  m_xScroll,
                          m_yScroll;

-    wxImageList         *m_small_image_list;
-    wxImageList         *m_normal_image_list;
+    wxImageListType         *m_small_image_list;
+    wxImageListType         *m_normal_image_list;

     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;
 
     bool                 m_lastOnSame;
     wxTimer             *m_renameTimer;
     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;
 
     bool                 m_lastOnSame;
     wxTimer             *m_renameTimer;

-    bool                 m_renameAccept;
-    wxString             m_renameRes;

     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;


@@ -827,7 +861,7 @@ protected:
 #ifdef __WXMAC__
         return *wxWHITE;
 #else
 #ifdef __WXMAC__
         return *wxWHITE;
 #else

-        return wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT);
+        return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);

 #endif
     }
 
 #endif
     }
 


@@ -857,8 +891,10 @@ private:
     // if this is > 0, the control is frozen and doesn't redraw itself
     size_t m_freezeCount;
 
     // if this is > 0, the control is frozen and doesn't redraw itself
     size_t m_freezeCount;
 

-    DECLARE_DYNAMIC_CLASS(wxListMainWindow);
+    DECLARE_DYNAMIC_CLASS(wxListMainWindow)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+
+    friend class wxGenericListCtrl;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -1445,8 +1481,8 @@ void wxListLineData::SetPosition( int x, int y,
 
             if ( item->HasImage() )
             {
 
             if ( item->HasImage() )
             {

-                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4
-                                    + (spacing - m_gi->m_rectIcon.width)/2;
+                m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 4 +
+                    (m_gi->m_rectAll.width - m_gi->m_rectIcon.width) / 2;

                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
             }
 
                 m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 4;
             }
 


@@ -1595,7 +1631,7 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     wxColour colText;
     if ( highlighted )
     {
     wxColour colText;
     if ( highlighted )
     {

-        colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+        colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

     }
     else
     {
     }
     else
     {


@@ -1690,18 +1726,17 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
         dc->DrawRectangle( rectHL );
     }
 
         dc->DrawRectangle( rectHL );
     }
 

-    wxListItemDataList::Node *node = m_items.GetFirst();
-    wxCHECK_RET( node, _T("no subitems at all??") );
-
-    size_t col = 0;

     wxCoord x = rect.x + HEADER_OFFSET_X,
             y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
 
     wxCoord x = rect.x + HEADER_OFFSET_X,
             y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
 

-    while ( node )
+    size_t col = 0;
+    for ( wxListItemDataList::Node *node = m_items.GetFirst();
+          node;
+          node = node->GetNext(), col++ )

     {
         wxListItemData *item = node->GetData();
 
     {
         wxListItemData *item = node->GetData();
 

-        int width = m_owner->GetColumnWidth(col++);
+        int width = m_owner->GetColumnWidth(col);

         int xOld = x;
         x += width;
 
         int xOld = x;
         x += width;
 


@@ -1717,14 +1752,79 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
             width -= ix;
         }
 
             width -= ix;
         }
 

-        wxDCClipper clipper(*dc, xOld, y, width, rect.height);
+        wxDCClipper clipper(*dc, xOld, y, width - 8, rect.height);

 
         if ( item->HasText() )
         {
 
         if ( item->HasText() )
         {

-            dc->DrawText( item->GetText(), xOld, y );
+            DrawTextFormatted(dc, item->GetText(), col, xOld, y, width - 8);

         }
         }

+    }
+}

 
 

-        node = node->GetNext();
+void wxListLineData::DrawTextFormatted(wxDC *dc,
+                                       const wxString &text,
+                                       int col,
+                                       int x,
+                                       int y,
+                                       int width)
+{
+    wxString drawntext, ellipsis;
+    wxCoord w, h, base_w;
+    wxListItem item;
+
+    // determine if the string can fit inside the current width
+    dc->GetTextExtent(text, &w, &h);
+    if (w <= width)
+    {
+        // it can, draw it using the items alignment
+        m_owner->GetColumn(col, item);
+        switch ( item.GetAlign() )
+        {
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                // fall through
+
+            case wxLIST_FORMAT_LEFT:
+                // nothing to do
+                break;
+
+            case wxLIST_FORMAT_RIGHT:
+                x += width - w;
+                break;
+
+            case wxLIST_FORMAT_CENTER:
+                x += (width - w) / 2;
+                break;
+        }
+
+        dc->DrawText(text, x, y);
+    }
+    else // otherwise, truncate and add an ellipsis if possible
+    {
+        // determine the base width
+        ellipsis = wxString(wxT("..."));
+        dc->GetTextExtent(ellipsis, &base_w, &h);
+
+        // continue until we have enough space or only one character left
+        drawntext = text.Left(text.Length() - 1);
+        while (drawntext.Length() > 1)
+        {
+            dc->GetTextExtent(drawntext, &w, &h);
+            if (w + base_w <= width)
+                break;
+            drawntext = drawntext.Left(drawntext.Length() - 1);
+        }
+
+        // if still not enough space, remove ellipsis characters
+        while (ellipsis.Length() > 0 && w + base_w > width)
+        {
+            ellipsis = ellipsis.Left(ellipsis.Length() - 1);
+            dc->GetTextExtent(ellipsis, &base_w, &h);
+        }
+
+        // now draw the text
+        dc->DrawText(drawntext, x, y);
+        dc->DrawText(ellipsis, x + w, y);

     }
 }
 
     }
 }
 


@@ -1749,7 +1849,7 @@ void wxListLineData::ReverseHighlight( void )
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow)

 
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
 
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)


@@ -1786,7 +1886,7 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
     m_owner = owner;
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 
     m_owner = owner;
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );

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


@@ -1794,9 +1894,14 @@ wxListHeaderWindow::~wxListHeaderWindow()
     delete m_resizeCursor;
 }
 
     delete m_resizeCursor;
 }
 

+#ifdef __WXUNIVERSAL__
+#include "wx/univ/renderer.h"
+#include "wx/univ/theme.h"
+#endif
+

 void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 {
 void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 {

-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)

     GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
                                                : GTK_STATE_INSENSITIVE;
 
     GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
                                                : GTK_STATE_INSENSITIVE;
 


@@ -1804,14 +1909,19 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 
     gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window,
                    state, GTK_SHADOW_OUT,
 
     gtk_paint_box (m_wxwindow->style, GTK_PIZZA(m_wxwindow)->bin_window,
                    state, GTK_SHADOW_OUT,

-                   (GdkRectangle*) NULL, m_wxwindow, "button",
+                   (GdkRectangle*) NULL, m_wxwindow,
+                   (char *)"button", // const_cast

                    x-1, y-1, w+2, h+2);
                    x-1, y-1, w+2, h+2);

-#elif defined( __WXMAC__  )
+#elif defined(__WXUNIVERSAL__)
+    wxTheme *theme = wxTheme::Get();
+    wxRenderer *renderer = theme->GetRenderer();
+    renderer->DrawBorder( *dc, wxBORDER_RAISED, wxRect(x,y,w,h), 0 );
+#elif defined(__WXMAC__)

     const int m_corner = 1;
 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
 
     const int m_corner = 1;
 
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
 

-    dc->SetPen( wxPen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
+    dc->SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );

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


@@ -1835,7 +1945,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
     dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 

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

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


@@ -1865,7 +1975,7 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

-#ifdef __WXGTK__
+#if defined(__WXGTK__)

     wxClientDC dc( this );
 #else
     wxPaintDC dc( this );
     wxClientDC dc( this );
 #else
     wxPaintDC dc( this );


@@ -1908,28 +2018,68 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );
 
 
         DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );
 

-        // if we have an image, draw it on the right of the label
-        int image = item.m_image;
+        // see if we have enough space for the column label
+
+        // for this we need the width of the text
+        wxCoord wLabel;
+        dc.GetTextExtent(item.GetText(), &wLabel, NULL);
+        wLabel += 2*EXTRA_WIDTH;
+
+        // and the width of the icon, if any
+        static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
+        int ix = 0,     // init them just to suppress the compiler warnings
+            iy = 0;
+        const int image = item.m_image;
+        wxImageListType *imageList;

         if ( image != -1 )
         {
         if ( image != -1 )
         {

-            wxImageList *imageList = m_owner->m_small_image_list;
+            imageList = m_owner->m_small_image_list;

             if ( imageList )
             {
             if ( imageList )
             {

-                int ix, iy;

                 imageList->GetSize(image, ix, iy);
                 imageList->GetSize(image, ix, iy);

+                wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON;
+            }
+        }
+        else
+        {
+            imageList = NULL;
+        }

 
 

-                imageList->Draw
-                           (
-                            image,
-                            dc,
-                            x + cw - ix - 1,
-                            HEADER_OFFSET_Y + (h - 4 - iy)/2,
-                            wxIMAGELIST_DRAW_TRANSPARENT
-                           );
+        // ignore alignment if there is not enough space anyhow
+        int xAligned;
+        switch ( wLabel < cw ? item.GetAlign() : wxLIST_FORMAT_LEFT )
+        {
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                // fall through

 
 

-                cw -= ix + 2;
-            }
-            //else: ignore the column image
+            case wxLIST_FORMAT_LEFT:
+                xAligned = x;
+                break;
+
+            case wxLIST_FORMAT_RIGHT:
+                xAligned = x + cw - wLabel;
+                break;
+
+            case wxLIST_FORMAT_CENTER:
+                xAligned = x + (cw - wLabel) / 2;
+                break;
+        }
+
+
+        // if we have an image, draw it on the right of the label
+        if ( imageList )
+        {
+            imageList->Draw
+                       (
+                        image,
+                        dc,
+                        xAligned + wLabel - ix - MARGIN_BETWEEN_TEXT_AND_ICON,
+                        HEADER_OFFSET_Y + (h - 4 - iy)/2,
+                        wxIMAGELIST_DRAW_TRANSPARENT
+                       );
+
+            cw -= ix + MARGIN_BETWEEN_TEXT_AND_ICON;

         }
 
         // draw the text clipping it so that it doesn't overwrite the column
         }
 
         // draw the text clipping it so that it doesn't overwrite the column


@@ -1937,7 +2087,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
 
         dc.DrawText( item.GetText(),
         wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
 
         dc.DrawText( item.GetText(),

-                     x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+                     xAligned + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );

 
         x += wCol;
     }
 
         x += wCol;
     }


@@ -1949,9 +2099,9 @@ void wxListHeaderWindow::DrawCurrent()
 {
     int x1 = m_currentX;
     int y1 = 0;
 {
     int x1 = m_currentX;
     int y1 = 0;

-    ClientToScreen( &x1, &y1 );
+    m_owner->ClientToScreen( &x1, &y1 );

 
 

-    int x2 = m_currentX-1;
+    int x2 = m_currentX;

     int y2 = 0;
     m_owner->GetClientSize( NULL, &y2 );
     m_owner->ClientToScreen( &x2, &y2 );
     int y2 = 0;
     m_owner->GetClientSize( NULL, &y2 );
     m_owner->ClientToScreen( &x2, &y2 );


@@ -1980,6 +2130,9 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 
     if (m_isDragging)
     {
 
     if (m_isDragging)
     {

+        SendListEvent(wxEVT_COMMAND_LIST_COL_DRAGGING,
+                      event.GetPosition());
+

         // we don't draw the line beyond our window, but we allow dragging it
         // there
         int w = 0;
         // we don't draw the line beyond our window, but we allow dragging it
         // there
         int w = 0;


@@ -1997,6 +2150,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             m_isDragging = FALSE;
             m_dirty = TRUE;
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             m_isDragging = FALSE;
             m_dirty = TRUE;
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );

+            SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG,
+                          event.GetPosition());

         }
         else
         {
         }
         else
         {


@@ -2019,8 +2174,9 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         int xpos = 0;
 
         // find the column where this event occured
         int xpos = 0;
 
         // find the column where this event occured

-        int countCol = m_owner->GetColumnCount();
-        for (int col = 0; col < countCol; col++)
+        int col,
+            countCol = m_owner->GetColumnCount();
+        for (col = 0; col < countCol; col++)

         {
             xpos += m_owner->GetColumnWidth( col );
             m_column = col;
         {
             xpos += m_owner->GetColumnWidth( col );
             m_column = col;


@@ -2041,6 +2197,9 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             m_minX = xpos;
         }
 
             m_minX = xpos;
         }
 

+        if ( col == countCol )
+            m_column = -1;
+

         if (event.LeftDown() || event.RightUp())
         {
             if (hit_border && event.LeftDown())
         if (event.LeftDown() || event.RightUp())
         {
             if (hit_border && event.LeftDown())


@@ -2049,25 +2208,15 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
                 m_currentX = x;
                 DrawCurrent();
                 CaptureMouse();
                 m_currentX = x;
                 DrawCurrent();
                 CaptureMouse();

+                SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
+                              event.GetPosition());

             }
             else // click on a column
             {
             }
             else // click on a column
             {

-                wxWindow *parent = GetParent();
-                wxListEvent le( event.LeftDown()
+                SendListEvent( event.LeftDown()

                                     ? wxEVT_COMMAND_LIST_COL_CLICK
                                     : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
                                     ? wxEVT_COMMAND_LIST_COL_CLICK
                                     : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,

-                                parent->GetId() );
-                le.SetEventObject( parent );
-                le.m_pointDrag = event.GetPosition();
-
-                // the position should be relative to the parent window, not
-                // this one for compatibility with MSW and common sense: the
-                // user code doesn't know anything at all about this header
-                // window, so why should it get positions relative to it?
-                le.m_pointDrag.y -= GetSize().y;
-
-                le.m_col = m_column;
-                parent->GetEventHandler()->ProcessEvent( le );
+                                event.GetPosition());

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


@@ -2095,6 +2244,23 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     m_owner->SetFocus();
 }
 
     m_owner->SetFocus();
 }
 

+void wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)
+{
+    wxWindow *parent = GetParent();
+    wxListEvent le( type, parent->GetId() );
+    le.SetEventObject( parent );
+    le.m_pointDrag = pos;
+
+    // the position should be relative to the parent window, not
+    // this one for compatibility with MSW and common sense: the
+    // user code doesn't know anything at all about this header
+    // window, so why should it get positions relative to it?
+    le.m_pointDrag.y -= GetSize().y;
+
+    le.m_col = m_column;
+    parent->GetEventHandler()->ProcessEvent( le );
+}
+

 //-----------------------------------------------------------------------------
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------


@@ -2113,69 +2279,82 @@ void wxListRenameTimer::Notify()
 // wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 
 // wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl);
-

 BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
     EVT_CHAR           (wxListTextCtrl::OnChar)
     EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)
     EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
     EVT_CHAR           (wxListTextCtrl::OnChar)
     EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)
     EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 

-wxListTextCtrl::wxListTextCtrl( wxWindow *parent,
-                                const wxWindowID id,
-                                bool *accept,
-                                wxString *res,
-                                wxListMainWindow *owner,
-                                const wxString &value,
-                                const wxPoint &pos,
-                                const wxSize &size,
-                                int style,
-                                const wxValidator& validator,
-                                const wxString &name )
-              : wxTextCtrl( parent, id, value, pos, size, style, validator, name )
-{
-    m_res = res;
-    m_accept = accept;
+wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit)
+              : m_startValue(owner->GetItemText(itemEdit)),
+                m_itemEdited(itemEdit)
+{

     m_owner = owner;
     m_owner = owner;

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

     m_finished = FALSE;
     m_finished = FALSE;

+
+    wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
+
+    m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
+                                  &rectLabel.x, &rectLabel.y);
+
+    (void)Create(owner, wxID_ANY, m_startValue,
+                 wxPoint(rectLabel.x-4,rectLabel.y-4),
+                 wxSize(rectLabel.width+11,rectLabel.height+8));

 }
 
 }
 

-void wxListTextCtrl::OnChar( wxKeyEvent &event )
+void wxListTextCtrl::Finish()

 {
 {

-    if (event.m_keyCode == WXK_RETURN)
+    if ( !m_finished )

     {
     {

-        (*m_accept) = TRUE;
-        (*m_res) = GetValue();
+        wxPendingDelete.Append(this);

 
 

-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+        m_finished = TRUE;

 
 

-        if ((*m_res) != m_startValue)
-            m_owner->OnRenameAccept();
+        m_owner->SetFocus();
+    }
+}

 
 

-        m_finished = TRUE;
-        m_owner->SetFocus(); // This doesn't work. TODO.
+bool wxListTextCtrl::AcceptChanges()
+{
+    const wxString value = GetValue();

 
 

-        return;
+    if ( value == m_startValue )
+    {
+        // nothing changed, always accept
+        return TRUE;

     }
     }

-    if (event.m_keyCode == WXK_ESCAPE)
+
+    if ( !m_owner->OnRenameAccept(m_itemEdited, value) )

     {
     {

-        (*m_accept) = FALSE;
-        (*m_res) = "";
+        // vetoed by the user
+        return FALSE;
+    }

 
 

-        if (!wxPendingDelete.Member(this))
-            wxPendingDelete.Append(this);
+    // accepted, do rename the item
+    m_owner->SetItemText(m_itemEdited, value);

 
 

-        m_finished = TRUE;
-        m_owner->SetFocus(); // This doesn't work. TODO.
+    return TRUE;
+}

 
 

-        return;
-    }
+void wxListTextCtrl::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            if ( !AcceptChanges() )
+            {
+                // vetoed by the user code
+                break;
+            }
+            //else: fall through

 
 

-    event.Skip();
+        case WXK_ESCAPE:
+            Finish();
+            break;
+
+        default:
+            event.Skip();
+    }

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


@@ -2191,7 +2370,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
     wxPoint myPos = GetPosition();
     wxSize mySize = GetSize();
     int sx, sy;
     wxPoint myPos = GetPosition();
     wxSize mySize = GetSize();
     int sx, sy;

-    GetTextExtent(GetValue() + _T("M"), &sx, &sy); // FIXME: MM??
+    GetTextExtent(GetValue() + _T("MM"), &sx, &sy);

     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)


@@ -2203,27 +2382,21 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {

-    if (m_finished)
+    if ( !m_finished )

     {
     {

-        event.Skip();
-        return;
-    }
+        (void)AcceptChanges();

 
 

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

 
 

-    (*m_accept) = TRUE;
-    (*m_res) = GetValue();
-    
-    if ((*m_res) != m_startValue)
-        m_owner->OnRenameAccept();
+    event.Skip();

 }
 
 //-----------------------------------------------------------------------------
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow)

 
 BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_PAINT          (wxListMainWindow::OnPaint)
 
 BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_PAINT          (wxListMainWindow::OnPaint)


@@ -2247,8 +2420,8 @@ void wxListMainWindow::Init()
     m_headerWidth =
     m_lineHeight = 0;
 
     m_headerWidth =
     m_lineHeight = 0;
 

-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
+    m_small_image_list = (wxImageListType *) NULL;
+    m_normal_image_list = (wxImageListType *) NULL;

 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;


@@ -2259,10 +2432,8 @@ void wxListMainWindow::Init()
 
     m_lastOnSame = FALSE;
     m_renameTimer = new wxListRenameTimer( this );
 
     m_lastOnSame = FALSE;
     m_renameTimer = new wxListRenameTimer( this );

-    m_renameAccept = FALSE;

 
     m_current =
 
     m_current =

-    m_currentEdit =

     m_lineLastClicked =
     m_lineBeforeLastClicked = (size_t)-1;
 
     m_lineLastClicked =
     m_lineBeforeLastClicked = (size_t)-1;
 


@@ -2307,7 +2478,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 
     m_highlightBrush = new wxBrush
                            (
 
     m_highlightBrush = new wxBrush
                            (

-                            wxSystemSettings::GetSystemColour
+                            wxSystemSettings::GetColour

                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),


@@ -2316,7 +2487,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 
     m_highlightUnfocusedBrush = new wxBrush
                                     (
 
     m_highlightUnfocusedBrush = new wxBrush
                                     (

-                                       wxSystemSettings::GetSystemColour
+                                       wxSystemSettings::GetColour

                                        (
                                            wxSYS_COLOUR_BTNSHADOW
                                        ),
                                        (
                                            wxSYS_COLOUR_BTNSHADOW
                                        ),


@@ -2329,7 +2500,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
     InitScrolling();
     SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
 
     InitScrolling();
     SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );

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


@@ -2344,7 +2515,7 @@ wxListMainWindow::~wxListMainWindow()
 
 void wxListMainWindow::CacheLineData(size_t line)
 {
 
 void wxListMainWindow::CacheLineData(size_t line)
 {

-    wxListCtrl *listctrl = GetListCtrl();
+    wxGenericListCtrl *listctrl = GetListCtrl();

 
     wxListLineData *ld = GetDummyLine();
 
 
     wxListLineData *ld = GetDummyLine();
 


@@ -2362,15 +2533,27 @@ wxListLineData *wxListMainWindow::GetDummyLine() const
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
 
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
 

-    if ( m_lines.IsEmpty() )
+    wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
+
+    wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
+
+    // we need to recreate the dummy line if the number of columns in the
+    // control changed as it would have the incorrect number of fields
+    // otherwise
+    if ( !m_lines.IsEmpty() &&
+            m_lines[0].m_items.GetCount() != (size_t)GetColumnCount() )

     {
     {

-        // normal controls are supposed to have something in m_lines
-        // already if it's not empty
-        wxASSERT_MSG( IsVirtual(), _T("logic error") );
+        self->m_lines.Clear();
+    }

 
 

-        wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
+    if ( m_lines.IsEmpty() )
+    {

         wxListLineData *line = new wxListLineData(self);
         self->m_lines.Add(line);
         wxListLineData *line = new wxListLineData(self);
         self->m_lines.Add(line);

+
+        // don't waste extra memory -- there never going to be anything
+        // else/more in this array
+        self->m_lines.Shrink();

     }
 
     return &m_lines[0];
     }
 
     return &m_lines[0];


@@ -2397,8 +2580,16 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
         if ( y < SCROLL_UNIT_Y )
             y = SCROLL_UNIT_Y;
 
         if ( y < SCROLL_UNIT_Y )
             y = SCROLL_UNIT_Y;

-        y += EXTRA_HEIGHT;

 
 

+        if ( m_small_image_list && m_small_image_list->GetImageCount() )
+        {
+            int iw = 0;
+            int ih = 0;
+            m_small_image_list->GetSize(0, iw, ih);
+            y = wxMax(y, ih);
+        }
+
+        y += EXTRA_HEIGHT;

         self->m_lineHeight = y + LINE_SPACING;
     }
 
         self->m_lineHeight = y + LINE_SPACING;
     }
 


@@ -2471,7 +2662,10 @@ long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
     if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
         return wxLIST_HITTEST_ONITEMICON;
 
     if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
         return wxLIST_HITTEST_ONITEMICON;
 

-    if ( ld->HasText() )
+    // VS: Testing for "ld->HasText() || InReportView()" instead of
+    //     "ld->HasText()" is needed to make empty lines in report view
+    //     possible
+    if ( ld->HasText() || InReportView() )

     {
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);
     {
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);


@@ -2618,22 +2812,24 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {
     if ( HasFlag(wxLC_REPORT) )
     {
 {
     if ( HasFlag(wxLC_REPORT) )
     {

-        size_t visibleFrom;
-        GetVisibleLinesRange(&visibleFrom, NULL);
+        size_t visibleFrom, visibleTo;
+        GetVisibleLinesRange(&visibleFrom, &visibleTo);

 
         if ( lineFrom < visibleFrom )
             lineFrom = visibleFrom;
 
         if ( lineFrom < visibleFrom )
             lineFrom = visibleFrom;

+        else if ( lineFrom > visibleTo )
+            return;

 
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
 
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);

+        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

 
         wxSize size = GetClientSize();
         rect.width = size.x;
         // refresh till the bottom of the window
         rect.height = size.y - rect.y;
 
 
         wxSize size = GetClientSize();
         rect.width = size.x;
         // refresh till the bottom of the window
         rect.height = size.y - rect.y;
 

-        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

         RefreshRect( rect );
     }
     else // !report
         RefreshRect( rect );
     }
     else // !report


@@ -2659,14 +2855,6 @@ void wxListMainWindow::RefreshSelected()
         to = GetItemCount() - 1;
     }
 
         to = GetItemCount() - 1;
     }
 

-    // VZ: this code would work fine if wxGTK wxWindow::Refresh() were
-    //     reasonable, i.e. if it only generated one expose event for
-    //     several calls to it - as it is, each Refresh() results in a
-    //     repaint which provokes flicker too horrible to be seen
-    //
-    //     when/if wxGTK is fixed, this code should be restored as normally it
-    //     should generate _less_ flicker than the version below
-#ifndef __WXGTK__

     if ( HasCurrent() && m_current >= from && m_current <= to )
     {
         RefreshLine(m_current);
     if ( HasCurrent() && m_current >= from && m_current <= to )
     {
         RefreshLine(m_current);


@@ -2680,26 +2868,6 @@ void wxListMainWindow::RefreshSelected()
             RefreshLine(line);
         }
     }
             RefreshLine(line);
         }
     }

-#else // __WXGTK__
-    size_t selMin = (size_t)-1,
-           selMax = 0;
-
-    for ( size_t line = from; line <= to; line++ )
-    {
-        if ( IsHighlighted(line) || (line == m_current) )
-        {
-            if ( line < selMin )
-                selMin = line;
-            if ( line > selMax )
-                selMax = line;
-        }
-    }
-
-    if ( selMin != (size_t)-1 )
-    {
-        RefreshLines(selMin, selMax);
-    }
-#endif // !__WXGTK__/__WXGTK__

 }
 
 void wxListMainWindow::Freeze()
 }
 
 void wxListMainWindow::Freeze()


@@ -2788,7 +2956,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 

-            for ( size_t i = visibleFrom; i <= visibleTo; i++ )
+            // Don't draw the first one
+            for ( size_t i = visibleFrom+1; i <= visibleTo; i++ )

             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );


@@ -2797,12 +2966,12 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             }
 
             // Draw last horizontal rule
             }
 
             // Draw last horizontal rule

-            if ( visibleTo > visibleFrom )
+            if ( visibleTo == GetItemCount() - 1 )

             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );

-                dc.DrawLine(0 - dev_x, m_lineTo*lineHeight,
-                            clientSize.x - dev_x , m_lineTo*lineHeight );
+                dc.DrawLine(0 - dev_x, (m_lineTo+1)*lineHeight,
+                            clientSize.x - dev_x , (m_lineTo+1)*lineHeight );

             }
         }
 
             }
         }
 


@@ -2814,8 +2983,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             int col = 0;
             wxRect firstItemRect;
             wxRect lastItemRect;
             int col = 0;
             wxRect firstItemRect;
             wxRect lastItemRect;

-            GetItemRect(0, firstItemRect);
-            GetItemRect(GetItemCount() - 1, lastItemRect);
+            GetItemRect(visibleFrom, firstItemRect);
+            GetItemRect(visibleTo, lastItemRect);

             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);


@@ -2823,8 +2992,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;

-                dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y,
-                            x - dev_x, lastItemRect.GetBottom() + 1 - dev_y);
+                dc.DrawLine(x - dev_x - 2, firstItemRect.GetY() - 1 - dev_y,
+                            x - dev_x - 2, lastItemRect.GetBottom() + 1 - dev_y);

             }
         }
     }
             }
         }
     }


@@ -2915,45 +3084,29 @@ void wxListMainWindow::ChangeCurrent(size_t current)
 void wxListMainWindow::EditLabel( long item )
 {
     wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),
 void wxListMainWindow::EditLabel( long item )
 {
     wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),

-                 wxT("wrong index in wxListCtrl::EditLabel()") );
+                 wxT("wrong index in wxGenericListCtrl::EditLabel()") );

 
 

-    m_currentEdit = (size_t)item;
+    size_t itemEdit = (size_t)item;

 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_itemIndex = item;
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_itemIndex = item;

-    wxListLineData *data = GetLine(m_currentEdit);
+    wxListLineData *data = GetLine(itemEdit);

     wxCHECK_RET( data, _T("invalid index in EditLabel()") );
     data->GetItem( 0, le.m_item );
     wxCHECK_RET( data, _T("invalid index in EditLabel()") );
     data->GetItem( 0, le.m_item );

-    GetParent()->GetEventHandler()->ProcessEvent( le );
-
-    if (!le.IsAllowed())
+    if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
+    {
+        // vetoed by user code

         return;
         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.

-    if (m_dirty)
+    if ( m_dirty )

         wxSafeYield();
 
         wxSafeYield();
 

-    wxClientDC dc(this);
-    PrepareDC( dc );
+    wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit);

 
 

-    wxString s = data->GetText(0);
-    wxRect rectLabel = GetLineLabelRect(m_currentEdit);
-
-    rectLabel.x = dc.LogicalToDeviceX( rectLabel.x );
-    rectLabel.y = dc.LogicalToDeviceY( rectLabel.y );
-
-    wxListTextCtrl *text = new wxListTextCtrl
-                               (
-                                this, -1,
-                                &m_renameAccept,
-                                &m_renameRes,
-                                this,
-                                s,
-                                wxPoint(rectLabel.x-4,rectLabel.y-4),
-                                wxSize(rectLabel.width+11,rectLabel.height+8)
-                               );

     text->SetFocus();
 }
 
     text->SetFocus();
 }
 


@@ -2964,27 +3117,19 @@ void wxListMainWindow::OnRenameTimer()
     EditLabel( m_current );
 }
 
     EditLabel( m_current );
 }
 

-void wxListMainWindow::OnRenameAccept()
+bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)

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

-    le.m_itemIndex = m_currentEdit;
+    le.m_itemIndex = itemEdit;

 
 

-    wxListLineData *data = GetLine(m_currentEdit);
-    wxCHECK_RET( data, _T("invalid index in OnRenameAccept()") );
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_MSG( data, FALSE, _T("invalid index in OnRenameAccept()") );

 
     data->GetItem( 0, le.m_item );
 
     data->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.SetTextColour(le.m_item.GetTextColour());
-    SetItem( info );
+    le.m_item.m_text = value;
+    return !GetParent()->GetEventHandler()->ProcessEvent( le ) ||
+                le.IsAllowed();

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


@@ -3073,7 +3218,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_renameTimer->Stop();
         m_lastOnSame = FALSE;
 
         m_renameTimer->Stop();
         m_lastOnSame = FALSE;
 

-        if ( current == m_lineBeforeLastClicked )
+        if ( current == m_lineLastClicked )

         {
             SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
 
         {
             SendNotify( current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
 


@@ -3228,7 +3373,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
 
         ChangeCurrent(newCurrent);
 
 
         ChangeCurrent(newCurrent);
 

-        HighlightLine( oldCurrent, FALSE );
+        // refresh the old focus to remove it

         RefreshLine( oldCurrent );
 
         if ( !event.ControlDown() )
         RefreshLine( oldCurrent );
 
         if ( !event.ControlDown() )


@@ -3271,7 +3416,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
         le.m_itemIndex = m_current;
         GetLine(m_current)->GetItem( 0, le.m_item );
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
         le.m_itemIndex = m_current;
         GetLine(m_current)->GetItem( 0, le.m_item );

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

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


@@ -3288,7 +3433,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 
     ke.SetEventObject( parent );
     if (parent->GetEventHandler()->ProcessEvent( ke )) return;
 

-    if (event.KeyCode() == WXK_TAB)
+    if (event.GetKeyCode() == WXK_TAB)

     {
         wxNavigationKeyEvent nevent;
         nevent.SetWindowChange( event.ControlDown() );
     {
         wxNavigationKeyEvent nevent;
         nevent.SetWindowChange( event.ControlDown() );


@@ -3306,7 +3451,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         return;
     }
 
         return;
     }
 

-    switch (event.KeyCode())
+    switch (event.GetKeyCode())

     {
         case WXK_UP:
             if ( m_current > 0 )
     {
         case WXK_UP:
             if ( m_current > 0 )


@@ -3423,9 +3568,25 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK__
-extern wxWindow *g_focusWindow;
-#endif
+void wxListMainWindow::SetFocus()
+{
+    // VS: wxListMainWindow derives from wxPanel (via wxScrolledWindow) and wxPanel
+    //     overrides SetFocus in such way that it does never change focus from
+    //     panel's child to the panel itself. Unfortunately, we must be able to change
+    //     focus to the panel from wxListTextCtrl because the text control should
+    //     disappear when the user clicks outside it.
+
+    wxWindow *oldFocus = FindFocus();
+
+    if ( oldFocus && oldFocus->GetParent() == this )
+    {
+        wxWindow::SetFocus();
+    }
+    else
+    {
+        wxScrolledWindow::SetFocus();
+    }
+}

 
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
 
 void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {


@@ -3443,10 +3604,6 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     if ( !GetParent() )
         return;
 
     if ( !GetParent() )
         return;
 

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

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


@@ -3515,7 +3672,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
     return lw + AUTOSIZE_COL_MARGIN;
 }
 
     return lw + AUTOSIZE_COL_MARGIN;
 }
 

-void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
+void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )

 {
     m_dirty = TRUE;
 
 {
     m_dirty = TRUE;
 


@@ -3537,6 +3694,7 @@ void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
     {
         m_small_image_list = imageList;
         m_small_spacing = width + 14;
     {
         m_small_image_list = imageList;
         m_small_spacing = width + 14;

+        m_lineHeight = 0;  // ensure that the line height will be recalc'd

     }
 }
 
     }
 }
 


@@ -3710,16 +3868,10 @@ void wxListMainWindow::SetItem( wxListItem &item )
         line->SetItem( item.m_col, item );
     }
 
         line->SetItem( item.m_col, item );
     }
 

-    if ( InReportView() )
-    {
-        // just refresh the line to show the new value of the text/image
-        RefreshLine((size_t)id);
-    }
-    else // !report
-    {
-        // refresh everything (resulting in horrible flicker - FIXME!)
-        m_dirty = TRUE;
-    }
+    // update the item on screen
+    wxRect rectItem;
+    GetItemRect(id, rectItem);
+    RefreshRect(rectItem);

 }
 
 void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
 }
 
 void wxListMainWindow::SetItemState( long litem, long state, long stateMask )


@@ -3760,6 +3912,14 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
             {
                 ResetCurrent();
 
             {
                 ResetCurrent();
 

+                if ( IsSingleSel() )
+                {
+                    // we must unselect the old current item as well or we
+                    // might end up with more than one selected item in a
+                    // single selection control
+                    HighlightLine(oldCurrent, FALSE);
+                }
+

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


@@ -3802,7 +3962,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
     }
 }
 
     }
 }
 

-int wxListMainWindow::GetItemState( long item, long stateMask )
+int wxListMainWindow::GetItemState( long item, long stateMask ) const

 {
     wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0,
                  _T("invalid list ctrl item index in GetItemState()") );
 {
     wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), 0,
                  _T("invalid list ctrl item index in GetItemState()") );


@@ -3824,7 +3984,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
     return ret;
 }
 
     return ret;
 }
 

-void wxListMainWindow::GetItem( wxListItem &item )
+void wxListMainWindow::GetItem( wxListItem &item ) const

 {
     wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
                  _T("invalid item index in GetItem") );
 {
     wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId < GetItemCount(),
                  _T("invalid item index in GetItem") );


@@ -3853,7 +4013,7 @@ void wxListMainWindow::SetItemCount(long count)
     m_dirty = TRUE;
 }
 
     m_dirty = TRUE;
 }
 

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

 {
     // deal with the quick case first
     if ( IsSingleSel() )
 {
     // deal with the quick case first
     if ( IsSingleSel() )


@@ -3882,7 +4042,7 @@ int wxListMainWindow::GetSelectedItemCount()
 // item position/size
 // ----------------------------------------------------------------------------
 
 // item position/size
 // ----------------------------------------------------------------------------
 

-void wxListMainWindow::GetItemRect( long index, wxRect &rect )
+void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const

 {
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );
 {
     wxCHECK_RET( index >= 0 && (size_t)index < GetItemCount(),
                  _T("invalid index in GetItemRect") );


@@ -3892,7 +4052,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect )
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
 
     CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
 }
 

-bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
+bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const

 {
     wxRect rect;
     GetItemRect(item, rect);
 {
     wxRect rect;
     GetItemRect(item, rect);


@@ -3920,9 +4080,25 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
     else
         iconSpacing = 0;
 
     else
         iconSpacing = 0;
 

+    // Note that we do not call GetClientSize() here but
+    // GetSize() and substract the border size for sunken
+    // borders manually. This is technically incorrect,
+    // but we need to know the client area's size WITHOUT
+    // scrollbars here. Since we don't know if there are
+    // any scrollbars, we use GetSize() instead. Another
+    // solution would be to call SetScrollbars() here to
+    // remove the scrollbars and call GetClientSize() then,
+    // but this might result in flicker and - worse - will
+    // reset the scrollbars to 0 which is not good at all
+    // if you resize a dialog/window, but don't want to
+    // reset the window scrolling. RR.
+    // Furthermore, we actually do NOT subtract the border
+    // width as 2 pixels is just the extra space which we
+    // need around the actual content in the window. Other-
+    // wise the text would e.g. touch the upper border. RR.

     int clientWidth,
         clientHeight;
     int clientWidth,
         clientHeight;

-    GetClientSize( &clientWidth, &clientHeight );
+    GetSize( &clientWidth, &clientHeight );

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


@@ -3940,7 +4116,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         ResetVisibleLinesRange();
 
         SetScrollbars( m_xScroll, m_yScroll,
         ResetVisibleLinesRange();
 
         SetScrollbars( m_xScroll, m_yScroll,

-                       (GetHeaderWidth() + m_xScroll - 1)/m_xScroll,
+                       GetHeaderWidth() / m_xScroll,

                        (entireHeight + m_yScroll - 1)/m_yScroll,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        (entireHeight + m_yScroll - 1)/m_yScroll,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),


@@ -3952,13 +4128,26 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
 
         // fit into the window, we recalculate after subtracting an
         // approximated 15 pt for the horizontal scrollbar
 

-        clientHeight -= 4;  // sunken frame
-

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

-            entireWidth = 0;
+            // We start with 4 for the border around all items
+            entireWidth = 4;
+
+            if (tries == 1)
+            {
+                // Now we have decided that the items do not fit into the
+                // client area. Unfortunately, wxWindows sometimes thinks
+                // that it does fit and therefore NO horizontal scrollbar
+                // is inserted. This looks ugly, so we fudge here and make
+                // the calculated width bigger than was actually has been
+                // calculated. This ensures that wxScrolledWindows puts
+                // a scrollbar at the bottom of its client area.
+                entireWidth += SCROLL_UNIT_X;
+            }
+
+            // Start at 2,2 so the text does not touch the border

             int x = 2;
             int y = 2;
             int maxWidth = 0;
             int x = 2;
             int y = 2;
             int maxWidth = 0;


@@ -3971,7 +4160,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 currentlyVisibleLines++;
                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );
                 currentlyVisibleLines++;
                 wxListLineData *line = GetLine(i);
                 line->CalculateSize( &dc, iconSpacing );

-                line->SetPosition( x, y, clientWidth, iconSpacing );
+                line->SetPosition( x, y, clientWidth, iconSpacing );  // Why clientWidth? (FIXME)

 
                 wxSize sizeLine = GetLineSize(i);
 
 
                 wxSize sizeLine = GetLineSize(i);
 


@@ -3982,8 +4171,8 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 if (currentlyVisibleLines > m_linesPerPage)
                     m_linesPerPage = currentlyVisibleLines;
 
                 if (currentlyVisibleLines > m_linesPerPage)
                     m_linesPerPage = currentlyVisibleLines;
 

-                // assume that the size of the next one is the same... (FIXME)
-                if ( y + sizeLine.y - 6 >= clientHeight )
+                // Assume that the size of the next one is the same... (FIXME)
+                if ( y + sizeLine.y >= clientHeight )

                 {
                     currentlyVisibleLines = 0;
                     y = 2;
                 {
                     currentlyVisibleLines = 0;
                     y = 2;


@@ -3991,17 +4180,21 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                     entireWidth += maxWidth+6;
                     maxWidth = 0;
                 }
                     entireWidth += maxWidth+6;
                     maxWidth = 0;
                 }

+
+                // We have reached the last item.

                 if ( i == count - 1 )
                     entireWidth += maxWidth;
                 if ( i == count - 1 )
                     entireWidth += maxWidth;

-                if ((tries == 0) && (entireWidth > clientWidth))
+
+                if ( (tries == 0) && (entireWidth+SCROLL_UNIT_X > clientWidth) )

                 {
                 {

-                    clientHeight -= 15; // scrollbar height
+                    clientHeight -= 15; // We guess the scrollbar height. (FIXME)

                     m_linesPerPage = 0;
                     currentlyVisibleLines = 0;
                     break;
                 }
                     m_linesPerPage = 0;
                     currentlyVisibleLines = 0;
                     break;
                 }

+

                 if ( i == count - 1 )
                 if ( i == count - 1 )

-                    tries = 1;  // everything fits, no second try required
+                    tries = 1;  // Everything fits, no second try required.

             }
         }
 
             }
         }
 


@@ -4041,7 +4234,7 @@ void wxListMainWindow::UpdateCurrent()
 
 long wxListMainWindow::GetNextItem( long item,
                                     int WXUNUSED(geometry),
 
 long wxListMainWindow::GetNextItem( long item,
                                     int WXUNUSED(geometry),

-                                    int state )
+                                    int state ) const

 {
     long ret = item,
          max = GetItemCount();
 {
     long ret = item,
          max = GetItemCount();


@@ -4135,6 +4328,9 @@ void wxListMainWindow::DeleteColumn( int col )
 
     m_dirty = TRUE;
     m_columns.DeleteNode( node );
 
     m_dirty = TRUE;
     m_columns.DeleteNode( node );

+
+    // invalidate it as it has to be recalculated
+    m_headerWidth = 0;

 }
 
 void wxListMainWindow::DoDeleteAllItems()
 }
 
 void wxListMainWindow::DoDeleteAllItems()


@@ -4180,9 +4376,9 @@ void wxListMainWindow::DeleteAllItems()
 
 void wxListMainWindow::DeleteEverything()
 {
 
 void wxListMainWindow::DeleteEverything()
 {

-    DeleteAllItems();
-

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

+
+    DeleteAllItems();

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


@@ -4290,7 +4486,10 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     int mode = 0;
     if ( HasFlag(wxLC_REPORT) )
 
     int mode = 0;
     if ( HasFlag(wxLC_REPORT) )

+    {

         mode = wxLC_REPORT;
         mode = wxLC_REPORT;

+        ResetVisibleLinesRange();
+    }

     else if ( HasFlag(wxLC_LIST) )
         mode = wxLC_LIST;
     else if ( HasFlag(wxLC_ICON) )
     else if ( HasFlag(wxLC_LIST) )
         mode = wxLC_LIST;
     else if ( HasFlag(wxLC_ICON) )


@@ -4329,6 +4528,9 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
         {
             m_columns.Append( column );
         }
         {
             m_columns.Append( column );
         }

+
+        // invalidate it as it has to be recalculated
+        m_headerWidth = 0;

     }
 }
 
     }
 }
 


@@ -4378,13 +4580,11 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
 
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {

-        wxListCtrl* lc = GetListCtrl();
+        wxGenericListCtrl* lc = GetListCtrl();

         wxCHECK_RET( lc, _T("no listctrl window?") );
 
         wxCHECK_RET( lc, _T("no listctrl window?") );
 

-        lc->m_headerWin->Refresh() ;
-#ifdef __WXMAC__
-        lc->m_headerWin->MacUpdateImmediately() ;
-#endif
+        lc->m_headerWin->Refresh();
+        lc->m_headerWin->Update();

     }
 }
 
     }
 }
 


@@ -4438,62 +4638,21 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 }
 
 // -------------------------------------------------------------------------------------
 }
 
 // -------------------------------------------------------------------------------------

-// wxListItem
+// wxGenericListCtrl

 // -------------------------------------------------------------------------------------
 
 // -------------------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-wxListItem::wxListItem()
-{
-    m_attr = NULL;
-
-    Clear();
-}
-
-void wxListItem::Clear()
-{
-    m_mask = 0;
-    m_itemId = 0;
-    m_col = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = -1;
-    m_data = 0;
-    m_format = wxLIST_FORMAT_CENTRE;
-    m_width = 0;
-    m_text.clear();
-
-    ClearAttributes();
-}
+IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)

 
 

-void wxListItem::ClearAttributes()
-{
-    if (m_attr)
-    {
-        delete m_attr;
-        m_attr = NULL;
-    }
-}
-
-// -------------------------------------------------------------------------------------
-// wxListCtrl
-// -------------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
-BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
-  EVT_SIZE(wxListCtrl::OnSize)
-  EVT_IDLE(wxListCtrl::OnIdle)
+BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
+  EVT_SIZE(wxGenericListCtrl::OnSize)
+  EVT_IDLE(wxGenericListCtrl::OnIdle)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxListCtrl::wxListCtrl()
+wxGenericListCtrl::wxGenericListCtrl()

 {
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
+    m_imageListNormal = (wxImageListType *) NULL;
+    m_imageListSmall = (wxImageListType *) NULL;
+    m_imageListState = (wxImageListType *) NULL;

 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =


@@ -4503,7 +4662,7 @@ wxListCtrl::wxListCtrl()
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 
     m_headerWin = (wxListHeaderWindow*) NULL;
 }
 

-wxListCtrl::~wxListCtrl()
+wxGenericListCtrl::~wxGenericListCtrl()

 {
     if (m_ownsImageListNormal)
         delete m_imageListNormal;
 {
     if (m_ownsImageListNormal)
         delete m_imageListNormal;


@@ -4513,7 +4672,7 @@ wxListCtrl::~wxListCtrl()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

-void wxListCtrl::CreateHeaderWindow()
+void wxGenericListCtrl::CreateHeaderWindow()

 {
     m_headerWin = new wxListHeaderWindow
                       (
 {
     m_headerWin = new wxListHeaderWindow
                       (


@@ -4524,7 +4683,7 @@ void wxListCtrl::CreateHeaderWindow()
                       );
 }
 
                       );
 }
 

-bool wxListCtrl::Create(wxWindow *parent,
+bool wxGenericListCtrl::Create(wxWindow *parent,

                         wxWindowID id,
                         const wxPoint &pos,
                         const wxSize &size,
                         wxWindowID id,
                         const wxPoint &pos,
                         const wxSize &size,


@@ -4534,7 +4693,7 @@ bool wxListCtrl::Create(wxWindow *parent,
 {
     m_imageListNormal =
     m_imageListSmall =
 {
     m_imageListNormal =
     m_imageListSmall =

-    m_imageListState = (wxImageList *) NULL;
+    m_imageListState = (wxImageListType *) NULL;

     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = FALSE;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = FALSE;


@@ -4569,7 +4728,7 @@ bool wxListCtrl::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxListCtrl::SetSingleStyle( long style, bool add )
+void wxGenericListCtrl::SetSingleStyle( long style, bool add )

 {
     wxASSERT_MSG( !(style & wxLC_VIRTUAL),
                   _T("wxLC_VIRTUAL can't be [un]set") );
 {
     wxASSERT_MSG( !(style & wxLC_VIRTUAL),
                   _T("wxLC_VIRTUAL can't be [un]set") );


@@ -4598,7 +4757,7 @@ void wxListCtrl::SetSingleStyle( long style, bool add )
     SetWindowStyleFlag( flag );
 }
 
     SetWindowStyleFlag( flag );
 }
 

-void wxListCtrl::SetWindowStyleFlag( long flag )
+void wxGenericListCtrl::SetWindowStyleFlag( long flag )

 {
     if (m_mainWin)
     {
 {
     if (m_mainWin)
     {


@@ -4639,47 +4798,47 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
     wxWindow::SetWindowStyleFlag( flag );
 }
 
     wxWindow::SetWindowStyleFlag( flag );
 }
 

-bool wxListCtrl::GetColumn(int col, wxListItem &item) const
+bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const

 {
     m_mainWin->GetColumn( col, item );
     return TRUE;
 }
 
 {
     m_mainWin->GetColumn( col, item );
     return TRUE;
 }
 

-bool wxListCtrl::SetColumn( int col, wxListItem& item )
+bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )

 {
     m_mainWin->SetColumn( col, item );
     return TRUE;
 }
 
 {
     m_mainWin->SetColumn( col, item );
     return TRUE;
 }
 

-int wxListCtrl::GetColumnWidth( int col ) const
+int wxGenericListCtrl::GetColumnWidth( int col ) const

 {
     return m_mainWin->GetColumnWidth( col );
 }
 
 {
     return m_mainWin->GetColumnWidth( col );
 }
 

-bool wxListCtrl::SetColumnWidth( int col, int width )
+bool wxGenericListCtrl::SetColumnWidth( int col, int width )

 {
     m_mainWin->SetColumnWidth( col, width );
     return TRUE;
 }
 
 {
     m_mainWin->SetColumnWidth( col, width );
     return TRUE;
 }
 

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

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

-bool wxListCtrl::GetItem( wxListItem &info ) const
+bool wxGenericListCtrl::GetItem( wxListItem &info ) const

 {
     m_mainWin->GetItem( info );
     return TRUE;
 }
 
 {
     m_mainWin->GetItem( info );
     return TRUE;
 }
 

-bool wxListCtrl::SetItem( wxListItem &info )
+bool wxGenericListCtrl::SetItem( wxListItem &info )

 {
     m_mainWin->SetItem( info );
     return TRUE;
 }
 
 {
     m_mainWin->SetItem( info );
     return TRUE;
 }
 

-long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
+long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )

 {
     wxListItem info;
     info.m_text = label;
 {
     wxListItem info;
     info.m_text = label;


@@ -4695,18 +4854,18 @@ long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageI
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxListCtrl::GetItemState( long item, long stateMask ) const
+int wxGenericListCtrl::GetItemState( long item, long stateMask ) const

 {
     return m_mainWin->GetItemState( item, stateMask );
 }
 
 {
     return m_mainWin->GetItemState( item, stateMask );
 }
 

-bool wxListCtrl::SetItemState( long item, long state, long stateMask )
+bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )

 {
     m_mainWin->SetItemState( item, state, stateMask );
     return TRUE;
 }
 
 {
     m_mainWin->SetItemState( item, state, stateMask );
     return TRUE;
 }
 

-bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
+bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )

 {
     wxListItem info;
     info.m_image = image;
 {
     wxListItem info;
     info.m_image = image;


@@ -4716,24 +4875,17 @@ bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxString wxListCtrl::GetItemText( long item ) const
+wxString wxGenericListCtrl::GetItemText( long item ) const

 {
 {

-    wxListItem info;
-    info.m_itemId = item;
-    m_mainWin->GetItem( info );
-    return info.m_text;
+    return m_mainWin->GetItemText(item);

 }
 
 }
 

-void wxListCtrl::SetItemText( long item, const wxString &str )
+void wxGenericListCtrl::SetItemText( long item, const wxString& str )

 {
 {

-    wxListItem info;
-    info.m_mask = wxLIST_MASK_TEXT;
-    info.m_itemId = item;
-    info.m_text = str;
-    m_mainWin->SetItem( info );
+    m_mainWin->SetItemText(item, str);

 }
 
 }
 

-long wxListCtrl::GetItemData( long item ) const
+long wxGenericListCtrl::GetItemData( long item ) const

 {
     wxListItem info;
     info.m_itemId = item;
 {
     wxListItem info;
     info.m_itemId = item;


@@ -4741,7 +4893,7 @@ long wxListCtrl::GetItemData( long item ) const
     return info.m_data;
 }
 
     return info.m_data;
 }
 

-bool wxListCtrl::SetItemData( long item, long data )
+bool wxGenericListCtrl::SetItemData( long item, long data )

 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_DATA;


@@ -4751,69 +4903,103 @@ bool wxListCtrl::SetItemData( long item, long data )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const
+bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code) ) const

 {
     m_mainWin->GetItemRect( item, rect );
     return TRUE;
 }
 
 {
     m_mainWin->GetItemRect( item, rect );
     return TRUE;
 }
 

-bool wxListCtrl::GetItemPosition( long item, wxPoint& pos ) const
+bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const

 {
     m_mainWin->GetItemPosition( item, pos );
     return TRUE;
 }
 
 {
     m_mainWin->GetItemPosition( item, pos );
     return TRUE;
 }
 

-bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
+bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )

 {
     return 0;
 }
 
 {
     return 0;
 }
 

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

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

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

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

-void wxListCtrl::SetItemSpacing( int spacing, bool isSmall )
+void wxGenericListCtrl::SetItemSpacing( int spacing, bool isSmall )

 {
     m_mainWin->SetItemSpacing( spacing, isSmall );
 }
 
 {
     m_mainWin->SetItemSpacing( spacing, isSmall );
 }
 

-int wxListCtrl::GetItemSpacing( bool isSmall ) const
+int wxGenericListCtrl::GetItemSpacing( bool isSmall ) const

 {
     return m_mainWin->GetItemSpacing( isSmall );
 }
 
 {
     return m_mainWin->GetItemSpacing( isSmall );
 }
 

-int wxListCtrl::GetSelectedItemCount() const
+void wxGenericListCtrl::SetItemTextColour( long item, const wxColour &col )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetTextColour( col );
+    m_mainWin->SetItem( info );
+}
+
+wxColour wxGenericListCtrl::GetItemTextColour( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetTextColour();
+}
+
+void wxGenericListCtrl::SetItemBackgroundColour( long item, const wxColour &col )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetBackgroundColour( col );
+    m_mainWin->SetItem( info );
+}
+
+wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetBackgroundColour();
+}
+
+int wxGenericListCtrl::GetSelectedItemCount() const

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

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

 {
     return GetForegroundColour();
 }
 
 {
     return GetForegroundColour();
 }
 

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

 {
     SetForegroundColour(col);
 }
 
 {
     SetForegroundColour(col);
 }
 

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

 {
 {

-    return 0;
+    size_t top;
+    m_mainWin->GetVisibleLinesRange(&top, NULL);
+    return (long)top;

 }
 
 }
 

-long wxListCtrl::GetNextItem( long item, int geom, int state ) const
+long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const

 {
     return m_mainWin->GetNextItem( item, geom, state );
 }
 
 {
     return m_mainWin->GetNextItem( item, geom, state );
 }
 

-wxImageList *wxListCtrl::GetImageList(int which) const
+wxImageListType *wxGenericListCtrl::GetImageList(int which) const

 {
     if (which == wxIMAGE_LIST_NORMAL)
     {
 {
     if (which == wxIMAGE_LIST_NORMAL)
     {


@@ -4827,10 +5013,10 @@ wxImageList *wxListCtrl::GetImageList(int which) const
     {
         return m_imageListState;
     }
     {
         return m_imageListState;
     }

-    return (wxImageList *) NULL;
+    return (wxImageListType *) NULL;

 }
 
 }
 

-void wxListCtrl::SetImageList( wxImageList *imageList, int which )
+void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )

 {
     if ( which == wxIMAGE_LIST_NORMAL )
     {
 {
     if ( which == wxIMAGE_LIST_NORMAL )
     {


@@ -4854,7 +5040,7 @@ void wxListCtrl::SetImageList( wxImageList *imageList, int which )
     m_mainWin->SetImageList( imageList, which );
 }
 
     m_mainWin->SetImageList( imageList, which );
 }
 

-void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
+void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which)

 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )


@@ -4865,24 +5051,24 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
         m_ownsImageListState = TRUE;
 }
 
         m_ownsImageListState = TRUE;
 }
 

-bool wxListCtrl::Arrange( int WXUNUSED(flag) )
+bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-bool wxListCtrl::DeleteItem( long item )
+bool wxGenericListCtrl::DeleteItem( long item )

 {
     m_mainWin->DeleteItem( item );
     return TRUE;
 }
 
 {
     m_mainWin->DeleteItem( item );
     return TRUE;
 }
 

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

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

-bool wxListCtrl::DeleteAllColumns()
+bool wxGenericListCtrl::DeleteAllColumns()

 {
     size_t count = m_mainWin->m_columns.GetCount();
     for ( size_t n = 0; n < count; n++ )
 {
     size_t count = m_mainWin->m_columns.GetCount();
     for ( size_t n = 0; n < count; n++ )


@@ -4891,56 +5077,63 @@ bool wxListCtrl::DeleteAllColumns()
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxListCtrl::ClearAll()
+void wxGenericListCtrl::ClearAll()

 {
     m_mainWin->DeleteEverything();
 }
 
 {
     m_mainWin->DeleteEverything();
 }
 

-bool wxListCtrl::DeleteColumn( int col )
+bool wxGenericListCtrl::DeleteColumn( int col )

 {
     m_mainWin->DeleteColumn( col );
 {
     m_mainWin->DeleteColumn( col );

+
+    // if we don't have the header any longer, we need to relayout the window
+    if ( !GetColumnCount() )
+    {
+        ResizeReportView(FALSE /* no header */);
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxListCtrl::Edit( long item )
+void wxGenericListCtrl::Edit( long item )

 {
     m_mainWin->EditLabel( item );
 }
 
 {
     m_mainWin->EditLabel( item );
 }
 

-bool wxListCtrl::EnsureVisible( long item )
+bool wxGenericListCtrl::EnsureVisible( long item )

 {
     m_mainWin->EnsureVisible( item );
     return TRUE;
 }
 
 {
     m_mainWin->EnsureVisible( item );
     return TRUE;
 }
 

-long wxListCtrl::FindItem( long start, const wxString& str,  bool partial )
+long wxGenericListCtrl::FindItem( long start, const wxString& str,  bool partial )

 {
     return m_mainWin->FindItem( start, str, partial );
 }
 
 {
     return m_mainWin->FindItem( start, str, partial );
 }
 

-long wxListCtrl::FindItem( long start, long data )
+long wxGenericListCtrl::FindItem( long start, long data )

 {
     return m_mainWin->FindItem( start, data );
 }
 
 {
     return m_mainWin->FindItem( start, data );
 }
 

-long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
+long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),

                            int WXUNUSED(direction))
 {
     return 0;
 }
 
                            int WXUNUSED(direction))
 {
     return 0;
 }
 

-long wxListCtrl::HitTest( const wxPoint &point, int &flags )
+long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )

 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }
 
 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }
 

-long wxListCtrl::InsertItem( wxListItem& info )
+long wxGenericListCtrl::InsertItem( wxListItem& info )

 {
     m_mainWin->InsertItem( info );
     return info.m_itemId;
 }
 
 {
     m_mainWin->InsertItem( info );
     return info.m_itemId;
 }
 

-long wxListCtrl::InsertItem( long index, const wxString &label )
+long wxGenericListCtrl::InsertItem( long index, const wxString &label )

 {
     wxListItem info;
     info.m_text = label;
 {
     wxListItem info;
     info.m_text = label;


@@ -4949,7 +5142,7 @@ long wxListCtrl::InsertItem( long index, const wxString &label )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

-long wxListCtrl::InsertItem( long index, int imageIndex )
+long wxGenericListCtrl::InsertItem( long index, int imageIndex )

 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_IMAGE;
 {
     wxListItem info;
     info.m_mask = wxLIST_MASK_IMAGE;


@@ -4958,7 +5151,7 @@ long wxListCtrl::InsertItem( long index, int imageIndex )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

-long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
+long wxGenericListCtrl::InsertItem( long index, const wxString &label, int imageIndex )

 {
     wxListItem info;
     info.m_text = label;
 {
     wxListItem info;
     info.m_text = label;


@@ -4968,16 +5161,25 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
     return InsertItem( info );
 }
 
     return InsertItem( info );
 }
 

-long wxListCtrl::InsertColumn( long col, wxListItem &item )
+long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )

 {
 {

-    wxASSERT( m_headerWin );
+    wxCHECK_MSG( m_headerWin, -1, _T("can't add column in non report mode") );
+

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

+
+    // if we hadn't had header before and have it now we need to relayout the
+    // window
+    if ( GetColumnCount() == 1 )
+    {
+        ResizeReportView(TRUE /* have header */);
+    }
+

     m_headerWin->Refresh();
 
     return 0;
 }
 
     m_headerWin->Refresh();
 
     return 0;
 }
 

-long wxListCtrl::InsertColumn( long col, const wxString &heading,
+long wxGenericListCtrl::InsertColumn( long col, const wxString &heading,

                                int format, int width )
 {
     wxListItem item;
                                int format, int width )
 {
     wxListItem item;


@@ -4993,7 +5195,7 @@ long wxListCtrl::InsertColumn( long col, const wxString &heading,
     return InsertColumn( col, item );
 }
 
     return InsertColumn( col, item );
 }
 

-bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
+bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )

 {
     return 0;
 }
 {
     return 0;
 }


@@ -5008,7 +5210,7 @@ bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 // or zero if the two items are equivalent.
 // data is arbitrary data to be passed to the sort function.
 
 // or zero if the two items are equivalent.
 // data is arbitrary data to be passed to the sort function.
 

-bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data )
+bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )

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


@@ -5018,7 +5220,7 @@ bool wxListCtrl::SortItems( wxListCtrlCompare fn, long data )
 // event handlers
 // ----------------------------------------------------------------------------
 
 // event handlers
 // ----------------------------------------------------------------------------
 

-void wxListCtrl::OnSize(wxSizeEvent& event)
+void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     if ( !m_mainWin )
         return;
 {
     if ( !m_mainWin )
         return;


@@ -5028,7 +5230,7 @@ void wxListCtrl::OnSize(wxSizeEvent& event)
     m_mainWin->RecalculatePositions();
 }
 
     m_mainWin->RecalculatePositions();
 }
 

-void wxListCtrl::ResizeReportView(bool showHeader)
+void wxGenericListCtrl::ResizeReportView(bool showHeader)

 {
     int cw, ch;
     GetClientSize( &cw, &ch );
 {
     int cw, ch;
     GetClientSize( &cw, &ch );


@@ -5044,7 +5246,7 @@ void wxListCtrl::ResizeReportView(bool showHeader)
     }
 }
 
     }
 }
 

-void wxListCtrl::OnIdle( wxIdleEvent & event )
+void wxGenericListCtrl::OnIdle( wxIdleEvent & event )

 {
     event.Skip();
 
 {
     event.Skip();
 


@@ -5059,7 +5261,7 @@ void wxListCtrl::OnIdle( wxIdleEvent & event )
 // font/colours
 // ----------------------------------------------------------------------------
 
 // font/colours
 // ----------------------------------------------------------------------------
 

-bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
+bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )

 {
     if (m_mainWin)
     {
 {
     if (m_mainWin)
     {


@@ -5070,7 +5272,7 @@ bool wxListCtrl::SetBackgroundColour( const wxColour &colour )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::SetForegroundColour( const wxColour &colour )
+bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )

 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
         return FALSE;


@@ -5089,7 +5291,7 @@ bool wxListCtrl::SetForegroundColour( const wxColour &colour )
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxListCtrl::SetFont( const wxFont &font )
+bool wxGenericListCtrl::SetFont( const wxFont &font )

 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;
 {
     if ( !wxWindow::SetFont( font ) )
         return FALSE;


@@ -5114,34 +5316,34 @@ bool wxListCtrl::SetFont( const wxFont &font )
 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 

-void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget )
+void wxGenericListCtrl::SetDropTarget( wxDropTarget *dropTarget )

 {
     m_mainWin->SetDropTarget( dropTarget );
 }
 
 {
     m_mainWin->SetDropTarget( dropTarget );
 }
 

-wxDropTarget *wxListCtrl::GetDropTarget() const
+wxDropTarget *wxGenericListCtrl::GetDropTarget() const

 {
     return m_mainWin->GetDropTarget();
 }
 
 #endif // wxUSE_DRAG_AND_DROP
 
 {
     return m_mainWin->GetDropTarget();
 }
 
 #endif // wxUSE_DRAG_AND_DROP
 

-bool wxListCtrl::SetCursor( const wxCursor &cursor )
+bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )

 {
     return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE;
 }
 
 {
     return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE;
 }
 

-wxColour wxListCtrl::GetBackgroundColour() const
+wxColour wxGenericListCtrl::GetBackgroundColour() const

 {
     return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour();
 }
 
 {
     return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour();
 }
 

-wxColour wxListCtrl::GetForegroundColour() const
+wxColour wxGenericListCtrl::GetForegroundColour() const

 {
     return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
 }
 
 {
     return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
 }
 

-bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
+bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )

 {
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 {
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );


@@ -5150,7 +5352,7 @@ bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS
 }
 

-void wxListCtrl::SetFocus()
+void wxGenericListCtrl::SetFocus()

 {
     /* The test in window.cpp fails as we are a composite
        window, so it checks against "this", but not m_mainWin. */
 {
     /* The test in window.cpp fails as we are a composite
        window, so it checks against "this", but not m_mainWin. */


@@ -5162,24 +5364,24 @@ void wxListCtrl::SetFocus()
 // virtual list control support
 // ----------------------------------------------------------------------------
 
 // virtual list control support
 // ----------------------------------------------------------------------------
 

-wxString wxListCtrl::OnGetItemText(long item, long col) const
+wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const

 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it
 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it

-    wxFAIL_MSG( _T("not supposed to be called") );
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemText not supposed to be called") );

 
     return wxEmptyString;
 }
 
 
     return wxEmptyString;
 }
 

-int wxListCtrl::OnGetItemImage(long item) const
+int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const

 {
     // same as above
 {
     // same as above

-    wxFAIL_MSG( _T("not supposed to be called") );
+    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );

 
     return -1;
 }
 
 
     return -1;
 }
 

-wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+wxListItemAttr *wxGenericListCtrl::OnGetItemAttr(long item) const

 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
                   _T("invalid item index in OnGetItemAttr()") );


@@ -5188,31 +5390,32 @@ wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
     return NULL;
 }
 
     return NULL;
 }
 

-void wxListCtrl::SetItemCount(long count)
+void wxGenericListCtrl::SetItemCount(long count)

 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 
     m_mainWin->SetItemCount(count);
 }
 
 {
     wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 
     m_mainWin->SetItemCount(count);
 }
 

-void wxListCtrl::RefreshItem(long item)
+void wxGenericListCtrl::RefreshItem(long item)

 {
     m_mainWin->RefreshLine(item);
 }
 
 {
     m_mainWin->RefreshLine(item);
 }
 

-void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)

 {
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 
 {
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 

-void wxListCtrl::Freeze()
+void wxGenericListCtrl::Freeze()

 {
     m_mainWin->Freeze();
 }
 
 {
     m_mainWin->Freeze();
 }
 

-void wxListCtrl::Thaw()
+void wxGenericListCtrl::Thaw()

 {
     m_mainWin->Thaw();
 }
 
 #endif // wxUSE_LISTCTRL
 {
     m_mainWin->Thaw();
 }
 
 #endif // wxUSE_LISTCTRL

+