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

diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h
index cc41d76a26cd28fde6d87c98dc1c7556b6903880..c73ec7fae95bb0f8b7312b1952a3a06d7697d608 100644 (file)
--- 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:
 // Purpose:     wxTreeCtrl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -116,7 +116,7 @@ public:
     // --------
     wxTreeCtrl();
 
     // --------
     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,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,


@@ -137,7 +137,7 @@ public:
     // accessors
     // ---------
       //
     // accessors
     // ---------
       //

-    int GetCount() const;
+    size_t GetCount() const;

 
       // indent
     int GetIndent() const;
 
       // indent
     int GetIndent() const;

diff --git a/include/wx/mac/classic/treectrl.h b/include/wx/mac/classic/treectrl.h
index ff982858bafcf2943914440360616be3c811e1dc..1d386f10bdc0e48d793cc1196380ede4a18a295b 100644 (file)
--- 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:
 // Purpose:     wxTreeCtrl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -137,7 +137,7 @@ public:
     // accessors
     // ---------
       //
     // accessors
     // ---------
       //

-    int GetCount() const;
+    size_t GetCount() const;

 
       // indent
     int GetIndent() const;
 
       // indent
     int GetIndent() const;

diff --git a/include/wx/mac/corefoundation/hid.h b/include/wx/mac/corefoundation/hid.h
index 9d138c301f9be6ab456e31ad224a9d9396ef3c53..9af78ddb07e90f2516fa311c02c2470a67675481 100644 (file)
--- 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:
 // Purpose:     DARWIN HID layer for WX
 // Author:      Ryan Norton
 // Modified by:


@@ -48,66 +48,66 @@ extern "C" {
 class wxCFArray
 {
 public:
 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:
 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:
 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);
     //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:
 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:
 };
 
 class wxHIDKeyboard : public wxHIDDevice
 {
 public:

-       bool Create();
-       virtual void BuildCookies(wxCFArray& Array);
+    bool Create();
+    virtual void BuildCookies(wxCFArray& Array);

 };
 
 #endif //__DARWIN__
 
 };
 
 #endif //__DARWIN__
 

-#endif 
-        //WX_MACCARBONHID_H
\ No newline at end of file
+#endif
+        //WX_MACCARBONHID_H