SF.net SVN: jazzplusplus:[925] trunk/jazz/src

[<pst...@us...>]

Revision: 925
          http://sourceforge.net/p/jazzplusplus/code/925
Author:   pstieber
Date:     2012-12-21 16:56:55 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Update wx_str to mb_str.

Modified Paths:
--------------
    trunk/jazz/src/Audio.cpp
    trunk/jazz/src/Configuration.cpp
    trunk/jazz/src/Harmony.cpp
    trunk/jazz/src/JazzPlusPlusApplication.cpp
    trunk/jazz/src/Rhythm.cpp
    trunk/jazz/src/SampleDialog.cpp

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2012-11-30 15:53:45 UTC (rev 924)
+++ trunk/jazz/src/Audio.cpp	2012-12-21 16:56:55 UTC (rev 925)
@@ -289,7 +289,7 @@
   // Get the path of the sample file.
   wxString SplFilePath = ::wxPathOnly(FileName);
 
-  ifstream Is(FileName.wx_str());
+  ifstream Is(FileName.mb_str());
   int Version;
   Is >> Version >> mSamplingRate >> mChannelCount >> mSoftwareSynchonization;
   while (Is && !Is.eof())
@@ -364,7 +364,7 @@
 //-----------------------------------------------------------------------------
 int JZSampleSet::Save(const wxString& FileName)
 {
-  ofstream Ofs(FileName.wx_str());
+  ofstream Ofs(FileName.mb_str());
   Ofs
     << 1
     << ' ' << mSamplingRate
@@ -1060,7 +1060,7 @@
   wh.data_length   = (end_index - start_index) * sizeof(short);
   wh.length        = wh.data_length + sizeof(WaveHeader);
 
-  ofstream os(FileName.wx_str(), ios::out | ios::binary | ios::trunc);
+  ofstream os(FileName.mb_str(), ios::out | ios::binary | ios::trunc);
 
   os.write((char*)&wh, sizeof(wh));
 

Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp	2012-11-30 15:53:45 UTC (rev 924)
+++ trunk/jazz/src/Configuration.cpp	2012-12-21 16:56:55 UTC (rev 925)
@@ -553,7 +553,7 @@
     return false;
   }
 
-  ifstream Ifs(FileName.wx_str());
+  ifstream Ifs(FileName.mb_str());
   if (!Ifs)
   {
     return false;
@@ -642,7 +642,7 @@
     return false;
   }
 
-  ifstream Ifs(FileName.wx_str());
+  ifstream Ifs(FileName.mb_str());
   if (!Ifs)
   {
     return false;
@@ -734,7 +734,7 @@
     << "  \"" << mFileName << '"'
     << endl;
 
-  ifstream* pIs = new ifstream(mFileName.wx_str());
+  ifstream* pIs = new ifstream(mFileName.mb_str());
   InputFileStreams.push(pIs);
 
   if (!*InputFileStreams.top())
@@ -848,7 +848,7 @@
             }
             else
             {
-              pIs = new ifstream(IncludeFileName.wx_str());
+              pIs = new ifstream(IncludeFileName.mb_str());
               InputFileStreams.push(pIs);
             }
 

Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp	2012-11-30 15:53:45 UTC (rev 924)
+++ trunk/jazz/src/Harmony.cpp	2012-12-21 16:56:55 UTC (rev 925)
@@ -1449,7 +1449,7 @@
 
   if (!FileName.empty())
   {
-    ifstream Is(FileName.wx_str());
+    ifstream Is(FileName.mb_str());
     Is >> *this;
   }
 }
@@ -1467,7 +1467,7 @@
 
   if (!FileName.empty())
   {
-    ofstream os(FileName.wx_str());
+    ofstream os(FileName.mb_str());
     os << *this;
   }
 }

Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp	2012-11-30 15:53:45 UTC (rev 924)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp	2012-12-21 16:56:55 UTC (rev 925)
@@ -191,7 +191,7 @@
   // Test for the existence of the help file.
   bool HelpFileFound = false;
   ifstream Is;
-  Is.open(HelpFileNameAndPath.wx_str());
+  Is.open(HelpFileNameAndPath.mb_str());
   if (!Is)
   {
     // Ask the user to find the help file.
@@ -202,7 +202,7 @@
       // Try one more time.
       Is.close();
       Is.clear();
-      Is.open(HelpFileNameAndPath.wx_str());
+      Is.open(HelpFileNameAndPath.mb_str());
       if (!Is)
       {
         wxString Message = "Failed to add the Jazz++ book " + mHelpFileName;

Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp	2012-11-30 15:53:45 UTC (rev 924)
+++ trunk/jazz/src/Rhythm.cpp	2012-12-21 16:56:55 UTC (rev 925)
@@ -769,7 +769,7 @@
           "*.rhy");
         if (!FileName.empty())
         {
-          ifstream Is(FileName.wx_str());
+          ifstream Is(FileName.mb_str());
           Is >> *this;
           OnPaint();
         }
@@ -787,7 +787,7 @@
           "*.rhy");
         if (!FileName.empty())
         {
-          ofstream Os(FileName.wx_str());
+          ofstream Os(FileName.mb_str());
           Os << *this;
         }
       }

Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp	2012-11-30 15:53:45 UTC (rev 924)
+++ trunk/jazz/src/SampleDialog.cpp	2012-12-21 16:56:55 UTC (rev 925)
@@ -626,7 +626,7 @@
           "*.syn");
         if (!FileName.empty())
         {
-          ifstream is(FileName.wx_str());
+          ifstream is(FileName.mb_str());
           is >> *this;
           SetupEdits();
           int cw, ch;
@@ -648,7 +648,7 @@
           "*.syn");
         if (!FileName.empty())
         {
-          ofstream os(FileName.wx_str());
+          ofstream os(FileName.mb_str());
           os << *this;
         }
       }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.