Compile fix for Universal

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 99b530c7d72e1cb22929b705d057ed3244f53ac6..d83f686fbfc7125044117896efe0dfbd79fd0c55 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -23,37 +23,30 @@
 
 #if wxUSE_LISTCTRL
 
 
 #if wxUSE_LISTCTRL
 

-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/app.h"
-    #include "wx/dcscreen.h"
-    #include "wx/textctrl.h"
-#endif
-
-// under Win32 we always use the native version and also may use the generic
-// one, however some things should be done only if we use only the generic
-// version
-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
-    #define HAVE_NATIVE_LISTCTRL
-#endif
-
-// if we have the native control, wx/listctrl.h declares it and not this one
-#ifdef HAVE_NATIVE_LISTCTRL
-    #include "wx/generic/listctrl.h"
-#else // !HAVE_NATIVE_LISTCTRL
-    #include "wx/listctrl.h"
+#include "wx/listctrl.h"

 
 

+#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)

     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
     IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
     IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
     IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
 
     IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)

-#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/scrolwin.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/dynarray.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcscreen.h"
+    #include "wx/math.h"
+#endif

 
 

+#include "wx/imaglist.h"

 #include "wx/selstore.h"
 #include "wx/renderer.h"
 #include "wx/selstore.h"
 #include "wx/renderer.h"

-#include "wx/math.h"

 
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
     #include "wx/mac/private.h"


@@ -65,35 +58,6 @@
 #define _USE_VISATTR 0
 
 
 #define _USE_VISATTR 0
 
 

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
-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)
-#if WXWIN_COMPATIBILITY_2_4
-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_INSERT_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -157,7 +121,7 @@ WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListItemData
+class wxListItemData

 {
 public:
     wxListItemData(wxListMainWindow *owner);
 {
 public:
     wxListItemData(wxListMainWindow *owner);


@@ -227,7 +191,7 @@ protected:
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListHeaderData : public wxObject
+class wxListHeaderData : public wxObject

 {
 public:
     wxListHeaderData();
 {
 public:
     wxListHeaderData();


@@ -408,7 +372,7 @@ WX_DEFINE_OBJARRAY(wxListLineDataArray)
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListHeaderWindow : public wxWindow
+class wxListHeaderWindow : public wxWindow

 {
 protected:
     wxListMainWindow  *m_owner;
 {
 protected:
     wxListMainWindow  *m_owner;


@@ -465,7 +429,7 @@ private:
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListRenameTimer: public wxTimer
+class wxListRenameTimer: public wxTimer

 {
 private:
     wxListMainWindow *m_owner;
 {
 private:
     wxListMainWindow *m_owner;


@@ -479,7 +443,7 @@ public:
 // wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
 //-----------------------------------------------------------------------------
 
 // wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListTextCtrlWrapper : public wxEvtHandler
+class wxListTextCtrlWrapper : public wxEvtHandler

 {
 public:
     // NB: text must be a valid object but not Create()d yet
 {
 public:
     // NB: text must be a valid object but not Create()d yet


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

-    void SetImageList( wxImageListType *imageList, int which );
+    void SetImageList( wxImageList *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 );
 


@@ -706,7 +670,7 @@ public:
     long FindItem( long start, const wxString& str, bool partial = false );
     long FindItem( long start, wxUIntPtr data);
     long FindItem( const wxPoint& pt );
     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 );
+    long HitTest( int x, int y, int &flags ) const;

     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     int GetItemWidthWithImage(wxListItem * item);
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     int GetItemWidthWithImage(wxListItem * item);


@@ -780,8 +744,8 @@ public:
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;

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

     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;
     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;


@@ -924,7 +888,7 @@ void wxListItemData::SetItem( const wxListItem &info )
     if ( info.HasAttributes() )
     {
         if ( m_attr )
     if ( info.HasAttributes() )
     {
         if ( m_attr )

-            *m_attr = *info.GetAttributes();
+            m_attr->AssignFrom(*info.GetAttributes());

         else
             m_attr = new wxListItemAttr(*info.GetAttributes());
     }
         else
             m_attr = new wxListItemAttr(*info.GetAttributes());
     }


@@ -960,7 +924,7 @@ 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()).Contains(x, y);

 }
 
 int wxListItemData::GetX() const
 }
 
 int wxListItemData::GetX() const


@@ -1416,7 +1380,11 @@ bool wxListLineData::SetAttributes(wxDC *dc,
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )
     // arithmetics on wxColour, unfortunately)
     wxColour colText;
     if ( highlighted )

+#ifdef __WXMAC__
+        colText = *wxWHITE;
+#else

         colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
         colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

+#endif

     else if ( attr && attr->HasTextColour() )
         colText = attr->GetTextColour();
     else
     else if ( attr && attr->HasTextColour() )
         colText = attr->GetTextColour();
     else


@@ -1697,11 +1665,26 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
 

-    int x;
-    m_owner->GetViewStart( &x, NULL );
+    int view_start;
+    m_owner->GetViewStart( &view_start, NULL );
+
+
+    int org_x = 0;
+    int org_y = 0;
+    dc.GetDeviceOrigin( &org_x, &org_y );

 
     // account for the horz scrollbar offset
 
     // account for the horz scrollbar offset

-    dc.SetDeviceOrigin( -x * xpix, 0 );
+#ifdef __WXGTK__
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+    {
+        // Maybe we just have to check for m_signX
+        // in the DC, but I leave the #ifdef __WXGTK__
+        // for now
+        dc.SetDeviceOrigin( org_x + (view_start * xpix), org_y );
+    }
+    else
+#endif
+        dc.SetDeviceOrigin( org_x - (view_start * xpix), org_y );

 }
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 }
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )


@@ -1760,7 +1743,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
         int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
         const int image = item.m_image;
         static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
         int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
         const int image = item.m_image;

-        wxImageListType *imageList;
+        wxImageList *imageList;

         if ( image != -1 )
         {
             imageList = m_owner->m_small_image_list;
         if ( image != -1 )
         {
             imageList = m_owner->m_small_image_list;


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

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

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


@@ -2203,23 +2186,39 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

+
+#ifdef __WXMAC__
+    // OS X sel item highlight color differs from text highlight color, which is
+    // what wxSYS_COLOUR_HIGHLIGHT returns. 
+    RGBColor hilight;
+    GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &hilight);
+    m_highlightBrush = new wxBrush( wxColour(hilight.red, hilight.green, hilight.blue ), wxSOLID );
+#else

     m_highlightBrush = new wxBrush
     m_highlightBrush = new wxBrush

-                           (
+                         (

                             wxSystemSettings::GetColour
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
                             wxSOLID
                             wxSystemSettings::GetColour
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
                             wxSOLID

-                           );
+                         );
+#endif

 
 

+#ifdef __WXMAC__
+    // on Mac, this color also differs from the wxSYS_COLOUR_BTNSHADOW, enough to be noticable.
+    // I don't know if BTNSHADOW is appropriate in other contexts, so I'm just changing it here.
+    GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &hilight);
+    m_highlightUnfocusedBrush = new wxBrush( wxColour(hilight.red, hilight.green, hilight.blue ), wxSOLID );
+#else

     m_highlightUnfocusedBrush = new wxBrush
     m_highlightUnfocusedBrush = new wxBrush

-                                    (
-                                       wxSystemSettings::GetColour
-                                       (
-                                           wxSYS_COLOUR_BTNSHADOW
-                                       ),
-                                       wxSOLID
-                                    );
+                              (
+                                 wxSystemSettings::GetColour
+                                 (
+                                     wxSYS_COLOUR_BTNSHADOW
+                                 ),
+                                 wxSOLID
+                              );
+#endif

 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 
 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 


@@ -2380,7 +2379,7 @@ long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
 
     wxListLineData *ld = GetLine(line);
 
 
     wxListLineData *ld = GetLine(line);
 

-    if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
+    if ( ld->HasImage() && GetLineIconRect(line).Contains(x, y) )

         return wxLIST_HITTEST_ONITEMICON;
 
     // VS: Testing for "ld->HasText() || InReportView()" instead of
         return wxLIST_HITTEST_ONITEMICON;
 
     // VS: Testing for "ld->HasText() || InReportView()" instead of


@@ -2391,7 +2390,7 @@ long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);
 
         wxRect rect = InReportView() ? GetLineRect(line)
                                      : GetLineLabelRect(line);
 

-        if ( rect.Inside(x, y) )
+        if ( rect.Contains(x, y) )

             return wxLIST_HITTEST_ONITEMLABEL;
     }
 
             return wxLIST_HITTEST_ONITEMLABEL;
     }
 


@@ -2628,9 +2627,9 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
 
         wxRect rectLine;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
 
         wxRect rectLine;

-        wxCoord xOrig, yOrig;
-        CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
-
+        int xOrig = dc.LogicalToDeviceX( 0 );
+        int yOrig = dc.LogicalToDeviceY( 0 );
+        

         // tell the caller cache to cache the data
         if ( IsVirtual() )
         {
         // tell the caller cache to cache the data
         if ( IsVirtual() )
         {


@@ -2646,7 +2645,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             rectLine = GetLineRect(line);
 
         {
             rectLine = GetLineRect(line);
 

-            if ( !IsExposed(rectLine.x - xOrig, rectLine.y - yOrig,
+
+            if ( !IsExposed(rectLine.x + xOrig, rectLine.y + yOrig,

                             rectLine.width, rectLine.height) )
             {
                 // don't redraw unaffected lines to avoid flicker
                             rectLine.width, rectLine.height) )
             {
                 // don't redraw unaffected lines to avoid flicker


@@ -3263,6 +3263,14 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
     const int pageSize = GetCountPerPage();
     wxCHECK_RET( pageSize, _T("should have non zero page size") );
 
     const int pageSize = GetCountPerPage();
     wxCHECK_RET( pageSize, _T("should have non zero page size") );
 

+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+    {
+        if (event.GetKeyCode() == WXK_RIGHT)
+            event.m_keyCode = WXK_LEFT;
+        else if (event.GetKeyCode() == WXK_LEFT)
+            event.m_keyCode = WXK_RIGHT;
+    }
+

     switch ( event.GetKeyCode() )
     {
         case WXK_UP:
     switch ( event.GetKeyCode() )
     {
         case WXK_UP:


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

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

 {
     m_dirty = true;
 
 {
     m_dirty = true;
 


@@ -3958,6 +3966,8 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const
 
 void wxListMainWindow::RecalculatePositions(bool noRefresh)
 {
 
 void wxListMainWindow::RecalculatePositions(bool noRefresh)
 {

+    const int lineHeight = GetLineHeight();
+

     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 
     wxClientDC dc( this );
     dc.SetFont( GetFont() );
 


@@ -3991,8 +4001,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 
         clientHeight;
     GetSize( &clientWidth, &clientHeight );
 

-    const int lineHeight = GetLineHeight();
-

     if ( InReportView() )
     {
         // all lines have the same height and we scroll one line per step
     if ( InReportView() )
     {
         // all lines have the same height and we scroll one line per step


@@ -4431,7 +4439,7 @@ long wxListMainWindow::FindItem( const wxPoint& pt )
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-long wxListMainWindow::HitTest( int x, int y, int &flags )
+long wxListMainWindow::HitTest( int x, int y, int &flags ) const

 {
     CalcUnscrolledPosition( x, y, &x, &y );
 
 {
     CalcUnscrolledPosition( x, y, &x, &y );
 


@@ -4694,9 +4702,9 @@ END_EVENT_TABLE()
 
 wxGenericListCtrl::wxGenericListCtrl()
 {
 
 wxGenericListCtrl::wxGenericListCtrl()
 {

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

 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =


@@ -4766,7 +4774,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 {
     m_imageListNormal =
     m_imageListSmall =
 {
     m_imageListNormal =
     m_imageListSmall =

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

     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;


@@ -5132,7 +5140,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const
     return m_mainWin->GetNextItem( item, geom, state );
 }
 
     return m_mainWin->GetNextItem( item, geom, state );
 }
 

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

 {
     if (which == wxIMAGE_LIST_NORMAL)
         return m_imageListNormal;
 {
     if (which == wxIMAGE_LIST_NORMAL)
         return m_imageListNormal;


@@ -5141,10 +5149,10 @@ wxImageListType *wxGenericListCtrl::GetImageList(int which) const
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 

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

 }
 
 }
 

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

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


@@ -5171,7 +5179,7 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
     m_mainWin->SetImageList( imageList, which );
 }
 
     m_mainWin->SetImageList( imageList, which );
 }
 

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

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


@@ -5255,7 +5263,8 @@ long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& pt,
     return m_mainWin->FindItem( pt );
 }
 
     return m_mainWin->FindItem( pt );
 }
 

-long wxGenericListCtrl::HitTest( const wxPoint &point, int &flags )
+// TODO: sub item hit testing
+long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *) const

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


@@ -5447,10 +5456,6 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     return true;
 }
 
     return true;
 }
 

-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-

 // static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 // static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)