projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove identic implementations of wxDir::Exists from platform-specific files and...
[wxWidgets.git]
/
include
/
wx
/
msw
/
joystick.h
diff --git
a/include/wx/msw/joystick.h
b/include/wx/msw/joystick.h
index 13a462b463fa4973a8d6319ea7fe463b5a6f4de0..7a655137a917c4d7348bbad69a16fdaf7a32dd99 100644
(file)
--- a/
include/wx/msw/joystick.h
+++ b/
include/wx/msw/joystick.h
@@
-12,10
+12,6
@@
#ifndef _WX_JOYSTICK_H_
#define _WX_JOYSTICK_H_
#ifndef _WX_JOYSTICK_H_
#define _WX_JOYSTICK_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "joystick.h"
-#endif
-
#include "wx/event.h"
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
#include "wx/event.h"
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
@@
-32,6
+28,8
@@
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
////////////////////////////////////////////////////////////////////////////
wxPoint GetPosition(void) const;
////////////////////////////////////////////////////////////////////////////
wxPoint GetPosition(void) const;
+ int GetPosition(unsigned axis) const;
+ bool GetButtonState(unsigned button) const;
int GetZPosition(void) const;
int GetButtonState(void) const;
int GetPOVPosition(void) const;
int GetZPosition(void) const;
int GetButtonState(void) const;
int GetPOVPosition(void) const;