projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow
[wxWidgets.git]
/
include
/
wx
/
unix
/
joystick.h
diff --git
a/include/wx/unix/joystick.h
b/include/wx/unix/joystick.h
index 7359bfa05e12c2a1e2c5f316afecbdeae0c7e553..614a9d8f53194b498dc0abcf11f8d46e3d11161f 100644
(file)
--- a/
include/wx/unix/joystick.h
+++ b/
include/wx/unix/joystick.h
@@
-1,23
+1,22
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.h
+// Name:
wx/unix/
joystick.h
// Purpose: wxJoystick class
// Author: Guilhem Lavaux
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
// Purpose: wxJoystick class
// Author: Guilhem Lavaux
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifndef _
_JOYSTICKH_
_
-#define _
_JOYSTICKH_
_
+#ifndef _
WX_UNIX_JOYSTICK_H
_
+#define _
WX_UNIX_JOYSTICK_H
_
#include "wx/event.h"
#include "wx/event.h"
-#include "wx/thread.h"
-class WXDLL
EXPORT
wxJoystickThread;
+class WXDLL
IMPEXP_FWD_CORE
wxJoystickThread;
-class WXDLL
EXPORT
wxJoystick: public wxObject
+class WXDLL
IMPEXP_ADV
wxJoystick: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:
@@
-26,12
+25,14
@@
class WXDLLEXPORT wxJoystick: public wxObject
*/
wxJoystick(int joystick = wxJOYSTICK1);
*/
wxJoystick(int joystick = wxJOYSTICK1);
- ~wxJoystick();
+
virtual
~wxJoystick();
// Attributes
////////////////////////////////////////////////////////////////////////////
wxPoint GetPosition() const;
// Attributes
////////////////////////////////////////////////////////////////////////////
wxPoint GetPosition() const;
+ int GetPosition(unsigned axis) const;
+ bool GetButtonState(unsigned button) const;
int GetZPosition() const;
int GetButtonState() const;
int GetPOVPosition() const;
int GetZPosition() const;
int GetButtonState() const;
int GetPOVPosition() const;
@@
-46,7
+47,7
@@
class WXDLLEXPORT wxJoystick: public wxObject
////////////////////////////////////////////////////////////////////////////
bool IsOk() const; // Checks that the joystick is functioning
////////////////////////////////////////////////////////////////////////////
bool IsOk() const; // Checks that the joystick is functioning
-
int GetNumberJoysticks() const
;
+
static int GetNumberJoysticks()
;
int GetManufacturerId() const ;
int GetProductId() const ;
wxString GetProductName() const ;
int GetManufacturerId() const ;
int GetProductId() const ;
wxString GetProductName() const ;
@@
-91,6
+92,4
@@
protected:
wxJoystickThread* m_thread;
};
wxJoystickThread* m_thread;
};
-#endif
-// __JOYSTICKH__
-
+#endif // _WX_UNIX_JOYSTICK_H_