Not working, gotta switch

Author: playmer

examples/video/01-menubar/menubar.c

@@ -52,7 +52,7 @@ void CreateMenuBar()
     SDL_CreateMenuItem(main_bookmarks, "SDL Wiki", SDL_MENU_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_WIKI);
     SDL_CreateMenuItem(main_bookmarks, "SDL Discord", SDL_MENU_BUTTON, MENU_BAR_BOOKMARKS_TOOLBAR_DISCORD);
 
-    SDL_MenuItem* other_bookmarks = SDL_CreateMenuItem(menu, "Other Bookmarks", SDL_MENU, MENU_BAR_LAST);
+    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_DisableMenuItem(other_bookmarks);

include/SDL3/SDL_video.h

@@ -3016,11 +3016,13 @@ typedef union SDL_MenuItem SDL_MenuItem;
 
 extern SDL_DECLSPEC SDL_MenuItem *SDL_CreateMenuBar(SDL_Window *window);
 
-// Must be a SDL_MENUBAR or SDL_MENU
+// menu_bar_as_item must be a SDL_MENUBAR or SDL_MENU
+// event_type will be ignored if type == SDL_MENU
 // 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);
 
-// Must be a SDL_MENUBAR or SDL_MENU
+// menu_bar_as_item must be a SDL_MENUBAR or SDL_MENU
+// event_type will be ignored if type == SDL_MENU
 // 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);
 

src/video/SDL_video.c

@@ -6093,13 +6093,21 @@ SDL_MenuItem *SDL_CreateMenuItemAt(SDL_MenuItem *menu_bar_as_item, size_t index,
 
     // Get the last item in the list and insert our new item.
     if (menu->child_list) {
-        SDL_MenuItem *common = menu->child_list;
+        SDL_MenuItem *current = menu->child_list;
 
-        while (common->common.next)
-            common = common->common.next;
+        for (size_t i = 1; i < index; ++i) {
+            current = current->common.next;
+        }
+
+        SDL_assert(current);
+
+        if (current->common.next) {
+            current->common.next->common.prev = menu_item;
+            menu_item->common.next = current->common.next;
+        }
 
-        common->common.next = menu_item;
-        menu_item->common.prev = common;
+        current->common.next = menu_item;
+        menu_item->common.prev = current;
     } else {
         menu->child_list = menu_item;
     }
@@ -6118,7 +6126,7 @@ SDL_MenuItem *SDL_CreateMenuItem(SDL_MenuItem *menu_bar_as_item, const char *nam
     }
 
     SDL_Menu_CommonData *menu = (SDL_Menu_CommonData *)menu_bar_as_item;
-    return SDL_CreateMenuItemAt(menu_bar_as_item, menu->children, name, type, event_type);
+    return SDL_CreateMenuItemAt(menu_bar_as_item, -1, name, type, event_type);
 }
 
 

src/video/windows/SDL_windowsvideo.c

@@ -816,11 +816,6 @@ static PlatformMenuData *CreatePlatformMenuData(HMENU owner_handle, UINT_PTR sel
     return platform;
 }
 
-static HWND GetHwndFromWindow(SDL_Window *window)
-{
-    return (HWND)SDL_GetPointerProperty(SDL_GetWindowProperties(window), SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
-}
-
 // PlatformMenuData platform_data = 
 
 bool SDLCALL Win32_CreateMenuBar(SDL_MenuBar *menu_bar)
@@ -833,8 +828,9 @@ bool SDLCALL Win32_CreateMenuBar(SDL_MenuBar *menu_bar)
     }
 
     menu_bar->common.item_common.platform_data = (void*)CreatePlatformMenuData(NULL, (UINT_PTR)menu_handle);
+    const SDL_WindowData *data = menu_bar->common.item_common.window->internal;
 
-    if (!SetMenu(GetHwndFromWindow(menu_bar->common.item_common.window), menu_handle)) {
+    if (!SetMenu(data->hwnd, menu_handle)) {
         WIN_SetError("Unable to set MenuBar");
         SDL_free(menu_bar->common.item_common.platform_data);
         DestroyMenu(menu_handle);
@@ -877,15 +873,18 @@ static bool Win32_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const
             flags |= MF_STRING;
         }
 
+        flags |= MF_BYPOSITION;
+
         platform_data->self_handle = (UINT_PTR)event_type;
     }
 
-    if (!AppendMenuA((HMENU)menu_platform_data->self_handle, flags, platform_data->self_handle, name)) {
+    if (!InsertMenuA((HMENU)menu_platform_data->self_handle, (UINT)index, flags, platform_data->self_handle, name)) {
         return WIN_SetError("Unable to append item to Menu.");
     }
 
+    const SDL_WindowData *data = menu_item->common.window->internal;
 
-    if (!DrawMenuBar(GetHwndFromWindow(menu_item->common.window))) {
+    if (!DrawMenuBar(data->hwnd)) {
         return WIN_SetError("Unable to draw menu bar");
     }