From 895ac51c6962d3dd551aa88ecefd81c92b0b8d2b Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:19:09 +0100
Subject: [PATCH] macOS: add "Toggle printing of titlebar" to application menu
 - cont'd.

---
 FL/mac.H                     | 2 +-
 src/Fl_MacOS_Sys_Menu_Bar.mm | 4 ++--
 src/Fl_cocoa.mm              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/FL/mac.H b/FL/mac.H
index 48aea6842..0b5d32a34 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -143,7 +143,7 @@ public:
    This menu item and next one won't be displayed if Fl_Mac_App_Menu::print
    is set to an empty string.
    */
-  static const char *print_with_titlebar;
+  static const char *print;
   /** Localizable text for the "Print Front Window" application menu item. */
   static const char *print_no_titlebar;
   /** Localizable text for the "Toggle print titlebar" application menu item. */
diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm
index ad24ec5ef..88200ead6 100644
--- a/src/Fl_MacOS_Sys_Menu_Bar.mm
+++ b/src/Fl_MacOS_Sys_Menu_Bar.mm
@@ -74,7 +74,7 @@ Fl_MacOS_Sys_Menu_Bar_Driver* Fl_MacOS_Sys_Menu_Bar_Driver::driver() {
 
 // Apple App Menu
 const char *Fl_Mac_App_Menu::about = "About %@";
-const char *Fl_Mac_App_Menu::print_with_titlebar = "Print Front Window & Titlebar";
+const char *Fl_Mac_App_Menu::print = "Print Front Window & Titlebar";
 const char *Fl_Mac_App_Menu::print_no_titlebar = "Print Front Window";
 const char *Fl_Mac_App_Menu::toggle_print_titlebar = "Toggle printing of titlebar";
 const char *Fl_Mac_App_Menu::services = "Services";
@@ -506,7 +506,7 @@ void Fl_Mac_App_Menu::custom_application_menu_items(const Fl_Menu_Item *m)
   NSInteger to_index;
   if ([[menu itemAtIndex:2] action] != @selector(printPanel)) { // the 'Print' item was removed
     [menu insertItem:[NSMenuItem separatorItem] atIndex:1];
-    to_index = 3;
+    to_index = 2;
   } else to_index = 4; // after the "Print Front Window/Toggle" items
   NSInteger count = [menu numberOfItems];
   createSubMenu(menu, m, NULL, @selector(customCallback)); // add new items at end of application menu
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 4b1850727..340fe2eff 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3916,7 +3916,7 @@ int Fl_Cocoa_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int
     title = Fl_Mac_App_Menu::print_no_titlebar;
   } else {
     [self setState:NSOnState];
-    title = Fl_Mac_App_Menu::print_with_titlebar;
+    title = Fl_Mac_App_Menu::print;
   }
   [item setTitle:NSLocalizedString([NSString stringWithUTF8String:title], nil)];
 }
@@ -4022,7 +4022,7 @@ static void createAppleMenu(void)
   [menuItem setTarget:about];
   [appleMenu addItem:[NSMenuItem separatorItem]];
   // Print front window
-  title = NSLocalizedString([NSString stringWithUTF8String:Fl_Mac_App_Menu::print_with_titlebar], nil);
+  title = NSLocalizedString([NSString stringWithUTF8String:Fl_Mac_App_Menu::print], nil);
   if ([title length] > 0) {
     menuItem = [appleMenu
                 addItemWithTitle:title