CLIST_INTERFACE::pfnGetDefaultExStyle => Clist_GetDefaultExStyle

6 files changed, 5 insertions, 6 deletions

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 453a2b6267..7f3d5a69ed 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -149,7 +149,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE,

 			GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);

 		{

-			DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", pcli->pfnGetDefaultExStyle());

+			DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", Clist_GetDefaultExStyle());

 			for (auto &it : checkBoxToStyleEx)

 				CheckDlgButton(hwndDlg, it.id, (exStyle & it.flag) ^ (it.flag * it.not) ? BST_CHECKED : BST_UNCHECKED);

 		}

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index ebdd0b1dcf..46f95c5d5a 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -96,8 +96,6 @@ void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour);
 void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst);

 void fnSetContactCheckboxes(ClcContact *cc, int checked);

 

-DWORD fnGetDefaultExStyle(void);

-

 int fnGetRowBottomY(struct ClcData *dat, int item);

 int fnGetRowHeight(struct ClcData *dat, int item);

 int fnGetRowTopY(struct ClcData *dat, int item);

diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index e0ecf94e42..1e41121b0e 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -659,7 +659,7 @@ void fnNotifyNewContact(HWND hwnd, MCONTACT hContact)
 	SendMessage(GetParent(hwnd), WM_NOTIFY, 0, (LPARAM)&nm);

 }

 

-DWORD fnGetDefaultExStyle(void)

+MIR_APP_DLL(DWORD) Clist_GetDefaultExStyle(void)

 {

 	BOOL param;

 	DWORD ret = CLCDEFAULT_EXSTYLE;

@@ -734,7 +734,7 @@ void fnLoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 {

 	dat->rowHeight = db_get_b(0, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT);

 	dat->leftMargin = db_get_b(0, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN);

-	dat->exStyle = db_get_dw(0, "CLC", "ExStyle", cli.pfnGetDefaultExStyle());

+	dat->exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle());

 	dat->scrollTime = db_get_w(0, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME);

 	dat->groupIndent = db_get_b(0, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT);

 	dat->gammaCorrection = db_get_b(0, "CLC", "GammaCorrect", CLCDEFAULT_GAMMACORRECT);

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index a4828244f5..ba3ebdbf46 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -110,7 +110,6 @@ void InitClistCore()
 	cli.pfnIsVisibleContact = fnIsVisibleContact;

 	cli.pfnHideInfoTip = fnHideInfoTip;

 	cli.pfnNotifyNewContact = fnNotifyNewContact;

-	cli.pfnGetDefaultExStyle = fnGetDefaultExStyle;

 	cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting;

 	cli.pfnLoadClcOptions = fnLoadClcOptions;

 	cli.pfnGetRowBottomY = fnGetRowBottomY;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 9aae4506fa..7847920997 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -561,3 +561,4 @@ Clist_InvalidateItem @580
 Clist_SetGroupChildCheckboxes @581

 Clist_RecalculateGroupCheckboxes @582

 Clist_GetFontSetting @583

+Clist_GetDefaultExStyle @584

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 69d4f4aa02..33dfe19f1c 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -561,3 +561,4 @@ Clist_InvalidateItem @580
 Clist_SetGroupChildCheckboxes @581

 Clist_RecalculateGroupCheckboxes @582

 Clist_GetFontSetting @583

+Clist_GetDefaultExStyle @584