Fixed some wxString-through-printf bugs.

icculus · Sep 30, 2003 · fdd3d90 · fdd3d90
1 parent 1bd103d
commit fdd3d90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CompareFolders.cpp b/CompareFolders.cpp
@@ -34,7 +34,7 @@ namespace MojoMerge
             // Add item to our hash table for keeping track of which folders
             //  this path occurs in
             // TODO - Add case insensitivity for Win32
-            Application::Debug("%s: Hash entry = %d", Path, (*Hash)[Path]);
+            Application::Debug("%s: Hash entry = %d", Path.c_str(), (*Hash)[Path]);
             // If it's a directoy, retain that info in our item data
             if(IsDir)
                 (*Hash)[Path] = (*Hash)[Path] | FileExistConstant | ISFOLDER;
@@ -110,7 +110,7 @@ FolderHunk *CompareFolders::Execute(CompareFolderOptions Options,
     size_t i;
     Application::Debug("%s", Folder1);
     for(i = 0; i < MyFiles.Count(); i++)
-        Application::Debug("%d:   %s", MyHash[MyFiles.Item(i)], MyFiles.Item(i));
+        Application::Debug("%d:   %s", MyHash[MyFiles.Item(i)], MyFiles.Item(i).c_str());
 
     // Begin creation of FolderHunk children
     int CurIndex = 0;

diff --git a/Test.cpp b/Test.cpp
@@ -275,7 +275,7 @@ void Test::PrintHunks(FolderHunk *FirstHunk, int Indent)
         Application::Debug("%d%d%d: %s%s", CurHunk->GetExists(DiffFile_One),
             CurHunk->GetExists(DiffFile_Two),
             CurHunk->GetExists(DiffFile_Three),
-            Spaces, CurHunk->GetBarePath());
+            Spaces.c_str(), CurHunk->GetBarePath());
         // If item has children
         if(CurHunk->GetFirstChild())
             PrintHunks(CurHunk->GetFirstChild(), Indent + 4);