Some Fixes, compile fix in Linux. Comments, etc

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3777 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 42 insertions, 2 deletions

diff --git a/Source/Core/InputCommon/Src/X11InputBase.cpp b/Source/Core/InputCommon/Src/X11InputBase.cpp
index 6013e2f983..32512d9307 100644
--- a/Source/Core/InputCommon/Src/X11InputBase.cpp
+++ b/Source/Core/InputCommon/Src/X11InputBase.cpp
@@ -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) {
diff --git a/Source/Core/InputCommon/Src/X11InputBase.h b/Source/Core/InputCommon/Src/X11InputBase.h
index 55e382cef9..aaa14a36ca 100644
--- a/Source/Core/InputCommon/Src/X11InputBase.h
+++ b/Source/Core/InputCommon/Src/X11InputBase.h
@@ -1,9 +1,29 @@
+// 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/
 
 #ifndef XINPUTBASE_H
 #define XINPUTBASE_H
 
 #include <X11/X.h>
 #include <X11/keysym.h>
+#include "Config.h"
+#if defined(HAVE_WX) && HAVE_WX
+#include <wx/wx.h>
+#endif
 namespace InputCommon
 {
 KeySym wxCharCodeWXToX(int id);