Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed stickies importing for 64-bit types

  • Loading branch information...
commit 3e339ce35e8fb4a086866368030966fe01cc9629 1 parent 238f532
Zachary Schneirov authored
View
3  AlienNoteImporter.m
@@ -454,8 +454,7 @@ - (NSArray*)_importStickies:(NSString*)filename {
uniqueFilename:nil format:SingleDatabaseFormat] autorelease];
if (noteObject) {
[noteObject setDateAdded:CFDateGetAbsoluteTime((CFDateRef)[doc creationDate])];
- //[noteObject setDateModified:CFDateGetAbsoluteTime((CFDateRef)[doc modificationDate])];
- //TODO: use the sticky's mod date
+ [noteObject setDateModified:CFDateGetAbsoluteTime((CFDateRef)[doc modificationDate])];
[notes addObject:noteObject];
} else {
View
2  AppController.m
@@ -30,6 +30,8 @@ @implementation AppController
- (id)init {
if ([super init]) {
+ NSLog(@"gcc version: %d", GCC_VERSION);
+
windowUndoManager = [[NSUndoManager alloc] init];
isCreatingANote = isFilteringFromTyping = typedStringIsCached = NO;
View
5 Notation.xcodeproj/project.pbxproj
@@ -1024,7 +1024,7 @@
212B842509780B5000F3597F /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- COPY_PHASE_STRIP = NO;
+ DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_POSTPROCESSING = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1075,7 +1075,6 @@
"-e",
start,
);
- STRIP_INSTALLED_PRODUCT = NO;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
@@ -1161,11 +1160,11 @@
ppc,
i386,
);
- DEAD_CODE_STRIPPING = YES;
GCC_DEBUGGING_SYMBOLS = full;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_THREADSAFE_STATICS = NO;
+ GCC_VERSION = 4.2;
"GCC_VERSION[sdk=macosx10.4][arch=*]" = 4.0;
GCC_WARN_SHADOW = YES;
GCC_WARN_SIGN_COMPARE = YES;
View
188 Notation.xcodeproj/scrod.mode1v3
@@ -219,25 +219,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>21313DEB106C9BFC00C8D785</string>
+ <string>2170B574106D562F00AF1CAC</string>
<key>PBXProjectModuleLabel</key>
- <string>NoteObject.m</string>
+ <string>Notation_Prefix.pch</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>21313DEC106C9BFC00C8D785</string>
+ <string>2170B575106D562F00AF1CAC</string>
<key>PBXProjectModuleLabel</key>
- <string>NoteObject.m</string>
+ <string>Notation_Prefix.pch</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>2170B4AE106D228100AF1CAC</string>
+ <string>2170B57E106D56E700AF1CAC</string>
<key>history</key>
<array>
- <string>21313DED106C9BFC00C8D785</string>
- <string>21313DF6106C9CFF00C8D785</string>
+ <string>2170B567106D528100AF1CAC</string>
</array>
</dict>
<key>SplitCount</key>
@@ -249,36 +248,35 @@
<key>Geometry</key>
<dict>
<key>Frame</key>
- <string>{{0, 20}, {1100, 702}}</string>
+ <string>{{0, 20}, {775, 665}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>526 435 1100 743 0 0 1920 1178 </string>
+ <string>782 330 775 706 0 0 1920 1178 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>21313DDD106C9B2200C8D785</string>
+ <string>2170B4C6106D2C6A00AF1CAC</string>
<key>PBXProjectModuleLabel</key>
- <string>NoteObject.m</string>
+ <string>AppController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>21313DDE106C9B2200C8D785</string>
+ <string>2170B4C7106D2C6A00AF1CAC</string>
<key>PBXProjectModuleLabel</key>
- <string>NoteObject.m</string>
+ <string>AppController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>2170B4AF106D228100AF1CAC</string>
+ <string>2170B57F106D56E700AF1CAC</string>
<key>history</key>
<array>
- <string>21313DDF106C9B2200C8D785</string>
- <string>21313DF7106C9CFF00C8D785</string>
+ <string>2170B52E106D3D6A00AF1CAC</string>
</array>
</dict>
<key>SplitCount</key>
@@ -290,11 +288,11 @@
<key>Geometry</key>
<dict>
<key>Frame</key>
- <string>{{0, 20}, {1063, 704}}</string>
+ <string>{{0, 20}, {1137, 1023}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>277 433 1063 745 0 0 1920 1178 </string>
+ <string>401 114 1137 1064 0 0 1920 1178 </string>
</dict>
</dict>
<dict>
@@ -315,10 +313,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>2170B4B0106D228100AF1CAC</string>
+ <string>2170B580106D56E700AF1CAC</string>
<key>history</key>
<array>
- <string>21313DF8106C9CFF00C8D785</string>
+ <string>2170B531106D3D6A00AF1CAC</string>
</array>
</dict>
<key>SplitCount</key>
@@ -337,46 +335,6 @@
<string>689 433 936 745 0 0 1920 1178 </string>
</dict>
</dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>21ED6C73106C162D00D37194</string>
- <key>PBXProjectModuleLabel</key>
- <string>Notation_Prefix.pch</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>21ED6C74106C162D00D37194</string>
- <key>PBXProjectModuleLabel</key>
- <string>Notation_Prefix.pch</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>2170B4B1106D228100AF1CAC</string>
- <key>history</key>
- <array>
- <string>21313DF9106C9CFF00C8D785</string>
- </array>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>Geometry</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 20}, {775, 665}}</string>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <false/>
- <key>RubberWindowFrame</key>
- <string>988 397 775 706 0 0 1920 1178 </string>
- </dict>
- </dict>
</array>
<key>PerspectiveWidths</key>
<array>
@@ -408,8 +366,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -433,7 +389,7 @@
<dict>
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
<array>
- <real>270</real>
+ <real>292</real>
</array>
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
<array>
@@ -469,13 +425,13 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>64</integer>
- <integer>1</integer>
+ <integer>126</integer>
+ <integer>94</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {270, 687}}</string>
+ <string>{{0, 1387}, {292, 997}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -487,19 +443,19 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {287, 705}}</string>
+ <string>{{0, 0}, {309, 1015}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
- <real>270</real>
+ <real>292</real>
</array>
<key>RubberWindowFrame</key>
- <string>34 432 292 746 0 0 1920 1178 </string>
+ <string>34 122 314 1056 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
<key>Proportion</key>
- <string>287pt</string>
+ <string>309pt</string>
</dict>
<dict>
<key>Dock</key>
@@ -522,7 +478,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>2170B4AB106D228100AF1CAC</string>
+ <string>2170B57D106D56E700AF1CAC</string>
<key>history</key>
<array>
<string>21C61FAB10542D40004D5948</string>
@@ -566,7 +522,7 @@
<string>21313DD6106C9B2200C8D785</string>
<string>21313DD7106C9B2200C8D785</string>
<string>21313DE8106C9BFC00C8D785</string>
- <string>21313DF5106C9CFF00C8D785</string>
+ <string>2170B52D106D3D6A00AF1CAC</string>
</array>
</dict>
<key>SplitCount</key>
@@ -580,7 +536,7 @@
<key>Frame</key>
<string>{{0, 0}, {0, 0}}</string>
<key>RubberWindowFrame</key>
- <string>34 432 292 746 0 0 1920 1178 </string>
+ <string>34 122 314 1056 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -598,14 +554,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 5}, {0, 700}}</string>
+ <string>{{0, 5}, {0, 1010}}</string>
<key>RubberWindowFrame</key>
- <string>34 432 292 746 0 0 1920 1178 </string>
+ <string>34 122 314 1056 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>700pt</string>
+ <string>1010pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -624,9 +580,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>2170B4AC106D228100AF1CAC</string>
+ <string>2170B53B106D44DD00AF1CAC</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>2170B4AD106D228100AF1CAC</string>
+ <string>2170B53C106D44DD00AF1CAC</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -745,7 +701,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>275587708.90259397</real>
+ <real>275601127.758578</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
@@ -761,14 +717,16 @@
<key>WindowOrderList</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>21ED6C73106C162D00D37194</string>
<string>21313DC8106C97F100C8D785</string>
- <string>21313DDD106C9B2200C8D785</string>
- <string>21313DEB106C9BFC00C8D785</string>
+ <string>2170B4C6106D2C6A00AF1CAC</string>
+ <string>2170B574106D562F00AF1CAC</string>
+ <string>1C78EAAD065D492600B07095</string>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <string>21C6208410543D7D004D5948</string>
<string>/Users/scrod/Projects/Notation-64bit/Notation.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>34 432 292 746 0 0 1920 1178 </string>
+ <string>34 122 314 1056 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -784,14 +742,12 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>NotesTableView.m</string>
+ <string>StickiesDocument.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -800,7 +756,7 @@
<key>Frame</key>
<string>{{0, 0}, {740, 402}}</string>
<key>RubberWindowFrame</key>
- <string>623 133 740 745 0 0 1440 878 </string>
+ <string>1050 433 740 745 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -808,23 +764,27 @@
<string>402pt</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
+ <key>PBXBuildLogShowsTranscriptDefaultKey</key>
+ <string>{{0, 161}, {740, 136}}</string>
<key>PBXProjectModuleGUID</key>
<string>XCMainBuildResultsModuleGUID</string>
<key>PBXProjectModuleLabel</key>
- <string>Build Results</string>
+ <string>Build</string>
<key>XCBuildResultsTrigger_Collapse</key>
<integer>1021</integer>
<key>XCBuildResultsTrigger_Open</key>
- <integer>1011</integer>
+ <integer>1010</integer>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 407}, {740, 297}}</string>
<key>RubberWindowFrame</key>
- <string>623 133 740 745 0 0 1440 878 </string>
+ <string>1050 433 740 745 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -847,14 +807,14 @@
<key>TableOfContents</key>
<array>
<string>21C6208410543D7D004D5948</string>
- <string>21313D0A106C7CD900C8D785</string>
+ <string>2170B541106D44DD00AF1CAC</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildV3</string>
<key>WindowString</key>
- <string>623 133 740 745 0 0 1440 878 </string>
+ <string>1050 433 740 745 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>21C6208410543D7D004D5948</string>
<key>WindowToolIsVisible</key>
@@ -967,13 +927,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>2170B4B2106D228100AF1CAC</string>
+ <string>2170B542106D44DD00AF1CAC</string>
<string>1C162984064C10D400B95A72</string>
- <string>2170B4B3106D228100AF1CAC</string>
- <string>2170B4B4106D228100AF1CAC</string>
- <string>2170B4B5106D228100AF1CAC</string>
- <string>2170B4B6106D228100AF1CAC</string>
- <string>2170B4B7106D228100AF1CAC</string>
+ <string>2170B543106D44DD00AF1CAC</string>
+ <string>2170B544106D44DD00AF1CAC</string>
+ <string>2170B545106D44DD00AF1CAC</string>
+ <string>2170B546106D44DD00AF1CAC</string>
+ <string>2170B547106D44DD00AF1CAC</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -1007,25 +967,25 @@
<key>PBXProjectModuleGUID</key>
<string>1CDD528C0622207200134675</string>
<key>PBXProjectModuleLabel</key>
- <string>AppController.m</string>
+ <string>AlienNoteImporter.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1173, 445}}</string>
+ <string>{{0, 0}, {1175, 615}}</string>
<key>RubberWindowFrame</key>
- <string>233 77 1173 801 0 0 1440 878 </string>
+ <string>488 84 1175 1094 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>1173pt</string>
+ <string>1175pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>445pt</string>
+ <string>615pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -1038,18 +998,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 450}, {1173, 310}}</string>
+ <string>{{0, 620}, {1175, 433}}</string>
<key>RubberWindowFrame</key>
- <string>233 77 1173 801 0 0 1440 878 </string>
+ <string>488 84 1175 1094 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXProjectFindModule</string>
<key>Proportion</key>
- <string>310pt</string>
+ <string>433pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>760pt</string>
+ <string>1053pt</string>
</dict>
</array>
<key>Name</key>
@@ -1063,17 +1023,17 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
- <string>21313D19106C7D3800C8D785</string>
- <string>21313D1A106C7D3800C8D785</string>
+ <string>2170B579106D562F00AF1CAC</string>
+ <string>2170B57A106D562F00AF1CAC</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
<key>WindowString</key>
- <string>233 77 1173 801 0 0 1440 878 </string>
+ <string>488 84 1175 1094 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C530D57069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@@ -1108,7 +1068,7 @@
<key>Frame</key>
<string>{{0, 0}, {928, 577}}</string>
<key>RubberWindowFrame</key>
- <string>429 260 928 618 0 0 1440 878 </string>
+ <string>863 560 928 618 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -1131,13 +1091,13 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>21313D27106C7F1600C8D785</string>
+ <string>2170B548106D44DD00AF1CAC</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>429 260 928 618 0 0 1440 878 </string>
+ <string>863 560 928 618 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
View
379 Notation.xcodeproj/scrod.pbxuser
@@ -133,7 +133,7 @@
argumentStrings = (
);
autoAttachOnCrash = 1;
- breakpointsEnabled = 1;
+ breakpointsEnabled = 0;
configStateDict = {
"PBXLSLaunchAction-0" = {
PBXLSLaunchAction = 0;
@@ -216,11 +216,11 @@
};
2114C11509575BD400614E74 /* AppController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1209, 16744}}";
- sepNavSelRange = "{19903, 0}";
- sepNavVisRange = "{18756, 1188}";
+ sepNavIntBoundsRect = "{{0, 0}, {1078, 18732}}";
+ sepNavSelRange = "{860, 0}";
+ sepNavVisRange = "{0, 1923}";
sepNavVisRect = "{{0, 15945}, {1000, 995}}";
- sepNavWindowFrame = "{{89, 77}, {1351, 801}}";
+ sepNavWindowFrame = "{{401, 74}, {1137, 1104}}";
};
};
2114C13D0957732800614E74 /* NotationController.h */ = {
@@ -234,9 +234,9 @@
};
2114C13E0957732800614E74 /* NotationController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1244, 21099}}";
- sepNavSelRange = "{48171, 0}";
- sepNavVisRange = "{49697, 1761}";
+ sepNavIntBoundsRect = "{{0, 0}, {1188, 22666}}";
+ sepNavSelRange = "{44268, 4}";
+ sepNavVisRange = "{43996, 1316}";
sepNavVisRect = "{{0, 17808}, {927, 898}}";
sepNavWindowFrame = "{{198, 83}, {966, 795}}";
};
@@ -252,11 +252,11 @@
};
2114C1450957733200614E74 /* NoteObject.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1004, 18788}}";
- sepNavSelRange = "{35593, 27}";
- sepNavVisRange = "{34847, 1559}";
+ sepNavIntBoundsRect = "{{0, 0}, {889, 18676}}";
+ sepNavSelRange = "{454, 0}";
+ sepNavVisRange = "{6880, 3419}";
sepNavVisRect = "{{0, 1728}, {1024, 899}}";
- sepNavWindowFrame = "{{122, 77}, {1063, 801}}";
+ sepNavWindowFrame = "{{520, 67}, {948, 1111}}";
};
};
2114C23B095883A600614E74 /* NSData_transformations.h */ = {
@@ -332,28 +332,28 @@
};
212089B00B0C24F500A15A69 /* AlienNoteImporter.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1237, 6695}}";
- sepNavSelRange = "{1373, 0}";
- sepNavVisRange = "{0, 1770}";
+ sepNavIntBoundsRect = "{{0, 0}, {1114, 6958}}";
+ sepNavSelRange = "{17439, 0}";
+ sepNavVisRange = "{16312, 1532}";
sepNavVisRect = "{{0, 4774}, {718, 99}}";
sepNavWindowFrame = "{{139, 77}, {1151, 801}}";
};
};
212089D60B0C2CA500A15A69 /* StickiesDocument.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {681, 686}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 615}";
- sepNavWindowFrame = "{{75, 64}, {740, 814}}";
+ sepNavIntBoundsRect = "{{0, 0}, {681, 679}}";
+ sepNavSelRange = "{816, 0}";
+ sepNavVisRange = "{0, 848}";
+ sepNavWindowFrame = "{{1081, 157}, {740, 814}}";
};
};
212089D70B0C2CA500A15A69 /* StickiesDocument.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {681, 938}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 1030}";
+ sepNavIntBoundsRect = "{{0, 0}, {679, 952}}";
+ sepNavSelRange = "{572, 0}";
+ sepNavVisRange = "{335, 670}";
sepNavVisRect = "{{0, 137}, {701, 899}}";
- sepNavWindowFrame = "{{75, 0}, {740, 1028}}";
+ sepNavWindowFrame = "{{153, 96}, {919, 1069}}";
};
};
212850870B56E549005F6E34 /* English */ = {
@@ -449,10 +449,6 @@
vrLen = 0;
vrLoc = 0;
};
- 21313DB8106C978100C8D785 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */;
- };
21313DBE106C97F100C8D785 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 219588D10961D7F200972B8C /* LinkingEditor.m */;
@@ -543,107 +539,16 @@
vrLen = 0;
vrLoc = 0;
};
- 21313DDF106C9B2200C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1440957733200614E74 /* NoteObject.h */;
- name = "NoteObject.h: 16";
- rLen = 0;
- rLoc = 288;
- rType = 0;
- vrLen = 1261;
- vrLoc = 0;
- };
- 21313DE0106C9B2200C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1450957733200614E74 /* NoteObject.m */;
- name = "NoteObject.m: 34";
- rLen = 20;
- rLoc = 712;
- rType = 0;
- vrLen = 1423;
- vrLoc = 144;
- };
21313DE8106C9BFC00C8D785 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2114C11509575BD400614E74 /* AppController.m */;
name = "AppController.m: 303";
rLen = 9;
- rLoc = 10826;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- 21313DE9106C9BFC00C8D785 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 2114C1440957733200614E74 /* NoteObject.h */;
- };
- 21313DED106C9BFC00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1440957733200614E74 /* NoteObject.h */;
- name = "NoteObject.h: 16";
- rLen = 0;
- rLoc = 288;
- rType = 0;
- vrLen = 1362;
- vrLoc = 0;
- };
- 21313DEE106C9BFC00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1450957733200614E74 /* NoteObject.m */;
- rLen = 1;
- rLoc = 1017;
- rType = 1;
- };
- 21313DF5106C9CFF00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1440957733200614E74 /* NoteObject.h */;
- name = "NoteObject.h: 16";
- rLen = 0;
- rLoc = 288;
+ rLoc = 10871;
rType = 0;
vrLen = 0;
vrLoc = 0;
};
- 21313DF6106C9CFF00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1450957733200614E74 /* NoteObject.m */;
- name = "NoteObject.m: 987";
- rLen = 0;
- rLoc = 34099;
- rType = 0;
- vrLen = 1519;
- vrLoc = 33280;
- };
- 21313DF7106C9CFF00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1450957733200614E74 /* NoteObject.m */;
- name = "NoteObject.m: 1036";
- rLen = 27;
- rLoc = 35593;
- rType = 0;
- vrLen = 1596;
- vrLoc = 34847;
- };
- 21313DF8106C9CFF00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */;
- name = "PrefsWindowController.m: 217";
- rLen = 0;
- rLoc = 7900;
- rType = 0;
- vrLen = 1996;
- vrLoc = 6770;
- };
- 21313DF9106C9CFF00C8D785 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */;
- name = "Notation_Prefix.pch: 67";
- rLen = 0;
- rLoc = 1677;
- rType = 0;
- vrLen = 1371;
- vrLoc = 500;
- };
213621EF0B92414F008C0830 /* MultiTextFinder.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {138, 392}}";
@@ -876,9 +781,9 @@
};
21582DC40B73F59A00711663 /* BookmarksController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {12, 6591}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 0}";
+ sepNavIntBoundsRect = "{{0, 0}, {1416, 7098}}";
+ sepNavSelRange = "{12514, 4}";
+ sepNavVisRange = "{11697, 1354}";
sepNavVisRect = "{{0, 5360}, {881, 970}}";
sepNavWindowFrame = "{{148, 77}, {920, 801}}";
};
@@ -915,14 +820,14 @@
};
2168EC5209E33B0300778D02 /* FrozenNotation.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {12, 3052}}";
- sepNavSelRange = "{631, 31}";
- sepNavVisRange = "{0, 0}";
+ sepNavIntBoundsRect = "{{0, 0}, {1112, 3136}}";
+ sepNavSelRange = "{5427, 10}";
+ sepNavVisRange = "{4957, 978}";
sepNavVisRect = "{{0, 1481}, {856, 899}}";
sepNavWindowFrame = "{{212, 73}, {895, 805}}";
};
};
- 2170B4AB106D228100AF1CAC /* PBXTextBookmark */ = {
+ 2170B52D106D3D6A00AF1CAC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2114C1440957733200614E74 /* NoteObject.h */;
name = "NoteObject.h: 16";
@@ -932,27 +837,17 @@
vrLen = 0;
vrLoc = 0;
};
- 2170B4AE106D228100AF1CAC /* PBXTextBookmark */ = {
+ 2170B52E106D3D6A00AF1CAC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 2114C1450957733200614E74 /* NoteObject.m */;
- name = "NoteObject.m: 987";
+ fRef = 2114C11509575BD400614E74 /* AppController.m */;
+ name = "AppController.m: 500";
rLen = 0;
- rLoc = 34099;
+ rLoc = 19728;
rType = 0;
- vrLen = 1366;
- vrLoc = 33433;
+ vrLen = 3016;
+ vrLoc = 18585;
};
- 2170B4AF106D228100AF1CAC /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 2114C1450957733200614E74 /* NoteObject.m */;
- name = "NoteObject.m: 1036";
- rLen = 27;
- rLoc = 35593;
- rType = 0;
- vrLen = 1559;
- vrLoc = 34847;
- };
- 2170B4B0106D228100AF1CAC /* PBXTextBookmark */ = {
+ 2170B531106D3D6A00AF1CAC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */;
name = "PrefsWindowController.m: 217";
@@ -962,15 +857,53 @@
vrLen = 1902;
vrLoc = 6864;
};
- 2170B4B1106D228100AF1CAC /* PBXTextBookmark */ = {
+ 2170B567106D528100AF1CAC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "error: expected '=', ',', ';', 'asm' or '__attribute__' before 'NSRange32'";
+ fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */;
+ rLen = 0;
+ rLoc = 36;
+ rType = 1;
+ };
+ 2170B57D106D56E700AF1CAC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 2114C1440957733200614E74 /* NoteObject.h */;
+ name = "NoteObject.h: 16";
+ rLen = 0;
+ rLoc = 288;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 2170B57E106D56E700AF1CAC /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */;
- name = "Notation_Prefix.pch: 67";
+ name = "Notation_Prefix.pch: 37";
+ rLen = 0;
+ rLoc = 794;
+ rType = 0;
+ vrLen = 1018;
+ vrLoc = 201;
+ };
+ 2170B57F106D56E700AF1CAC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 2114C11509575BD400614E74 /* AppController.m */;
+ name = "AppController.m: 32";
rLen = 0;
- rLoc = 1677;
+ rLoc = 860;
rType = 0;
- vrLen = 1341;
- vrLoc = 530;
+ vrLen = 1923;
+ vrLoc = 0;
+ };
+ 2170B580106D56E700AF1CAC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */;
+ name = "PrefsWindowController.m: 217";
+ rLen = 0;
+ rLoc = 7900;
+ rType = 0;
+ vrLen = 1902;
+ vrLoc = 6864;
};
217CEBA109E9885500DF0E09 /* NotationFileManager.h */ = {
uiCtxt = {
@@ -983,9 +916,9 @@
};
217CEBA209E9885500DF0E09 /* NotationFileManager.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1181, 7761}}";
- sepNavSelRange = "{4528, 0}";
- sepNavVisRange = "{3842, 1485}";
+ sepNavIntBoundsRect = "{{0, 0}, {1112, 8316}}";
+ sepNavSelRange = "{17988, 0}";
+ sepNavVisRange = "{17622, 1003}";
sepNavVisRect = "{{0, 1987}, {1002, 483}}";
sepNavWindowFrame = "{{806, 159}, {982, 1019}}";
};
@@ -1284,7 +1217,7 @@
sepNavSelRange = "{7900, 0}";
sepNavVisRange = "{6864, 1902}";
sepNavVisRect = "{{0, 2355}, {897, 822}}";
- sepNavWindowFrame = "{{353, 77}, {936, 801}}";
+ sepNavWindowFrame = "{{689, 393}, {936, 785}}";
};
};
219588D00961D7F200972B8C /* LinkingEditor.h */ = {
@@ -1701,16 +1634,6 @@
sepNavWindowFrame = "{{436, 0}, {851, 1028}}";
};
};
- 21ED6CE0106C22D900D37194 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */;
- name = "Notation_Prefix.pch: 67";
- rLen = 0;
- rLoc = 1677;
- rType = 0;
- vrLen = 1341;
- vrLoc = 530;
- };
21F1CD650B3A38DB001FB5F6 /* PTHotKeyCenter.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {760, 686}}";
@@ -1822,7 +1745,7 @@
};
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeArchitecturePreference = x86_64;
+ activeArchitecturePreference = ppc;
activeBuildConfigurationName = Deployment;
activeExecutable = 2114C0D00957570800614E74 /* Notational Velocity */;
activeSDKPreference = macosx10.5;
@@ -1869,7 +1792,7 @@
PBXFileTableDataSourceColumnWidthsKey = (
200,
200,
- 57.5835,
+ 57.58349609375,
);
PBXFileTableDataSourceColumnsKey = (
PBXBookmarksDataSource_LocationID,
@@ -1946,7 +1869,7 @@
16,
200,
50,
- 160,
+ 45.20849609375,
);
PBXFileTableDataSourceColumnsKey = (
PBXSymbolsDataSource_SymbolTypeIconID,
@@ -1963,7 +1886,7 @@
20,
10,
20,
- 48.16259765625,
+ 48,
43,
43,
20,
@@ -2001,68 +1924,59 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 275587708;
- PBXWorkspaceStateSaveDate = 275587708;
+ PBXPerProjectTemplateStateSaveDate = 275596167;
+ PBXWorkspaceStateSaveDate = 275596167;
};
perUserProjectItems = {
- 21313D28106C7F1700C8D785 = 21313D28106C7F1700C8D785 /* PBXTextBookmark */;
- 21313D86106C908300C8D785 = 21313D86106C908300C8D785 /* PBXTextBookmark */;
- 21313D87106C908300C8D785 = 21313D87106C908300C8D785 /* PBXTextBookmark */;
- 21313DB8106C978100C8D785 = 21313DB8106C978100C8D785 /* PBXBookmark */;
- 21313DBE106C97F100C8D785 = 21313DBE106C97F100C8D785 /* PBXTextBookmark */;
- 21313DC0106C97F100C8D785 = 21313DC0106C97F100C8D785 /* PBXTextBookmark */;
- 21313DC1106C97F100C8D785 = 21313DC1106C97F100C8D785 /* PBXTextBookmark */;
- 21313DC2106C97F100C8D785 = 21313DC2106C97F100C8D785 /* PBXTextBookmark */;
- 21313DC3106C97F100C8D785 = 21313DC3106C97F100C8D785 /* PBXTextBookmark */;
- 21313DC4106C97F100C8D785 = 21313DC4106C97F100C8D785 /* PBXTextBookmark */;
- 21313DD5106C9B2200C8D785 = 21313DD5106C9B2200C8D785 /* PBXTextBookmark */;
- 21313DD6106C9B2200C8D785 = 21313DD6106C9B2200C8D785 /* PBXTextBookmark */;
- 21313DD7106C9B2200C8D785 = 21313DD7106C9B2200C8D785 /* PBXTextBookmark */;
- 21313DDF106C9B2200C8D785 = 21313DDF106C9B2200C8D785 /* PBXTextBookmark */;
- 21313DE0106C9B2200C8D785 = 21313DE0106C9B2200C8D785 /* PBXTextBookmark */;
- 21313DE8106C9BFC00C8D785 = 21313DE8106C9BFC00C8D785 /* PBXTextBookmark */;
- 21313DE9106C9BFC00C8D785 = 21313DE9106C9BFC00C8D785 /* PBXBookmark */;
- 21313DED106C9BFC00C8D785 = 21313DED106C9BFC00C8D785 /* PBXTextBookmark */;
- 21313DEE106C9BFC00C8D785 = 21313DEE106C9BFC00C8D785 /* PBXTextBookmark */;
- 21313DF5106C9CFF00C8D785 = 21313DF5106C9CFF00C8D785 /* PBXTextBookmark */;
- 21313DF6106C9CFF00C8D785 = 21313DF6106C9CFF00C8D785 /* PBXTextBookmark */;
- 21313DF7106C9CFF00C8D785 = 21313DF7106C9CFF00C8D785 /* PBXTextBookmark */;
- 21313DF8106C9CFF00C8D785 = 21313DF8106C9CFF00C8D785 /* PBXTextBookmark */;
- 21313DF9106C9CFF00C8D785 = 21313DF9106C9CFF00C8D785 /* PBXTextBookmark */;
- 2139CF51105D985D00FD961B = 2139CF51105D985D00FD961B /* PBXTextBookmark */;
- 214C6C641054454C0085D386 = 214C6C641054454C0085D386 /* PlistBookmark */;
- 214C6C651054454C0085D386 = 214C6C651054454C0085D386 /* PBXBookmark */;
- 2170B4AB106D228100AF1CAC /* PBXTextBookmark */ = 2170B4AB106D228100AF1CAC /* PBXTextBookmark */;
- 2170B4AE106D228100AF1CAC /* PBXTextBookmark */ = 2170B4AE106D228100AF1CAC /* PBXTextBookmark */;
- 2170B4AF106D228100AF1CAC /* PBXTextBookmark */ = 2170B4AF106D228100AF1CAC /* PBXTextBookmark */;
- 2170B4B0106D228100AF1CAC /* PBXTextBookmark */ = 2170B4B0106D228100AF1CAC /* PBXTextBookmark */;
- 2170B4B1106D228100AF1CAC /* PBXTextBookmark */ = 2170B4B1106D228100AF1CAC /* PBXTextBookmark */;
- 2182B39D106B2359008641E4 = 2182B39D106B2359008641E4 /* PBXTextBookmark */;
- 2182B3BB106B24FA008641E4 = 2182B3BB106B24FA008641E4 /* PBXTextBookmark */;
- 2182B3D1106B2561008641E4 = 2182B3D1106B2561008641E4 /* PBXTextBookmark */;
- 2182B429106B35CC008641E4 = 2182B429106B35CC008641E4 /* PBXTextBookmark */;
- 2182B42A106B35CC008641E4 = 2182B42A106B35CC008641E4 /* PBXTextBookmark */;
- 2182B42B106B35CC008641E4 = 2182B42B106B35CC008641E4 /* PBXBookmark */;
- 2182B42D106B35CC008641E4 = 2182B42D106B35CC008641E4 /* PBXTextBookmark */;
- 2182B46E106B3E9E008641E4 = 2182B46E106B3E9E008641E4 /* PBXTextBookmark */;
- 2182B46F106B3E9E008641E4 = 2182B46F106B3E9E008641E4 /* PBXTextBookmark */;
- 2182B479106B3EDA008641E4 = 2182B479106B3EDA008641E4 /* PBXTextBookmark */;
- 21B5447D105D7963002097C4 = 21B5447D105D7963002097C4 /* PBXBookmark */;
- 21B54537105D953C002097C4 = 21B54537105D953C002097C4 /* PBXTextBookmark */;
- 21C61FAB10542D40004D5948 = 21C61FAB10542D40004D5948 /* PBXTextBookmark */;
- 21C61FAC10542D40004D5948 = 21C61FAC10542D40004D5948 /* PBXTextBookmark */;
- 21C61FAD10542D40004D5948 = 21C61FAD10542D40004D5948 /* PBXTextBookmark */;
- 21C61FEC10542FB9004D5948 = 21C61FEC10542FB9004D5948 /* PBXTextBookmark */;
- 21C61FED10542FB9004D5948 = 21C61FED10542FB9004D5948 /* PBXTextBookmark */;
- 21C61FEE10542FB9004D5948 = 21C61FEE10542FB9004D5948 /* PBXTextBookmark */;
- 21C6206510543D7D004D5948 = 21C6206510543D7D004D5948 /* PBXTextBookmark */;
- 21C6206610543D7D004D5948 = 21C6206610543D7D004D5948 /* PBXTextBookmark */;
- 21C6206810543D7D004D5948 = 21C6206810543D7D004D5948 /* PBXTextBookmark */;
- 21C6206A10543D7D004D5948 = 21C6206A10543D7D004D5948 /* PBXTextBookmark */;
- 21C6206B10543D7D004D5948 = 21C6206B10543D7D004D5948 /* PBXTextBookmark */;
- 21C6206E10543D7D004D5948 = 21C6206E10543D7D004D5948 /* PBXTextBookmark */;
- 21C6207110543D7D004D5948 = 21C6207110543D7D004D5948 /* PBXTextBookmark */;
- 21ED6CE0106C22D900D37194 = 21ED6CE0106C22D900D37194 /* PBXTextBookmark */;
+ 21313D28106C7F1700C8D785 /* PBXTextBookmark */ = 21313D28106C7F1700C8D785 /* PBXTextBookmark */;
+ 21313D86106C908300C8D785 /* PBXTextBookmark */ = 21313D86106C908300C8D785 /* PBXTextBookmark */;
+ 21313D87106C908300C8D785 /* PBXTextBookmark */ = 21313D87106C908300C8D785 /* PBXTextBookmark */;
+ 21313DBE106C97F100C8D785 /* PBXTextBookmark */ = 21313DBE106C97F100C8D785 /* PBXTextBookmark */;
+ 21313DC0106C97F100C8D785 /* PBXTextBookmark */ = 21313DC0106C97F100C8D785 /* PBXTextBookmark */;
+ 21313DC1106C97F100C8D785 /* PBXTextBookmark */ = 21313DC1106C97F100C8D785 /* PBXTextBookmark */;
+ 21313DC2106C97F100C8D785 /* PBXTextBookmark */ = 21313DC2106C97F100C8D785 /* PBXTextBookmark */;
+ 21313DC3106C97F100C8D785 /* PBXTextBookmark */ = 21313DC3106C97F100C8D785 /* PBXTextBookmark */;
+ 21313DC4106C97F100C8D785 /* PBXTextBookmark */ = 21313DC4106C97F100C8D785 /* PBXTextBookmark */;
+ 21313DD5106C9B2200C8D785 /* PBXTextBookmark */ = 21313DD5106C9B2200C8D785 /* PBXTextBookmark */;
+ 21313DD6106C9B2200C8D785 /* PBXTextBookmark */ = 21313DD6106C9B2200C8D785 /* PBXTextBookmark */;
+ 21313DD7106C9B2200C8D785 /* PBXTextBookmark */ = 21313DD7106C9B2200C8D785 /* PBXTextBookmark */;
+ 21313DE8106C9BFC00C8D785 /* PBXTextBookmark */ = 21313DE8106C9BFC00C8D785 /* PBXTextBookmark */;
+ 2139CF51105D985D00FD961B /* PBXTextBookmark */ = 2139CF51105D985D00FD961B /* PBXTextBookmark */;
+ 214C6C641054454C0085D386 /* PlistBookmark */ = 214C6C641054454C0085D386 /* PlistBookmark */;
+ 214C6C651054454C0085D386 /* PBXBookmark */ = 214C6C651054454C0085D386 /* PBXBookmark */;
+ 2170B52D106D3D6A00AF1CAC /* PBXTextBookmark */ = 2170B52D106D3D6A00AF1CAC /* PBXTextBookmark */;
+ 2170B52E106D3D6A00AF1CAC /* PBXTextBookmark */ = 2170B52E106D3D6A00AF1CAC /* PBXTextBookmark */;
+ 2170B531106D3D6A00AF1CAC /* PBXTextBookmark */ = 2170B531106D3D6A00AF1CAC /* PBXTextBookmark */;
+ 2170B567106D528100AF1CAC /* PBXTextBookmark */ = 2170B567106D528100AF1CAC /* PBXTextBookmark */;
+ 2170B57D106D56E700AF1CAC /* PBXTextBookmark */ = 2170B57D106D56E700AF1CAC /* PBXTextBookmark */;
+ 2170B57E106D56E700AF1CAC /* PBXTextBookmark */ = 2170B57E106D56E700AF1CAC /* PBXTextBookmark */;
+ 2170B57F106D56E700AF1CAC /* PBXTextBookmark */ = 2170B57F106D56E700AF1CAC /* PBXTextBookmark */;
+ 2170B580106D56E700AF1CAC /* PBXTextBookmark */ = 2170B580106D56E700AF1CAC /* PBXTextBookmark */;
+ 2182B39D106B2359008641E4 /* PBXTextBookmark */ = 2182B39D106B2359008641E4 /* PBXTextBookmark */;
+ 2182B3BB106B24FA008641E4 /* PBXTextBookmark */ = 2182B3BB106B24FA008641E4 /* PBXTextBookmark */;
+ 2182B3D1106B2561008641E4 /* PBXTextBookmark */ = 2182B3D1106B2561008641E4 /* PBXTextBookmark */;
+ 2182B429106B35CC008641E4 /* PBXTextBookmark */ = 2182B429106B35CC008641E4 /* PBXTextBookmark */;
+ 2182B42A106B35CC008641E4 /* PBXTextBookmark */ = 2182B42A106B35CC008641E4 /* PBXTextBookmark */;
+ 2182B42B106B35CC008641E4 /* PBXBookmark */ = 2182B42B106B35CC008641E4 /* PBXBookmark */;
+ 2182B42D106B35CC008641E4 /* PBXTextBookmark */ = 2182B42D106B35CC008641E4 /* PBXTextBookmark */;
+ 2182B46E106B3E9E008641E4 /* PBXTextBookmark */ = 2182B46E106B3E9E008641E4 /* PBXTextBookmark */;
+ 2182B46F106B3E9E008641E4 /* PBXTextBookmark */ = 2182B46F106B3E9E008641E4 /* PBXTextBookmark */;
+ 2182B479106B3EDA008641E4 /* PBXTextBookmark */ = 2182B479106B3EDA008641E4 /* PBXTextBookmark */;
+ 21B5447D105D7963002097C4 /* PBXBookmark */ = 21B5447D105D7963002097C4 /* PBXBookmark */;
+ 21B54537105D953C002097C4 /* PBXTextBookmark */ = 21B54537105D953C002097C4 /* PBXTextBookmark */;
+ 21C61FAB10542D40004D5948 /* PBXTextBookmark */ = 21C61FAB10542D40004D5948 /* PBXTextBookmark */;
+ 21C61FAC10542D40004D5948 /* PBXTextBookmark */ = 21C61FAC10542D40004D5948 /* PBXTextBookmark */;
+ 21C61FAD10542D40004D5948 /* PBXTextBookmark */ = 21C61FAD10542D40004D5948 /* PBXTextBookmark */;
+ 21C61FEC10542FB9004D5948 /* PBXTextBookmark */ = 21C61FEC10542FB9004D5948 /* PBXTextBookmark */;
+ 21C61FED10542FB9004D5948 /* PBXTextBookmark */ = 21C61FED10542FB9004D5948 /* PBXTextBookmark */;
+ 21C61FEE10542FB9004D5948 /* PBXTextBookmark */ = 21C61FEE10542FB9004D5948 /* PBXTextBookmark */;
+ 21C6206510543D7D004D5948 /* PBXTextBookmark */ = 21C6206510543D7D004D5948 /* PBXTextBookmark */;
+ 21C6206610543D7D004D5948 /* PBXTextBookmark */ = 21C6206610543D7D004D5948 /* PBXTextBookmark */;
+ 21C6206810543D7D004D5948 /* PBXTextBookmark */ = 21C6206810543D7D004D5948 /* PBXTextBookmark */;
+ 21C6206A10543D7D004D5948 /* PBXTextBookmark */ = 21C6206A10543D7D004D5948 /* PBXTextBookmark */;
+ 21C6206B10543D7D004D5948 /* PBXTextBookmark */ = 21C6206B10543D7D004D5948 /* PBXTextBookmark */;
+ 21C6206E10543D7D004D5948 /* PBXTextBookmark */ = 21C6206E10543D7D004D5948 /* PBXTextBookmark */;
+ 21C6207110543D7D004D5948 /* PBXTextBookmark */ = 21C6207110543D7D004D5948 /* PBXTextBookmark */;
};
sourceControlManager = 2114C0D90957570F00614E74 /* Source Control */;
userBookmarkGroup = 215826490B72482B00711663 /* PBXBookmarkGroup */;
@@ -2071,19 +1985,20 @@
};
29B97316FDCFA39411CA2CEA /* main.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {992, 884}}";
- sepNavSelRange = "{187, 0}";
+ sepNavIntBoundsRect = "{{0, 0}, {972, 902}}";
+ sepNavSelRange = "{260, 0}";
+ sepNavVisRange = "{0, 260}";
sepNavVisRect = "{{0, 0}, {992, 884}}";
sepNavWindowFrame = "{{15, 9}, {1031, 1014}}";
};
};
32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {716, 980}}";
- sepNavSelRange = "{1677, 0}";
- sepNavVisRange = "{530, 1341}";
+ sepNavIntBoundsRect = "{{0, 0}, {716, 1050}}";
+ sepNavSelRange = "{794, 0}";
+ sepNavVisRange = "{201, 1018}";
sepNavVisRect = "{{0, 0}, {736, 617}}";
- sepNavWindowFrame = "{{574, 93}, {775, 762}}";
+ sepNavWindowFrame = "{{782, 290}, {775, 746}}";
};
};
8D1107260486CEB800E47090 /* Notation */ = {
View
5 Notation_Prefix.pch
@@ -36,6 +36,11 @@ typedef short FSIORefNum;
typedef float CGFloat;
#endif
+#define GCC_VERSION (__GNUC__ * 10000 \
++ __GNUC_MINOR__ * 100 \
++ __GNUC_PATCHLEVEL__)
+
+
#define VAR_STR(x) @#x
#define SEL_STR(name) NSStringFromSelector(@selector(name))
View
19 StickiesDocument.h
@@ -8,11 +8,26 @@
#import <Cocoa/Cocoa.h>
+#if __LP64__
+// Needed for compatability with data created by 32bit app
+typedef struct _NSRect32 {
+ struct {
+ float x;
+ float y;
+ };
+ struct {
+ float width;
+ float height;
+ };
+} NSRect32;
+#else
+typedef NSRect NSRect32;
+#endif
@interface StickiesDocument : NSObject <NSCoding> {
int mWindowColor;
int mWindowFlags;
- NSRect mWindowFrame;
+ NSRect32 mWindowFrame;
NSData *mRTFDData;
NSDate *mCreationDate;
NSDate *mModificationDate;
@@ -26,6 +41,6 @@
- (NSData*)RTFDData;
- (int)windowColor;
- (int)windowFlags;
-- (NSRect)windowFrame;
+- (NSRect32)windowFrame;
@end
View
7 StickiesDocument.m
@@ -8,7 +8,6 @@
#import "StickiesDocument.h"
-
@implementation StickiesDocument
- (void)dealloc {
@@ -34,7 +33,11 @@ - (id)initWithCoder:(id)decoder {
mRTFDData = [[decoder decodeObject] retain];
[decoder decodeValueOfObjCType:@encode(int) at:&mWindowFlags];
+#if __LP64__
+ [decoder decodeValueOfObjCType:"{_NSRect={_NSPoint=ff}{_NSSize=ff}}" at:&mWindowFrame];
+#else
[decoder decodeValueOfObjCType:@encode(NSRect) at:&mWindowFrame];
+#endif
[decoder decodeValueOfObjCType:@encode(int) at:&mWindowColor];
mCreationDate = [[decoder decodeObject] retain];
mModificationDate = [[decoder decodeObject] retain];
@@ -66,7 +69,7 @@ - (int)windowFlags {
return mWindowFlags;
}
-- (NSRect)windowFrame {
+- (NSRect32)windowFrame {
return mWindowFrame;
}
Please sign in to comment.
Something went wrong with that request. Please try again.