ignore warning 4535 for VC8 too as it still seems to be harmless

[wxWidgets.git] / include / wx / listctrl.h

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index f9b4629f211a3a77f1de2cf1d5ca6583f615c4e3..f8385b6ab58216768232a3b64d74b521912167ca 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -28,14 +28,12 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-    #include "wx/generic/listctrl.h"
-#endif
-

 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/carbon/listctrl.h"
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/carbon/listctrl.h"

+#else
+    #include "wx/generic/listctrl.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -86,7 +84,7 @@ public:
         { return GetNextSelected(-1); }
 
     // return true if the item is selected
         { return GetNextSelected(-1); }
 
     // return true if the item is selected

-    bool IsSelected(long index)
+    bool IsSelected(long index) const

         { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; }
 
     // columns
         { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; }
 
     // columns