(cleanup) Move WXInputBase into InputUICommon. Delete some leftovers from the last change.

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

9 files changed, 16 insertions, 43 deletions

diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 42312e3557..f5384ad86e 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Dolphin"
 	ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
 	RootNamespace="DolphinWX"
@@ -56,7 +56,7 @@
 				Optimization="3"
 				InlineFunctionExpansion="0"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="false"
 				RuntimeLibrary="0"
@@ -174,7 +174,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="false"
-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -397,7 +397,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -510,7 +510,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
 				PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -626,7 +626,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"
 				PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/Source/Core/InputCommon/InputCommon.vcproj b/Source/Core/InputCommon/InputCommon.vcproj
index e439b690cb..6c0f8ea4e8 100644
--- a/Source/Core/InputCommon/InputCommon.vcproj
+++ b/Source/Core/InputCommon/InputCommon.vcproj
@@ -497,10 +497,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\Src\InputCommon.cpp"
-			>
-		</File>
-		<File
 			RelativePath=".\Src\InputCommon.h"
 			>
 		</File>
@@ -525,14 +521,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\Src\WXInputBase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\WXInputBase.h"
-			>
-		</File>
-		<File
 			RelativePath=".\Src\XInput_Util.cpp"
 			>
 		</File>
diff --git a/Source/Core/InputCommon/Src/InputCommon.cpp b/Source/Core/InputCommon/Src/InputCommon.cpp
deleted file mode 100644
index beed506f8e..0000000000
--- a/Source/Core/InputCommon/Src/InputCommon.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "EventHandler.h"
-
-//EventHandler *eventHandler = NULL;
-
-namespace InputCommon
-{
-    void Init() {
-	// init the event handler
-	//EventHandler::GetInstance();
-    }
-    
-    void Shutdown() {
-	//if (eventHandler)
-	//    delete eventHandler;
-    }
-}
diff --git a/Source/Core/InputCommon/Src/InputCommon.h b/Source/Core/InputCommon/Src/InputCommon.h
index 3419902c47..52b75e0f0f 100644
--- a/Source/Core/InputCommon/Src/InputCommon.h
+++ b/Source/Core/InputCommon/Src/InputCommon.h
@@ -20,6 +20,4 @@ enum EXInputTrigger
 	XI_TRIGGER_R,
 };
 
-    void Init(); 
-    void Shutdown();
 }
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index 861c34851b..750045d285 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -5,7 +5,6 @@ Import('env')
 files = [
 	'Configuration.cpp',
 	'ControllerEmu.cpp',
-	'InputCommon.cpp',
 	'InputConfig.cpp',
 	'SDL_Util.cpp',
 	'ControllerInterface/ControllerInterface.cpp',
@@ -17,11 +16,6 @@ if env['HAVE_X11']:
 		"X11InputBase.cpp",
 		]
 
-if env['HAVE_WX']:
-	files += [
-		"WXInputBase.cpp",
-		]
-
 if sys.platform == 'darwin':
 	files += [
 		'ControllerInterface/OSX/OSX.mm',
diff --git a/Source/Core/InputUICommon/InputUICommon.vcproj b/Source/Core/InputUICommon/InputUICommon.vcproj
index 6e4b6c9a97..8ec25a57a1 100644
--- a/Source/Core/InputUICommon/InputUICommon.vcproj
+++ b/Source/Core/InputUICommon/InputUICommon.vcproj
@@ -419,6 +419,14 @@
 			RelativePath=".\Src\SConscript"

 			>

 		</File>

+		<File

+			RelativePath=".\Src\WXInputBase.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\WXInputBase.h"

+			>

+		</File>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/Source/Core/InputUICommon/Src/SConscript b/Source/Core/InputUICommon/Src/SConscript
index 18d98eed59..a0c6ec8013 100644
--- a/Source/Core/InputUICommon/Src/SConscript
+++ b/Source/Core/InputUICommon/Src/SConscript
@@ -9,6 +9,7 @@ if not env['HAVE_WX']:
 files = [

 	'ConfigDiag.cpp',

 	'ConfigDiagBitmaps.cpp',

+	'WXInputBase.cpp',

 	]

 

 env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files)

diff --git a/Source/Core/InputCommon/Src/WXInputBase.cpp b/Source/Core/InputUICommon/Src/WXInputBase.cpp
index 8255ba94e7..8255ba94e7 100644
--- a/Source/Core/InputCommon/Src/WXInputBase.cpp
+++ b/Source/Core/InputUICommon/Src/WXInputBase.cpp
diff --git a/Source/Core/InputCommon/Src/WXInputBase.h b/Source/Core/InputUICommon/Src/WXInputBase.h
index da0743db47..da0743db47 100644
--- a/Source/Core/InputCommon/Src/WXInputBase.h
+++ b/Source/Core/InputUICommon/Src/WXInputBase.h