fixed the just added wxStringTokenizer::GetPosition() test overwritten by the previou...

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 4ef33b5262349062f808548a8b516af4943f46eb..7ef33c834116f30bbb65253fe7f22c8e55b3a9c5 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -76,6 +76,9 @@
     #include "wx/mac/private.h"
 #endif
 
     #include "wx/mac/private.h"
 #endif
 

+#include <math.h>
+
+

 // 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
 // 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


@@ -91,8 +94,10 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)

+#if WXWIN_COMPATIBILITY_2_4

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)

+#endif

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)


@@ -161,7 +166,7 @@ public:
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }
 
     void SetItem( const wxListItem &info );
     void SetImage( int image ) { m_image = image; }

-    void SetData( long data ) { m_data = data; }
+    void SetData( wxUIntPtr data ) { m_data = data; }

     void SetPosition( int x, int y );
     void SetSize( int width, int height );
 
     void SetPosition( int x, int y );
     void SetSize( int width, int height );
 


@@ -200,7 +205,7 @@ public:
     int m_image;
 
     // user data associated with the item
     int m_image;
 
     // user data associated with the item

-    long m_data;
+    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
 
     // 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


@@ -514,6 +519,8 @@ public:
                       const wxString &name = _T("listctrlmainwindow") );
 
     virtual ~wxListMainWindow();
                       const wxString &name = _T("listctrlmainwindow") );
 
     virtual ~wxListMainWindow();

+    
+    wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }

 
     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 
 
     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 


@@ -534,14 +541,14 @@ public:
 
     // all these functions only do something if the line is currently visible
 
 
     // all these functions only do something if the line is currently visible
 

-    // change the line "selected" state, return TRUE if it really changed
-    bool HighlightLine( size_t line, bool highlight = TRUE);
+    // change the line "selected" state, return true if it really changed
+    bool HighlightLine( size_t line, bool highlight = true);

 
     // as HighlightLine() but do it for the range of lines: this is incredibly
     // more efficient for virtual list controls!
     //
     // NB: unlike HighlightLine() this one does refresh the lines on screen
 
     // as HighlightLine() but do it for the range of lines: this is incredibly
     // more efficient for virtual list controls!
     //
     // NB: unlike HighlightLine() this one does refresh the lines on screen

-    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = TRUE );
+    void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true );

 
     // toggle the line state and refresh it
     void ReverseHighlight( size_t line )
 
     // toggle the line state and refresh it
     void ReverseHighlight( size_t line )


@@ -623,8 +630,8 @@ public:
     int GetTextLength( const wxString &s ) const;
 
     void SetImageList( wxImageListType *imageList, int which );
     int GetTextLength( const wxString &s ) const;
 
     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 );

 
     void SetColumn( int col, wxListItem &item );
     void SetColumnWidth( int col, int width );
 
     void SetColumn( int col, wxListItem &item );
     void SetColumnWidth( int col, int width );


@@ -664,7 +671,7 @@ public:
     }
 
     // set the scrollbars and update the positions of the items
     }
 
     // set the scrollbars and update the positions of the items

-    void RecalculatePositions(bool noRefresh = FALSE);
+    void RecalculatePositions(bool noRefresh = false);

 
     // refresh the window and the header
     void RefreshAll();
 
     // refresh the window and the header
     void RefreshAll();


@@ -675,8 +682,9 @@ public:
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );
     void DeleteColumn( int col );
     void DeleteEverything();
     void EnsureVisible( long index );

-    long FindItem( long start, const wxString& str, bool partial = FALSE );
-    long FindItem( long start, long data);
+    long FindItem( long start, const wxString& str, bool partial = false );
+    long FindItem( long start, wxUIntPtr data);
+    long FindItem( const wxPoint& pt );

     long HitTest( int x, int y, int &flags );
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     long HitTest( int x, int y, int &flags );
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );


@@ -700,11 +708,11 @@ public:
     virtual bool SetFont(const wxFont& font)
     {
         if ( !wxScrolledWindow::SetFont(font) )
     virtual bool SetFont(const wxFont& font)
     {
         if ( !wxScrolledWindow::SetFont(font) )

-            return FALSE;
+            return false;

 
         m_lineHeight = 0;
 
 
         m_lineHeight = 0;
 

-        return TRUE;
+        return true;

     }
 
     // these are for wxListLineData usage only
     }
 
     // these are for wxListLineData usage only


@@ -937,7 +945,7 @@ void wxListItemData::SetSize( int width, int height )
 
 bool wxListItemData::IsHit( int x, int y ) const
 {
 
 bool wxListItemData::IsHit( int x, int y ) const
 {

-    wxCHECK_MSG( m_rect, FALSE, _T("can't be called in this mode") );
+    wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") );

 
     return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Inside(x, y);
 }
 
     return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Inside(x, y);
 }


@@ -1122,7 +1130,7 @@ wxListLineData::wxListLineData( wxListMainWindow *owner )
         m_gi = new GeometryInfo;
     }
 
         m_gi = new GeometryInfo;
     }
 

-    m_highlighted = FALSE;
+    m_highlighted = false;

 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }
 
     InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 );
 }


@@ -1438,10 +1446,10 @@ bool wxListLineData::SetAttributes(wxDC *dc,
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxListLineData::Draw( wxDC *dc )
 }
 
 void wxListLineData::Draw( wxDC *dc )


@@ -1608,14 +1616,14 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
 
 bool wxListLineData::Highlight( bool on )
 {
 
 bool wxListLineData::Highlight( bool on )
 {

-    wxCHECK_MSG( !IsVirtual(), FALSE, _T("unexpected call to Highlight") );
+    wxCHECK_MSG( !IsVirtual(), false, _T("unexpected call to Highlight") );

 
     if ( on == m_highlighted )
 
     if ( on == m_highlighted )

-        return FALSE;
+        return false;

 
     m_highlighted = on;
 
 
     m_highlighted = on;
 

-    return TRUE;
+    return true;

 }
 
 void wxListLineData::ReverseHighlight( void )
 }
 
 void wxListLineData::ReverseHighlight( void )


@@ -1638,8 +1646,8 @@ END_EVENT_TABLE()
 void wxListHeaderWindow::Init()
 {
     m_currentCursor = (wxCursor *) NULL;
 void wxListHeaderWindow::Init()
 {
     m_currentCursor = (wxCursor *) NULL;

-    m_isDragging = FALSE;
-    m_dirty = FALSE;
+    m_isDragging = false;
+    m_dirty = false;

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


@@ -1665,14 +1673,16 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 
 #if _USE_VISATTR
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
 
 #if _USE_VISATTR

-    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();    
-    SetDefaultForegroundColour( attr.colFg );
-    SetDefaultBackgroundColour( attr.colBg );
-    SetDefaultFont( attr.font );
+    wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );

 #else
 #else

-    SetDefaultForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-    SetDefaultBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
-    SetDefaultFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT ));
+    SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+    SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+    if (!m_hasFont)
+        SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT ));

 #endif
 }
 
 #endif
 }
 


@@ -1719,7 +1729,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     dc.SetTextForeground(GetForegroundColour());
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     dc.SetTextForeground(GetForegroundColour());

-    
+

     int x = HEADER_OFFSET_X;
 
     int numColumns = m_owner->GetColumnCount();
     int x = HEADER_OFFSET_X;
 
     int numColumns = m_owner->GetColumnCount();


@@ -1746,7 +1756,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         // for this we need the width of the text
         wxCoord wLabel;
 
         // for this we need the width of the text
         wxCoord wLabel;

-       wxCoord hLabel;
+        wxCoord hLabel;

         dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
         wLabel += 2*EXTRA_WIDTH;
 
         dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
         wLabel += 2*EXTRA_WIDTH;
 


@@ -1871,8 +1881,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         if (event.ButtonUp())
         {
             ReleaseMouse();
         if (event.ButtonUp())
         {
             ReleaseMouse();

-            m_isDragging = FALSE;
-            m_dirty = TRUE;
+            m_isDragging = false;
+            m_dirty = true;

             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition());
         }
             m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
             SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition());
         }


@@ -1891,7 +1901,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     else // not dragging
     {
         m_minX = 0;
     else // not dragging
     {
         m_minX = 0;

-        bool hit_border = FALSE;
+        bool hit_border = false;

 
         // end of the current column
         int xpos = 0;
 
         // end of the current column
         int xpos = 0;


@@ -1907,7 +1917,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border
             if ( (abs(x-xpos) < 3) && (y < 22) )
             {
                 // near the column border

-                hit_border = TRUE;
+                hit_border = true;

                 break;
             }
 
                 break;
             }
 


@@ -1930,7 +1940,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
                 if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
                                    event.GetPosition()) )
                 {
                 if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
                                    event.GetPosition()) )
                 {

-                    m_isDragging = TRUE;
+                    m_isDragging = true;

                     m_currentX = x;
                     CaptureMouse();
                     DrawCurrent();
                     m_currentX = x;
                     CaptureMouse();
                     DrawCurrent();


@@ -2017,7 +2027,7 @@ wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit)
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;
                 m_itemEdited(itemEdit)
 {
     m_owner = owner;

-    m_finished = FALSE;
+    m_finished = false;

 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
 
 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
 


@@ -2035,7 +2045,7 @@ void wxListTextCtrl::Finish()
     {
         wxPendingDelete.Append(this);
 
     {
         wxPendingDelete.Append(this);
 

-        m_finished = TRUE;
+        m_finished = true;

 
         m_owner->SetFocus();
     }
 
         m_owner->SetFocus();
     }


@@ -2048,19 +2058,19 @@ bool wxListTextCtrl::AcceptChanges()
     if ( value == m_startValue )
     {
         // nothing changed, always accept
     if ( value == m_startValue )
     {
         // nothing changed, always accept

-        return TRUE;
+        return true;

     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // vetoed by the user
     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // vetoed by the user

-        return FALSE;
+        return false;

     }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
 
     }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
 

-    return TRUE;
+    return true;

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


@@ -2068,12 +2078,14 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            if ( !AcceptChanges() )
+            if ( AcceptChanges() )

             {
             {

-                // vetoed by the user code
-                break;
+                // Close the text control, changes were accepted
+                Finish();

             }
             }

-            //else: fall through
+            // else do nothing, do not accept and do not close
+
+            break;

 
         case WXK_ESCAPE:
             Finish();
 
         case WXK_ESCAPE:
             Finish();


@@ -2103,7 +2115,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
         sx = mySize.x;

-    SetSize(sx, -1);
+    SetSize(sx, wxDefaultCoord);

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


@@ -2112,13 +2124,16 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
     if ( !m_finished )
     {
 {
     if ( !m_finished )
     {

-        // We must finish regardless of success, otherwise we'll get focus problems
+        // We must finish regardless of success, otherwise we'll get
+        // focus problems:

         Finish();
 
         if ( !AcceptChanges() )
             m_owner->OnRenameCancelled( m_itemEdited );
     }
 
         Finish();
 
         if ( !AcceptChanges() )
             m_owner->OnRenameCancelled( m_itemEdited );
     }
 

+    // We must let the native text control handle focus, too, otherwise
+    // it could have problems with the cursor (e.g., in wxGTK):

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


@@ -2140,7 +2155,7 @@ END_EVENT_TABLE()
 
 void wxListMainWindow::Init()
 {
 
 void wxListMainWindow::Init()
 {

-    m_dirty = TRUE;
+    m_dirty = true;

     m_countVirt = 0;
     m_lineFrom =
     m_lineTo = (size_t)-1;
     m_countVirt = 0;
     m_lineFrom =
     m_lineTo = (size_t)-1;


@@ -2155,11 +2170,11 @@ void wxListMainWindow::Init()
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

     m_dragCount = 0;
     m_dragCount = 0;

-    m_isCreated = FALSE;
+    m_isCreated = false;

 
 

-    m_lastOnSame = FALSE;
+    m_lastOnSame = false;

     m_renameTimer = new wxListRenameTimer( this );
 
     m_current =
     m_renameTimer = new wxListRenameTimer( this );
 
     m_current =


@@ -2211,10 +2226,11 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 
 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 

-    wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();    
-    SetDefaultForegroundColour( attr.colFg );
-    SetDefaultBackgroundColour( attr.colBg );
-    SetDefaultFont( attr.font );
+    wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont( attr.font );

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


@@ -2400,7 +2416,7 @@ bool wxListMainWindow::IsHighlighted(size_t line) const
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") );
+        wxCHECK_MSG( ld, false, _T("invalid index in IsHighlighted") );

 
         return ld->IsHighlighted();
     }
 
         return ld->IsHighlighted();
     }


@@ -2451,7 +2467,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);
     else // !virtual
     {
         wxListLineData *ld = GetLine(line);

-        wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") );
+        wxCHECK_MSG( ld, false, _T("invalid index in HighlightLine") );

 
         changed = ld->Highlight(highlight);
     }
 
         changed = ld->Highlight(highlight);
     }


@@ -2545,7 +2561,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
     else // !report
     {
         // TODO: how to do it more efficiently?
     else // !report
     {
         // TODO: how to do it more efficiently?

-        m_dirty = TRUE;
+        m_dirty = true;

     }
 }
 
     }
 }
 


@@ -2740,7 +2756,7 @@ void wxListMainWindow::HighlightAll( bool on )
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )
         {
         // we just have one item to turn off
         if ( HasCurrent() && IsHighlighted(m_current) )
         {

-            HighlightLine(m_current, FALSE);
+            HighlightLine(m_current, false);

             RefreshLine(m_current);
         }
     }
             RefreshLine(m_current);
         }
     }


@@ -2829,7 +2845,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
     le.m_itemIndex = itemEdit;
 
     wxListLineData *data = GetLine(itemEdit);
     le.m_itemIndex = itemEdit;
 
     wxListLineData *data = GetLine(itemEdit);

-    wxCHECK_MSG( data, FALSE, _T("invalid index in OnRenameAccept()") );
+    wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );

 
     data->GetItem( 0, le.m_item );
     le.m_item.m_text = value;
 
     data->GetItem( 0, le.m_item );
     le.m_item.m_text = value;


@@ -2842,7 +2858,7 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
     // let owner know that the edit was cancelled
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
 
     // let owner know that the edit was cancelled
     wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
 

-    le.SetEditCanceled(TRUE);
+    le.SetEditCanceled(true);

 
     le.SetEventObject( GetParent() );
     le.m_itemIndex = itemEdit;
 
     le.SetEventObject( GetParent() );
     le.m_itemIndex = itemEdit;


@@ -2936,11 +2952,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         return;
     }
 
         return;
     }
 

-    bool forceClick = FALSE;
+    bool forceClick = false;

     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();
     if (event.ButtonDClick())
     {
         m_renameTimer->Stop();

-        m_lastOnSame = FALSE;
+        m_lastOnSame = false;

 
         if ( current == m_lineLastClicked )
         {
 
         if ( current == m_lineLastClicked )
         {


@@ -2952,7 +2968,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         {
             // the first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead
         {
             // the first click was on another item, so don't interpret this as
             // a double click, but as a simple click instead

-            forceClick = TRUE;
+            forceClick = true;

         }
     }
 
         }
     }
 


@@ -2962,9 +2978,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
             HasFlag(wxLC_EDIT_LABELS)  )
         {
             (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
             HasFlag(wxLC_EDIT_LABELS)  )
         {

-            m_renameTimer->Start( 100, TRUE );
+            m_renameTimer->Start( 100, true );

         }
         }

-        m_lastOnSame = FALSE;
+        m_lastOnSame = false;

     }
     else if (event.RightDown())
     {
     }
     else if (event.RightDown())
     {


@@ -2981,10 +2997,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;

-
-        if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) )
+        bool cmdModifierDown = event.CmdDown();
+        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )

         {
         {

-            HighlightAll( FALSE );
+            HighlightAll( false );

 
             ChangeCurrent(current);
 
 
             ChangeCurrent(current);
 


@@ -2992,7 +3008,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
         else // multi sel & either ctrl or shift is down
         {
         }
         else // multi sel & either ctrl or shift is down
         {

-            if (event.ControlDown())
+            if (cmdModifierDown)

             {
                 ChangeCurrent(current);
 
             {
                 ChangeCurrent(current);
 


@@ -3098,19 +3114,19 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     {
         // all previously selected items are unselected unless ctrl is held
         if ( !event.ControlDown() )
     {
         // all previously selected items are unselected unless ctrl is held
         if ( !event.ControlDown() )

-            HighlightAll(FALSE);
+            HighlightAll(false);

 
         ChangeCurrent(newCurrent);
 
         ChangeCurrent(newCurrent);

-        
+

         // refresh the old focus to remove it
         RefreshLine( oldCurrent );
 
         if ( !event.ControlDown() )
         {
         // refresh the old focus to remove it
         RefreshLine( oldCurrent );
 
         if ( !event.ControlDown() )
         {

-            HighlightLine( m_current, TRUE );
+            HighlightLine( m_current, true );

         }
     }
         }
     }

-       
+

     RefreshLine( m_current );
 
     MoveToFocus();
     RefreshLine( m_current );
 
     MoveToFocus();


@@ -3291,7 +3307,7 @@ void wxListMainWindow::SetFocus()
     //     focus to the panel from wxListTextCtrl because the text control should
     //     disappear when the user clicks outside it.
 
     //     focus to the panel from wxListTextCtrl because the text control should
     //     disappear when the user clicks outside it.
 

-    wxWindow *oldFocus = FindFocus();
+    wxWindow *oldFocus = DoFindFocus();

 
     if ( oldFocus && oldFocus->GetParent() == this )
     {
 
     if ( oldFocus && oldFocus->GetParent() == this )
     {


@@ -3319,7 +3335,7 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     // it
     if ( !m_hasFocus )
     {
     // it
     if ( !m_hasFocus )
     {

-        m_hasFocus = TRUE;
+        m_hasFocus = true;

 
         RefreshSelected();
     }
 
         RefreshSelected();
     }


@@ -3334,7 +3350,7 @@ void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
         if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
             return;
     }
         if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
             return;
     }

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

     RefreshSelected();
 }
 
     RefreshSelected();
 }
 


@@ -3396,7 +3412,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
 
 void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
 {
 
 void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
 {

-    m_dirty = TRUE;
+    m_dirty = true;

 
     // calc the spacing from the icon size
     int width = 0,
 
     // calc the spacing from the icon size
     int width = 0,


@@ -3422,7 +3438,7 @@ void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
 
 void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 {
 
 void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
 {

-    m_dirty = TRUE;
+    m_dirty = true;

     if (isSmall)
     {
         m_small_spacing = spacing;
     if (isSmall)
     {
         m_small_spacing = spacing;


@@ -3456,9 +3472,9 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item )
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )

-        headerWin->m_dirty = TRUE;
+        headerWin->m_dirty = true;

 
 

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -3472,10 +3488,10 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
     wxCHECK_RET( InReportView(),
                  _T("SetColumnWidth() can only be called in report mode.") );
 
     wxCHECK_RET( InReportView(),
                  _T("SetColumnWidth() can only be called in report mode.") );
 

-    m_dirty = TRUE;
+    m_dirty = true;

     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )

-        headerWin->m_dirty = TRUE;
+        headerWin->m_dirty = true;

 
     wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
     wxCHECK_RET( node, _T("no column?") );
 
     wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
     wxCHECK_RET( node, _T("no column?") );


@@ -3618,7 +3634,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                 {
                     if ( IsSingleSel() )
                     {
                 {
                     if ( IsSingleSel() )
                     {

-                        HighlightLine(oldCurrent, FALSE);
+                        HighlightLine(oldCurrent, false);

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


@@ -3639,7 +3655,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
                     // 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
                     // 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);
+                    HighlightLine(oldCurrent, false);

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


@@ -3664,7 +3680,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
 
                     if ( oldCurrent != (size_t)-1 )
                     {
 
                     if ( oldCurrent != (size_t)-1 )
                     {

-                        HighlightLine( oldCurrent, FALSE );
+                        HighlightLine( oldCurrent, false );

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


@@ -3732,7 +3748,7 @@ void wxListMainWindow::SetItemCount(long count)
     ResetVisibleLinesRange();
 
     // scrollbars must be reset
     ResetVisibleLinesRange();
 
     // scrollbars must be reset

-    m_dirty = TRUE;
+    m_dirty = true;

 }
 
 int wxListMainWindow::GetSelectedItemCount() const
 }
 
 int wxListMainWindow::GetSelectedItemCount() const


@@ -3740,7 +3756,7 @@ int wxListMainWindow::GetSelectedItemCount() const
     // deal with the quick case first
     if ( IsSingleSel() )
     {
     // deal with the quick case first
     if ( IsSingleSel() )
     {

-        return HasCurrent() ? IsHighlighted(m_current) : FALSE;
+        return HasCurrent() ? IsHighlighted(m_current) : false;

     }
 
     // virtual controls remmebers all its selections itself
     }
 
     // virtual controls remmebers all its selections itself


@@ -3813,7 +3829,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const
     if ( m_dirty )
     {
         wxConstCast(this, wxListMainWindow)->
     if ( m_dirty )
     {
         wxConstCast(this, wxListMainWindow)->

-            RecalculatePositions(TRUE /* no refresh */);
+            RecalculatePositions(true /* no refresh */);

     }
 
     rect = GetLineRect((size_t)index);
     }
 
     rect = GetLineRect((size_t)index);


@@ -3829,7 +3845,7 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const
     pos.x = rect.x;
     pos.y = rect.y;
 
     pos.x = rect.x;
     pos.y = rect.y;
 

-    return TRUE;
+    return true;

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


@@ -3887,7 +3903,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                        (entireHeight + lineHeight - 1) / lineHeight,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),
                        (entireHeight + lineHeight - 1) / lineHeight,
                        GetScrollPos(wxHORIZONTAL),
                        GetScrollPos(wxVERTICAL),

-                       TRUE );
+                       true );

     }
     else // !report
     {
     }
     else // !report
     {


@@ -3944,7 +3960,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 (y + lineHeight) / lineHeight,
                 GetScrollPos( wxHORIZONTAL ),
                 GetScrollPos( wxVERTICAL ),
                 (y + lineHeight) / lineHeight,
                 GetScrollPos( wxHORIZONTAL ),
                 GetScrollPos( wxVERTICAL ),

-                TRUE
+                true

             );
         }
         else // "flowed" arrangement, the most complicated case
             );
         }
         else // "flowed" arrangement, the most complicated case


@@ -4025,7 +4041,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 0,
                 GetScrollPos( wxHORIZONTAL ),
                 0,
                 0,
                 GetScrollPos( wxHORIZONTAL ),
                 0,

-                TRUE
+                true

             );
         }
     }
             );
         }
     }


@@ -4041,13 +4057,13 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
 void wxListMainWindow::RefreshAll()
 {
 
 void wxListMainWindow::RefreshAll()
 {

-    m_dirty = FALSE;
+    m_dirty = false;

     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin && headerWin->m_dirty )
     {
     Refresh();
 
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin && headerWin->m_dirty )
     {

-        headerWin->m_dirty = FALSE;
+        headerWin->m_dirty = false;

         headerWin->Refresh();
     }
 }
         headerWin->Refresh();
     }
 }


@@ -4141,7 +4157,7 @@ void wxListMainWindow::DeleteItem( long lindex )
     }
 
     // we need to refresh the (vert) scrollbar as the number of items changed
     }
 
     // we need to refresh the (vert) scrollbar as the number of items changed

-    m_dirty = TRUE;
+    m_dirty = true;

 
     SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
 
 
     SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
 


@@ -4154,7 +4170,7 @@ void wxListMainWindow::DeleteColumn( int col )
 
     wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
 
 
     wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") );
 

-    m_dirty = TRUE;
+    m_dirty = true;

     delete node->GetData();
     m_columns.Erase( node );
 
     delete node->GetData();
     m_columns.Erase( node );
 


@@ -4235,7 +4251,7 @@ void wxListMainWindow::EnsureVisible( long index )
     // been added and its position is not known yet
     if ( m_dirty )
     {
     // been added and its position is not known yet
     if ( m_dirty )
     {

-        RecalculatePositions(TRUE /* no refresh */);
+        RecalculatePositions(true /* no refresh */);

     }
 
     MoveToItem((size_t)index);
     }
 
     MoveToItem((size_t)index);


@@ -4259,7 +4275,7 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-long wxListMainWindow::FindItem(long start, long data)
+long wxListMainWindow::FindItem(long start, wxUIntPtr data)

 {
     long pos = start;
     if (pos < 0)
 {
     long pos = start;
     if (pos < 0)


@@ -4278,6 +4294,22 @@ long wxListMainWindow::FindItem(long start, long data)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

+long wxListMainWindow::FindItem( const wxPoint& pt )
+{
+    size_t topItem;
+    GetVisibleLinesRange(&topItem, NULL);
+
+    wxPoint p;
+    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() )
+        return id;
+
+    return wxNOT_FOUND;
+}
+

 long wxListMainWindow::HitTest( int x, int y, int &flags )
 {
     CalcUnscrolledPosition( x, y, &x, &y );
 long wxListMainWindow::HitTest( int x, int y, int &flags )
 {
     CalcUnscrolledPosition( x, y, &x, &y );


@@ -4317,13 +4349,15 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
 
 {
     wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") );
 

-    size_t count = GetItemCount();
-    wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId <= count,
-                 _T("invalid item index") );
+    int count = GetItemCount();
+    wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") );

 
 

+    if (item.m_itemId > count)
+        item.m_itemId = count;
+    

     size_t id = item.m_itemId;
 
     size_t id = item.m_itemId;
 

-    m_dirty = TRUE;
+    m_dirty = true;

 
     #if 0
     // this is unused variable
 
     #if 0
     // this is unused variable


@@ -4369,7 +4403,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     m_lines.Insert( line, id );
 
 
     m_lines.Insert( line, id );
 

-    m_dirty = TRUE;
+    m_dirty = true;

 
     // If an item is selected at or below the point of insertion, we need to
     // increment the member variables because the current row's index has gone
 
     // If an item is selected at or below the point of insertion, we need to
     // increment the member variables because the current row's index has gone


@@ -4386,7 +4420,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
 
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {

-    m_dirty = TRUE;
+    m_dirty = true;

     if ( InReportView() )
     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
     if ( InReportView() )
     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)


@@ -4436,9 +4470,9 @@ int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData
     wxListLineData *line2 = *arg2;
     wxListItem item;
     line1->GetItem( 0, item );
     wxListLineData *line2 = *arg2;
     wxListItem item;
     line1->GetItem( 0, item );

-    long data1 = item.m_data;
+    wxUIntPtr data1 = item.m_data;

     line2->GetItem( 0, item );
     line2->GetItem( 0, item );

-    long data2 = item.m_data;
+    wxUIntPtr data2 = item.m_data;

     return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
 }
 
     return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
 }
 


@@ -4447,7 +4481,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );
     list_ctrl_compare_func_2 = fn;
     list_ctrl_compare_data = data;
     m_lines.Sort( list_ctrl_compare_func_1 );

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -4544,7 +4578,7 @@ wxGenericListCtrl::wxGenericListCtrl()
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;


@@ -4578,7 +4612,7 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight()
             m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
 
             if ( HasHeader() )
             m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
 
             if ( HasHeader() )

-                ResizeReportView(TRUE);
+                ResizeReportView(true);

         }
     }
 }
         }
     }
 }


@@ -4587,7 +4621,7 @@ void wxGenericListCtrl::CreateHeaderWindow()
 {
     m_headerWin = new wxListHeaderWindow
                       (
 {
     m_headerWin = new wxListHeaderWindow
                       (

-                        this, -1, m_mainWin,
+                        this, wxID_ANY, m_mainWin,

                         wxPoint(0, 0),
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL
                         wxPoint(0, 0),
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL


@@ -4608,7 +4642,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     m_imageListState = (wxImageListType *) NULL;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_imageListState = (wxImageListType *) NULL;
     m_ownsImageListNormal =
     m_ownsImageListSmall =

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;


@@ -4621,17 +4655,21 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     }
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
     }
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )

-        return FALSE;
+        return false;

 
     // don't create the inner window with the border
     style &= ~wxBORDER_MASK;
 
 
     // don't create the inner window with the border
     style &= ~wxBORDER_MASK;
 

-    m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
+    m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );

 
 #if defined( __WXMAC__ ) && __WXMAC_CARBON__
 
 #if defined( __WXMAC__ ) && __WXMAC_CARBON__

-    wxFont font ;
-    font.MacCreateThemeFont( kThemeViewsFont ) ;
-    SetFont( font ) ;
+    // Human Interface Guidelines ask us for a special font in this case
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
+    {
+        wxFont font ;
+        font.MacCreateThemeFont( kThemeViewsFont ) ;
+        SetFont( font ) ;
+    }

 #endif
     if ( InReportView() )
     {
 #endif
     if ( InReportView() )
     {


@@ -4640,13 +4678,13 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
         if ( HasFlag(wxLC_NO_HEADER) )
         {
             // VZ: why do we create it at all then?
         if ( HasFlag(wxLC_NO_HEADER) )
         {
             // VZ: why do we create it at all then?

-            m_headerWin->Show( FALSE );
+            m_headerWin->Show( false );

         }
     }
 
     SetBestSize(size);
         }
     }
 
     SetBestSize(size);

-    
-    return TRUE;
+
+    return true;

 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )
 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )


@@ -4696,7 +4734,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
                 if ( m_headerWin )
                 {
                     // don't delete, just hide, as we can reuse it later
                 if ( m_headerWin )
                 {
                     // don't delete, just hide, as we can reuse it later

-                    m_headerWin->Show(FALSE);
+                    m_headerWin->Show(false);

                 }
                 //else: nothing to do
             }
                 }
                 //else: nothing to do
             }


@@ -4708,7 +4746,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
                 }
                 else // already have it, just show
                 {
                 }
                 else // already have it, just show
                 {

-                    m_headerWin->Show( TRUE );
+                    m_headerWin->Show( true );

                 }
             }
 
                 }
             }
 


@@ -4722,13 +4760,13 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
 bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const
 {
     m_mainWin->GetColumn( col, item );
 bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const
 {
     m_mainWin->GetColumn( col, item );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )
 {
     m_mainWin->SetColumn( col, item );
 }
 
 bool wxGenericListCtrl::SetColumn( int col, wxListItem& item )
 {
     m_mainWin->SetColumn( col, item );

-    return TRUE;
+    return true;

 }
 
 int wxGenericListCtrl::GetColumnWidth( int col ) const
 }
 
 int wxGenericListCtrl::GetColumnWidth( int col ) const


@@ -4739,7 +4777,7 @@ int wxGenericListCtrl::GetColumnWidth( int col ) const
 bool wxGenericListCtrl::SetColumnWidth( int col, int width )
 {
     m_mainWin->SetColumnWidth( col, width );
 bool wxGenericListCtrl::SetColumnWidth( int col, int width )
 {
     m_mainWin->SetColumnWidth( col, width );

-    return TRUE;
+    return true;

 }
 
 int wxGenericListCtrl::GetCountPerPage() const
 }
 
 int wxGenericListCtrl::GetCountPerPage() const


@@ -4750,13 +4788,13 @@ int wxGenericListCtrl::GetCountPerPage() const
 bool wxGenericListCtrl::GetItem( wxListItem &info ) const
 {
     m_mainWin->GetItem( info );
 bool wxGenericListCtrl::GetItem( wxListItem &info ) const
 {
     m_mainWin->GetItem( info );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetItem( wxListItem &info )
 {
     m_mainWin->SetItem( info );
 }
 
 bool wxGenericListCtrl::SetItem( wxListItem &info )
 {
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;

 }
 
 long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
 }
 
 long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )


@@ -4772,7 +4810,7 @@ long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int
         info.m_mask |= wxLIST_MASK_IMAGE;
     };
     m_mainWin->SetItem(info);
         info.m_mask |= wxLIST_MASK_IMAGE;
     };
     m_mainWin->SetItem(info);

-    return TRUE;
+    return true;

 }
 
 int wxGenericListCtrl::GetItemState( long item, long stateMask ) const
 }
 
 int wxGenericListCtrl::GetItemState( long item, long stateMask ) const


@@ -4783,17 +4821,18 @@ int wxGenericListCtrl::GetItemState( long item, long stateMask ) const
 bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
 {
     m_mainWin->SetItemState( item, state, stateMask );
 bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
 {
     m_mainWin->SetItemState( item, state, stateMask );

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
     m_mainWin->SetItem( info );
 {
     wxListItem info;
     info.m_image = image;
     info.m_mask = wxLIST_MASK_IMAGE;
     info.m_itemId = item;
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;

 }
 
 wxString wxGenericListCtrl::GetItemText( long item ) const
 }
 
 wxString wxGenericListCtrl::GetItemText( long item ) const


@@ -4806,7 +4845,7 @@ void wxGenericListCtrl::SetItemText( long item, const wxString& str )
     m_mainWin->SetItemText(item, str);
 }
 
     m_mainWin->SetItemText(item, str);
 }
 

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

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


@@ -4821,7 +4860,7 @@ bool wxGenericListCtrl::SetItemData( long item, long data )
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );
     info.m_itemId = item;
     info.m_data = data;
     m_mainWin->SetItem( info );

-    return TRUE;
+    return true;

 }
 
 wxRect wxGenericListCtrl::GetViewRect() const
 }
 
 wxRect wxGenericListCtrl::GetViewRect() const


@@ -4834,13 +4873,13 @@ bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect,  int WXUNUSED(code
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )
         rect.y += m_headerHeight + 1;
     m_mainWin->GetItemRect( item, rect );
     if ( m_mainWin->HasHeader() )
         rect.y += m_headerHeight + 1;

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const
 {
     m_mainWin->GetItemPosition( item, pos );
 }
 
 bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const
 {
     m_mainWin->GetItemPosition( item, pos );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
 }
 
 bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )


@@ -4957,19 +4996,19 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
     {
         if (m_ownsImageListNormal) delete m_imageListNormal;
         m_imageListNormal = imageList;
     {
         if (m_ownsImageListNormal) delete m_imageListNormal;
         m_imageListNormal = imageList;

-        m_ownsImageListNormal = FALSE;
+        m_ownsImageListNormal = false;

     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
         if (m_ownsImageListSmall) delete m_imageListSmall;
         m_imageListSmall = imageList;
     }
     else if ( which == wxIMAGE_LIST_SMALL )
     {
         if (m_ownsImageListSmall) delete m_imageListSmall;
         m_imageListSmall = imageList;

-        m_ownsImageListSmall = FALSE;
+        m_ownsImageListSmall = false;

     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
         if (m_ownsImageListState) delete m_imageListState;
         m_imageListState = imageList;
     }
     else if ( which == wxIMAGE_LIST_STATE )
     {
         if (m_ownsImageListState) delete m_imageListState;
         m_imageListState = imageList;

-        m_ownsImageListState = FALSE;
+        m_ownsImageListState = false;

     }
 
     m_mainWin->SetImageList( imageList, which );
     }
 
     m_mainWin->SetImageList( imageList, which );


@@ -4979,11 +5018,11 @@ void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which)
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )
 {
     SetImageList(imageList, which);
     if ( which == wxIMAGE_LIST_NORMAL )

-        m_ownsImageListNormal = TRUE;
+        m_ownsImageListNormal = true;

     else if ( which == wxIMAGE_LIST_SMALL )
     else if ( which == wxIMAGE_LIST_SMALL )

-        m_ownsImageListSmall = TRUE;
+        m_ownsImageListSmall = true;

     else if ( which == wxIMAGE_LIST_STATE )
     else if ( which == wxIMAGE_LIST_STATE )

-        m_ownsImageListState = TRUE;
+        m_ownsImageListState = true;

 }
 
 bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )
 }
 
 bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )


@@ -4994,13 +5033,13 @@ bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) )
 bool wxGenericListCtrl::DeleteItem( long item )
 {
     m_mainWin->DeleteItem( item );
 bool wxGenericListCtrl::DeleteItem( long item )
 {
     m_mainWin->DeleteItem( item );

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::DeleteAllItems()
 {
     m_mainWin->DeleteAllItems();
 }
 
 bool wxGenericListCtrl::DeleteAllItems()
 {
     m_mainWin->DeleteAllItems();

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::DeleteAllColumns()
 }
 
 bool wxGenericListCtrl::DeleteAllColumns()


@@ -5009,7 +5048,7 @@ bool wxGenericListCtrl::DeleteAllColumns()
     for ( size_t n = 0; n < count; n++ )
         DeleteColumn(0);
 
     for ( size_t n = 0; n < count; n++ )
         DeleteColumn(0);
 

-    return TRUE;
+    return true;

 }
 
 void wxGenericListCtrl::ClearAll()
 }
 
 void wxGenericListCtrl::ClearAll()


@@ -5024,10 +5063,10 @@ bool wxGenericListCtrl::DeleteColumn( int col )
     // if we don't have the header any longer, we need to relayout the window
     if ( !GetColumnCount() )
     {
     // if we don't have the header any longer, we need to relayout the window
     if ( !GetColumnCount() )
     {

-        ResizeReportView(FALSE /* no header */);
+        ResizeReportView(false /* no header */);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxGenericListCtrl::Edit( long item )
 }
 
 void wxGenericListCtrl::Edit( long item )


@@ -5038,7 +5077,7 @@ void wxGenericListCtrl::Edit( long item )
 bool wxGenericListCtrl::EnsureVisible( long item )
 {
     m_mainWin->EnsureVisible( item );
 bool wxGenericListCtrl::EnsureVisible( long item )
 {
     m_mainWin->EnsureVisible( item );

-    return TRUE;
+    return true;

 }
 
 long wxGenericListCtrl::FindItem( long start, const wxString& str,  bool partial )
 }
 
 long wxGenericListCtrl::FindItem( long start, const wxString& str,  bool partial )


@@ -5046,15 +5085,15 @@ 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 wxGenericListCtrl::FindItem( long start, long data )
+long wxGenericListCtrl::FindItem( long start, wxUIntPtr data )

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

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

                            int WXUNUSED(direction))
 {
                            int WXUNUSED(direction))
 {

-    return 0;
+    return m_mainWin->FindItem( pt );

 }
 
 long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )
 }
 
 long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )


@@ -5106,7 +5145,7 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
     // window
     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
     {
     // window
     if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
     {

-        ResizeReportView(TRUE /* have header */);
+        ResizeReportView(true /* have header */);

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


@@ -5148,7 +5187,7 @@ bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
 bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )
 {
     m_mainWin->SortItems( fn, data );
 bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )
 {
     m_mainWin->SortItems( fn, data );

-    return TRUE;
+    return true;

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


@@ -5201,21 +5240,21 @@ bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour )
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );
     if (m_mainWin)
     {
         m_mainWin->SetBackgroundColour( colour );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )
 }
 
 bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
 {
     if ( !wxWindow::SetForegroundColour( colour ) )

-        return FALSE;
+        return false;

 
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );
 
     if (m_mainWin)
     {
         m_mainWin->SetForegroundColour( colour );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     if (m_headerWin)
     }
 
     if (m_headerWin)


@@ -5223,18 +5262,18 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour )
         m_headerWin->SetForegroundColour( colour );
     }
 
         m_headerWin->SetForegroundColour( colour );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericListCtrl::SetFont( const wxFont &font )
 {
     if ( !wxWindow::SetFont( font ) )
 }
 
 bool wxGenericListCtrl::SetFont( const wxFont &font )
 {
     if ( !wxWindow::SetFont( font ) )

-        return FALSE;
+        return false;

 
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );
 
     if (m_mainWin)
     {
         m_mainWin->SetFont( font );

-        m_mainWin->m_dirty = TRUE;
+        m_mainWin->m_dirty = true;

     }
 
     if (m_headerWin)
     }
 
     if (m_headerWin)


@@ -5245,7 +5284,7 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
 
     Refresh();
 
 
     Refresh();
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -5262,6 +5301,7 @@ wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
     // Use the same color scheme as wxListBox
     return wxListBox::GetClassDefaultAttributes(variant);
 #else
     // Use the same color scheme as wxListBox
     return wxListBox::GetClassDefaultAttributes(variant);
 #else

+    wxUnusedVar(variant);

     wxVisualAttributes attr;
     attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
     wxVisualAttributes attr;
     attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);


@@ -5290,7 +5330,7 @@ wxDropTarget *wxGenericListCtrl::GetDropTarget() const
 
 bool wxGenericListCtrl::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 wxGenericListCtrl::GetBackgroundColour() const
 }
 
 wxColour wxGenericListCtrl::GetBackgroundColour() const


@@ -5308,7 +5348,7 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 #else
 #if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
 #else

-    return FALSE;
+    return false;

 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS
 }
 


@@ -5316,10 +5356,18 @@ 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 ( FindFocus() != this )
+    if ( DoFindFocus() != this )

         m_mainWin->SetFocus();
 }
 
         m_mainWin->SetFocus();
 }
 

+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);
+}
+

 // ----------------------------------------------------------------------------
 // virtual list control support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // virtual list control support
 // ----------------------------------------------------------------------------


@@ -5335,9 +5383,9 @@ wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col
 
 int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {
 
 int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
 {

-    // same as above
-    wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );
-
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                wxT("List control has an image list, OnGetItemImage should be overridden."));

     return -1;
 }
 
     return -1;
 }