X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83b1bfaac993b74012dc42078b39315ac1dffa6e..8b99adf475af713c192933dd9a011db8b2030f34:/include/wx/msw/setup0.h?ds=inline

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 09e5ba1196..49e1807b7b 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -12,13 +12,12 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 
-/*
- * General features
- *
- */
+// ----------------------------------------------------------------------------
+// global settings
+// ----------------------------------------------------------------------------
 
-#define wxUSE_CONFIG           1
-                                // Use wxConfig, with CreateConfig in wxApp
+// define this to 0 when building wxBase library
+#define wxUSE_GUI            1
 
 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.
@@ -27,6 +26,13 @@
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 1.
 
+// ----------------------------------------------------------------------------
+// General features
+// ----------------------------------------------------------------------------
+
+#define wxUSE_CONFIG           1
+                                // Use wxConfig, with CreateConfig in wxApp
+
 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
@@ -86,8 +92,9 @@
 #define wxUSE_SPINBTN      1
                                 // Define 1 to compile spin button
 
-// use wxStaticLine class (separator line in the dialog)?
+
 #define wxUSE_STATLINE     1
+                                // use wxStaticLine class
 
 #define wxUSE_CHECKLISTBOX 1
                                 // Define 1 to compile check listbox
@@ -97,6 +104,11 @@
 
 #define wxUSE_CARET        1
                                 // Define 1 to use wxCaret 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
@@ -107,14 +119,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
@@ -326,7 +332,13 @@
                                 // complains about deallocating
                                 // arrays of wxPoints if wxPoint is a class.
 
-#if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__)
+#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.
@@ -379,8 +391,22 @@
 #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