summaryrefslogtreecommitdiff
path: root/tikzit
diff options
context:
space:
mode:
authorJohan Paulsson <gonz@badcode.net>2014-03-25 20:41:44 +0000
committerJohan Paulsson <gonz@badcode.net>2014-03-25 20:41:44 +0000
commit1e65c32b799b7ca262f266737a867240eeb451f8 (patch)
tree821fb1da406de281b9753af56c589f3f849cdce0 /tikzit
parent32cb63c5115d1eaa1422114861514293ddd74f6d (diff)
fixing a couple of attributes that stopped selectable nodes from showing
Diffstat (limited to 'tikzit')
-rw-r--r--tikzit/src/osx/AppDelegate.h4
-rw-r--r--tikzit/src/osx/CustomNodeController.h4
-rw-r--r--tikzit/src/osx/GraphicsView.h4
-rw-r--r--tikzit/src/osx/NodeLayer.h4
-rw-r--r--tikzit/src/osx/NodeSelectionLayer.h4
-rw-r--r--tikzit/src/osx/StylePaletteController.h18
6 files changed, 19 insertions, 19 deletions
diff --git a/tikzit/src/osx/AppDelegate.h b/tikzit/src/osx/AppDelegate.h
index 0f9d787..67389e4 100644
--- a/tikzit/src/osx/AppDelegate.h
+++ b/tikzit/src/osx/AppDelegate.h
@@ -37,13 +37,13 @@
PreambleController *preambleController;
PreviewController *previewController;
PreferenceController *preferenceController;
- ToolPaletteController *__weak toolPaletteController;
+ ToolPaletteController *toolPaletteController;
IBOutlet GraphicsView *graphicsView;
NSString *tempDir;
}
@property IBOutlet StylePaletteController *stylePaletteController;
-@property (weak) IBOutlet ToolPaletteController *toolPaletteController;
+@property (strong) IBOutlet ToolPaletteController *toolPaletteController;
- (void)awakeFromNib;
+ (void)setDefaults;
diff --git a/tikzit/src/osx/CustomNodeController.h b/tikzit/src/osx/CustomNodeController.h
index 5553fcd..67adf0b 100644
--- a/tikzit/src/osx/CustomNodeController.h
+++ b/tikzit/src/osx/CustomNodeController.h
@@ -16,7 +16,7 @@
#import "SupportDir.h"
@interface CustomNodeController : NSViewController <NSTableViewDelegate>{
- NSDictionary* __weak nodeStyles;
+ NSDictionary *nodeStyles;
NSMutableArray* customNodeStyles;
GraphicsView *__weak graphicsView;
@@ -24,7 +24,7 @@
NSTableView *customNodeTable;
}
-@property (weak, readonly) NSDictionary *nodeStyles;
+@property NSDictionary *nodeStyles;
@property NSMutableArray* customNodeStyles;
@property IBOutlet NSTableView *customNodeTable;
diff --git a/tikzit/src/osx/GraphicsView.h b/tikzit/src/osx/GraphicsView.h
index c3c2add..329b1e5 100644
--- a/tikzit/src/osx/GraphicsView.h
+++ b/tikzit/src/osx/GraphicsView.h
@@ -92,12 +92,12 @@ typedef enum {
NSUndoManager *documentUndoManager;
NSPoint startPoint;
- TikzSourceController *__weak tikzSourceController;
+ TikzSourceController *tikzSourceController;
}
@property BOOL enabled;
@property (weak) Graph *graph;
-@property (weak) IBOutlet TikzSourceController *tikzSourceController;
+@property IBOutlet TikzSourceController *tikzSourceController;
@property (readonly) Transformer *transformer;
@property (readonly) PickSupport *pickSupport;
diff --git a/tikzit/src/osx/NodeLayer.h b/tikzit/src/osx/NodeLayer.h
index d2a943b..dbcdac5 100644
--- a/tikzit/src/osx/NodeLayer.h
+++ b/tikzit/src/osx/NodeLayer.h
@@ -30,7 +30,7 @@
#import "NodeSelectionLayer.h"
@interface NodeLayer : CALayer {
- Node *__weak node;
+ Node *node;
Shape *shape;
CGMutablePathRef path;
float textwidth;
@@ -42,7 +42,7 @@
BOOL dirty; // need to rebuild CGBezierPath of the shape
}
-@property (weak) Node *node;
+@property (strong) Node *node;
@property (assign) NSPoint center;
@property (assign) BOOL rescale;
@property (strong) NodeSelectionLayer *selection;
diff --git a/tikzit/src/osx/NodeSelectionLayer.h b/tikzit/src/osx/NodeSelectionLayer.h
index 68d5beb..99ee75f 100644
--- a/tikzit/src/osx/NodeSelectionLayer.h
+++ b/tikzit/src/osx/NodeSelectionLayer.h
@@ -31,10 +31,10 @@
BOOL selected;
CGMutablePathRef path;
NSLock *drawLock;
- NodeLayer *__weak nodeLayer;
+ NodeLayer *nodeLayer;
}
-@property (weak) NodeLayer *nodeLayer;
+@property NodeLayer *nodeLayer;
- (id)init;
- (void)select;
diff --git a/tikzit/src/osx/StylePaletteController.h b/tikzit/src/osx/StylePaletteController.h
index 51404bb..0242b61 100644
--- a/tikzit/src/osx/StylePaletteController.h
+++ b/tikzit/src/osx/StylePaletteController.h
@@ -28,8 +28,8 @@
@class SFBInspectorView;
@interface StylePaletteController : NSWindowController {
- NSMutableArray *__weak nodeStyles;
- NSMutableArray *__weak edgeStyles;
+ NSMutableArray *nodeStyles;
+ NSMutableArray *edgeStyles;
IBOutlet NSArrayController *nodeStyleArrayController;
IBOutlet NSArrayController *filteredNodeStyleArrayController;
IBOutlet NSArrayController *edgeStyleArrayController;
@@ -43,15 +43,15 @@
NSString *displayedEdgeStyleCategory;
}
-@property (weak, readonly) NSMutableArray *nodeStyles;
-@property (weak, readonly) NSMutableArray *edgeStyles;
-@property (readonly) BOOL documentActive;
-@property (weak) NodeStyle *activeNodeStyle;
-@property (weak) EdgeStyle *activeEdgeStyle;
+@property (strong) NSMutableArray *nodeStyles;
+@property (strong) NSMutableArray *edgeStyles;
+@property BOOL documentActive;
+@property (strong) NodeStyle *activeNodeStyle;
+@property (strong) EdgeStyle *activeEdgeStyle;
@property (copy) NSString *displayedNodeStyleCategory;
@property (copy) NSString *displayedEdgeStyleCategory;
-@property (weak, readonly) NSPredicate *displayedNodeStylePredicate;
-@property (weak, readonly) NSPredicate *displayedEdgeStylePredicate;
+@property (weak) NSPredicate *displayedNodeStylePredicate;
+@property (weak) NSPredicate *displayedEdgeStylePredicate;
//@property NSString *nodeLabel;