Rewrote SetWindowMenuBar, need to test it.

Author: playmer

src/video/SDL_sysvideo.h

@@ -372,7 +372,7 @@ struct SDL_VideoDevice
     bool (*ReconfigureWindow)(SDL_VideoDevice *_this, SDL_Window *window, SDL_WindowFlags flags);
 
     bool (*CreateMenuBar)(SDL_MenuBar *menu_bar);
-    bool (*SetWindowMenuBar)(SDL_MenuBar *menu_bar);
+    bool (*SetWindowMenuBar)(SDL_Window *window, SDL_MenuBar *menu_bar);
     bool (*CreateMenuItemAt)(SDL_MenuItem *menu_item, size_t index, const char *name, Uint16 event_type);
     bool (*SetMenuItemLabel)(SDL_MenuItem *menu_item, const char *label);
     bool (*GetMenuItemChecked)(SDL_MenuItem *menu_item, bool *checked);

src/video/SDL_video.c

@@ -6164,39 +6164,37 @@ bool SDL_SetWindowMenuBar(SDL_Window* window, SDL_MenuItem* menu_bar)
     if (!_this) {
         return SDL_UninitializedVideo();
     }
-    
-    // Same Window/MenuBar combination, no need to do anything.
-    if (menu_bar->menu_bar.window == window) {
-        return true;
-    }
 
     // Passed NULL to the Window, user wants to retake ownership of the menubar.
     if (!menu_bar && window->menu_bar) {
-        bool success = _this->SetWindowMenuBar(NULL);
+        bool success = _this->SetWindowMenuBar(window, NULL);
 
         SDL_SetObjectValid(window->menu_bar, SDL_OBJECT_TYPE_MENUBAR, true);
         window->menu_bar = NULL;
 
         return success;
     }
 
+    // Same Window/MenuBar combination, no need to do anything.
+    if (menu_bar->menu_bar.window == window) {
+        return true;
+    }
+
     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;
     }
-    
+
+    // menu_bar is already on another window, null out the menubar on that window
+    // before we add this menubar to the given window.
     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;
+        _this->SetWindowMenuBar(menu_bar->menu_bar.window, NULL);
     }
 
     SDL_MenuBar *menu_bar_real = (SDL_MenuBar*)menu_bar;
     menu_bar_real->window = window;
 
+    // Window has an existing MenuBar, release it back to the user.
     if (window->menu_bar) {
         SDL_SetObjectValid(window->menu_bar, SDL_OBJECT_TYPE_MENUBAR, true);
     }
@@ -6205,7 +6203,7 @@ bool SDL_SetWindowMenuBar(SDL_Window* window, SDL_MenuItem* menu_bar)
 
     SDL_SetObjectValid(menu_bar_real, SDL_OBJECT_TYPE_MENUBAR, false);
 
-    return _this->SetWindowMenuBar(menu_bar_real);
+    return _this->SetWindowMenuBar(window, menu_bar_real);
 }
 
 void SDL_CleanupMenubars()

src/video/cocoa/SDL_cocoavideo.m

@@ -370,8 +370,13 @@ bool Cocoa_CreateMenuBar(SDL_MenuBar *menu_bar)
     return true;
 }
 
-bool Cocoa_SetWindowMenuBar(SDL_MenuBar *menu_bar)
+bool Cocoa_SetWindowMenuBar(SDL_Window *window, SDL_MenuBar *menu_bar)
 {
+    if (menu_bar == NULL) {
+        [NSApp setMainMenu:nil];
+        return true;
+    }
+
     // We don't actually set the menubar until the window is in focus
     if (!menu_bar->window->keyboard_focus) {
         return true;

src/video/cocoa/SDL_cocoawindow.h

@@ -197,7 +197,7 @@ extern bool Cocoa_SyncWindow(SDL_VideoDevice *_this, SDL_Window *window);
 extern void Cocoa_MenuVisibilityCallback(void *userdata, const char *name, const char *oldValue, const char *newValue);
 
 extern bool Cocoa_CreateMenuBar(SDL_MenuBar *menu_bar);
-extern bool Cocoa_SetWindowMenuBar(SDL_MenuBar *menu_bar);
+extern bool Cocoa_SetWindowMenuBar(SDL_Window *window, SDL_MenuBar *menu_bar);
 extern bool Cocoa_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const char *name, Uint16 event_type);
 extern bool Cocoa_SetMenuItemLabel(SDL_MenuItem *menu_item, const char *label);
 extern bool Cocoa_GetMenuItemChecked(SDL_MenuItem *menu_item, bool *checked);

src/video/windows/SDL_windowsvideo.c

@@ -920,8 +920,19 @@ bool Win32_CreateMenuBar(SDL_MenuBar *menu_bar)
     return true;
 }
 
-bool Win32_SetWindowMenuBar(SDL_MenuBar *menu_bar)
+bool Win32_SetWindowMenuBar(SDL_Window *window, SDL_MenuBar *menu_bar)
 {
+    if (!menu_bar) {
+        const SDL_WindowData *data = window->internal;
+
+        if (!SetMenu(data->hwnd, (HMENU)NULL)) {
+            WIN_SetError("Unable to unset MenuBar");
+            return false;
+        }
+        
+        return true;
+    }
+
     const PlatformMenuData *menu_platform_data = (PlatformMenuData *)menu_bar->common.item_common.platform_data;
     const SDL_WindowData *data = menu_bar->common.item_common.menu_bar->window->internal;
 

src/video/windows/SDL_windowsvideo.h

@@ -672,15 +672,15 @@ typedef struct PlatformMenuData
     Uint16 user_event_type;
 } PlatformMenuData;
 
-extern bool Cocoa_CreateMenuBar(SDL_MenuBar *menu_bar);
-extern bool Cocoa_SetWindowMenuBar(SDL_MenuBar *menu_bar);
-extern bool Cocoa_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const char *name, Uint16 event_type);
-
-extern bool Cocoa_SetMenuItemLabel(SDL_MenuItem *menu_item, const char *label);
-extern bool Cocoa_GetMenuItemChecked(SDL_MenuItem *menu_item, bool *checked);
-extern bool Cocoa_SetMenuItemChecked(SDL_MenuItem *menu_item, bool checked);
-extern bool Cocoa_GetMenuItemEnabled(SDL_MenuItem *menu_item, bool *enabled);
-extern bool Cocoa_SetMenuItemEnabled(SDL_MenuItem *menu_item, bool enabled);
-extern bool Cocoa_DestroyMenuItem(SDL_MenuItem *menu_item);
+extern bool Win32_CreateMenuBar(SDL_MenuBar *menu_bar);
+extern bool Win32_SetWindowMenuBar(SDL_Window *window, SDL_MenuBar *menu_bar);
+extern bool Win32_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const char *name, Uint16 event_type);
+
+extern bool Win32_SetMenuItemLabel(SDL_MenuItem *menu_item, const char *label);
+extern bool Win32_GetMenuItemChecked(SDL_MenuItem *menu_item, bool *checked);
+extern bool Win32_SetMenuItemChecked(SDL_MenuItem *menu_item, bool checked);
+extern bool Win32_GetMenuItemEnabled(SDL_MenuItem *menu_item, bool *enabled);
+extern bool Win32_SetMenuItemEnabled(SDL_MenuItem *menu_item, bool enabled);
+extern bool Win32_DestroyMenuItem(SDL_MenuItem *menu_item);
 
 #endif // SDL_windowsvideo_h_