X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ac03f5aa993f48dcff56d42525c1e362db47e3..e10972f6c1436a6dcd5427b4e3913bb0f398e045:/include/wx/listctrl.h?ds=sidebyside diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index ef4e2d3763..de43556b2c 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -22,16 +22,16 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration // ---------------------------------------------------------------------------- -#if defined(__WIN32__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/listctrl.h" -#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) - #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 @@ -40,7 +40,7 @@ extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[]; // wxListView: a class which provides a better API for list control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListView : public wxListCtrl +class WXDLLIMPEXP_CORE wxListView : public wxListCtrl { public: wxListView() { }