From 67ca609fdca9c5211897bc7bf04f397619c6de20 Mon Sep 17 00:00:00 2001 From: Fredrik Modeen Date: Mon, 14 Jul 2008 19:53:39 +0000 Subject: [PATCH] small updates git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26414 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../stickit_BJoystick/StickItWindow.cpp | 25 ++++++++++++++++-- .../device/stickit_BJoystick/stickit_x86.proj | Bin 12211 -> 12211 bytes 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/tests/kits/device/stickit_BJoystick/StickItWindow.cpp b/src/tests/kits/device/stickit_BJoystick/StickItWindow.cpp index caa6079e66..b59d0d8f6c 100644 --- a/src/tests/kits/device/stickit_BJoystick/StickItWindow.cpp +++ b/src/tests/kits/device/stickit_BJoystick/StickItWindow.cpp @@ -163,10 +163,31 @@ StickItWindow::PickJoystick(BJoystick *stick) if (err == B_OK) { err = stick->Open(devName); temp1 = AddToList(fListView1, "BJoystick::Open()"); - int32 sticks = stick->CountSticks(); + int32 count = stick->CountSticks(); temp1 << "BJoystick::CountSticks(), number of sticks = " - << sticks; + << count; temp1 = AddToList(fListView1, temp1.String()); + + count = stick->CountAxes(); + temp1 << "BJoystick::CountAxes(), number of Axes = " + << count; + temp1 = AddToList(fListView1, temp1.String()); + + count = stick->CountButtons(); + temp1 << "BJoystick::CountButtons(), number of Buttons = " + << count; + temp1 = AddToList(fListView1, temp1.String()); + + count = stick->CountHats(); + temp1 << "BJoystick::CountHats(), number of Hats = " + << count; + temp1 = AddToList(fListView1, temp1.String()); + + count = stick->CountDevices(); + temp1 << "BJoystick::CountDevices(), number of Devices = " + << count; + temp1 = AddToList(fListView1, temp1.String()); + if (err != B_ERROR) { BString name; err = stick->GetControllerModule(&name); diff --git a/src/tests/kits/device/stickit_BJoystick/stickit_x86.proj b/src/tests/kits/device/stickit_BJoystick/stickit_x86.proj index 399f5ac9f9b8088d598b32090c56651ccd3b6b90..d3037bf859cbf8151abcc088ec7df95df40ad492 100644 GIT binary patch delta 75 zcmdlSzd3%x6)u*DD#?b)4nmHbCAqK5GsiS4Ot#k%-OQnF!U*DQw%6InD5j^*00B%O VssV^Ss#nKMKBK3$Sx2v(5dc@q6cPXc delta 75 zcmdlSzd3%x6)u()sgezo9fTY=OLAYAXYRQzIoV!EbTfyx2_uNJ*