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

fixing naming to conform to effective ownership, cleaning up releasing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-02-16 06:55:43 +00:00
parent 192c3efa7f
commit 2677566b1d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/cocoa/filedlg.mm
View File

@@ -57,7 +57,7 @@ bool wxFileDialog::SupportsExtraControl() const
return true; return true;
} }
NSArray* GetTypesFromFilter( const wxString filter ) NSArray* CopyTypesFromFilter( const wxString filter )
{ {
NSMutableArray* types = nil; NSMutableArray* types = nil;
if ( !filter.empty() ) if ( !filter.empty() )
@@ -127,8 +127,8 @@ NSArray* GetTypesFromFilter( const wxString filter )
if ( extension.IsEmpty() ) if ( extension.IsEmpty() )
{ {
if ( types != nil )
[types release]; [types release];
types = nil;
return nil; return nil;
} }
@@ -188,7 +188,7 @@ void wxFileDialog::ShowWindowModal()
} }
else else
{ {
NSArray* types = GetTypesFromFilter( m_wildCard ) ; NSArray* types = CopyTypesFromFilter( m_wildCard ) ;
NSOpenPanel* oPanel = [NSOpenPanel openPanel]; NSOpenPanel* oPanel = [NSOpenPanel openPanel];
SetupExtraControls(oPanel); SetupExtraControls(oPanel);
@@ -207,6 +207,8 @@ void wxFileDialog::ShowWindowModal()
modalDelegate: sheetDelegate modalDelegate: sheetDelegate
didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo: nil]; contextInfo: nil];
[types release];
types = nil;
} }
} }
@@ -280,7 +282,7 @@ int wxFileDialog::ShowModal()
} }
else else
{ {
NSArray* types = GetTypesFromFilter( m_wildCard ) ; NSArray* types = CopyTypesFromFilter( m_wildCard ) ;
NSOpenPanel* oPanel = [NSOpenPanel openPanel]; NSOpenPanel* oPanel = [NSOpenPanel openPanel];
SetupExtraControls(oPanel); SetupExtraControls(oPanel);
@@ -299,8 +301,8 @@ int wxFileDialog::ShowModal()
UnsubclassWin(); UnsubclassWin();
[oPanel setAccessoryView:nil]; [oPanel setAccessoryView:nil];
if ( types != nil )
[types release]; [types release];
types = nil;
} }
return GetReturnCode(); return GetReturnCode();