A bunch of refactoring to address the open questions.

Author: playmer

examples/video/01-menubar/menubar.c

@@ -14,6 +14,8 @@ SDL_Renderer* renderer = NULL;
 SDL_MenuItem* checkable = NULL;
 SDL_MenuItem* new_window = NULL;
 
+SDL_MenuItem *menu_bar;
+
 typedef enum SDL_EventType_MenuExt
 {
   MENU_BAR_FILE,
@@ -35,42 +37,68 @@ typedef enum SDL_EventType_MenuExt
 
 static SDL_EventType_MenuExt EVENT_START = (SDL_EventType_MenuExt)0;
 
+void PrintMenuItems(SDL_MenuItem *menu_item, int indent, int *total_index)
+{
+    if (!menu_item) {
+        return;
+    }
+
+    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);
+
+    size_t item_count = SDL_GetMenuChildItems(menu_item);
+
+    for (size_t i = 0; i < item_count; ++i) {
+        PrintMenuItems(SDL_GetMenuChildItem(menu_item, i), indent + 1, total_index);
+    }
+}
+
 
 void CreateMenuBar()
 {
-  SDL_MenuItem* bar = SDL_CreateMenuBar(window);
+    menu_bar = SDL_CreateMenuBar(window);
 
   {
-    SDL_MenuItem* menu = SDL_CreateMenuItem(bar, "File", SDL_MENU, MENU_BAR_LAST);
-    new_window = SDL_CreateMenuItem(menu, "New Window", SDL_MENU_BUTTON, MENU_BAR_FILE_NEW_WINDOW);
-    checkable = SDL_CreateMenuItem(menu, "Enable New Window", SDL_MENU_CHECKABLE, MENU_BAR_FILE_DISABLE_NEW_WINDOW);
+    SDL_MenuItem* menu = SDL_CreateMenuItem(menu_bar, "File", SDL_MENUITEM_SUBMENU, MENU_BAR_LAST);
+    new_window = SDL_CreateMenuItem(menu, "New Window", SDL_MENUITEM_BUTTON, MENU_BAR_FILE_NEW_WINDOW);
+    checkable = SDL_CreateMenuItem(menu, "Enable New Window", SDL_MENUITEM_CHECKABLE, MENU_BAR_FILE_DISABLE_NEW_WINDOW);
 
-    SDL_CheckMenuItem(checkable);
+    SDL_SetMenuItemChecked(checkable, true);
   }
 
   {
-    SDL_MenuItem* menu = SDL_CreateMenuItem(bar, "Bookmarks", SDL_MENU, MENU_BAR_LAST);
-    SDL_MenuItem* main_bookmarks = SDL_CreateMenuItem(menu, "Bookmarks Toolbar", SDL_MENU, MENU_BAR_LAST);
-    SDL_MenuItem* discord = SDL_CreateMenuItem(main_bookmarks, "SDL Discord", SDL_MENU_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_DISCORD);
-    SDL_CreateMenuItem(main_bookmarks, "SDL GitHub", SDL_MENU_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_GITHUB);
-    SDL_CreateMenuItemAt(main_bookmarks, 0, "SDL Wiki", SDL_MENU_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_WIKI);
-
-    SDL_MenuItem *other_bookmarks = SDL_CreateMenuItem(main_bookmarks, "Other Bookmarks", SDL_MENU, MENU_BAR_LAST);
-    SDL_CreateMenuItem(other_bookmarks, "Stack Overflow", SDL_MENU_BUTTON, MENU_BAR_BOOKMARKS_OTHER_BOOKMARKS_STACKOVERFLOW);
+    SDL_MenuItem* menu = SDL_CreateMenuItem(menu_bar, "Bookmarks", SDL_MENUITEM_SUBMENU, MENU_BAR_LAST);
+    SDL_MenuItem* main_bookmarks = SDL_CreateMenuItem(menu, "Bookmarks Toolbar", SDL_MENUITEM_SUBMENU, MENU_BAR_LAST);
+    SDL_MenuItem* discord = SDL_CreateMenuItem(main_bookmarks, "SDL Discord", SDL_MENUITEM_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_DISCORD);
+    SDL_CreateMenuItem(main_bookmarks, "SDL GitHub", SDL_MENUITEM_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_GITHUB);
+    SDL_CreateMenuItemAt(main_bookmarks, 0, "SDL Wiki", SDL_MENUITEM_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_WIKI);
+
+    SDL_MenuItem *other_bookmarks = SDL_CreateMenuItem(main_bookmarks, "Other Bookmarks", SDL_MENUITEM_SUBMENU, MENU_BAR_LAST);
+    SDL_MenuItem *stack_overflow = SDL_CreateMenuItem(other_bookmarks, "Stack Overflow-test", SDL_MENUITEM_BUTTON, MENU_BAR_BOOKMARKS_OTHER_BOOKMARKS_STACKOVERFLOW);
+    SDL_SetMenuItemLabel(stack_overflow, "Stack Overflow");
 
     SDL_DestroyMenuItem(discord);
 
 
-    SDL_DisableMenuItem(other_bookmarks);
+    SDL_SetMenuItemChecked(other_bookmarks, false);
   }
 
   {
     // We can't create a top level checkable .
-    SDL_assert(!SDL_CreateMenuItem(bar, "Incognito", SDL_MENU_CHECKABLE, MENU_BAR_INCOGNITO));
+    SDL_assert(!SDL_CreateMenuItem(menu_bar, "Incognito", SDL_MENUITEM_CHECKABLE, MENU_BAR_INCOGNITO));
 
-    SDL_CreateMenuItem(bar, "Exit", SDL_MENU_BUTTON, MENU_BAR_EXIT);
+    SDL_CreateMenuItem(menu_bar, "Exit", SDL_MENUITEM_BUTTON, MENU_BAR_EXIT);
   }
 
+  SDL_SetWindowMenuBar(window, menu_bar);
+
   EVENT_START = (SDL_EventType_MenuExt)SDL_RegisterEvents(MENU_BAR_LAST);
 }
 
@@ -85,8 +113,13 @@ SDL_AppResult SDL_AppInit(void** appstate, int argc, char** argv) {
 
 SDL_AppResult SDL_AppIterate(void* appstate) {
 
-  SDL_SetRenderDrawColor(renderer, 128, 128, 128, 255);
+  SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
   SDL_RenderClear(renderer);
+
+  
+  SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+  int total_index = 0;
+  PrintMenuItems(menu_bar, 0, &total_index);
   SDL_RenderPresent(renderer);
 
   return SDL_APP_CONTINUE;
@@ -127,23 +160,13 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event) {
           case MENU_BAR_FILE_DISABLE_NEW_WINDOW:
           {
               bool is_checked = false;
-              SDL_MenuItemChecked(checkable, &is_checked);
-              if (is_checked) {
-                  SDL_UncheckMenuItem(checkable);
-              }
-              else {
-                  SDL_CheckMenuItem(checkable);
-              }
+              SDL_GetMenuItemChecked(checkable, &is_checked);
+              SDL_SetMenuItemChecked(checkable, !is_checked);
 
               bool is_enabled = false;
-              SDL_MenuItemEnabled(new_window, &is_enabled);
-              
-              if (is_enabled) {
-                  SDL_DisableMenuItem(new_window);
-              }
-              else {
-                  SDL_EnableMenuItem(new_window);
-              }
+              SDL_GetMenuItemEnabled(new_window, &is_enabled);
+              SDL_SetMenuItemEnabled(new_window, !is_enabled);
+
               break;
           }
           case MENU_BAR_EXIT:
@@ -155,6 +178,7 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event) {
     }
   }
 
+
   return SDL_APP_CONTINUE;
 }
 

include/SDL3/SDL_video.h

@@ -541,6 +541,19 @@ typedef Uint32 SDL_GLContextResetNotification;
 #define SDL_GL_CONTEXT_RESET_LOSE_CONTEXT     0x0001
 
 
+
+typedef enum SDL_MenuItemType
+{
+    SDL_MENUITEM_INVALID,
+    SDL_MENUITEM_MENUBAR,
+    SDL_MENUITEM_SUBMENU,
+    SDL_MENUITEM_BUTTON,
+    SDL_MENUITEM_CHECKABLE,
+} SDL_MenuItemType;
+
+typedef union SDL_MenuItem SDL_MenuItem;
+
+
 /* Function prototypes */
 
 /**
@@ -2944,6 +2957,7 @@ extern SDL_DECLSPEC SDL_ProgressState SDLCALL SDL_GetWindowProgressState(SDL_Win
  */
 extern SDL_DECLSPEC bool SDLCALL SDL_SetWindowProgressValue(SDL_Window *window, float value);
 
+
 /**
  * Get the value of the progress bar for the given window’s taskbar icon.
  *
@@ -2957,6 +2971,18 @@ extern SDL_DECLSPEC bool SDLCALL SDL_SetWindowProgressValue(SDL_Window *window,
  */
 extern SDL_DECLSPEC float SDLCALL SDL_GetWindowProgressValue(SDL_Window *window);
 
+/**
+ * Assigns a menu_bar to the given window, which will take ownership of it's destruction. NULL
+ * releases the menu_bar without destroying it.
+ */
+extern SDL_DECLSPEC SDL_MenuItem *SDL_GetWindowMenuBar(SDL_Window *window);
+
+/**
+ * Assigns a menu_bar to the given window, which will take ownership of it's destruction. NULL
+ * releases the menu_bar without destroying it.
+ */
+extern SDL_DECLSPEC bool SDL_SetWindowMenuBar(SDL_Window *window, SDL_MenuItem *menu_bar);
+
 /**
  * Destroy a window.
  *
@@ -3034,56 +3060,48 @@ extern SDL_DECLSPEC bool SDLCALL SDL_EnableScreenSaver(void);
  */
 extern SDL_DECLSPEC bool SDLCALL SDL_DisableScreenSaver(void);
 
-typedef enum SDL_MenuItemType
-{
-    SDL_MENUBAR,
-    SDL_MENU,
-    SDL_MENU_BUTTON,
-    SDL_MENU_CHECKABLE,
-} SDL_MenuItemType;
-
-typedef union SDL_MenuItem SDL_MenuItem;
-
 extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuBar(SDL_Window *window);
 
+#define SDL_PROP_MENUITEM_CREATE_LABEL "SDL.menuitem.create.label"
+
 /**
- * menu_bar_as_item must be a SDL_MENUBAR or SDL_MENU
- * event_type will be ignored if type == SDL_MENU
+ * menu_as_item must be a SDL_MENUITEM_MENUBAR or SDL_MENUITEM_SUBMENU
+ * event_type will be ignored if type == SDL_MENUITEM_SUBMENU
  * On MacOS, buttoms created under a menubar will go into the "App" submenu
  */
-extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuItemAt(SDL_MenuItem *menu_bar_as_item, size_t index, const char *name, SDL_MenuItemType type, Uint16 event_type);
+extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuItemAt(SDL_MenuItem *menu_as_item, size_t index, const char *Label, SDL_MenuItemType type, Uint16 event_type);
 
 /**
- * menu_bar_as_item must be a SDL_MENUBAR or SDL_MENU
- * event_type will be ignored if type == SDL_MENU
+ * menu_as_item must be a SDL_MENUITEM_MENUBAR or SDL_MENUITEM_SUBMENU
+ * event_type will be ignored if type == SDL_MENUITEM_SUBMENU
  * On MacOS, buttoms created under a menubar will go into the "App" submenu
  */
-extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_bar_as_item, const char *name, SDL_MenuItemType type, Uint16 event_type);
+extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_as_item, const char *Label, SDL_MenuItemType type, Uint16 event_type);
 
 /**
  * -1 on error
  */
-    extern SDL_DECLSPEC Sint64 SDL_ChildItems(SDL_MenuItem *menu_bar_as_item);
+extern SDL_DECLSPEC Sint64 SDL_GetMenuChildItems(SDL_MenuItem *menu_as_item);
+extern SDL_DECLSPEC SDL_MenuItem *SDL_GetMenuChildItem(SDL_MenuItem *menu_as_item, size_t index);
 
+extern SDL_DECLSPEC const char *SDL_GetMenuItemLabel(SDL_MenuItem *menu_item);
+extern SDL_DECLSPEC bool SDL_SetMenuItemLabel(SDL_MenuItem *menu_item, const char *label);
+extern SDL_DECLSPEC SDL_MenuItemType SDL_GetMenuItemType(SDL_MenuItem *menu_item);
 
 /**
- * Must be a SDL_MENU_CHECKABLE
+ * Must be a SDL_MENUITEM_CHECKABLE
  */
-    extern SDL_DECLSPEC bool SDL_CheckMenuItem(SDL_MenuItem *menu_item);
+extern SDL_DECLSPEC bool SDL_GetMenuItemChecked(SDL_MenuItem *menu_item, bool *checked);
 
 /**
- * Must be a SDL_MENU_CHECKABLE
+ * Must be a SDL_MENUITEM_CHECKABLE
  */
-    extern SDL_DECLSPEC bool SDL_UncheckMenuItem(SDL_MenuItem *menu_item);
+extern SDL_DECLSPEC bool SDL_SetMenuItemChecked(SDL_MenuItem *menu_item, bool checked);
 
-/**
- * Must be a SDL_MENU_CHECKABLE
- */
-    extern SDL_DECLSPEC bool SDL_MenuItemChecked(SDL_MenuItem *menu_item, bool *checked);
 
-extern SDL_DECLSPEC bool SDL_MenuItemEnabled(SDL_MenuItem *menu_item, bool *enabled);
-extern SDL_DECLSPEC bool SDL_EnableMenuItem(SDL_MenuItem *menu_item);
-extern SDL_DECLSPEC bool SDL_DisableMenuItem(SDL_MenuItem *menu_item);
+extern SDL_DECLSPEC bool SDL_GetMenuItemEnabled(SDL_MenuItem *menu_item, bool *enabled);
+extern SDL_DECLSPEC bool SDL_SetMenuItemEnabled(SDL_MenuItem *menu_item, bool enabled);
+
 extern SDL_DECLSPEC bool SDL_DestroyMenuItem(SDL_MenuItem *menu_item);
 
 /**

src/SDL_utils_c.h

@@ -62,6 +62,7 @@ typedef enum
     SDL_OBJECT_TYPE_HIDAPI_JOYSTICK,
     SDL_OBJECT_TYPE_THREAD,
     SDL_OBJECT_TYPE_TRAY,
+    SDL_OBJECT_TYPE_MENUBAR,
 
 } SDL_ObjectType;
 

src/dynapi/SDL_dynapi.sym

@@ -1265,31 +1265,19 @@ SDL3_0.0.0 {
     SDL_SavePNG_IO;
     SDL_SavePNG;
     SDL_CreateMenuBar;
-    SDL_CreateMenuBarItem;
-    SDL_CreateMenuItem;
-    SDL_CheckMenuItem;
-    SDL_EnableMenuItem;
-    SDL_CreateMenuBar
-    SDL_CreateMenuItemAt
-    SDL_CreateMenuItem
-    SDL_ChildItems
-    SDL_CheckMenuItem
-    SDL_UncheckMenuItem
-    SDL_MenuItemChecked
-    SDL_MenuItemEnabled
-    SDL_EnableMenuItem
-    SDL_DisableMenuItem
-    SDL_DestroyMenuItem
-    SDL_CreateMenuBar;
+    SDL_GetWindowMenuBar;
+    SDL_SetWindowMenuBar;
     SDL_CreateMenuItemAt;
     SDL_CreateMenuItem;
-    SDL_ChildItems;
-    SDL_CheckMenuItem;
-    SDL_UncheckMenuItem;
-    SDL_MenuItemChecked;
-    SDL_MenuItemEnabled;
-    SDL_EnableMenuItem;
-    SDL_DisableMenuItem;
+    SDL_GetMenuChildItems;
+    SDL_GetMenuChildItem;
+    SDL_GetMenuItemLabel;
+    SDL_GetMenuItemType;
+    SDL_SetMenuItemLabel;
+    SDL_SetMenuItemChecked;
+    SDL_GetMenuItemChecked;
+    SDL_GetMenuItemEnabled;
+    SDL_SetMenuItemEnabled;
     SDL_DestroyMenuItem;
     # extra symbols go here (don't modify this line)
   local: *;

src/dynapi/SDL_dynapi_overrides.h

@@ -1291,13 +1291,17 @@
 #define SDL_SavePNG_IO SDL_SavePNG_IO_REAL
 #define SDL_SavePNG SDL_SavePNG_REAL
 #define SDL_CreateMenuBar SDL_CreateMenuBar_REAL
+#define SDL_GetWindowMenuBar SDL_GetWindowMenuBar_REAL
+#define SDL_SetWindowMenuBar SDL_SetWindowMenuBar_REAL
 #define SDL_CreateMenuItemAt SDL_CreateMenuItemAt_REAL
 #define SDL_CreateMenuItem SDL_CreateMenuItem_REAL
-#define SDL_ChildItems SDL_ChildItems_REAL
-#define SDL_CheckMenuItem SDL_CheckMenuItem_REAL
-#define SDL_UncheckMenuItem SDL_UncheckMenuItem_REAL
-#define SDL_MenuItemChecked SDL_MenuItemChecked_REAL
-#define SDL_MenuItemEnabled SDL_MenuItemEnabled_REAL
-#define SDL_EnableMenuItem SDL_EnableMenuItem_REAL
-#define SDL_DisableMenuItem SDL_DisableMenuItem_REAL
+#define SDL_GetMenuChildItems SDL_GetMenuChildItems_REAL
+#define SDL_GetMenuChildItem SDL_GetMenuChildItem_REAL
+#define SDL_GetMenuItemLabel SDL_GetMenuItemLabel_REAL
+#define SDL_GetMenuItemType SDL_GetMenuItemType_REAL
+#define SDL_SetMenuItemLabel SDL_SetMenuItemLabel_REAL
+#define SDL_SetMenuItemChecked SDL_SetMenuItemChecked_REAL
+#define SDL_GetMenuItemChecked SDL_GetMenuItemChecked_REAL
+#define SDL_GetMenuItemEnabled SDL_GetMenuItemEnabled_REAL
+#define SDL_SetMenuItemEnabled SDL_SetMenuItemEnabled_REAL
 #define SDL_DestroyMenuItem SDL_DestroyMenuItem_REAL

src/dynapi/SDL_dynapi_procs.h

@@ -1298,19 +1298,18 @@ SDL_DYNAPI_PROC(SDL_Surface*,SDL_LoadPNG_IO,(SDL_IOStream *a,bool b),(a,b),retur
 SDL_DYNAPI_PROC(SDL_Surface*,SDL_LoadPNG,(const char *a),(a),return)
 SDL_DYNAPI_PROC(bool,SDL_SavePNG_IO,(SDL_Surface *a,SDL_IOStream *b,bool c),(a,b,c),return)
 SDL_DYNAPI_PROC(bool,SDL_SavePNG,(SDL_Surface *a,const char *b),(a,b),return)
-SDL_DYNAPI_PROC(SDL_MenuBar*, SDL_CreateMenuBar,(SDL_Window*a),(a),return)
-SDL_DYNAPI_PROC(SDL_MenuItem*,SDL_CreateMenuBarItem,(SDL_MenuBar*a,const char*b,SDL_MenuItemType c,Uint16 d),(a,b,c,d),return)
-SDL_DYNAPI_PROC(SDL_MenuItem*,SDL_CreateMenuItem,(SDL_Menu*a,const char*b,SDL_MenuItemType c,Uint16 d),(a,b,c,d),return)
-SDL_DYNAPI_PROC(bool, SDL_CheckMenuItem,(SDL_MenuItem*a, bool b),(a,b),return)
-SDL_DYNAPI_PROC(bool, SDL_EnableMenuItem,(SDL_MenuItem*a, bool b),(a,b),return)
 SDL_DYNAPI_PROC(SDL_MenuItem*,SDL_CreateMenuBar,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(SDL_MenuItem*,SDL_GetWindowMenuBar, (SDL_Window * a), (a),return)
+SDL_DYNAPI_PROC(bool,SDL_SetWindowMenuBar,(SDL_Window *a, SDL_MenuItem *b),(a, b),return)
 SDL_DYNAPI_PROC(SDL_MenuItem*,SDL_CreateMenuItemAt,(SDL_MenuItem *a,size_t b,const char *c,SDL_MenuItemType d, Uint16 e), (a,b,c,d,e), return)
 SDL_DYNAPI_PROC(SDL_MenuItem*,SDL_CreateMenuItem,(SDL_MenuItem *a, const char *b, SDL_MenuItemType c, Uint16 d),(a,b,c,d), return)
-SDL_DYNAPI_PROC(Sint64,SDL_ChildItems, (SDL_MenuItem *a),(a),return)
-SDL_DYNAPI_PROC(bool,SDL_CheckMenuItem,(SDL_MenuItem *a),(a),return)
-SDL_DYNAPI_PROC(bool,SDL_UncheckMenuItem,(SDL_MenuItem *a),(a),return)
-SDL_DYNAPI_PROC(bool,SDL_MenuItemChecked,(SDL_MenuItem *a,bool *b),(a, b),return)
-SDL_DYNAPI_PROC(bool,SDL_MenuItemEnabled,(SDL_MenuItem *a,bool *b),(a, b),return)
-SDL_DYNAPI_PROC(bool,SDL_EnableMenuItem,(SDL_MenuItem *a),(a),return)
-SDL_DYNAPI_PROC(bool,SDL_DisableMenuItem,(SDL_MenuItem *a),(a),return)
+SDL_DYNAPI_PROC(Sint64,SDL_GetMenuChildItems, (SDL_MenuItem *a),(a),return)
+SDL_DYNAPI_PROC(SDL_MenuItem*, SDL_GetMenuChildItem, (SDL_MenuItem *a, size_t b), (a,b), return)
+SDL_DYNAPI_PROC(const char *, SDL_GetMenuItemLabel, (SDL_MenuItem *a), (a), return)
+SDL_DYNAPI_PROC(bool, SDL_SetMenuItemLabel, (SDL_MenuItem *a,const char *b), (a,b), return)
+SDL_DYNAPI_PROC(SDL_MenuItemType, SDL_GetMenuItemType, (SDL_MenuItem *a), (a), return)
+SDL_DYNAPI_PROC(bool,SDL_GetMenuItemChecked,(SDL_MenuItem *a,bool *b),(a,b),return)
+SDL_DYNAPI_PROC(bool,SDL_SetMenuItemChecked,(SDL_MenuItem *a,bool b),(a,b),return)
+SDL_DYNAPI_PROC(bool,SDL_GetMenuItemEnabled,(SDL_MenuItem *a,bool *b),(a,b),return)
+SDL_DYNAPI_PROC(bool,SDL_SetMenuItemEnabled,(SDL_MenuItem *a,bool b),(a,b),return)
 SDL_DYNAPI_PROC(bool,SDL_DestroyMenuItem,(SDL_MenuItem *a),(a),return)