changed choice to properly inherit from wxChoiceBase , added msg compatible calls...

[wxWidgets.git] / include / wx / qt / joystick.h

diff --git a/include/wx/qt/joystick.h b/include/wx/qt/joystick.h
index 957c16581adbdc734bdd31634b7dcba426592fdd..30324fc035da5e6d6e49504afff284bc508d31b9 100644 (file)
--- a/include/wx/qt/joystick.h
+++ b/include/wx/qt/joystick.h
@@ -1,25 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.h
 // Purpose:     wxJoystick class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.h
 // Purpose:     wxJoystick class

-// Author:      Guilhem Lavaux
+// Author:      AUTHOR

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     ??/??/98

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:
+// Copyright:   (c) AUTHOR

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __JOYSTICKH__
-#define __JOYSTICKH__
+#ifndef _WX_JOYSTICK_H_
+#define _WX_JOYSTICK_H_

 
 #ifdef __GNUG__
 #pragma interface "joystick.h"
 #endif
 
 #include "wx/event.h"
 
 #ifdef __GNUG__
 #pragma interface "joystick.h"
 #endif
 
 #include "wx/event.h"

-#include "wx/thread.h"

 
 

-class WXDLLEXPORT wxJoystick: public wxObject, public wxThread
+class WXDLLEXPORT wxJoystick: public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:


@@ -27,56 +26,56 @@ class WXDLLEXPORT wxJoystick: public wxObject, public wxThread
    * Public interface
    */
 
    * Public interface
    */
 

-  wxJoystick(int joystick = wxJOYSTICK1);
+  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };

 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
 
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
 

-  wxPoint GetPosition(void) const;
-  int GetZPosition(void) const;
-  int GetButtonState(void) const;
-  int GetPOVPosition(void) const;
-  int GetPOVCTSPosition(void) const;
-  int GetRudderPosition(void) const;
-  int GetUPosition(void) const;
-  int GetVPosition(void) const;
-  int GetMovementThreshold(void) const;
+  wxPoint GetPosition() const;
+  int GetZPosition() const;
+  int GetButtonState() const;
+  int GetPOVPosition() const;
+  int GetPOVCTSPosition() const;
+  int GetRudderPosition() const;
+  int GetUPosition() const;
+  int GetVPosition() const;
+  int GetMovementThreshold() const;

   void SetMovementThreshold(int threshold) ;
 
   // Capabilities
   ////////////////////////////////////////////////////////////////////////////
 
   void SetMovementThreshold(int threshold) ;
 
   // Capabilities
   ////////////////////////////////////////////////////////////////////////////
 

-  bool IsOk(void) const; // Checks that the joystick is functioning
-  int GetNumberJoysticks(void) const ;
-  int GetManufacturerId(void) const ;
-  int GetProductId(void) const ;
-  wxString GetProductName(void) const ;
-  int GetXMin(void) const;
-  int GetYMin(void) const;
-  int GetZMin(void) const;
-  int GetXMax(void) const;
-  int GetYMax(void) const;
-  int GetZMax(void) const;
-  int GetNumberButtons(void) const;
-  int GetNumberAxes(void) const;
-  int GetMaxButtons(void) const;
-  int GetMaxAxes(void) const;
-  int GetPollingMin(void) const;
-  int GetPollingMax(void) const;
-  int GetRudderMin(void) const;
-  int GetRudderMax(void) const;
-  int GetUMin(void) const;
-  int GetUMax(void) const;
-  int GetVMin(void) const;
-  int GetVMax(void) const;
-
-  bool HasRudder(void) const;
-  bool HasZ(void) const;
-  bool HasU(void) const;
-  bool HasV(void) const;
-  bool HasPOV(void) const;
-  bool HasPOV4Dir(void) const;
-  bool HasPOVCTS(void) const;
+  bool IsOk() const; // Checks that the joystick is functioning
+  int GetNumberJoysticks() const ;
+  int GetManufacturerId() const ;
+  int GetProductId() const ;
+  wxString GetProductName() const ;
+  int GetXMin() const;
+  int GetYMin() const;
+  int GetZMin() const;
+  int GetXMax() const;
+  int GetYMax() const;
+  int GetZMax() const;
+  int GetNumberButtons() const;
+  int GetNumberAxes() const;
+  int GetMaxButtons() const;
+  int GetMaxAxes() const;
+  int GetPollingMin() const;
+  int GetPollingMax() const;
+  int GetRudderMin() const;
+  int GetRudderMax() const;
+  int GetUMin() const;
+  int GetUMax() const;
+  int GetVMin() const;
+  int GetVMax() const;
+
+  bool HasRudder() const;
+  bool HasZ() const;
+  bool HasU() const;
+  bool HasV() const;
+  bool HasPOV() const;
+  bool HasPOV4Dir() const;
+  bool HasPOVCTS() const;

 
   // Operations
   ////////////////////////////////////////////////////////////////////////////
 
   // Operations
   ////////////////////////////////////////////////////////////////////////////


@@ -84,19 +83,11 @@ class WXDLLEXPORT wxJoystick: public wxObject, public wxThread
   // pollingFreq = 0 means that movement events are sent when above the threshold.
   // If pollingFreq > 0, events are received every this many milliseconds.
   bool SetCapture(wxWindow* win, int pollingFreq = 0);
   // pollingFreq = 0 means that movement events are sent when above the threshold.
   // If pollingFreq > 0, events are received every this many milliseconds.
   bool SetCapture(wxWindow* win, int pollingFreq = 0);

-  bool ReleaseCapture(void);
+  bool ReleaseCapture();

 
 protected:
   int       m_joystick;
 
 protected:
   int       m_joystick;

-  wxPoint   m_lastposition;
-  int      m_axe[15];
-  int      m_buttons;
-  wxWindow *m_catchwin;
-  int      m_polling;
-
-  void    *Entry(void);

 };
 
 #endif
 };
 
 #endif

-    // __JOYSTICKH__
-
+    // _WX_JOYSTICK_H_