Peaceful solution to wxCheckListBox inheritance in WinCE and wxListBox::Clear() ambig...

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 50f4ec9c71241c1486b6a53750531869535a4667..4eccdff7f6ed82f798fa40aaf89705a0d9aadc6b 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -18,18 +18,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_LISTCTRL
 
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/dynarray.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
@@ -51,6 +44,14 @@
     IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
 #endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/app.h"
+    #include "wx/dcscreen.h"
+    #include "wx/textctrl.h"
+    #include "wx/listbox.h"
+#endif
+
 #include "wx/selstore.h"
 #include "wx/renderer.h"
 #include "wx/math.h"
@@ -413,7 +414,7 @@ class WXDLLEXPORT wxListHeaderWindow : public wxWindow
 protected:
     wxListMainWindow  *m_owner;
     const wxCursor    *m_currentCursor;
-    const wxCursor    *m_resizeCursor;
+    wxCursor          *m_resizeCursor;
     bool               m_isDragging;
 
     // column being resized or -1
@@ -5255,7 +5256,8 @@ long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& 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 *)
 {
     return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
 }
@@ -5447,10 +5449,6 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     return true;
 }
 
-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-
 // static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)