diff options
author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2013-02-04 11:55:17 +0000 |
---|---|---|
committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2013-02-04 11:55:17 +0000 |
commit | 5349460f6ba630d92ab61f4cbe1c04210e7684cc (patch) | |
tree | ffca8efdeb7e51477d6f90e93512f75432600c48 /tikzit/src/osx/PreambleController.m | |
parent | f9bdbf93887313a79528696607d96140f33cbd84 (diff) | |
parent | 5afd392bb6ddde79f0518ffd913bd8c365bf39e6 (diff) |
Merge branch 'master' into multi-docs
Diffstat (limited to 'tikzit/src/osx/PreambleController.m')
-rw-r--r-- | tikzit/src/osx/PreambleController.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m index e09a3fc..e424e7b 100644 --- a/tikzit/src/osx/PreambleController.m +++ b/tikzit/src/osx/PreambleController.m @@ -28,11 +28,12 @@ @synthesize preambleText, preambles; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty { +- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { [super initWithWindowNibName:windowNibName]; preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; [preambles setStyles:sty]; + [preambles setEdges:edg]; if (preambles == nil) preambles = [[Preambles alloc] init]; preambleText = nil; |