From 680873487c4a7987012606119a744e5ca725ad30 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 13 Apr 2019 20:22:59 +0300 Subject: merge with trunk --- plugins/UserInfoEx/src/ctrl_contact.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/UserInfoEx/src/ctrl_contact.h') diff --git a/plugins/UserInfoEx/src/ctrl_contact.h b/plugins/UserInfoEx/src/ctrl_contact.h index 6216035542..df3e9f8858 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.h +++ b/plugins/UserInfoEx/src/ctrl_contact.h @@ -54,23 +54,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CBEXIF_SMS (CTRLF_FIRST * 2) #define CBEXIF_DELETED (CTRLF_FIRST * 4) -typedef struct TComboExItem +struct CBEXITEM { - WORD wMask; // determines which element of this structure is valid - WORD wFlags; // standard control flags - int iItem; // position of the item in the data array - DWORD dwID; // unique number for each setting read from db to identify it, new entries have dwID = 0 - LPTSTR pszCat; // pointer to a descriptive category string to set or retrieve for the data entry - WORD ccCat; - LPTSTR pszVal; - WORD ccVal; - LPCSTR pszIcon; -} CBEXITEM, *LPCBEXITEM; + WORD wMask; // determines which element of this structure is valid + WORD wFlags; // standard control flags + int iItem; // position of the item in the data array + DWORD dwID; // unique number for each setting read from db to identify it, new entries have dwID = 0 + LPTSTR pszCat; // pointer to a descriptive category string to set or retrieve for the data entry + WORD ccCat; + LPTSTR pszVal; + WORD ccVal; + int iIcon; +}; int CtrlContactLoadModule(); int CtrlContactUnLoadModule(); -int CtrlContactAddItemFromDB(HWND hCtrl, LPCSTR szIcon, LPTSTR szItem, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szSettingVal); -int CtrlContactAddMyItemsFromDB(HWND hCtrl, LPCSTR szIcon, WORD wForcedFlags, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szFormatCat, LPCSTR szFormatVal); +int CtrlContactAddItemFromDB(HWND hCtrl, int iIcon, LPTSTR szItem, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szSettingVal); +int CtrlContactAddMyItemsFromDB(HWND hCtrl, int iIcon, WORD wForcedFlags, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szFormatCat, LPCSTR szFormatVal); int CtrlContactWriteItemToDB(HWND hCtrl, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR pszSetting); int CtrlContactWriteMyItemsToDB(HWND hCtrl, int iFirstItem, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szFormatCat, LPCSTR szFormatVal); -- cgit v1.2.3