X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2614da437cc1e640931d16b1919670017ab8b337..15f7c30516facfb272fc116aec4d3f9c3a9de085:/include/wx/listctrl.h?ds=sidebyside

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index f9b4629f21..ef4e2d3763 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -22,20 +22,18 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // 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__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
     #include "wx/mac/carbon/listctrl.h"
+#else
+    #include "wx/generic/listctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -86,7 +84,7 @@ public:
         { 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