Back to unsigned int count in wxTreeCtrl.

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

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 700b9a378c59eab5e9b2ffe4c70f5583cc968685..1b4f25948965efe42ed9f313375282ddbc69e071 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -69,7 +69,7 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

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

 
     virtual unsigned int GetIndent() const { return m_indent; }
     virtual void SetIndent(unsigned int indent);
 
     virtual unsigned int GetIndent() const { return m_indent; }
     virtual void SetIndent(unsigned int indent);

diff --git a/include/wx/gtk/treectrl.h b/include/wx/gtk/treectrl.h
index 280b08ea3a5f7f96144b88360e92bc68eaa07d8f..6b1282674fef45948f5fa9ecefb57c4b8362630d 100644 (file)
--- a/include/wx/gtk/treectrl.h
+++ b/include/wx/gtk/treectrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treectrl.h
+// Name:        wx/gtk/treectrl.h

 // Purpose:     wxTreeCtrl class
 // Author:      Denis Pershin
 // Modified by:
 // Purpose:     wxTreeCtrl class
 // Author:      Denis Pershin
 // Modified by:


@@ -154,7 +154,7 @@ public:
     // ---------
 
         // get the total number of items in the control
     // ---------
 
         // get the total number of items in the control

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

 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control
 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control

diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h
index 3e177c70cbbab79c2f633bbef5176f1e8aedb6e5..3ab40d1c41ef277d7266243a4b81c0e6475d4425 100644 (file)
--- a/include/wx/gtk1/treectrl.h
+++ b/include/wx/gtk1/treectrl.h
@@ -154,7 +154,7 @@ public:
     // ---------
 
         // get the total number of items in the control
     // ---------
 
         // get the total number of items in the control

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

 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control
 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control

diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h
index c73ec7fae95bb0f8b7312b1952a3a06d7697d608..3bf45fe30058d1f8e50b1df3e3055d94820e0a82 100644 (file)
--- a/include/wx/mac/carbon/treectrl.h
+++ b/include/wx/mac/carbon/treectrl.h
@@ -137,7 +137,7 @@ public:
     // accessors
     // ---------
       //
     // accessors
     // ---------
       //

-    size_t GetCount() const;
+    virtual unsigned int 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 1d386f10bdc0e48d793cc1196380ede4a18a295b..3ef103d41e028798906bbfa5e9c527c85b7afbb0 100644 (file)
--- a/include/wx/mac/classic/treectrl.h
+++ b/include/wx/mac/classic/treectrl.h
@@ -137,7 +137,7 @@ public:
     // accessors
     // ---------
       //
     // accessors
     // ---------
       //

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

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 59fa744586317b3a2cfe483f9adcfa529a36b67c..a1cd6dd6c06427de33d89c61a843049ff7685433 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -78,7 +78,7 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

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

 
     virtual unsigned int GetIndent() const;
     virtual void SetIndent(unsigned int indent);
 
     virtual unsigned int GetIndent() const;
     virtual void SetIndent(unsigned int indent);

diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index b14254085ada99f34edb0d9c2fb65bf610a49f0c..3758c86c16d7d0198ae1e84caca4aaded4b2d1e3 100644 (file)
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -90,7 +90,7 @@ public:
     //
     // Get the total number of items in the control
     //
     //
     // Get the total number of items in the control
     //

-    size_t GetCount(void) const;
+    virtual unsigned int GetCount(void) const;

 
     //
     // Indent is the number of pixels the children are indented relative to
 
     //
     // Indent is the number of pixels the children are indented relative to

diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h
index 48aed96db1e6a02aaffa65df16174021fa5b716e..33b92a78e566bedebe8109dbc07a8d1718bfc2a5 100644 (file)
--- a/include/wx/palmos/treectrl.h
+++ b/include/wx/palmos/treectrl.h
@@ -73,7 +73,7 @@ public:
     // ---------
 
         // get the total number of items in the control
     // ---------
 
         // get the total number of items in the control

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

 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control
 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 0b4587bc7947cb275aff4abe33bbdaec82e43bc5..c161d0d098759c8c6f0fe14357aa5833c82bb7da 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -50,7 +50,7 @@ public:
     // ---------
 
         // get the total number of items in the control
     // ---------
 
         // get the total number of items in the control

-    virtual size_t GetCount() const = 0;
+    virtual unsigned int GetCount() const = 0;

 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control
 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index fd499ea6feb3e5db3110a2c0dcfa1497d5fd0cfc..25576d2fb7e1759a739199d8e71f6ec9dec282ec 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -863,7 +863,7 @@ wxGenericTreeCtrl::~wxGenericTreeCtrl()
 // accessors
 // -----------------------------------------------------------------------------
 
 // accessors
 // -----------------------------------------------------------------------------
 

-size_t wxGenericTreeCtrl::GetCount() const
+unsigned int wxGenericTreeCtrl::GetCount() const

 {
     if ( !m_anchor )
     {
 {
     if ( !m_anchor )
     {


@@ -871,7 +871,7 @@ size_t wxGenericTreeCtrl::GetCount() const
         return 0;
     }
 
         return 0;
     }
 

-    size_t count = m_anchor->GetChildrenCount();
+    unsigned int count = m_anchor->GetChildrenCount();

     if ( !HasFlag(wxTR_HIDE_ROOT) )
     {
         // take the root itself into account
     if ( !HasFlag(wxTR_HIDE_ROOT) )
     {
         // take the root itself into account

diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp
index 9c6809f2920878b5e7a63aaf47b0fe1fedfc879c..d5c5ddff1d2df9872b4554f4fd8d865f14f03627 100644 (file)
--- a/src/gtk/treegtk.cpp
+++ b/src/gtk/treegtk.cpp
@@ -152,12 +152,14 @@ static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) {
     gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data);
 }
 
     gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data);
 }
 

-size_t wxTreeCtrl::GetCount() const {
-  int count = 0;
+unsigned int wxTreeCtrl::GetCount() const
+{
+    int count = 0;
+
+    if (m_anchor != NULL)
+        gtk_treectrl_count_callback(GTK_WIDGET(m_anchor), &count);

 
 

-  if (m_anchor != NULL)
-    gtk_treectrl_count_callback(GTK_WIDGET(m_anchor), &count);
-  return count;
+    return (unsigned int)count;

 }
 
 unsigned int wxTreeCtrl::GetIndent() const {
 }
 
 unsigned int wxTreeCtrl::GetIndent() const {

diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp
index 58722ba8aca5bfb33286c57b1e9fbc33f856b914..91e52b964c6ee49a2cf36a473e7d1b32e2550355 100644 (file)
--- a/src/gtk1/treegtk.cpp
+++ b/src/gtk1/treegtk.cpp
@@ -152,12 +152,14 @@ static void gtk_treectrl_count_callback (GtkWidget *widget, gpointer data) {
     gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data);
 }
 
     gtk_container_foreach(GTK_CONTAINER(widget), gtk_treectrl_count_callback, data);
 }
 

-size_t wxTreeCtrl::GetCount() const {
-  int count = 0;
+unsigned int wxTreeCtrl::GetCount() const
+{
+    int count = 0;
+
+    if (m_anchor != NULL)
+        gtk_treectrl_count_callback(GTK_WIDGET(m_anchor), &count);

 
 

-  if (m_anchor != NULL)
-    gtk_treectrl_count_callback(GTK_WIDGET(m_anchor), &count);
-  return count;
+    return (unsigned int)count;

 }
 
 unsigned int wxTreeCtrl::GetIndent() const {
 }
 
 unsigned int wxTreeCtrl::GetIndent() const {

diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 729d535a9ef1a60339364f248920d44e8a7ad626..164b37af75b61d62032609176fc6933a10e695d7 100644 (file)
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -57,7 +57,7 @@ wxTreeCtrl::~wxTreeCtrl()
 }
 
 // Attributes
 }
 
 // Attributes

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

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

diff --git a/src/mac/classic/treectrl.cpp b/src/mac/classic/treectrl.cpp
index a29581f2b4f29a3d31b3a68772fba1aca2cf77b1..36dd0963f861650f133eeb4d7558e7e1d4062da9 100644 (file)
--- a/src/mac/classic/treectrl.cpp
+++ b/src/mac/classic/treectrl.cpp
@@ -55,7 +55,7 @@ wxTreeCtrl::~wxTreeCtrl()
 }
 
 // Attributes
 }
 
 // Attributes

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

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 82816207fde3a9fa45fd9ceba6750262a1ce4b7b..52c7d9f768b8ff6d747b2912208522fb181d77e6 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -817,9 +817,9 @@ void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
     }
 }
 
     }
 }
 

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

 {
 {

-    return (size_t)TreeView_GetCount(GetHwnd());
+    return (unsigned int)TreeView_GetCount(GetHwnd());

 }
 
 unsigned int wxTreeCtrl::GetIndent() const
 }
 
 unsigned int wxTreeCtrl::GetIndent() const

diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index d54a567d251461aa9700c6a894814b931666f8ba..2a3742d8a328ca155ebbf730cf9859520a427afd 100644 (file)
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -492,16 +492,17 @@ void wxTreeCtrl::DoSetItem (
     }
 } // end of wxTreeCtrl::DoSetItem
 
     }
 } // end of wxTreeCtrl::DoSetItem
 

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

 {
 {

-    CNRINFO                         vCnrInfo;
+    CNRINFO  vCnrInfo;

 
     ::WinSendMsg( GetHWND()
                  ,CM_QUERYCNRINFO
                  ,MPFROMP(&vCnrInfo)
                  ,(MPARAM)(USHORT)sizeof(CNRINFO)
                 );
 
     ::WinSendMsg( GetHWND()
                  ,CM_QUERYCNRINFO
                  ,MPFROMP(&vCnrInfo)
                  ,(MPARAM)(USHORT)sizeof(CNRINFO)
                 );

-    return (size_t)vCnrInfo.cRecords;
+
+    return (unsigned int)vCnrInfo.cRecords;

 } // end of wxTreeCtrl::GetCount
 
 unsigned int wxTreeCtrl::GetIndent () const
 } // end of wxTreeCtrl::GetCount
 
 unsigned int wxTreeCtrl::GetIndent () const

diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp
index d8b6f0ac9649e3be3e74c749c4f356e87b93b7c6..41a4abbea154151f1316a223c9d02055919b1941 100644 (file)
--- a/src/palmos/treectrl.cpp
+++ b/src/palmos/treectrl.cpp
@@ -210,8 +210,9 @@ void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
 {
 }
 
 {
 }
 

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

 {
 {

+    // TODO

     return 0;
 }
 
     return 0;
 }