X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73974df1f951f176f592fd900352c41281eb5df2..5e84fc5a820a15a1ce2d32d2ae71f0bf92abda3d:/include/wx/msw/setup0.h

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4acb6ca886..73add4e890 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -32,7 +32,8 @@
 
 #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
@@ -79,6 +80,8 @@
                                 // 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
@@ -92,8 +95,11 @@
 #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
+                                // use wxStaticLine class
 
 #define wxUSE_CHECKLISTBOX 1
                                 // Define 1 to compile check listbox
@@ -103,6 +109,14 @@
 
 #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
+                                //  use existing wxGrid class)
 #define wxUSE_XPM_IN_MSW   1
                                 // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
@@ -113,14 +127,8 @@
 #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
+                                // support for startup tips (wxShowTip &c)
 
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                 // Set to 0 to disable document/view architecture
@@ -166,6 +174,14 @@
 #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
@@ -332,7 +348,13 @@
                                 // 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.
@@ -385,14 +407,34 @@
 #define wxUSE_ODBC 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
+
+#if defined(__WXMSW__) && defined(__WATCOMC__)
+#undef wxUSE_LIBJPEG
+#define wxUSE_LIBJPEG 0
+#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_SPINCTRL
+#define wxUSE_SPINCTRL 0
+
+#undef wxUSE_SPINBTN
+#define wxUSE_SPINBTN 0
+
 #undef wxUSE_LIBPNG
 #define wxUSE_LIBPNG 0
 
@@ -410,5 +452,13 @@
 
 #endif
 
+// Problem with VC++ 5 and dobjcmn.cpp
+/*
+#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200)
+#undef wxUSE_DRAG_AND_DROP
+#define wxUSE_DRAG_AND_DROP 0
+#endif
+*/
+
 #endif
     // _WX_SETUP_H_