Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better retain/release semantics

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-06-09 00:24:21 +00:00
parent 668e3f703e
commit c2a22141f8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/osx/cocoa/nonownedwnd.mm
View File

@@ -452,6 +452,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
editor = [[wxNSTextFieldEditor alloc] init]; editor = [[wxNSTextFieldEditor alloc] init];
[editor setFieldEditor:YES]; [editor setFieldEditor:YES];
[tf setFieldEditor:editor]; [tf setFieldEditor:editor];
[editor release];
} }
return editor; return editor;
} }

7
src/osx/cocoa/textctrl.mm
View File

@@ -258,7 +258,12 @@ protected :
- (void) setFieldEditor:(wxNSTextFieldEditor*) editor - (void) setFieldEditor:(wxNSTextFieldEditor*) editor
{ {
if ( editor != fieldEditor )
{
[editor retain];
[fieldEditor release];
fieldEditor = editor; fieldEditor = editor;
}
} }
- (wxNSTextFieldEditor*) fieldEditor - (wxNSTextFieldEditor*) fieldEditor
@@ -630,7 +635,7 @@ wxNSTextFieldControl::wxNSTextFieldControl(wxWindow *wxPeer,
void wxNSTextFieldControl::Init(WXWidget w) void wxNSTextFieldControl::Init(WXWidget w)
{ {
NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>) *tf = (NSTextField*) w; NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>) *tf = (NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)*) w;
m_textField = tf; m_textField = tf;
[m_textField setDelegate: tf]; [m_textField setDelegate: tf];
m_selStart = m_selEnd = 0; m_selStart = m_selEnd = 0;