From 9f8ffc5f8bcf0f127bfefc3e2d9b1b02a20489c3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 14 Dec 2006 02:07:03 +0000 Subject: [PATCH] test for __WIN32__ and not __WIN95__ when defining wxUSE_OWNER_DRAWN and wxUSE_RICHEDIT; don't even define __WIN95__ any more as it's not used anywhere git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- setup.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.h.in b/setup.h.in index 6676237b33..f94f839451 100644 --- 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 -- 2.47.2