Started appmenu work, not remotely ready.

Author: playmer

src/dynapi/SDL_dynapi.sym

@@ -1265,6 +1265,7 @@ SDL3_0.0.0 {
     SDL_SavePNG_IO;
     SDL_SavePNG;
     SDL_CreateMenuBar;
+    SDL_GetMenuBarAppMenu;
     SDL_GetWindowMenuBar;
     SDL_SetWindowMenuBar;
     SDL_CreateMenuItemAt;

src/dynapi/SDL_dynapi_overrides.h

@@ -1291,6 +1291,7 @@
 #define SDL_SavePNG_IO SDL_SavePNG_IO_REAL
 #define SDL_SavePNG SDL_SavePNG_REAL
 #define SDL_CreateMenuBar SDL_CreateMenuBar_REAL
+#define SDL_GetMenuBarAppMenu SDL_GetMenuBarAppMenu_REAL
 #define SDL_GetWindowMenuBar SDL_GetWindowMenuBar_REAL
 #define SDL_SetWindowMenuBar SDL_SetWindowMenuBar_REAL
 #define SDL_CreateMenuItemAt SDL_CreateMenuItemAt_REAL

src/dynapi/SDL_dynapi_procs.h

@@ -1301,6 +1301,7 @@ SDL_DYNAPI_PROC(bool,SDL_SavePNG,(SDL_Surface *a,const char *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_GetMenuBarAppMenu,(SDL_MenuItem *a),(a),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_GetMenuChildItems, (SDL_MenuItem *a),(a),return)

src/video/SDL_sysvideo.h

@@ -236,6 +236,7 @@ typedef struct SDL_MenuBar
 {
     SDL_Menu_CommonData common;
     SDL_Window *window;
+    SDL_MenuItem *app_menu;
 } SDL_MenuBar;
 
 typedef struct SDL_SubMenu

src/video/SDL_video.c

@@ -6162,18 +6162,37 @@ bool SDL_SetWindowMenuBar(SDL_Window* window, SDL_MenuItem* menu_bar)
     CHECK_WINDOW_MAGIC(window, false);
 
     if (!_this) {
-        return false;
+        return SDL_UninitializedVideo();
+    }
+    
+    // Same Window/MenuBar combination, no need to do anything.
+    if (menu_bar->menu_bar.window == window) {
+        return true;
     }
 
-    if (!menu_bar) {
+    // Passed NULL to the Window, user wants to retake ownership of the menubar.
+    if (!menu_bar && window->menu_bar) {
+        bool success = _this->SetWindowMenuBar(NULL);
+        
+        SDL_SetObjectValid(window->menu_bar, SDL_OBJECT_TYPE_MENUBAR, true);
         window->menu_bar = NULL;
-        return true;
+        
+        return success;
     }
 
     if (menu_bar->common.type != SDL_MENUITEM_MENUBAR) {
         SDL_SetError("Can't set menu Item that isn't a Menu onto a Window.");
         return false;
     }
+    
+    if (menu_bar->menu_bar.window) {
+        bool success = _this->SetWindowMenuBar(NULL);
+        SDL_SetObjectValid(menu_bar->menu_bar.window->menu_bar, SDL_OBJECT_TYPE_MENUBAR, true);
+        window->menu_bar = NULL;
+        menu_bar->menu_bar.window->menu_bar
+        
+        menu_bar->menu_bar.window = NULL;
+    }
 
     SDL_MenuBar *menu_bar_real = (SDL_MenuBar*)menu_bar;
     menu_bar_real->window = window;
@@ -6284,11 +6303,6 @@ Uint32 SDL_GetIndexInMenu(SDL_MenuItem *menu_item)
     return i;
 }
 
-SDL_MenuItem *SDL_CreateMenuItemWithProperties(SDL_MenuItem *menu_bar_as_item, SDL_PropertiesID props)
-{
-    return NULL;
-}
-
 SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_bar_as_item, const char *label, SDL_MenuItemType type, Uint16 event_type)
 {
     CHECK_MENUITEM_MAGIC(menu_bar_as_item, NULL);
@@ -6301,6 +6315,18 @@ SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_bar_as_item, const char *lab
     return SDL_CreateMenuItemAt(menu_bar_as_item, menu->num_children, label, type, event_type);
 }
 
+
+SDL_MenuItem *SDL_GetMenuBarAppMenu(SDL_MenuBar *menu_bar)
+{
+    CHECK_MENUITEM_MAGIC(menu_bar, NULL);
+    
+    if (!menu_bar->app_menu) {
+        SDL_SetError("This platform doesn't support an Application menu.");
+    }
+    
+    return menu_bar->app_menu;
+}
+
 Sint64 SDL_GetMenuChildItems(SDL_MenuItem *menu_as_item)
 {
     CHECK_MENUITEM_MAGIC(menu_as_item, -1);