From 6337fd567e99229a5eae69dbdf95ff94b973d9e7 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Mon, 14 Aug 2023 02:30:38 +0200 Subject: Move main_menu.{h,m} to MainMenu.{h,m} Decided to use Core Foundation naming conventions here instead of C-style lowercase. It seems to fit better with the Objective-C code. --- src/AppDelegate.m | 4 ++-- src/MainMenu.h | 8 ++++++++ src/MainMenu.m | 22 ++++++++++++++++++++++ src/main_menu.h | 8 -------- src/main_menu.m | 22 ---------------------- 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 src/MainMenu.h create mode 100644 src/MainMenu.m delete mode 100644 src/main_menu.h delete mode 100644 src/main_menu.m (limited to 'src') diff --git a/src/AppDelegate.m b/src/AppDelegate.m index 86ba5f6..d2b9df3 100644 --- a/src/AppDelegate.m +++ b/src/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "main_menu.h" +#import "MainMenu.h" @implementation AppDelegate @@ -11,7 +11,7 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification { - NSMenu *menubar = main_menu_create(); + NSMenu *menubar = MainMenuCreate(); [NSApp setMainMenu:menubar]; [menubar release]; diff --git a/src/MainMenu.h b/src/MainMenu.h new file mode 100644 index 0000000..4eacc5c --- /dev/null +++ b/src/MainMenu.h @@ -0,0 +1,8 @@ +#ifndef MainMenu_h +#define MainMenu_h + +#import + +NSMenu *MainMenuCreate(); + +#endif /* MainMenu_h */ diff --git a/src/MainMenu.m b/src/MainMenu.m new file mode 100644 index 0000000..b565cca --- /dev/null +++ b/src/MainMenu.m @@ -0,0 +1,22 @@ +#import "MainMenu.h" + +NSMenu *MainMenuCreate() +{ + NSMenu *menubar = [[NSMenu alloc] init]; + NSMenuItem *application_menu_item = [[NSMenuItem alloc] init]; + [menubar addItem:application_menu_item]; + + NSMenu *application_menu = [[NSMenu alloc] init]; + NSMenuItem *quit_menu_item = [[NSMenuItem alloc] + initWithTitle:@"Quit" + action:@selector(terminate:) + keyEquivalent:@"q"]; + [application_menu addItem:quit_menu_item]; + [application_menu_item setSubmenu:application_menu]; + + [quit_menu_item release]; + [application_menu release]; + [application_menu_item release]; + + return menubar; +} diff --git a/src/main_menu.h b/src/main_menu.h deleted file mode 100644 index 2ed9ed6..0000000 --- a/src/main_menu.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef MAIN_MENU_H -#define MAIN_MENU_H - -#import - -NSMenu *main_menu_create(); - -#endif /* MAIN_MENU_H */ diff --git a/src/main_menu.m b/src/main_menu.m deleted file mode 100644 index 6cf11af..0000000 --- a/src/main_menu.m +++ /dev/null @@ -1,22 +0,0 @@ -#import "main_menu.h" - -NSMenu *main_menu_create() -{ - NSMenu *menubar = [[NSMenu alloc] init]; - NSMenuItem *application_menu_item = [[NSMenuItem alloc] init]; - [menubar addItem:application_menu_item]; - - NSMenu *application_menu = [[NSMenu alloc] init]; - NSMenuItem *quit_menu_item = [[NSMenuItem alloc] - initWithTitle:@"Quit" - action:@selector(terminate:) - keyEquivalent:@"q"]; - [application_menu addItem:quit_menu_item]; - [application_menu_item setSubmenu:application_menu]; - - [quit_menu_item release]; - [application_menu release]; - [application_menu_item release]; - - return menubar; -} -- cgit v1.2.3