commit 9f4221bf92510f417bb9263031ca4f18db10e54f
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Apr 24 21:39:31 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Apr 24 21:39:31 2011 +0000

    Add test button to joystick menu in setup tool (thanks Alexandre
    Xavier).

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 2329
---
 NEWS             | 2 ++
 setup/joystick.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 8a66fb2b..8569bfd7 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@
      * In the setup tool, it is now possible to hold down shift when
        changing key/mouse/joystick bindings to prevent other bindings
        to the same key from being cleared (thanks myk).
+     * The joystick menu in the setup tool now has a test button
+       (thanks Alexandre Xavier).

     Compatibility:
      * Added support for the alternate version of the Final Doom
diff --git a/setup/joystick.c b/setup/joystick.c
index fe87439c..5d2dfd68 100644
--- a/setup/joystick.c
+++ b/setup/joystick.c
@@ -25,6 +25,7 @@
 #include "textscreen.h"
 #include "txt_joybinput.h"

+#include "execute.h"
 #include "joystick.h"

 typedef enum
@@ -438,6 +439,8 @@ void ConfigJoystick(void)
     TXT_SignalConnect(joystick_button, "pressed", CalibrateJoystick, NULL);
     TXT_SignalConnect(window, "closed", JoystickWindowClosed, NULL);

+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
+
     SetJoystickButtonLabel();
 }