From 3be534c7528386c00bc31fca9c15b87d214f5cc1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 8 Nov 2012 19:17:18 +0000 Subject: CLN_LISTREBUILT & CLN_NEWCONTACT processing moved to the core git-svn-id: http://svn.miranda-ng.org/main/trunk@2249 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/HistoryWindow.cpp | 2 +- plugins/Clist_modern/src/hdr/modern_clui.h | 2 -- plugins/Clist_modern/src/modern_clui.cpp | 22 +++------------------- plugins/Clist_modern/src/modern_viewmodebar.cpp | 23 +++-------------------- plugins/Clist_mw/src/clui.cpp | 12 ------------ plugins/Clist_nicer/src/viewmodes.cpp | 2 -- 6 files changed, 7 insertions(+), 56 deletions(-) (limited to 'plugins') diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 06f7f69e27..844dedc14c 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -712,7 +712,7 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP switch(pNmhdr->idFrom) { case IDC_LIST_CONTACTS: - if(pNmhdr->code == CLN_LISTREBUILT)// || pNmhdr->code == CLN_CONTACTMOVED || pNmhdr->code == CLN_NEWCONTACT) + if(pNmhdr->code == CLN_LISTREBUILT) { HistoryWindow* historyWindow =(HistoryWindow*)GetWindowLongPtr(hwndDlg,GWLP_USERDATA); if(historyWindow != NULL) diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/hdr/modern_clui.h index 75d348e547..0b8cc4f9e1 100644 --- a/plugins/Clist_modern/src/hdr/modern_clui.h +++ b/plugins/Clist_modern/src/hdr/modern_clui.h @@ -173,8 +173,6 @@ private: LRESULT OnGetMinMaxInfo( UINT msg, WPARAM wParam, LPARAM lParam ); LRESULT OnMoving( UINT msg, WPARAM wParam, LPARAM lParam ); LRESULT OnNotify( UINT msg, WPARAM wParam, LPARAM lParam ); - LRESULT OnNewContactNotify( NMCLISTCONTROL * pnmc ); - LRESULT OnListRebuildNotify( NMCLISTCONTROL * pnmc ); LRESULT OnListSizeChangeNotify( NMCLISTCONTROL * pnmc ); LRESULT OnClickNotify( NMCLISTCONTROL * pnmc ); LRESULT OnContextMenu( UINT msg, WPARAM wParam, LPARAM lParam ); diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 9a8c0324d3..4a4505c48b 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -2685,18 +2685,6 @@ LRESULT CLUI::OnMoving(UINT msg, WPARAM wParam, LPARAM lParam) return TRUE; } -LRESULT CLUI::OnNewContactNotify(NMCLISTCONTROL *pnmc) -{ - pcli->pfnSetAllExtraIcons(pcli->hwndContactTree, pnmc->hItem); - return FALSE; -} - -LRESULT CLUI::OnListRebuildNotify(NMCLISTCONTROL *pnmc) -{ - pcli->pfnSetAllExtraIcons(pcli->hwndContactTree, 0); - return FALSE; -} - LRESULT CLUI::OnListSizeChangeNotify( NMCLISTCONTROL * pnmc ) { // TODO: Check and refactor possible problem of clist resized to full screen problem @@ -2827,13 +2815,9 @@ LRESULT CLUI::OnNotify( UINT msg, WPARAM wParam, LPARAM lParam ) if ( pnmhdr->hwndFrom != pcli->hwndContactTree ) return DefCluiWndProc( msg, wParam, lParam ); - switch ( pnmhdr->code) - { - case CLN_NEWCONTACT: return OnNewContactNotify((NMCLISTCONTROL *)pnmhdr ); - case CLN_LISTREBUILT: return OnListRebuildNotify((NMCLISTCONTROL *)pnmhdr ); - case CLN_LISTSIZECHANGE: return OnListSizeChangeNotify((NMCLISTCONTROL *)pnmhdr ); - case NM_CLICK: return OnClickNotify((NMCLISTCONTROL *)pnmhdr ); - + switch ( pnmhdr->code) { + case CLN_LISTSIZECHANGE: return OnListSizeChangeNotify((NMCLISTCONTROL *)pnmhdr ); + case NM_CLICK: return OnClickNotify((NMCLISTCONTROL *)pnmhdr ); } return DefCluiWndProc( msg, wParam, lParam ); } diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 92f655f7a7..38f05eafa2 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -935,26 +935,8 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP case IDC_CLIST: if (((LPNMHDR) lParam)->code == NM_CLICK || ((LPNMHDR) lParam)->code == CLN_CHECKCHANGED) EnableWindow(GetDlgItem(hwndDlg, IDC_APPLY), TRUE); - switch (((LPNMHDR)lParam)->code) - { - case CLN_NEWCONTACT: - case CLN_LISTREBUILT: - //SetAllContactIcons(GetDlgItem(hwndDlg,IDC_CLIST)); - //fall through - /* - case CLN_CONTACTMOVED: - SetListGroupIcons(GetDlgItem(hwndDlg,IDC_LIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hItemAll,NULL); - break; - case CLN_OPTIONSCHANGED: - ResetListOptions(GetDlgItem(hwndDlg,IDC_LIST)); - break; - case CLN_CHECKCHANGED: - { - HANDLE hItem; - NMCLISTCONTROL *nm = (NMCLISTCONTROL*)lParam; - int typeOfItem = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETITEMTYPE,(WPARAM)nm->hItem, 0); - break; - }*/ + + switch (((LPNMHDR)lParam)->code) { case NM_CLICK: { HANDLE hItem; @@ -980,6 +962,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP } } break; + case IDC_TAB: if (((LPNMHDR) lParam)->code == TCN_SELCHANGE) { int id = TabCtrl_GetCurSel(GetDlgItem(hwndDlg, IDC_TAB)); diff --git a/plugins/Clist_mw/src/clui.cpp b/plugins/Clist_mw/src/clui.cpp index 3e23ecd5dc..8e53dedda5 100644 --- a/plugins/Clist_mw/src/clui.cpp +++ b/plugins/Clist_mw/src/clui.cpp @@ -600,18 +600,6 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case WM_NOTIFY: if (((LPNMHDR)lParam)->hwndFrom == pcli->hwndContactTree) { switch (((LPNMHDR)lParam)->code) { - case CLN_NEWCONTACT: - { - NMCLISTCONTROL *nm = (NMCLISTCONTROL *)lParam; - if (nm != NULL) - pcli->pfnSetAllExtraIcons(pcli->hwndContactTree, nm->hItem); - return TRUE; - } - - case CLN_LISTREBUILT: - pcli->pfnSetAllExtraIcons(pcli->hwndContactTree, 0); - return(FALSE); - case CLN_LISTSIZECHANGE: { NMCLISTCONTROL *nmc = (NMCLISTCONTROL*)lParam; diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 957a580a0d..cf6a09e9e9 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -789,8 +789,6 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP Utils::enableDlgControl(hwndDlg, IDC_APPLY, TRUE); switch (((LPNMHDR)lParam)->code) { - case CLN_NEWCONTACT: - case CLN_LISTREBUILT: case NM_CLICK: { NMCLISTCONTROL *nm=(NMCLISTCONTROL*)lParam; -- cgit v1.2.3