Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to boost::bind for a bunch of CommitCallbacks. Converted several static member functions to nonstatic member functions

Browse Source
This commit is contained in:
Shyotl
2012-12-06 17:13:17 -06:00
parent ef6f411b70
commit 26191dd274
27 changed files with 326 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloatercolorpicker.cpp
View File

@@ -238,8 +238,7 @@ postBuild()
mApplyImmediateCheck = getChild<LLCheckBoxCtrl>("apply_immediate");
mApplyImmediateCheck->set(gSavedSettings.getBOOL("ApplyColorImmediately"));
mApplyImmediateCheck->setCommitCallback(onImmediateCheck);
mApplyImmediateCheck->setCallbackUserData(this);
mApplyImmediateCheck->setCommitCallback(boost::bind(&LLFloaterColorPicker::onImmediateCheck,this));
childSetCommitCallback("rspin", onTextCommit, (void*)this );
childSetCommitCallback("gspin", onTextCommit, (void*)this );
@@ -500,17 +499,13 @@ onTextCommit ( LLUICtrl* ctrl, void* data )
}
}
void LLFloaterColorPicker::onImmediateCheck( LLUICtrl* ctrl, void* data)
void LLFloaterColorPicker::onImmediateCheck()
{
LLFloaterColorPicker* self = ( LLFloaterColorPicker* )data;
if (self)
{
gSavedSettings.setBOOL("ApplyColorImmediately", self->mApplyImmediateCheck->get());
gSavedSettings.setBOOL("ApplyColorImmediately", mApplyImmediateCheck->get());
if (self->mApplyImmediateCheck->get())
{
LLColorSwatchCtrl::onColorChanged ( self->getSwatch (), LLColorSwatchCtrl::COLOR_CHANGE );
}
if (mApplyImmediateCheck->get())
{
LLColorSwatchCtrl::onColorChanged ( getSwatch(), LLColorSwatchCtrl::COLOR_CHANGE );
}
}