X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2bc1d69812f8fc3f6ae24508a9d007ad5d00ede..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/listctrl.h?ds=sidebyside diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index 56deddfebf..ccf2a0548f 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -22,24 +22,25 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration // ---------------------------------------------------------------------------- -#include "wx/generic/listctrl.h" #if defined(__WIN32__) && !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() { } @@ -83,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