From 2c210e3b4ebe98964a67a87e143a5eb503a3ae96 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 8 Sep 2009 04:46:18 +0000
Subject: [PATCH] Linux: More fixes, because I got impatient and didn't wait
 for the compilation to finish last time.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1781 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/Linux/LnxKeyCodes.cpp | 4 ++--
 pcsx2/Linux/pcsx2.cbp       | 1 -
 pcsx2/gui/main.cpp          | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pcsx2/Linux/LnxKeyCodes.cpp b/pcsx2/Linux/LnxKeyCodes.cpp
index 45a6c30de7..d11c4c754d 100644
--- a/pcsx2/Linux/LnxKeyCodes.cpp
+++ b/pcsx2/Linux/LnxKeyCodes.cpp
@@ -7,9 +7,9 @@
 
 
 // Returns a WXK_* keycode, given osome kinda GKT input mess!
-u32 TranslateGDKtoWXK( u32 keysym )
+int TranslateGDKtoWXK( u32 keysym )
 {
-    u32 key_code;
+    int key_code;
 
     switch ( keysym )
     {
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 6f43a2885e..b1222bf1f4 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -199,7 +199,6 @@
 		<Unit filename="../IopSio2.h" />
 		<Unit filename="LnxHostSys.cpp" />
 		<Unit filename="LnxKeyCodes.cpp">
-			<Option link="0" />
 			<Option compiler="gcc" use="1" buildCommand="$compiler $options $includes `pkg-config gtk+-2.0 --cflags` -c $file -o $object" />
 		</Unit>
 		<Unit filename="../MMI.cpp" />
diff --git a/pcsx2/gui/main.cpp b/pcsx2/gui/main.cpp
index a7fc557820..7a95cf8be2 100644
--- a/pcsx2/gui/main.cpp
+++ b/pcsx2/gui/main.cpp
@@ -84,6 +84,10 @@ void AppEmuThread::Resume()
 // wx-managed yet, so let's just use some arbitrary value...)
 static const int pxID_Window_GS = 8030;
 
+#ifdef __WXGTK__
+	extern int TranslateGDKtoWXK( u32 keysym );
+#endif
+
 void AppEmuThread::StateCheck()
 {
 	CoreEmuThread::StateCheck();
@@ -111,7 +115,7 @@ void AppEmuThread::StateCheck()
 	{
 		case WXK_SHIFT:		m_kevt.m_shiftDown		= isDown; return;
 		case WXK_CONTROL:	m_kevt.m_controlDown	= isDown; return;
-		case WXK_MENU:		m_kevt.m_altDown		= isDown; return; 
+		case WXK_MENU:		m_kevt.m_altDown		= isDown; return;
 	}
 
 	// fixme: when the GS is wx-controlled, we should send the message to the GS window