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 3b84824403cb6043ea36815cc23301dba7a342b8..85ff39009bad5bc63fae9fa9873d411edf1dbe63 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -5,12 +5,12 @@
 // 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


@@ -19,7 +19,7 @@
 
 #define USE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 
 #define USE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp

-#define __GOODCOMPILER__
+#define _WX_GOODCOMPILER__

                                 // gcc can have problems, but Windows compilers
                                 // are generally OK.
 #define WXWIN_COMPATIBILITY  1
                                 // gcc can have problems, but Windows compilers
                                 // are generally OK.
 #define WXWIN_COMPATIBILITY  1


@@ -116,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


@@ -142,13 +142,6 @@
 #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>,
 #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>,


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

-    // __SETUPH__
+    // _WX_SETUP_H_