Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced obsolete Number() calls with GetCount() calls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-03 18:59:43 +00:00
parent 3a8c693aea
commit 6326010ca0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/propform.cpp
View File

@@ -713,7 +713,7 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox))) else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
{ {
wxListBox *lbox = (wxListBox *)m_propertyWindow; wxListBox *lbox = (wxListBox *)m_propertyWindow;
if (lbox->Number() == 0 && m_strings) if (lbox->GetCount() == 0 && m_strings)
{ {
// Try to initialize the listbox from 'strings' // Try to initialize the listbox from 'strings'
wxNode *node = m_strings->First(); wxNode *node = m_strings->First();
@@ -737,7 +737,7 @@ bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormV
{ {
wxChoice *choice = (wxChoice *)m_propertyWindow; wxChoice *choice = (wxChoice *)m_propertyWindow;
#ifndef __XVIEW__ #ifndef __XVIEW__
if (choice->Number() == 0 && m_strings) if (choice->GetCount() == 0 && m_strings)
{ {
// Try to initialize the choice item from 'strings' // Try to initialize the choice item from 'strings'
// XView doesn't allow this kind of thing. // XView doesn't allow this kind of thing.

4
src/generic/proplist.cpp
View File

@@ -217,7 +217,7 @@ bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
// Find the wxListBox index corresponding to this property // Find the wxListBox index corresponding to this property
int wxPropertyListView::FindListIndexForProperty(wxProperty *property) int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
{ {
int n = m_propertyScrollingList->Number(); int n = m_propertyScrollingList->GetCount();
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i)) if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
@@ -1172,7 +1172,7 @@ bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListV
return FALSE; return FALSE;
wxString str(property->GetValue().GetStringRepresentation()); wxString str(property->GetValue().GetStringRepresentation());
view->GetValueText()->SetValue(str); 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);
} }