made wxHeaderCtrl::GetColumn() const to get rid of the const_cast<>s

[wxWidgets.git] / include / wx / listctrl.h

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index ef4e2d3763167ecc8f13771fb9e1f3c0b048a516..d24c3007de0c29518e4eec30b3b08e554306af50 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -22,7 +22,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];

 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 
 // ----------------------------------------------------------------------------
 // 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"
 
 #if defined(__WIN32__) && !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/carbon/listctrl.h"

 #else
     #include "wx/generic/listctrl.h"
 #endif
 #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
 // ----------------------------------------------------------------------------
 
 // wxListView: a class which provides a better API for list control
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListView : public wxListCtrl
+class WXDLLIMPEXP_CORE wxListView : public wxListCtrl

 {
 public:
     wxListView() { }
 {
 public:
     wxListView() { }