Forgot to commit this one - changes for wxBase

[wxWidgets.git] / include / wx / msw / setup0.h

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 24ca1412a7c59f9db5599852181d9c5b7028dcbf..fca3f3295b8a3d8934866705960fb010d53f3da1 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -144,21 +144,37 @@
 // Default is 1 for everything.
 //
 // Recommended setting: 1 (library might fail to compile for some combinations
 // Default is 1 for everything.
 //
 // Recommended setting: 1 (library might fail to compile for some combinations

-// of disabled controls) 
-#define wxUSE_COMBOBOX     1
+// of disabled controls)
+#define wxUSE_CARET        1
+#define wxUSE_CHECKBOX     1
+#define wxUSE_CHECKLISTBOX 1

 #define wxUSE_CHOICE       1
 #define wxUSE_CHOICE       1

-#define wxUSE_RADIOBTN     1
+#define wxUSE_COMBOBOX     1
+#define wxUSE_GAUGE        1
+#define wxUSE_LISTBOX      1

 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBOX     1

+#define wxUSE_RADIOBTN     1

 #define wxUSE_SCROLLBAR    1
 #define wxUSE_SCROLLBAR    1

-#define wxUSE_CHECKBOX     1
-#define wxUSE_LISTBOX      1
+#define wxUSE_SLIDER       1

 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1
 #define wxUSE_STATLINE     1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1
 #define wxUSE_STATLINE     1

-#define wxUSE_CHECKLISTBOX 1
-#define wxUSE_CHOICE       1
-#define wxUSE_CARET        1
-#define wxUSE_SLIDER       1
+
+// this setting is obsolete, value is ignored
+#define wxUSE_BUTTONBAR    1
+
+// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and
+// the new, much imporved and enhanced version. The new version is backwards
+// compatible with the old one and should be used whenever possible, i.e. if
+// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too.
+//
+// Default is 1 for both options.
+//
+// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
+// wxGrid and 100% backwards compatible (with all old wxGrid quirks) is
+// essential.
+#define wxUSE_GRID         1
+#define wxUSE_NEW_GRID     1

 
 // ----------------------------------------------------------------------------
 // Metafiles support
 
 // ----------------------------------------------------------------------------
 // Metafiles support


@@ -181,6 +197,32 @@
 #define wxUSE_ENH_METAFILE          1
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 #define wxUSE_ENH_METAFILE          1
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 

+// ----------------------------------------------------------------------------
+// Big GUI components
+// ----------------------------------------------------------------------------
+
+// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
+// much more.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
+// smaller library.
+#define wxUSE_HTML          1
+
+// wxPlot is a class to display functions plots in wxWindow.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_PLOT           1
+
+// OpenGL canvas
+#define wxUSE_GLCANVAS       0
+
+// wxTreeLayout class
+#define wxUSE_TREELAYOUT     1
+

 // ----------------------------------------------------------------------------
 // Postscript support settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Postscript support settings
 // ----------------------------------------------------------------------------


@@ -208,18 +250,11 @@
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 

-#define wxUSE_BUTTONBAR    1
-                                // Define 1 to use buttonbar classes (enhanced toolbar
-                                // for MS Windows)
-#define wxUSE_GAUGE        1
-                                // Define 1 to use Microsoft's gauge (Windows)
-                                // or Bull's gauge (Motif) library (both in contrib).
-#define wxUSE_NEW_GRID     1
-                                // Define 1 to use the new wxGrid class
-                                // (still under development, define 0 to
-                                //  use existing wxGrid class)

 #define wxUSE_XPM_IN_MSW   1
 #define wxUSE_XPM_IN_MSW   1

-                                // Define 1 to support the XPM package in wxBitmap.
+                                // 0 for no XPM support in wxBitmap.
+                                // Default is 1, as XPM is now fully
+                                // supported this makes easier the issue
+                                // of portable icons and bitmaps.

 #define wxUSE_IMAGE_LOADING_IN_MSW        1
                                 // Use dynamic DIB loading/saving code in utils/dib under MSW.
 #define wxUSE_RESOURCE_LOADING_IN_MSW     1
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
                                 // Use dynamic DIB loading/saving code in utils/dib under MSW.
 #define wxUSE_RESOURCE_LOADING_IN_MSW     1


@@ -243,31 +278,35 @@
 #define wxUSE_DYNAMIC_CLASSES     1
                                 // If 1, enables provision of run-time type information.
                                 // NOW MANDATORY: don't change.
 #define wxUSE_DYNAMIC_CLASSES     1
                                 // If 1, enables provision of run-time type information.
                                 // NOW MANDATORY: don't change.

-#define wxUSE_MEMORY_TRACING      1
-                                // If 1, enables debugging versions of wxObject::new and
-                                // wxObject::delete *IF* __WXDEBUG__ is also defined.
-                                // WARNING: this code may not work with all architectures, especially
-                                // if alignment is an issue.

 #define wxUSE_DEBUG_CONTEXT       1
                                 // If 1, enables wxDebugContext, for
                                 // writing error messages to file, etc.
 #define wxUSE_DEBUG_CONTEXT       1
                                 // If 1, enables wxDebugContext, for
                                 // writing error messages to file, etc.

-                                // If __WXDEBUG__ is not defined, will still use
-                                // normal memory operators.
+                                // If __WXDEBUG__ is not defined, will
+                                // still use normal memory operators.

                                 // It's recommended to set this to 1,
                                 // since you may well need to output
                                 // an error log in a production
                                 // version (or non-debugging beta)
                                 // It's recommended to set this to 1,
                                 // since you may well need to output
                                 // an error log in a production
                                 // version (or non-debugging beta)

+#define wxUSE_MEMORY_TRACING      1
+                                // If 1, enables debugging versions of wxObject::new and
+                                // wxObject::delete *IF* __WXDEBUG__ is also defined.
+                                // WARNING: this code may not work with all architectures,
+                                // especially if alignment is an issue.
+                                // This switch is currently ignored for
+                                // mingw / cygwin

 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
                                 // In debug mode, cause new and delete to be redefined globally.
                                 // If this causes problems (e.g. link errors), set this to 0.
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
                                 // In debug mode, cause new and delete to be redefined globally.
                                 // If this causes problems (e.g. link errors), set this to 0.

-
+                                // This switch is currently ignored for
+                                // mingw / cygwin

 #define wxUSE_DEBUG_NEW_ALWAYS 1
                                 // In debug mode, causes new to be defined to
                                 // be WXDEBUG_NEW (see object.h).
                                 // If this causes problems (e.g. link errors), set this to 0.
                                 // You may need to set this to 0 if using templates (at least
                                 // for VC++).
 #define wxUSE_DEBUG_NEW_ALWAYS 1
                                 // In debug mode, causes new to be defined to
                                 // be WXDEBUG_NEW (see object.h).
                                 // If this causes problems (e.g. link errors), set this to 0.
                                 // You may need to set this to 0 if using templates (at least
                                 // for VC++).

-
+                                // This switch is currently ignored for
+                                // mingw / cygwin

 #define REMOVE_UNUSED_ARG   1
                                 // Set this to 0 if your compiler can't cope
                                 // with omission of prototype parameters.
 #define REMOVE_UNUSED_ARG   1
                                 // Set this to 0 if your compiler can't cope
                                 // with omission of prototype parameters.


@@ -275,13 +314,15 @@
 #define wxUSE_ODBC          0
                                 // Define 1 to use ODBC classes
 
 #define wxUSE_ODBC          0
                                 // Define 1 to use ODBC classes
 

-#define wxODBC_FWD_ONLY_CURSORS 1
-                                // Some databases/ODBC drivers only allow forward scrolling cursors.
-                                // Unless you specifically want to use backward scrolling
-                                // cursors, and you know that all of the databases/ODBC drivers
-                                // that you will use these odbc classes with allow backward
-                                // scrolling cursors, this setting should remain set to 1
-                                // for maximum database/driver compatibilty
+#define wxODBC_FWD_ONLY_CURSORS         1
+                                // For backward compatibility reasons, this parameter now only
+                                // controls the default scrolling method used by cursors.  This
+                                // default behavior can be overriden by setting the second param
+                                // of wxDB::GetDbConnection() to indicate whether the connection
+                                // (and any wxTable()s that use the connection) should support
+                                // forward only scrolling of cursors, or both forward and backward
+                                // Support for backward scrolling cursors is dependent on the 
+                                // data source as well as the ODBC driver being used.

 
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1


@@ -291,18 +332,12 @@
                                 // VC++ 4.2 and above allows <iostream> and <iostream.h>
                                 // but you can't mix them. Set to 1 for <iostream.h>,
                                 // 0 for <iostream>
                                 // VC++ 4.2 and above allows <iostream> and <iostream.h>
                                 // but you can't mix them. Set to 1 for <iostream.h>,
                                 // 0 for <iostream>

-

 #define wxUSE_STREAMS       1
                                 // If enabled (1), compiles wxWindows streams classes
 
 #define wxUSE_STD_IOSTREAM  0
                                 // Use standard C++ streams if 1. If 0, use wxWin
                                 // streams implementation.
 #define wxUSE_STREAMS       1
                                 // If enabled (1), compiles wxWindows streams classes
 
 #define wxUSE_STD_IOSTREAM  0
                                 // Use standard C++ streams if 1. If 0, use wxWin
                                 // streams implementation.

-
-#define wxUSE_WXCONFIG      1
-                                // if enabled, compiles built-in OS independent wxConfig
-                                // class and it's file (any platform) and registry (Win)
-                                // based implementations

 #define wxUSE_THREADS       1
                                 // support for multithreaded applications: if
                                 // 1, compile in thread classes (thread.h)
 #define wxUSE_THREADS       1
                                 // support for multithreaded applications: if
                                 // 1, compile in thread classes (thread.h)


@@ -313,7 +348,7 @@
                                 // Use PNG bitmap/image code
 #define wxUSE_LIBJPEG       1
                                 // Use JPEG bitmap/image code
                                 // Use PNG bitmap/image code
 #define wxUSE_LIBJPEG       1
                                 // Use JPEG bitmap/image code

-#define wxUSE_LIBTIFF       0
+#define wxUSE_LIBTIFF       1

                                 // Use TIFF bitmap/image code
 #define wxUSE_GIF           1
                                 // Use GIF bitmap/image code
                                 // Use TIFF bitmap/image code
 #define wxUSE_GIF           1
                                 // Use GIF bitmap/image code


@@ -323,7 +358,7 @@
                                 // Use PCX bitmap/image code
 #define wxUSE_SERIAL        0
                                 // Use serialization (requires utils/serialize)
                                 // Use PCX bitmap/image code
 #define wxUSE_SERIAL        0
                                 // Use serialization (requires utils/serialize)

-#define wxUSE_DYNLIB_CLASS  0
+#define wxUSE_DYNLIB_CLASS  1

                                 // Compile in wxLibrary class for run-time
                                 // DLL loading and function calling
 #define wxUSE_TOOLTIPS      1
                                 // Compile in wxLibrary class for run-time
                                 // DLL loading and function calling
 #define wxUSE_TOOLTIPS      1


@@ -331,10 +366,12 @@
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes

-#define wxUSE_HTML          1
-                                // Set to 1 to use wxHTML sub-library
+#define wxUSE_FILESYSTEM    1   
+                                // Set to 1 to enable virtual file systems
+                                // (needed by wxHTML)

 #define wxUSE_FS_ZIP        1
 #define wxUSE_FS_ZIP        1

-#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems
+#define wxUSE_FS_INET       1   
+                                // Set to 1 to enable virtual file systems

 
 #define wxUSE_BUSYINFO      1
                                 // wxBusyInfo displays window with message
 
 #define wxUSE_BUSYINFO      1
                                 // wxBusyInfo displays window with message


@@ -391,6 +428,9 @@
  *
  */
 
  *
  */
 

+// Make settings compatible with MFC
+#define wxUSE_MFC           0
+

 #define wxUSE_OLE           1
                                 // drag-and-drop, clipboard, OLE Automation
 
 #define wxUSE_OLE           1
                                 // drag-and-drop, clipboard, OLE Automation
 


@@ -418,7 +458,10 @@
                                 // wxPrinterDC.
 #define wxUSE_ITSY_BITSY             1
                                 // Define 1 to use Microsoft's ItsyBitsy
                                 // wxPrinterDC.
 #define wxUSE_ITSY_BITSY             1
                                 // Define 1 to use Microsoft's ItsyBitsy

-                                // small title bar library, for wxMiniFrame
+                                // small title bar library, for wxMiniFrame.
+                                // This setting is only used for Win3.1;
+                                // Win9x and NT use native miniframes
+                                // support instead.

 #define wxUSE_BITMAP_MESSAGE         1
                                 // Define 1 to use bitmap messages.
 #define wxUSE_PORTABLE_FONTS_IN_MSW  0
 #define wxUSE_BITMAP_MESSAGE         1
                                 // Define 1 to use bitmap messages.
 #define wxUSE_PORTABLE_FONTS_IN_MSW  0


@@ -428,7 +471,7 @@
                                 // Define 1 for font size to be backward compatible
                                 // to 1.63 and earlier. 1.64 and later define point
                                 // sizes to be compatible with Windows.
                                 // Define 1 for font size to be backward compatible
                                 // to 1.63 and earlier. 1.64 and later define point
                                 // sizes to be compatible with Windows.

-#define wxUSE_GENERIC_DIALOGS_IN_MSW 1
+#define wxUSE_GENERIC_DIALOGS_IN_MSW 0

                                 // Define 1 to use generic dialogs in Windows, even though
                                 // they duplicate native common dialog (e.g. wxColourDialog)
 #define wxUSE_PENWINDOWS 0
                                 // Define 1 to use generic dialogs in Windows, even though
                                 // they duplicate native common dialog (e.g. wxColourDialog)
 #define wxUSE_PENWINDOWS 0


@@ -458,7 +501,32 @@
 #endif
 #endif
 
 #endif
 #endif
 

-#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS))
+// These don't work as expected for mingw32 and cygwin32
+#if defined(__GNUWIN32__)
+#undef  wxUSE_MEMORY_TRACING
+#define wxUSE_MEMORY_TRACING            0
+
+#undef  wxUSE_GLOBAL_MEMORY_OPERATORS
+#define wxUSE_GLOBAL_MEMORY_OPERATORS   0
+
+#undef  wxUSE_DEBUG_NEW_ALWAYS
+#define wxUSE_DEBUG_NEW_ALWAYS          0
+#endif
+
+// MFC duplicates these operators
+#if wxUSE_MFC
+#undef  wxUSE_GLOBAL_MEMORY_OPERATORS
+#define wxUSE_GLOBAL_MEMORY_OPERATORS   0
+
+#undef  wxUSE_DEBUG_NEW_ALWAYS
+#define wxUSE_DEBUG_NEW_ALWAYS          0
+
+#ifndef _MBCS
+// #define _MBCS
+#endif
+#endif
+
+#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)

 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs
 // GnuWin32 doesn't have appropriate headers for e.g. IUnknown.
 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs
 // GnuWin32 doesn't have appropriate headers for e.g. IUnknown.