|
|
@ -262,6 +262,7 @@ namespace NLGUI
|
|
|
|
dirt();
|
|
|
|
dirt();
|
|
|
|
_Texts.clear();
|
|
|
|
_Texts.clear();
|
|
|
|
_Textures.clear();
|
|
|
|
_Textures.clear();
|
|
|
|
|
|
|
|
_Grayed.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
@ -270,6 +271,7 @@ namespace NLGUI
|
|
|
|
dirt();
|
|
|
|
dirt();
|
|
|
|
_Texts.push_back(make_pair((uint)_Texts.size(), text));
|
|
|
|
_Texts.push_back(make_pair((uint)_Texts.size(), text));
|
|
|
|
_Textures.push_back(std::string());
|
|
|
|
_Textures.push_back(std::string());
|
|
|
|
|
|
|
|
_Grayed.push_back(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
@ -292,9 +294,11 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_Texts[t+1] = _Texts[t];
|
|
|
|
_Texts[t+1] = _Texts[t];
|
|
|
|
_Textures[t+1] = _Textures[t];
|
|
|
|
_Textures[t+1] = _Textures[t];
|
|
|
|
|
|
|
|
_Grayed[t+1] = _Grayed[t];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_Texts[i] = make_pair(i, text);
|
|
|
|
_Texts[i] = make_pair(i, text);
|
|
|
|
_Textures[i] = std::string();
|
|
|
|
_Textures[i] = std::string();
|
|
|
|
|
|
|
|
_Grayed[i] = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(i==_Texts.size())
|
|
|
|
else if(i==_Texts.size())
|
|
|
|
addText(text);
|
|
|
|
addText(text);
|
|
|
@ -308,6 +312,24 @@ namespace NLGUI
|
|
|
|
_Textures[i]= texture;
|
|
|
|
_Textures[i]= texture;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
void CDBGroupComboBox::setGrayed(uint i, bool g)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
dirt();
|
|
|
|
|
|
|
|
if(i<_Grayed.size())
|
|
|
|
|
|
|
|
_Grayed[i] = g;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
const bool CDBGroupComboBox::getGrayed(uint i) const
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if(i<_Grayed.size())
|
|
|
|
|
|
|
|
return _Grayed[i];
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
void CDBGroupComboBox::removeText(uint nPos)
|
|
|
|
void CDBGroupComboBox::removeText(uint nPos)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -316,6 +338,7 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_Texts.erase( _Texts.begin()+nPos );
|
|
|
|
_Texts.erase( _Texts.begin()+nPos );
|
|
|
|
_Textures.erase( _Textures.begin()+nPos );
|
|
|
|
_Textures.erase( _Textures.begin()+nPos );
|
|
|
|
|
|
|
|
_Grayed.erase ( _Grayed.begin()+nPos );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -365,7 +388,6 @@ namespace NLGUI
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
void CDBGroupComboBox::setSelection(sint32 val)
|
|
|
|
void CDBGroupComboBox::setSelection(sint32 val)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -619,6 +641,7 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
groupMenu->addLine(getText(i), "combo_box_select_end", toString(i),
|
|
|
|
groupMenu->addLine(getText(i), "combo_box_select_end", toString(i),
|
|
|
|
"", std::string(), getTexture(i).toString(), checkable);
|
|
|
|
"", std::string(), getTexture(i).toString(), checkable);
|
|
|
|
|
|
|
|
groupMenu->setGrayedLine(i, getGrayed(i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|