Line-up interfaces to use size_t for GetCount()s.

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

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 5916a2dfaab086fbf2b93dd34c420be25c797438..e1633bc419859c63d4ebd64bb472ae19dee2cada 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -1492,7 +1492,7 @@ public:
     virtual void ClearStyleStack();
 
     /// Get the size of the style stack, for example to check correct nesting
     virtual void ClearStyleStack();
 
     /// Get the size of the style stack, for example to check correct nesting

-    virtual int GetStyleStackSize() const { return m_attributeStack.GetCount(); }
+    virtual size_t GetStyleStackSize() const { return m_attributeStack.GetCount(); }

 
     /// Begin using bold
     bool BeginBold();
 
     /// Begin using bold
     bool BeginBold();

diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 75dad9de67dde5c876b3b5dd024c5670aeb4c18b..729d535a9ef1a60339364f248920d44e8a7ad626 100644 (file)
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -41,7 +41,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    m_windowId = (id == -1) ? NewControlId() : id;
+    m_windowId = (id == wxID_ANY) ? NewControlId() : id;

 
     if (parent)
         parent->AddChild(this);
 
     if (parent)
         parent->AddChild(this);


@@ -57,7 +57,7 @@ wxTreeCtrl::~wxTreeCtrl()
 }
 
 // Attributes
 }
 
 // Attributes

-int wxTreeCtrl::GetCount() const
+size_t wxTreeCtrl::GetCount() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -413,4 +413,3 @@ wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
     m_code = 0;
     m_oldItem = 0;
 }
     m_code = 0;
     m_oldItem = 0;
 }

-

diff --git a/src/mac/classic/treectrl.cpp b/src/mac/classic/treectrl.cpp
index 8b1ebc64061a9aada5d2b0cb5eb9d9ff00ad9ee0..a29581f2b4f29a3d31b3a68772fba1aca2cf77b1 100644 (file)
--- a/src/mac/classic/treectrl.cpp
+++ b/src/mac/classic/treectrl.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treectrl.cpp
+// Name:        src/mac/classic/treectrl.cpp

 // Purpose:     wxTreeCtrl. See also Robert's generic wxTreeCtrl.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxTreeCtrl. See also Robert's generic wxTreeCtrl.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/stubs/textctrl.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/stubs/textctrl.h"


@@ -37,13 +37,13 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
 
     SetParent(parent);
 
 
     SetParent(parent);
 

-    m_windowId = (id == -1) ? NewControlId() : id;
+    m_windowId = (id == wxID_ANY) ? NewControlId() : id;

 
     if (parent) parent->AddChild(this);
 
     // TODO create tree control
 
 
     if (parent) parent->AddChild(this);
 
     // TODO create tree control
 

-    return FALSE;
+    return false;

 }
 
 wxTreeCtrl::~wxTreeCtrl()
 }
 
 wxTreeCtrl::~wxTreeCtrl()


@@ -55,7 +55,7 @@ wxTreeCtrl::~wxTreeCtrl()
 }
 
 // Attributes
 }
 
 // Attributes

-int wxTreeCtrl::GetCount() const
+size_t wxTreeCtrl::GetCount() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -107,7 +107,7 @@ long wxTreeCtrl::GetNextItem(long item, int code) const
 bool wxTreeCtrl::ItemHasChildren(long item) const
 {
     // TODO
 bool wxTreeCtrl::ItemHasChildren(long item) const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 long wxTreeCtrl::GetChild(long item) const
 }
 
 long wxTreeCtrl::GetChild(long item) const


@@ -149,13 +149,13 @@ long wxTreeCtrl::GetRootItem() const
 bool wxTreeCtrl::GetItem(wxTreeItem& info) const
 {
     // TODO
 bool wxTreeCtrl::GetItem(wxTreeItem& info) const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxTreeCtrl::SetItem(wxTreeItem& info)
 {
     // TODO
 }
 
 bool wxTreeCtrl::SetItem(wxTreeItem& info)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 int wxTreeCtrl::GetItemState(long item, long stateMask) const
 }
 
 int wxTreeCtrl::GetItemState(long item, long stateMask) const


@@ -208,7 +208,7 @@ wxString wxTreeCtrl::GetItemText(long item) const
     info.m_itemId = item;
 
     if (!GetItem(info))
     info.m_itemId = item;
 
     if (!GetItem(info))

-        return wxString("");
+        return wxEmptyString;

     return info.m_text;
 }
 
     return info.m_text;
 }
 


@@ -249,7 +249,7 @@ bool wxTreeCtrl::SetItemData(long item, long data)
 bool wxTreeCtrl::GetItemRect(long item, wxRect& rect, bool textOnly) const
 {
     // TODO
 bool wxTreeCtrl::GetItemRect(long item, wxRect& rect, bool textOnly) const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 wxTextCtrl* wxTreeCtrl::GetEditControl() const
 }
 
 wxTextCtrl* wxTreeCtrl::GetEditControl() const


@@ -261,7 +261,7 @@ wxTextCtrl* wxTreeCtrl::GetEditControl() const
 bool wxTreeCtrl::DeleteItem(long item)
 {
     // TODO
 bool wxTreeCtrl::DeleteItem(long item)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxTreeCtrl::ExpandItem(long item, int action)
 }
 
 bool wxTreeCtrl::ExpandItem(long item, int action)


@@ -271,22 +271,22 @@ bool wxTreeCtrl::ExpandItem(long item, int action)
     {
     case wxTREE_EXPAND_EXPAND:
         break;
     {
     case wxTREE_EXPAND_EXPAND:
         break;

-        
+

     case wxTREE_EXPAND_COLLAPSE:
         break;
     case wxTREE_EXPAND_COLLAPSE:
         break;

-        
+

     case wxTREE_EXPAND_COLLAPSE_RESET:
         break;
     case wxTREE_EXPAND_COLLAPSE_RESET:
         break;

-        
+

     case wxTREE_EXPAND_TOGGLE:
         break;
     case wxTREE_EXPAND_TOGGLE:
         break;

-        
+

     default:
         wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem");
     }
     default:
         wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem");
     }

-    
-    bool bOk = FALSE; // TODO expand item
-    
+
+    bool bOk = false; // TODO expand item
+

     // May not send messages, so emulate them
     if ( bOk ) {
         wxTreeEvent event(wxEVT_NULL, m_windowId);
     // May not send messages, so emulate them
     if ( bOk ) {
         wxTreeEvent event(wxEVT_NULL, m_windowId);


@@ -294,22 +294,22 @@ bool wxTreeCtrl::ExpandItem(long item, int action)
         event.m_item.m_mask      =
             event.m_item.m_stateMask = 0xffff; // get all
         GetItem(event.m_item);
         event.m_item.m_mask      =
             event.m_item.m_stateMask = 0xffff; // get all
         GetItem(event.m_item);

-        
+

         bool bIsExpanded = (event.m_item.m_state & wxTREE_STATE_EXPANDED) != 0;
         bool bIsExpanded = (event.m_item.m_state & wxTREE_STATE_EXPANDED) != 0;

-        
+

         event.m_code = action;
         event.SetEventObject(this);
         event.m_code = action;
         event.SetEventObject(this);

-        
+

         // @@@ return values of {EXPAND|COLLAPS}ING event handler is discarded
         event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDING
             : wxEVT_COMMAND_TREE_ITEM_COLLAPSING);
         GetEventHandler()->ProcessEvent(event);
         // @@@ return values of {EXPAND|COLLAPS}ING event handler is discarded
         event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDING
             : wxEVT_COMMAND_TREE_ITEM_COLLAPSING);
         GetEventHandler()->ProcessEvent(event);

-        
+

         event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDED
             : wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
         GetEventHandler()->ProcessEvent(event);
     }
         event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDED
             : wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
         GetEventHandler()->ProcessEvent(event);
     }

-    
+

     return bOk;
 }
 
     return bOk;
 }
 


@@ -341,19 +341,19 @@ long wxTreeCtrl::InsertItem(long parent, const wxString& label, int image, int s
 bool wxTreeCtrl::SelectItem(long item)
 {
     // TODO
 bool wxTreeCtrl::SelectItem(long item)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxTreeCtrl::ScrollTo(long item)
 {
     // TODO
 }
 
 bool wxTreeCtrl::ScrollTo(long item)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxTreeCtrl::DeleteAllItems()
 {
     // TODO
 }
 
 bool wxTreeCtrl::DeleteAllItems()
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 }
 
 wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass)


@@ -366,7 +366,7 @@ wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 bool wxTreeCtrl::EndEditLabel(bool cancel)
 {
     // TODO
 bool wxTreeCtrl::EndEditLabel(bool cancel)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
 }
 
 long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)


@@ -378,13 +378,13 @@ long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
 bool wxTreeCtrl::SortChildren(long item)
 {
     // TODO
 bool wxTreeCtrl::SortChildren(long item)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxTreeCtrl::EnsureVisible(long item)
 {
     // TODO
 }
 
 bool wxTreeCtrl::EnsureVisible(long item)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Tree item structure
 }
 
 // Tree item structure


@@ -409,4 +409,3 @@ wxTreeEvent::wxTreeEvent(wxEventType commandType, int id):
     m_code = 0;
     m_oldItem = 0;
 }
     m_code = 0;
     m_oldItem = 0;
 }

-

diff --git a/src/mac/corefoundation/hid.cpp b/src/mac/corefoundation/hid.cpp
index bc107d9f8b0be656f47e126fda9e797ca77a7e4a..a4a9a6ea3779ff5523b8b30343894d41616f69be 100644 (file)
--- a/src/mac/corefoundation/hid.cpp
+++ b/src/mac/corefoundation/hid.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hid.cpp
+// Name:        src/mac/corefoundation/hid.cpp

 // Purpose:     DARWIN HID layer for WX Implementation
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     DARWIN HID layer for WX Implementation
 // Author:      Ryan Norton
 // Modified by:


@@ -208,7 +208,7 @@ USB Product Name
     return true;
 }//end Create()
 
     return true;
 }//end Create()
 

-int wxHIDDevice::GetCount (int nClass, int nType)
+size_t wxHIDDevice::GetCount (int nClass, int nType)

 {
     mach_port_t             m_pPort;
 
 {
     mach_port_t             m_pPort;
 


@@ -248,7 +248,7 @@ int wxHIDDevice::GetCount (int nClass, int nType)
     //Now we iterate through them
     io_object_t pObject;
 
     //Now we iterate through them
     io_object_t pObject;
 

-    int nCount = 0;
+    size_t nCount = 0;

 
     while ( (pObject = IOIteratorNext(pIterator)) != 0)
         ++nCount;
 
     while ( (pObject = IOIteratorNext(pIterator)) != 0)
         ++nCount;