CComponentsHeader: move int of default buttons into its own member

This commit is contained in:
2012-11-24 22:20:37 +01:00
parent 189ba5b5e6
commit 62f44d7a8c
2 changed files with 7 additions and 1 deletions

View File

@@ -505,6 +505,7 @@ class CComponentsHeader : public CComponentsForm
void initCCHeaderText(); void initCCHeaderText();
void initCCHeaderButtons(); void initCCHeaderButtons();
void initCCHItems(); void initCCHItems();
void initCCHDefaultButtons();
protected: protected:
void initVarHeader(); void initVarHeader();

View File

@@ -1819,7 +1819,7 @@ void CComponentsHeader::removeHeaderButtons()
cch_btn_obj->removeAllIcons(); cch_btn_obj->removeAllIcons();
} }
void CComponentsHeader::initCCHeaderButtons() void CComponentsHeader::initCCHDefaultButtons()
{ {
if (cch_buttons & CC_BTN_EXIT) if (cch_buttons & CC_BTN_EXIT)
v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_HOME); v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_HOME);
@@ -1829,6 +1829,11 @@ void CComponentsHeader::initCCHeaderButtons()
v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_INFO); v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_INFO);
if (cch_buttons & CC_BTN_MENU) if (cch_buttons & CC_BTN_MENU)
v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_MENU); v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_MENU);
}
void CComponentsHeader::initCCHeaderButtons()
{
initCCHDefaultButtons();
//exit if no button defined //exit if no button defined
if (v_cch_btn.empty()) if (v_cch_btn.empty())