moved custom menu up

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index c93c220075e85ea1fe619e19bfd8a89b83575835..c44530392bcb00393ea970d27e01cb97318099bb 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 16 August 2006                                                     *
+ * Date : 19 December 2006                                                   *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -88,6 +88,9 @@
 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 
 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 

+/* Define this if your version of GTK+ is greater than 2.10 */
+#define __WXGTK210__ 1
+

 #include <types.h>
 typedef pid_t GPid;
 
 #include <types.h>
 typedef pid_t GPid;
 


@@ -143,9 +146,6 @@ typedef pid_t GPid;
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

-#ifndef __WIN95__
-#undef __WIN95__
-#endif

 #ifndef __WIN32__
 #undef __WIN32__
 #endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif


@@ -167,10 +167,10 @@ typedef pid_t GPid;
 #endif
 
 
 #endif
 
 

-#define WXWIN_COMPATIBILITY_2_4 1
-

 #define WXWIN_COMPATIBILITY_2_6 1
 
 #define WXWIN_COMPATIBILITY_2_6 1
 

+#define WXWIN_COMPATIBILITY_2_8 1
+

 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 


@@ -219,7 +219,12 @@ typedef pid_t GPid;
 
 #define wxUSE_STD_IOSTREAM  0
 
 
 #define wxUSE_STD_IOSTREAM  0
 

-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+     || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif

 
 #define wxUSE_PRINTF_POS_PARAMS 0
 
 
 #define wxUSE_PRINTF_POS_PARAMS 0
 


@@ -260,12 +265,16 @@ typedef pid_t GPid;
 
 #define wxUSE_FS_ZIP        1
 
 
 #define wxUSE_FS_ZIP        1
 

+#define wxUSE_FS_ARCHIVE    1
+

 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 
 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 

+#define wxUSE_TARSTREAM     1
+

 #define wxUSE_ZLIB          1
 
 #define wxUSE_APPLE_IEEE          0
 #define wxUSE_ZLIB          1
 
 #define wxUSE_APPLE_IEEE          0


@@ -286,6 +295,8 @@ typedef pid_t GPid;
 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

+#define wxUSE_VARIANT 1
+

 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 1
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 1


@@ -298,14 +309,14 @@ typedef pid_t GPid;
 
 #define wxUSE_XRC       1
 
 
 #define wxUSE_XRC       1
 

-#if wxUSE_XRC
-#define wxUSE_XML       1
-#else
-#  define wxUSE_XML       1
-#endif
+#define wxUSE_XML       wxUSE_XRC

 
 #define wxUSE_AUI       1
 
 
 #define wxUSE_AUI       1
 

+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+

 #define wxUSE_CONTROLS     1
 
 #ifdef __WXMOTIF__
 #define wxUSE_CONTROLS     1
 
 #ifdef __WXMOTIF__


@@ -316,12 +327,14 @@ typedef pid_t GPid;
 
 #define wxUSE_TIPWINDOW    1
 
 
 #define wxUSE_TIPWINDOW    1
 

+#define wxUSE_ANIMATIONCTRL 1

 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
 #define wxUSE_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
 #define wxUSE_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1

+#define wxUSE_COLLPANE      1

 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_DATAVIEWCTRL   1
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_DATAVIEWCTRL   1


@@ -336,6 +349,7 @@ typedef pid_t GPid;
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1
 #define wxUSE_SCROLLBAR    1
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1
 #define wxUSE_SCROLLBAR    1

+#define wxUSE_SEARCHCTRL    1

 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1
 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1


@@ -438,6 +452,7 @@ typedef pid_t GPid;
 
 #define wxUSE_WIZARDDLG 1
 
 
 #define wxUSE_WIZARDDLG 1
 

+#define wxUSE_ABOUTDLG 1

 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -479,6 +494,8 @@ typedef pid_t GPid;
 
 #define wxUSE_HELP        1
 
 
 #define wxUSE_HELP        1
 

+#define wxUSE_MS_HTML_HELP 0
+

 #define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_RESOURCES   1
 #define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_RESOURCES   1


@@ -523,6 +540,8 @@ typedef pid_t GPid;
 
 #define wxUSE_LIBTIFF       1
 
 
 #define wxUSE_LIBTIFF       1
 

+#define wxUSE_TGA           1
+

 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1
 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1


@@ -537,18 +556,25 @@ typedef pid_t GPid;
 
 #define wxUSE_PALETTE       1
 
 
 #define wxUSE_PALETTE       1
 

+#define wxUSE_ALL_THEMES    0
+
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0
+

 /* --- end common options --- */
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
 /* --- end common options --- */
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */

-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)

 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
 /* enable rich edit under Win32 */
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
 /* enable rich edit under Win32 */

-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)

 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else


@@ -733,9 +759,11 @@ typedef pid_t GPid;
  */
 #define wxUSE_X_RESOURCES 1
 /*
  */
 #define wxUSE_X_RESOURCES 1
 /*

- * Use OLE (MSW only)
+ * Use OLE and OLE Automation (MSW only)

  */
 #define wxUSE_OLE 0
  */
 #define wxUSE_OLE 0

+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0

 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES


@@ -778,6 +806,11 @@ typedef pid_t GPid;
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM     0
+

 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
  
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
  


@@ -818,6 +851,9 @@ typedef pid_t GPid;
 /* Define if fsync() is available */
 #define HAVE_FSYNC 1
 
 /* Define if fsync() is available */
 #define HAVE_FSYNC 1
 

+/* Define if round() is available */
+/* #undef HAVE_ROUND */
+

 /* Define if you have ftime() */
 #define HAVE_FTIME
 
 /* Define if you have ftime() */
 #define HAVE_FTIME
 


@@ -849,6 +885,9 @@ typedef pid_t GPid;
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 

+/* Define if you have pthread_mutex_timedlock */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+

 /* Define if you have pthread_attr_setstacksize */
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 
 /* Define if you have pthread_attr_setstacksize */
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 


@@ -911,6 +950,9 @@ typedef pid_t GPid;
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 

+/* Define if you have strtoull() and strtoll() */
+#define HAVE_STRTOULL 1
+

 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 


@@ -941,6 +983,9 @@ typedef pid_t GPid;
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 

+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+

 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 


@@ -1109,6 +1154,9 @@ typedef pid_t GPid;
 #undef HAVE_WCTYPE_H
 #endif
 
 #undef HAVE_WCTYPE_H
 #endif
 

+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+

 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 


@@ -1186,6 +1234,9 @@ typedef pid_t GPid;
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 

+/* Define if fdopen is available.  */
+#define HAVE_FDOPEN 1
+

 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------


@@ -1199,10 +1250,6 @@ typedef pid_t GPid;
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 

-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_BOOLEAN
-

 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H
 
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H