ENH: check for values that switch to internal, can happen with a load cache command
This commit is contained in:
parent
baa28efd10
commit
b341539bc1
@ -601,6 +601,7 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
|
|||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case cmCacheManager::INTERNAL:
|
case cmCacheManager::INTERNAL:
|
||||||
|
m_CacheEntriesList.RemoveProperty(key);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -645,16 +646,6 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI()
|
|||||||
{
|
{
|
||||||
m_GeneratorChoiceString = curGen.c_str();
|
m_GeneratorChoiceString = curGen.c_str();
|
||||||
this->UpdateData(FALSE);
|
this->UpdateData(FALSE);
|
||||||
// m_GeneratorChoice.SetWindowText(m_GeneratorChoiceString);
|
|
||||||
// int c = m_GeneratorChoice.GetCount();
|
|
||||||
// int j = m_GeneratorChoice.FindStringExact(0, curGen.c_str());
|
|
||||||
// if (j != CB_ERR)
|
|
||||||
// {
|
|
||||||
// m_GeneratorChoice.SetCurSel(j);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// m_GeneratorChoice.SelectString(0, curGen.c_str());
|
|
||||||
// this->UpdateData(FALSE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -614,6 +614,20 @@ void CPropertyList::OnRButtonUp( UINT nFlags, CPoint point )
|
|||||||
rect.TopLeft().y + point.y, this, NULL);
|
rect.TopLeft().y + point.y, this, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CPropertyList::RemoveProperty(const char* name)
|
||||||
|
{
|
||||||
|
for(int i =0; i < this->GetCount(); ++i)
|
||||||
|
{
|
||||||
|
CPropertyItem* pItem = (CPropertyItem*) GetItemDataPtr(i);
|
||||||
|
if(pItem->m_propName == name)
|
||||||
|
{
|
||||||
|
m_PropertyItems.erase(pItem);
|
||||||
|
delete pItem;
|
||||||
|
this->DeleteString(i);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void CPropertyList::OnDelete()
|
void CPropertyList::OnDelete()
|
||||||
{
|
{
|
||||||
|
@ -67,6 +67,7 @@ public:
|
|||||||
int type,
|
int type,
|
||||||
const char* comboItems,
|
const char* comboItems,
|
||||||
bool reverseOrder);
|
bool reverseOrder);
|
||||||
|
void RemoveProperty(const char* name);
|
||||||
void HideControls();
|
void HideControls();
|
||||||
std::set<CPropertyItem*> GetItems()
|
std::set<CPropertyItem*> GetItems()
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user