Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5696
Modified Files:
FileNames.cpp
Log Message:
fixing directories for mac help manual
Index: FileNames.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FileNames.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- FileNames.cpp 3 Aug 2009 17:14:20 -0000 1.21
+++ FileNames.cpp 13 Sep 2009 01:32:08 -0000 1.22
@@ -118,9 +118,22 @@
wxString FileNames::HtmlHelpDir()
{
- // Use the Audacity.exe directory as a base (on Windows, others elsewhere)
+#if defined(__WXMAC__)
+ wxFileName exePath(PlatformCompatibility::GetExecutablePath());
+ // This removes (for instance) "Audacity.app/Contents/MacOSX"
+ exePath.RemoveLastDir();
+ exePath.RemoveLastDir();
+ exePath.RemoveLastDir();
+
+ return wxFileName( exePath.GetPath()+wxT("/help/manual"), wxEmptyString
).GetFullPath();
+#else
+ //linux goes into /*prefix*/share/audacity/
+ //windows goes into the dir containing the .exe
wxString exeDir = wxStandardPaths::Get().GetDataDir();
+
+ //for mac this puts us within the .app: Audacity.app/Contents/SharedSupport/
return wxFileName( exeDir+wxT("/help/manual"), wxEmptyString
).GetFullPath();
+#endif
}
wxString FileNames::HtmlHelpIndexFile(bool quick)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
