Most of the App Menu Stuff, need to think about destruction.

Author: playmer

examples/video/01-menubar/menubar.c

@@ -106,7 +106,13 @@ void CreateMenuBar_1()
         // We can't create a top level checkable .
         SDL_assert(!SDL_CreateMenuItem(menu_bar_1, "Incognito", SDL_MENUITEM_CHECKABLE, MENU_BAR_INCOGNITO));
 
-        SDL_CreateMenuItem(menu_bar_1, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+        SDL_MenuItem* app_menu = SDL_GetMenuBarAppMenu(menu_bar_1);
+        if (app_menu) {
+            SDL_assert(!SDL_CreateMenuItem(menu_bar_1, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT));
+            SDL_CreateMenuItem(app_menu, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+        } else {
+            SDL_CreateMenuItem(menu_bar_1, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+        }
     }
 
     SDL_SetWindowMenuBar(window_1, menu_bar_1);
@@ -147,7 +153,13 @@ void CreateMenuBar_2()
         // We can't create a top level checkable .
         SDL_assert(!SDL_CreateMenuItem(menu_bar_2, "Incognito_2", SDL_MENUITEM_CHECKABLE, MENU_BAR_INCOGNITO));
 
-        SDL_CreateMenuItem(menu_bar_2, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+        SDL_MenuItem* app_menu = SDL_GetMenuBarAppMenu(menu_bar_2);
+        if (app_menu) {
+            SDL_assert(!SDL_CreateMenuItem(menu_bar_2, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT));
+            SDL_CreateMenuItem(app_menu, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+        } else {
+            SDL_CreateMenuItem(menu_bar_2, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+        }
     }
 
     SDL_SetWindowMenuBar(window_2, menu_bar_2);

include/SDL3/SDL_video.h

@@ -3062,7 +3062,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_DisableScreenSaver(void);
 
 extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuBar();
 
-#define SDL_PROP_MENUITEM_CREATE_LABEL "SDL.menuitem.create.label"
+extern SDL_DECLSPEC SDL_MenuItem *SDL_GetMenuBarAppMenu(SDL_MenuItem *menu_bar);
 
 /**
  * menu_as_item must be a SDL_MENUITEM_MENUBAR or SDL_MENUITEM_SUBMENU

src/video/SDL_video.c

@@ -6321,15 +6321,15 @@ SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_bar_as_item, const char *lab
 }
 
 
-SDL_MenuItem *SDL_GetMenuBarAppMenu(SDL_MenuBar *menu_bar)
+SDL_MenuItem *SDL_GetMenuBarAppMenu(SDL_MenuItem *menu_bar)
 {
     CHECK_MENUITEM_MAGIC(menu_bar, NULL);
 
-    if (!menu_bar->app_menu) {
+    if (!menu_bar->menu_bar.app_menu) {
         SDL_SetError("This platform doesn't support an Application menu.");
     }
 
-    return menu_bar->app_menu;
+    return menu_bar->menu_bar.app_menu;
 }
 
 Sint64 SDL_GetMenuChildItems(SDL_MenuItem *menu_as_item)

src/video/cocoa/SDL_cocoavideo.m

@@ -360,6 +360,7 @@ bool Cocoa_CreateMenuBar(SDL_MenuBar *menu_bar)
     app_menu->common.type = SDL_MENUITEM_SUBMENU;
     app_menu->common.enabled = true;
     app_menu->common.parent = (SDL_MenuItem*)menu_bar;
+    app_menu->common.menu_bar = menu_bar;
 
     PlatformMenuData* app_menu_platform_data = [PlatformMenuData new];
     app_menu->common.platform_data = (void*)CFBridgingRetain(app_menu_platform_data);
@@ -372,6 +373,7 @@ bool Cocoa_CreateMenuBar(SDL_MenuBar *menu_bar)
     [platform_menu->menu addItem:app_menu_platform_data->menu_item];
 
     menu_bar->common.item_common.platform_data = (void*)CFBridgingRetain(platform_menu);
+    menu_bar->app_menu = app_menu;
 
     return true;
 }
@@ -398,6 +400,11 @@ bool Cocoa_SetWindowMenuBar(SDL_Window *window, SDL_MenuBar *menu_bar)
 
 bool Cocoa_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const char *name, Uint16 event_type)
 {
+    if ((menu_item->common.parent->common.type == SDL_MENUITEM_MENUBAR) && (menu_item->common.type != SDL_MENUITEM_SUBMENU)) {
+        SDL_SetError("No top level Checkables or Buttons on this platform");
+        return false;
+    }
+    
     PlatformMenuData* platform_data = [PlatformMenuData new];
     menu_item->common.platform_data = (void*)CFBridgingRetain(platform_data);
     platform_data->user_event_type = event_type;
@@ -420,14 +427,7 @@ bool Cocoa_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const char *n
         [platform_data->menu_item setAction:@selector(Cocoa_PlatformMenuData_MenuButtonClicked:)];
         [platform_data->menu_item setTarget:platform_data];
         [platform_data->menu_item setEnabled:true];
-        
-        if ((menu_item->common.parent->common.type == SDL_MENUITEM_MENUBAR) && (menu_item->common.type != SDL_MENUITEM_SUBMENU)) {
-            NSMenu* app_menu = [[parent_platform_data->menu itemAtIndex:(NSInteger)0] submenu];
-            [app_menu addItem:platform_data->menu_item];
-            
-        } else {
-            [parent_platform_data->menu insertItem:platform_data->menu_item atIndex:(NSInteger)index];
-        }
+        [parent_platform_data->menu insertItem:platform_data->menu_item atIndex:(NSInteger)index];
     }
     return true;
 }