X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a3a6dc63c36641ad3104a080edaf7fdda512a7..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/listctrl.h diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index d92e26d7b0..de43556b2c 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -22,27 +22,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() { }