From be26f8bde5d972651bdfcb56a97deb0519d35df2 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Mon, 27 Dec 2010 20:31:59 +0000 Subject: [PATCH] 2010-10-20 Seth Jackson * include/commctrl.h (TC_ITEMHEADER[AW]): Rename to TCITEMHEADER[AW]. Add defines for backward compatibility. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/commctrl.h | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index cc42cc1d0..365e40e42 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2010-10-20 Seth Jackson + + * include/commctrl.h (TC_ITEMHEADER[AW]): Rename to TCITEMHEADER[AW]. + Add defines for backward compatibility. + 2010-12-27 Johann Hanne * include/oaidl.h (GetTypeComp, GetTypeComp, IsMatchingType): Fix defintion. diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index 05353ee36..f67c2f56b 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -2712,22 +2712,24 @@ typedef struct _TV_KEYDOWN { WORD wVKey; UINT flags; } TV_KEYDOWN; -typedef struct _TC_ITEMHEADERA { +typedef struct tagTCITEMHEADERA { UINT mask; UINT lpReserved1; UINT lpReserved2; LPSTR pszText; int cchTextMax; int iImage; -} TC_ITEMHEADERA; -typedef struct _TC_ITEMHEADERW { +} TCITEMHEADERA, *LPTCITEMHEADERA; +#define TC_ITEMHEADERA TCITEMHEADERA +typedef struct tagTCITEMHEADERW { UINT mask; UINT lpReserved1; UINT lpReserved2; LPWSTR pszText; int cchTextMax; int iImage; -} TC_ITEMHEADERW; +} TCITEMHEADERW, *LPTCITEMHEADERW; +#define TC_ITEMHEADERW TCITEMHEADERW typedef struct tagTCITEMA { UINT mask; #if (_WIN32_IE >= 0x0300) @@ -3530,6 +3532,8 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO; #define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW #define TVN_ENDLABELEDIT TVN_ENDLABELEDITW #define TC_ITEMHEADER TC_ITEMHEADERW +#define TCITEMHEADER TCITEMHEADERW +#define LPTCITEMHEADER LPTCITEMHEADERW #define TC_ITEM TC_ITEMW #define TCITEM TCITEMW #define LPTCITEM LPTCITEMW @@ -3706,6 +3710,8 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO; #define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITA #define TVN_ENDLABELEDIT TVN_ENDLABELEDITA #define TC_ITEMHEADER TC_ITEMHEADERA +#define TCITEMHEADER TCITEMHEADERA +#define LPTCITEMHEADER LPTCITEMHEADERA #define TC_ITEM TC_ITEMA #define TCITEM TCITEMA #define LPTCITEM LPTCITEMA