use wxDIB class instead of duplicating DDB -> DIB conversion code once again (aaaargh...

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index b3c1369e2c67019b0105ba26c26687da0f3679e2..0d0a0d0751905bc11e9a881311aceb588ea449d3 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -57,7 +57,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
        joysticks, counting from the first
        available and upwards.
 */
        joysticks, counting from the first
        available and upwards.
 */

-wxJoystick::wxJoystick(int joystick = wxJOYSTICK1)
+wxJoystick::wxJoystick(int joystick)

 {
     JOYINFO joyInfo;
        int i, maxsticks;
 {
     JOYINFO joyInfo;
        int i, maxsticks;


@@ -306,7 +306,7 @@ wxString wxJoystick::GetProductName() const
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return wxString("");
+        return wxEmptyString;

     else
         return wxString(joyCaps.szPname);
 }
     else
         return wxString(joyCaps.szPname);
 }