compilation fixes

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index b4fb9a7b2964278a0b074b0723c72e8a69f8c361..2df71e010d72626b72188120e2daf230c63173e3 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DEFS_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DEFS_H_


@@ -16,51 +16,126 @@
 #pragma interface "defs.h"
 #endif
 
 #pragma interface "defs.h"
 #endif
 

-#ifdef __WXGTK__
-
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-#endif
-

 #include <stddef.h>
 
 #include "wx/setup.h"
 #include "wx/version.h"
 
 #include <stddef.h>
 
 #include "wx/setup.h"
 #include "wx/version.h"
 

-// Helps SGI compilation, apparently
-#if defined(__SGI__) 
-#if defined(__GNUG__)
-#define __need_wchar_t
-#else
-/* Note I use the term __SGI_CC__ for both cc and CC, its not a good idea to 
- * mix gcc and cc/CC, the name mangling is different */
-#define __SGI_CC__
-#endif
-#endif
+// ----------------------------------------------------------------------------
+// compiler and OS identification
+// ----------------------------------------------------------------------------

 
 

-// Eliminate double/float warnings
-#ifdef _MSC_VER
-# pragma warning(disable:4244)
-#endif
+// OS
+#if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \
+    defined(__LINUX__) || defined(__sgi ) || \
+    defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX)
+
+    #ifndef __UNIX__
+        #define __UNIX__
+    #endif // Unix
+
+    // Helps SGI compilation, apparently
+    #ifdef __SGI__
+        #ifdef __GNUG__
+            #define __need_wchar_t
+        #else // !gcc
+            // Note I use the term __SGI_CC__ for both cc and CC, its not a good
+            // idea to mix gcc and cc/CC, the name mangling is different
+            #define __SGI_CC__
+        #endif // gcc/!gcc
+    #endif  // SGI
+
+    #if defined(sun) || defined(__SUN__)
+        #ifndef __GNUG__
+            #ifndef __SUNCC__
+                #define __SUNCC__
+            #endif // Sun CC
+        #endif
+    #endif // Sun
+
+    #if defined(__hpux) && !defined(__HPUX__)
+        #define __HPUX__
+    #endif // HP-UX
+
+#elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
+        // MacOS
+#else   // Windows
+    #ifndef __WINDOWS__
+        #define __WINDOWS__
+    #endif  // Windows
+
+    // 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 __VISUALC__ _MSC_VER
+    #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
+        #define __BORLANDC__
+      #elif defined(__WATCOMC__)
+    //#define __WATCOMC__
+    #elif defined(__SC__)
+        #define __SYMANTECC__
+    #endif  // compiler
+#endif  // OS

 
 

+// suppress some Visual C++ warnings
+#ifdef __VISUALC__
+#   pragma warning(disable:4244)    // conversion from double to float
+#   pragma warning(disable:4100)    // unreferenced formal parameter
+#   pragma warning(disable:4511)    // copy ctor couldn't be generated
+#   pragma warning(disable:4512)    // operator=() couldn't be generated
+#endif // __VISUALC__
+
+// suppress some Salford C++ warnings
+#ifdef __SALFORDC__
+#   pragma suppress 353             // Possible nested comments
+#   pragma suppress 593             // Define not used
+#   pragma suppress 61              // enum has no name (doesn't suppress!)
+#   pragma suppress 106             // unnamed, unused parameter
+#   pragma suppress 571             // Virtual function hiding
+#endif // __SALFORDC__
+
+// Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
+// so define it ourselves
+#ifdef __DECCXX
+    #define __cplusplus
+#endif // __DECCXX
+
+// Resolves linking problems under HP-UX
+#if defined(__HPUX__) && defined(__GNUG__)
+    #define va_list __gnuc_va_list
+#endif // HP-UX

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

-#if defined(__HPUX__) && !defined(__WXMOTIF__)
-# define __WXMOTIF__
+#if defined(__HPUX__) && !defined(__WXGTK__)
+    #ifndef __WXMOTIF__
+        #define __WXMOTIF__
+    #endif // __WXMOTIF__

 #endif
 #endif

+

 #if defined(__WXMOTIF__)
 #if defined(__WXMOTIF__)

-# define __X__
+    #define __X__

 #endif
 
 #endif
 

+#ifdef __WXMSW__

 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__
 #endif
 
 // wxWindows checks for WIN32, not __WIN32__
 #if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__
 #endif
 

+#ifdef __WXWINE__
+  #ifndef __WIN32__
+    #define __WIN32__
+  #endif
+  #ifndef __WIN95__
+    #define __WIN95__
+  #endif
+  #ifndef STRICT
+    #define STRICT
+  #endif
+#endif
+

 #ifndef __WIN32__
 #define __WIN16__
 #endif
 #ifndef __WIN32__
 #define __WIN16__
 #endif


@@ -69,53 +144,97 @@
 #define __WIN95__
 #endif
 
 #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__)
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)

-# error "Target can't be both X and Windows"
+    #error "Target can't be both X and Windows"

 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)

-#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"
+    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"

 #endif
 
 #endif
 

-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)
+// ============================================================================
+// non portable C++ features
+// ============================================================================

 
 

-// Bool is now obsolete, use bool instead
-// typedef int Bool;
-
-#ifndef TRUE
-# define TRUE  1
-# define FALSE 0
-# define Bool_DEFINED
-#endif
+// ----------------------------------------------------------------------------
+// check for native bool type and TRUE/FALSE constants
+// ----------------------------------------------------------------------------

 
 

+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)
+    // Bool is now obsolete, use bool instead
+    // typedef int Bool;
+
+    #ifndef TRUE
+        #define TRUE  1
+        #define FALSE 0
+        #define Bool_DEFINED
+    #endif

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-
-#ifndef TRUE
-# define TRUE  1
-# define FALSE 0
-#endif
-
-#endif
-
-// VC++ 4.0 is 1000.
-
-// Add more tests here for compilers that don't already define bool.
-#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
-typedef unsigned int bool;
-#endif
-
-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)
-#define byte unsigned char
-#endif
+    #ifndef TRUE
+        #define TRUE  1
+        #define FALSE 0
+    #endif
+#endif // TRUE/FALSE
+
+// Add more tests here for Windows compilers that already define bool
+// (under Unix, configure tests for this)
+#ifndef HAVE_BOOL
+    #if defined( __MWERKS__ )
+        #if (__MWERKS__ >= 0x1000) && !__option(bool)
+            #define HAVE_BOOL
+        #endif
+    #elif defined(__VISUALC__) && (__VISUALC__ == 1020)
+        // in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed)
+        // but not implemented, so we must #define it
+        #define bool unsigned int
+    #elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+        // For VisualC++ 4.1, we need to define
+        // bool as something between 4.0 & 5.0...
+        typedef unsigned int wxbool;
+        #define bool wxbool
+        #define HAVE_BOOL
+    #elif defined(__VISUALC__) && (__VISUALC__ > 1020)
+        // VC++ supports bool since 4.2
+        #define HAVE_BOOL
+    #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)
+        // Borland 5.0+ supports bool
+        #define HAVE_BOOL
+    #elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
+        // Watcom 11+ supports bool
+        #define HAVE_BOOL
+    #elif defined(__GNUWIN32__)
+        // Cygwin supports bool
+        #define HAVE_BOOL
+    #endif // compilers
+#endif // HAVE_BOOL
+
+#if !defined(HAVE_BOOL) && !defined(bool)
+    // NB: of course, this doesn't replace the standard type, because, for
+    //     example, overloading based on bool/int parameter doesn't work and
+    //     so should be avoided in portable programs
+    typedef unsigned int bool;
+#endif // bool

 
 typedef short int WXTYPE;
 
 typedef short int WXTYPE;

+
+// special care should be taken with this type under Windows where the real
+// window id is unsigned, so we must always do the cast before comparing them
+// (or else they would be always different!). Usign wxGetWindowId() which does
+// the cast itself is recommended. Note that this type can't be unsigned
+// because -1 is a valid (and largely used) value for window id.

 typedef int wxWindowID;
 
 // Macro to cut down on compiler warnings.
 #if REMOVE_UNUSED_ARG
 typedef int wxWindowID;
 
 // Macro to cut down on compiler warnings.
 #if REMOVE_UNUSED_ARG

-#define WXUNUSED(identifier) /* identifier */
+    #define WXUNUSED(identifier) /* identifier */

 #else  // stupid, broken compiler
 #else  // stupid, broken compiler

-#define WXUNUSED(identifier) identifier
+    #define WXUNUSED(identifier) identifier

 #endif
 
 /*
 #endif
 
 /*


@@ -124,31 +243,16 @@ typedef int wxWindowID;
 
 #ifdef __WXMSW__
 
 
 #ifdef __WXMSW__
 

-#ifdef __BORLANDC__
+// _declspec works in BC++ 5 and later, as well as VC++
+#if defined(__VISUALC__) || defined(__BORLANDC__)

 
 #  ifdef WXMAKINGDLL
 
 #  ifdef WXMAKINGDLL

-#    define WXDLLEXPORT __export
-#    define WXDLLEXPORT_DATA(type) type __export
-#    define WXDLLEXPORT_CTORFN __export
-#  elif defined(WXUSINGDLL)
-#    define WXDLLEXPORT __import
-#    define WXDLLEXPORT_DATA(type) type __import
-#    define WXDLLEXPORT_CTORFN
-#  else
-#    define WXDLLEXPORT
-#    define WXDLLEXPORT_DATA(type) type
+#    define WXDLLEXPORT _declspec( dllexport )
+#    define WXDLLEXPORT_DATA(type) _declspec( dllexport ) type

 #    define WXDLLEXPORT_CTORFN
 #    define WXDLLEXPORT_CTORFN

-#  endif
-
-#else
-
-#  ifdef WXMAKINGDLL
-#    define WXDLLEXPORT __declspec( dllexport )
-#    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
-#    define WXDLLEXPORT_CTORFN __declspec( dllexport )

 #  elif defined(WXUSINGDLL)
 #  elif defined(WXUSINGDLL)

-#    define WXDLLEXPORT __declspec( dllimport )
-#    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
+#    define WXDLLEXPORT _declspec( dllimport )
+#    define WXDLLEXPORT_DATA(type) _declspec( dllimport ) type

 #    define WXDLLEXPORT_CTORFN
 #  else
 #    define WXDLLEXPORT
 #    define WXDLLEXPORT_CTORFN
 #  else
 #    define WXDLLEXPORT


@@ -156,15 +260,18 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_CTORFN
 #  endif
 
 #    define WXDLLEXPORT_CTORFN
 #  endif
 

-#endif
-

 #else
 #else

-// Non-Windows

 #  define WXDLLEXPORT
 #  define WXDLLEXPORT_DATA(type) type
 #  define WXDLLEXPORT_CTORFN
 #endif
 
 #  define WXDLLEXPORT
 #  define WXDLLEXPORT_DATA(type) type
 #  define WXDLLEXPORT_CTORFN
 #endif
 

+#else // !Windows
+#  define WXDLLEXPORT
+#  define WXDLLEXPORT_DATA(type) type
+#  define WXDLLEXPORT_CTORFN
+#endif // Win/!Win
+

 // For ostream, istream ofstream
 #if defined(__BORLANDC__) && defined( _RTLDLL )
 #  define WXDLLIMPORT __import
 // For ostream, istream ofstream
 #if defined(__BORLANDC__) && defined( _RTLDLL )
 #  define WXDLLIMPORT __import


@@ -177,24 +284,7 @@ class WXDLLEXPORT wxEvent;
 
  /** 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 */

-#define NOT_FOUND       (-1)
-
-// ----------------------------------------------------------------------------
-// Error codes
-// ----------------------------------------------------------------------------
-
-/// Standard error codes
-enum  ErrCode
-{
-  /// invalid parameter (in broad sense)
-  ERR_PARAM = (-4000),
-  /// no more data (iteration functions usually return this)
-  ERR_NODATA,
-  /// user cancelled the operation
-  ERR_CANCEL,
-  /// no error (the only non negative error code)
-  ERR_SUCCESS = 0
-};
+#define wxNOT_FOUND       (-1)

 
 // ----------------------------------------------------------------------------
 /** @name Very common macros */
 
 // ----------------------------------------------------------------------------
 /** @name Very common macros */


@@ -206,13 +296,13 @@ enum  ErrCode
 //  be considered as an error by some overzealous debugging implementations of
 //  the library, so we do it ourselves)
 #if defined(__SGI_CC__)
 //  be considered as an error by some overzealous debugging implementations of
 //  the library, so we do it ourselves)
 #if defined(__SGI_CC__)

-// Okay this is bad styling, but the native SGI compiler is very picky, it 
+// Okay this is bad styling, but the native SGI compiler is very picky, it

 // wont let you compare/assign between a NULL (void *) and another pointer
 // wont let you compare/assign between a NULL (void *) and another pointer

-// type. To be really clean we'd need to pass in another argument, the type 
-// of p. 
-// Also note the use of 0L, this would allow future possible 64bit support 
-// (as yet untested) by ensuring that we zero all the bits in a pointer 
-// (which is always the same length as a long (at least with the LP64 standard) 
+// type. To be really clean we'd need to pass in another argument, the type
+// of p.
+// Also note the use of 0L, this would allow future possible 64bit support
+// (as yet untested) by ensuring that we zero all the bits in a pointer
+// (which is always the same length as a long (at least with the LP64 standard)

 // --- offer aug 98
 #define wxDELETE(p)      if ( (p) ) { delete (p); p = 0L; }
 #else
 // --- offer aug 98
 #define wxDELETE(p)      if ( (p) ) { delete (p); p = 0L; }
 #else


@@ -230,29 +320,9 @@ enum  ErrCode
 /// size of statically declared array
 #define WXSIZEOF(array)   (sizeof(array)/sizeof(array[0]))
 
 /// size of statically declared array
 #define WXSIZEOF(array)   (sizeof(array)/sizeof(array[0]))
 

-// ----------------------------------------------------------------------------
-// compiler and OS identification
-// ----------------------------------------------------------------------------
-
-// OS
-#if     defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi )
-  #ifndef __UNIX__
-    #define __UNIX__
-  #endif
-#endif
-
-#ifndef __UNIX__                     // Windows
-  #if   defined(_MSC_VER)
-    #define __VISUALC__
-  #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
-    #define __BORLANDC__
-  #elif defined(__WATCOMC__)
-    //#define __WATCOMC__
-  #elif defined(__SC__)
-    #define __SYMANTECC__
-  #endif  // compiler
-
-#endif  // OS
+// Use of these suppresses some compiler warnings
+WXDLLEXPORT_DATA(extern const bool) wxTrue;
+WXDLLEXPORT_DATA(extern const bool) wxFalse;

 
 // ----------------------------------------------------------------------------
 // compiler specific settings
 
 // ----------------------------------------------------------------------------
 // compiler specific settings


@@ -262,21 +332,159 @@ enum  ErrCode
 // warnings just must be disabled
 #ifdef  __VISUALC__
   #pragma warning(disable: 4514) // unreferenced inline func has been removed
 // warnings just must be disabled
 #ifdef  __VISUALC__
   #pragma warning(disable: 4514) // unreferenced inline func has been removed

-/* 
+/*

   you might be tempted to disable this one also: triggered by CHECK and FAIL
   you might be tempted to disable this one also: triggered by CHECK and FAIL

-  macros in debug.h, but it's, overall, is a rather useful one, so I leave it
-  and will try to find some way to disable this warning just for CHECK/FAIL.
-  Anyone?
+  macros in debug.h, but it's, overall, a rather useful one, so I leave it and
+  will try to find some way to disable this warning just for CHECK/FAIL. Anyone?

 */
   #pragma warning(disable: 4127) // conditional expression is constant
 */
   #pragma warning(disable: 4127) // conditional expression is constant

-

 #endif  // VC++
 
 #endif  // VC++
 

+#if defined(__MWERKS__)
+    #undef try
+    #undef except
+    #undef finally
+    #define except(x) catch(...)
+#endif // Metrowerks
+
+// where should i put this? we need to make sure of this as it breaks
+// the <iostream> code.
+#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#ifndef __MWERKS__
+#undef __WXDEBUG__
+#endif
+#endif
+

 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
 
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
 

+// ----------------------------------------------------------------------------
+// machine specific settings
+// ----------------------------------------------------------------------------
+
+// fixed length types
+
+typedef  char    signed  wxInt8;
+typedef  char  unsigned  wxUint8;
+
+#ifdef __WIN16__
+typedef  int     signed  wxInt16;
+typedef  int   unsigned  wxUint16;
+typedef  long    signed  wxInt32;
+typedef  long  unsigned  wxUint32;
+#endif
+
+#ifdef __WIN32__
+typedef  short   signed  wxInt16;
+typedef  short unsigned  wxUint16;
+typedef  int     signed  wxInt32;
+typedef  int   unsigned  wxUint32;
+#endif
+
+#ifdef __WXMAC__
+typedef  short   signed  wxInt16;
+typedef  short unsigned  wxUint16;
+typedef  int     signed  wxInt32;
+typedef  int   unsigned  wxUint32;
+#endif
+
+#ifdef __WXOS2__
+typedef  short   signed  wxInt16;
+typedef  short unsigned  wxUint16;
+typedef  int     signed  wxInt32;
+typedef  int   unsigned  wxUint32;
+#endif
+
+#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
+  #if defined(SIZEOF_INT)
+    #if (SIZEOF_SHORT == 2)
+      typedef  short   signed  wxInt16;
+      typedef  short unsigned  wxUint16;
+    #else
+      #error "FIXME"
+    #endif
+    #if (SIZEOF_INT == 4)
+      typedef  int     signed  wxInt32;
+      typedef  int   unsigned  wxUint32;
+    #else
+      #error "FIXME"
+    #endif
+  #else
+    typedef  short   signed  wxInt16;
+    typedef  short unsigned  wxUint16;
+    typedef  int     signed  wxInt32;
+    typedef  int   unsigned  wxUint32;
+  #endif
+#endif
+
+typedef  wxUint8         wxByte;
+typedef  wxUint16        wxWord;
+
+// byte sex
+
+#define  wxBIG_ENDIAN     4321
+#define  wxLITTLE_ENDIAN  1234
+#define  wxPDP_ENDIAN     3412
+
+#ifdef WORDS_BIGENDIAN
+#define  wxBYTE_ORDER  wxBIG_ENDIAN
+#else
+#define  wxBYTE_ORDER  wxLITTLE_ENDIAN
+#endif
+
+// byte swapping
+
+#define wxUINT16_SWAP_ALWAYS(val) \
+   ((wxUint16) ( \
+    (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
+    (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))
+    
+#define wxINT16_SWAP_ALWAYS(val) \
+   ((wxInt16) ( \
+    (((wxInt16) (val) & (wxInt16) 0x00ffU) << 8) | \
+    (((wxInt16) (val) & (wxInt16) 0xff00U) >> 8)))
+    
+#define wxUINT32_SWAP_ALWAYS(val) \
+   ((wxUint32) ( \
+    (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \
+    (((wxUint32) (val) & (wxUint32) 0x0000ff00U) <<  8) | \
+    (((wxUint32) (val) & (wxUint32) 0x00ff0000U) >>  8) | \
+    (((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24)))
+
+#define wxINT32_SWAP_ALWAYS(val) \
+   ((wxInt32) ( \
+    (((wxInt32) (val) & (wxInt32) 0x000000ffU) << 24) | \
+    (((wxInt32) (val) & (wxInt32) 0x0000ff00U) <<  8) | \
+    (((wxInt32) (val) & (wxInt32) 0x00ff0000U) >>  8) | \
+    (((wxInt32) (val) & (wxInt32) 0xff000000U) >> 24)))
+
+// machine specific byte swapping
+
+#ifdef WORDS_BIGENDIAN
+  #define wxUINT16_SWAP_FROM_LE(val)  wxUINT16_SWAP_ALWAYS(val)
+  #define wxINT16_SWAP_FROM_LE(val)   wxINT16_SWAP_ALWAYS(val)
+  #define wxUINT16_SWAP_FROM_BE(val)  (val)
+  #define wxINT16_SWAP_FROM_BE(val)   (val)
+  #define wxUINT32_SWAP_FROM_LE(val)  wxUINT32_SWAP_ALWAYS(val)
+  #define wxINT32_SWAP_FROM_LE(val)   wxINT32_SWAP_ALWAYS(val)
+  #define wxUINT32_SWAP_FROM_BE(val)  (val)
+  #define wxINT32_SWAP_FROM_BE(val)   (val)
+#else
+  #define wxUINT16_SWAP_FROM_BE(val)  wxUINT16_SWAP_ALWAYS(val)
+  #define wxINT16_SWAP_FROM_BE(val)   wxINT16_SWAP_ALWAYS(val)
+  #define wxUINT16_SWAP_FROM_LE(val)  (val)
+  #define wxINT16_SWAP_FROM_LE(val)   (val)
+  #define wxUINT32_SWAP_FROM_BE(val)  wxUINT32_SWAP_ALWAYS(val)
+  #define wxINT32_SWAP_FROM_BE(val)   wxINT32_SWAP_ALWAYS(val)
+  #define wxUINT32_SWAP_FROM_LE(val)  (val)
+  #define wxINT32_SWAP_FROM_LE(val)   (val)
+#endif
+
+// ----------------------------------------------------------------------------
+// Window style flags
+// ----------------------------------------------------------------------------
+

 /*
 /*

- * Window style flags.

  * Values are chosen so they can be |'ed in a bit list.
  * Some styles are used across more than one group,
  * so the values mustn't clash with others in the group.
  * Values are chosen so they can be |'ed in a bit list.
  * Some styles are used across more than one group,
  * so the values mustn't clash with others in the group.


@@ -286,7 +494,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
  * Window (cross-group) styles now take up the first half
  * of the flag, and control-specific styles the
  * second half.
  * Window (cross-group) styles now take up the first half
  * of the flag, and control-specific styles the
  * second half.

- * 
+ *

  */
 
 /*
  */
 
 /*


@@ -301,7 +509,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxSUNKEN_BORDER     0x08000000
 #define wxRAISED_BORDER     0x04000000
 #define wxBORDER            0x02000000
 #define wxSUNKEN_BORDER     0x08000000
 #define wxRAISED_BORDER     0x04000000
 #define wxBORDER            0x02000000

-#define wxSIMPLE_BORDER     0x02000000
+#define wxSIMPLE_BORDER     wxBORDER

 #define wxSTATIC_BORDER     0x01000000
 #define wxTRANSPARENT_WINDOW 0x00100000
 #define wxNO_BORDER         0x00200000
 #define wxSTATIC_BORDER     0x01000000
 #define wxTRANSPARENT_WINDOW 0x00100000
 #define wxNO_BORDER         0x00200000


@@ -322,37 +530,55 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 // outside of dialogs.
 #define wxTAB_TRAVERSAL     0x00080000
 
 // outside of dialogs.
 #define wxTAB_TRAVERSAL     0x00080000
 

+// Add this style if the control wants to get all keyboard messages (under
+// Windows, it won't normally get the dialog navigation key events)
+#define wxWANTS_CHARS       0x00040000
+

 // Orientations
 // Orientations

-#define wxHORIZONTAL     0x01
-#define wxVERTICAL       0x02
-#define wxBOTH           (wxVERTICAL|wxHORIZONTAL)
+enum wxOrientation
+{
+    wxHORIZONTAL = 0x01,
+    wxVERTICAL   = 0x02,
+    wxBOTH       = (wxVERTICAL | wxHORIZONTAL)
+};
+

 #define wxCENTER_FRAME   0x04  /* centering into frame rather than screen */
 
 /*
  * Frame/dialog style flags
  */
 #define wxCENTER_FRAME   0x04  /* centering into frame rather than screen */
 
 /*
  * Frame/dialog style flags
  */

-#define wxSTAY_ON_TOP       0x8000
-#define wxICONIZE           0x4000
-#define wxMINIMIZE          wxICONIZE
-#define wxMAXIMIZE          0x2000
-#define wxTHICK_FRAME       0x1000
-#define wxSYSTEM_MENU       0x0800
-#define wxMINIMIZE_BOX      0x0400
-#define wxMAXIMIZE_BOX      0x0200
-#define wxTINY_CAPTION_HORIZ 0x0100
-#define wxTINY_CAPTION_VERT 0x0080
-#define wxRESIZE_BOX        wxMAXIMIZE_BOX
-#define wxRESIZE_BORDER            0x0040
-#define wxDIALOG_MODAL      0x0020
-#define wxDIALOG_MODELESS   0x0000
-
-#define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
+#define wxSTAY_ON_TOP           0x8000
+#define wxICONIZE               0x4000
+#define wxMINIMIZE              wxICONIZE
+#define wxMAXIMIZE              0x2000
+#define wxTHICK_FRAME           0x1000
+#define wxSYSTEM_MENU           0x0800
+#define wxMINIMIZE_BOX          0x0400
+#define wxMAXIMIZE_BOX          0x0200
+#define wxTINY_CAPTION_HORIZ    0x0100
+#define wxTINY_CAPTION_VERT     0x0080
+#define wxRESIZE_BOX            wxMAXIMIZE_BOX
+#define wxRESIZE_BORDER         0x0040
+#define wxDIALOG_MODAL          0x0020
+#define wxDIALOG_MODELESS       0x0000
+/* Add for normal Windows frame behaviour */
+#define wxFRAME_FLOAT_ON_PARENT 0x0020
+

 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 #endif
 
 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 #endif
 

-#define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU|wxCAPTION|wxTHICK_FRAME)
+#define wxDEFAULT_FRAME_STYLE    (wxSYSTEM_MENU|wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
+
+#ifdef __WXMSW__
+#   define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU|wxCAPTION|wxTHICK_FRAME)
+#else
+// Under Unix, the dialogs don't have a system menu. Specifying
+// wxSYSTEM_MENU here, will make a close button appear.
+#   define wxDEFAULT_DIALOG_STYLE  (wxCAPTION)
+#endif
+

 
 /*
  * Subwindow style flags
 
 /*
  * Subwindow style flags


@@ -365,17 +591,24 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * wxToolBar style flags
  */
 /*
  * wxToolBar style flags
  */

- 

 #define wxTB_3DBUTTONS      0x8000
 #define wxTB_HORIZONTAL     0x0002
 #define wxTB_VERTICAL       0x0004
 #define wxTB_3DBUTTONS      0x8000
 #define wxTB_HORIZONTAL     0x0002
 #define wxTB_VERTICAL       0x0004

-// Flatbar/Coolbar under Win98
+// Flatbar/Coolbar under Win98/ GTK 1.2

 #define wxTB_FLAT           0x0008
 #define wxTB_FLAT           0x0008

+// use native docking under GTK
+#define wxTB_DOCKABLE       0x0010
+
+/*
+ * wxMenuBar style flags
+ */
+// use native docking
+#define wxMB_DOCKABLE       0x0001
+

 
 /*
  * Apply to all panel items
  */
 
 /*
  * Apply to all panel items
  */

- 

 #define wxCOLOURED          0x0800
 // Alignment for panel item labels: replaces characters with zeros
 // when creating label, so spaces can be included in string for alignment.
 #define wxCOLOURED          0x0800
 // Alignment for panel item labels: replaces characters with zeros
 // when creating label, so spaces can be included in string for alignment.


@@ -388,7 +621,6 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * Styles for wxListBox
  */
 /*
  * Styles for wxListBox
  */

-

 #define wxLB_SORT           0x0010
 #define wxLB_SINGLE         0x0020
 #define wxLB_MULTIPLE       0x0040
 #define wxLB_SORT           0x0010
 #define wxLB_SINGLE         0x0020
 #define wxLB_MULTIPLE       0x0040


@@ -408,9 +640,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxTE_PASSWORD       wxPASSWORD
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PASSWORD       wxPASSWORD
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020

-
-// MSW-only
-#define wxTE_RICHTEXT       0x0020
+#define wxTE_PROCESS_TAB    0x0040

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags


@@ -423,6 +653,15 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * wxRadioBox/wxRadioButton style flags
  */
 /*
  * wxRadioBox/wxRadioButton style flags
  */

+
+// New, more intuitive names to specify majorDim argument
+
+// Same as wxRA_HORIZONTAL
+#define wxRA_SPECIFY_COLS   0x0001
+// Same as wxRA_VERTICAL
+#define wxRA_SPECIFY_ROWS   0x0002
+
+// Old names for compatibility

 #define wxRA_HORIZONTAL     wxHORIZONTAL
 #define wxRA_VERTICAL       wxVERTICAL
 #define wxRB_GROUP          0x0004
 #define wxRA_HORIZONTAL     wxHORIZONTAL
 #define wxRA_VERTICAL       wxVERTICAL
 #define wxRB_GROUP          0x0004


@@ -433,11 +672,12 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxGA_PROGRESSBAR     0x0004
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 #define wxGA_PROGRESSBAR     0x0004
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL

+/* Windows only */
+#define wxGA_SMOOTH          0x0008

 
 /*
  * wxSlider flags
  */
 
 /*
  * wxSlider flags
  */

- 

 #define wxSL_HORIZONTAL      wxHORIZONTAL
 #define wxSL_VERTICAL        wxVERTICAL
 // The next one is obsolete - use scroll events instead
 #define wxSL_HORIZONTAL      wxHORIZONTAL
 #define wxSL_VERTICAL        wxVERTICAL
 // The next one is obsolete - use scroll events instead


@@ -455,29 +695,30 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * wxScrollBar flags
  */
 /*
  * wxScrollBar flags
  */

- 

 #define wxSB_HORIZONTAL      wxHORIZONTAL
 #define wxSB_VERTICAL        wxVERTICAL
 
 /*
 #define wxSB_HORIZONTAL      wxHORIZONTAL
 #define wxSB_VERTICAL        wxVERTICAL
 
 /*

- * wxButton flags
+ * wxButton flags (Win32 only)

  */
  */

-

 #define wxBU_AUTODRAW        0x0004
 #define wxBU_NOAUTODRAW      0x0000
 
 /*
  * wxTreeCtrl flags
  */
 #define wxBU_AUTODRAW        0x0004
 #define wxBU_NOAUTODRAW      0x0000
 
 /*
  * wxTreeCtrl flags
  */

-

 #define wxTR_HAS_BUTTONS     0x0004
 #define wxTR_EDIT_LABELS     0x0008
 #define wxTR_LINES_AT_ROOT   0x0010
 
 #define wxTR_HAS_BUTTONS     0x0004
 #define wxTR_EDIT_LABELS     0x0008
 #define wxTR_LINES_AT_ROOT   0x0010
 

+#define wxTR_SINGLE          0x0000
+#define wxTR_MULTIPLE        0x0020
+#define wxTR_EXTENDED        0x0040
+#define wxTR_HAS_VARIABLE_ROW_HIGHT 0x0080
+

 /*
  * wxListCtrl flags
  */
 /*
  * wxListCtrl flags
  */

-

 #define wxLC_ICON            0x0004
 #define wxLC_SMALL_ICON      0x0008
 #define wxLC_LIST            0x0010
 #define wxLC_ICON            0x0004
 #define wxLC_SMALL_ICON      0x0008
 #define wxLC_LIST            0x0010


@@ -513,34 +754,55 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxSP_WRAP           0x0020
 
 /*
 #define wxSP_WRAP           0x0020
 
 /*

- * wxSplitterWnd flags
+ * wxSplitterWindow flags

  */
 
 #define wxSP_NOBORDER       0x0000
 #define wxSP_3D             0x0004
 #define wxSP_BORDER         0x0008
  */
 
 #define wxSP_NOBORDER       0x0000
 #define wxSP_3D             0x0004
 #define wxSP_BORDER         0x0008

+#define wxSP_PERMIT_UNSPLIT 0x0010
+#define wxSP_LIVE_UPDATE    0x0020

 
 /*
 
 /*

- * wxTabCtrl flags
+ * wxFrame extra flags

  */
 
  */
 

-#define wxTAB_MULTILINE     0x0000
-#define wxTAB_RIGHTJUSTIFY  0x0004
-#define wxTAB_FIXEDWIDTH    0x0008
-#define wxTAB_OWNERDRAW     0x0010
+// No title on taskbar
+#define wxFRAME_TOOL_WINDOW 0x0004
+
+/*
+ * wxTabCtrl flags
+ */

 
 

-// Sorry, I changed my mind about these names...

 #define wxTC_MULTILINE     0x0000
 #define wxTC_RIGHTJUSTIFY  0x0004
 #define wxTC_FIXEDWIDTH    0x0008
 #define wxTC_OWNERDRAW     0x0010
 
 #define wxTC_MULTILINE     0x0000
 #define wxTC_RIGHTJUSTIFY  0x0004
 #define wxTC_FIXEDWIDTH    0x0008
 #define wxTC_OWNERDRAW     0x0010
 

+/*
+ * wxNotebook flags
+ */
+#define wxNB_FIXEDWIDTH    0x0008
+

 /*
  * wxStatusBar95 flags
  */
 
 #define wxST_SIZEGRIP       0x0002
 
 /*
  * wxStatusBar95 flags
  */
 
 #define wxST_SIZEGRIP       0x0002
 

+/*
+ * wxStaticLine flags
+ */
+#define wxLI_HORIZONTAL      wxHORIZONTAL
+#define wxLI_VERTICAL        wxVERTICAL
+
+/*
+ * wxProgressDialog flags
+ */
+#define wxPD_CAN_ABORT      0x0001
+#define wxPD_APP_MODAL      0x0002
+#define wxPD_AUTO_HIDE      0x0004
+

 /*
  * GDI descriptions
  */
 /*
  * GDI descriptions
  */


@@ -586,7 +848,7 @@ enum {
   wxCROSS_HATCH,
   wxHORIZONTAL_HATCH,
   wxVERTICAL_HATCH,
   wxCROSS_HATCH,
   wxHORIZONTAL_HATCH,
   wxVERTICAL_HATCH,

-#define IS_HATCH(s)    ((s)>=wxBDIAGONAL_HATCH && (s)<=wxVERTICAL_HATCH)
+#define IS_HATCH(s)    ((s)>=wxBDIAGONAL_HATCH && (s)<=wxVERTICAL_HATCH)

 
   wxJOIN_BEVEL =     120,
   wxJOIN_MITER,
 
   wxJOIN_BEVEL =     120,
   wxJOIN_MITER,


@@ -599,7 +861,8 @@ enum {
 
 
 // Logical ops
 
 
 // Logical ops

-typedef enum {
+typedef enum
+{

   wxCLEAR,      // 0
   wxXOR,        // src XOR dst
   wxINVERT,     // NOT dst
   wxCLEAR,      // 0
   wxXOR,        // src XOR dst
   wxINVERT,     // NOT dst


@@ -629,10 +892,10 @@ typedef enum {
 #define  wxWINDING_RULE    2
 
 // ToolPanel in wxFrame
 #define  wxWINDING_RULE    2
 
 // ToolPanel in wxFrame

-#define        wxTOOL_TOP         1
-#define        wxTOOL_BOTTOM      2
-#define        wxTOOL_LEFT        3
-#define        wxTOOL_RIGHT       4
+#define    wxTOOL_TOP       1
+#define    wxTOOL_BOTTOM       2
+#define    wxTOOL_LEFT       3
+#define    wxTOOL_RIGHT       4

 
 // Dialog specifiers/return values
 
 
 // Dialog specifiers/return values
 


@@ -670,132 +933,166 @@ typedef enum {
 // Don't do parent client adjustments (for implementation only)
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
 // Don't do parent client adjustments (for implementation only)
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 

-
-// Data format for drag & drop and clipboard operations
-// numbers as per winuser.h
-
-enum wxDataFormat
+enum wxDataFormatId

 {
 {

+  wxDF_INVALID =          0,

   wxDF_TEXT =             1,  /* CF_TEXT */
   wxDF_BITMAP =           2,  /* CF_BITMAP */
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */
   wxDF_TEXT =             1,  /* CF_TEXT */
   wxDF_BITMAP =           2,  /* CF_BITMAP */
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */

-  wxDF_DIB =              8,  /* CF_DIB */
+  wxDF_SYLK =             4,
+  wxDF_DIF =              5,
+  wxDF_TIFF =             6,

   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */
   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */

-  wxDF_FILENAME =         15  /* CF_HDROP */
+  wxDF_DIB =              8,  /* CF_DIB */
+  wxDF_PALETTE =          9,
+  wxDF_PENDATA =          10,
+  wxDF_RIFF =             11,
+  wxDF_WAVE =             12,
+  wxDF_UNICODETEXT =      13,
+  wxDF_ENHMETAFILE =      14,
+  wxDF_FILENAME =         15, /* CF_HDROP */
+  wxDF_LOCALE =           16,
+  wxDF_PRIVATE =          20,
+  wxDF_MAX

 };
 
 };
 

-// Virtual keycodes
-
-enum _Virtual_keycodes {
- WXK_BACK    =   8,
- WXK_TAB     =   9,
- WXK_RETURN  = 13,
- WXK_ESCAPE  = 27,
- WXK_SPACE   = 32,
- WXK_DELETE  = 127,
-
- WXK_START   = 300,
- WXK_LBUTTON,
- WXK_RBUTTON,
- WXK_CANCEL,
- WXK_MBUTTON,
- WXK_CLEAR,
- WXK_SHIFT,
- WXK_CONTROL,
- WXK_MENU,
- WXK_PAUSE,
- WXK_CAPITAL,
- WXK_PRIOR,  // Page up
- WXK_NEXT,   // Page down
- WXK_END,
- WXK_HOME,
- WXK_LEFT,
- WXK_UP,
- WXK_RIGHT,
- WXK_DOWN,
- WXK_SELECT,
- WXK_PRINT,
- WXK_EXECUTE,
- WXK_SNAPSHOT,
- WXK_INSERT,
- WXK_HELP,
- WXK_NUMPAD0,
- WXK_NUMPAD1,
- WXK_NUMPAD2,
- WXK_NUMPAD3,
- WXK_NUMPAD4,
- WXK_NUMPAD5,
- WXK_NUMPAD6,
- WXK_NUMPAD7,
- WXK_NUMPAD8,
- WXK_NUMPAD9,
- WXK_MULTIPLY,
- WXK_ADD,
- WXK_SEPARATOR,
- WXK_SUBTRACT,
- WXK_DECIMAL,
- WXK_DIVIDE,
- WXK_F1,
- WXK_F2,
- WXK_F3,
- WXK_F4,
- WXK_F5,
- WXK_F6,
- WXK_F7,
- WXK_F8,
- WXK_F9,
- WXK_F10,
- WXK_F11,
- WXK_F12,
- WXK_F13,
- WXK_F14,
- WXK_F15,
- WXK_F16,
- WXK_F17,
- WXK_F18,
- WXK_F19,
- WXK_F20,
- WXK_F21,
- WXK_F22,
- WXK_F23,
- WXK_F24,
- WXK_NUMLOCK,
- WXK_SCROLL,
- WXK_PAGEUP,
- WXK_PAGEDOWN
-};
+/* Virtual keycodes */

 
 

-// Colours - see wx_gdi.cc for database
+enum wxKeyCode
+{
+  WXK_BACK    =    8,
+  WXK_TAB     =    9,
+  WXK_RETURN  =    13,
+  WXK_ESCAPE  =    27,
+  WXK_SPACE   =    32,
+  WXK_DELETE  =    127,
+
+  WXK_START   = 300,
+  WXK_LBUTTON,
+  WXK_RBUTTON,
+  WXK_CANCEL,
+  WXK_MBUTTON,
+  WXK_CLEAR,
+  WXK_SHIFT,
+  WXK_ALT,
+  WXK_CONTROL,
+  WXK_MENU,
+  WXK_PAUSE,
+  WXK_CAPITAL,
+  WXK_PRIOR,  /* Page up */
+  WXK_NEXT,   /* Page down */
+  WXK_END,
+  WXK_HOME,
+  WXK_LEFT,
+  WXK_UP,
+  WXK_RIGHT,
+  WXK_DOWN,
+  WXK_SELECT,
+  WXK_PRINT,
+  WXK_EXECUTE,
+  WXK_SNAPSHOT,
+  WXK_INSERT,
+  WXK_HELP,
+  WXK_NUMPAD0,
+  WXK_NUMPAD1,
+  WXK_NUMPAD2,
+  WXK_NUMPAD3,
+  WXK_NUMPAD4,
+  WXK_NUMPAD5,
+  WXK_NUMPAD6,
+  WXK_NUMPAD7,
+  WXK_NUMPAD8,
+  WXK_NUMPAD9,
+  WXK_MULTIPLY,
+  WXK_ADD,
+  WXK_SEPARATOR,
+  WXK_SUBTRACT,
+  WXK_DECIMAL,
+  WXK_DIVIDE,
+  WXK_F1,
+  WXK_F2,
+  WXK_F3,
+  WXK_F4,
+  WXK_F5,
+  WXK_F6,
+  WXK_F7,
+  WXK_F8,
+  WXK_F9,
+  WXK_F10,
+  WXK_F11,
+  WXK_F12,
+  WXK_F13,
+  WXK_F14,
+  WXK_F15,
+  WXK_F16,
+  WXK_F17,
+  WXK_F18,
+  WXK_F19,
+  WXK_F20,
+  WXK_F21,
+  WXK_F22,
+  WXK_F23,
+  WXK_F24,
+  WXK_NUMLOCK,
+  WXK_SCROLL,
+  WXK_PAGEUP,
+  WXK_PAGEDOWN,
+
+  WXK_NUMPAD_SPACE,
+  WXK_NUMPAD_TAB,
+  WXK_NUMPAD_ENTER,
+  WXK_NUMPAD_F1,
+  WXK_NUMPAD_F2,
+  WXK_NUMPAD_F3,
+  WXK_NUMPAD_F4,
+  WXK_NUMPAD_HOME,
+  WXK_NUMPAD_LEFT,
+  WXK_NUMPAD_UP,
+  WXK_NUMPAD_RIGHT,
+  WXK_NUMPAD_DOWN,
+  WXK_NUMPAD_PRIOR,
+  WXK_NUMPAD_PAGEUP,
+  WXK_NUMPAD_NEXT,
+  WXK_NUMPAD_PAGEDOWN,
+  WXK_NUMPAD_END,
+  WXK_NUMPAD_BEGIN,
+  WXK_NUMPAD_INSERT,
+  WXK_NUMPAD_DELETE,
+  WXK_NUMPAD_EQUAL,
+  WXK_NUMPAD_MULTIPLY,
+  WXK_NUMPAD_ADD,
+  WXK_NUMPAD_SEPARATOR,
+  WXK_NUMPAD_SUBTRACT,
+  WXK_NUMPAD_DECIMAL,
+  WXK_NUMPAD_DIVIDE
+};

 
 

-// OS mnemonics -- Identify the running OS (useful for Windows)
-// [Not all platforms are currently available or supported]
-enum {
+/* OS mnemonics -- Identify the running OS (useful for Windows)
+ * [Not all platforms are currently available or supported] */
+enum
+{

   wxUNKNOWN_PLATFORM,
   wxUNKNOWN_PLATFORM,

-  wxCURSES,     // Text-only CURSES
-  wxXVIEW_X,   // Sun's XView OpenLOOK toolkit
-  wxMOTIF_X,   // OSF Motif 1.x.x
-  wxCOSE_X,        // OSF Common Desktop Environment
-  wxNEXTSTEP,  // NeXTStep
-  wxMACINTOSH, // Apple System 7
-  wxGTK,           // GTK
-  wxQT,                // Qt
-  wxGEOS,          // GEOS
-  wxOS2_PM,        // OS/2 Workplace
-  wxWINDOWS,   // Windows or WfW
-  wxPENWINDOWS,        // Windows for Pen Computing
-  wxWINDOWS_NT,        // Windows NT
-  wxWIN32S,        // Windows 32S API
-  wxWIN95,         // Windows 95
-  wxWIN386         // Watcom 32-bit supervisor modus
+  wxCURSES,                 // Text-only CURSES
+  wxXVIEW_X,                // Sun's XView OpenLOOK toolkit
+  wxMOTIF_X,                // OSF Motif 1.x.x
+  wxCOSE_X,                 // OSF Common Desktop Environment
+  wxNEXTSTEP,               // NeXTStep
+  wxMACINTOSH,              // Apple System 7
+  wxGTK,                    // GTK
+  wxQT,                     // Qt
+  wxGEOS,                   // GEOS
+  wxOS2_PM,                 // OS/2 Workplace
+  wxWINDOWS,                // Windows or WfW
+  wxPENWINDOWS,             // Windows for Pen Computing
+  wxWINDOWS_NT,             // Windows NT
+  wxWIN32S,                 // Windows 32S API
+  wxWIN95,                  // Windows 95
+  wxWIN386                  // Watcom 32-bit supervisor modus

 };
 
 };
 

-// Printing
-#ifndef wxPORTRAIT
-#define wxPORTRAIT      1
-#define wxLANDSCAPE     2
-#endif
+/* Standard menu identifiers */
+#define wxID_LOWEST             4999

 
 

-// Standard menu identifiers

 #define wxID_OPEN               5000
 #define wxID_CLOSE              5001
 #define wxID_NEW                5002
 #define wxID_OPEN               5000
 #define wxID_CLOSE              5001
 #define wxID_NEW                5002


@@ -820,6 +1117,8 @@ enum {
 #define wxID_PASTE              5032
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_PASTE              5032
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034

+#define wxID_DUPLICATE          5035
+#define wxID_SELECTALL          5036

 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051
 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051


@@ -838,10 +1137,135 @@ enum {
 #define wxID_NO                 5104
 #define wxID_STATIC             5105
 
 #define wxID_NO                 5104
 #define wxID_STATIC             5105
 

-#ifdef __WXMSW__
-// Stand-ins for Windows types, to avoid
-// #including all of windows.h
+#define wxID_HIGHEST            5999
+
+// Mapping modes (as per Windows)
+#define wxMM_TEXT             1
+#define wxMM_LOMETRIC         2
+#define wxMM_HIMETRIC         3
+#define wxMM_LOENGLISH        4
+#define wxMM_HIENGLISH        5
+#define wxMM_TWIPS            6
+#define wxMM_ISOTROPIC        7
+#define wxMM_ANISOTROPIC      8
+
+#define wxMM_POINTS           9
+#define wxMM_METRIC          10
+
+/* Shortcut for easier dialog-unit-to-pixel conversion */
+#define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
+
+/* Paper types */
+typedef enum {
+    wxPAPER_NONE,               // Use specific dimensions
+    wxPAPER_LETTER,             // Letter, 8 1/2 by 11 inches
+    wxPAPER_LEGAL,              // Legal, 8 1/2 by 14 inches
+    wxPAPER_A4,                 // A4 Sheet, 210 by 297 millimeters
+    wxPAPER_CSHEET,             // C Sheet, 17 by 22 inches
+    wxPAPER_DSHEET,             // D Sheet, 22 by 34 inches
+    wxPAPER_ESHEET,             // E Sheet, 34 by 44 inches
+    wxPAPER_LETTERSMALL,        // Letter Small, 8 1/2 by 11 inches
+    wxPAPER_TABLOID,            // Tabloid, 11 by 17 inches
+    wxPAPER_LEDGER,             // Ledger, 17 by 11 inches
+    wxPAPER_STATEMENT,          // Statement, 5 1/2 by 8 1/2 inches
+    wxPAPER_EXECUTIVE,          // Executive, 7 1/4 by 10 1/2 inches
+    wxPAPER_A3,                 // A3 sheet, 297 by 420 millimeters
+    wxPAPER_A4SMALL,            // A4 small sheet, 210 by 297 millimeters
+    wxPAPER_A5,                 // A5 sheet, 148 by 210 millimeters
+    wxPAPER_B4,                 // B4 sheet, 250 by 354 millimeters
+    wxPAPER_B5,                 // B5 sheet, 182-by-257-millimeter paper
+    wxPAPER_FOLIO,              // Folio, 8-1/2-by-13-inch paper
+    wxPAPER_QUARTO,             // Quarto, 215-by-275-millimeter paper
+    wxPAPER_10X14,              // 10-by-14-inch sheet
+    wxPAPER_11X17,              // 11-by-17-inch sheet
+    wxPAPER_NOTE,               // Note, 8 1/2 by 11 inches
+    wxPAPER_ENV_9,              // #9 Envelope, 3 7/8 by 8 7/8 inches
+    wxPAPER_ENV_10,             // #10 Envelope, 4 1/8 by 9 1/2 inches
+    wxPAPER_ENV_11,             // #11 Envelope, 4 1/2 by 10 3/8 inches
+    wxPAPER_ENV_12,             // #12 Envelope, 4 3/4 by 11 inches
+    wxPAPER_ENV_14,             // #14 Envelope, 5 by 11 1/2 inches
+    wxPAPER_ENV_DL,             // DL Envelope, 110 by 220 millimeters
+    wxPAPER_ENV_C5,             // C5 Envelope, 162 by 229 millimeters
+    wxPAPER_ENV_C3,             // C3 Envelope, 324 by 458 millimeters
+    wxPAPER_ENV_C4,             // C4 Envelope, 229 by 324 millimeters
+    wxPAPER_ENV_C6,             // C6 Envelope, 114 by 162 millimeters
+    wxPAPER_ENV_C65,            // C65 Envelope, 114 by 229 millimeters
+    wxPAPER_ENV_B4,             // B4 Envelope, 250 by 353 millimeters
+    wxPAPER_ENV_B5,             // B5 Envelope, 176 by 250 millimeters
+    wxPAPER_ENV_B6,             // B6 Envelope, 176 by 125 millimeters
+    wxPAPER_ENV_ITALY,          // Italy Envelope, 110 by 230 millimeters
+    wxPAPER_ENV_MONARCH,        // Monarch Envelope, 3 7/8 by 7 1/2 inches
+    wxPAPER_ENV_PERSONAL,       // 6 3/4 Envelope, 3 5/8 by 6 1/2 inches
+    wxPAPER_FANFOLD_US,         // US Std Fanfold, 14 7/8 by 11 inches
+    wxPAPER_FANFOLD_STD_GERMAN, // German Std Fanfold, 8 1/2 by 12 inches
+    wxPAPER_FANFOLD_LGL_GERMAN, // German Legal Fanfold, 8 1/2 by 13 inches
+
+    wxPAPER_ISO_B4,             // B4 (ISO) 250 x 353 mm
+    wxPAPER_JAPANESE_POSTCARD,  // Japanese Postcard 100 x 148 mm
+    wxPAPER_9X11,               // 9 x 11 in
+    wxPAPER_10X11,              // 10 x 11 in
+    wxPAPER_15X11,              // 15 x 11 in
+    wxPAPER_ENV_INVITE,         // Envelope Invite 220 x 220 mm
+    wxPAPER_LETTER_EXTRA,       // Letter Extra 9 \275 x 12 in
+    wxPAPER_LEGAL_EXTRA,        // Legal Extra 9 \275 x 15 in
+    wxPAPER_TABLOID_EXTRA,      // Tabloid Extra 11.69 x 18 in
+    wxPAPER_A4_EXTRA,           // A4 Extra 9.27 x 12.69 in
+    wxPAPER_LETTER_TRANSVERSE,  // Letter Transverse 8 \275 x 11 in
+    wxPAPER_A4_TRANSVERSE,      // A4 Transverse 210 x 297 mm
+    wxPAPER_LETTER_EXTRA_TRANSVERSE, // Letter Extra Transverse 9\275 x 12 in
+    wxPAPER_A_PLUS,             // SuperA/SuperA/A4 227 x 356 mm
+    wxPAPER_B_PLUS,             // SuperB/SuperB/A3 305 x 487 mm
+    wxPAPER_LETTER_PLUS,        // Letter Plus 8.5 x 12.69 in
+    wxPAPER_A4_PLUS,            // A4 Plus 210 x 330 mm
+    wxPAPER_A5_TRANSVERSE,      // A5 Transverse 148 x 210 mm
+    wxPAPER_B5_TRANSVERSE,      // B5 (JIS) Transverse 182 x 257 mm
+    wxPAPER_A3_EXTRA,           // A3 Extra 322 x 445 mm
+    wxPAPER_A5_EXTRA,           // A5 Extra 174 x 235 mm
+    wxPAPER_B5_EXTRA,           // B5 (ISO) Extra 201 x 276 mm
+    wxPAPER_A2,                 // A2 420 x 594 mm
+    wxPAPER_A3_TRANSVERSE,      // A3 Transverse 297 x 420 mm
+    wxPAPER_A3_EXTRA_TRANSVERSE // A3 Extra Transverse 322 x 445 mm
+
+} wxPaperSize ;
+
+/* Printing orientation */
+#ifndef wxPORTRAIT
+#define wxPORTRAIT      1
+#define wxLANDSCAPE     2
+#endif

 
 

+/* Duplex printing modes
+ */
+
+typedef enum {
+    wxDUPLEX_SIMPLEX, // Non-duplex
+    wxDUPLEX_HORIZONTAL,
+    wxDUPLEX_VERTICAL
+} wxDuplexMode;
+
+/* Print quality.
+ */
+
+#define wxPRINT_QUALITY_HIGH    -1
+#define wxPRINT_QUALITY_MEDIUM  -2
+#define wxPRINT_QUALITY_LOW     -3
+#define wxPRINT_QUALITY_DRAFT   -4
+
+typedef int wxPrintQuality;
+
+/* Print mode (currently PostScript only)
+ */
+
+typedef enum {
+    wxPRINT_MODE_NONE =    0,
+    wxPRINT_MODE_PREVIEW = 1,   // Preview in external application
+    wxPRINT_MODE_FILE =    2,   // Print to file
+    wxPRINT_MODE_PRINTER = 3    // Send to printer
+} wxPrintMode;
+
+
+#ifdef __WXMSW__
+// Stand-ins for Windows types, to avoid #including all of windows.h

 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;
 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;


@@ -868,16 +1292,120 @@ typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef unsigned long   WXHKEY;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef unsigned long   WXHKEY;

+typedef unsigned long   WXHTREEITEM;
+

 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;

-#ifdef __GNUWIN32__
-typedef int (*WXFARPROC)();
+
+#if defined(__GNUWIN32__) || defined(__WXWINE__)
+    typedef int (*WXFARPROC)();
+#elif defined(__WIN32__)
+    typedef int (__stdcall *WXFARPROC)();

 #else
 #else

-typedef int (__stdcall *WXFARPROC)();
+    typedef int (*WXFARPROC)();

 #endif
 
 #endif
 

+typedef WXHWND WXWidget;
+#endif // MSW
+
+#ifdef __WXMOTIF__
+/* Stand-ins for X/Xt/Motif types */
+typedef void*           WXWindow;
+typedef void*           WXWidget;
+typedef void*           WXAppContext;
+typedef void*           WXColormap;
+typedef void            WXDisplay;
+typedef void            WXEvent;
+typedef void*           WXCursor;
+typedef void*           WXPixmap;
+typedef void*           WXFontStructPtr;
+typedef void*           WXGC;
+typedef void*           WXRegion;
+typedef void*           WXFont;
+typedef void*           WXImage;
+typedef void*           WXCursor;
+typedef void*           WXFontList;
+#endif // Motif
+
+#ifdef __WXGTK__
+/* Stand-ins for GLIB types */
+typedef int            gint;
+typedef unsigned       guint;
+typedef unsigned long  gulong;
+typedef void*          gpointer;
+
+/* Stand-ins for GDK types */
+typedef gulong                  GdkAtom;
+typedef struct _GdkColor        GdkColor;
+typedef struct _GdkColormap     GdkColormap;
+typedef struct _GdkFont         GdkFont;
+typedef struct _GdkGC           GdkGC;
+typedef struct _GdkWindow       GdkWindow;
+typedef struct _GdkWindow       GdkBitmap;
+typedef struct _GdkWindow       GdkPixmap;
+typedef struct _GdkCursor       GdkCursor;
+typedef struct _GdkRegion       GdkRegion;
+typedef struct _GdkDragContext  GdkDragContext;
+
+/* Stand-ins for GTK types */
+typedef struct _GtkWidget         GtkWidget;
+typedef struct _GtkStyle          GtkStyle;
+typedef struct _GtkAdjustment     GtkAdjustment;
+typedef struct _GtkList           GtkList;
+typedef struct _GtkToolbar        GtkToolbar;
+typedef struct _GtkTooltips       GtkTooltips;
+typedef struct _GtkNotebook       GtkNotebook;
+typedef struct _GtkNotebookPage   GtkNotebookPage;
+typedef struct _GtkAccelGroup     GtkAccelGroup;
+typedef        struct _GtkItemFactory    GtkItemFactory;
+typedef        struct _GtkSelectionData  GtkSelectionData;
+
+typedef GtkWidget *WXWidget;
+#endif // GTK
+
+// This is required because of clashing macros in windows.h, which may be
+// included before or after wxWindows classes, and therefore must be
+// disabled here before any significant wxWindows headers are included.
+#ifdef __WXMSW__
+#ifdef GetClassInfo
+#undef GetClassInfo

 #endif
 
 #endif
 

+#ifdef GetClassName
+#undef GetClassName
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
+
+#ifdef StartDoc
+#undef StartDoc
+#endif
+
+#ifdef FindWindow
+#undef FindWindow
+#endif
+
+#ifdef FindResource
+#undef FindResource
+#endif
+#endif
+  // __WXMSW__
+
+// ---------------------------------------------------------------------------
+// macro to define a class without copy ctor nor assignment operator
+// ---------------------------------------------------------------------------
+
+#define DECLARE_NO_COPY_CLASS(classname)        \
+    private:                                    \
+        classname(const classname&);            \
+        classname& operator=(const classname&)
+

 #endif
     // _WX_DEFS_H_
 #endif
     // _WX_DEFS_H_