CLIST_INTERFACE::pfnInvalidateItem => Clist_InvalidateItem

13 files changed, 49 insertions, 48 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 9338ac0e97..12cef06989 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -362,7 +362,7 @@ type
     pfnLoadClcOptions                  : procedure (hwnd:HWND; var dat:TClcData; bFirst: int); cdecl;

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

     pfnSetGroupChildCheckboxes         : procedure (var group:TClcGroup; checked:int); cdecl;

-    pfnInvalidateItem                  : procedure (hwnd:HWND; var dat:TClcData; iItem:int); cdecl;

+    blablablabla4                      : procedure; cdecl;

 

     pfnGetRowBottomY                   : function (var dat:TClcData; item:int):int; cdecl;

     pfnGetRowHeight                    : function (var dat:TClcData; item:int):int; cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 1e9e7de62e..0dfb893124 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -47,22 +47,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define MAX_TIP_SIZE 2048

 

-#define INTM_NAMECHANGED     (WM_USER+10)

-#define INTM_ICONCHANGED     (WM_USER+11)

-#define INTM_GROUPCHANGED    (WM_USER+12)

-#define INTM_GROUPSCHANGED   (WM_USER+13)

-#define INTM_CONTACTADDED    (WM_USER+14)

-#define INTM_CONTACTDELETED  (WM_USER+15)

-#define INTM_HIDDENCHANGED   (WM_USER+16)

-#define INTM_INVALIDATE      (WM_USER+17)

+#define INTM_NAMECHANGED         (WM_USER+10)

+#define INTM_ICONCHANGED         (WM_USER+11)

+#define INTM_GROUPCHANGED        (WM_USER+12)

+#define INTM_GROUPSCHANGED       (WM_USER+13)

+#define INTM_CONTACTADDED        (WM_USER+14)

+#define INTM_CONTACTDELETED      (WM_USER+15)

+#define INTM_HIDDENCHANGED       (WM_USER+16)

+#define INTM_INVALIDATE          (WM_USER+17)

 #define INTM_APPARENTMODECHANGED (WM_USER+18)

 #define INTM_SETINFOTIPHOVERTIME (WM_USER+19)

-#define INTM_NOTONLISTCHANGED   (WM_USER+20)

-#define INTM_RELOADOPTIONS   (WM_USER+21)

-#define INTM_NAMEORDERCHANGED (WM_USER+22)

+#define INTM_NOTONLISTCHANGED    (WM_USER+20)

+#define INTM_RELOADOPTIONS       (WM_USER+21)

+#define INTM_NAMEORDERCHANGED    (WM_USER+22)

 #define INTM_IDLECHANGED         (WM_USER+23)

-#define INTM_SCROLLBARCHANGED (WM_USER+24)

-#define INTM_PROTOCHANGED (WM_USER+25)

+#define INTM_SCROLLBARCHANGED    (WM_USER+24)

+#define INTM_PROTOCHANGED        (WM_USER+25)

 

 #define TIMERID_RENAME           10

 #define TIMERID_DRAGAUTOSCROLL   11

@@ -197,25 +197,25 @@ struct MenuProto
 /////////////////////////////////////////////////////////////////////////////////////////

 // constants

 

-#define DRAGSTAGE_NOTMOVED  0

-#define DRAGSTAGE_ACTIVE    1

-#define DRAGSTAGEM_STAGE    0x00FF

-#define DRAGSTAGEF_MAYBERENAME  0x8000

-#define DRAGSTAGEF_OUTSIDE      0x4000

-

-#define CONTACTF_ONLINE    1

-#define CONTACTF_INVISTO   2

-#define CONTACTF_VISTO     4

-#define CONTACTF_NOTONLIST 8

-#define CONTACTF_CHECKED   16

-#define CONTACTF_IDLE      32

-

-#define DROPTARGET_OUTSIDE    0

-#define DROPTARGET_ONSELF     1

-#define DROPTARGET_ONNOTHING  2

-#define DROPTARGET_ONGROUP    3

-#define DROPTARGET_ONCONTACT  4

-#define DROPTARGET_INSERTION  5

+#define DRAGSTAGE_NOTMOVED       0

+#define DRAGSTAGE_ACTIVE         1

+#define DRAGSTAGEM_STAGE         0x00FF

+#define DRAGSTAGEF_MAYBERENAME   0x8000

+#define DRAGSTAGEF_OUTSIDE       0x4000

+

+#define CONTACTF_ONLINE          1

+#define CONTACTF_INVISTO         2

+#define CONTACTF_VISTO           4

+#define CONTACTF_NOTONLIST       8

+#define CONTACTF_CHECKED         16

+#define CONTACTF_IDLE            32

+

+#define DROPTARGET_OUTSIDE       0

+#define DROPTARGET_ONSELF        1

+#define DROPTARGET_ONNOTHING     2

+#define DROPTARGET_ONGROUP       3

+#define DROPTARGET_ONCONTACT     4

+#define DROPTARGET_INSERTION     5

 

 #define CLCDEFAULT_ROWHEIGHT     16

 #define CLCDEFAULT_EXSTYLE       (CLS_EX_EDITLABELS|CLS_EX_TRACKSELECT|CLS_EX_SHOWGROUPCOUNTS|CLS_EX_HIDECOUNTSWHENEMPTY|CLS_EX_TRACKSELECT|CLS_EX_NOTRANSLUCENTSEL)  //plus CLS_EX_NOSMOOTHSCROLL is got from the system

@@ -257,6 +257,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon,
 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_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(int)  Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);

@@ -367,12 +368,12 @@ struct CLIST_INTERFACE
 	void           (*pfnHideInfoTip)(HWND hwnd, ClcData *dat);

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

 	DWORD          (*pfnGetDefaultExStyle)(void);

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

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

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

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

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

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

 	void           (*pfnSetGroupChildCheckboxes)(ClcGroup *group, int checked);

-	void           (*pfnInvalidateItem)(HWND hwnd, ClcData *dat, int iItem);

+	void           (*blablablabla4)();

 				      

 	int            (*pfnGetRowBottomY)(ClcData *dat, int item);

 	int            (*pfnGetRowHeight)(ClcData *dat, int item);

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index f34a6bc793..1cc983dd47 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 a482412915..0a3d15d6cb 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 9ac6cb147c..33348b0a71 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -679,7 +679,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 		int io = dat->iHotTrack;

 		dat->iHotTrack = 0;

 		if (dat->exStyle & CLS_EX_TRACKSELECT)

-			pcli->pfnInvalidateItem(hwnd, dat, io);

+			Clist_InvalidateItem(hwnd, dat, io);

 

 		if (k && GetCapture() == hwnd)

 			SendMessage(GetParent(hwnd), WM_PARENTNOTIFY, WM_LBUTTONDOWN, lParam);

@@ -814,7 +814,7 @@ static LRESULT clcOnCaptureChanged(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM
 			int i;

 			i = dat->iHotTrack;

 			dat->iHotTrack = -1;

-			pcli->pfnInvalidateItem(hwnd, dat, i);

+			Clist_InvalidateItem(hwnd, dat, i);

 			pcli->pfnHideInfoTip(hwnd, dat);

 		}

 	}

@@ -888,8 +888,8 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 				ReleaseCapture();

 

 			if (dat->exStyle & CLS_EX_TRACKSELECT) {

-				pcli->pfnInvalidateItem(hwnd, dat, iOldHotTrack);

-				pcli->pfnInvalidateItem(hwnd, dat, dat->iHotTrack);

+				Clist_InvalidateItem(hwnd, dat, iOldHotTrack);

+				Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 			}

 

 			pcli->pfnHideInfoTip(hwnd, dat);

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index 063a41c14b..569fcb660b 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -120,7 +120,7 @@ void cliScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth)
 	int maxy, previousy;

 

 	if (dat->iHotTrack != -1 && dat->yScroll != desty) {

-		pcli->pfnInvalidateItem(hwnd, dat, dat->iHotTrack);

+		Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 		dat->iHotTrack = -1;

 		ReleaseCapture();

 	}

diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp
index 92f2361c74..75f1c29c57 100644
--- a/plugins/Clist_nicer/src/clcutils.cpp
+++ b/plugins/Clist_nicer/src/clcutils.cpp
@@ -342,7 +342,7 @@ void ScrollTo(HWND hwnd, struct ClcData *dat, int desty, int noSmooth)
 	RECT clRect, rcInvalidate;

 

 	if (dat->iHotTrack != -1 && dat->yScroll != desty) {

-		pcli->pfnInvalidateItem(hwnd, dat, dat->iHotTrack);

+		Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 		dat->iHotTrack = -1;

 		ReleaseCapture();

 	}

diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index b6b78e9157..4b786cda53 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -984,8 +984,8 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 				else if (dat->iHotTrack == -1)

 					ReleaseCapture();

 				if (dat->exStyle & CLS_EX_TRACKSELECT) {

-					cli.pfnInvalidateItem(hwnd, dat, iOldHotTrack);

-					cli.pfnInvalidateItem(hwnd, dat, dat->iHotTrack);

+					Clist_InvalidateItem(hwnd, dat, iOldHotTrack);

+					Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 				}

 				cli.pfnHideInfoTip(hwnd, dat);

 			}

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 6a031f6e07..2925629a88 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -98,7 +98,6 @@ void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst);
 void fnRecalculateGroupCheckboxes(HWND hwnd, struct ClcData *dat);

 void fnSetGroupChildCheckboxes(ClcGroup *group, int checked);

 void fnSetContactCheckboxes(ClcContact *cc, int checked);

-void fnInvalidateItem(HWND hwnd, struct ClcData *dat, int iItem);

 

 DWORD fnGetDefaultExStyle(void);

 

diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index feb31fcf2b..0c04d08279 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -198,7 +198,7 @@ void fnScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth)
 	int oldy = dat->yScroll;

 

 	if (dat->iHotTrack != -1 && dat->yScroll != desty) {

-		cli.pfnInvalidateItem(hwnd, dat, dat->iHotTrack);

+		Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 		dat->iHotTrack = -1;

 		ReleaseCapture();

 	}

@@ -847,7 +847,7 @@ void fnSetGroupChildCheckboxes(ClcGroup *group, int checked)
 	}

 }

 

-void fnInvalidateItem(HWND hwnd, ClcData *dat, int iItem)

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

 {

 	if (iItem == -1)

 		return;

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 4d846c0ece..ea02d17230 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -116,7 +116,6 @@ void InitClistCore()
 	cli.pfnLoadClcOptions = fnLoadClcOptions;

 	cli.pfnRecalculateGroupCheckboxes = fnRecalculateGroupCheckboxes;

 	cli.pfnSetGroupChildCheckboxes = fnSetGroupChildCheckboxes;

-	cli.pfnInvalidateItem = fnInvalidateItem;

 	cli.pfnGetRowBottomY = fnGetRowBottomY;

 	cli.pfnGetRowHeight = fnGetRowHeight;

 	cli.pfnGetRowTopY = fnGetRowTopY;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 37d849b6a3..674af31044 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -557,3 +557,4 @@ Clist_TraySetTimer @576
 Clist_GetContactDisplayName @577

 Clist_GetCacheEntry @578

 Clist_EventsProcessTrayDoubleClick @579

+Clist_InvalidateItem @580

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 9721b041c1..8671a4d445 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -557,3 +557,4 @@ Clist_TraySetTimer @576
 Clist_GetContactDisplayName @577

 Clist_GetCacheEntry @578

 Clist_EventsProcessTrayDoubleClick @579

+Clist_InvalidateItem @580