From da9aa1870502d88752c5482e3eb2d2548dd64984 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 20:44:07 +0300 Subject: CLIST_INTERFACE::pfnDoSelectionDefaultAction => Clist_DoSelectionDefaultAction --- src/mir_app/src/clc.cpp | 4 ++-- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcutils.cpp | 2 +- src/mir_app/src/clistcore.cpp | 3 +-- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index d1a0c27f72..011f315b78 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -702,7 +702,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam case VK_RIGHT: changeGroupExpand = 2; break; case VK_RETURN: - cli.pfnDoSelectionDefaultAction(hwnd, dat); + Clist_DoSelectionDefaultAction(hwnd, dat); return 0; case VK_F2: cli.pfnBeginRenameSelection(hwnd, dat); return 0; @@ -1175,7 +1175,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam if (hitFlags & (CLCHT_ONITEMICON | CLCHT_ONITEMLABEL)) { UpdateWindow(hwnd); - cli.pfnDoSelectionDefaultAction(hwnd, dat); + Clist_DoSelectionDefaultAction(hwnd, dat); } break; diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index b1dcc58dc2..8396747bc2 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -81,7 +81,6 @@ void fnScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth); void fnEnsureVisible(HWND hwnd, ClcData *dat, int iItem, int partialOk); void fnRecalcScrollBar(HWND hwnd, ClcData *dat); void fnSetGroupExpand(HWND hwnd, ClcData *dat, ClcGroup *group, int newState); -void fnDoSelectionDefaultAction(HWND hwnd, ClcData *dat); int fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk); void fnBeginRenameSelection(HWND hwnd, ClcData *dat); diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 3087ea488e..cc2d806737 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -345,7 +345,7 @@ void fnSetGroupExpand(HWND hwnd, ClcData *dat, ClcGroup *group, int newState) SendMessage(GetParent(hwnd), WM_NOTIFY, 0, (LPARAM)&nm); } -void fnDoSelectionDefaultAction(HWND hwnd, ClcData *dat) +MIR_APP_DLL(void) Clist_DoSelectionDefaultAction(HWND hwnd, ClcData *dat) { if (dat->selection == -1) return; diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index f93ff81f87..37ba317f2a 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -98,9 +98,8 @@ void InitClistCore() cli.pfnEnsureVisible = fnEnsureVisible; cli.pfnRecalcScrollBar = fnRecalcScrollBar; cli.pfnSetGroupExpand = fnSetGroupExpand; - cli.pfnDoSelectionDefaultAction = fnDoSelectionDefaultAction; - cli.pfnFindRowByText = fnFindRowByText; + cli.pfnFindRowByText = fnFindRowByText; cli.pfnBeginRenameSelection = fnBeginRenameSelection; cli.pfnIsVisibleContact = fnIsVisibleContact; cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index b776392554..4af222c749 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -569,3 +569,4 @@ Clist_ClcStatusToPf2 @588 Clist_CalcEipPosition @589 Clist_DeleteFromContactList @590 Clist_EndRename @591 +Clist_DoSelectionDefaultAction @592 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index eea6bae720..fdab2e472d 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -569,3 +569,4 @@ Clist_ClcStatusToPf2 @588 Clist_CalcEipPosition @589 Clist_DeleteFromContactList @590 Clist_EndRename @591 +Clist_DoSelectionDefaultAction @592 -- cgit v1.2.3