From: <har...@us...> - 2009-09-11 12:37:10
|
Revision: 4374 http://hugin.svn.sourceforge.net/hugin/?rev=4374&view=rev Author: harryvanderwolf Date: 2009-09-11 12:36:57 +0000 (Fri, 11 Sep 2009) Log Message: ----------- [OSX] prepare OSX for TModes autopano structure Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/platform.cpp hugin/trunk/src/hugin1/base_wx/platform.h Modified: hugin/trunk/src/hugin1/base_wx/platform.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.cpp 2009-09-11 12:34:56 UTC (rev 4373) +++ hugin/trunk/src/hugin1/base_wx/platform.cpp 2009-09-11 12:36:57 UTC (rev 4374) @@ -263,6 +263,27 @@ return tmpDirPath; } +wxString MacGetPathToUserAppSupportAutoPanoFolder() +{ + wxString appSupportAutoPanoFolder = wxT(""); + + FSRef appSupportFolder; + OSErr err = FSFindFolder(kUserDomain,kApplicationSupportFolderType,kDontCreateFolder,&appSupportFolder); + if( err == noErr) + { + CFURLRef appSupportFolderURL = CFURLCreateFromFSRef(kCFAllocatorDefault,&appSupportFolder); + CFURLRef appSupportHugin = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,appSupportFolderURL,CFSTR("Hugin"),true); + CFURLRef autopanoURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,appSupportHugin,CFSTR("Autopano"),true); + CFStringRef tmpPath = CFURLCopyFileSystemPath(autopanoURL, kCFURLPOSIXPathStyle); + CFRetain(tmpPath); + appSupportAutoPanoFolder = wxMacCFStringHolder(tmpPath).AsString(wxLocale::GetSystemEncoding()); + + CFRelease(autopanoURL); + } + return appSupportAutoPanoFolder; +} + + #endif // MAC_SELF_CONTAINED_BUNDLE #endif // __WXMAC__ Modified: hugin/trunk/src/hugin1/base_wx/platform.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.h 2009-09-11 12:34:56 UTC (rev 4373) +++ hugin/trunk/src/hugin1/base_wx/platform.h 2009-09-11 12:36:57 UTC (rev 4374) @@ -53,6 +53,7 @@ wxString MacGetPathToBundledExecutableFile(CFStringRef filename); wxString MacGetPathToBundledAppMainExecutableFile(CFStringRef appname); wxString MacGetPathToUserDomainTempDir(); +wxString MacGetPathToUserAppSupportAutoPanoFolder(); #endif // MAC_SELF_CONTAINED_BUNDLE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-11 12:08:09
|
Revision: 4600 http://hugin.svn.sourceforge.net/hugin/?rev=4600&view=rev Author: stativ Date: 2009-10-11 12:08:03 +0000 (Sun, 11 Oct 2009) Log Message: ----------- Added destructors to MyExecPanel, MyExecDialog, MyExternalCmdExecDialog. Fixes several memory leaks. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2009-10-11 09:07:09 UTC (rev 4599) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2009-10-11 12:08:03 UTC (rev 4600) @@ -506,7 +506,15 @@ } +MyExecPanel::~MyExecPanel() { +#ifdef HUGIN_EXEC_LISTBOX + delete m_lbox; +#else + delete m_textctrl; +#endif +} + // ---------------------------------------------------------------------------- // MyProcess // ---------------------------------------------------------------------------- @@ -629,6 +637,10 @@ return ShowModal(); } +MyExecDialog::~MyExecDialog() { + delete m_execPanel; +} + int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title) { @@ -741,6 +753,10 @@ #endif } +MyExternalCmdExecDialog::~MyExternalCmdExecDialog() { + delete m_tbox; +} + //---------- bool HuginPipedProcess::HasInput() Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2009-10-11 09:07:09 UTC (rev 4599) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2009-10-11 12:08:03 UTC (rev 4600) @@ -72,6 +72,8 @@ // for MyPipedProcess void OnProcessTerminated(MyPipedProcess *process, int pid, int status); //wxListBox *GetLogListBox() const { return m_lbox; } + + virtual ~MyExecPanel(); private: @@ -156,6 +158,8 @@ int ExecWithRedirect(wxString command); void OnProcessTerminate(wxProcessEvent & event); + + virtual ~MyExecDialog(); private: @@ -193,6 +197,7 @@ void OnIdle(wxIdleEvent& event); //wxListBox *GetLogListBox() const { return m_lbox; } wxTextCtrl *GetLogTextBox() const { return m_tbox; } + virtual ~MyExternalCmdExecDialog(); private: //wxListBox *m_lbox; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |