test complete :-)

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index fa3435b1afe0f015801892d15ba5e69916d28519..1a73808f9e2645272d23d085c3fe8dae91a76290 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -19,6 +19,10 @@
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 

+// ----------------------------------------------------------------------------
+// compatibility settings
+// ----------------------------------------------------------------------------
+

 #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


@@ -26,13 +30,27 @@
                                 // 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.
 

+// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
+// but this is very dangerous because you can mistakenly pass an icon instead
+// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
+// because an icon is not a valid bitmap
+//
+// Starting from 2.1.12, you have the choice under this backwards compatible
+// behaviour (your code will still compile, but probably won't behave as
+// expected!) and not deriving wxIcon class from wxBitmap, but providing a
+// conversion ctor wxBitmap(const wxIcon&) instead.
+//
+// Recommended setting: 0
+#define wxICON_IS_BITMAP    0
+

 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp

-
+#define wxUSE_DIALUP_MANAGER   1
+                                // Use wxDialUpManager class

 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0


@@ -61,8 +79,6 @@
 #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_TOOLBAR      1
-                                // Define 1 to use toolbar classes

 #define wxUSE_BUTTONBAR    1
                                 // Define 1 to use buttonbar classes (enhanced toolbar
                                 // for MS Windows)
 #define wxUSE_BUTTONBAR    1
                                 // Define 1 to use buttonbar classes (enhanced toolbar
                                 // for MS Windows)


@@ -79,6 +95,8 @@
                                 // Define 1 to use radio button control
 #define wxUSE_RADIOBTN     1
                                 // Unfortunately someone introduced this one, too
                                 // Define 1 to use radio button control
 #define wxUSE_RADIOBTN     1
                                 // Unfortunately someone introduced this one, too

+#define wxUSE_RADIOBOX     1
+                                // And this... don't know which one is corect

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


@@ -92,8 +110,11 @@
 #define wxUSE_SPINBTN      1
                                 // Define 1 to compile spin button
 
 #define wxUSE_SPINBTN      1
                                 // Define 1 to compile spin button
 

-// use wxStaticLine class (separator line in the dialog)?
+#define wxUSE_SPINCTRL     1
+                                // Define 1 to use wxSpinCtrl class
+

 #define wxUSE_STATLINE     1
 #define wxUSE_STATLINE     1

+                                // use wxStaticLine class

 
 #define wxUSE_CHECKLISTBOX 1
                                 // Define 1 to compile check listbox
 
 #define wxUSE_CHECKLISTBOX 1
                                 // Define 1 to compile check listbox


@@ -104,6 +125,9 @@
 #define wxUSE_CARET        1
                                 // Define 1 to use wxCaret class
 
 #define wxUSE_CARET        1
                                 // Define 1 to use wxCaret class
 

+#define wxUSE_SLIDER       1
+                                // Define 1 to use wxSlider class
+

 #define wxUSE_NEW_GRID     1
                                 // Define 1 to use the new wxGrid class
                                 // (still under development, define 0 to
 #define wxUSE_NEW_GRID     1
                                 // Define 1 to use the new wxGrid class
                                 // (still under development, define 0 to


@@ -118,14 +142,8 @@
 #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
 #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
+                                // support for startup tips (wxShowTip &c)

 
 #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


@@ -171,6 +189,14 @@
 #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
+

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


@@ -217,16 +243,16 @@
                                 // 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          0
+#define wxUSE_HTML          1

                                 // Set to 1 to use wxHTML sub-library
                                 // 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_FS_ZIP        1
+#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems

 
 

-#define wxUSE_BUSYINFO      0
+#define wxUSE_BUSYINFO      1

                                 // wxBusyInfo displays window with message
                                 // when app is busy. Works in same way as
                                 // wxBusyCursor
                                 // wxBusyInfo displays window with message
                                 // when app is busy. Works in same way as
                                 // wxBusyCursor

-#define wxUSE_ZIPSTREAM     0
+#define wxUSE_ZIPSTREAM     1

                                 // input stream for reading from zip archives
 
 /*
                                 // input stream for reading from zip archives
 
 /*


@@ -291,6 +317,13 @@
                                 // See note above about using FAFA and CTL3D.
 #endif
 
                                 // See note above about using FAFA and CTL3D.
 #endif
 

+// can we use RICHEDIT control?
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0
+#endif
+

 #define wxUSE_COMMON_DIALOGS         1
                                 // On rare occasions (e.g. using DJGPP) may want
                                 // to omit common dialogs
 #define wxUSE_COMMON_DIALOGS         1
                                 // On rare occasions (e.g. using DJGPP) may want
                                 // to omit common dialogs


@@ -321,9 +354,6 @@
 
 #define wxUSE_NATIVE_STATUSBAR        1
                                 // Set to 0 to use cross-platform wxStatusBar
 
 #define wxUSE_NATIVE_STATUSBAR        1
                                 // Set to 0 to use cross-platform wxStatusBar

-#define wxUSE_DBWIN32                 1
-                                // Use Andrew Tucker's OutputDebugString implementation
-                                // (required on Win95 only). See utils.cpp.

 
 /*
  * Any platform
 
 /*
  * Any platform


@@ -337,7 +367,13 @@
                                 // 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(wxUSE_NORLANDER_HEADERS))
+#if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#ifndef wxUSE_NORLANDER_HEADERS
+#   define wxUSE_NORLANDER_HEADERS 1
+#endif
+#endif
+
+#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(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.


@@ -365,9 +401,6 @@
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

-#undef wxUSE_DBWIN32
-#define wxUSE_DBWIN32 0
-

 #undef wxUSE_OWNER_DRAWN
 #define wxUSE_OWNER_DRAWN 0
 #endif
 #undef wxUSE_OWNER_DRAWN
 #define wxUSE_OWNER_DRAWN 0
 #endif


@@ -377,27 +410,42 @@
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

-#undef wxUSE_DBWIN32
-#define wxUSE_DBWIN32 0
-

 #undef wxUSE_ODBC
 #define wxUSE_ODBC 0
 
 #endif
 
 #undef wxUSE_ODBC
 #define wxUSE_ODBC 0
 
 #endif
 

-#if defined(__WXMSW__) && defined(__BORLANDC__)
+// 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
+

 #undef wxUSE_ODBC
 #undef wxUSE_ODBC

-#define wxUSE_ODBC 0
+#define wxUSE_ODBC                0
+#endif
+
+#if defined(__WXMSW__) && defined(__WATCOMC__)
+#undef wxUSE_LIBJPEG
+#define wxUSE_LIBJPEG 0

 #endif
 
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #endif
 
 #if defined(__WXMSW__) && !defined(__WIN32__)
 

+#undef wxUSE_SOCKETS
+#define wxUSE_SOCKETS 0
+

 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_TOOLTIPS
 #define wxUSE_TOOLTIPS 0
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_TOOLTIPS
 #define wxUSE_TOOLTIPS 0
 

+#undef wxUSE_SPINCTRL
+#define wxUSE_SPINCTRL 0
+
+#undef wxUSE_SPINBTN
+#define wxUSE_SPINBTN 0
+

 #undef wxUSE_LIBPNG
 #define wxUSE_LIBPNG 0
 
 #undef wxUSE_LIBPNG
 #define wxUSE_LIBPNG 0