Compilation fixes

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f84200020c3ff87565619f9c586c09d47be4e4d2..095cb07c4e96e504b34532bc3d9c2d8f471354fc 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -9,36 +9,42 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DEFSH__
-#define __DEFSH__
+#ifndef _WX_DEFS_H_
+#define _WX_DEFS_H_

 
 #ifdef __GNUG__
 #pragma interface "defs.h"
 #endif
 
 
 #ifdef __GNUG__
 #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"
 
 // Helps SGI compilation, apparently
 #include <stddef.h>
 
 #include "wx/setup.h"
 #include "wx/version.h"
 
 // Helps SGI compilation, apparently

-#if defined(__SGI__) && defined(__GNUG__)
+#if defined(__SGI__)
+#if defined(__GNUG__)

 #define __need_wchar_t
 #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
 
 #endif
 

-// Eliminate double/float warnings
-#ifdef _MSC_VER
-# pragma warning(disable:4244)
+#if defined(sun) || defined(__SUN__)
+# if !defined(__GNUG__)
+#  ifndef __SUNCC__
+#   define __SUNCC__
+#  endif
+# endif

 #endif
 
 #endif
 

+// suppress some Visual C++ warnings
+#ifdef _MSC_VER
+#   pragma warning(disable:4244)    // cobversion from double to float
+#   pragma warning(disable:4100)    // unreferenced formal parameter
+#endif

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


@@ -48,14 +54,11 @@
 #endif
 #if defined(__WXMOTIF__)
 # define __X__
 #endif
 #if defined(__WXMOTIF__)
 # define __X__

-#elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) 
-# ifndef __WXMSW__
-#  define __WXMSW__
-# endif

 #endif
 
 #endif
 

+#ifdef __WXMSW__

 // wxWindows checks for WIN32, not __WIN32__
 // wxWindows checks for WIN32, not __WIN32__

-#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__))
+#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))

 #define __WIN32__
 #endif
 
 #define __WIN32__
 #endif
 


@@ -67,14 +70,17 @@
 #define __WIN95__
 #endif
 
 #define __WIN95__
 #endif
 

+#endif // wxMSW
+

 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
 // 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(__MAC__) && !defined(__X__)
-#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__]"
+#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__]"

 #endif
 
 #endif
 

-#if defined(__WXMOTIF__) || defined(__WXGTK__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)

 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;
 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;


@@ -97,12 +103,25 @@
 // VC++ 4.0 is 1000.
 
 // Add more tests here for compilers that don't already define bool.
 // 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;
+#if defined( __MWERKS__ )
+    #if (__MWERKS__ < 0x1000) || !__option(bool)
+        typedef unsigned int bool;
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
+    typedef unsigned int bool;
+#elif defined(_MSC_VER) && (_MSC_VER == 1020)
+    #define bool unsigned int
+#elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+    typedef unsigned int bool;
+#elif defined(__WATCOMC__)
+    typedef unsigned int bool;
+#elif defined(__SUNCC__)
+    // If we use int, we get identically overloaded functions in config.cpp
+    typedef unsigned char bool;

 #endif
 
 #endif
 

-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)
-#define byte unsigned char
+#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
+    #define byte unsigned char

 #endif
 
 typedef short int WXTYPE;
 #endif
 
 typedef short int WXTYPE;


@@ -142,7 +161,7 @@ typedef int wxWindowID;
 #  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

-#    define WXDLLEXPORT_CTORFN __declspec( dllexport )
+#    define WXDLLEXPORT_CTORFN // __declspec( dllexport )

 #  elif defined(WXUSINGDLL)
 #    define WXDLLEXPORT __declspec( dllimport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
 #  elif defined(WXUSINGDLL)
 #    define WXDLLEXPORT __declspec( dllimport )
 #    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type


@@ -172,22 +191,9 @@ typedef int wxWindowID;
 class WXDLLEXPORT wxObject;
 class WXDLLEXPORT wxEvent;
 
 class WXDLLEXPORT wxObject;
 class WXDLLEXPORT wxEvent;
 

-// Vadim's types - check whether we need them all
-
-/// the type for various indexes (string, arrays, ...)
-typedef unsigned int    uint;
-
-/// extended boolean type: { yes, no, may be }
-typedef signed   int    EBool;
-
-/// with TRUE and FALSE is a possible value for a "3-state" boolean var
-#define UNKNOWN         (-1)
-  /** symbolic constant used by all Find()-like functions returning positive
+ /** symbolic constant used by all Find()-like functions returning positive

       integer on success as failure indicator */
 #define NOT_FOUND       (-1)
       integer on success as failure indicator */
 #define NOT_FOUND       (-1)

-  /** useful for Windows programmers: makes somewhat more clear all these 
-      zeroes being passed to Windows APIs */
-#define RESERVED        (NULL)

 
 // ----------------------------------------------------------------------------
 // Error codes
 
 // ----------------------------------------------------------------------------
 // Error codes


@@ -215,30 +221,47 @@ enum  ErrCode
 //  a question of style, because delete will do it itself anyhow, but it might
 //  be considered as an error by some overzealous debugging implementations of
 //  the library, so we do it ourselves)
 //  a question of style, because delete will do it itself anyhow, but it might
 //  be considered as an error by some overzealous debugging implementations of
 //  the library, so we do it ourselves)

-#define wxDELETE(p)      if ( (p) != NULL ) { delete (p); p = NULL; }
+#if defined(__SGI_CC__)
+// 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
+// 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
+#define wxDELETE(p)      if ( (p) != NULL ) { delete p; p = NULL; }
+#endif /* __SGI__CC__ */

 
 // delete an array and NULL it (see comments above)
 
 // delete an array and NULL it (see comments above)

-#define wxDELETEA(p)      if ( (p) != NULL ) { delete [] (p); p = NULL; }
+#if defined(__SGI_CC__)
+// see above comment.
+#define wxDELETEA(p)      if ( (p) ) { delete [] (p); p = 0L; }
+#else
+#define wxDELETEA(p)      if ( ((void *) (p)) != NULL ) { delete [] p; p = NULL; }
+#endif /* __SGI__CC__ */

 
 /// 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]))
 

+// Use of these suppresses some compiler warnings
+WXDLLEXPORT_DATA(extern const bool) wxTrue;
+WXDLLEXPORT_DATA(extern const bool) wxFalse;
+

 // ----------------------------------------------------------------------------
 // compiler and OS identification
 // ----------------------------------------------------------------------------
 
 // OS
 // ----------------------------------------------------------------------------
 // compiler and OS identification
 // ----------------------------------------------------------------------------
 
 // OS

-#if     defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__)
+#if     defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || defined(__unix__)

   #ifndef __UNIX__
     #define __UNIX__
   #endif
 #endif
 
 #ifndef __UNIX__                     // Windows
   #ifndef __UNIX__
     #define __UNIX__
   #endif
 #endif
 
 #ifndef __UNIX__                     // Windows

-  #ifndef __WXMSW__
-    #define __WXMSW__
-  #endif
-

   #if   defined(_MSC_VER)
     #define __VISUALC__
   #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
   #if   defined(_MSC_VER)
     #define __VISUALC__
   #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)


@@ -251,14 +274,6 @@ enum  ErrCode
 
 #endif  // OS
 
 
 #endif  // OS
 

-#if     defined(__UNIX__)
-  #define FILE_PATH_SEPARATOR   ('/')
-#elif   defined(__WXMSW__)
-  #define FILE_PATH_SEPARATOR   ('\\')
-#else
-  #error "don't know path separator for this platform"
-#endif
-

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


@@ -267,7 +282,7 @@ 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
   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.
   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.


@@ -277,6 +292,26 @@ enum  ErrCode
 
 #endif  // VC++
 
 
 #endif  // VC++
 

+#if _MSC_VER > 1010
+#undef try
+#undef except
+#undef finally
+#define except(x) catch(...)
+#elif defined(__MWERKS__)
+#undef try
+#undef except
+#undef finally
+#define except(x) catch(...)
+#endif
+
+// 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&);
 


@@ -291,7 +326,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.

- * 
+ *

  */
 
 /*
  */
 
 /*


@@ -370,7 +405,7 @@ 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


@@ -380,7 +415,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * 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.


@@ -394,21 +429,14 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
  * Styles for wxListBox
  */
 
  * Styles for wxListBox
  */
 

-// In wxListBox style flag
-#define wxSB_MASK           0x0008
-#define wxNEEDED_SB         0x0000
-#define wxALWAYS_SB         0x0008
-
-// New naming convention
-#define wxLB_NEEDED_SB      wxNEEDED_SB
-#define wxLB_ALWAYS_SB      wxALWAYS_SB

 #define wxLB_SORT           0x0010
 #define wxLB_SORT           0x0010

-// These duplicate the styles in the Multiple argument
-#define wxLB_SINGLE         0x0000
+#define wxLB_SINGLE         0x0020

 #define wxLB_MULTIPLE       0x0040
 #define wxLB_EXTENDED       0x0080
 // wxLB_OWNERDRAW is Windows-only
 #define wxLB_OWNERDRAW      0x0100
 #define wxLB_MULTIPLE       0x0040
 #define wxLB_EXTENDED       0x0080
 // wxLB_OWNERDRAW is Windows-only
 #define wxLB_OWNERDRAW      0x0100

+#define wxLB_NEEDED_SB      0x0200
+#define wxLB_ALWAYS_SB      0x0400

 #define wxLB_HSCROLL        wxHSCROLL
 
 /*
 #define wxLB_HSCROLL        wxHSCROLL
 
 /*


@@ -421,23 +449,29 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 

-// TODO For backward compatibility, need wxOLD_READONLY
-#define wxREADONLY          wxTE_READONLY
-#define wxEDITABLE          0
-
-// #define wxTE_RICHTEXT       0x0020
+// MSW-only
+#define wxTE_RICHTEXT       0x0020

 
 /*
  * wxComboBox style flags
  */
 #define wxCB_SIMPLE         0x0004
 
 /*
  * wxComboBox style flags
  */
 #define wxCB_SIMPLE         0x0004

-#define wxCB_DROPDOWN       0x0000

 #define wxCB_SORT           0x0008
 #define wxCB_SORT           0x0008

-#define wxCB_READONLY       wxREADONLY
+#define wxCB_READONLY       0x0010
+#define wxCB_DROPDOWN       0x0020

 
 /*
  * 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


@@ -452,7 +486,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * 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


@@ -470,7 +504,7 @@ 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
 


@@ -528,13 +562,20 @@ 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
 

+/*
+ * wxFrame extra flags
+ */
+
+// No title on taskbar
+#define wxFRAME_TOOL_WINDOW 0x0004
+

 /*
  * wxTabCtrl flags
  */
 /*
  * wxTabCtrl flags
  */


@@ -614,7 +655,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


@@ -686,8 +728,8 @@ typedef enum {
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
 
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
 

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

 
 enum wxDataFormat
 {
 
 enum wxDataFormat
 {


@@ -696,12 +738,14 @@ enum wxDataFormat
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */
   wxDF_DIB =              8,  /* CF_DIB */
   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */
   wxDF_DIB =              8,  /* CF_DIB */
   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */

-  wxDF_FILENAME =         15  /* CF_HDROP */
+  wxDF_FILENAME =         15, /* CF_HDROP */
+  wxDF_PRIVATE =          20

 };
 
 };
 

-// Virtual keycodes
+/* Virtual keycodes */

 
 

-enum _Virtual_keycodes {
+enum wxKeyCode 
+{

  WXK_BACK    =   8,
  WXK_TAB     =   9,
  WXK_RETURN  = 13,
  WXK_BACK    =   8,
  WXK_TAB     =   9,
  WXK_RETURN  = 13,


@@ -720,8 +764,8 @@ enum _Virtual_keycodes {
  WXK_MENU,
  WXK_PAUSE,
  WXK_CAPITAL,
  WXK_MENU,
  WXK_PAUSE,
  WXK_CAPITAL,

- WXK_PRIOR,  // Page up
- WXK_NEXT,   // Page down
+ WXK_PRIOR,  /* Page up */
+ WXK_NEXT,   /* Page down */

  WXK_END,
  WXK_HOME,
  WXK_LEFT,
  WXK_END,
  WXK_HOME,
  WXK_LEFT,


@@ -780,34 +824,36 @@ enum _Virtual_keycodes {
  WXK_PAGEDOWN
 };
 
  WXK_PAGEDOWN
 };
 

-// Colours - see wx_gdi.cc for database
-
-// OS mnemonics -- Identify the running OS (useful for Windows)
-// [Not all platforms are currently available or supported]
-enum {
-  wxCURSES,
-  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
-  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
+/* OS mnemonics -- Identify the running OS (useful for Windows)
+ * [Not all platforms are currently available or supported] */
+enum 
+{
+  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 */

 };
 
 };
 

-// Printing
+/* Printing */

 #ifndef wxPORTRAIT
 #define wxPORTRAIT      1
 #define wxLANDSCAPE     2
 #endif
 
 #ifndef wxPORTRAIT
 #define wxPORTRAIT      1
 #define wxLANDSCAPE     2
 #endif
 

-// Standard menu identifiers
+/* 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


@@ -832,6 +878,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


@@ -850,10 +898,14 @@ 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

 
 

+/* Shortcut for easier dialog-unit-to-pixel conversion */
+#define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
+
+#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;


@@ -879,12 +931,70 @@ typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXHCONV;
 typedef void *          WXRGNDATA;
 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)();
+#elif defined(__WIN32__)
+typedef int (__stdcall *WXFARPROC)();
+#else

 typedef int (*WXFARPROC)();
 typedef int (*WXFARPROC)();

+#endif
+
+#endif
+
+#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
+
+#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;
+
+/* 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 _GtkNotebook     GtkNotebook;
+typedef struct _GtkNotebookPage GtkNotebookPage;

 
 #endif
 
 
 #endif
 

+

 #endif
 #endif

-    // __WXDEFSH__
+    // _WX_DEFS_H_