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
This commit is contained in:
@@ -541,13 +541,13 @@
|
|||||||
|
|
||||||
/* for some features we don't have dedicated configure switches, so just choose
|
/* for some features we don't have dedicated configure switches, so just choose
|
||||||
* the common values automatically */
|
* the common values automatically */
|
||||||
#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
|
#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
|
||||||
#define wxUSE_OWNER_DRAWN 1
|
#define wxUSE_OWNER_DRAWN 1
|
||||||
#else
|
#else
|
||||||
#define wxUSE_OWNER_DRAWN 0
|
#define wxUSE_OWNER_DRAWN 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||||
#define wxUSE_RICHEDIT 1
|
#define wxUSE_RICHEDIT 1
|
||||||
#define wxUSE_RICHEDIT2 1
|
#define wxUSE_RICHEDIT2 1
|
||||||
#else
|
#else
|
||||||
|
Reference in New Issue
Block a user