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

cleanup and fix of double disposal (thanks to Steve Hartwell)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-11 15:15:42 +00:00
parent 79a73b4f86
commit e71800ba3a
2 changed files with 18 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/mac/carbon/filedlg.cpp
View File

@@ -333,6 +333,7 @@ pascal Boolean CrossPlatformFilterCallback (
CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
#endif
CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
::CFRelease( fullURLRef ) ;
wxString file = wxMacCFStringHolder(cfString).AsString(wxFont::GetDefaultEncoding());
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
@@ -355,29 +356,13 @@ int wxFileDialog::ShowModal()
// this was always unset in the old code
dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;
#if wxUSE_UNICODE
// tried using wxMacCFStringHolder in the code below, but it seems
// the CFStrings were being released before the save dialog was called,
// causing a crash - open dialog works fine with or without wxMacCFStringHolder
CFStringRef titleRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault,
(const unsigned short*)m_message.wc_str(),
m_message.Len() );
#else
CFStringRef titleRef = ::CFStringCreateWithCString(NULL,
m_message.c_str(),
m_font.GetEncoding() );
#endif
dialogCreateOptions.windowTitle = titleRef;
#if wxUSE_UNICODE
CFStringRef defaultFileNameRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault,
(const unsigned short*)m_fileName.wc_str(),
m_fileName.Len() );
#else
CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL,
m_fileName.c_str(),
m_font.GetEncoding());
#endif
dialogCreateOptions.saveFileName = defaultFileNameRef;
wxMacCFStringHolder message(m_message, m_font.GetEncoding());
dialogCreateOptions.windowTitle = message;
wxMacCFStringHolder defaultFileName(m_fileName, m_font.GetEncoding());
dialogCreateOptions.saveFileName = defaultFileName;
NavDialogRef dialog;
NavObjectFilterUPP navFilterUPP = NULL;
CFArrayRef cfArray = NULL; // for popupExtension
@@ -433,20 +418,8 @@ int wxFileDialog::ShowModal()
if (navFilterUPP)
::DisposeNavObjectFilterUPP(navFilterUPP);
if (cfArray)
{
CFIndex n = ::CFArrayGetCount(cfArray);
for (CFIndex i = 0; i < n; i++)
{
CFStringRef str = (CFStringRef) ::CFArrayGetValueAtIndex(cfArray, i);
if (str)
::CFRelease(str);
}
::CFRelease(cfArray);
}
if (titleRef)
::CFRelease(titleRef);
if (defaultFileNameRef)
::CFRelease(defaultFileNameRef);
if (err != noErr)
return wxID_CANCEL;

45
src/mac/filedlg.cpp
View File

@@ -333,6 +333,7 @@ pascal Boolean CrossPlatformFilterCallback (
CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
#endif
CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
::CFRelease( fullURLRef ) ;
wxString file = wxMacCFStringHolder(cfString).AsString(wxFont::GetDefaultEncoding());
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
@@ -355,29 +356,13 @@ int wxFileDialog::ShowModal()
// this was always unset in the old code
dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;
#if wxUSE_UNICODE
// tried using wxMacCFStringHolder in the code below, but it seems
// the CFStrings were being released before the save dialog was called,
// causing a crash - open dialog works fine with or without wxMacCFStringHolder
CFStringRef titleRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault,
(const unsigned short*)m_message.wc_str(),
m_message.Len() );
#else
CFStringRef titleRef = ::CFStringCreateWithCString(NULL,
m_message.c_str(),
m_font.GetEncoding() );
#endif
dialogCreateOptions.windowTitle = titleRef;
#if wxUSE_UNICODE
CFStringRef defaultFileNameRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault,
(const unsigned short*)m_fileName.wc_str(),
m_fileName.Len() );
#else
CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL,
m_fileName.c_str(),
m_font.GetEncoding());
#endif
dialogCreateOptions.saveFileName = defaultFileNameRef;
wxMacCFStringHolder message(m_message, m_font.GetEncoding());
dialogCreateOptions.windowTitle = message;
wxMacCFStringHolder defaultFileName(m_fileName, m_font.GetEncoding());
dialogCreateOptions.saveFileName = defaultFileName;
NavDialogRef dialog;
NavObjectFilterUPP navFilterUPP = NULL;
CFArrayRef cfArray = NULL; // for popupExtension
@@ -433,20 +418,8 @@ int wxFileDialog::ShowModal()
if (navFilterUPP)
::DisposeNavObjectFilterUPP(navFilterUPP);
if (cfArray)
{
CFIndex n = ::CFArrayGetCount(cfArray);
for (CFIndex i = 0; i < n; i++)
{
CFStringRef str = (CFStringRef) ::CFArrayGetValueAtIndex(cfArray, i);
if (str)
::CFRelease(str);
}
::CFRelease(cfArray);
}
if (titleRef)
::CFRelease(titleRef);
if (defaultFileNameRef)
::CFRelease(defaultFileNameRef);
if (err != noErr)
return wxID_CANCEL;