From 78fc4e5509e42b96304175883cdf5750081c3313 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Sun, 12 Mar 2006 13:08:24 +0000 Subject: [PATCH] Line-up interfaces to use size_t for GetCount()s. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/treectrl.h | 6 +- include/wx/mac/classic/treectrl.h | 4 +- include/wx/mac/corefoundation/hid.h | 90 ++++++++++++++--------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h index cc41d76a26..c73ec7fae9 100644 --- a/include/wx/mac/carbon/treectrl.h +++ b/include/wx/mac/carbon/treectrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: treectrl.h +// Name: wx/mac/carbon/treectrl.h // Purpose: wxTreeCtrl class // Author: Stefan Csomor // Modified by: @@ -116,7 +116,7 @@ public: // -------- wxTreeCtrl(); - inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, + inline wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT, @@ -137,7 +137,7 @@ public: // accessors // --------- // - int GetCount() const; + size_t GetCount() const; // indent int GetIndent() const; diff --git a/include/wx/mac/classic/treectrl.h b/include/wx/mac/classic/treectrl.h index ff982858ba..1d386f10bd 100644 --- a/include/wx/mac/classic/treectrl.h +++ b/include/wx/mac/classic/treectrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: treectrl.h +// Name: wx/mac/classic/treectrl.h // Purpose: wxTreeCtrl class // Author: Stefan Csomor // Modified by: @@ -137,7 +137,7 @@ public: // accessors // --------- // - int GetCount() const; + size_t GetCount() const; // indent int GetIndent() const; diff --git a/include/wx/mac/corefoundation/hid.h b/include/wx/mac/corefoundation/hid.h index 9d138c301f..9af78ddb07 100644 --- a/include/wx/mac/corefoundation/hid.h +++ b/include/wx/mac/corefoundation/hid.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hid.h +// Name: wx/mac/corefoundation/hid.h // Purpose: DARWIN HID layer for WX // Author: Ryan Norton // Modified by: @@ -48,66 +48,66 @@ extern "C" { class wxCFArray { public: - wxCFArray(CFTypeRef pData) : pArray((CFArrayRef) pData) {} - CFTypeRef operator [] (const int& nIndex) {return CFArrayGetValueAtIndex(pArray, nIndex); } - int Count() {return CFArrayGetCount(pArray);} + wxCFArray(CFTypeRef pData) : pArray((CFArrayRef) pData) {} + CFTypeRef operator [] (const int& nIndex) {return CFArrayGetValueAtIndex(pArray, nIndex); } + int Count() {return CFArrayGetCount(pArray);} private: - CFArrayRef pArray; + CFArrayRef pArray; }; // -// A wrapper around OS X HID Manager procedures. -// The tutorial "Working With HID Class Device Interfaces" Is -// Quite good, as is the sample program associated with it -// (Depite the author's protests!). +// A wrapper around OS X HID Manager procedures. +// The tutorial "Working With HID Class Device Interfaces" Is +// Quite good, as is the sample program associated with it +// (Depite the author's protests!). class wxHIDDevice { public: - wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {} - //kHIDPage_GenericDesktop - //kHIDUsage_GD_Joystick,kHIDUsage_GD_Mouse,kHIDUsage_GD_Keyboard - bool Create (int nClass = -1, int nType = -1, int nDev = 1); - - static int GetCount(int nClass = -1, int nType = -1); - - 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 - - //first call InitCookies to initialize the cookie - //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 nIndex is active (element value != 0) - bool IsActive(int nIndex); - + wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {} + //kHIDPage_GenericDesktop + //kHIDUsage_GD_Joystick,kHIDUsage_GD_Mouse,kHIDUsage_GD_Keyboard + bool Create (int nClass = -1, int nType = -1, int nDev = 1); + + static size_t GetCount(int nClass = -1, int nType = -1); + + 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 - + //first call InitCookies to initialize the cookie + //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 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(); - + + //closes the device and cleans the queue and cookies + virtual ~wxHIDDevice(); + protected: - IOHIDDeviceInterface** m_ppDevice; //this, essentially - IOHIDQueueInterface** m_ppQueue; //queue (if we want one) - IOHIDElementCookie* m_pCookies; //cookies - - wxString m_szProductName; //product name - int m_nProductId; //product id - int m_nManufacturerId; //manufacturer id - mach_port_t m_pPort; + IOHIDDeviceInterface** m_ppDevice; //this, essentially + IOHIDQueueInterface** m_ppQueue; //queue (if we want one) + IOHIDElementCookie* m_pCookies; //cookies + + wxString m_szProductName; //product name + int m_nProductId; //product id + int m_nManufacturerId; //manufacturer id + mach_port_t m_pPort; }; class wxHIDKeyboard : public wxHIDDevice { public: - bool Create(); - virtual void BuildCookies(wxCFArray& Array); + bool Create(); + virtual void BuildCookies(wxCFArray& Array); }; #endif //__DARWIN__ -#endif - //WX_MACCARBONHID_H \ No newline at end of file +#endif + //WX_MACCARBONHID_H -- 2.45.2