From 0615f02d6a10080964b5f91982e5b54161530f3a Mon Sep 17 00:00:00 2001 From: Jouk Date: Wed, 15 Jul 2020 08:34:13 +0200 Subject: [PATCH] OpenVMS : add wxUSE_MENUBAR definition + fix for building wxMOTIF --- setup.h_vms | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index ddb49c8cce..9ff982a655 100644 --- 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) * - * Date : 18 December 2019 * + * Date : 15 July 2020 * * * *****************************************************************************/ @@ -65,13 +65,13 @@ #undef WORDS_BIGENDIAN /* Define this if you want to use GPE features */ -/* #undef __WXGPE__ */ +#undef __WXGPE__ /* Define this if your version of Motif is greater than 2.0 */ -/* #undef __WXMOTIF20__ */ +#undef __WXMOTIF20__ /* Define this if you are using Lesstif */ -/* #undef __WXLESSTIF__ */ +#undef __WXLESSTIF__ #ifdef __WXGTK__ @@ -101,6 +101,12 @@ /* Define this if your version of GTK+ is greater than 2.20 */ #undef __WXGTK220__ +/* Define this if your version of GTK+ is >= 3.0 */ +#undef __WXGTK3__ + +/* Define this if your version of GTK+ is >= 3.90.0 */ +#undef __WXGTK4__ + #include typedef pid_t GPid; @@ -400,11 +406,7 @@ typedef pid_t GPid; #define wxUSE_MARKUP 1 -#ifdef __WXMOTIF__ -#define wxUSE_POPUPWIN 0 -#else #define wxUSE_POPUPWIN 1 -#endif #define wxUSE_PREFERENCES_EDITOR 1 @@ -518,6 +520,8 @@ typedef pid_t GPid; #define wxUSE_MENUS 1 +#define wxUSE_MENUBAR 1 + #define wxUSE_NOTIFICATION_MESSAGE 1 #ifndef VMS_GTK2