From f80ac025ba17488fd0578aaa9061b88926b080ae Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 28 Jun 2020 22:59:00 +0200 Subject: [PATCH] added wxUSE_MENUBAR for platforms like iOS where menus are available but menubars are not we need a finter level of control --- build/cmake/setup.h.in | 2 ++ docs/doxygen/mainpages/const_wxusedef.h | 3 ++- include/wx/android/setup.h | 9 ++++++++- include/wx/gtk/setup0.h | 9 ++++++++- include/wx/motif/setup0.h | 9 ++++++++- include/wx/msw/setup0.h | 9 ++++++++- include/wx/osx/setup0.h | 9 ++++++++- include/wx/setup_inc.h | 9 ++++++++- include/wx/univ/setup0.h | 9 ++++++++- setup.h.in | 2 ++ 10 files changed, 62 insertions(+), 8 deletions(-) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index 613cef5ba5..77f5c8111e 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -469,6 +469,8 @@ #cmakedefine01 wxUSE_MENUS +#cmakedefine01 wxUSE_MENUBAR + #cmakedefine01 wxUSE_NOTIFICATION_MESSAGE #cmakedefine01 wxUSE_PREFERENCES_EDITOR diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index 8124f108c7..bfe3bad8bc 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -169,7 +169,8 @@ library: @itemdef{wxUSE_MDI_ARCHITECTURE, Use MDI-based document-view classes.} @itemdef{wxUSE_MEDIACTRL, Use wxMediaCtrl.} @itemdef{wxUSE_MEMORY_TRACING, Use wxWidgets memory leak detection, not recommended if using another memory debugging tool.} -@itemdef{wxUSE_MENUS, Use wxMenu and related classes.} +@itemdef{wxUSE_MENUS, Use wxMenu and wxMenuItem.} +@itemdef{wxUSE_MENUBAR, Use wxMenubar.} @itemdef{wxUSE_METAFILE, Use wxMetaFile and related classes.} @itemdef{wxUSE_MIMETYPE, Use wxFileType class.} @itemdef{wxUSE_MINIFRAME, Use wxMiniFrame class.} diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index af4585828d..197a0af802 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -1129,13 +1129,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 639f912d52..e09a86bfdf 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -1130,13 +1130,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 7f7ff9eb8a..cf7268d1a5 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -1130,13 +1130,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index e7b9d06668..0905003ab1 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1130,13 +1130,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index d45ea59db7..04636ec158 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -1136,13 +1136,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 99e95fd8b7..623ed70752 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -1126,13 +1126,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 7c2852039b..a8ab9b665f 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -1129,13 +1129,20 @@ // depends on it) #define wxUSE_INFOBAR 1 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user diff --git a/setup.h.in b/setup.h.in index 59a8fce331..b724a18cbe 100644 --- a/setup.h.in +++ b/setup.h.in @@ -469,6 +469,8 @@ #define wxUSE_MENUS 0 +#define wxUSE_MENUBAR 0 + #define wxUSE_NOTIFICATION_MESSAGE 0 #define wxUSE_PREFERENCES_EDITOR 0