moved wxSTRINGIZE to defs.h and made it work with macro argument, so that it can...

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index ba631c79854d4bc1fe58e64b3d690f7174a092a8..d92e26d7b00f539a7a36015c4ff003d1033d6d31 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -22,16 +22,20 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxListCtrlNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) 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"
-#else
-    #include "wx/generic/listctrl.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/carbon/listctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -82,7 +86,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