X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/131f9d9b19b6b7943b24601fc813ceaa2c57340e..3f85391ea7ec33be616af1a323e2d5c2e0f6e74f:/src/msw/joystick.cpp?ds=sidebyside

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index b3c1369e2c..0d0a0d0751 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -57,7 +57,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 	joysticks, counting from the first
 	available and upwards.
 */
-wxJoystick::wxJoystick(int joystick = wxJOYSTICK1)
+wxJoystick::wxJoystick(int joystick)
 {
     JOYINFO joyInfo;
 	int i, maxsticks;
@@ -306,7 +306,7 @@ wxString wxJoystick::GetProductName() const
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return wxString("");
+        return wxEmptyString;
     else
         return wxString(joyCaps.szPname);
 }