Move HID stuff into both OSX builds. Add preliminary joystick for OSX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/carbon/app.h

@@ -124,10 +124,6 @@ public:
     static bool           s_macHasDialogManager ;
     static long           s_macDialogManagerVersion ;
     
-    #ifdef __DARWIN__
-    static class wxHIDKeyboard* s_macHIDKeyboard;
-    #endif
-
     WXHRGN                m_macCursorRgn ;
     WXHRGN                m_macSleepRgn ;
     WXHRGN                m_macHelpRgn ;

include/wx/mac/corefoundation/hid.h

@@ -63,11 +63,13 @@ public:
 	wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {}
 	//kHIDPage_GenericDesktop
 	//kHIDUsage_GD_Joystick,kHIDUsage_GD_Mouse,kHIDUsage_GD_Keyboard
-	bool Create (const int& nClass = -1, const int& nType = -1);
+	bool Create (int nClass = -1, int nType = -1, int nDev = 1);
+    
+    static int GetCount(int nClass = -1, int nType = -1);
 
-	inline void AddCookie(CFTypeRef Data, const int& i);
-	inline void AddCookieInQueue(CFTypeRef Data, const int& i);	
-	inline void InitCookies(const size_t& dwSize, bool bQueue = false);
+	void AddCookie(CFTypeRef Data, int i);
+	void AddCookieInQueue(CFTypeRef Data, int i);	
+	void InitCookies(size_t dwSize, bool bQueue = false);
 
 	//Must be implemented by derived classes
 	//builds the cookie array -
@@ -75,12 +77,16 @@ public:
 	//array, then AddCookie to add a cookie at a certain point in an array
 	virtual void BuildCookies(wxCFArray& Array) = 0;
 		
-	//checks to see whether the cookie at index nIndex is active (element value != 0)
-	bool IsActive(const int& nIndex);
+	//checks to see whether the cookie at nIndex is active (element value != 0)
+	bool IsActive(int nIndex);
+    
+    //checks to see whether the cookie at nIndex exists
+    bool HasElement(int nIndex);
 	
 	//closes the device and cleans the queue and cookies
 	virtual ~wxHIDDevice();
-private:
+    
+protected:
 	IOHIDDeviceInterface** 	m_ppDevice; //this, essentially
 	IOHIDQueueInterface**	m_ppQueue;  //queue (if we want one)
 	IOHIDElementCookie* 	m_pCookies; //cookies

include/wx/mac/corefoundation/joystick.h

@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        joystick.h
+// Purpose:     wxJoystick class
+// Author:      Ryan Norton
+// Modified by:
+// Created:     2/13/2005
+// RCS-ID:      $Id$
+// Copyright:   (c) Ryan Norton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#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 WXDLLEXPORT wxJoystickThread;
+
+class WXDLLEXPORT wxJoystick: public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxJoystick)
+ public:
+
+    wxJoystick(int joystick = wxJOYSTICK1);
+    virtual ~wxJoystick();
+
+    // 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;
+    wxJoystickThread*   m_thread;
+    class wxHIDJoystick* m_hid;
+};
+
+#endif
+    // _WX_JOYSTICK_H_