Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/include/wx/mac/joystick.h b/include/wx/mac/joystick.h
index e1138391be08267a0b97a2ec35b183e05909ee8b..7614c25668ddb4a2558e2f2bf8af992ce6858ac2 100644 (file)
--- a/include/wx/mac/joystick.h
+++ b/include/wx/mac/joystick.h
@@ -1,93 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.h
-// Purpose:     wxJoystick class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_JOYSTICK_H_
-#define _WX_JOYSTICK_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "joystick.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/joystick.h"
+#else
+#include "wx/mac/carbon/joystick.h"
 #endif
-
-#include "wx/event.h"
-
-class WXDLLEXPORT wxJoystick: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
-  /*
-   * Public interface
-   */
-
-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
-
-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////
-
-  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
-  ////////////////////////////////////////////////////////////////////////////
-
-  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
-  ////////////////////////////////////////////////////////////////////////////
-
-  // 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();
-
-protected:
-  int       m_joystick;
-};
-
-#endif
-    // _WX_JOYSTICK_H_