Skip to content

Commit 2016d3f

Browse files
committed
Smalltalk working again as a document-based application
1 parent b14605c commit 2016d3f

File tree

11 files changed

+378
-448
lines changed

11 files changed

+378
-448
lines changed

ObjectiveSmalltalk.xcodeproj/project.pbxproj

Lines changed: 187 additions & 133 deletions
Large diffs are not rendered by default.

ObjectiveSmalltalk.xcodeproj/xcshareddata/xcschemes/Smalltalk.xcscheme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "1F14804922476228003C436E"
17+
BlueprintIdentifier = "1F2D95CD2250FCC500D025D8"
1818
BuildableName = "Smalltalk.app"
1919
BlueprintName = "Smalltalk"
2020
ReferencedContainer = "container:ObjectiveSmalltalk.xcodeproj">
@@ -32,7 +32,7 @@
3232
<MacroExpansion>
3333
<BuildableReference
3434
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "1F14804922476228003C436E"
35+
BlueprintIdentifier = "1F2D95CD2250FCC500D025D8"
3636
BuildableName = "Smalltalk.app"
3737
BlueprintName = "Smalltalk"
3838
ReferencedContainer = "container:ObjectiveSmalltalk.xcodeproj">
@@ -55,7 +55,7 @@
5555
runnableDebuggingMode = "0">
5656
<BuildableReference
5757
BuildableIdentifier = "primary"
58-
BlueprintIdentifier = "1F14804922476228003C436E"
58+
BlueprintIdentifier = "1F2D95CD2250FCC500D025D8"
5959
BuildableName = "Smalltalk.app"
6060
BlueprintName = "Smalltalk"
6161
ReferencedContainer = "container:ObjectiveSmalltalk.xcodeproj">
@@ -74,7 +74,7 @@
7474
runnableDebuggingMode = "0">
7575
<BuildableReference
7676
BuildableIdentifier = "primary"
77-
BlueprintIdentifier = "1F14804922476228003C436E"
77+
BlueprintIdentifier = "1F2D95CD2250FCC500D025D8"
7878
BuildableName = "Smalltalk.app"
7979
BlueprintName = "Smalltalk"
8080
ReferencedContainer = "container:ObjectiveSmalltalk.xcodeproj">

ObjectiveSmalltalkUI/MPWProgramTextView.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,9 @@ -(IBAction)printIt:sender;
481481
[self setSelectedRange:NSMakeRange( currentSelection.location+currentSelection.length,0)];
482482
currentSelection=[self selectedRange];
483483
if ( resultText.length ) {
484+
[self insertText:@" "];
484485
[self insertText:resultText];
485-
[self setSelectedRange:NSMakeRange( currentSelection.location, resultText.length)];
486+
[self setSelectedRange:NSMakeRange( currentSelection.location+1, resultText.length)];
486487
}
487488
}
488489

ObjectiveSmalltalkUI/classdef-method-browser-scheme.stsh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ scheme ClassBrowser {
88
-classDefs {
99
self dictionary.
1010
}
11-
/. {
11+
12+
-<int>hasChildren:ref {
13+
ref relativePathComponents count < 3.
14+
}
15+
16+
/. {
1217
|= {
1318
classNames := self classDefs | allKeys | sorted.
1419
self collect referenceForPath:classNames each.
@@ -30,9 +35,6 @@ scheme ClassBrowser {
3035
theRef referencesByAppendingPaths: paths .
3136
}
3237
}
33-
-<int>hasChildren:ref {
34-
ref relativePathComponents count < 3.
35-
}
3638

3739
/:className {
3840
|= {

Smalltalk/Base.lproj/Document.xib

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
5+
</dependencies>
6+
<objects>
7+
<customObject id="-2" userLabel="File's Owner" customClass="Document" customModuleProvider="">
8+
<connections>
9+
<outlet property="window" destination="xOd-HO-29H" id="JIz-fz-R2o"/>
10+
</connections>
11+
</customObject>
12+
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
13+
<customObject id="-3" userLabel="Application" customClass="NSApplication"/>
14+
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="xOd-HO-29H" userLabel="Window">
15+
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
16+
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
17+
<rect key="contentRect" x="133" y="235" width="507" height="413"/>
18+
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
19+
<value key="minSize" type="size" width="94" height="86"/>
20+
<view key="contentView" id="gIp-Ho-8D9">
21+
<rect key="frame" x="0.0" y="0.0" width="507" height="413"/>
22+
<autoresizingMask key="autoresizingMask"/>
23+
<subviews>
24+
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="264" translatesAutoresizingMaskIntoConstraints="NO" id="Hz6-mo-xeY">
25+
<rect key="frame" x="129" y="195" width="248" height="22"/>
26+
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Your document contents here" id="JDq-Ah-v2f">
27+
<font key="font" metaFont="system" size="18"/>
28+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
29+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
30+
</textFieldCell>
31+
</textField>
32+
</subviews>
33+
<constraints>
34+
<constraint firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="OG3-1c-Sd0"/>
35+
<constraint firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="s6i-b7-llN"/>
36+
</constraints>
37+
</view>
38+
<connections>
39+
<outlet property="delegate" destination="-2" id="0bl-1N-x8E"/>
40+
</connections>
41+
</window>
42+
</objects>
43+
</document>

0 commit comments

Comments
 (0)