CLIST_INTERFACE::pfnDoSelectionDefaultAction => Clist_DoSelectionDefaultAction

12 files changed, 11 insertions, 10 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 29ee1ae27d..9d6a97348d 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -345,7 +345,7 @@ type
     pfnEnsureVisible                   : procedure (hwnd:HWND; var dat:TClcData; iItem:int; partialOk:int); cdecl;

     pfnRecalcScrollBar                 : procedure (hwnd:HWND; var dat:TClcData); cdecl;

     pfnSetGroupExpand                  : procedure (hwnd:HWND; var dat:TClcData; var group:TClcGroup; newState:int); cdecl;

-    pfnDoSelectionDefaultAction        : procedure (hwnd:HWND; var dat:TClcData); cdecl;

+    blablablabla17                     : procedure; cdecl;

     pfnFindRowByText                   : function  (hwnd:HWND; var dat:TClcData; text:TChar; prefixOk:int):int; cdecl;

     blablablabla16                     : procedure; cdecl;

     blablablabla15                     : procedure; cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 6b692e442b..46ec233c56 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -255,6 +255,7 @@ EXTERN_C MIR_APP_DLL(void)     Clist_BroadcastAsync(int msg, WPARAM wParam, LPAR
 EXTERN_C MIR_APP_DLL(void)     Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);

 EXTERN_C MIR_APP_DLL(int)      Clist_ClcStatusToPf2(int status);

 EXTERN_C MIR_APP_DLL(void)     Clist_DeleteFromContactList(HWND hwnd, ClcData *dat);

+EXTERN_C MIR_APP_DLL(void)     Clist_DoSelectionDefaultAction(HWND hwnd, ClcData *dat);

 EXTERN_C MIR_APP_DLL(void)     Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);

 EXTERN_C MIR_APP_DLL(void)     Clist_EndRename(ClcData *dat, int save);

 EXTERN_C MIR_APP_DLL(int)      Clist_EventsProcessTrayDoubleClick(int index);

@@ -364,7 +365,7 @@ struct CLIST_INTERFACE
 	void           (*pfnEnsureVisible)(HWND hwnd, ClcData *dat, int iItem, int partialOk);

 	void           (*pfnRecalcScrollBar)(HWND hwnd, ClcData *dat);

 	void           (*pfnSetGroupExpand)(HWND hwnd, ClcData *dat, ClcGroup *group, int newState);

-	void           (*pfnDoSelectionDefaultAction)(HWND hwnd, ClcData *dat);

+	void           (*blablablabla17)();

 	int            (*pfnFindRowByText)(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);

 	void           (*blablablabla16)();

 	void           (*blablablabla15)();

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 7a204de94a..6173676e7b 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 9c1fac0364..265113671d 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 25afd153fe..39d920265c 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -447,7 +447,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
 	case VK_LEFT: changeGroupExpand = 1; break;

 	case VK_RIGHT: changeGroupExpand = 2; break;

 	case VK_RETURN:

-		pcli->pfnDoSelectionDefaultAction(hwnd, dat);

+		Clist_DoSelectionDefaultAction(hwnd, dat);

 		SetCapture(hwnd);

 		return 0;

 

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 51f00bb68d..839ba5f020 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -627,7 +627,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		}

 		if (hitFlags & (CLCHT_ONITEMICON | CLCHT_ONITEMLABEL | CLCHT_ONITEMSPACE)) {

 			UpdateWindow(hwnd);

-			pcli->pfnDoSelectionDefaultAction(hwnd, dat);

+			Clist_DoSelectionDefaultAction(hwnd, dat);

 		}

 		return TRUE;

 

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