Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -975,7 +975,7 @@
|
||||
//
|
||||
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
|
||||
// or can't compile <richedit.h>
|
||||
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||
#define wxUSE_RICHEDIT 1
|
||||
|
||||
// TODO: This should be ifdef'ed for any compilers that don't support
|
||||
@@ -1086,16 +1086,6 @@
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
#endif // __SALFORDC__
|
||||
|
||||
#ifdef __TWIN32__
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
|
||||
#endif // __TWIN32__
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
|
@@ -1012,7 +1012,7 @@
|
||||
//
|
||||
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
|
||||
// or can't compile <richedit.h>
|
||||
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||
#define wxUSE_RICHEDIT 1
|
||||
|
||||
// TODO: This should be ifdef'ed for any compilers that don't support
|
||||
@@ -1134,16 +1134,6 @@
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
#endif // __SALFORDC__
|
||||
|
||||
#ifdef __TWIN32__
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
|
||||
#endif // __TWIN32__
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
|
@@ -975,7 +975,7 @@
|
||||
//
|
||||
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
|
||||
// or can't compile <richedit.h>
|
||||
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||
#define wxUSE_RICHEDIT 1
|
||||
|
||||
// TODO: This should be ifdef'ed for any compilers that don't support
|
||||
@@ -1091,16 +1091,6 @@
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
#endif // __SALFORDC__
|
||||
|
||||
#ifdef __TWIN32__
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
|
||||
#endif // __TWIN32__
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
|
@@ -1011,7 +1011,7 @@
|
||||
//
|
||||
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
|
||||
// or can't compile <richedit.h>
|
||||
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||
#define wxUSE_RICHEDIT 1
|
||||
|
||||
// TODO: This should be ifdef'ed for any compilers that don't support
|
||||
@@ -1133,16 +1133,6 @@
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
#endif // __SALFORDC__
|
||||
|
||||
#ifdef __TWIN32__
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
|
||||
#endif // __TWIN32__
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
|
@@ -76,10 +76,6 @@
|
||||
#endif
|
||||
#endif /* WINE */
|
||||
|
||||
#if defined(TWIN32) && !defined(__TWIN32__)
|
||||
#define __TWIN32__
|
||||
#endif /* Twin32 */
|
||||
|
||||
/*
|
||||
Include wx/setup.h for the Unix platform defines generated by configure and
|
||||
the library compilation options
|
||||
|
@@ -1112,7 +1112,7 @@
|
||||
//
|
||||
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
|
||||
// or can't compile <richedit.h>
|
||||
#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
|
||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||
// TODO: This should be ifdef'ed for any compilers that don't support
|
||||
// RichEdit 2.0 but do have RichEdit 1.0...
|
||||
#define wxUSE_RICHEDIT 0 // currently not supported
|
||||
@@ -1212,14 +1212,6 @@
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
#endif // __SALFORDC__
|
||||
|
||||
#ifdef __TWIN32__
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
#endif // __TWIN32__
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
|
Reference in New Issue
Block a user