From f792993d37563a441ce74904db1807dadc57088c Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Thu, 12 Sep 2019 20:03:15 -0400
Subject: [PATCH] Fix toolbar item auto-validation.

Putting NSViews (or NSControls) in a toolbar item turns off automatic
validation, per
https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Toolbars/Tasks/ValidatingTBItems.html.
---
 English.lproj/Debugger.xib        | 12 ++++++------
 MacGDBp.xcodeproj/project.pbxproj |  6 ++++++
 Source/ValidatingNSToolbarItem.h  | 20 ++++++++++++++++++++
 Source/ValidatingNSToolbarItem.m  | 25 +++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 Source/ValidatingNSToolbarItem.h
 create mode 100644 Source/ValidatingNSToolbarItem.m

diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index e9ced6f..b31a2cb 100644
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -319,7 +319,7 @@
             </view>
             <toolbar key="toolbar" implicitIdentifier="2E704228-00D1-43C3-B458-9839CEF5A7D0" displayMode="iconOnly" sizeMode="regular" id="471">
                 <allowedToolbarItems>
-                    <toolbarItem implicitItemIdentifier="69AE2ACB-C36A-4083-9D2B-3572B7A21CA0" label="Step In" paletteLabel="Step In" toolTip="Step In" image="StepIn" id="wHU-wT-jc4">
+                    <toolbarItem implicitItemIdentifier="69AE2ACB-C36A-4083-9D2B-3572B7A21CA0" label="Step In" paletteLabel="Step In" toolTip="Step In" image="StepIn" id="wHU-wT-jc4" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="YNB-SH-ciO">
@@ -334,7 +334,7 @@
                             <action selector="stepIn:" target="-2" id="wB8-VT-8r1"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="BCF9D13D-041F-4A9B-9D75-6AC074995436" label="Step Out" paletteLabel="Step Out" toolTip="Step Out" image="StepOut" id="ufJ-5Q-WL7">
+                    <toolbarItem implicitItemIdentifier="BCF9D13D-041F-4A9B-9D75-6AC074995436" label="Step Out" paletteLabel="Step Out" toolTip="Step Out" image="StepOut" id="ufJ-5Q-WL7" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="Mjb-90-kNO">
@@ -349,7 +349,7 @@
                             <action selector="stepOut:" target="-2" id="C6v-5h-qFh"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="EC9FAEF4-0C25-4E7D-9F3D-443E4672DE6E" label="Step Over" paletteLabel="Step Over" toolTip="Step Over" image="StepOver" id="5k5-MH-RDF">
+                    <toolbarItem implicitItemIdentifier="EC9FAEF4-0C25-4E7D-9F3D-443E4672DE6E" label="Step Over" paletteLabel="Step Over" toolTip="Step Over" image="StepOver" id="5k5-MH-RDF" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="bvu-m4-jMC">
@@ -364,7 +364,7 @@
                             <action selector="stepOver:" target="-2" id="CLi-q2-OVy"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="58386453-DE59-433C-B30B-4B0D4B5A649C" label="Run" paletteLabel="Run" toolTip="Run" image="Run" id="tdv-j4-098">
+                    <toolbarItem implicitItemIdentifier="58386453-DE59-433C-B30B-4B0D4B5A649C" label="Run" paletteLabel="Run" toolTip="Run" image="Run" id="tdv-j4-098" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="arO-TR-gYF">
@@ -379,7 +379,7 @@
                             <action selector="run:" target="-2" id="pjQ-XL-Lji"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="127468BC-789B-4F17-900B-E11D3BBC1CA2" label="Stop" paletteLabel="Stop" toolTip="Stop" image="Stop" id="2FY-E7-O5U">
+                    <toolbarItem implicitItemIdentifier="127468BC-789B-4F17-900B-E11D3BBC1CA2" label="Stop" paletteLabel="Stop" toolTip="Stop" image="Stop" id="2FY-E7-O5U" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="yYe-sC-BgP">
@@ -394,7 +394,7 @@
                             <action selector="stop:" target="-2" id="fyn-2Y-Yjd"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="1004F2E7-E87F-4BF2-ADEC-2AB74BD70EC3" label="Variable Inspector" paletteLabel="Variable Inspector" toolTip="Variable Inspector" image="HUDIcon" id="U1g-Xu-m4W">
+                    <toolbarItem implicitItemIdentifier="1004F2E7-E87F-4BF2-ADEC-2AB74BD70EC3" label="Variable Inspector" paletteLabel="Variable Inspector" toolTip="Variable Inspector" image="HUDIcon" id="U1g-Xu-m4W" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="oqt-mU-aZ3">
diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj
index 790ab91..e142158 100644
--- a/MacGDBp.xcodeproj/project.pbxproj
+++ b/MacGDBp.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		1EB7BED50ECF3CA90033283A /* StackFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EB7BED40ECF3CA90033283A /* StackFrame.m */; };
 		1EC1337E127DBB00007946FC /* VariableNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EC1337D127DBB00007946FC /* VariableNode.m */; };
 		1EDA9CF812DD13B300596211 /* BSLineNumberRulerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1EDA9CF712DD13B300596211 /* BSLineNumberRulerView.mm */; };
+		1EE97E55232B11CB000FA8E6 /* ValidatingNSToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EE97E54232B11CB000FA8E6 /* ValidatingNSToolbarItem.m */; };
 		1EEBE842176FEA80003622C3 /* MessageQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EEBE841176FEA80003622C3 /* MessageQueue.m */; };
 		1EEBE845176FFE04003622C3 /* ProtocolClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EEBE844176FFE04003622C3 /* ProtocolClient.m */; };
 		1EEBFBE50D34C793008F835B /* Debugger.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFBE30D34C793008F835B /* Debugger.xib */; };
@@ -131,6 +132,8 @@
 		1ED58817231CC66000F0A713 /* MacGDBp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacGDBp.entitlements; sourceTree = "<group>"; };
 		1EDA9CF612DD13B300596211 /* BSLineNumberRulerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSLineNumberRulerView.h; path = Source/BSLineNumberRulerView.h; sourceTree = "<group>"; };
 		1EDA9CF712DD13B300596211 /* BSLineNumberRulerView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BSLineNumberRulerView.mm; path = Source/BSLineNumberRulerView.mm; sourceTree = "<group>"; };
+		1EE97E53232B11CB000FA8E6 /* ValidatingNSToolbarItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ValidatingNSToolbarItem.h; path = Source/ValidatingNSToolbarItem.h; sourceTree = "<group>"; };
+		1EE97E54232B11CB000FA8E6 /* ValidatingNSToolbarItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ValidatingNSToolbarItem.m; path = Source/ValidatingNSToolbarItem.m; sourceTree = "<group>"; };
 		1EEBE840176FEA80003622C3 /* MessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MessageQueue.h; path = Source/MessageQueue.h; sourceTree = "<group>"; };
 		1EEBE841176FEA80003622C3 /* MessageQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MessageQueue.m; path = Source/MessageQueue.m; sourceTree = "<group>"; };
 		1EEBE843176FFE04003622C3 /* ProtocolClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProtocolClient.h; path = Source/ProtocolClient.h; sourceTree = "<group>"; };
@@ -308,6 +311,8 @@
 				1EC1337D127DBB00007946FC /* VariableNode.m */,
 				1E109017136DD92D002E34E0 /* StripLineBreaksValueTransformer.h */,
 				1E109018136DD92D002E34E0 /* StripLineBreaksValueTransformer.m */,
+				1EE97E53232B11CB000FA8E6 /* ValidatingNSToolbarItem.h */,
+				1EE97E54232B11CB000FA8E6 /* ValidatingNSToolbarItem.m */,
 			);
 			name = Debugger;
 			sourceTree = "<group>";
@@ -515,6 +520,7 @@
 				1EC1337E127DBB00007946FC /* VariableNode.m in Sources */,
 				1EDA9CF812DD13B300596211 /* BSLineNumberRulerView.mm in Sources */,
 				1E11814A1319805E003BFEF1 /* BSSourceViewTextView.m in Sources */,
+				1EE97E55232B11CB000FA8E6 /* ValidatingNSToolbarItem.m in Sources */,
 				1E108E40136CC8B9002E34E0 /* EvalController.m in Sources */,
 				1E109019136DD92D002E34E0 /* StripLineBreaksValueTransformer.m in Sources */,
 				1EEBE842176FEA80003622C3 /* MessageQueue.m in Sources */,
diff --git a/Source/ValidatingNSToolbarItem.h b/Source/ValidatingNSToolbarItem.h
new file mode 100644
index 0000000..0a33e46
--- /dev/null
+++ b/Source/ValidatingNSToolbarItem.h
@@ -0,0 +1,20 @@
+/*
+ * MacGDBp
+ * Copyright (c) 2019, Blue Static <https://www.bluestatic.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface ValidatingNSToolbarItem : NSToolbarItem
+@end
diff --git a/Source/ValidatingNSToolbarItem.m b/Source/ValidatingNSToolbarItem.m
new file mode 100644
index 0000000..a0c6864
--- /dev/null
+++ b/Source/ValidatingNSToolbarItem.m
@@ -0,0 +1,25 @@
+/*
+ * MacGDBp
+ * Copyright (c) 2019, Blue Static <https://www.bluestatic.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#import "ValidatingNSToolbarItem.h"
+
+@implementation ValidatingNSToolbarItem
+
+- (void)validate {
+  self.enabled = [self.target validateUserInterfaceItem:self];
+}
+
+@end
-- 
2.22.5