first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/setup.h

@@ -15,7 +15,16 @@
 #error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
 #endif
 
-#ifdef __WXBASE__
+// wxUniversal is defined together with one of other ports, so test for it
+// first
+#ifdef __WXUNIVERSAL__
+#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
+#include "wx/univd/setup.h"
+#else
+#include "wx/univ/setup.h"
+#endif
+
+#elif defined(__WXBASE__)
 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/based/setup.h"
 #else
@@ -56,5 +65,7 @@
 #endif
 
 #endif
-#endif
-	/* _WX_SETUP_H_BASE_ */
+
+#include "chkconf.h"
+
+#endif /* _WX_SETUP_H_BASE_ */