Fixup CI

Author: playmer

examples/video/01-menubar/menubar.c

@@ -51,30 +51,43 @@ static SDL_EventType_MenuExt EVENT_START = (SDL_EventType_MenuExt)0;
 
 void PrintMenuItems(SDL_Renderer* renderer, SDL_MenuItem *menu_item, int indent, int *total_index)
 {
+    SDL_MenuItem *app_menu = NULL;
+    Sint64 item_count = 0;
+    Sint64 i = 0;
+
     if (!menu_item) {
         return;
     }
 
-    SDL_MenuItem *app_menu = SDL_GetMenuBarAppMenu(menu_item);
-    if (app_menu) {
-        SDL_RenderDebugText(renderer, (float)(8 * indent * 2), (float)(*total_index * 8), " -> AppMenu");
-        ++(*total_index);
-    }
-
     const char* label = SDL_GetMenuItemLabel(menu_item);
 
     if (!label) {
         label = "no label given";
     }
 
     SDL_RenderDebugText(renderer, (float)(8 * indent * 2), (float)(*total_index * 8), label);
-
     ++(*total_index);
+    
+    
+    if (SDL_GetMenuItemType(menu_item) == SDL_MENUITEM_MENUBAR) {
+        app_menu = SDL_GetMenuBarAppMenu(menu_item);
+        
+        if (app_menu) {
+            SDL_RenderDebugText(renderer, (float)(8 * (indent + 1) * 2), (float)(*total_index * 8), " -> AppMenu");
+            ++(*total_index);
+            
+            item_count = SDL_GetMenuChildItems(app_menu);
+            
+            for (i = 0; i < item_count; ++i) {
+                PrintMenuItems(renderer, SDL_GetMenuChildItem(app_menu, (size_t)i), indent + 2, total_index);
+            }
+        }
+    }
 
-    size_t item_count = SDL_GetMenuChildItems(menu_item);
+    item_count = SDL_GetMenuChildItems(menu_item);
 
-    for (size_t i = 0; i < item_count; ++i) {
-        PrintMenuItems(renderer, SDL_GetMenuChildItem(menu_item, i), indent + 1, total_index);
+    for (i = 0; i < item_count; ++i) {
+        PrintMenuItems(renderer, SDL_GetMenuChildItem(menu_item, (size_t)i), indent + 1, total_index);
     }
 }
 
@@ -114,10 +127,10 @@ void CreateMenuBar_1()
 
         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);
+            SDL_assert(!SDL_CreateMenuItem(menu_bar_1, "Exit 1", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT));
+            SDL_CreateMenuItem(app_menu, "Exit 1", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
         } else {
-            SDL_CreateMenuItem(menu_bar_1, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+            SDL_CreateMenuItem(menu_bar_1, "Exit 1", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
         }
     }
 
@@ -161,10 +174,10 @@ void CreateMenuBar_2()
 
         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);
+            SDL_assert(!SDL_CreateMenuItem(menu_bar_2, "Exit 2", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT));
+            SDL_CreateMenuItem(app_menu, "Exit 2", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
         } else {
-            SDL_CreateMenuItem(menu_bar_2, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
+            SDL_CreateMenuItem(menu_bar_2, "Exit 2", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
         }
     }
 

include/SDL3/SDL_video.h

@@ -3150,7 +3150,7 @@ extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_as_item,
 /**
  * Gets the number of children of the given menu, must be SDL_MENUITEM_MENUBAR or SDL_MENUITEM_SUBMENU
  *
- * \param menu_item the menu item to get the label of.
+ * \param menu_as_item the menu item to get the label of.
  * \returns the number of children of the given menu, or -1 on failure; call SDL_GetError() for more
  *          information.
  *

src/dynapi/SDL_dynapi.sym

@@ -1272,7 +1272,6 @@ SDL3_0.0.0 {
     SDL_CreateMenuItem;
     SDL_GetMenuChildItems;
     SDL_GetMenuChildItem;
-    SDL_GetMenuItemLabel;
     SDL_GetMenuItemType;
     SDL_SetMenuItemLabel;
     SDL_SetMenuItemChecked;

src/video/SDL_video.c

@@ -6332,9 +6332,15 @@ SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_bar_as_item, const char *lab
 SDL_MenuItem *SDL_GetMenuBarAppMenu(SDL_MenuItem *menu_bar)
 {
     CHECK_MENUITEM_MAGIC(menu_bar, NULL);
+
+    if (menu_bar->common.type != SDL_MENUITEM_MENUBAR) {
+        SDL_SetError("menu_bar must be a SDL_MENUITEM_MENUBAR.");
+        return NULL;
+    }
 
     if (!menu_bar->menu_bar.app_menu) {
         SDL_SetError("This platform doesn't support an Application menu.");
+        return NULL;
     }
 
     return menu_bar->menu_bar.app_menu;

src/video/cocoa/SDL_cocoavideo.m

@@ -390,8 +390,6 @@ bool Cocoa_SetWindowMenuBar(SDL_Window *window, SDL_MenuBar *menu_bar)
         return true;
     }
 
-    // If we don't set it to nil first, it won't change menu bars until you switch off and back on focus.
-    [NSApp setMainMenu:nil];
     PlatformMenuData* platform_data = (__bridge PlatformMenuData*)menu_bar->common.item_common.platform_data;
     [NSApp setMainMenu:platform_data->menu];
 

src/video/windows/SDL_windowsevents.c

@@ -2442,6 +2442,7 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
             event.menu.windowID = data->window->id;
 
             SDL_PushEvent(&event);
+            break;
         }
 
 #endif // !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)