Warning fixes for VC++ 5.0

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 50f4ec9c71241c1486b6a53750531869535a4667..d82d81b3327b097e633e1b32eb9eb0a351758a64 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -18,14 +18,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_LISTCTRL
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_LISTCTRL
 
 #ifndef WX_PRECOMP

-    #include "wx/app.h"

     #include "wx/dynarray.h"
     #include "wx/dynarray.h"

+    #include "wx/app.h"

     #include "wx/dcscreen.h"
     #include "wx/textctrl.h"
 #endif
     #include "wx/dcscreen.h"
     #include "wx/textctrl.h"
 #endif


@@ -413,7 +413,7 @@ class WXDLLEXPORT wxListHeaderWindow : public wxWindow
 protected:
     wxListMainWindow  *m_owner;
     const wxCursor    *m_currentCursor;
 protected:
     wxListMainWindow  *m_owner;
     const wxCursor    *m_currentCursor;

-    const wxCursor    *m_resizeCursor;
+    wxCursor          *m_resizeCursor;

     bool               m_isDragging;
 
     // column being resized or -1
     bool               m_isDragging;
 
     // column being resized or -1


@@ -5255,7 +5255,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 *)

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