CLIST_INTERFACE::pfnGetDefaultExStyle => Clist_GetDefaultExStyle

11 files changed, 35 insertions, 35 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index adade975fa..e10a4a4d32 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -356,7 +356,7 @@ type
     pfnIsHiddenMode                    : function  (var dat:TClcData; status:int):int; cdecl;

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

     pfnNotifyNewContact                : procedure (hwnd:HWND; hContact:TMCONTACT); cdecl;

-    pfnGetDefaultExStyle               : function  :dword; cdecl;

+    blablablabla8                      : procedure; cdecl;

     pfnGetDefaultFontSetting           : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl;

     pfnLoadClcOptions                  : procedure (hwnd:HWND; var dat:TClcData; bFirst: int); cdecl;

     blablablabla7                      : procedure; cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 61586e51c6..f2a75b00c9 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -246,31 +246,32 @@ struct MenuProto
 /////////////////////////////////////////////////////////////////////////////////////////

 // functions

 

-EXTERN_C MIR_APP_DLL(DWORD) Clist_ContactToHItem(ClcContact *contact);

-EXTERN_C MIR_APP_DLL(HANDLE) Clist_ContactToItemHandle(ClcContact *contact, DWORD *nmFlags);

-

-EXTERN_C MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam);

-EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);

-

-EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);

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

-EXTERN_C MIR_APP_DLL(int)  Clist_EventsProcessTrayDoubleClick(int index);

-EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

-EXTERN_C MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour);

-EXTERN_C MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd);

-EXTERN_C MIR_APP_DLL(void) Clist_InvalidateItem(HWND hwnd, ClcData *dat, int iItem);

-EXTERN_C MIR_APP_DLL(void) Clist_LoadContactTree(void);

-EXTERN_C MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat);

-EXTERN_C MIR_APP_DLL(void) Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked);

-

-EXTERN_C MIR_APP_DLL(int)  Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);

-EXTERN_C MIR_APP_DLL(int)  Clist_TrayIconDestroy(HWND hwnd);

-EXTERN_C MIR_APP_DLL(void) Clist_TrayIconIconsChanged(void);

+EXTERN_C MIR_APP_DLL(DWORD)    Clist_ContactToHItem(ClcContact *contact);

+EXTERN_C MIR_APP_DLL(HANDLE)   Clist_ContactToItemHandle(ClcContact *contact, DWORD *nmFlags);

+

+EXTERN_C MIR_APP_DLL(void)     Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam);

+EXTERN_C MIR_APP_DLL(void)     Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);

+								       

+EXTERN_C MIR_APP_DLL(void)     Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);

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

+EXTERN_C MIR_APP_DLL(int)      Clist_EventsProcessTrayDoubleClick(int index);

+EXTERN_C MIR_APP_DLL(bool)     Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

+EXTERN_C MIR_APP_DLL(DWORD)    Clist_GetDefaultExStyle(void);

+EXTERN_C MIR_APP_DLL(void)     Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour);

+EXTERN_C MIR_APP_DLL(void)     Clist_InitAutoRebuild(HWND hWnd);

+EXTERN_C MIR_APP_DLL(void)     Clist_InvalidateItem(HWND hwnd, ClcData *dat, int iItem);

+EXTERN_C MIR_APP_DLL(void)     Clist_LoadContactTree(void);

+EXTERN_C MIR_APP_DLL(void)     Clist_RecalculateGroupCheckboxes(ClcData *dat);

+EXTERN_C MIR_APP_DLL(void)     Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked);

+								       

+EXTERN_C MIR_APP_DLL(int)      Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);

+EXTERN_C MIR_APP_DLL(int)      Clist_TrayIconDestroy(HWND hwnd);

+EXTERN_C MIR_APP_DLL(void)     Clist_TrayIconIconsChanged(void);

 EXTERN_C MIR_APP_DLL(wchar_t*) Clist_TrayIconMakeTooltip(const wchar_t *szPrefix, const char *szProto);

-EXTERN_C MIR_APP_DLL(void) Clist_TrayIconRemove(HWND hwnd, const char *szProto);

-EXTERN_C MIR_APP_DLL(int)  Clist_TrayIconSetBaseInfo(HICON hIcon, const char *szPreferredProto);

-EXTERN_C MIR_APP_DLL(void) Clist_TrayIconUpdateBase(const char *szChangedProto);

-EXTERN_C MIR_APP_DLL(void) Clist_TraySetTimer();

+EXTERN_C MIR_APP_DLL(void)     Clist_TrayIconRemove(HWND hwnd, const char *szProto);

+EXTERN_C MIR_APP_DLL(int)      Clist_TrayIconSetBaseInfo(HICON hIcon, const char *szPreferredProto);

+EXTERN_C MIR_APP_DLL(void)     Clist_TrayIconUpdateBase(const char *szChangedProto);

+EXTERN_C MIR_APP_DLL(void)     Clist_TraySetTimer();

 

 EXTERN_C MIR_APP_DLL(ClcCacheEntry*) Clist_GetCacheEntry(MCONTACT hContact);

 

@@ -367,7 +368,7 @@ struct CLIST_INTERFACE
 	int            (*pfnIsHiddenMode)(ClcData *dat, int status);

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

 	void           (*pfnNotifyNewContact)(HWND hwnd, MCONTACT hContact);

-	DWORD          (*pfnGetDefaultExStyle)(void);

+	void           (*blablablabla8)();

 	void           (*pfnGetDefaultFontSetting)(int i, LOGFONT *lf, COLORREF *colour);

 	void           (*pfnLoadClcOptions)(HWND hwnd, ClcData *dat, BOOL bFirst);

 	void           (*blablablabla7)();

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index aea8002698..3d75f604a4 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 15610a4d61..499274c6b4 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index b2464eeb00..0895b0d146 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -155,7 +155,7 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always right"));

 			SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Automatic (RTL)"));

 

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

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

 			for (auto &it : checkBoxToGroupStyleEx)

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

 

@@ -193,7 +193,7 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam,
 		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

 			if (((LPNMHDR)lParam)->code == PSN_APPLY) {

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

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

 

 				for (auto &it : checkBoxToGroupStyleEx) {

 					if ((IsDlgButtonChecked(hwndDlg, it.id) == 0) == it.not_t)

@@ -596,7 +596,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		opt_clc_main_changed = 0;

 		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), 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());

 			UDACCEL accel[2] = { { 0, 10 }, { 2, 50 } };

 			SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETRANGE, 0, MAKELONG(999, 0));

 			SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETACCEL, _countof(accel), (LPARAM)&accel);

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