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 @@ - 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