Converting from GC to ARC

This should only be for the osx specific code as all common files are left out. Hopefully this shouldn't introduce any problems on the other systems.

1 files changed, 10 insertions, 2 deletions

diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m
index ab992ed..099bf48 100644
--- a/tikzit/src/osx/PreferenceController.m
+++ b/tikzit/src/osx/PreferenceController.m
@@ -30,8 +30,8 @@
 
 @implementation PreferenceController
 
-- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController*)pc{
-    [super initWithWindowNibName:windowNibName];
+- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{
+    if (!(self = [super initWithWindowNibName:windowNibName])) return nil;
     
     preambleController = pc;
     
@@ -69,6 +69,9 @@
         case 3:
             view = preambleView;
         break;
+        case 4:
+            view = customNodeView;
+        break;
     }
     
     return  view;
@@ -96,6 +99,11 @@
     [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]];
     preambleView = [preambleController view];
     
+    customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil];
+    [[customNodeController view] setFrame:[customNodeView frame]];
+    [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]];
+    customNodeView = [customNodeController view];
+    
     [[self window] setContentSize:[preambleView frame].size];
     [[[self window] contentView] addSubview:preambleView];
     currentViewTag = 3;