From fc5e41a7baad3f7800df1a5c6e57beb5d814ce2d Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Mon, 22 May 2000 02:34:17 +0000 Subject: [PATCH] made Robert's fix for wxBase too, and cleaned a couple of typos git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/setup.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/wx/setup.h b/include/wx/setup.h index 9ba3a2f367..a38f59eb9f 100644 --- a/include/wx/setup.h +++ b/include/wx/setup.h @@ -16,37 +16,45 @@ #endif #ifdef __WXBASE__ +#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) +#include "wx/based/setup.h" +#else #include "wx/base/setup.h" +#endif + #elif defined(__VMS) #include "wx_root:[wxwindows]setup.h" #elif defined(__WXMSW__) #include "wx/msw/setup.h" #elif defined(__WXMAC__) #include "wx/mac/setup.h" + #elif defined(__WXQT__) #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) #include "wx/qtd/setup.h" #else #include "wx/qt/setup.h" #endif -#include "wx/qt/setup.h" + #elif defined(__WXMOTIF__) #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) #include "wx/motifd/setup.h" #else -#include "wx/motifd/setup.h" +#include "wx/motif/setup.h" #endif + #elif defined(__WXPM__) #include "wx/os2/setup.h" #elif defined(__WXSTUBS__) #include "wx/stubs/setup.h" + #elif defined(__WXGTK__) #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) #include "wx/gtkd/setup.h" #else #include "wx/gtk/setup.h" #endif -#endif +#endif #endif /* _WX_SETUP_H_BASE_ */