joy.cpl: Hardcode axis name strings that were in joy.rc
Lucas Zawacki
lfzawacki at gmail.com
Tue Jun 19 09:42:08 CDT 2012
From: Lucas Zawacki <lfzawacki at gmail.com>
These strings are not subject to translation so I'm hardcoding
them as requested by Frederic Delanoy.
---
dlls/joy.cpl/joy.h | 3 +++
dlls/joy.cpl/joy.rc | 6 +++---
dlls/joy.cpl/main.c | 7 ++++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h
index c54d30f..c4a13b8 100644
--- a/dlls/joy.cpl/joy.h
+++ b/dlls/joy.cpl/joy.h
@@ -68,6 +68,9 @@ struct JoystickData {
#define IDC_BUTTONENABLE 2002
#define IDC_DISABLEDLIST 2003
#define IDC_TESTSELECTCOMBO 2004
+#define IDC_TESTGROUPXY 2005
+#define IDC_TESTGROUPRXRY 2006
+#define IDC_TESTGROUPZRZ 2007
#define IDC_JOYSTICKBUTTON 3000
#define IDC_JOYSTICKAXES 4000
diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index a52273b..1e94990 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -48,9 +48,9 @@ FONT 8, "Ms Shell Dlg"
{
COMBOBOX IDC_TESTSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
GROUPBOX "Buttons", IDC_STATIC, 0, 110, 250, 90
- GROUPBOX "X,Y", IDC_STATIC, 15, 30, 60, 60
- GROUPBOX "Rx,Ry", IDC_STATIC, 92, 30, 60, 60
- GROUPBOX "Z, Rz", IDC_STATIC, 169, 30, 60, 60
+ GROUPBOX "", IDC_TESTGROUPXY, 15, 30, 60, 60
+ GROUPBOX "", IDC_TESTGROUPRXRY, 92, 30, 60, 60
+ GROUPBOX "", IDC_TESTGROUPZRZ, 169, 30, 60, 60
}
IDD_FORCEFEEDBACK DIALOG 0, 0, 250, 200
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index a58d768..47894ca 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -308,7 +308,9 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data)
struct Joystick *joy;
DIPROPRANGE propRange;
HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE);
- static WCHAR button_class[] = {'B','u','t','t','o','n','\0'};
+ static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'};
+ static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, {'Z',',','R','z','\0'} };
+ static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, IDC_TESTGROUPZRZ };
/* Set axis range to ease the GUI visualization */
for (i = 0; i < data->num_joysticks; i++)
@@ -326,6 +328,9 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data)
for (i = 0; i < TEST_MAX_AXES; i++)
{
+ /* Set axis box name */
+ SetWindowTextW(GetDlgItem(hwnd, axes_idc[i]), axes_names[i]);
+
data->axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE,
TEST_AXIS_X + TEST_NEXT_AXIS_X*i, TEST_AXIS_Y,
TEST_AXIS_SIZE_X, TEST_AXIS_SIZE_Y,
--
1.7.9.5
More information about the wine-patches
mailing list