Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10492
Modified Files:
Tag: Audacity_UmixIt
LyricsWindow.cpp Makefile.in MixerBoard.cpp Project.cpp
Log Message:
Fixed problems where a wxString was passed through a printf-like ... statement
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Makefile.in,v
retrieving revision 1.73.2.10.2.2
retrieving revision 1.73.2.10.2.3
diff -u -d -r1.73.2.10.2.2 -r1.73.2.10.2.3
--- Makefile.in 29 Nov 2006 08:39:13 -0000 1.73.2.10.2.2
+++ Makefile.in 26 Feb 2007 08:08:03 -0000 1.73.2.10.2.3
@@ -64,6 +64,7 @@
$(OBJDIR)/Menus.o \
$(OBJDIR)/MeterToolBar.o \
$(OBJDIR)/Mix.o \
+ $(OBJDIR)/MixerBoard.o \
$(OBJDIR)/MixerToolBar.o \
$(OBJDIR)/NoteTrack.o \
$(OBJDIR)/PitchName.o \
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.178.2.17.2.10
retrieving revision 1.178.2.17.2.11
diff -u -d -r1.178.2.17.2.10 -r1.178.2.17.2.11
--- Project.cpp 10 Feb 2007 04:06:52 -0000 1.178.2.17.2.10
+++ Project.cpp 26 Feb 2007 08:08:03 -0000 1.178.2.17.2.11
@@ -178,7 +178,8 @@
if (XMLValueChecker::IsGoodFileName(strPathName,
fileName.GetPath(wxPATH_GET_VOLUME))) {
strPathName = fileName.GetFullPath();
} else {
- wxLogWarning(wxT("Could not import file: %s"), strPathName);
+ wxLogWarning(wxT("Could not import file: %s"),
+ strPathName.c_str());
return false;
}
}
Index: LyricsWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/LyricsWindow.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- LyricsWindow.cpp 20 Feb 2007 07:20:26 -0000 1.1.2.3
+++ LyricsWindow.cpp 26 Feb 2007 08:08:03 -0000 1.1.2.4
@@ -29,10 +29,14 @@
wxFrame(parent, -1,
wxString::Format(_("Audacity Lyrics%s"),
((parent->GetName() == wxEmptyString) ?
- wxEmptyString :
- wxString::Format(wxT("- %s"),
parent->GetName()))),
+ wxT("") :
+ wxString::Format(
+ wxT("- %s"),
+ parent->GetName().c_str()).c_str())),
wxDefaultPosition, gSize,
- wxDEFAULT_FRAME_STYLE | ((parent == NULL) ? 0x0 :
wxFRAME_FLOAT_ON_PARENT))
+ wxDEFAULT_FRAME_STYLE | ((parent == NULL) ?
+ 0x0 :
+ wxFRAME_FLOAT_ON_PARENT))
{
mProject = parent;
mLyricsPanel = new Lyrics(this, -1, wxPoint(0, 0), gSize);
Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/MixerBoard.cpp,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- MixerBoard.cpp 21 Feb 2007 03:26:11 -0000 1.1.2.5
+++ MixerBoard.cpp 26 Feb 2007 08:08:03 -0000 1.1.2.6
@@ -485,8 +485,9 @@
wxFrame(parent, -1,
wxString::Format(_("Audacity Mixer Board%s"),
((parent->GetName() == wxEmptyString) ?
- wxEmptyString :
- wxString::Format(wxT("- %s"),
parent->GetName()))),
+ wxT("") :
+ wxString::Format(wxT("- %s"),
+
parent->GetName().c_str()).c_str())),
wxDefaultPosition, kDefaultSize,
wxDEFAULT_FRAME_STYLE | ((parent == NULL) ? 0x0 :
wxFRAME_FLOAT_ON_PARENT))
{
@@ -1101,4 +1102,4 @@
for (unsigned int i = 0; i < mMixerTrackClusters.GetCount(); i++)
mMixerTrackClusters[i]->UpdateHeight();
-}
\ No newline at end of file
+}
-------------------------------------------------------------------------
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
