diff options
| -rw-r--r-- | include/m_system.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/contacts.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/menu_options.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/m_system.h b/include/m_system.h index f5003a2585..affe7bfa25 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -667,7 +667,7 @@ __inline CCallback<TArgument> Callback(TClass *object, void (TClass:: *func)(TAr }
template<typename TClass, typename TArgument>
-__inline CCallback<TArgument> Callback(TClass *object, bool (TClass:: *func)(TArgument *argument))
+__inline CCallback<TArgument> BCallback(TClass *object, bool (TClass:: *func)(TArgument *argument))
{
return CCallback<TArgument>(object, func);
}
diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 7fc760e550..94d6313df8 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -334,8 +334,8 @@ public: m_nameOrder(this, IDC_NAMEORDER)
{
m_nameOrder.SetFlags(MTREE_DND);
- m_nameOrder.OnBeginDrag = Callback(this, &CContactOptsDlg::OnBeginDrag);
- m_nameOrder.OnEndDrag = Callback(this, &CContactOptsDlg::OnEndDrag);
+ m_nameOrder.OnBeginDrag = BCallback(this, &CContactOptsDlg::OnBeginDrag);
+ m_nameOrder.OnEndDrag = BCallback(this, &CContactOptsDlg::OnEndDrag);
}
bool OnInitDialog() override
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp index 3c6ce3cf55..daa9a80e1d 100644 --- a/src/mir_app/src/menu_options.cpp +++ b/src/mir_app/src/menu_options.cpp @@ -318,7 +318,7 @@ public: m_menuItems.SetFlags(MTREE_CHECKBOX | MTREE_DND);
m_menuItems.OnSelChanged = Callback(this, &CGenMenuOptionsPage::onMenuItemChanged);
- m_menuItems.OnBeginDrag = Callback(this, &CGenMenuOptionsPage::onMenuItemBeginDrag);
+ m_menuItems.OnBeginDrag = BCallback(this, &CGenMenuOptionsPage::onMenuItemBeginDrag);
m_customName.SetSilent();
m_service.SetSilent();
|