it didn't compile at all...

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f78fbf9e02a6f483751e176c2e4daa21800d0407..d76043d8723cbedd2848043ad537f2b30f876832 100644 (file)
--- 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
@@ -104,6 +110,9 @@
 #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
@@ -118,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
@@ -171,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
@@ -391,9 +402,20 @@
 
 #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
-#define wxUSE_ODBC 0
+#define wxUSE_ODBC                0
+#endif
+
+// With C++Builder we get lots of doubly-defined symbols
+// when including both winsock.h and winsock2.h
+#if defined(__BORLANDC__) && (__BORLANDC__ == 0x530)
+#undef wxUSE_SOCKETS
+#undef wxUSE_SOCKETS 0
 #endif
 
 #if defined(__WXMSW__) && defined(__WATCOMC__)
@@ -412,6 +434,12 @@
 #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