Add the options stuff to settings.

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 784b5b9e9dc6660b2734ddf3347cad79172c8990..aaa969318831103b908d0e62d65577e7ddc51fed 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -20,6 +20,61 @@
 // compiler and OS identification
 // ----------------------------------------------------------------------------
 
 // compiler and OS identification
 // ----------------------------------------------------------------------------
 

+// first define Windows symbols if they're not defined on the command line: we
+// can autodetect everything we need if _WIN32 is defined
+#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
+    #ifndef __WXMSW__
+        #define __WXMSW__
+    #endif
+
+    #ifndef __WIN32__
+        #define __WIN32__
+    #endif
+
+    // Win95 means Win95-style UI, i.e. Win9x/NT 4+
+    #if !defined(__WIN95__) && defined(WINVER) && (WINVER >= 0x0400)
+        #define __WIN95__
+    #endif
+#endif // Win32
+
+#ifdef __WXWINE__
+    #ifndef __WIN32__
+        #define __WIN32__
+    #endif
+    #ifndef __WIN95__
+        #define __WIN95__
+    #endif
+    #ifndef STRICT
+        #define STRICT
+    #endif
+#endif // WINE
+
+#if defined(TWIN32) && !defined(__TWIN32__)
+    #define __TWIN32__
+#endif // Twin32
+
+#include "wx/setup.h"
+
+// old C++ headers (like <iostream.h>) declare classes in the global namespace
+// while the new, standard ones (like <iostream>) do it in std:: namespace
+//
+// using this macro allows constuctions like "wxSTD iostream" to work in
+// either case
+#if !wxUSE_IOSTREAMH
+ #define wxSTD std::
+#else
+ #define wxSTD
+#endif
+
+// just in case they were defined in setup.h
+#ifdef PACKAGE
+#undef PACKAGE
+#endif
+
+#ifdef VERSION
+#undef VERSION
+#endif
+

 // OS: first test for generic Unix defines, then for particular flavours and
 //     finally for Unix-like systems
 #if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
 // OS: first test for generic Unix defines, then for particular flavours and
 //     finally for Unix-like systems
 #if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \


@@ -52,18 +107,28 @@
         #define OS2EMX_PLAIN_CHAR
     #endif
 
         #define OS2EMX_PLAIN_CHAR
     #endif
 

+    // define __HPUX__ for HP-UX where standard macro is __hpux
+    #if defined(__hpux) && !defined(__HPUX__)
+        #define __HPUX__
+    #endif // HP-UX
+

     #if defined(__APPLE__)
         // MacOS X
         #ifndef __WXMAC__
             #define __WXMAC__
         #endif
         #ifndef __WXMAC_X__
     #if defined(__APPLE__)
         // MacOS X
         #ifndef __WXMAC__
             #define __WXMAC__
         #endif
         #ifndef __WXMAC_X__

+            // This define really should not be necessary since __WXMAC__
+            // combined with __UNIX__ is sufficient to differentiate
+            // Classic Mac OS from Mac OS X. However, some code has been
+            // added to workaround defects(?) in the bundled gcc compiler
+            // and these corrections are identified by __WXMAC_X__

             #define __WXMAC_X__
         #endif
 
         #define PM_USE_SESSION_APIS 0
         #include <Carbon/Carbon.h>
             #define __WXMAC_X__
         #endif
 
         #define PM_USE_SESSION_APIS 0
         #include <Carbon/Carbon.h>

-    #endif
+    #endif // __APPLE__

 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))


@@ -76,6 +141,11 @@
         #define __WXMAC__
     #endif
     #ifndef __WXMAC_X__
         #define __WXMAC__
     #endif
     #ifndef __WXMAC_X__

+        // This define really should not be necessary since __WXMAC__
+        // combined with __UNIX__ is sufficient to differentiate
+        // Classic Mac OS from Mac OS X. However, some code has been
+        // added to workaround defects(?) in the bundled gcc compiler
+        // and these corrections are identified by __WXMAC_X__

         #define __WXMAC_X__
     #endif
 
         #define __WXMAC_X__
     #endif
 


@@ -102,6 +172,11 @@
         #define __WINDOWS__
     #endif  // Windows
 
         #define __WINDOWS__
     #endif  // Windows
 

+    // to be changed for Win64!
+    #ifndef __WIN32__
+        #define __WIN16__
+    #endif
+

     // define another standard symbol for Microsoft Visual C++: the standard one
     // (_MSC_VER) is also defined by Metrowerks compiler
     #if defined(_MSC_VER) && !defined(__MWERKS__)
     // define another standard symbol for Microsoft Visual C++: the standard one
     // (_MSC_VER) is also defined by Metrowerks compiler
     #if defined(_MSC_VER) && !defined(__MWERKS__)


@@ -109,12 +184,17 @@
     #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
         #define __BORLANDC__
       #elif defined(__WATCOMC__)
     #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
         #define __BORLANDC__
       #elif defined(__WATCOMC__)

-    //#define __WATCOMC__

     #elif defined(__SC__)
         #define __SYMANTECC__
     #endif  // compiler
 #endif  // OS
 
     #elif defined(__SC__)
         #define __SYMANTECC__
     #endif  // compiler
 #endif  // OS
 

+// if we're on a Unix system but didn't use configure (so that setup.h didn't
+// define __UNIX__), do define __UNIX__ now
+#if !defined(__UNIX__) && defined(__UNIX_LIKE__)
+    #define __UNIX__
+#endif // Unix
+

 // LINKAGEMODE mode is empty for everyting except OS/2
 #ifndef LINKAGEMODE
     #define LINKAGEMODE
 // LINKAGEMODE mode is empty for everyting except OS/2
 #ifndef LINKAGEMODE
     #define LINKAGEMODE


@@ -138,6 +218,12 @@
 #endif
 #endif // __VISUALC__
 
 #endif
 #endif // __VISUALC__
 

+// suppress some Watcom C++ warnings
+#ifdef __WATCOMC__
+#   pragma warning 849 9                       // Disable 'virtual function hidden'
+#   pragma warning 549 9                       // Disable 'operand contains compiler generated information'
+#endif // __VISUALC__
+

 // suppress some Salford C++ warnings
 #ifdef __SALFORDC__
 #   pragma suppress 353             // Possible nested comments
 // suppress some Salford C++ warnings
 #ifdef __SALFORDC__
 #   pragma suppress 353             // Possible nested comments


@@ -167,13 +253,15 @@
     #define va_list __gnuc_va_list
 #endif // HP-UX
 
     #define va_list __gnuc_va_list
 #endif // HP-UX
 

+// This macro can be used to check that the version of mingw32 compiler is
+// at least maj.min

 #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
 #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )

-#include "wx/msw/gccpriv.h"
+    #include "wx/msw/gccpriv.h"
+#else
+    #undef wxCHECK_W32API_VERSION
+    #define wxCHECK_W32API_VERSION(maj, min) (0)

 #endif
 
 #endif
 

-//////////////////////////////////////////////////////////////////////////////////
-// Currently Only MS-Windows/NT, XView and Motif are supported
-//

 #if defined(__HPUX__) && !defined(__WXGTK__)
     #ifndef __WXMOTIF__
         #define __WXMOTIF__
 #if defined(__HPUX__) && !defined(__WXGTK__)
     #ifndef __WXMOTIF__
         #define __WXMOTIF__


@@ -184,78 +272,19 @@
     #define __X__
 #endif
 
     #define __X__
 #endif
 

-#ifdef __WXMSW__
-
-#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
-    #ifndef __WIN32__
-        #define __WIN32__
-    #endif
-#endif
-
-#ifdef __WXWINE__
-  #ifndef __WIN32__
-    #define __WIN32__
-  #endif
-  #ifndef __WIN95__
-    #define __WIN95__
-  #endif
-  #ifndef STRICT
-    #define STRICT
-  #endif
-#endif
-
-#ifndef __WIN32__
-#define __WIN16__
-#endif
-
-#if !defined(__WIN95__) && (WINVER >= 0x0400)
-#define __WIN95__
-#endif
-
-#if defined(TWIN32) && !defined(__TWIN32__)
-#define __TWIN32__
-#endif
-
-#endif // wxMSW
-

 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
     #error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
       !defined(__WXQT__) && !defined(__WXSTUBS__) && wxUSE_GUI
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
     #error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
       !defined(__WXQT__) && !defined(__WXSTUBS__) && wxUSE_GUI

-    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXPM__|__WXSTUBS__]"
+    #ifdef __UNIX__
+        #error "No Target! You should wx-config program for compilation flags!"
+    #else // !Unix
+        #error "No Target! You should supplied makefiles for compilation!"
+    #endif // Unix/!Unix

 #endif
 
 #endif
 

-// ----------------------------------------------------------------------------
-// wxWindows options
-// ----------------------------------------------------------------------------
-
-#include <stddef.h>
-
-#include "wx/setup.h"
-
-// just in case they were defined in setup.h
-#ifdef PACKAGE
-#undef PACKAGE
-#endif
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-// this has to be done after including setup.h which might
-// define __HPUX__ 1 itself
-#if defined(__hpux) && !defined(__HPUX__)
-    #define __HPUX__
-#endif // HP-UX
-
-// if we're on a Unix system but didn't use configure (so that setup.h didn't
-// define __UNIX__), do define __UNIX__ now
-#if !defined(__UNIX__) && defined(__UNIX_LIKE__)
-    #define __UNIX__
-#endif // Unix
-

 #include "wx/version.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/version.h"
 
 // ----------------------------------------------------------------------------


@@ -401,8 +430,8 @@ typedef int wxWindowID;
 
 #if defined(__WXMSW__)
 
 
 #if defined(__WXMSW__)
 

-// __declspec works in BC++ 5 and later, as well as VC++ and gcc
-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__)
+// __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well as VC++ and gcc
+#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__)

 #  ifdef WXMAKINGDLL
 #    define WXDLLEXPORT __declspec( dllexport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
 #  ifdef WXMAKINGDLL
 #    define WXDLLEXPORT __declspec( dllexport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type


@@ -464,8 +493,10 @@ typedef int wxWindowID;
 #  define WXDLLIMPORT
 #endif
 
 #  define WXDLLIMPORT
 #endif
 

+#ifdef __cplusplus

 class WXDLLEXPORT wxObject;
 class WXDLLEXPORT wxEvent;
 class WXDLLEXPORT wxObject;
 class WXDLLEXPORT wxEvent;

+#endif

 
  /** symbolic constant used by all Find()-like functions returning positive
       integer on success as failure indicator */
 
  /** symbolic constant used by all Find()-like functions returning positive
       integer on success as failure indicator */


@@ -476,7 +507,12 @@ class WXDLLEXPORT wxEvent;
 // ----------------------------------------------------------------------------
 
 // everybody gets the assert and other debug macros
 // ----------------------------------------------------------------------------
 
 // everybody gets the assert and other debug macros

+#ifdef __cplusplus

 #include "wx/debug.h"
 #include "wx/debug.h"

+#endif
+
+// NULL declaration
+#include <stddef.h>

 
 //@{
 /// delete pointer if it is not NULL and NULL it afterwards
 
 //@{
 /// delete pointer if it is not NULL and NULL it afterwards


@@ -545,7 +581,9 @@ class WXDLLEXPORT wxEvent;
 #endif
 
 // Callback function type definition
 #endif
 
 // Callback function type definition

+#ifdef __cplusplus

 typedef void (*wxFunction) (wxObject&, wxEvent&);
 typedef void (*wxFunction) (wxObject&, wxEvent&);

+#endif

 
 // ----------------------------------------------------------------------------
 // OS mnemonics -- Identify the running OS (useful for Windows)
 
 // ----------------------------------------------------------------------------
 // OS mnemonics -- Identify the running OS (useful for Windows)


@@ -1119,6 +1157,8 @@ enum wxStretch
 #define wxTR_EXTENDED        0x0040
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080
 #define wxTR_NO_LINES        0x0100
 #define wxTR_EXTENDED        0x0040
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080
 #define wxTR_NO_LINES        0x0100

+#define wxTR_MAC_BUTTONS     0x0200
+#define wxTR_ROW_LINES       0x0400

 
 /*
  * wxListCtrl flags
 
 /*
  * wxListCtrl flags