Examples: Apple: add native menu with Quit entry. Add missing title text. Standardize code.

.gitignore

@@ -66,6 +66,7 @@ cmake-build-*
 
 ## Unix executables from our example Makefiles
 examples/example_apple_metal/example_apple_metal
+examples/example_apple_metal4/example_apple_metal4
 examples/example_apple_opengl2/example_apple_opengl2
 examples/example_apple_opengl3/example_apple_opengl3
 examples/example_glfw_metal/example_glfw_metal

examples/example_apple_metal/main.mm

@@ -273,6 +273,20 @@
 
 @implementation AppDelegate
 
+-(void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    NSMenu* mainMenuBar = [[NSMenu alloc] init];
+    NSMenu* appMenu = [[NSMenu alloc] initWithTitle:@"Dear ImGui OSX+Metal Example"];
+    NSMenuItem* quitMenuItem = [appMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [quitMenuItem setTarget:NSApp];
+    [quitMenuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+
+    NSMenuItem* appMenuItem = [[NSMenuItem alloc] init];
+    [appMenuItem setSubmenu:appMenu];
+    [mainMenuBar addItem:appMenuItem];
+    [NSApp setMainMenu:mainMenuBar];
+}
+
 -(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {
     return YES;
@@ -287,6 +301,7 @@
                                                   styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable
                                                     backing:NSBackingStoreBuffered
                                                       defer:NO];
+        self.window.title = @"Dear ImGui OSX+Metal Example";
         self.window.contentViewController = rootViewController;
         [self.window center];
         [self.window makeKeyAndOrderFront:self];

examples/example_apple_metal4/main.mm

@@ -289,6 +289,20 @@
 
 @implementation AppDelegate
 
+-(void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    NSMenu* mainMenuBar = [[NSMenu alloc] init];
+    NSMenu* appMenu = [[NSMenu alloc] initWithTitle:@"Dear ImGui OSX+Metal4 Example"];
+    NSMenuItem* quitMenuItem = [appMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [quitMenuItem setTarget:NSApp];
+    [quitMenuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+
+    NSMenuItem* appMenuItem = [[NSMenuItem alloc] init];
+    [appMenuItem setSubmenu:appMenu];
+    [mainMenuBar addItem:appMenuItem];
+    [NSApp setMainMenu:mainMenuBar];
+}
+
 -(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {
     return YES;
@@ -303,6 +317,7 @@
                                                   styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable
                                                     backing:NSBackingStoreBuffered
                                                       defer:NO];
+        self.window.title = @"Dear ImGui OSX+Metal4 Example";
         self.window.contentViewController = rootViewController;
         [self.window center];
         [self.window makeKeyAndOrderFront:self];

examples/example_apple_opengl2/main.mm

@@ -191,19 +191,14 @@
 -(void)setupMenu
 {
     NSMenu* mainMenuBar = [[NSMenu alloc] init];
-    NSMenu* appMenu;
+    NSMenu* appMenu = [[NSMenu alloc] initWithTitle:@"Dear ImGui OSX+OpenGL2 Example"];
-    NSMenuItem* menuItem;
+    NSMenuItem* quitMenuItem = [appMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [quitMenuItem setTarget:NSApp];
+    [quitMenuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
 
-    appMenu = [[NSMenu alloc] initWithTitle:@"Dear ImGui OSX+OpenGL2 Example"];
+    NSMenuItem* appMenuItem = [[NSMenuItem alloc] init];
-    menuItem = [appMenu addItemWithTitle:@"Quit Dear ImGui OSX+OpenGL2 Example" action:@selector(terminate:) keyEquivalent:@"q"];
+    [appMenuItem setSubmenu:appMenu];
-    [menuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+    [mainMenuBar addItem:appMenuItem];
-
-    menuItem = [[NSMenuItem alloc] init];
-    [menuItem setSubmenu:appMenu];
-
-    [mainMenuBar addItem:menuItem];
-
-    appMenu = nil;
     [NSApp setMainMenu:mainMenuBar];
 }
 

examples/example_apple_opengl3/main.mm

@@ -191,19 +191,14 @@
 -(void)setupMenu
 {
     NSMenu* mainMenuBar = [[NSMenu alloc] init];
-    NSMenu* appMenu;
+    NSMenu* appMenu = [[NSMenu alloc] initWithTitle:@"Dear ImGui OSX+OpenGL3 Example"];
-    NSMenuItem* menuItem;
+    NSMenuItem* quitMenuItem = [appMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [quitMenuItem setTarget:NSApp];
+    [quitMenuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
 
-    appMenu = [[NSMenu alloc] initWithTitle:@"Dear ImGui OSX+OpenGL3 Example"];
+    NSMenuItem* appMenuItem = [[NSMenuItem alloc] init];
-    menuItem = [appMenu addItemWithTitle:@"Quit Dear ImGui OSX+OpenGL3 Example" action:@selector(terminate:) keyEquivalent:@"q"];
+    [appMenuItem setSubmenu:appMenu];
-    [menuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+    [mainMenuBar addItem:appMenuItem];
-
-    menuItem = [[NSMenuItem alloc] init];
-    [menuItem setSubmenu:appMenu];
-
-    [mainMenuBar addItem:menuItem];
-
-    appMenu = nil;
     [NSApp setMainMenu:mainMenuBar];
 }