projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure that GetEditControl() returns something even if label editing was started...
[wxWidgets.git]
/
include
/
wx
/
mac
/
carbon
/
joystick.h
diff --git
a/include/wx/mac/carbon/joystick.h
b/include/wx/mac/carbon/joystick.h
index 271db26b0a03d12296b912c32b3c716a180aab0c..94de2470e119d9170771b37bdda980c073b36ef0 100644
(file)
--- a/
include/wx/mac/carbon/joystick.h
+++ b/
include/wx/mac/carbon/joystick.h
@@
-14,7
+14,7
@@
#include "wx/event.h"
#include "wx/event.h"
-class WXDLL
EXPORT
wxJoystick: public wxObject
+class WXDLL
IMPEXP_ADV
wxJoystick: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:
@@
-28,6
+28,8
@@
class WXDLLEXPORT wxJoystick: public wxObject
////////////////////////////////////////////////////////////////////////////
wxPoint GetPosition() const;
////////////////////////////////////////////////////////////////////////////
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;
@@
-42,7
+44,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 ;