X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/listctrl.h?ds=sidebyside

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index db57cf04df..ccf2a0548f 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -22,7 +22,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
@@ -30,8 +30,8 @@ extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[];
 
 #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
@@ -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() { }