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

@@ -469,6 +469,8 @@
 
 #cmakedefine01 wxUSE_MENUS
 
+#cmakedefine01 wxUSE_MENUBAR
+
 #cmakedefine01 wxUSE_NOTIFICATION_MESSAGE
 
 #cmakedefine01 wxUSE_PREFERENCES_EDITOR

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.}

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

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

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

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

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

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

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

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