moving tlw list up, cleanup

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index d92e26d7b00f539a7a36015c4ff003d1033d6d31..ef4e2d3763167ecc8f13771fb9e1f3c0b048a516 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -22,20 +22,18 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-    #include "wx/generic/listctrl.h"
-#endif
-
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
     #include "wx/mac/carbon/listctrl.h"
+#else
+    #include "wx/generic/listctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------