[Audacity-cvs] audacity-src/src AutoRecovery.cpp, 1.14, 1.15 UploadDialog.cpp, 1.22, 1.23

[Vaughan Johnson]

Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31528

Modified Files:
        AutoRecovery.cpp UploadDialog.cpp 
Log Message:
Brian Cameron's patch for compatibility with latest Sun Studio compiler.

Index: UploadDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/UploadDialog.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- UploadDialog.cpp    2 Feb 2009 17:11:04 -0000       1.22
+++ UploadDialog.cpp    2 Jul 2009 22:12:16 -0000       1.23
@@ -244,7 +244,7 @@
         system = ftp->GetLastResult();
         system = system.Lower();
 
-        //wxMessageBox(system, _T("FTP Status"), wxOK | wxICON_INFORMATION, 
this);
+        //wxMessageBox(system, wxT("FTP Status"), wxOK | wxICON_INFORMATION, 
this);
 
         if (system.Find(wxT("unix"))==-1 && system.Find(wxT("windows"))==-1)
         {
@@ -901,7 +901,7 @@
                     int updateResult = mProgress->Update(count, iterations, 
src);
                     if (updateResult != eProgressSuccess)
                     {
-                        //wxMessageBox("ABORT", _T("FTP Status"), wxOK | 
wxICON_INFORMATION, NULL);
+                        //wxMessageBox("ABORT", wxT("FTP Status"), wxOK | 
wxICON_INFORMATION, NULL);
 
                         abort = true;
                         break;
@@ -1309,7 +1309,7 @@
     wxString debug;
 
 //  debug.Printf("%d", index);
-//  wxMessageBox(debug, _T("FTP Status"), wxOK | wxICON_INFORMATION, this);
+//  wxMessageBox(debug, wxT("FTP Status"), wxOK | wxICON_INFORMATION, this);
     
     wxFileName fn( FileNames::DataDir(), wxT("connections.ini") );
 
@@ -1353,7 +1353,7 @@
 
     //wxString debug;
     //debug.Printf("ftpIndex %d", ftpIndex);
-    //wxMessageBox(debug, _T("FTP Status"), wxOK | wxICON_INFORMATION, NULL);
+    //wxMessageBox(debug, wxT("FTP Status"), wxOK | wxICON_INFORMATION, NULL);
 
 
 }
@@ -1462,7 +1462,7 @@
 
     while (count < ftpList->GetCount())
     {
-        //wxMessageBox(ftpList->Item(count), _T("Error"), wxOK, NULL);
+        //wxMessageBox(ftpList->Item(count), wxT("Error"), wxOK, NULL);
 
         tmp = siteList->InsertItem(insert_count, ftpList->Item(count), 0);
         siteList->SetItemData(tmp, insert_count);

Index: AutoRecovery.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AutoRecovery.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- AutoRecovery.cpp    31 Mar 2009 16:51:31 -0000      1.14
+++ AutoRecovery.cpp    2 Jul 2009 22:12:16 -0000       1.15
@@ -158,7 +158,7 @@
 {
    wxArrayString files;
    wxDir::GetAllFiles(FileNames::AutoSaveDir(), &files,
-                      _T("*.autosave"), wxDIR_FILES);
+                      wxT("*.autosave"), wxDIR_FILES);
 
    for (unsigned int i = 0; i < files.GetCount(); i++)
    {
@@ -191,7 +191,7 @@
    
    wxArrayString files;
    wxDir::GetAllFiles(FileNames::AutoSaveDir(), &files,
-                      _T("*.autosave"), wxDIR_FILES);
+                      wxT("*.autosave"), wxDIR_FILES);
 
    for (unsigned int i = 0; i < files.GetCount(); i++)
    {


------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs