Some Fixes, compile fix in Linux. Comments, etc

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3777 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2009-07-13 07:31:43 +00:00
parent 4cfcf9bdd5
commit e4a57202d2
5 changed files with 64 additions and 7 deletions

View file

@ -1,3 +1,19 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "X11InputBase.h"
#include <string.h>
@ -5,8 +21,7 @@
#include <ctype.h>
namespace InputCommon
{
#ifdef HAVE_WX
#include <wx/wx.h>
#if defined(HAVE_WX) && HAVE_WX
// Taken from wxw source code
KeySym wxCharCodeWXToX(int id)
{
@ -89,6 +104,11 @@ KeySym wxCharCodeWXToX(int id)
return keySym;
}
#else
KeySym wxCharCodeWXToX(int id)
{
return NULL;
}
#endif
void XKeyToString(unsigned int keycode, char *keyStr) {
switch (keycode) {