From 6e4a5d8cdad71c79e393502005bae3bfbaeaae82 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Sun, 23 Nov 2008 08:44:02 +0000
Subject: Moved wiimote_test to wiimote Some linux compile fixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1266 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/Thread.cpp            |  2 ++
 Source/Core/DolphinWX/Src/ISOProperties.cpp  | 10 +++++-----
 Source/Core/DolphinWX/Src/MemcardManager.cpp |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'Source/Core')

diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp
index 512e6be345..56188bb9b3 100644
--- a/Source/Core/Common/Src/Thread.cpp
+++ b/Source/Core/Common/Src/Thread.cpp
@@ -248,6 +248,8 @@ void Thread::WaitForDeath()
 	{
 		void* exit_status;
 		pthread_join(thread_id, &exit_status);
+                if (exit_status)
+                  fprintf(stderr, "error %d joining thread\n", *(int *)exit_status);
 		thread_id = 0;
 	}
 }
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index c8ded255d6..4990d67635 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -589,7 +589,7 @@ void CISOProperties::ActionReplayList_Load()
 			// Take care of the previous code
 			if (code.ops.size())
 			{
-				code.uiIndex = Cheats->Append(_T(code.name));
+                          code.uiIndex = Cheats->Append(wxString::FromAscii(code.name.c_str()));
 				ARCodes.push_back(code);
 				Cheats->Check(code.uiIndex, code.enabled);
 				code.ops.clear();
@@ -618,9 +618,9 @@ void CISOProperties::ActionReplayList_Load()
  
 	if (code.ops.size())
 	{
-		code.uiIndex = Cheats->Append(_T(code.name));
-		ARCodes.push_back(code);
-		Cheats->Check(code.uiIndex, code.enabled);
+            code.uiIndex = Cheats->Append(wxString::FromAscii(code.name.c_str()));
+            ARCodes.push_back(code);
+            Cheats->Check(code.uiIndex, code.enabled);
 	}
 }
 void CISOProperties::ActionReplayList_Save()
@@ -638,4 +638,4 @@ void CISOProperties::ActionReplayList_Save()
 		}
 	}
 	GameIni.SetLines("ActionReplay", lines);
-}
\ No newline at end of file
+}
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index 2bba44fb20..561a507df8 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -665,9 +665,9 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card, int page)
 		m_MemcardList[card]->SetItem(index, COLUMN_TITLE, wxString::FromAscii(title));
 		m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxString::FromAscii(comment));
 		if (!memoryCard[card]->GetNumBlocks(j, &blocks)) blocks = 0;
-		wxBlock.Printf("%10d", blocks);
+		wxBlock.Printf(wxT("%10d"), blocks);
 		if (!memoryCard[card]->GetFirstBlock(j,&firstblock)) firstblock = 0;
-		wxFirstBlock.Printf("%10d", firstblock-4);
+		wxFirstBlock.Printf(wxT("%10d"), firstblock-4);
 		m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock);
 		m_MemcardList[card]->SetItem(index,COLUMN_FIRSTBLOCK, wxFirstBlock);
 		m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString);
@@ -695,7 +695,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card, int page)
 		m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE);
 	}
 	m_MemcardList[card]->Show();
-	wxLabel.Printf("%d Free Blocks; %d Free Dir Entries",
+	wxLabel.Printf(wxT("%d Free Blocks; %d Free Dir Entries"),
 		memoryCard[card]->GetFreeBlocks(), 127 - nFiles);
 	card ? t_StatusRight->SetLabel(wxLabel) : t_StatusLeft->SetLabel(wxLabel);
 
-- 
cgit v1.2.3