Some warning fixes.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4345 8ced0084-cf51-0410-be5f-012b33b47a6e

5 files changed, 11 insertions, 14 deletions

diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp
index dde5dbb5a4..754193e3ac 100644
--- a/Source/Core/Core/Src/HW/VideoInterface.cpp
+++ b/Source/Core/Core/Src/HW/VideoInterface.cpp
@@ -1088,8 +1088,8 @@ static void EndField()
 void Update()
 {
 	// Update the target refresh rate
-	TargetRefreshRate = (m_DisplayControlRegister.FMT == 0 || m_DisplayControlRegister.FMT == 2)
-		? NTSC_FIELD_RATE : PAL_FIELD_RATE;
+	TargetRefreshRate = (float)((m_DisplayControlRegister.FMT == 0 || m_DisplayControlRegister.FMT == 2)
+		? NTSC_FIELD_RATE : PAL_FIELD_RATE);
 
 	// Calculate actual refresh rate
 	static u64 LastTick = 0;
@@ -1105,7 +1105,7 @@ void Update()
 		// Multipled by two because of the way TicksPerFrame is calculated (divided by 25 and 30
 		// rather than 50 and 60)
 
-		ActualRefreshRate = ((double)SyncTicksProgress / (double)TicksPerFrame) * 2.0;		
+		ActualRefreshRate = (float)(((double)SyncTicksProgress / (double)TicksPerFrame) * 2.0);		
 		LastTick = CoreTiming::GetTicks();
 		SyncTicksProgress = 0;
 	}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
index cf99063e6e..11ab74faa3 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
@@ -150,7 +150,7 @@ InstLoc IRBuilder::EmitZeroOp(unsigned Opcode, unsigned extra = 0) {
 
 InstLoc IRBuilder::EmitUOp(unsigned Opcode, InstLoc Op1, unsigned extra) {
 	InstLoc curIndex = &InstList[InstList.size()];
-	unsigned backOp1 = curIndex - 1 - Op1;
+	unsigned backOp1 = (s32)(curIndex - 1 - Op1);
 	if (backOp1 >= 256) {
 		InstList.push_back(Tramp | backOp1 << 8);
 		backOp1 = 0;
@@ -162,13 +162,13 @@ InstLoc IRBuilder::EmitUOp(unsigned Opcode, InstLoc Op1, unsigned extra) {
 
 InstLoc IRBuilder::EmitBiOp(unsigned Opcode, InstLoc Op1, InstLoc Op2, unsigned extra) {
 	InstLoc curIndex = &InstList[InstList.size()];
-	unsigned backOp1 = curIndex - 1 - Op1;
+	unsigned backOp1 = (s32)(curIndex - 1 - Op1);
 	if (backOp1 >= 255) {
 		InstList.push_back(Tramp | backOp1 << 8);
 		backOp1 = 0;
 		curIndex++;
 	}
-	unsigned backOp2 = curIndex - 1 - Op2;
+	unsigned backOp2 = (s32)(curIndex - 1 - Op2);
 	if (backOp2 >= 256) {
 		InstList.push_back(Tramp | backOp2 << 8);
 		backOp2 = 0;
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 0d3dd1fa9b..26f31604f1 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -534,7 +534,7 @@ void CFrame::OnRestart(wxCommandEvent& WXUNUSED (event))
 	#ifdef _WIN32
 		char Str[MAX_PATH + 1];
 		DWORD Size = sizeof(Str)/sizeof(char);
-		DWORD n = GetModuleFileNameA(NULL, Str, Size);
+		//DWORD n = GetModuleFileNameA(NULL, Str, Size);
 		ShellExecuteA(NULL, "open", PathToFilename(*new std::string(Str)).c_str(), g_pCodeWindow ? "" : "-d", NULL, SW_SHOW);
 	#endif
 
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index a2546c80b3..4d0bac59da 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -638,7 +638,7 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 	if (!_rFullPath) // Extract all
 	{
 		index[0] = 0;
-		index[1] = fst.size();
+		index[1] = (u32)fst.size();
 
 		FS->ExportApploader(_rExportFolder);
 	}
diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp
index ee611567ba..af7f873dbb 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.cpp
+++ b/Source/Core/DolphinWX/Src/LogWindow.cpp
@@ -283,10 +283,8 @@ void CLogWindow::UpdateChecks()
 
 void CLogWindow::UnPopulateRight()
 {
-	// Use ->Detach instead, as per sizer.h?
-	sRight->Remove(m_Log);
-	sRight->Remove(sRightBottom);
-	// Remove() destroys sizers
+	sRight->Detach(m_Log);
+	sRight->Detach(sRightBottom);
 	sRightBottom = new wxBoxSizer(wxHORIZONTAL);
 }
 void CLogWindow::PopulateRight()
@@ -445,10 +443,9 @@ void CLogWindow::OnLogTimer(wxTimerEvent& WXUNUSED(event))
 	if (!m_LogAccess) return;
 
 	//m_Log->Freeze();
-	int MsgSz = msgQueue.size();
 	UpdateLog();
 	// Better auto scroll than wxTE_AUTO_SCROLL
-	if (MsgSz > 0)
+	if (msgQueue.size() > 0)
 	{
 		m_Log->ScrollLines(1);
 		m_Log->ShowPosition( m_Log->GetLastPosition() );