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:
@@ -2050,7 +2050,7 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
if(mOnMaximumSelectCallback)
|
||||
{
|
||||
mOnMaximumSelectCallback(mCallbackUserData);
|
||||
mOnMaximumSelectCallback();
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -2088,7 +2088,7 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
if(mOnMaximumSelectCallback)
|
||||
{
|
||||
mOnMaximumSelectCallback(mCallbackUserData);
|
||||
mOnMaximumSelectCallback();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2181,7 +2181,7 @@ BOOL LLScrollListCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
if( mCanSelect && mOnDoubleClickCallback )
|
||||
{
|
||||
mOnDoubleClickCallback( mCallbackUserData );
|
||||
mOnDoubleClickCallback();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3320,7 +3320,7 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
|
||||
|
||||
if (parent->mOnSortChangedCallback)
|
||||
{
|
||||
parent->mOnSortChangedCallback(parent->getCallbackUserData());
|
||||
parent->mOnSortChangedCallback();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user