Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / joystick.h

diff --git a/interface/wx/joystick.h b/interface/wx/joystick.h
index 70e5b807e790cdda19174cd61ae7b99d50ce9f9d..eb519f3037a52248d5c621f2ce9368a421a3c34d 100644 (file)
--- a/interface/wx/joystick.h
+++ b/interface/wx/joystick.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxJoystick
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -48,7 +48,7 @@ public:
         @param id
             The button id to report, from 0 to GetNumberButtons() - 1
     */
-    bool GetButtonState(unsigned id) const;
+    bool GetButtonState(unsigned int id) const;
 
     /**
         Returns the manufacturer id.
@@ -114,7 +114,7 @@ public:
         @param axis
             The joystick axis to report, from 0 to GetNumberAxes() - 1.
     */
-    int GetPosition(unsigned axis) const;
+    int GetPosition(unsigned int axis) const;
 
     /**
         Returns the product id for the joystick.