Small changes after Robert's edits

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

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 2a6145f6c4e8a716f863e37a9c9b8f7a04bbae31..85ff39009bad5bc63fae9fa9873d411edf1dbe63 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -5,18 +5,23 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __SETUPH__
-#define __SETUPH__
+#ifndef _WX_SETUP_H_
+#define _WX_SETUP_H_

 
 /*
  * General features
  *
  */
 
 
 /*
  * General features
  *
  */
 

+#define USE_CONFIG           1
+                                // Use wxConfig, with CreateConfig in wxApp
+#define _WX_GOODCOMPILER__
+                                // gcc can have problems, but Windows compilers
+                                // are generally OK.

 #define WXWIN_COMPATIBILITY  1
                                 // Compatibility with 1.66 API.
                                 // Level 0: no backward compatibility, all new features
 #define WXWIN_COMPATIBILITY  1
                                 // Compatibility with 1.66 API.
                                 // Level 0: no backward compatibility, all new features


@@ -111,13 +116,13 @@
                                   // NOW MANDATORY: don't change.
 #define USE_MEMORY_TRACING      1
                                   // If 1, enables debugging versions of wxObject::new and
                                   // NOW MANDATORY: don't change.
 #define USE_MEMORY_TRACING      1
                                   // If 1, enables debugging versions of wxObject::new and

-                                  // wxObject::delete *IF* DEBUG is also defined.
+                                  // wxObject::delete *IF* WXDEBUG is also defined.

                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
 #define USE_DEBUG_CONTEXT       1
                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
 #define USE_DEBUG_CONTEXT       1
                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 

-                                  // If DEBUG is not defined, will still use
+                                  // If WXDEBUG is not defined, will still use

                                   // normal memory operators.
                                   // It's recommended to set this to 1,
                                   // since you may well need to output
                                   // normal memory operators.
                                   // It's recommended to set this to 1,
                                   // since you may well need to output


@@ -137,23 +142,25 @@
 #define USE_ODBC                   1
                                     // Define 1 to use ODBC classes
 
 #define USE_ODBC                   1
                                     // Define 1 to use ODBC classes
 

-#define USE_ODBC_IN_MSW_ONLY           1
-
-#if USE_ODBC && USE_ODBC_IN_MSW_ONLY
-#undef USE_ODBC
-#define USE_ODBC 0
-#endif
-

 #define USE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>
                                   // but you can't mix them. Set to 1 for <iostream.h>,
                                   // 0 for <iostream>
 
 #define USE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>
                                   // but you can't mix them. Set to 1 for <iostream.h>,
                                   // 0 for <iostream>
 

+#define USE_WXCONFIG      1
+                                  // if enabled, compiles built-in OS independent wxConfig
+                                  // class and it's file (any platform) and registry (Win)
+                                  // based implementations

 /*
  * Finer detail
  *
  */
 
 /*
  * Finer detail
  *
  */
 

+#define USE_APPLE_IEEE   1
+                               // if enabled, the float codec written by Apple
+                               // will be used to write, in a portable way,
+                               // float on the disk
+

 /*
  * Motif and XView
  *
 /*
  * Motif and XView
  *


@@ -240,7 +247,7 @@
 #define USE_PENWINDOWS 0
                                     // Set to 1 to use PenWindows
 
 #define USE_PENWINDOWS 0
                                     // Set to 1 to use PenWindows
 

-#define USE_OWNER_DRAWN             1
+#define USE_OWNER_DRAWN             0

                                     // Owner-drawn menus and listboxes
 
 #define USE_NATIVE_STATUSBAR        1
                                     // Owner-drawn menus and listboxes
 
 #define USE_NATIVE_STATUSBAR        1


@@ -321,4 +328,4 @@
 #endif
 
 #endif
 #endif
 
 #endif

-    // __SETUPH__
+    // _WX_SETUP_H_