replaced obsolete Number() calls with GetCount() calls

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

diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp
index 4f1b06f67fa938b3d9c494b5af28ffa5e604472e..5086d818c3d71997dcca3d58c31db2ef651a8ea4 100644 (file)
--- a/src/generic/propform.cpp
+++ b/src/generic/propform.cpp
@@ -713,7 +713,7 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
     {
         wxListBox *lbox = (wxListBox *)m_propertyWindow;
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
     {
         wxListBox *lbox = (wxListBox *)m_propertyWindow;

-        if (lbox->Number() == 0 && m_strings)
+        if (lbox->GetCount() == 0 && m_strings)

         {
             // Try to initialize the listbox from 'strings'
             wxNode *node = m_strings->First();
         {
             // Try to initialize the listbox from 'strings'
             wxNode *node = m_strings->First();


@@ -737,7 +737,7 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
     {
         wxChoice *choice = (wxChoice *)m_propertyWindow;
 #ifndef __XVIEW__
     {
         wxChoice *choice = (wxChoice *)m_propertyWindow;
 #ifndef __XVIEW__

-        if (choice->Number() == 0 && m_strings)
+        if (choice->GetCount() == 0 && m_strings)

         {
             // Try to initialize the choice item from 'strings'
             // XView doesn't allow this kind of thing.
         {
             // Try to initialize the choice item from 'strings'
             // XView doesn't allow this kind of thing.

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index 66d2f30ca0724f82dfa17941a4e1c53b8338a013..55722a5c10817961542531e10d1d7ec3945deb4a 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -217,7 +217,7 @@ bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
 // Find the wxListBox index corresponding to this property
 int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
 {
 // Find the wxListBox index corresponding to this property
 int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
 {

-  int n = m_propertyScrollingList->Number();
+  int n = m_propertyScrollingList->GetCount();

   for (int i = 0; i < n; i++)
   {
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
   for (int i = 0; i < n; i++)
   {
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))


@@ -1172,7 +1172,7 @@ bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListV
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str);
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str);

-  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->Number() > 0)
+  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->GetCount() > 0)

   {
     view->GetValueList()->SetStringSelection(str);
   }
   {
     view->GetValueList()->SetStringSelection(str);
   }