X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184b5d99a5382cd7a19888c85aff11f8a21af2f6..16553659df1a8fee8b19cc9a8ff8321711fe983c:/include/wx/msw/setup.h

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 9e205cc1f2..e780f78018 100644
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
@@ -44,23 +44,23 @@
 #define wxUSE_HELP        1
                                 // 0 for no help facility
 #define wxUSE_RESOURCES   1
-                        	// 0 for no wxGetResource/wxWriteResource
+                                // 0 for no wxGetResource/wxWriteResource
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
-                                
+
 #define wxUSE_TIMEDATE    1
                                 // 0 for no wxTime/wxDate classes
-                                
+
 #define wxUSE_CLIPBOARD   1
-                        	// 0 for no clipboard functions
+                                // 0 for no clipboard functions
 #define wxUSE_SPLINES     1
-                            	// 0 for no splines
+                                    // 0 for no splines
 #define wxUSE_XFIG_SPLINE_CODE  1
-                           	// 1 for XFIG spline code, 0 for AIAI spline code.
+                                   // 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
+                                // 0 for no drag and drop
 
 #define wxUSE_TOOLBAR       1
                                     // Define 1 to use toolbar classes
@@ -78,16 +78,8 @@
 
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
-#define wxUSE_XPM_IN_X    1
 #define wxUSE_XPM_IN_MSW  0
-                                    // Define 1 to support the XPM package in wxBitmap,
-                                    // separated by platform. If 1, you must link in
-                                    // the XPM library to your applications.
-#define wxUSE_IMAGE_LOADING_IN_X          1
-                                  // Use dynamic icon/bitmap loading/saving code in utils/image under X.
-                                  // If this is 1, you will need to link your applications
-                                  // with image_X.lib. where X is motif, ol, or hp.
-
+                                    // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
                                   // Use dynamic DIB loading/saving code in utils/dib under MSW.
 #define wxUSE_RESOURCE_LOADING_IN_MSW     1
@@ -96,14 +88,8 @@
 #define wxUSE_WX_RESOURCES        1
                                   // Use .wxr resource mechanism (requires PrologIO library)
 
-#define wxUSE_GNU_WXSTRING        0
-                                  // Define 1 to use modified GNU wxString class
-                                  // from (stefan.hammes@urz.uni-heidelberg.de) in contrib\string
-                                  // TODO: why does this give an unresolved 'wxRegex::Search'
-                                  // symbol if 1?
-
 #define HAVE_SOCKET             1
-                                  // Use WinSock if 1                                 
+                                  // Use WinSock if 1
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                   // Set to 0 to disable document/view architecture
 #define wxUSE_PRINTING_ARCHITECTURE  1
@@ -132,11 +118,10 @@
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
-// GnuWin32 (b19) can't copy with these operators.
-#ifdef __GNUWIN32__
-#undef wxUSE_GLOBAL_MEMORY_OPERATORS 1
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-#endif
+#define wxUSE_DEBUG_NEW_ALWAYS 1
+                                  // In debug mode, causes new to be defined to
+                                  // be WXDEBUG_NEW (see object.h).
+                                  // If this causes problems (e.g. link errors), set this to 0.
 
 #define REMOVE_UNUSED_ARG 1
                                   // Set this to 0 if your compiler can't cope
@@ -162,10 +147,10 @@
  *
  */
 
-#define wxUSE_APPLE_IEEE	  1
-				// if enabled, the float codec written by Apple
-				// will be used to write, in a portable way,
-				// float on the disk
+#define wxUSE_APPLE_IEEE          1
+                                // if enabled, the float codec written by Apple
+                                // will be used to write, in a portable way,
+                                // float on the disk
 
 /*
  * MS Windows/Windows NT
@@ -210,6 +195,9 @@
 
 #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
@@ -218,9 +206,9 @@
 
 #define wxUSE_TYPEDEFS               0
                                     // Use typedefs not classes for wxPoint
-				    // and others, to reduce overhead and avoid
-				    // MS C7 memory bug. Bounds checker
-				    // complains about deallocating
+                                    // and others, to reduce overhead and avoid
+                                    // MS C7 memory bug. Bounds checker
+                                    // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 
 #if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__) || defined(__BORLANDC__)