Applied patch [ 1349607 ] [msw] Multiline notebook tab label change can add extra row

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index d09e443a91e228b5c81a4a0fa91a13abd284ab6d..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:
 // Purpose:     wxJoystick class
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "joystick.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,6 +16,9 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_JOYSTICK
+
+#include "wx/joystick.h"

 #include "wx/string.h"
 #include "wx/window.h"
 #include "wx/msw/private.h"
 #include "wx/string.h"
 #include "wx/window.h"
 #include "wx/msw/private.h"


@@ -28,17 +27,15 @@
     #include <mmsystem.h>
 #endif
 
     #include <mmsystem.h>
 #endif
 

-#if !defined(__WIN32__) && !defined(_MMRESULT_)
-typedef UINT MMRESULT;
-#endif
-

 // Why doesn't BC++ have joyGetPosEx?
 #if !defined(__WIN32__) || defined(__BORLANDC__)
 #define NO_JOYGETPOSEX
 #endif
 
 #include "wx/window.h"
 // Why doesn't BC++ have joyGetPosEx?
 #if !defined(__WIN32__) || defined(__BORLANDC__)
 #define NO_JOYGETPOSEX
 #endif
 
 #include "wx/window.h"

-#include "wx/msw/joystick.h"
+#include "wx/msw/registry.h"
+
+#include <regstr.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 


@@ -74,7 +71,7 @@ wxJoystick::wxJoystick(int joystick)
     /* No such joystick, return ID 0 */
     m_joystick = 0;
     return;
     /* No such joystick, return ID 0 */
     m_joystick = 0;
     return;

-};
+}

 
 wxPoint wxJoystick::GetPosition() const
 {
 
 wxPoint wxJoystick::GetPosition() const
 {


@@ -298,11 +295,24 @@ int wxJoystick::GetProductId() const
 
 wxString wxJoystick::GetProductName() const
 {
 
 wxString wxJoystick::GetProductName() const
 {

+    wxString str;
+#ifndef __WINE__

     JOYCAPS joyCaps;
     JOYCAPS joyCaps;

-    if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
+    if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR)

         return wxEmptyString;
         return wxEmptyString;

-    else
-        return wxString(joyCaps.szPname);
+
+    wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"),
+                   REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR));
+
+    key1.QueryValue(wxString::Format(wxT("Joystick%d%s"),
+                                     m_joystick + 1, REGSTR_VAL_JOYOEMNAME),
+                    str);
+
+    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;

 }
 
 int wxJoystick::GetXMin() const
 }
 
 int wxJoystick::GetXMin() const


@@ -611,3 +621,4 @@ bool wxJoystick::ReleaseCapture()
     return (res == JOYERR_NOERROR);
 }
 
     return (res == JOYERR_NOERROR);
 }
 

+#endif // wxUSE_JOYSTICK