From 3429db1115e7293ab97f870f47338a3b6365c06b Mon Sep 17 00:00:00 2001
From: Braden <Bradenb95@gmail.com>
Date: Sun, 4 Nov 2012 15:49:52 -0600
Subject: [PATCH] Removes a few compiler warnings and fix the bitmap for the
 sticks being cut off on the right

---
 Source/Core/DolphinWX/Src/Frame.cpp       | 2 +-
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 5 ++---
 Source/Core/DolphinWX/Src/TASInputDlg.h   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 6b0e7b7678..0b95daeda7 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -951,7 +951,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		else
 		{
 			unsigned int i = NUM_HOTKEYS;
-			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->HasFocus())
+			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->TASInputDlgHasFocus())
 			{
 				for (i = 0; i < NUM_HOTKEYS; i++)
 				{
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index fcb4773243..9742ca9804 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -682,7 +682,7 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
 	}
 }
 
-bool TASInputDlg::HasFocus()
+bool TASInputDlg::TASInputDlgHasFocus()
 {	
 	//allows numbers to be used as hotkeys
 	if(TextBoxHasFocus())
@@ -753,7 +753,6 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
 			return;
 	}
 
-	wxPoint ptM(event.GetPosition()); 
 	*x = 128;
 	*y = 128;
 
@@ -1027,7 +1026,7 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
 	y = y/2;
     
 	wxMemoryDC memDC;
-    wxBitmap bitmap(127, 127);
+    wxBitmap bitmap(129, 129);
     memDC.SelectObject(bitmap);
     memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
     memDC.Clear();
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h
index 95d2223209..0bec29ef3d 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.h
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.h
@@ -46,7 +46,7 @@ class TASInputDlg : public wxDialog
 		void ButtonTurbo();
 		void GetKeyBoardInput(SPADStatus *PadStatus);
 		bool TextBoxHasFocus();
-		bool HasFocus();
+		bool TASInputDlgHasFocus();
 
 		wxBitmap CreateStickBitmap(int x, int y);