diff options
| author | nyamatongwe <devnull@localhost> | 2013-01-04 18:23:23 +1100 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2013-01-04 18:23:23 +1100 |
| commit | e747a5f6cced2aec6ecb0ed2cee24736e54764b1 (patch) | |
| tree | fc3935dfceb0712fd8f21fcf1c70db7abfedad77 /cocoa/ScintillaCocoa.mm | |
| parent | 0f1f4f27b8f4c70f514121206b024014deaef132 (diff) | |
| download | scintilla-mirror-e747a5f6cced2aec6ecb0ed2cee24736e54764b1.tar.gz | |
Fix object ownership and thus memory management. Change owner and backend
properties to (nonatomic, assign) as pointers to owners should not be
retained and backend is a pointer to a C++ object.
Move property declarations before methods.
Update copyright notice.
From Mike Lischke at Oracle.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index be8987083..cdf3f059a 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -381,7 +381,7 @@ const CGFloat paddingHighlightY = 2; ScintillaCocoa::ScintillaCocoa(NSView* view) { - wMain= [view retain]; + wMain = view; // Don't retain since we're owned by view, which would cause a cycle timerTarget = [[[TimerTarget alloc] init: this] retain]; layerFindIndicator = NULL; Initialise(); @@ -393,8 +393,6 @@ ScintillaCocoa::~ScintillaCocoa() { SetTicking(false); [timerTarget release]; - NSView* container = ContentView(); - [container release]; } //-------------------------------------------------------------------------------------------------- |