Menu
▾
▴
[MinGW-cvs] CVS: w32api/include commctrl.h,1.5,1.6 winbase.h,1.7,1.8 winuser.h,1.8,1.9
|
From: Danny S. <dan...@us...> - 2001-12-11 20:38:06
|
Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv3747/w32api/include
Modified Files:
commctrl.h winbase.h winuser.h
Log Message:
* include/commctrl.h (ACS_*): Add new defines.
(PGS_*): Ditto.
(CBES_*): Ditto.
(TBSTYLE_*): Ditto.
(TB_*): Ditto.
(TTS_*): Ditto.
(UDS_HOTTRACK): Add define.
(SBT_TOOLTIPS): Ditto.
(TBS_*): Add new defines.
(HDS_*): Ditto.
(LVS_EX_*) Ditto.
(LVKF_*): Ditto.
(TCM_GETEXTENDEDSTYLE): Add define.
(TVS_NOHSCROLL): Ditto.
(TVIF_INTEGRAL): Ditto.
(DTS_SHORTDATECENTURYFORMAT): Ditto.
(TCS_*): Add new defines.
(CBEM_*): Add defines.
(tagNMITEMACTIVATE): Add structure definition and typedefs.
(tagTVITEMEX[AW]: Ditto.
(tagTVINSERTSTRUCT[AW]: Add union member.
* include/winbase.h (VirtualAllocEx): Add prototype.
* include/winuser.h (SS_*): Add new defines.
Index: commctrl.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/commctrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** commctrl.h 2001/09/16 21:19:42 1.5
--- commctrl.h 2001/12/11 20:38:04 1.6
***************
*** 73,76 ****
--- 73,84 ----
#define CCS_RIGHT 131
#endif
+ #define ACS_CENTER 0x0001
+ #define ACS_TRANSPARENT 0x0002
+ #define ACS_AUTOPLAY 0x0004
+ #define ACS_TIMER 0x0008
+ #define PGS_VERT 0x00000000
+ #define PGS_HORZ 0x00000001
+ #define PGS_AUTOSCROLL 0x00000002
+ #define PGS_DRAGNDROP 0x00000004
#define CMB_MASKED 2
#define MINSYSCOMMAND SC_SIZE
***************
*** 154,157 ****
--- 162,172 ----
#define HDI_ORDER 128
#endif
+ #define CBES_EX_NOEDITIMAGE 0x00000001
+ #define CBES_EX_NOEDITIMAGEINDENT 0x00000002
+ #define CBES_EX_PATHWORDBREAKPROC 0x00000004
+ #if (_WIN32_IE >= 0x0400)
+ #define CBES_EX_NOSIZELIMIT 0x00000008
+ #define CBES_EX_CASESENSITIVE 0x00000010
+ #endif /* _WIN32_IE >= 0x0400 */
#if (_WIN32_IE >= 0x0500)
#define HDI_FILTER 256
***************
*** 227,230 ****
--- 242,250 ----
#define TBSTYLE_CUSTOMERASE 8192
#endif
+ #if (_WIN32_IE >= 0x0400)
+ #define TBSTYLE_REGISTERDROP 0x4000
+ #define TBSTYLE_TRANSPARENT 0x8000
+ #define TBSTYLE_EX_DRAWDDARROWS 0x00000001
+ #endif /* _WIN32_IE >= 0x0400 */
#define TB_ENABLEBUTTON (WM_USER+1)
#define TB_CHECKBUTTON (WM_USER+2)
***************
*** 303,307 ****
#define TB_GETBITMAPFLAGS (WM_USER+41)
#if _WIN32_IE >= 0x400
! #define TB_SETBUTTONINFO (WM_USER+66)
#endif
#define TBN_GETBUTTONINFOA (TBN_FIRST-0)
--- 323,329 ----
#define TB_GETBITMAPFLAGS (WM_USER+41)
#if _WIN32_IE >= 0x400
! #define TB_SETBUTTONINFO (WM_USER+66)
! #define TB_SETEXTENDEDSTYLE (WM_USER+84)
! #define TB_GETEXTENDEDSTYLE (WM_USER+85)
#endif
#define TBN_GETBUTTONINFOA (TBN_FIRST-0)
***************
*** 318,321 ****
--- 340,349 ----
#define TTS_ALWAYSTIP 1
#define TTS_NOPREFIX 2
+ #if( _WIN32_IE >= 0x0500 )
+ #define TTS_NOANIMATE 0x10
+ #define TTS_NOFADE 0x20
+ #define TTS_BALLOON 0x40
+ #define TTS_CLOSE 0x80
+ #endif /* _WIN32_IE >= 0x0500 */
#define TTF_IDISHWND 1
#define TTF_CENTERTIP 2
***************
*** 383,386 ****
--- 411,417 ----
#define UDS_HORZ 64
#define UDS_NOTHOUSANDS 128
+ #if ( _WIN32_IE >= 0x0300 )
+ #define UDS_HOTTRACK 0x0100
+ #endif /* _WIN32_IE >= 0x0300 */
#define UDM_SETRANGE (WM_USER+101)
#define UDM_GETRANGE (WM_USER+102)
***************
*** 409,412 ****
--- 440,446 ----
#define SBT_POPOUT 512
#define SBT_RTLREADING 1024
+ #if( _WIN32_IE >= 0x0400 )
+ #define SBT_TOOLTIPS 0x0800
+ #endif /* _WIN32_IE >= 0x0400 */
#define TBS_AUTOTICKS 1
#define TBS_VERT 2
***************
*** 421,424 ****
--- 455,460 ----
#define TBS_FIXEDLENGTH 64
#define TBS_NOTHUMB 128
+ #define TBS_TOOLTIPS 0x0100
+ #define TBS_REVERSED 0x0200
#if _WIN32_IE >= 0x400
#define TBIF_BYINDEX -2147483648
***************
*** 517,520 ****
--- 553,560 ----
#define LVS_NOSORTHEADER 0x8000
#if (_WIN32_IE >= 0x0300)
+ #define HDS_HOTTRACK 0x0004
+ #define HDS_DRAGDROP 0x0040
+ #define HDS_FULLDRAG 0x0080
+ #define HDS_FILTERBAR 0x0100
/* FIXME: missing CDIS_INDETERMINATE,CDIS_MARKED,
CDDS_SUBITEM, CDRF_NOTIFYSUBITEMDRAW */
***************
*** 551,555 ****
#define LVS_EX_TRACKSELECT 8
#define LVS_EX_TWOCLICKACTIVATE 128
! #endif
#define LVSIL_NORMAL 0
#define LVSIL_SMALL 1
--- 591,607 ----
#define LVS_EX_TRACKSELECT 8
#define LVS_EX_TWOCLICKACTIVATE 128
! #if( _WIN32_IE >= 0x0400 )
! #define LVS_EX_FLATSB 0x00000100
! #define LVS_EX_REGIONAL 0x00000200
! #define LVS_EX_INFOTIP 0x00000400
! #define LVS_EX_UNDERLINEHOT 0x00000800
! #define LVS_EX_UNDERLINECOLD 0x00001000
! #define LVS_EX_MULTIWORKAREAS 0x00002000
! #endif /* _WIN32_IE >=0x0400 */
! #if( _WIN32_IE >= 0x0500 )
! #define LVS_EX_LABELTIP 0x00004000
! #define LVS_EX_BORDERSELECT 0x00008000
! #endif /* _WIN32_IE >= 0x0500 */
! #endif /* _WIN32_IE >= 0x0300 */
#define LVSIL_NORMAL 0
#define LVSIL_SMALL 1
***************
*** 715,718 ****
--- 767,775 ----
#define LVN_SETDISPINFOW (LVN_FIRST-78)
#define LVN_KEYDOWN (LVN_FIRST-55)
+ #if (_WIN32_IE >= 0x0400)
+ #define LVKF_ALT 0x0001
+ #define LVKF_CONTROL 0x0002
+ #define LVKF_SHIFT 0x0004
+ #endif
#define TVS_HASBUTTONS 1
#define TVS_HASLINES 2
***************
*** 734,737 ****
--- 791,797 ----
#define TVS_SINGLEEXPAND 1024
#endif
+ #if( _WIN32_IE >= 0x0500 )
+ #define TVS_NOHSCROLL 0x8000
+ #endif /* _WIN32_IE >= 0x0500 */
#define TVIF_TEXT 1
#define TVIF_IMAGE 2
***************
*** 741,744 ****
--- 801,807 ----
#define TVIF_SELECTEDIMAGE 32
#define TVIF_CHILDREN 64
+ #if (_WIN32_IE >= 0x0400)
+ #define TVIF_INTEGRAL 0x0080
+ #endif /* _WIN32_IE >= 0x0400 */
#define TVIS_FOCUSED 1
#define TVIS_SELECTED 2
***************
*** 875,880 ****
--- 938,950 ----
#define TCS_RIGHT 2
#define TCS_VERTICAL 128
+ #define TCS_SCROLLOPPOSITE 0x0001
#define TCS_HOTTRACK 0x0040
+ #define TCS_MULTISELECT 0x0004
#endif
+ #if( _WIN32_IE >= 0x0400 )
+ #define TCS_FLATBUTTONS 0x0008
+ #define TCS_EX_FLATSEPARATORS 0x00000001
+ #define TCS_EX_REGISTERDROP 0x00000002
+ #endif /* _WIN32_IE >= 0x0400 */
#define TCIF_TEXT 1
#define TCIF_IMAGE 2
***************
*** 907,910 ****
--- 977,981 ----
#define TCM_GETCURFOCUS (TCM_FIRST+47)
#define TCM_SETCURFOCUS (TCM_FIRST+48)
+ #define TCM_GETEXTENDEDSTYLE (TCM_FIRST + 53)
#define TCN_KEYDOWN TCN_FIRST
#define TCN_SELCHANGE (TCN_FIRST-1)
***************
*** 964,971 ****
#define DTS_APPCANPARSE 16
#define DTS_RIGHTALIGN 32
#define MCS_DAYSTATE 1
#define MCS_MULTISELECT 2
#define MCS_WEEKNUMBERS 4
! #define MCS_NOTODAY 8
#define DTM_GETSYSTEMTIME 0x1001
#define DTM_SETSYSTEMTIME 0x1002
--- 1035,1050 ----
#define DTS_APPCANPARSE 16
#define DTS_RIGHTALIGN 32
+ #if ( _WIN32_IE >= 0x500 )
+ #define DTS_SHORTDATECENTURYFORMAT 0x000C
+ #endif /* _WIN32_IE >= 0x500 */
#define MCS_DAYSTATE 1
#define MCS_MULTISELECT 2
#define MCS_WEEKNUMBERS 4
! #if (_WIN32_IE >= 0x0400)
! #define MCS_NOTODAYCIRCLE 0x0008
! #define MCS_NOTODAY 0x0010
! #else /* _WIN32_IE >= 0x0400 */
! #define MCS_NOTODAY 0x0008
! #endif /* _WIN32_IE >= 0x0400 */
#define DTM_GETSYSTEMTIME 0x1001
#define DTM_SETSYSTEMTIME 0x1002
***************
*** 1140,1143 ****
--- 1219,1242 ----
#define RB_GETBANDINFO (WM_USER+5)
#endif /* _WIN32_IE >= 0x0400 */
+ #define CBEM_INSERTITEMA (WM_USER + 1)
+ #define CBEM_SETIMAGELIST (WM_USER + 2)
+ #define CBEM_GETIMAGELIST (WM_USER + 3)
+ #define CBEM_GETITEMA (WM_USER + 4)
+ #define CBEM_SETITEMA (WM_USER + 5)
+ #define CBEM_DELETEITEM CB_DELETESTRING
+ #define CBEM_GETCOMBOCONTROL (WM_USER + 6)
+ #define CBEM_GETEDITCONTROL (WM_USER + 7)
+ #define CBEM_SETEXSTYLE (WM_USER + 8)
+ #define CBEM_GETEXSTYLE (WM_USER + 9)
+ #if (_WIN32_IE >= 0x0400)
+ #define CBEM_SETEXTENDEDSTYLE (WM_USER + 14)
+ #define CBEM_GETEXTENDEDSTYLE (WM_USER + 9)
+ #define CBEM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT
+ #define CBEM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT
+ #endif /* _WIN32_IE >= 0x0400 */
+ #define CBEM_HASEDITCHANGED (WM_USER + 10)
+ #define CBEM_INSERTITEMW (WM_USER + 11)
+ #define CBEM_SETITEMW (WM_USER + 12)
+ #define CBEM_GETITEMW (WM_USER + 13)
#ifndef RC_INVOKED
***************
*** 1311,1314 ****
--- 1410,1426 ----
#endif
} NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW;
+ #if (_WIN32_IE >= 0x400)
+ typedef struct tagNMITEMACTIVATE {
+ NMHDR hdr;
+ int iItem;
+ int iSubItem;
+ UINT uNewState;
+ UINT uOldState;
+ UINT uChanged;
+ POINT ptAction;
+ LPARAM lParam;
+ UINT uKeyFlags;
+ } NMITEMACTIVATE, *LPNMITEMACTIVATE;
+ #endif /* _WIN32_IE >= 0x0400 */
typedef struct tagTBADDBITMAP {
HINSTANCE hInst;
***************
*** 1547,1554 ****
--- 1659,1701 ----
#define TV_ITEMW TVITEMW
#define LPTV_ITEMW LPTVITEMW
+ #if (_WIN32_IE >= 0x0400)
+ typedef struct tagTVITEMEXA {
+ UINT mask;
+ HTREEITEM hItem;
+ UINT state;
+ UINT stateMask;
+ LPSTR pszText;
+ int cchTextMax;
+ int iImage;
+ int iSelectedImage;
+ int cChildren;
+ LPARAM lParam;
+ int iIntegral;
+ } TVITEMEXA, *LPTVITEMEXA;
+ typedef struct tagTVITEMEXW {
+ UINT mask;
+ HTREEITEM hItem;
+ UINT state;
+ UINT stateMask;
+ LPWSTR pszText;
+ int cchTextMax;
+ int iImage;
+ int iSelectedImage;
+ int cChildren;
+ LPARAM lParam;
+ int iIntegral;
+ } TVITEMEXW, *LPTVITEMEXW;
+ #endif /* _WIN32_IE >= 0x0400 */
typedef struct tagTVINSERTSTRUCTA {
HTREEITEM hParent;
HTREEITEM hInsertAfter;
+ #if (_WIN32_IE >= 0x0400)
+ _ANONYMOUS_UNION union {
+ TVITEMEXA itemex;
+ TV_ITEMA item;
+ } DUMMYUNIONNAME;
+ #else
TV_ITEMA item;
+ #endif
} TVINSERTSTRUCTA,*LPTVINSERTSTRUCTA;
#define _TV_INSERTSTRUCTA tagTVINSERTSTRUCTA
***************
*** 1558,1562 ****
--- 1705,1716 ----
HTREEITEM hParent;
HTREEITEM hInsertAfter;
+ #if (_WIN32_IE >= 0x0400)
+ _ANONYMOUS_UNION union {
+ TVITEMEXW itemex;
+ TV_ITEMW item;
+ } DUMMYUNIONNAME;
+ #else
TV_ITEMW item;
+ #endif
} TVINSERTSTRUCTW,*LPTVINSERTSTRUCTW;
#define _TV_INSERTSTRUCTW tagTVINSERTSTRUCTW
***************
*** 2103,2106 ****
--- 2257,2263 ----
typedef TV_ITEMW TV_ITEM,*LPTV_ITEM;
typedef TVITEMW TVITEM,*LPTVITEM;
+ #if (_WIN32_IE >= 0x0400)
+ typedef TVITEMEXW TVITEMEX,*LPTVITEMEX;
+ #endif
typedef TV_INSERTSTRUCTW TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
typedef TVINSERTSTRUCTW TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
***************
*** 2241,2244 ****
--- 2398,2404 ----
typedef TV_ITEMA TV_ITEM,*LPTV_ITEM;
typedef TVITEMA TVITEM,*LPTVITEM;
+ #if (_WIN32_IE >= 0x0400)
+ typedef TVITEMEXA TVITEMEX,*LPTVITEMEX;
+ #endif
typedef TV_INSERTSTRUCTA TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
typedef TVINSERTSTRUCTA TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
Index: winbase.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winbase.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** winbase.h 2001/12/04 13:08:59 1.7
--- winbase.h 2001/12/11 20:38:04 1.8
***************
*** 1531,1534 ****
--- 1531,1535 ----
BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG);
PVOID WINAPI VirtualAlloc(PVOID,DWORD,DWORD,DWORD);
+ PVOID WINAPI VirtualAllocEx(HANDLE,PVOID,DWORD,DWORD,DWORD);
BOOL WINAPI VirtualFree(PVOID,DWORD,DWORD);
BOOL WINAPI VirtualFreeEx(HANDLE,PVOID,DWORD,DWORD);
Index: winuser.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winuser.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** winuser.h 2001/12/04 14:38:19 1.8
--- winuser.h 2001/12/11 20:38:04 1.9
***************
*** 306,309 ****
--- 306,314 ----
#define SS_WHITERECT 6
#define SS_USERITEM 10
+ #define SS_TYPEMASK 0x0000001FL
+ #define SS_ENDELLIPSIS 0x00004000L
+ #define SS_PATHELLIPSIS 0x00008000L
+ #define SS_WORDELLIPSIS 0x0000C000L
+ #define SS_ELLIPSISMASK 0x0000C000L
#define DS_3DLOOK 4
#define DS_ABSALIGN 1
|