From 89c3ef56d406d1a3de02aca33b4f45c858ad549a Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 15 Sep 2006 18:21:41 +0000
Subject: [PATCH] Remove Xbox hack. (Unless there's a DEL defined as well.)

---
 stepmania/src/arch/InputHandler/InputHandler.cpp | 4 ++--
 stepmania/src/arch/InputHandler/InputHandler.h   | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp
index 236f761100..97ca93c13b 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler.cpp
@@ -110,7 +110,7 @@ static LocalizedString SHIFT	( "DeviceButton", "Shift" );
 static LocalizedString CTRL	( "DeviceButton", "Ctrl" );
 static LocalizedString ALT	( "DeviceButton", "Alt" );
 static LocalizedString INSERT	( "DeviceButton", "Insert" );
-static LocalizedString DELETE	( "DeviceButton", "Delete" );
+static LocalizedString DEL	( "DeviceButton", "Delete" );
 static LocalizedString PGUP	( "DeviceButton", "PgUp" );
 static LocalizedString PGDN	( "DeviceButton", "PgDn" );
 static LocalizedString BACKSLASH	( "DeviceButton", "Backslash" );
@@ -146,7 +146,7 @@ RString InputHandler::GetLocalizedInputString( const DeviceInput &di )
 	case KEY_LCTRL:	 case KEY_RCTRL:	return CTRL.GetValue();
 	case KEY_LALT:	 case KEY_RALT:		return ALT.GetValue();
 	case KEY_INSERT:	return INSERT.GetValue();
-	case KEY_DEL:		return DELETE.GetValue();
+	case KEY_DEL:		return DEL.GetValue();
 	case KEY_PGUP:		return PGUP.GetValue();
 	case KEY_PGDN:		return PGDN.GetValue();
 	case KEY_BACKSLASH:	return BACKSLASH.GetValue();
diff --git a/stepmania/src/arch/InputHandler/InputHandler.h b/stepmania/src/arch/InputHandler/InputHandler.h
index cbfc0ff5ca..12be5c5189 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.h
+++ b/stepmania/src/arch/InputHandler/InputHandler.h
@@ -22,11 +22,6 @@
  */
 #include "RageInputDevice.h"	// for InputDevice
 
-// Macro override. Defined in the Xbox's winnt.h
-#ifdef _XBOX
-#undef DELETE
-#endif
-
 class InputHandler
 {
 public: