We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to support optional MainMenu nib file

sdl-cocoa-menus.patch (text/plain), 1.61 KB, created by Eric Shepherd (:sheppy) on 2019-11-26 14:47:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Shepherd (:sheppy)

Created: 2019-11-26 14:47:01 UTC

Size: 1.61 KB

patch

obsolete

>diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
>--- a/src/video/cocoa/SDL_cocoaevents.m
>+++ b/src/video/cocoa/SDL_cocoaevents.m
>@@ -267,6 +267,25 @@ GetApplicationName(void)
>     return appName;
> }
> 
>+static bool
>+LoadMainMenuNibIfAvailable(void)
>+{
>+    NSDictionary *infoDict;
>+    NSString *mainNibFileName;
>+    bool success = false;
>+    
>+    infoDict = [[NSBundle mainBundle] infoDictionary];
>+    if (infoDict) {
>+        mainNibFileName = [infoDict valueForKey:@"NSMainNibFile"];
>+        
>+        if (mainNibFileName) {
>+            success = [[NSBundle mainBundle] loadNibNamed:mainNibFileName owner:[NSApplication sharedApplication] topLevelObjects:nil];
>+        }
>+    }
>+    
>+    return success;
>+}
>+
> static void
> CreateApplicationMenus(void)
> {
>@@ -281,7 +300,7 @@ CreateApplicationMenus(void)
>     if (NSApp == nil) {
>         return;
>     }
>-
>+    
>     mainMenu = [[NSMenu alloc] init];
> 
>     /* Create the main menu bar */
>@@ -385,8 +404,17 @@ Cocoa_RegisterApp(void)
>             [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
>         }
> 
>+        /* If there aren't already menus in place, look to see if there's
>+         * a nib we should use. If not, then manually create the basic
>+         * menus we meed.
>+         */
>         if ([NSApp mainMenu] == nil) {
>-            CreateApplicationMenus();
>+            bool nibLoaded;
>+            
>+            nibLoaded = LoadMainMenuNibIfAvailable();
>+            if (!nibLoaded) {
>+                CreateApplicationMenus();
>+            }
>         }
>         [NSApp finishLaunching];
>         if ([NSApp delegate]) {

Actions: View | Diff

Attachments on bug 4877: 4071

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.