Fix up Eval after moving it into the debugger.

- Unconditionally validate the main menu item.
- Remove the close button from the XIB.

diff --git a/English.lproj/Eval.xib b/English.lproj/Eval.xib
index 212df7ecc1ebc0dd9f8598316d72a554a7e8c921..5ae3b7af28229008d039dc26a499c330bdb4d1f8 100644 (file)
--- a/English.lproj/Eval.xib
+++ b/English.lproj/Eval.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="EvalController">
@@ -66,20 +67,9 @@ DQ
                         <action selector="evaluateScript:" target="-2" id="ylX-wS-HCd"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" id="yxM-H4-d1E">
-                    <rect key="frame" x="274" y="7" width="96" height="32"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                    <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iFP-7O-ger">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                        <string key="keyEquivalent" base64-UTF8="YES">
-Gw
-</string>
-                    </buttonCell>
-                </button>
             </subviews>
         </view>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
     </objects>
 </document>

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index a5765e719b4e55d44b7b1a5b2c2dbba3355ffcac..ec00ad556b9d541045b3530f267eeb79436882d5 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -168,8 +168,7 @@
   } else if (action == @selector(stepIn:) ||
              action == @selector(stepOver:) ||
              action == @selector(run:) ||
-             action == @selector(stop:) ||
-             action == @selector(showEvalWindow:)) {
+             action == @selector(stop:)) {
     return _model.connected;
   }
   return [[self window] validateUserInterfaceItem:anItem];