ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jake.Stine 2009-09-08 04:46:18 +00:00
parent c85c02259b
commit 2c210e3b4e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Linux/LnxKeyCodes.cpp
View File

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

1
pcsx2/Linux/pcsx2.cbp
View File

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

6
pcsx2/gui/main.cpp
View File

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