Corrected wxlistBox, wxRadioBox, wxComboBox and

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index d65e756645a61cfdaa5b92af36c6deb8af99dffe..a6a024817a92581ff6b24f05ca8c7fc30de2ca5c 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -19,9 +19,7 @@
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp

-#define _WX_GOODCOMPILER__
-                                // gcc can have problems, but Windows compilers
-                                // are generally OK.
+

 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.
                                 // Level 0: no backward compatibility, all new features
 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.
                                 // Level 0: no backward compatibility, all new features


@@ -29,16 +27,12 @@
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 1.
 
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 1.
 

-#define wxUSE_AUTOTRANS   1
-                                // Define wxTString

 #define wxUSE_POSTSCRIPT  0
                             // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
                                 // 1 to use font metric files in GetTextExtent
 #define wxUSE_METAFILE    1
                                 // 0 for no Metafile and metafile device context
 #define wxUSE_POSTSCRIPT  0
                             // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
                                 // 1 to use font metric files in GetTextExtent
 #define wxUSE_METAFILE    1
                                 // 0 for no Metafile and metafile device context

-#define wxUSE_FORM        0
-                                // 0 for no wxForm

 #define wxUSE_IPC         1
                                 // 0 for no interprocess comms
 // Note: wxHELP uses IPC under X so these are interdependent!
 #define wxUSE_IPC         1
                                 // 0 for no interprocess comms
 // Note: wxHELP uses IPC under X so these are interdependent!


@@ -54,11 +48,9 @@
 
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions

+

 #define wxUSE_SPLINES     1
                                     // 0 for no splines
 #define wxUSE_SPLINES     1
                                     // 0 for no splines

-#define wxUSE_XFIG_SPLINE_CODE  1
-                                   // 1 for XFIG spline code, 0 for AIAI spline code.
-// AIAI spline code is slower, but freer of copyright issues.

 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop


@@ -74,11 +66,37 @@
 #define wxUSE_COMBOBOX      1
                                     // Define 1 to use COMBOXBOX control (Windows)
                                     // or FWW's ComboBox widget (Motif).
 #define wxUSE_COMBOBOX      1
                                     // Define 1 to use COMBOXBOX control (Windows)
                                     // or FWW's ComboBox widget (Motif).

+#define wxUSE_CHOICE      1
+                                    // Define 1 to use CHOICE
+

 #define wxUSE_RADIOBUTTON   1
                                     // Define 1 to use radio button control
 #define wxUSE_RADIOBUTTON   1
                                     // Define 1 to use radio button control

+#define wxUSE_RADIOBTN   1
+                                    // Unfortunately someone introduced this one, too

 
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
 
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class

+
+#define wxUSE_CHECKBOX 1
+                                    // Define 1 to compile checkbox
+
+#define wxUSE_LISTBOX 1
+                                    // Define 1 to compile listbox
+
+#define wxUSE_SPINBTN 1
+                                    // Define 1 to compile spin button
+
+// use wxStaticLine class (separator line in the dialog)?
+#define wxUSE_STATLINE 1
+
+#define wxUSE_CHECKLISTBOX 1
+                                    // Define 1 to compile check listbox
+
+#define wxUSE_CHOICE 1
+                                    // Define 1 to compile choice
+
+#define wxUSE_CARET       1
+                                    // Define 1 to use wxCaret class

 #define wxUSE_XPM_IN_MSW  1
                                     // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
 #define wxUSE_XPM_IN_MSW  1
                                     // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1


@@ -89,16 +107,19 @@
 #define wxUSE_WX_RESOURCES        1
                                   // Use .wxr resource mechanism (requires PrologIO library)
 
 #define wxUSE_WX_RESOURCES        1
                                   // Use .wxr resource mechanism (requires PrologIO library)
 

+// support for startup tips (wxShowTip &c)
+#define wxUSE_STARTUP_TIPS       1
+

 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES
 #define wxUSE_WX_RESOURCES        0
 #endif
 
 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES
 #define wxUSE_WX_RESOURCES        0
 #endif
 

-#define HAVE_SOCKET             1
-                                  // Use WinSock if 1

 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                   // Set to 0 to disable document/view architecture
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                   // Set to 0 to disable document/view architecture

+#define wxUSE_MDI_ARCHITECTURE  1
+                                  // Set to 0 to disable MDI document/view architecture

 #define wxUSE_PRINTING_ARCHITECTURE  1
                                     // Set to 0 to disable print/preview architecture code
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 #define wxUSE_PRINTING_ARCHITECTURE  1
                                     // Set to 0 to disable print/preview architecture code
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1


@@ -142,12 +163,19 @@
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else

-#define wxUSE_IOSTREAMH     0
+#define wxUSE_IOSTREAMH     1

 #endif
                                   // 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>
 
 #endif
                                   // 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  1
+                                  // 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)
 #define wxUSE_WXCONFIG      1
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)


@@ -160,13 +188,29 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code

-#define wxUSE_STD_IOSTREAM  1
-                                  // Use standard C++ streams if 1. If 0, use wxWin
-                                  // streams implementation.
-
+#define wxUSE_LIBJPEG       0
+                                  // Use JPEG bitmap code
+#define wxUSE_SERIAL        0
+                                  // Use serialization (requires utils/serialize)
+#define wxUSE_DYNLIB_CLASS  0
+                                  // Compile in wxLibrary class for run-time
+                                  // DLL loading and function calling

 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method

+#define wxUSE_SOCKETS       0
+                                  // Set to 1 to use socket classes
+#define wxUSE_HTML          0
+                                  // Set to 1 to use wxHTML sub-library
+#define wxUSE_FS_ZIP        0
+#define wxUSE_FS_INET       0     // Set to 1 to enable virtual file systems
+
+#define wxUSE_BUSYINFO      0
+                                  // wxBusyInfo displays window with message
+                                  // when app is busy. Works in same way as
+                                  // wxBusyCursor
+#define wxUSE_ZIPSTREAM     0
+                                  // input stream for reading from zip archives

 
 /*
  * Finer detail
 
 /*
  * Finer detail


@@ -178,15 +222,54 @@
                                 // will be used to write, in a portable way,
                                 // float on the disk
 
                                 // will be used to write, in a portable way,
                                 // float on the disk
 

+// use wxFile class - required by i18n code, wxConfig and others - recommended
+#define wxUSE_FILE                1
+
+// use wxTextFile class: requires wxFile, required by wxConfig
+#define wxUSE_TEXTFILE            1
+
+// i18n support: _() macro, wxLocale class. Requires wxFile
+#define wxUSE_INTL                1
+
+// wxLogXXX functions - highly recommended
+#define wxUSE_LOG                   1
+
+// wxValidator class
+#define wxUSE_VALIDATORS 1
+
+// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
+#define wxUSE_ACCEL 1
+
+// wxSashWindow class
+#define wxUSE_SASH 1
+
+// text entry dialog and wxGetTextFromUser function
+#define wxUSE_TEXTDLG 1
+
+// wxToolBar class
+#define wxUSE_TOOLBAR 1
+
+// wxStatusBar class
+#define wxUSE_STATUSBAR 1
+
+// progress dialog class for lengthy operations
+#define wxUSE_PROGRESSDLG 1
+
+// wxDirDlg class for getting a directory name from user
+#define wxUSE_DIRDLG 1
+

 /*
  * MS Windows/Windows NT
  *
  */
 
 /*
  * MS Windows/Windows NT
  *
  */
 

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

 #if defined(__WIN95__)
 #if defined(__WIN95__)

-#define CTL3D                      0
+#define wxUSE_CTL3D                      0

 #else
 #else

-#define CTL3D                      1
+#define wxUSE_CTL3D                      1

                                     // Define 1 to use Microsoft CTL3D library.
                                     // See note above about using FAFA and CTL3D.
 #endif
                                     // Define 1 to use Microsoft CTL3D library.
                                     // See note above about using FAFA and CTL3D.
 #endif


@@ -206,7 +289,7 @@
 #define wxUSE_PORTABLE_FONTS_IN_MSW  0
                                     // Define 1 to use new portable font scheme in Windows
                                     // (used by default under X)
 #define wxUSE_PORTABLE_FONTS_IN_MSW  0
                                     // Define 1 to use new portable font scheme in Windows
                                     // (used by default under X)

-#define FONT_SIZE_COMPATIBILITY    0
+#define wxFONT_SIZE_COMPATIBILITY    0

                                     // 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.


@@ -237,7 +320,7 @@
                                     // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 
                                     // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 

-#if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__) || defined(__BORLANDC__)
+#if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__)

 // 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.


@@ -285,59 +368,19 @@
 
 #endif
 
 
 #endif
 

+#if defined(__WXMSW__) && defined(__BORLANDC__)
+#undef wxUSE_ODBC
+#define wxUSE_ODBC 0
+#endif
+

 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

-#endif
+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0

 
 

-// Minimal setup e.g. for compiling small utilities
-#define MINIMAL_WXWINDOWS_SETUP 0
-
-#if MINIMAL_WXWINDOWS_SETUP
-#undef wxUSE_POSTSCRIPT
-# define wxUSE_POSTSCRIPT 0
-#undef wxUSE_PRINTING_ARCHITECTURE
-# define wxUSE_PRINTING_ARCHITECTURE 0
-#undef wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
-# define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-#undef wxUSE_METAFILE
-# define wxUSE_METAFILE 0
-#undef wxUSE_FORM
-# define wxUSE_FORM 0
-#undef wxUSE_SPLINES
-# define wxUSE_SPLINES 0
-#undef wxUSE_SCROLLBAR
-# define wxUSE_SCROLLBAR 0
-#undef wxUSE_COMBOBOX
-# define wxUSE_COMBOBOX 0
-#undef wxUSE_RADIOBUTTON
-# define wxUSE_RADIOBUTTON 0
-#undef wxUSE_XPM_IN_MSW
-# define wxUSE_XPM_IN_MSW 0
-#undef wxUSE_WX_RESOURCES
-# define wxUSE_WX_RESOURCES 0
-#undef wxUSE_DOC_VIEW_ARCHITECTURE
-# define wxUSE_DOC_VIEW_ARCHITECTURE 0
-#undef wxUSE_GNU_WXSTRING
-# define wxUSE_GNU_WXSTRING 0
-#undef wxUSE_ODBC
-# define wxUSE_ODBC 0
-#undef wxUSE_TIMEDATE
-# define wxUSE_TIMEDATE 0
-#undef CTL3D
-# define CTL3D 0
-#undef wxUSE_ITSY_BITSY
-# define wxUSE_ITSY_BITSY 0
-#undef wxUSE_IMAGE_LOADING_IN_MSW
-# define wxUSE_IMAGE_LOADING_IN_MSW 0
-#undef wxUSE_GAUGE
-# define wxUSE_GAUGE 0
-#undef wxUSE_RESOURCE_LOADING_IN_MSW
-# define wxUSE_RESOURCE_LOADING_IN_MSW 0
-#undef wxUSE_DRAG_AND_DROP
-# define wxUSE_DRAG_AND_DROP 0

 #endif
 
 #endif
 #endif
 
 #endif