#define __WIN95__
#endif
-#ifdef __GNUWIN32__
+//#ifdef _MSC_VER
+#define __VISUALC__ _MSC_VER
+//#endif
+
#define wxID_OK 5100
#define wxID_CANCEL 5101
#define wxID_APPLY 5102
#define wxID_YES 5103
#define wxID_NO 5104
-/* #include <wx/msw/gnuwin32/winresrc.h> */
-#else
-#include <wx/defs.h>
-/* #include <windows.h> */
-#endif
#include "resource.h"
-#if !defined(__GNUWIN32__)
+#if !defined(__GNUWIN32__) && !defined(__BORLANDC__)
#include <commctrl.h>
#endif