#if defined(__VISUALC__) || \
defined(__DMC__) || \
defined(__VISAGECPP__) || \
- defined(__MWERKS__) || \
defined(__WATCOMC__) || \
defined(__BORLANDC__)
#include "wx/chartype.h"
// include standard Windows headers
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
#include "wx/msw/wrapwin.h"
+ #include "wx/msw/private.h"
+#endif
+#if defined(__WXMSW__)
#include "wx/msw/wrapcctl.h"
#include "wx/msw/wrapcdlg.h"
- #include "wx/msw/private.h"
#include "wx/msw/missing.h"
#endif