A couple of identifiers at global level moved to the .cpp file from .h where

[wxWidgets.git] / setup / setup.hin

diff --git a/setup/setup.hin b/setup/setup.hin
index 90d10cd77f8116e8e46e4df7065825b5148d5ded..2923f6565c653e553a75b7dadac9a951f52a51f9 100644 (file)
--- a/setup/setup.hin
+++ b/setup/setup.hin
@@ -47,6 +47,10 @@
  * Use libpng
  */
 #define wxUSE_LIBPNG 0
+/*
+ * Use libjpeg
+ */
+#define wxUSE_LIBJPEG 0
 /*
  * Use iODBC
  */
@@ -144,7 +148,7 @@
  *
  * Note that you must link your programs with libc.a if you enable this and you
  * have libc 5 (you should enable this for libc6 where wcsrtombs() is
- * thread-safe version of wcstombs()). 
+ * thread-safe version of wcstombs()).
  */
 #define wxUSE_WCSRTOMBS 0
 
@@ -172,11 +176,11 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
- 
+
 //------------------------------------------------------------------------
 // architecture options
 //------------------------------------------------------------------------
- 
+
 /*
  * Use the mdi architecture
  */
@@ -227,7 +231,7 @@
    Level 0: no backward compatibility, all new features
    Level 1: wxDC, OnSize (etc.) compatibility, but
    some new features such as event tables */
-#define WXWIN_COMPATIBILITY  1
+#define WXWIN_COMPATIBILITY  0
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -243,10 +247,10 @@
  * Disable it, If this causes problems (e.g. link errors)
  */
 #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. 
+ * be WXDEBUG_NEW (see object.h). If this causes
+ * problems (e.g. link errors), set this to 0.
  */
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 /*
@@ -473,6 +477,7 @@
 #undef SIZEOF_INT
 #undef SIZEOF_INT_P
 #undef SIZEOF_LONG
+#undef SIZEOF_LONG_LONG
 
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t