Added autoconf makefiles for FoldBar extended samples

[wxWidgets.git] / wxPython / src / _joystick.i

diff --git a/wxPython/src/_joystick.i b/wxPython/src/_joystick.i
index b446daeb6845a91d41cb5612c6dc8ef9f67acb16..252208e9e503aac02353767b51ebf22d7a975b34 100644 (file)
--- a/wxPython/src/_joystick.i
+++ b/wxPython/src/_joystick.i
@@ -48,7 +48,7 @@ enum
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {

-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxJoystick is not available on this platform.");
         wxPyEndBlockThreads(blocked);
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxJoystick is not available on this platform.");
         wxPyEndBlockThreads(blocked);


@@ -172,12 +172,6 @@ public:
 class wxJoystickEvent : public wxEvent
 {
 public:
 class wxJoystickEvent : public wxEvent
 {
 public:

-    wxPoint   m_pos;
-    int       m_zPosition;
-    int       m_buttonChange;   // Which button changed?
-    int       m_buttonState;    // Which buttons are down?
-    int       m_joyStick;       // Which joystick?
-

     wxJoystickEvent(wxEventType type = wxEVT_NULL,
                     int state = 0,
                     int joystick = wxJOYSTICK1,
     wxJoystickEvent(wxEventType type = wxEVT_NULL,
                     int state = 0,
                     int joystick = wxJOYSTICK1,


@@ -212,6 +206,14 @@ public:
 
     // Was the given button 1,2,3,4 or any in Down state?
     bool ButtonIsDown(int but =  wxJOY_BUTTON_ANY) const;
 
     // Was the given button 1,2,3,4 or any in Down state?
     bool ButtonIsDown(int but =  wxJOY_BUTTON_ANY) const;

+
+    %pythoncode {
+        m_pos = property(GetPosition, SetPosition)
+        m_zPosition = property(GetZPosition, SetZPosition)
+        m_buttonChange = property(GetButtonChange, SetButtonChange)
+        m_buttonState = property(GetButtonState, SetButtonState)
+        m_joyStick = property(GetJoystick, SetJoystick)
+    }

 };
 
 
 };