wxUSE_UNICODE_MSLU is MSW-specific so shouldn't be in setup_inc.h: removed and regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -14,7 +14,6 @@
|
||||
|
||||
|
||||
/* --- start common options --- */
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// global settings
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -131,7 +130,7 @@
|
||||
// Default is 1 if supported by the compiler.
|
||||
//
|
||||
// Recommended setting: 1, set to 0 if your programs never crash
|
||||
#define wxUSE_STACKWALKER 0
|
||||
#define wxUSE_STACKWALKER 1
|
||||
|
||||
// Set this to 1 to compile in wxDebugReport class which allows you to create
|
||||
// and optionally upload to your web site a debug report consisting of back
|
||||
@@ -162,22 +161,6 @@
|
||||
#define wxUSE_UNICODE 0
|
||||
#endif
|
||||
|
||||
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
|
||||
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
|
||||
// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
|
||||
// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
|
||||
// that you will have to modify the makefiles to include unicows.lib import
|
||||
// library as the first library (see installation instructions in install.txt
|
||||
// to learn how to do it when building the library or samples).
|
||||
//
|
||||
// If your compiler doesn't have unicows.lib, you can get a version of it at
|
||||
// http://libunicows.sourceforge.net
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
|
||||
// compiling the program in Unicode mode. More precisely, it will be possible
|
||||
// to construct wxString from a wide (Unicode) string and convert any wxString
|
||||
@@ -270,7 +253,7 @@
|
||||
// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
|
||||
// Enable conversion to standard C++ string if 1.
|
||||
// Enable conversion to standard C++ string if 1.
|
||||
#define wxUSE_STD_STRING 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -490,20 +473,6 @@
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use QuickTime
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
|
||||
#define wxUSE_QUICKTIME 0
|
||||
|
||||
// Use DirectShow (requires linkage to strmiids.lib)
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
|
||||
#define wxUSE_DIRECTSHOW 0
|
||||
|
||||
// Use GStreamer for Unix (req a lot of dependancies)
|
||||
//
|
||||
// Default is 0
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#define _WX_SETUP_H_
|
||||
|
||||
/* --- start common options --- */
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// global settings
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -161,22 +160,6 @@
|
||||
#define wxUSE_UNICODE 0
|
||||
#endif
|
||||
|
||||
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
|
||||
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
|
||||
// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
|
||||
// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
|
||||
// that you will have to modify the makefiles to include unicows.lib import
|
||||
// library as the first library (see installation instructions in install.txt
|
||||
// to learn how to do it when building the library or samples).
|
||||
//
|
||||
// If your compiler doesn't have unicows.lib, you can get a version of it at
|
||||
// http://libunicows.sourceforge.net
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
|
||||
// compiling the program in Unicode mode. More precisely, it will be possible
|
||||
// to construct wxString from a wide (Unicode) string and convert any wxString
|
||||
@@ -269,7 +252,7 @@
|
||||
// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
|
||||
// Enable conversion to standard C++ string if 1.
|
||||
// Enable conversion to standard C++ string if 1.
|
||||
#define wxUSE_STD_STRING 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -489,20 +472,6 @@
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use QuickTime
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
|
||||
#define wxUSE_QUICKTIME 0
|
||||
|
||||
// Use DirectShow (requires linkage to strmiids.lib)
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
|
||||
#define wxUSE_DIRECTSHOW 0
|
||||
|
||||
// Use GStreamer for Unix (req a lot of dependancies)
|
||||
//
|
||||
// Default is 0
|
||||
@@ -1062,6 +1031,24 @@
|
||||
// Windows-only settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
|
||||
// and want to run your programs under Windows 9x and not only NT/2000/XP.
|
||||
// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
|
||||
// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
|
||||
// that you will have to modify the makefiles to include unicows.lib import
|
||||
// library as the first library (see installation instructions in install.txt
|
||||
// to learn how to do it when building the library or samples).
|
||||
//
|
||||
// If your compiler doesn't have unicows.lib, you can get a version of it at
|
||||
// http://libunicows.sourceforge.net
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
|
||||
#ifndef wxUSE_UNICODE_MSLU
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
#endif
|
||||
|
||||
// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
|
||||
// will override some other settings (see below)
|
||||
//
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#define _WX_SETUP_H_
|
||||
|
||||
/* --- start common options --- */
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// global settings
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -161,22 +160,6 @@
|
||||
#define wxUSE_UNICODE 0
|
||||
#endif
|
||||
|
||||
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
|
||||
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
|
||||
// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
|
||||
// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
|
||||
// that you will have to modify the makefiles to include unicows.lib import
|
||||
// library as the first library (see installation instructions in install.txt
|
||||
// to learn how to do it when building the library or samples).
|
||||
//
|
||||
// If your compiler doesn't have unicows.lib, you can get a version of it at
|
||||
// http://libunicows.sourceforge.net
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
|
||||
// compiling the program in Unicode mode. More precisely, it will be possible
|
||||
// to construct wxString from a wide (Unicode) string and convert any wxString
|
||||
@@ -269,7 +252,7 @@
|
||||
// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
|
||||
// Enable converion to standard C++ string if 1.
|
||||
// Enable conversion to standard C++ string if 1.
|
||||
#define wxUSE_STD_STRING 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -489,20 +472,6 @@
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use QuickTime
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
|
||||
#define wxUSE_QUICKTIME 0
|
||||
|
||||
// Use DirectShow (requires linkage to strmiids.lib)
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
|
||||
#define wxUSE_DIRECTSHOW 0
|
||||
|
||||
// Use GStreamer for Unix (req a lot of dependancies)
|
||||
//
|
||||
// Default is 0
|
||||
|
||||
@@ -156,22 +156,6 @@
|
||||
#define wxUSE_UNICODE 0
|
||||
#endif
|
||||
|
||||
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
|
||||
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
|
||||
// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
|
||||
// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
|
||||
// that you will have to modify the makefiles to include unicows.lib import
|
||||
// library as the first library (see installation instructions in install.txt
|
||||
// to learn how to do it when building the library or samples).
|
||||
//
|
||||
// If your compiler doesn't have unicows.lib, you can get a version of it at
|
||||
// http://libunicows.sourceforge.net
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
|
||||
// compiling the program in Unicode mode. More precisely, it will be possible
|
||||
// to construct wxString from a wide (Unicode) string and convert any wxString
|
||||
|
||||
@@ -144,7 +144,6 @@
|
||||
|
||||
/* --- start common options --- */
|
||||
|
||||
|
||||
#ifndef wxUSE_GUI
|
||||
#define wxUSE_GUI 0
|
||||
#endif
|
||||
@@ -177,8 +176,6 @@
|
||||
#define wxUSE_UNICODE 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
#define wxUSE_WCHAR_T 0
|
||||
|
||||
|
||||
@@ -278,10 +275,6 @@
|
||||
|
||||
#define wxUSE_MEDIACTRL 0
|
||||
|
||||
#define wxUSE_QUICKTIME 0
|
||||
|
||||
#define wxUSE_DIRECTSHOW 0
|
||||
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
#define wxUSE_XRC 0
|
||||
@@ -507,6 +500,8 @@
|
||||
#define wxUSE_RICHEDIT2 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
/*
|
||||
* Supports bool type
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user