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

post wxUniv merge fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-20 18:46:55 +00:00
parent a6c1aa9027
commit 2350e91520
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
utils/dialoged/src/winprop.cpp
View File

@@ -1160,7 +1160,7 @@ wxProperty *wxListBoxPropertyInfo::GetProperty(wxString& name)
{ {
wxStringList *stringList = new wxStringList; wxStringList *stringList = new wxStringList;
int i; int i;
for (i = 0; i < listBox->Number(); i++) for (i = 0; i < listBox->GetCount(); i++)
stringList->Add(listBox->GetString(i)); stringList->Add(listBox->GetString(i));
return new wxProperty(name, stringList, "stringlist"); return new wxProperty(name, stringList, "stringlist");
@@ -1241,13 +1241,13 @@ bool wxListBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
// This will be set for the wxItemResource on reading or in SetProperty // This will be set for the wxItemResource on reading or in SetProperty
// resource->SetValue1(lbox->GetSelectionMode()); // resource->SetValue1(lbox->GetSelectionMode());
int i; int i;
if (lbox->Number() == 0) if (lbox->GetCount() == 0)
resource->SetStringValues(NULL); resource->SetStringValues(NULL);
else else
{ {
wxStringList slist; wxStringList slist;
for (i = 0; i < lbox->Number(); i++) for (i = 0; i < lbox->GetCount(); i++)
slist.Add(lbox->GetString(i)); slist.Add(lbox->GetString(i));
resource->SetStringValues(slist); resource->SetStringValues(slist);
@@ -1266,7 +1266,7 @@ wxProperty *wxChoicePropertyInfo::GetProperty(wxString& name)
{ {
wxStringList* stringList = new wxStringList; wxStringList* stringList = new wxStringList;
int i; int i;
for (i = 0; i < choice->Number(); i++) for (i = 0; i < choice->GetCount(); i++)
stringList->Add(choice->GetString(i)); stringList->Add(choice->GetString(i));
return new wxProperty(name, stringList, "stringlist"); return new wxProperty(name, stringList, "stringlist");
@@ -1289,7 +1289,7 @@ bool wxChoicePropertyInfo::SetProperty(wxString& name, wxProperty *property)
choice->Append(s); choice->Append(s);
expr = expr->GetNext(); expr = expr->GetNext();
} }
if (choice->Number() > 0) if (choice->GetCount() > 0)
choice->SetSelection(0); choice->SetSelection(0);
return TRUE; return TRUE;
} }
@@ -1307,13 +1307,13 @@ bool wxChoicePropertyInfo::InstantiateResource(wxItemResource *resource)
{ {
wxChoice *choice = (wxChoice *)m_propertyWindow; wxChoice *choice = (wxChoice *)m_propertyWindow;
int i; int i;
if (choice->Number() == 0) if (choice->GetCount() == 0)
resource->SetStringValues(NULL); resource->SetStringValues(NULL);
else else
{ {
wxStringList slist; wxStringList slist;
for (i = 0; i < choice->Number(); i++) for (i = 0; i < choice->GetCount(); i++)
slist.Add(choice->GetString(i)); slist.Add(choice->GetString(i));
resource->SetStringValues(slist); resource->SetStringValues(slist);
@@ -1332,7 +1332,7 @@ wxProperty *wxComboBoxPropertyInfo::GetProperty(wxString& name)
{ {
wxStringList *stringList = new wxStringList; wxStringList *stringList = new wxStringList;
int i; int i;
for (i = 0; i < choice->Number(); i++) for (i = 0; i < choice->GetCount(); i++)
stringList->Add(choice->GetString(i)); stringList->Add(choice->GetString(i));
return new wxProperty(name, stringList, "stringlist"); return new wxProperty(name, stringList, "stringlist");
@@ -1374,7 +1374,7 @@ bool wxComboBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
choice->Append(s); choice->Append(s);
expr = expr->GetNext(); expr = expr->GetNext();
} }
if (choice->Number() > 0) if (choice->GetCount() > 0)
choice->SetSelection(0); choice->SetSelection(0);
return TRUE; return TRUE;
} }
@@ -1426,13 +1426,13 @@ bool wxComboBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
{ {
wxComboBox *choice = (wxComboBox *)m_propertyWindow; wxComboBox *choice = (wxComboBox *)m_propertyWindow;
int i; int i;
if (choice->Number() == 0) if (choice->GetCount() == 0)
resource->SetStringValues(NULL); resource->SetStringValues(NULL);
else else
{ {
wxStringList slist; wxStringList slist;
for (i = 0; i < choice->Number(); i++) for (i = 0; i < choice->GetCount(); i++)
slist.Add(choice->GetString(i)); slist.Add(choice->GetString(i));
resource->SetStringValues(slist); resource->SetStringValues(slist);
@@ -1467,7 +1467,7 @@ wxProperty *wxRadioBoxPropertyInfo::GetProperty(wxString& name)
{ {
wxStringList *stringList = new wxStringList; wxStringList *stringList = new wxStringList;
int i; int i;
for (i = 0; i < radioBox->Number(); i++) for (i = 0; i < radioBox->GetCount(); i++)
stringList->Add(radioBox->GetString(i)); stringList->Add(radioBox->GetString(i));
return new wxProperty(name, stringList, "stringlist"); return new wxProperty(name, stringList, "stringlist");
@@ -1575,13 +1575,13 @@ bool wxRadioBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
// Take strings from resource instead // Take strings from resource instead
/* /*
int i; int i;
if (rbox->Number() == 0) if (rbox->GetCount() == 0)
resource->SetStringValues(NULL); resource->SetStringValues(NULL);
else else
{ {
wxStringList *slist = new wxStringList; wxStringList *slist = new wxStringList;
for (i = 0; i < rbox->Number(); i++) for (i = 0; i < rbox->GetCount(); i++)
slist->Add(rbox->GetString(i)); slist->Add(rbox->GetString(i));
resource->SetStringValues(slist); resource->SetStringValues(slist);