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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index f9b4629f21..51aca4a1b1 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.12.99
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,27 +21,25 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-    #include "wx/generic/listctrl.h"
-#endif
-
-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/carbon/listctrl.h"
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
+    #include "wx/osx/listctrl.h"
+#else
+    #include "wx/generic/listctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // wxListView: a class which provides a better API for list control
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxListView : public wxListCtrl
+class WXDLLIMPEXP_CORE wxListView : public wxListCtrl
 {
 public:
     wxListView() { }
@@ -86,7 +83,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