Hook GBA up to input config dialog (interim only)

BizHawk.MultiClient/BizHawk.MultiClient.csproj

@@ -958,6 +958,7 @@
     <None Include="config\ControllerImages\C64Joystick.png" />
     <None Include="config\ControllerImages\C64Keyboard.png" />
     <None Include="config\ControllerImages\colecovisioncontroller.png" />
+    <None Include="config\ControllerImages\GBA_Controller.png" />
     <Content Include="images\logo.ico" />
     <None Include="images\Paste.png" />
     <None Include="images\reboot.png" />

BizHawk.MultiClient/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
+//     Runtime Version:4.0.30319.296
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -305,6 +305,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap GBA_Controller {
+            get {
+                object obj = ResourceManager.GetObject("GBA_Controller", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap GBController {
             get {
                 object obj = ResourceManager.GetObject("GBController", resourceCulture);

BizHawk.MultiClient/Properties/Resources.resx

@@ -846,4 +846,7 @@
   <data name="colecovisioncontroller" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\config\ControllerImages\colecovisioncontroller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="GBA_Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\config\ControllerImages\GBA_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

BizHawk.MultiClient/config/ControllerConfig.cs

@@ -53,6 +53,9 @@ namespace BizHawk.MultiClient
 			GBController1Panel.LoadSettings(Global.Config.GBController[0]);
 			GBAutofire1Panel.LoadSettings(Global.Config.GBAutoController[0]);
 
+			GBAController1Panel.LoadSettings(Global.Config.GBAController[0]);
+			GBAAutofire1Panel.LoadSettings(Global.Config.GBAAutoController[0]);
+
 			GenesisController1Panel.LoadSettings(Global.Config.GenesisController[0]);
 			GenesisAutofire1Panel.LoadSettings(Global.Config.GenesisAutoController[0]);
 			GenesisConsoleButtons.LoadSettings(Global.Config.GenesisConsoleButtons);
@@ -124,6 +127,7 @@ namespace BizHawk.MultiClient
 			if (!Global.MainForm.INTERIM)
 			{
 				PlatformTabControl.Controls.Remove(tabPageC64);
+				PlatformTabControl.Controls.Remove(tabPageGBA);
 			}
 
 			AutoTab.Checked = Global.Config.InputConfigAutoTab;
@@ -146,6 +150,9 @@ namespace BizHawk.MultiClient
 				case "GBC":
 					PlatformTabControl.SelectTab(tabPageGameboy);
 					break;
+				case "GBA":
+					PlatformTabControl.SelectTab(tabPageGBA);
+					break;
 				case "GEN":
 					PlatformTabControl.SelectTab(tabPageGenesis);
 					break;