Removed LLUICtrl::setDoubleClickCallback and LLPanel::childSetDoubleClickCallback as they aren't used/needed and complicate things. Added LLPanel::childSetAction overload that accepts boost::singal2::signal (for boost::bind). Now using boost::function for various callbacks in LLScrollListCtrl (for boost::bind).

This commit is contained in:
Shyotl
2012-12-04 21:54:01 -06:00
parent ca3e0d2ba9
commit ef6f411b70
29 changed files with 82 additions and 103 deletions

View File

@@ -136,8 +136,7 @@ BOOL LLFloaterGroupPicker::postBuild()
setDefaultBtn("OK");
childSetDoubleClickCallback("group list", onBtnOK);
childSetUserData("group list", this);
group_list->setDoubleClickCallback(boost::bind(&LLFloaterGroupPicker::onBtnOK,this));
childEnable("OK");
@@ -222,7 +221,8 @@ BOOL LLPanelGroups::postBuild()
const std::string none_text = getString("none");
LLScrollListCtrl *group_list = getChild<LLScrollListCtrl>("group list");
init_group_list(group_list, gAgent.getGroupID(), none_text);
group_list->setSortChangedCallback(onGroupSortChanged); //Force 'none' to always be first entry.
group_list->setSortChangedCallback(boost::bind(&onGroupSortChanged,this)); //Force 'none' to always be first entry.
group_list->setDoubleClickCallback(boost::bind(&LLPanelGroups::onBtnIM,this));
childSetAction("Activate", onBtnActivate, this);
@@ -242,9 +242,6 @@ BOOL LLPanelGroups::postBuild()
setDefaultBtn("IM");
childSetDoubleClickCallback("group list", onBtnIM);
childSetUserData("group list", this);
reset();
return TRUE;