[Vm-dev] [commit][3419] add sqSqueakOSXCGView to enable testing
outside of openGL
commits at squeakvm.org
commits at squeakvm.org
Tue Aug 11 17:44:23 UTC 2015
Revision: 3419
Author: johnmci
Date: 2015-08-11 10:44:21 -0700 (Tue, 11 Aug 2015)
Log Message:
-----------
add sqSqueakOSXCGView to enable testing outside of openGL
Modified Paths:
--------------
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-08-10 17:49:36 UTC (rev 3418)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-08-11 17:44:21 UTC (rev 3419)
@@ -197,6 +197,7 @@
94D921581AC6321E00A5970F /* ZipPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E6591F0DDD03FE00358328 /* ZipPlugin.c */; };
94D9215A1AC6334600A5970F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94329ECA12275FFA0090298B /* OpenGL.framework */; };
94D9215B1AC6337D00A5970F /* sqManualSurface.c in Sources */ = {isa = PBXBuildFile; fileRef = 94BD816F11C8A58D00556751 /* sqManualSurface.c */; };
+ 94FE5EC31B7A6232000D6014 /* sqSqueakOSXCGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */; };
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
@@ -247,7 +248,7 @@
9422C3B11AFFF94100448DC0 /* GreenCogSqueak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GreenCogSqueak.icns; path = "../../Mac OS/Resources/GreenCogSqueak.icns"; sourceTree = "<group>"; };
9422C3B41AFFFAC500448DC0 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = Common/English.lproj/Localizable.strings; sourceTree = "<group>"; };
9422C3B61AFFFB3400448DC0 /* CoreVM.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = CoreVM.plist; path = ../../../build.macos64x64/squeak.stack.spur/CoreVM.plist; sourceTree = "<group>"; };
- 9422C3B81AFFFB6000448DC0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "SqueakPureObjc64x64/Images.xcassets"; sourceTree = SOURCE_ROOT; };
+ 9422C3B81AFFFB6000448DC0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SqueakPureObjc64x64/Images.xcassets; sourceTree = SOURCE_ROOT; };
9422C3C81AFFFFD600448DC0 /* gcc3x-interp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "gcc3x-interp.c"; sourceTree = "<group>"; };
9422C3C91AFFFFD600448DC0 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interp.h; sourceTree = "<group>"; };
9424FF5B0DDCB1C7009912BF /* sqGnu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqGnu.h; path = ../../platforms/iOS/vm/Common/sqGnu.h; sourceTree = SOURCE_ROOT; };
@@ -573,6 +574,8 @@
94E65A340DDD053900358328 /* study.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = study.c; sourceTree = "<group>"; };
94F8798F0E6C0C7E00662DEA /* sqSqueakIPhoneInfoPlistInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSqueakIPhoneInfoPlistInterface.h; sourceTree = "<group>"; };
94F879900E6C0C7E00662DEA /* sqSqueakIPhoneInfoPlistInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sqSqueakIPhoneInfoPlistInterface.m; sourceTree = "<group>"; };
+ 94FE5EC11B7A6232000D6014 /* sqSqueakOSXCGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqSqueakOSXCGView.h; path = vm/OSX/sqSqueakOSXCGView.h; sourceTree = "<group>"; };
+ 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sqSqueakOSXCGView.m; path = vm/OSX/sqSqueakOSXCGView.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1001,6 +1004,8 @@
94C88BDE10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.m */,
94C2068810AF4F53002F4160 /* sqSqueakOSXOpenGLView.h */,
94C2068910AF4F53002F4160 /* sqSqueakOSXOpenGLView.m */,
+ 94FE5EC11B7A6232000D6014 /* sqSqueakOSXCGView.h */,
+ 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */,
9402DD6F10CE0E91005C2102 /* SqViewClut.m */,
94B8F54E10CF677800F0DD6B /* SqViewClut.h */,
94D3654D10CEC86C00805023 /* BitMapConversionLogicFromX11.h */,
@@ -1790,7 +1795,7 @@
);
dependencies = (
);
- name = "SqueakPureObjc64x64";
+ name = SqueakPureObjc64x64;
productName = SqueakNoOGLIPhone;
productReference = 948774A810C64DD800E4AEC5 /* Squeak.app */;
productType = "com.apple.product-type.application";
@@ -2016,6 +2021,7 @@
9487748910C64DD800E4AEC5 /* sqSqueakOSXFileDirectoryInterface.m in Sources */,
9463C1C71AEE155A009C5CE5 /* FloatArrayPlugin.c in Sources */,
9487748A10C64DD800E4AEC5 /* sqSqueakOSXApplication+attributes.m in Sources */,
+ 94FE5EC31B7A6232000D6014 /* sqSqueakOSXCGView.m in Sources */,
9463C1C41AEE14DF009C5CE5 /* DropPlugin.c in Sources */,
94C3176A1AD49B020096E59D /* sqUnixJoystickTablet.c in Sources */,
9487748C10C64DD800E4AEC5 /* sqSqueakOSXApplication+imageReadWrite.m in Sources */,
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout 2015-08-10 17:49:36 UTC (rev 3418)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout 2015-08-11 17:44:21 UTC (rev 3419)
@@ -7,7 +7,7 @@
<key>IDESourceControlProjectIdentifier</key>
<string>3D2D6A47-5629-4BC5-9C59-4C1A9F137CF6</string>
<key>IDESourceControlProjectName</key>
- <string>project</string>
+ <string>SqueakPureObjcCog</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>fa1542d4-bde8-0310-ad64-8ed1123d492a++2954</key>
@@ -16,13 +16,13 @@
<string>http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins</string>
</dict>
<key>IDESourceControlProjectPath</key>
- <string>build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace</string>
+ <string>build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>fa1542d4-bde8-0310-ad64-8ed1123d492a++2954</key>
<string>../../../..</string>
<key>fa1542d4-bde8-0310-ad64-8ed1123d492a++5922</key>
- <string>../../../..platforms/Cross/plugins</string>
+ <string>../../../..platforms/Cross/plugins/</string>
</dict>
<key>IDESourceControlProjectRepositoryRootDictionary</key>
<dict>
@@ -32,7 +32,7 @@
<string>http://squeakvm.org/svn/squeak</string>
</dict>
<key>IDESourceControlProjectURL</key>
- <string>http://squeakvm.org/svn/squeak/branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace</string>
+ <string>http://squeakvm.org/svn/squeak/branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-08-10 17:49:36 UTC (rev 3418)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-08-11 17:44:21 UTC (rev 3419)
@@ -9,22 +9,6 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
- timestampString = "452994389.12955"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "61"
- endingLineNumber = "61"
- landmarkName = "-initWithFrame:"
- landmarkType = "5">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m"
timestampString = "452997671.589229"
startingColumnNumber = "9223372036854775807"
@@ -38,32 +22,16 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m"
- timestampString = "452998545.508416"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "771"
- endingLineNumber = "771"
- landmarkName = "-preDrawThelayers"
- landmarkType = "5">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m"
- timestampString = "452998560.740228"
+ filePath = "../../platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m"
+ timestampString = "461002846.844502"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "103"
- endingLineNumber = "103"
- landmarkName = "-preDrawThelayers"
+ startingLineNumber = "157"
+ endingLineNumber = "157"
+ landmarkName = "-runSqueak"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
@@ -73,13 +41,13 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m"
- timestampString = "452998561.662078"
+ filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m"
+ timestampString = "461003235.308319"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "111"
- endingLineNumber = "111"
- landmarkName = "-drawThelayers"
+ startingLineNumber = "179"
+ endingLineNumber = "179"
+ landmarkName = "-setupOpenGL"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
@@ -89,95 +57,15 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
- timestampString = "452998565.700942"
+ filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXCGView.m"
+ timestampString = "461006124.963329"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "147"
- endingLineNumber = "147"
- landmarkName = "-drawThelayers"
+ startingLineNumber = "114"
+ endingLineNumber = "114"
+ landmarkName = "-dealloc"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
- timestampString = "452999005.074078"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "137"
- endingLineNumber = "137"
- landmarkName = "-drawImageUsingClip:"
- landmarkType = "5">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
- timestampString = "452999020.475384"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "150"
- endingLineNumber = "150"
- landmarkName = "-drawThelayers"
- landmarkType = "5">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m"
- timestampString = "452999105.187551"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "94"
- endingLineNumber = "94"
- landmarkName = "-drawImageUsingClip:"
- landmarkType = "5">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "../../platforms/iOS/vm/Common/Classes/sqMacV2Time.c"
- timestampString = "452999920.194741"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "107"
- endingLineNumber = "107"
- landmarkName = "ioMicroMSecs()"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "Yes"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "../../platforms/unix/vm/sqUnixHeartbeat.c"
- timestampString = "452999978.904348"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "272"
- endingLineNumber = "272"
- landmarkName = "ioMicroMSecs()"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
</Breakpoints>
</Bucket>
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme 2015-08-10 17:49:36 UTC (rev 3418)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme 2015-08-11 17:44:21 UTC (rev 3419)
@@ -61,21 +61,6 @@
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
- <AdditionalOption
- key = "DYLD_INSERT_LIBRARIES"
- value = "/usr/lib/libgmalloc.dylib"
- isEnabled = "YES">
- </AdditionalOption>
- <AdditionalOption
- key = "NSZombieEnabled"
- value = "YES"
- isEnabled = "YES">
- </AdditionalOption>
- <AdditionalOption
- key = "MallocGuardEdges"
- value = ""
- isEnabled = "YES">
- </AdditionalOption>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h 2015-08-10 17:49:36 UTC (rev 3418)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h 2015-08-11 17:44:21 UTC (rev 3419)
@@ -45,7 +45,7 @@
#import "sq.h"
@interface sqSqueakOSXCGView : NSView <sqSqueakOSXView, NSTextInputClient> {
- sqSqueakOSXScreenAndWindow *windowLogic;
+ sqSqueakOSXScreenAndWindow *__weak windowLogic;
NSTrackingRectTag squeakTrackingRectForCursor;
NSRange inputMark;
NSRange inputSelection;
@@ -69,7 +69,7 @@
@property (nonatomic,assign) BOOL dragInProgress;
@property (nonatomic,assign) int dragCount;
@property (nonatomic,retain) NSMutableArray* dragItems;
- at property (nonatomic,assign) sqSqueakOSXScreenAndWindow *windowLogic;
+ at property (nonatomic,weak) sqSqueakOSXScreenAndWindow *windowLogic;
@property (nonatomic,assign) NSRect savedScreenBoundsAtTimeOfFullScreen;
//Initialization
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2015-08-10 17:49:36 UTC (rev 3418)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2015-08-11 17:44:21 UTC (rev 3419)
@@ -89,7 +89,7 @@
- (void)awakeFromNib {
//self = [self initWithFrame: self.frame pixelFormat: [[self class] defaultPixelFormat] ];
- self = [self initWithFrame: self.frame];
+// self = [self initWithFrame: self.frame];
[self initialize];
}
@@ -107,8 +107,10 @@
- (void) initializeVariables {
}
+- (void) preDrawThelayers{
+}
+
- (void) dealloc {
- [super dealloc];
free(colorMap32);
CGColorSpaceRelease(colorspace);
}
@@ -349,7 +351,6 @@
self.lastSeenKeyBoardStrokeDetails = NULL;
[self keyUp: theEvent];
}
- [down release];
}
-(void)keyDown:(NSEvent*)theEvent {
@@ -364,7 +365,6 @@
[self interpretKeyEvents: down];
self.lastSeenKeyBoardStrokeDetails = NULL;
}
- [down release];
}
-(void)keyUp:(NSEvent*)theEvent {
@@ -393,7 +393,6 @@
aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags];
self.lastSeenKeyBoardModifierDetails = aKeyBoardStrokeDetails;
[(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordKeyDownEvent: theEvent fromView: self];
- [aKeyBoardStrokeDetails release];
}
- (void)doCommandBySelector:(SEL)aSelector {
@@ -561,7 +560,7 @@
self.dragCount = (int) [self countNumberOfNoneSqueakImageFilesInDraggedFiles: info];
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
return NSDragOperationGeneric;
}
@@ -569,14 +568,14 @@
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)info
{
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view:self];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
return NSDragOperationGeneric;
}
- (void) draggingExited: (id<NSDraggingInfo>)info
{
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view:self];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
self.dragCount = 0;
self.dragInProgress = NO;
self.dragItems = NULL;
@@ -585,7 +584,7 @@
- (BOOL) performDragOperation: (id<NSDraggingInfo>)info {
if (self.dragCount) {
self.dragItems = [self filterOutSqueakImageFilesFromDraggedFiles: info];
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view:self];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
}
NSArray *images = [self filterSqueakImageFilesFromDraggedFiles: info];
@@ -593,9 +592,9 @@
for (NSString *item in images ){
NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]];
LSLaunchURLSpec launchSpec;
- launchSpec.appURL = (CFURLRef)url;
+ launchSpec.appURL = (__bridge CFURLRef)url;
launchSpec.passThruParams = NULL;
- launchSpec.itemURLs = (CFArrayRef) [NSArray arrayWithObject:[NSURL fileURLWithPath: item]];
+ launchSpec.itemURLs = (__bridge CFArrayRef) [NSArray arrayWithObject:[NSURL fileURLWithPath: item]];
launchSpec.launchFlags = kLSLaunchDefaults | kLSLaunchNewInstance;
launchSpec.asyncRefCon = NULL;
More information about the Vm-dev
mailing list