Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24783/widgets
Modified Files:
Tag: Audacity_UmixIt
LinkingHtmlWindow.cpp Meter.cpp
Log Message:
Mixer Board updates to be XOR Track Panel display for UmixIt, but stay a
separate wxFrame for standard build.
Plus some cleanups/fixes.
Index: LinkingHtmlWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/LinkingHtmlWindow.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- LinkingHtmlWindow.cpp 22 Mar 2007 02:15:31 -0000 1.1.2.1
+++ LinkingHtmlWindow.cpp 28 Mar 2007 02:19:25 -0000 1.1.2.2
@@ -19,13 +19,18 @@
void OpenInDefaultBrowser(const wxHtmlLinkInfo& link)
{
#ifdef __WXMAC__
- wxString openCmd = "open " + link.GetHref();
+ wxString openCmd = wxT("open ") + link.GetHref();
::wxExecute(openCmd);
#else
wxFileType* pFileType =
wxTheMimeTypesManager->GetFileTypeFromExtension(wxT(".htm"));
- if (pFileType == NULL) return;
+ if (pFileType == NULL)
+ return;
wxString openCmd = pFileType->GetOpenCommand(link.GetHref());
+ if (openCmd.Contains(wxT("iexplore.exe")))
+ // GetOpenCommand is not quite right for Internet Explorer.
+ openCmd.Replace(wxT("WWW_OpenURL#\"file://"), wxT("WWW_OpenURL#\""));
::wxExecute(openCmd);
+ delete pFileType;
#endif
};
Index: Meter.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.1.2.12.2.6
retrieving revision 1.1.2.12.2.7
diff -u -d -r1.1.2.12.2.6 -r1.1.2.12.2.7
--- Meter.cpp 1 Mar 2007 02:28:18 -0000 1.1.2.12.2.6
+++ Meter.cpp 28 Mar 2007 02:19:25 -0000 1.1.2.12.2.7
@@ -653,9 +653,7 @@
mRightTextPos = wxPoint(width-mLeftSize.x, height-2-mLeftSize.y);
width -= mLeftSize.x + mRightSize.x + 8;
- //vvv #ifdef __WXMAC__
width -= 8;
- //vvv #endif
}
barw = (width-2)/2;
barh = height - 4;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
