[Commits] (heikki) Wonder why this is not automatically updated
from include/wx/msw/setup.h...
commits at osafoundation.org
commits at osafoundation.org
Wed Dec 8 16:09:15 PST 2004
Commit by: heikki
Modified files:
internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h 1.2 1.3
Log message:
Wonder why this is not automatically updated from include/wx/msw/setup.h...
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
Index: internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h
diff -u internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h:1.2 internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h:1.3
--- internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h:1.2 Wed Sep 22 14:25:11 2004
+++ internal/wxPython-2.5/lib/vc_dll/mswd/wx/setup.h Wed Dec 8 16:09:14 2004
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id: setup.h,v 1.2 2004/09/22 21:25:11 heikki Exp $
+// RCS-ID: $Id: setup.h,v 1.3 2004/12/09 00:09:14 heikki Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@
// Generic comment about debugging settings: they are very useful if you don't
// use any other memory leak detection tools such as Purify/BoundsChecker, but
// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you
// may prefer to use it instead of built in memory debugging code because it is
// faster and more fool proof.
//
@@ -126,7 +126,8 @@
// Default is 1
//
// Recommended setting: 1 if your compiler supports it.
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || \
+ (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
#define wxUSE_ON_FATAL_EXCEPTION 1
#else
#define wxUSE_ON_FATAL_EXCEPTION 0
@@ -136,7 +137,7 @@
// Unicode support
// ----------------------------------------------------------------------------
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
// defined as wchar_t, wxString will use Unicode internally. If you set this
// to 1, you must use wxT() macro for all literal strings in the program.
//
@@ -151,7 +152,7 @@
#define wxUSE_UNICODE 0
#endif
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// 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
@@ -253,7 +254,7 @@
// Recommended setting: 0 unless you do plan to develop MT applications
#define wxUSE_THREADS 1
-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes
#define wxUSE_STREAMS 1
// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
@@ -395,15 +396,16 @@
#define wxUSE_ZIPSTREAM 1
// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG and wxUSE_GZSTREAM.
+// wxUSE_LIBPNG
#define wxUSE_ZLIB 1
+// NB: obsolete, as of v2.5.3.1
// Set to 1 to compile wxGzipInput/OutputStream classes. Requires wxUSE_ZLIB.
-#define wxUSE_GZSTREAM 1
+// #define wxUSE_GZSTREAM 1
// If enabled, the code written by Apple will be used to write, in a portable
// way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
+// from wxWidgets one.
//
// Default is 1.
//
@@ -461,13 +463,24 @@
// wxSound class
#define wxUSE_SOUND 1
+// Use wxWidget's XRC XML-based resource system. Recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (requires wxUSE_XML)
+#define wxUSE_XRC 1
+
// XML parsing classes. Note that their API will change in the future, so
// using wxXmlDocument and wxXmlNode in your app is not recommended.
//
// Default is 1
//
-// Recommended setting: 1 (needed by XRC)
-#define wxUSE_XML 1
+// Recommended setting: 1 (required by XRC)
+#if wxUSE_XRC || 1
+# define wxUSE_XML 1
+#else
+# define wxUSE_XML 0
+#endif
// ----------------------------------------------------------------------------
// Individual GUI controls
@@ -497,7 +510,7 @@
// Recommended setting: 1 (may be set to 0)
#define wxUSE_TIPWINDOW 1
-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are
// all switched on by default but may be disabled if you are sure that your
// program (including any standard dialogs it can show!) doesn't need them and
// if you desperately want to save some space. If you use any of these you must
@@ -557,11 +570,11 @@
#define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 1
-// this setting is obsolete, value is ignored
-#define wxUSE_BUTTONBAR 1
+// NB: obsolete, as of v2.5.2 ???
+// #define wxUSE_BUTTONBAR 1
// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used ot logically organise the data presented to the user instead of
+// may be used to logically organise the data presented to the user instead of
// putting everything in one huge dialog. It replaces wxTabControl and related
// classes of wxWin 1.6x.
//
@@ -578,6 +591,14 @@
// Recommended setting: 1
#define wxUSE_LISTBOOK 1
+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CHOICEBOOK 1
+
// wxTabDialog is a generic version of wxNotebook but it is incompatible with
// the new class. It shouldn't be used in new code.
//
@@ -677,6 +698,7 @@
// common dialogs
// ----------------------------------------------------------------------------
+// NB: obsolete, as of v2.5.3.1
// Define 1 to use generic dialogs in Windows, even though they duplicate
// native common dialog (e.g. wxColourDialog). This is mainly useful for
// testing.
@@ -684,7 +706,7 @@
// Default is 0
//
// Recommended setting: 0
-#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
+// #define wxUSE_GENERIC_DIALOGS_IN_MSW 0
// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
// file selector, printer dialog). Switching this off also switches off the
@@ -789,13 +811,21 @@
// Big GUI components
// ----------------------------------------------------------------------------
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
+// Set to 0 to disable MDI support.
+//
+// Requires wxUSE_NOTEBOOK under platforms other than MSW.
+//
+// Default is 1.
+//
// Recommended setting: 1, can be safely set to 0.
#define wxUSE_MDI 1
+// Set to 0 to disable document/view architecture
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+
// Set to 0 to disable MDI document/view architecture
+//
+// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
#define wxUSE_MDI_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
@@ -1001,7 +1031,7 @@
// Windows-only settings
// ----------------------------------------------------------------------------
-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
// will override some other settings (see below)
//
// Default is 0.
@@ -1073,8 +1103,9 @@
// (notably, wxNotebook pages)
#define wxUSE_UXTHEME_AUTO 1
+// NB: obsolete, as of v2.5.3.1
// Set to 1 to if you're developing for MS SmartPhone
-#define wxUSE_SMARTPHONE 0
+// #define wxUSE_SMARTPHONE 0
// ----------------------------------------------------------------------------
// obsolete settings
More information about the Commits
mailing list