From 37e1f0cb88e2344c288064b7d88963ba7ea26955 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 14 Jun 2012 17:17:39 +0000
Subject: - clists' menus compatibility issues; - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@412 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/m_clist.h    | 2 ++
 include/m_clistint.h | 9 +++++----
 include/m_genmenu.h  | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/m_clist.h b/include/m_clist.h
index 2417932122..40288608e5 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -117,6 +117,8 @@ typedef struct {
 }
 	CLISTMENUITEM;
 
+#define CLISTMENUITEM_OLDSIZE_V1 (offsetof(CLISTMENUITEM,hLangpack))
+
 #define HGENMENU_ROOT      (( HGENMENU )-1)
 
 #define CMIF_GRAYED     1
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 8f58397b8e..625289d709 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -220,7 +220,7 @@ typedef struct
 	int    ( *pfnGetRowsPriorTo )( struct ClcGroup *group, struct ClcGroup *subgroup, int contactIndex );
 	int    ( *pfnFindItem )( HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, struct ClcGroup **subgroup, int *isVisible );
 	int    ( *pfnGetRowByIndex )( struct ClcData *dat, int testindex, struct ClcContact **contact, struct ClcGroup **subgroup );
-   HANDLE ( *pfnContactToHItem )( struct ClcContact* contact );
+	HANDLE ( *pfnContactToHItem )( struct ClcContact* contact );
 	HANDLE ( *pfnContactToItemHandle )( struct ClcContact * contact, DWORD * nmFlags );
 
 	/* clcitems.c */
@@ -262,7 +262,7 @@ typedef struct
 	void  ( *pfnCalcEipPosition )( struct ClcData *dat, struct ClcContact *contact, struct ClcGroup *group, POINT *result);
 	int   ( *pfnGetDropTargetInformation )( HWND hwnd, struct ClcData *dat, POINT pt );
 	int   ( *pfnClcStatusToPf2 )( int status );
-   int   ( *pfnIsHiddenMode )( struct ClcData *dat, int status );
+	int   ( *pfnIsHiddenMode )( struct ClcData *dat, int status );
 	void  ( *pfnHideInfoTip )( HWND hwnd, struct ClcData *dat );
 	void  ( *pfnNotifyNewContact )( HWND hwnd, HANDLE hContact );
 	DWORD ( *pfnGetDefaultExStyle )( void );
@@ -327,7 +327,7 @@ typedef struct
 
 	/* group.c */
 	TCHAR* ( *pfnGetGroupName )( int idx, DWORD* pdwFlags );
-   int    ( *pfnRenameGroup )( int groupID, TCHAR* newName );
+	int    ( *pfnRenameGroup )( int groupID, TCHAR* newName );
 
 	/* keyboard.c */
 	int   ( *pfnHotKeysRegister )( HWND hwnd );
@@ -382,7 +382,7 @@ typedef struct
 	int      trayIconCount;
 	int      shellVersion;
 	UINT_PTR cycleTimerId;
-    int      cycleStep;
+	int      cycleStep;
 	TCHAR*   szTip;
 	BOOL     bTrayMenuOnScreen;
 
@@ -408,6 +408,7 @@ typedef struct
 	 * version 6 additions (0.8.0.x) - accounts
 	 *************************************************************************************/
 	int    ( *pfnGetAccountIndexByPos )( int pos );
+	int    ( *pfnConvertMenu )( CLISTMENUITEM*, TMO_MenuItem* );
 }
 	CLIST_INTERFACE;
 
diff --git a/include/m_genmenu.h b/include/m_genmenu.h
index c0d20fc9f1..8c181912a8 100644
--- a/include/m_genmenu.h
+++ b/include/m_genmenu.h
@@ -233,6 +233,7 @@ typedef struct
 	};
 	DWORD hotKey;
 	void *ownerdata;
+	int   hLangpack;
 }
 	TMO_MenuItem,*PMO_MenuItem;
 
-- 
cgit v1.2.3