test for __WIN32__ and not __WIN95__ when defining wxUSE_OWNER_DRAWN and wxUSE_RICHED...

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

diff --git a/setup.h.in b/setup.h.in
index 6676237b331120b3e8514dfb6f45ae408f3f0b3f..f94f839451837ba4e00976ab87e9ff292011c349 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -541,13 +541,13 @@
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else