From cb4668b47a9b71a96b1285143391ca6cc7ff1f56 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 26 Sep 2022 12:42:43 +0300 Subject: =?UTF-8?q?fixes=20#3208=20(tabSRMM:=20=D0=BD=D0=B5=20=D1=81=D0=BE?= =?UTF-8?q?=D1=85=D1=80=D0=B0=D0=BD=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=87=D0=B5?= =?UTF-8?q?=D0=BA=D0=B1=D0=BE=D0=BA=D1=81=D0=BE=D0=B2=20=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=D1=85=20=D1=83?= =?UTF-8?q?=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B1=D0=BE=D1=80=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/stdmsg/src/msgoptions.cpp | 6 ------ src/mir_core/src/Windows/CCtrlClc.cpp | 28 ++++++++++++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 641886c837..590afa2478 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -475,7 +475,6 @@ public: ResetCList(); clist.OnListRebuilt = Callback(this, &COptionTypingDlg::RebuildList); - clist.OnCheckChanged = Callback(this, &COptionTypingDlg::onChange_Clist); clist.OnOptionsChanged = Callback(this, &COptionTypingDlg::ResetCList); return true; } @@ -487,11 +486,6 @@ public: return true; } - void onChange_Clist(CCtrlClc::TEventInfo*) - { - NotifyChange(); - } - void onChange_Tray(CCtrlCheck*) { bool bStatus = chkTypeTray.GetState() != 0; diff --git a/src/mir_core/src/Windows/CCtrlClc.cpp b/src/mir_core/src/Windows/CCtrlClc.cpp index cf4f05cda6..3e208679d4 100644 --- a/src/mir_core/src/Windows/CCtrlClc.cpp +++ b/src/mir_core/src/Windows/CCtrlClc.cpp @@ -33,18 +33,22 @@ BOOL CCtrlClc::OnNotify(int, NMHDR *pnmh) { TEventInfo evt = { this, (NMCLISTCONTROL *)pnmh }; switch (pnmh->code) { - case CLN_EXPANDED: OnExpanded(&evt); break; - case CLN_LISTREBUILT: OnListRebuilt(&evt); break; - case CLN_ITEMCHECKED: OnItemChecked(&evt); break; - case CLN_DRAGGING: OnDragging(&evt); break; - case CLN_DROPPED: OnDropped(&evt); break; - case CLN_LISTSIZECHANGE: OnListSizeChange(&evt); break; - case CLN_OPTIONSCHANGED: OnOptionsChanged(&evt); break; - case CLN_DRAGSTOP: OnDragStop(&evt); break; - case CLN_NEWCONTACT: OnNewContact(&evt); break; - case CLN_CONTACTMOVED: OnContactMoved(&evt); break; - case CLN_CHECKCHANGED: OnCheckChanged(&evt); break; - case NM_CLICK: OnClick(&evt); break; + case CLN_EXPANDED: OnExpanded(&evt); break; + case CLN_LISTREBUILT: OnListRebuilt(&evt); break; + case CLN_ITEMCHECKED: OnItemChecked(&evt); break; + case CLN_DRAGGING: OnDragging(&evt); break; + case CLN_DROPPED: OnDropped(&evt); break; + case CLN_LISTSIZECHANGE: OnListSizeChange(&evt); break; + case CLN_OPTIONSCHANGED: OnOptionsChanged(&evt); break; + case CLN_DRAGSTOP: OnDragStop(&evt); break; + case CLN_NEWCONTACT: OnNewContact(&evt); break; + case CLN_CONTACTMOVED: OnContactMoved(&evt); break; + case NM_CLICK: OnClick(&evt); break; + + case CLN_CHECKCHANGED: + OnCheckChanged(&evt); + NotifyChange(); + break; } return FALSE; } -- cgit v1.2.3