Applied patch [ 1399013 ] More removals of extraneous semicolons

[wxWidgets.git] / src / msw / joystick.cpp

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index a9a18a6935bf5392349cfb77b70e03b0ee2420c8..294447cb0a73b4f844bc8c75c385fdce588f2206 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/msw/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      Julian Smart
 // Modified by:
@@ -16,6 +16,9 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_JOYSTICK
+
+#include "wx/joystick.h"
 #include "wx/string.h"
 #include "wx/window.h"
 #include "wx/msw/private.h"
@@ -31,7 +34,6 @@
 
 #include "wx/window.h"
 #include "wx/msw/registry.h"
-#include "wx/msw/joystick.h"
 
 #include <regstr.h>
 
@@ -69,7 +71,7 @@ wxJoystick::wxJoystick(int joystick)
     /* No such joystick, return ID 0 */
     m_joystick = 0;
     return;
-};
+}
 
 wxPoint wxJoystick::GetPosition() const
 {
@@ -293,6 +295,8 @@ int wxJoystick::GetProductId() const
 
 wxString wxJoystick::GetProductName() const
 {
+    wxString str;
+#ifndef __WINE__
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR)
         return wxEmptyString;
@@ -300,7 +304,6 @@ wxString wxJoystick::GetProductName() const
     wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"),
                    REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR));
 
-    wxString str;
     key1.QueryValue(wxString::Format(wxT("Joystick%d%s"),
                                      m_joystick + 1, REGSTR_VAL_JOYOEMNAME),
                     str);
@@ -308,7 +311,7 @@ wxString wxJoystick::GetProductName() const
     wxRegKey key2(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s"),
                                         REGSTR_PATH_JOYOEM, str.c_str()));
     key2.QueryValue(REGSTR_VAL_JOYOEMNAME, str);
-
+#endif
     return str;
 }
 
@@ -618,3 +621,4 @@ bool wxJoystick::ReleaseCapture()
     return (res == JOYERR_NOERROR);
 }
 
+#endif // wxUSE_JOYSTICK