X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d36b2167df7e86ecfc58d148eaf6abe0a5b7971..8045736e4d85cfa0fc9115787ab34cfc8332a8bb:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1d3d6605ec..9e4c6128f3 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -8,25 +8,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-   TODO
+// TODO
+//
+//   1. we need to implement searching/sorting for virtual controls somehow
+// 2. when changing selection the lines are refreshed twice
 
-   1. we need to implement searching/sorting for virtual controls somehow
-  ?2. when changing selection the lines are refreshed twice
- */
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listctrl.h"
-    #pragma implementation "listctrlbase.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -39,11 +25,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-
     #include "wx/dynarray.h"
-
     #include "wx/dcscreen.h"
-
     #include "wx/textctrl.h"
 #endif
 
@@ -77,7 +60,6 @@
 #endif
 
 
-
 // NOTE: If using the wxListBox visual attributes works everywhere then this can
 // be removed, as well as the #else case below.
 #define _USE_VISATTR 0
@@ -142,9 +124,8 @@ static const int MARGIN_BETWEEN_ROWS = 6;
 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 
-// default and minimal widths for the header columns
+// default width for the header columns
 static const int WIDTH_COL_DEFAULT = 80;
-static const int WIDTH_COL_MIN = 10;
 
 // the space between the image and the text in the report mode
 static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
@@ -225,9 +206,8 @@ public:
     // user data associated with the item
     wxUIntPtr m_data;
 
-    // the item coordinates are not used in report mode, instead this pointer
-    // is NULL and the owner window is used to retrieve the item position and
-    // size
+    // the item coordinates are not used in report mode; instead this pointer is
+    // NULL and the owner window is used to retrieve the item position and size
     wxRect *m_rect;
 
     // the list ctrl we are in
@@ -288,9 +268,9 @@ private:
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 
-WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
+WX_DECLARE_EXPORTED_LIST(wxListItemData, wxListItemDataList);
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListItemDataList);
+WX_DEFINE_LIST(wxListItemDataList)
 
 class wxListLineData
 {
@@ -320,11 +300,12 @@ public:
                             _T("width can only be increased") );
 
             m_rectAll.width = w;
-            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width)/2;
-            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width)/2;
-            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width)/2;
+            m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
+            m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2;
+            m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2;
         }
-    } *m_gi;
+    }
+    *m_gi;
 
     // is this item selected? [NB: not used in virtual mode]
     bool m_highlighted;
@@ -360,6 +341,9 @@ public:
 
     void SetImage( int image ) { SetImage(0, image); }
     int GetImage() const { return GetImage(0); }
+    void SetImage( int index, int image );
+    int GetImage( int index ) const;
+
     bool HasImage() const { return GetImage() != -1; }
     bool HasText() const { return !GetText(0).empty(); }
 
@@ -367,7 +351,7 @@ public:
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;
-    void SetText( int index, const wxString s );
+    void SetText( int index, const wxString& s );
 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);
@@ -409,16 +393,11 @@ private:
     // 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 );
-    int GetImage( int index ) const;
 };
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+WX_DEFINE_OBJARRAY(wxListLineDataArray)
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
@@ -438,8 +417,8 @@ protected:
     // divider line position in logical (unscrolled) coords
     int m_currentX;
 
-    // minimal position beyond which the divider line can't be dragged in
-    // logical coords
+    // minimal position beyond which the divider line
+    // can't be dragged in logical coords
     int m_minX;
 
 public:
@@ -456,7 +435,7 @@ public:
     virtual ~wxListHeaderWindow();
 
     void DrawCurrent();
-    void AdjustDC(wxDC& dc);
+    void AdjustDC( wxDC& dc );
 
     void OnPaint( wxPaintEvent &event );
     void OnMouse( wxMouseEvent &event );
@@ -471,7 +450,7 @@ private:
 
     // generate and process the list event of the given type, return true if
     // it wasn't vetoed, i.e. if we should proceed
-    bool SendListEvent(wxEventType type, wxPoint pos);
+    bool SendListEvent(wxEventType type, const wxPoint& pos);
 
     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()
@@ -492,13 +471,20 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-//  wxListTextCtrl (internal)
+// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl
+class WXDLLEXPORT wxListTextCtrlWrapper : public wxEvtHandler
 {
 public:
-    wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit);
+    // NB: text must be a valid object but not Create()d yet
+    wxListTextCtrlWrapper(wxListMainWindow *owner,
+                          wxTextCtrl *text,
+                          size_t itemEdit);
+
+    wxTextCtrl *GetText() const { return m_text; }
+
+    void AcceptChangesAndFinish();
 
 protected:
     void OnChar( wxKeyEvent &event );
@@ -510,6 +496,7 @@ protected:
 
 private:
     wxListMainWindow   *m_owner;
+    wxTextCtrl         *m_text;
     wxString            m_startValue;
     size_t              m_itemEdited;
     bool                m_finished;
@@ -522,9 +509,9 @@ private:
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 
-WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
+WX_DECLARE_EXPORTED_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListHeaderDataList);
+WX_DEFINE_LIST(wxListHeaderDataList)
 
 class wxListMainWindow : public wxScrolledWindow
 {
@@ -539,8 +526,6 @@ public:
 
     virtual ~wxListMainWindow();
 
-    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
-
     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 
     // return true if this is a virtual list control
@@ -619,7 +604,19 @@ public:
     void MoveToFocus() { MoveToItem(m_current); }
 
     // start editing the label of the given item
-    void EditLabel( long item );
+    wxTextCtrl *EditLabel(long item,
+                          wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+    wxTextCtrl *GetEditControl() const
+    {
+        return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
+    }
+
+    void FinishEditing(wxTextCtrl *text)
+    {
+        delete text;
+        m_textctrlWrapper = NULL;
+        SetFocusIgnoringChildren();
+    }
 
     // suspend/resume redrawing the control
     void Freeze();
@@ -638,7 +635,7 @@ public:
     void OnKeyDown( wxKeyEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
-    void OnScroll(wxScrollWinEvent& event) ;
+    void OnScroll( wxScrollWinEvent& event );
 
     void OnPaint( wxPaintEvent &event );
 
@@ -674,6 +671,7 @@ public:
     wxString GetItemText(long item) const
     {
         wxListItem info;
+        info.m_mask = wxLIST_MASK_TEXT;
         info.m_itemId = item;
         GetItem( info );
         return info.m_text;
@@ -721,7 +719,7 @@ public:
     // send out a wxListEvent
     void SendNotify( size_t line,
                      wxEventType command,
-                     wxPoint point = wxDefaultPosition );
+                     const wxPoint& point = wxDefaultPosition );
 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
@@ -796,6 +794,8 @@ public:
            m_lineSelectSingleOnUp;
 
 protected:
+    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
+
     // the total count of items in a virtual list control
     size_t m_countVirt;
 
@@ -814,7 +814,6 @@ protected:
         if ( IsVirtual() )
         {
             wxConstCast(this, wxListMainWindow)->CacheLineData(n);
-
             n = 0;
         }
 
@@ -837,11 +836,7 @@ protected:
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {
-#ifdef __WXMAC__
-        return *wxWHITE;
-#else
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
-#endif
     }
 
 private:
@@ -870,28 +865,24 @@ private:
     // if this is > 0, the control is frozen and doesn't redraw itself
     size_t m_freezeCount;
 
+    // wrapper around the text control currently used for in place editing or
+    // NULL if no item is being edited
+    wxListTextCtrlWrapper *m_textctrlWrapper;
+
+
     DECLARE_DYNAMIC_CLASS(wxListMainWindow)
     DECLARE_EVENT_TABLE()
 
     friend class wxGenericListCtrl;
 };
 
-// ============================================================================
-// implementation
-// ============================================================================
-
-//-----------------------------------------------------------------------------
-//  wxListItemData
-//-----------------------------------------------------------------------------
 
 wxListItemData::~wxListItemData()
 {
     // in the virtual list control the attributes are managed by the main
     // program, so don't delete them
     if ( !m_owner->IsVirtual() )
-    {
         delete m_attr;
-    }
 
     delete m_rect;
 }
@@ -911,13 +902,9 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
     m_owner = owner;
 
     if ( owner->InReportView() )
-    {
         m_rect = NULL;
-    }
     else
-    {
         m_rect = new wxRect;
-    }
 }
 
 void wxListItemData::SetItem( const wxListItem &info )
@@ -1001,9 +988,17 @@ int wxListItemData::GetHeight() const
 
 void wxListItemData::GetItem( wxListItem &info ) const
 {
-    info.m_text = m_text;
-    info.m_image = m_image;
-    info.m_data = m_data;
+    long mask = info.m_mask;
+    if ( !mask )
+        // by default, get everything for backwards compatibility
+        mask = -1;
+
+    if ( mask & wxLIST_MASK_TEXT )
+        info.m_text = m_text;
+    if ( mask & wxLIST_MASK_IMAGE )
+        info.m_image = m_image;
+    if ( mask & wxLIST_MASK_DATA )
+        info.m_data = m_data;
 
     if ( m_attr )
     {
@@ -1073,11 +1068,7 @@ void wxListHeaderData::SetHeight( int h )
 
 void wxListHeaderData::SetWidth( int w )
 {
-    m_width = w;
-    if (m_width < 0)
-        m_width = WIDTH_COL_DEFAULT;
-    else if (m_width < WIDTH_COL_MIN)
-        m_width = WIDTH_COL_MIN;
+    m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
 }
 
 void wxListHeaderData::SetFormat( int format )
@@ -1143,13 +1134,9 @@ wxListLineData::wxListLineData( wxListMainWindow *owner )
     m_owner = owner;
 
     if ( InReportView() )
-    {
         m_gi = NULL;
-    }
     else // !report
-    {
         m_gi = new GeometryInfo;
-    }
 
     m_highlighted = false;
 
@@ -1254,6 +1241,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
 
         default:
             wxFAIL_MSG( _T("unknown mode") );
+            break;
     }
 }
 
@@ -1283,7 +1271,7 @@ void wxListLineData::SetPosition( int x, int y, int spacing )
                 if (m_gi->m_rectAll.width > spacing)
                     m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
                 else
-                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing/2) - (m_gi->m_rectLabel.width/2);
+                    m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing / 2) - (m_gi->m_rectLabel.width / 2);
                 m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height;
                 m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2;
                 m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2;
@@ -1321,6 +1309,7 @@ void wxListLineData::SetPosition( int x, int y, int spacing )
 
         default:
             wxFAIL_MSG( _T("unknown mode") );
+            break;
     }
 }
 
@@ -1363,7 +1352,7 @@ wxString wxListLineData::GetText(int index) const
     return s;
 }
 
-void wxListLineData::SetText( int index, const wxString s )
+void wxListLineData::SetText( int index, const wxString& s )
 {
     wxListItemDataList::compatibility_iterator node = m_items.Item( index );
     if (node)
@@ -1422,33 +1411,20 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )
-    {
         colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-    }
+    else if ( attr && attr->HasTextColour() )
+        colText = attr->GetTextColour();
     else
-    {
-        if ( attr && attr->HasTextColour() )
-        {
-            colText = attr->GetTextColour();
-        }
-        else
-        {
-            colText = listctrl->GetForegroundColour();
-        }
-    }
+        colText = listctrl->GetForegroundColour();
 
     dc->SetTextForeground(colText);
 
     // font
     wxFont font;
     if ( attr && attr->HasFont() )
-    {
         font = attr->GetFont();
-    }
     else
-    {
         font = listctrl->GetFont();
-    }
 
     dc->SetFont(font);
 
@@ -1457,13 +1433,9 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )
-        {
             dc->SetBrush( *m_owner->GetHighlightBrush() );
-        }
         else
-        {
             dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
-        }
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 
@@ -1483,9 +1455,7 @@ void wxListLineData::Draw( wxDC *dc )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )
-    {
         dc->DrawRectangle( m_gi->m_rectHighlight );
-    }
 
     // just for debugging to better see where the items are
 #if 0
@@ -1494,7 +1464,7 @@ void wxListLineData::Draw( wxDC *dc )
     dc->DrawRectangle( m_gi->m_rectAll );
     dc->SetPen(*wxGREEN_PEN);
     dc->DrawRectangle( m_gi->m_rectIcon );
-#endif // 0
+#endif
 
     wxListItemData *item = node->GetData();
     if (item->HasImage())
@@ -1525,9 +1495,7 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
     //       GetAttr() and move these lines into the loop below
     wxListItemAttr *attr = GetAttr();
     if ( SetAttributes(dc, attr, highlighted) )
-    {
         dc->DrawRectangle( rectHL );
-    }
 
     wxCoord x = rect.x + HEADER_OFFSET_X,
             y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
@@ -1558,9 +1526,7 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
         wxDCClipper clipper(*dc, xOld, y, width - 8, rect.height);
 
         if ( item->HasText() )
-        {
             DrawTextFormatted(dc, item->GetText(), col, xOld, y, width - 8);
-        }
     }
 }
 
@@ -1583,10 +1549,6 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
         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;
@@ -1598,6 +1560,10 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
             case wxLIST_FORMAT_CENTER:
                 x += (width - w) / 2;
                 break;
+
+            default:
+                wxFAIL_MSG( _T("unknown list item format") );
+                break;
         }
 
         dc->DrawText(text, x, y);
@@ -1738,8 +1704,6 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC( dc );
     AdjustDC( dc );
 
-    dc.BeginDrawing();
-
     dc.SetFont( GetFont() );
 
     // width and height of the entire header window
@@ -1748,11 +1712,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
-
     dc.SetTextForeground(GetForegroundColour());
 
     int x = HEADER_OFFSET_X;
-
     int numColumns = m_owner->GetColumnCount();
     wxListItem item;
     for ( int i = 0; i < numColumns && x < w; i++ )
@@ -1763,12 +1725,13 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         // the width of the rect to draw: make it smaller to fit entirely
         // inside the column rect
 #ifdef __WXMAC__
-        int cw = wCol ;
-        int ch = h ;
+        int cw = wCol;
+        int ch = h;
 #else
         int cw = wCol - 2;
-        int ch = h-2 ;
+        int ch = h - 2;
 #endif
+
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
@@ -1784,12 +1747,11 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxCoord wLabel;
         wxCoord hLabel;
         dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
-        wLabel += 2*EXTRA_WIDTH;
+        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;
+        int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
         const int image = item.m_image;
         wxImageListType *imageList;
         if ( image != -1 )
@@ -1827,7 +1789,6 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 break;
         }
 
-
         // if we have an image, draw it on the right of the label
         if ( imageList )
         {
@@ -1852,8 +1813,6 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         x += wCol;
     }
-
-    dc.EndDrawing();
 }
 
 void wxListHeaderWindow::DrawCurrent()
@@ -1932,7 +1891,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         // end of the current column
         int xpos = 0;
 
-        // find the column where this event occured
+        // find the column where this event occurred
         int col,
             countCol = m_owner->GetColumnCount();
         for (col = 0; col < countCol; col++)
@@ -2007,7 +1966,7 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     m_owner->Update();
 }
 
-bool wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)
+bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)
 {
     wxWindow *parent = GetParent();
     wxListEvent le( type, parent->GetId() );
@@ -2039,20 +1998,23 @@ void wxListRenameTimer::Notify()
 }
 
 //-----------------------------------------------------------------------------
-// wxListTextCtrl (internal)
+// wxListTextCtrlWrapper (internal)
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
-    EVT_CHAR           (wxListTextCtrl::OnChar)
-    EVT_KEY_UP         (wxListTextCtrl::OnKeyUp)
-    EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
+BEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler)
+    EVT_CHAR           (wxListTextCtrlWrapper::OnChar)
+    EVT_KEY_UP         (wxListTextCtrlWrapper::OnKeyUp)
+    EVT_KILL_FOCUS     (wxListTextCtrlWrapper::OnKillFocus)
 END_EVENT_TABLE()
 
-wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit)
+wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
+                                             wxTextCtrl *text,
+                                             size_t itemEdit)
               : m_startValue(owner->GetItemText(itemEdit)),
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;
+    m_text = text;
     m_finished = false;
     m_aboutToFinish = false;
 
@@ -2061,38 +2023,36 @@ wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t 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));
+    m_text->Create(owner, wxID_ANY, m_startValue,
+                   wxPoint(rectLabel.x-4,rectLabel.y-4),
+                   wxSize(rectLabel.width+11,rectLabel.height+8));
+    m_text->PushEventHandler(this);
 }
 
-void wxListTextCtrl::Finish()
+void wxListTextCtrlWrapper::Finish()
 {
     if ( !m_finished )
     {
-        wxPendingDelete.Append(this);
-
         m_finished = true;
 
-        m_owner->SetFocusIgnoringChildren();
+        m_text->PopEventHandler(this);
+        m_owner->FinishEditing(m_text);
+
+        delete this;
     }
 }
 
-bool wxListTextCtrl::AcceptChanges()
+bool wxListTextCtrlWrapper::AcceptChanges()
 {
-    const wxString value = GetValue();
+    const wxString value = m_text->GetValue();
 
     if ( value == m_startValue )
-    {
         // nothing changed, always accept
         return true;
-    }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
-    {
         // vetoed by the user
         return false;
-    }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
@@ -2100,16 +2060,23 @@ bool wxListTextCtrl::AcceptChanges()
     return true;
 }
 
-void wxListTextCtrl::OnChar( wxKeyEvent &event )
+void wxListTextCtrlWrapper::AcceptChangesAndFinish()
+{
+    m_aboutToFinish = true;
+
+    // Notify the owner about the changes
+    AcceptChanges();
+
+    // Even if vetoed, close the control (consistent with MSW)
+    Finish();
+}
+
+void wxListTextCtrlWrapper::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
-            m_aboutToFinish = true;
-            // Notify the owner about the changes
-            AcceptChanges();
-            // Even if vetoed, close the control (consistent with MSW)
-            Finish();
+            AcceptChangesAndFinish();
             break;
 
         case WXK_ESCAPE:
@@ -2122,7 +2089,7 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     }
 }
 
-void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
+void wxListTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )
 {
     if (m_finished)
     {
@@ -2132,22 +2099,22 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 
     // auto-grow the textctrl:
     wxSize parentSize = m_owner->GetSize();
-    wxPoint myPos = GetPosition();
-    wxSize mySize = GetSize();
+    wxPoint myPos = m_text->GetPosition();
+    wxSize mySize = m_text->GetSize();
     int sx, sy;
-    GetTextExtent(GetValue() + _T("MM"), &sx, &sy);
+    m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;
-    SetSize(sx, wxDefaultCoord);
+    m_text->SetSize(sx, wxDefaultCoord);
 
     event.Skip();
 }
 
-void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
+void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
 {
-    if ( !m_finished )
+    if ( !m_finished && !m_aboutToFinish )
     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems:
@@ -2201,6 +2168,7 @@ void wxListMainWindow::Init()
 
     m_lastOnSame = false;
     m_renameTimer = new wxListRenameTimer( this );
+    m_textctrlWrapper = NULL;
 
     m_current =
     m_lineLastClicked =
@@ -2247,9 +2215,6 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                        wxSOLID
                                     );
 
-    wxSize sz = size;
-    sz.y = 25;
-
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 
     wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
@@ -2267,7 +2232,6 @@ wxListMainWindow::~wxListMainWindow()
 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;
-
     delete m_renameTimer;
 }
 
@@ -2281,16 +2245,15 @@ void wxListMainWindow::CacheLineData(size_t line)
     for ( size_t col = 0; col < countCol; col++ )
     {
         ld->SetText(col, listctrl->OnGetItemText(line, col));
+        ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));
     }
 
-    ld->SetImage(listctrl->OnGetItemImage(line));
     ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
 {
     wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
-
     wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
 
     wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
@@ -2336,8 +2299,7 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
         if ( m_small_image_list && m_small_image_list->GetImageCount() )
         {
-            int iw = 0;
-            int ih = 0;
+            int iw = 0, ih = 0;
             m_small_image_list->GetSize(0, iw, ih);
             y = wxMax(y, ih);
         }
@@ -2353,7 +2315,7 @@ wxCoord wxListMainWindow::GetLineY(size_t line) const
 {
     wxASSERT_MSG( InReportView(), _T("only works in report mode") );
 
-    return LINE_SPACING + line*GetLineHeight();
+    return LINE_SPACING + line * GetLineHeight();
 }
 
 wxRect wxListMainWindow::GetLineRect(size_t line) const
@@ -2476,9 +2438,7 @@ void wxListMainWindow::HighlightLines( size_t lineFrom,
         for ( size_t line = lineFrom; line <= lineTo; line++ )
         {
             if ( HighlightLine(line, highlight) )
-            {
                 RefreshLine(line);
-            }
         }
     }
 }
@@ -2580,6 +2540,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
 
         wxSize size = GetClientSize();
         rect.width = size.x;
+
         // refresh till the bottom of the window
         rect.height = size.y - rect.y;
 
@@ -2609,17 +2570,13 @@ void wxListMainWindow::RefreshSelected()
     }
 
     if ( HasCurrent() && m_current >= from && m_current <= to )
-    {
         RefreshLine(m_current);
-    }
 
     for ( size_t line = from; line <= to; line++ )
     {
         // NB: the test works as expected even if m_current == -1
         if ( line != m_current && IsHighlighted(line) )
-        {
             RefreshLine(line);
-        }
     }
 }
 
@@ -2632,10 +2589,8 @@ void wxListMainWindow::Thaw()
 {
     wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );
 
-    if ( !--m_freezeCount )
-    {
+    if ( --m_freezeCount == 0 )
         Refresh();
-    }
 }
 
 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
@@ -2645,24 +2600,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
 
     if ( IsEmpty() || m_freezeCount )
-    {
         // nothing to draw or not the moment to draw it
         return;
-    }
 
     if ( m_dirty )
-    {
         // delay the repainting until we calculate all the items positions
         return;
-    }
 
     PrepareDC( dc );
 
     int dev_x, dev_y;
     CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
 
-    dc.BeginDrawing();
-
     dc.SetFont( GetFont() );
 
     if ( InReportView() )
@@ -2710,21 +2659,21 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxSize clientSize = GetClientSize();
 
             // Don't draw the first one
-            for ( size_t i = visibleFrom+1; i <= visibleTo; i++ )
+            for ( size_t i = visibleFrom + 1; i <= visibleTo; i++ )
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
-                dc.DrawLine(0 - dev_x, i*lineHeight,
-                            clientSize.x - dev_x, i*lineHeight);
+                dc.DrawLine(0 - dev_x, i * lineHeight,
+                            clientSize.x - dev_x, i * lineHeight);
             }
 
             // Draw last horizontal rule
             if ( visibleTo == GetItemCount() - 1 )
             {
-                dc.SetPen(pen);
+                dc.SetPen( pen );
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
-                dc.DrawLine(0 - dev_x, (m_lineTo+1)*lineHeight,
-                            clientSize.x - dev_x , (m_lineTo+1)*lineHeight );
+                dc.DrawLine(0 - dev_x, (m_lineTo + 1) * lineHeight,
+                            clientSize.x - dev_x , (m_lineTo + 1) * lineHeight );
             }
         }
 
@@ -2732,14 +2681,14 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {
             wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxRect firstItemRect, lastItemRect;
 
-            wxRect firstItemRect;
-            wxRect lastItemRect;
             GetItemRect(visibleFrom, firstItemRect);
             GetItemRect(visibleTo, lastItemRect);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);
+
             for (int col = 0; col < GetColumnCount(); col++)
             {
                 int colWidth = GetColumnWidth(col);
@@ -2766,19 +2715,17 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
-            dc.DrawRectangle( GetLineHighlightRect(m_current) );
+            dc.DrawRectangle( GetLineHighlightRect( m_current ) );
         }
     }
 #endif
-
-    dc.EndDrawing();
 }
 
 void wxListMainWindow::HighlightAll( bool on )
 {
     if ( IsSingleSel() )
     {
-        wxASSERT_MSG( !on, _T("can't do this in a single sel control") );
+        wxASSERT_MSG( !on, _T("can't do this in a single selection control") );
 
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )
@@ -2795,7 +2742,7 @@ void wxListMainWindow::HighlightAll( bool on )
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
-                                   wxPoint point )
+                                   const wxPoint& point )
 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
@@ -2829,23 +2776,27 @@ void wxListMainWindow::ChangeCurrent(size_t current)
     SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);
 }
 
-void wxListMainWindow::EditLabel( long item )
+wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass)
 {
-    wxCHECK_RET( (item >= 0) && ((size_t)item < GetItemCount()),
+    wxCHECK_MSG( (item >= 0) && ((size_t)item < GetItemCount()), NULL,
                  wxT("wrong index in wxGenericListCtrl::EditLabel()") );
 
+    wxASSERT_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)),
+                 wxT("EditLabel() needs a text control") );
+
     size_t itemEdit = (size_t)item;
 
     wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
     le.m_itemIndex = item;
     wxListLineData *data = GetLine(itemEdit);
-    wxCHECK_RET( data, _T("invalid index in EditLabel()") );
+    wxCHECK_MSG( data, NULL, _T("invalid index in EditLabel()") );
     data->GetItem( 0, le.m_item );
+
     if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
     {
         // vetoed by user code
-        return;
+        return NULL;
     }
 
     // We have to call this here because the label in question might just have
@@ -2853,9 +2804,9 @@ void wxListMainWindow::EditLabel( long item )
     if ( m_dirty )
         wxSafeYield();
 
-    wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit);
-
-    text->SetFocus();
+    wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
+    m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
+    return m_textctrlWrapper->GetText();
 }
 
 void wxListMainWindow::OnRenameTimer()
@@ -2872,6 +2823,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
     le.m_itemIndex = itemEdit;
 
     wxListLineData *data = GetLine(itemEdit);
+
     wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );
 
     data->GetItem( 0, le.m_item );
@@ -2894,12 +2846,20 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
     wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
 
     data->GetItem( 0, le.m_item );
-
     GetEventHandler()->ProcessEvent( le );
 }
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
+#ifdef __WXMAC__
+    // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
+    // shutdown the edit control when the mouse is clicked elsewhere on the
+    // listctrl because the order of events is different (or something like
+    // that), so explicitly end the edit if it is active.
+    if ( event.LeftDown() && m_textctrlWrapper )
+        m_textctrlWrapper->AcceptChangesAndFinish();
+#endif // __WXMAC__
+
     event.SetEventObject( GetParent() );
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
         return;
@@ -3008,36 +2968,39 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     if (event.LeftUp())
     {
-        if(m_lineSelectSingleOnUp != (size_t) -1)
+        if (m_lineSelectSingleOnUp != (size_t)-1)
         {
             // select single line
             HighlightAll( false );
             ReverseHighlight(m_lineSelectSingleOnUp);
         }
-        else if (m_lastOnSame)
+
+        if (m_lastOnSame)
         {
             if ((current == m_current) &&
                 (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
-                HasFlag(wxLC_EDIT_LABELS)  )
+                HasFlag(wxLC_EDIT_LABELS) )
             {
                 m_renameTimer->Start( 100, true );
             }
         }
+
         m_lastOnSame = false;
-        m_lineSelectSingleOnUp = (size_t) -1;
+        m_lineSelectSingleOnUp = (size_t)-1;
     }
     else
     {
-        // This is neccessary , because after a DnD operation in
+        // This is necessary, because after a DnD operation in
         // from and to ourself, the up event is swallowed by the
         // DnD code. So on next non-up event (which means here and
         // now) m_lineSelectSingleOnUp should be reset.
-        m_lineSelectSingleOnUp = (size_t) -1;
+        m_lineSelectSingleOnUp = (size_t)-1;
     }
     if (event.RightDown())
     {
         m_lineBeforeLastClicked = m_lineLastClicked;
         m_lineLastClicked = current;
+
         // If the item is already selected, do not update the selection.
         // Multi-selections should not be cleared if a selected item is clicked.
         if (!IsHighlighted(current))
@@ -3046,8 +3009,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             ChangeCurrent(current);
             ReverseHighlight(m_current);
         }
-        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
-                    event.GetPosition() );
+
+        SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
+
         // Allow generation of context menu event
         event.Skip();
     }
@@ -3061,10 +3025,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;
+        bool oldWasSelected = IsHighlighted(m_current);
+
         bool cmdModifierDown = event.CmdDown();
         if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
         {
-            if( IsSingleSel() || !IsHighlighted(current) )
+            if ( IsSingleSel() || !IsHighlighted(current) )
             {
                 HighlightAll( false );
 
@@ -3109,12 +3075,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         if (m_current != oldCurrent)
-        {
             RefreshLine( oldCurrent );
-        }
 
         // forceClick is only set if the previous click was on another item
-        m_lastOnSame = !forceClick && (m_current == oldCurrent);
+        m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;
     }
 }
 
@@ -3130,26 +3094,26 @@ void wxListMainWindow::MoveToItem(size_t item)
 
     const int hLine = GetLineHeight();
 
-    int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
-    int view_y = hLine*GetScrollPos( wxVERTICAL );
+    int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL );
+    int view_y = hLine * GetScrollPos( wxVERTICAL );
 
     if ( InReportView() )
     {
-        // the next we need the range of lines shown it might be different, so
-        // recalculate it
+        // the next we need the range of lines shown it might be different,
+        // so recalculate it
         ResetVisibleLinesRange();
 
-        if (rect.y < view_y )
-            Scroll( -1, rect.y/hLine );
-        if (rect.y+rect.height+5 > view_y+client_h)
-            Scroll( -1, (rect.y+rect.height-client_h+hLine)/hLine );
+        if (rect.y < view_y)
+            Scroll( -1, rect.y / hLine );
+        if (rect.y + rect.height + 5 > view_y + client_h)
+            Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );
     }
     else // !report
     {
         if (rect.x-view_x < 5)
-            Scroll( (rect.x-5)/SCROLL_UNIT_X, -1 );
-        if (rect.x+rect.width-5 > view_x+client_w)
-            Scroll( (rect.x+rect.width-client_w+SCROLL_UNIT_X)/SCROLL_UNIT_X, -1 );
+            Scroll( (rect.x - 5) / SCROLL_UNIT_X, -1 );
+        if (rect.x + rect.width - 5 > view_x + client_w)
+            Scroll( (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X, -1 );
     }
 }
 
@@ -3208,7 +3172,7 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 
-    /* we propagate the key event up */
+    // propagate the key event upwards
     wxKeyEvent ke( wxEVT_KEY_DOWN );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;
@@ -3227,7 +3191,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 {
     wxWindow *parent = GetParent();
 
-    /* we send a list_key event up */
+    // send a list_key event up
     if ( HasCurrent() )
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
@@ -3238,7 +3202,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         parent->GetEventHandler()->ProcessEvent( le );
     }
 
-    /* we propagate the char event up */
+    // propagate the char event upwards
     wxKeyEvent ke( wxEVT_CHAR );
     ke.m_shiftDown = event.m_shiftDown;
     ke.m_controlDown = event.m_controlDown;
@@ -3261,7 +3225,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             return;
     }
 
-    /* no item -> nothing to do */
+    // no item -> nothing to do
     if (!HasCurrent())
     {
         event.Skip();
@@ -3402,6 +3366,7 @@ void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
         if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
             return;
     }
+
     m_hasFocus = false;
     RefreshSelected();
 }
@@ -3467,12 +3432,10 @@ void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
     m_dirty = true;
 
     // calc the spacing from the icon size
-    int width = 0,
-        height = 0;
+    int width = 0, height = 0;
+
     if ((imageList) && (imageList->GetImageCount()) )
-    {
         imageList->GetSize(0, width, height);
-    }
 
     if (which == wxIMAGE_LIST_NORMAL)
     {
@@ -3492,13 +3455,9 @@ void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 {
     m_dirty = true;
     if (isSmall)
-    {
         m_small_spacing = spacing;
-    }
     else
-    {
         m_normal_spacing = spacing;
-    }
 }
 
 int wxListMainWindow::GetItemSpacing( bool isSmall )
@@ -3575,7 +3534,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
             {
                 for (size_t i = 0; i < count; i++)
                 {
-                    wxListLineData *line = GetLine(i);
+                    wxListLineData *line = GetLine( i );
                     wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
 
                     wxCHECK_RET( n, _T("no subitem?") );
@@ -3653,6 +3612,10 @@ void wxListMainWindow::SetItem( wxListItem &item )
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );
 
+        // Set item state if user wants
+        if ( item.m_mask & wxLIST_MASK_STATE )
+            SetItemState( item.m_itemId, item.m_state, item.m_state );
+
         if (InReportView())
         {
             //  update the Max Width Cache if needed
@@ -3721,8 +3684,8 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
         return;
     }
 
-     wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
-                  _T("invalid list ctrl item index in SetItem") );
+    wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
+                 _T("invalid list ctrl item index in SetItem") );
 
     size_t oldCurrent = m_current;
     size_t item = (size_t)litem;    // safe because of the check above
@@ -3836,6 +3799,11 @@ void wxListMainWindow::GetItem( wxListItem &item ) const
 
     wxListLineData *line = GetLine((size_t)item.m_itemId);
     line->GetItem( item.m_col, item );
+
+    // Get item state if user wants it
+    if ( item.m_mask & wxLIST_MASK_STATE )
+        item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED |
+                                                 wxLIST_STATE_FOCUSED );
 }
 
 // ----------------------------------------------------------------------------
@@ -3862,9 +3830,7 @@ int wxListMainWindow::GetSelectedItemCount() const
 {
     // deal with the quick case first
     if ( IsSingleSel() )
-    {
         return HasCurrent() ? IsHighlighted(m_current) : false;
-    }
 
     // virtual controls remmebers all its selections itself
     if ( IsVirtual() )
@@ -3893,8 +3859,7 @@ wxRect wxListMainWindow::GetViewRect() const
                     _T("wxListCtrl::GetViewRect() only works in icon mode") );
 
     // we need to find the longest/tallest label
-    wxCoord xMax = 0,
-            yMax = 0;
+    wxCoord xMax = 0, yMax = 0;
     const int count = GetItemCount();
     if ( count )
     {
@@ -3914,8 +3879,8 @@ wxRect wxListMainWindow::GetViewRect() const
     }
 
     // some fudge needed to make it look prettier
-    xMax += 2*EXTRA_BORDER_X;
-    yMax += 2*EXTRA_BORDER_Y;
+    xMax += 2 * EXTRA_BORDER_X;
+    yMax += 2 * EXTRA_BORDER_Y;
 
     // account for the scrollbars if necessary
     const wxSize sizeAll = GetClientSize();
@@ -3999,7 +3964,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
     if ( InReportView() )
     {
         // all lines have the same height and we scroll one line per step
-        int entireHeight = count*lineHeight + LINE_SPACING;
+        int entireHeight = count * lineHeight + LINE_SPACING;
 
         m_linesPerPage = clientHeight / lineHeight;
 
@@ -4058,7 +4023,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 }
             }
 
-
             SetScrollbars
             (
                 SCROLL_UNIT_X,
@@ -4080,7 +4044,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
             for (int tries = 0; tries < 2; tries++)
             {
-                entireWidth = 2*EXTRA_BORDER_X;
+                entireWidth = 2 * EXTRA_BORDER_X;
 
                 if (tries == 1)
                 {
@@ -4099,11 +4063,11 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 for (size_t i = 0; i < count; i++)
                 {
                     currentlyVisibleLines++;
-                    wxListLineData *line = GetLine(i);
+                    wxListLineData *line = GetLine( i );
                     line->CalculateSize( &dc, iconSpacing );
                     line->SetPosition( x, y, iconSpacing );
 
-                    wxSize sizeLine = GetLineSize(i);
+                    wxSize sizeLine = GetLineSize( i );
 
                     if ( maxWidthInThisRow < sizeLine.x )
                         maxWidthInThisRow = sizeLine.x;
@@ -4178,9 +4142,7 @@ void wxListMainWindow::RefreshAll()
 void wxListMainWindow::UpdateCurrent()
 {
     if ( !HasCurrent() && !IsEmpty() )
-    {
         ChangeCurrent(0);
-    }
 }
 
 long wxListMainWindow::GetNextItem( long item,
@@ -4197,17 +4159,13 @@ long wxListMainWindow::GetNextItem( long item,
     // all selected items
     ret++;
     if ( ret == max )
-    {
-        // this is not an error because the index was ok initially, just no
-        // such item
+        // this is not an error because the index was OK initially,
+        // just no such item
         return -1;
-    }
 
     if ( !state )
-    {
         // any will do
         return (size_t)ret;
-    }
 
     size_t count = GetItemCount();
     for ( size_t line = (size_t)ret; line < count; line++ )
@@ -4242,9 +4200,7 @@ void wxListMainWindow::DeleteItem( long lindex )
         // become selected - unless there is no next one - so don't adjust
         // m_current in this case
         if ( m_current != index || m_current == count - 1 )
-        {
             m_current--;
-        }
     }
 
     if ( InReportView() )
@@ -4275,7 +4231,6 @@ void wxListMainWindow::DeleteItem( long lindex )
     if ( IsVirtual() )
     {
         m_countVirt--;
-
         m_selStore.OnItemDelete(index);
     }
     else
@@ -4326,10 +4281,8 @@ void wxListMainWindow::DeleteColumn( int col )
 void wxListMainWindow::DoDeleteAllItems()
 {
     if ( IsEmpty() )
-    {
         // nothing to do - in particular, don't send the event
         return;
-    }
 
     ResetCurrent();
 
@@ -4345,7 +4298,6 @@ void wxListMainWindow::DoDeleteAllItems()
     if ( IsVirtual() )
     {
         m_countVirt = 0;
-
         m_selStore.Clear();
     }
 
@@ -4388,9 +4340,7 @@ void wxListMainWindow::EnsureVisible( long index )
     // We have to call this here because the label in question might just have
     // been added and its position is not known yet
     if ( m_dirty )
-    {
         RecalculatePositions(true /* no refresh */);
-    }
 
     MoveToItem((size_t)index);
 }
@@ -4435,14 +4385,15 @@ long wxListMainWindow::FindItem(long start, wxUIntPtr data)
 long wxListMainWindow::FindItem( const wxPoint& pt )
 {
     size_t topItem;
-    GetVisibleLinesRange(&topItem, NULL);
+    GetVisibleLinesRange( &topItem, NULL );
 
     wxPoint p;
-    GetItemPosition( GetItemCount()-1, p );
-    if( p.y == 0 )
+    GetItemPosition( GetItemCount() - 1, p );
+    if ( p.y == 0 )
         return topItem;
-    long id = (long) floor( pt.y*double(GetItemCount()-topItem-1)/p.y+topItem );
-    if( id >= 0 && id < (long)GetItemCount() )
+
+    long id = (long)floor( pt.y * double(GetItemCount() - topItem - 1) / p.y + topItem );
+    if ( id >= 0 && id < (long)GetItemCount() )
         return id;
 
     return wxNOT_FOUND;
@@ -4521,9 +4472,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     // increment the member variables because the current row's index has gone
     // up by one
     if ( HasCurrent() && m_current >= id )
-    {
         m_current++;
-    }
 
     SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
 
@@ -4636,7 +4585,7 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
     ResetVisibleLinesRange();
 
     // FIXME
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
@@ -4741,7 +4690,7 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight()
     if ( m_headerWin )
     {
 #ifdef __WXMAC__
-        SInt32 h ;
+        SInt32 h;
         GetThemeMetric( kThemeMetricListHeaderHeight, &h );
 #else
         // we use 'g' to get the descent, too
@@ -4749,15 +4698,16 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight()
         m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d);
         h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
 #endif
+
         // only update if changed
         if ( h != m_headerHeight )
         {
             m_headerHeight = h;
 
-            m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
-
             if ( HasHeader() )
                 ResizeReportView(true);
+            else    //why is this needed if it doesn't have a header?
+                m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
         }
     }
 }
@@ -4805,34 +4755,35 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     // don't create the inner window with the border
     style &= ~wxBORDER_MASK;
 
-    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
+    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 
 #ifdef  __WXMAC_CARBON__
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
-        wxFont font ;
-        font.MacCreateThemeFont( kThemeViewsFont ) ;
-        SetFont( font ) ;
+        wxFont font;
+        font.MacCreateThemeFont( kThemeViewsFont );
+        SetFont( font );
     }
 #endif
+
     if ( InReportView() )
     {
         CreateHeaderWindow();
+
 #ifdef  __WXMAC_CARBON__
         if (m_headerWin)
         {
-            wxFont font ;
-            font.MacCreateThemeFont( kThemeSmallSystemFont ) ;
+            wxFont font;
+            font.MacCreateThemeFont( kThemeSmallSystemFont );
             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }
 #endif
+
         if ( HasFlag(wxLC_NO_HEADER) )
-        {
             // VZ: why do we create it at all then?
             m_headerWin->Show( false );
-        }
     }
 
     SetBestSize(size);
@@ -4858,13 +4809,9 @@ void wxGenericListCtrl::SetSingleStyle( long style, bool add )
     }
 
     if (add)
-    {
         flag |= style;
-    }
     else
-    {
         flag &= ~style;
-    }
 
     SetWindowStyleFlag( flag );
 }
@@ -4961,7 +4908,8 @@ long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int
     {
         info.m_image = imageId;
         info.m_mask |= wxLIST_MASK_IMAGE;
-    };
+    }
+
     m_mainWin->SetItem(info);
     return true;
 }
@@ -5001,6 +4949,7 @@ void wxGenericListCtrl::SetItemText( long item, const wxString& str )
 wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const
 {
     wxListItem info;
+    info.m_mask = wxLIST_MASK_DATA;
     info.m_itemId = item;
     m_mainWin->GetItem( info );
     return info.m_data;
@@ -5021,7 +4970,7 @@ wxRect wxGenericListCtrl::GetViewRect() const
     return m_mainWin->GetViewRect();
 }
 
-bool wxGenericListCtrl::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 );
     if ( m_mainWin->HasHeader() )
@@ -5099,6 +5048,22 @@ wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
     return info.GetBackgroundColour();
 }
 
+void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
+{
+    wxListItem info;
+    info.m_itemId = item;
+    info.SetFont( f );
+    m_mainWin->SetItem( info );
+}
+
+wxFont wxGenericListCtrl::GetItemFont( long item ) const
+{
+    wxListItem info;
+    info.m_itemId = item;
+    m_mainWin->GetItem( info );
+    return info.GetFont();
+}
+
 int wxGenericListCtrl::GetSelectedItemCount() const
 {
     return m_mainWin->GetSelectedItemCount();
@@ -5129,17 +5094,12 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const
 wxImageListType *wxGenericListCtrl::GetImageList(int which) const
 {
     if (which == wxIMAGE_LIST_NORMAL)
-    {
         return m_imageListNormal;
-    }
     else if (which == wxIMAGE_LIST_SMALL)
-    {
         return m_imageListSmall;
-    }
     else if (which == wxIMAGE_LIST_STATE)
-    {
         return m_imageListState;
-    }
+
     return (wxImageListType *) NULL;
 }
 
@@ -5147,19 +5107,22 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
 {
     if ( which == wxIMAGE_LIST_NORMAL )
     {
-        if (m_ownsImageListNormal) delete m_imageListNormal;
+        if (m_ownsImageListNormal)
+            delete m_imageListNormal;
         m_imageListNormal = imageList;
         m_ownsImageListNormal = false;
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
-        if (m_ownsImageListSmall) delete m_imageListSmall;
+        if (m_ownsImageListSmall)
+            delete m_imageListSmall;
         m_imageListSmall = imageList;
         m_ownsImageListSmall = false;
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
-        if (m_ownsImageListState) delete m_imageListState;
+        if (m_ownsImageListState)
+            delete m_imageListState;
         m_imageListState = imageList;
         m_ownsImageListState = false;
     }
@@ -5199,8 +5162,7 @@ bool wxGenericListCtrl::DeleteAllColumns()
 {
     size_t count = m_mainWin->m_columns.GetCount();
     for ( size_t n = 0; n < count; n++ )
-        DeleteColumn(0);
-
+        DeleteColumn( 0 );
     return true;
 }
 
@@ -5215,16 +5177,19 @@ bool wxGenericListCtrl::DeleteColumn( int col )
 
     // if we don't have the header any longer, we need to relayout the window
     if ( !GetColumnCount() )
-    {
         ResizeReportView(false /* no header */);
-    }
-
     return true;
 }
 
-void wxGenericListCtrl::Edit( long item )
+wxTextCtrl *wxGenericListCtrl::EditLabel(long item,
+                                         wxClassInfo* textControlClass)
 {
-    m_mainWin->EditLabel( item );
+    return m_mainWin->EditLabel( item, textControlClass );
+}
+
+wxTextCtrl *wxGenericListCtrl::GetEditControl() const
+{
+    return m_mainWin->GetEditControl();
 }
 
 bool wxGenericListCtrl::EnsureVisible( long item )
@@ -5233,7 +5198,7 @@ bool wxGenericListCtrl::EnsureVisible( long item )
     return true;
 }
 
-long wxGenericListCtrl::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 );
 }
@@ -5294,12 +5259,10 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
 
     m_mainWin->InsertColumn( col, item );
 
-    // if we hadn't had header before and have it now we need to relayout the
-    // window
+    // if we hadn't had a header before but have one now
+    // then we need to relayout the window
     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
-    {
         ResizeReportView(true /* have header */);
-    }
 
     m_headerWin->Refresh();
 
@@ -5317,6 +5280,7 @@ long wxGenericListCtrl::InsertColumn( long col, const wxString &heading,
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;
     }
+
     item.m_format = format;
 
     return InsertColumn( col, item );
@@ -5353,7 +5317,6 @@ void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
         return;
 
     ResizeReportView(m_mainWin->HasHeader());
-
     m_mainWin->RecalculatePositions();
 }
 
@@ -5365,7 +5328,12 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
     if ( showHeader )
     {
         m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
-        m_mainWin->SetSize( 0, m_headerHeight + 1, cw, ch - m_headerHeight - 1 );
+        if(ch > m_headerHeight)
+            m_mainWin->SetSize( 0, m_headerHeight + 1, 
+                                   cw, ch - m_headerHeight - 1 );
+        else
+            m_mainWin->SetSize( 0, m_headerHeight + 1, 
+                                   cw, 0);
     }
     else // no header window
     {
@@ -5411,9 +5379,7 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
     }
 
     if (m_headerWin)
-    {
         m_headerWin->SetForegroundColour( colour );
-    }
 
     return true;
 }
@@ -5440,13 +5406,11 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     return true;
 }
 
-
-
 #if _USE_VISATTR
 #include "wx/listbox.h"
 #endif
 
-//static
+// static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 {
@@ -5479,7 +5443,7 @@ wxDropTarget *wxGenericListCtrl::GetDropTarget() const
     return m_mainWin->GetDropTarget();
 }
 
-#endif // wxUSE_DRAG_AND_DROP
+#endif
 
 bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
 {
@@ -5502,13 +5466,23 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
     return m_mainWin->PopupMenu( menu, x, y );
 #else
     return false;
-#endif // wxUSE_MENUS
+#endif
+}
+
+void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
+{
+    return m_mainWin->DoClientToScreen(x, y);
+}
+
+void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
+{
+    return m_mainWin->DoScreenToClient(x, y);
 }
 
 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.
     if ( DoFindFocus() != this )
         m_mainWin->SetFocus();
 }
@@ -5518,7 +5492,7 @@ wxSize wxGenericListCtrl::DoGetBestSize() const
     // Something is better than nothing...
     // 100x80 is what the MSW version will get from the default
     // wxControl::DoGetBestSize
-    return wxSize(100,80);
+    return wxSize(100, 80);
 }
 
 // ----------------------------------------------------------------------------
@@ -5538,10 +5512,18 @@ int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {
     wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
                 -1,
-                wxT("List control has an image list, OnGetItemImage should be overridden."));
+                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
     return -1;
 }
 
+int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
+{
+    if (!column)
+        return OnGetItemImage(item);
+
+   return -1;
+}
+
 wxListItemAttr *
 wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {
@@ -5569,13 +5551,12 @@ void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 
-/*
- * Generic wxListCtrl is more or less a container for two other
- * windows which drawings are done upon. These are namely
- * 'm_headerWin' and 'm_mainWin'.
- * Here we override 'virtual wxWindow::Refresh()' to mimic the
- * behaviour wxListCtrl has under wxMSW.
- */
+// Generic wxListCtrl is more or less a container for two other
+// windows which drawings are done upon. These are namely
+// 'm_headerWin' and 'm_mainWin'.
+// Here we override 'virtual wxWindow::Refresh()' to mimic the
+// behaviour wxListCtrl has under wxMSW.
+//
 void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
 {
     if (!rect)
@@ -5601,7 +5582,6 @@ void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
                 rectHeader.Offset(-x, -y);
                 m_headerWin->Refresh(eraseBackground, &rectHeader);
             }
-
         }
 
         // Refresh the main window