* Apply Phil Krylov patches.

2001-01-19  Phil Krylov  <phil@mail.ru>
	* include/commctrl.h: (HDI_IMAGE) New definition.
	(HDI_DI_SETITEM) Ditto.
	(HDI_ORDER) Ditto.
	(HDI_FILTER) Ditto.
	(HDF_BITMAP_ON_RIGHT) Ditto.
	(HDF_IMAGE) Ditto.
	(HDM_SETORDERARRAY) Ditto.
	(Header_SetOrderArray) Ditto.
	(ICC_BAR_CLASSES) Ditto.
	(struct _HD_ITEMA) Change definition.
	(struct _HD_ITEMW) Ditto.
	(struct tagINITCOMMONCONTROLSEX) Enclose in _WIN32_IE braces.
	(InitCommonControlsEx()) Ditto.
	2001-01-23  Phil Krylov  <phil@mail.ru>
	* include/richedit.h: Many Richedit 2.0 definitions.
This commit is contained in:
Earnie Boyd 2001-01-30 15:47:41 +00:00
parent aaee3363f6
commit 9cf3d9cbb5
3 changed files with 104 additions and 0 deletions

View File

@ -1,4 +1,24 @@
Tue Jan 30 10:42:28 2001 Earnie Boyd <earnie@users.sourceforge.net>
* Apply Phil Krylov patches.
2001-01-19 Phil Krylov <phil@mail.ru>
* include/commctrl.h: (HDI_IMAGE) New definition.
(HDI_DI_SETITEM) Ditto.
(HDI_ORDER) Ditto.
(HDI_FILTER) Ditto.
(HDF_BITMAP_ON_RIGHT) Ditto.
(HDF_IMAGE) Ditto.
(HDM_SETORDERARRAY) Ditto.
(Header_SetOrderArray) Ditto.
(ICC_BAR_CLASSES) Ditto.
(struct _HD_ITEMA) Change definition.
(struct _HD_ITEMW) Ditto.
(struct tagINITCOMMONCONTROLSEX) Enclose in _WIN32_IE braces.
(InitCommonControlsEx()) Ditto.
2001-01-23 Phil Krylov <phil@mail.ru>
* include/richedit.h: Many Richedit 2.0 definitions.
Tue Jan 30 09:56:50 2001 Earnie Boyd <earnie@users.sourceforge.net>
* include/winuser.h: (IDC_HAND) New resource identifier.

View File

@ -148,6 +148,14 @@ extern "C" {
#define HDI_FORMAT 4
#define HDI_LPARAM 8
#define HDI_BITMAP 16
#if (_WIN32_IE >= 0x0300)
#define HDI_IMAGE 32
#define HDI_DI_SETITEM 64
#define HDI_ORDER 128
#endif
#if (_WIN32_IE >= 0x0500)
#define HDI_FILTER 256
#endif
#define HDF_LEFT 0
#define HDF_RIGHT 1
#define HDF_CENTER 2
@ -156,6 +164,10 @@ extern "C" {
#define HDF_OWNERDRAW 0x8000
#define HDF_STRING 0x4000
#define HDF_BITMAP 0x2000
#if (_WIN32_IE >= 0x0300)
#define HDF_BITMAP_ON_RIGHT 0x1000
#define HDF_IMAGE 0x0800
#endif
#define HDM_GETITEMCOUNT HDM_FIRST
#define HDM_INSERTITEMA (HDM_FIRST+1)
#define HDM_INSERTITEMW (HDM_FIRST+10)
@ -165,6 +177,9 @@ extern "C" {
#define HDM_SETITEMA (HDM_FIRST+4)
#define HDM_SETITEMW (HDM_FIRST+12)
#define HDM_LAYOUT (HDM_FIRST+5)
#if (_WIN32_IE >= 0x0300)
#define HDM_SETORDERARRAY (HDM_FIRST+18)
#endif
#define HHT_NOWHERE 1
#define HHT_ONHEADER 2
#define HHT_ONDIVIDER 4
@ -810,6 +825,7 @@ extern "C" {
#define CCM_GETUNICODEFORMAT 8198
#define ICC_LISTVIEW_CLASSES 1
#define ICC_TREEVIEW_CLASSES 2
#define ICC_BAR_CLASSES 4
#define ICC_TAB_CLASSES 8
#define ICC_UPDOWN_CLASS 16
#define ICC_PROGRESS_CLASS 32
@ -1064,6 +1080,14 @@ typedef struct _HD_ITEMA {
int cchTextMax;
int fmt;
LPARAM lParam;
#if (_WIN32_IE >= 0x0300)
int iImage;
int iOrder;
#endif
#if (_WIN32_IE >= 0x0500)
UINT type;
LPVOID pvFilter;
#endif
} HD_ITEMA;
typedef struct _HD_ITEMW {
UINT mask;
@ -1073,6 +1097,14 @@ typedef struct _HD_ITEMW {
int cchTextMax;
int fmt;
LPARAM lParam;
#if (_WIN32_IE >= 0x0300)
int iImage;
int iOrder;
#endif
#if (_WIN32_IE >= 0x0500)
UINT type;
LPVOID pvFilter;
#endif
} HD_ITEMW;
typedef struct _HD_LAYOUT {
RECT *prc;
@ -1402,10 +1434,12 @@ typedef struct _TC_KEYDOWN {
WORD wVKey;
UINT flags;
} TC_KEYDOWN;
#if (_WIN32_IE >= 0x0300)
typedef struct tagINITCOMMONCONTROLSEX {
DWORD dwSize;
DWORD dwICC;
} INITCOMMONCONTROLSEX,*LPINITCOMMONCONTROLSEX;
#endif
typedef struct tagPBRANGE {
int iLow;
int iHigh;
@ -1591,6 +1625,9 @@ void WINAPI GetEffectiveClientRect(HWND,LPRECT,LPINT);
#define Header_GetItem(w,i,phdi) (BOOL)SendMessage((w),HDM_GETITEM,(WPARAM)(int)(i),(LPARAM)(HD_ITEM*)(phdi))
#define Header_SetItem(w,i,phdi) (BOOL)SendMessage((w),HDM_SETITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM*)(phdi))
#define Header_Layout(w,l) (BOOL)SendMessage((w),HDM_LAYOUT,0,(LPARAM)(HD_LAYOUT*)(l))
#if (_WIN32_IE >= 0x0300)
#define Header_SetOrderArray(w,l,a) (BOOL)SendMessage((w),HDM_SETORDERARRAY,(WPARAM)(l),(LPARAM)(a))
#endif
int WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
#define ImageList_AddIcon(l,i) ImageList_ReplaceIcon(l,-1,i)
int WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
@ -1628,7 +1665,9 @@ HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
BOOL WINAPI ImageList_Write(HIMAGELIST,LPSTREAM);
#endif
void WINAPI InitCommonControls(void);
#if (_WIN32_IE >= 0x0300)
BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX);
#endif
WINBOOL WINAPI ImageList_DragShowNolock(BOOL);
int WINAPI LBItemFromPt(HWND,POINT,BOOL);
#define ListView_GetBkColor(w) (COLORREF)SendMessage((w),LVM_GETBKCOLOR,0,0)

View File

@ -5,6 +5,7 @@ extern "C" {
#endif
#pragma pack(push,4)
#define RICHEDIT_CLASS "RichEdit20A"
#define CF_RTF TEXT("Rich Text Format")
#define CF_RTFNOOBJS TEXT("Rich Text Format Without Objects")
#define CF_RETEXTOBJ TEXT("RichEdit Text and Objects")
@ -13,17 +14,23 @@ extern "C" {
#define CFM_UNDERLINE 4
#define CFM_STRIKEOUT 8
#define CFM_PROTECTED 16
#define CFM_LINK 32
#define CFM_SIZE 0x80000000
#define CFM_COLOR 0x40000000
#define CFM_FACE 0x20000000
#define CFM_OFFSET 0x10000000
#define CFM_CHARSET 0x08000000
#define CFM_SUBSCRIPT 0x00030000
#define CFM_SUPERSCRIPT 0x00030000
#define CFM_EFFECTS (CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_COLOR | CFM_STRIKEOUT | CFE_PROTECTED | CFM_LINK)
#define CFE_BOLD 1
#define CFE_ITALIC 2
#define CFE_UNDERLINE 4
#define CFE_STRIKEOUT 8
#define CFE_PROTECTED 16
#define CFE_AUTOCOLOR 0x40000000
#define CFE_SUBSCRIPT 0x00010000
#define CFE_SUPERSCRIPT 0x00020000
#define IMF_FORCENONE 1
#define IMF_FORCEENABLE 2
#define IMF_FORCEDISABLE 4
@ -53,6 +60,13 @@ extern "C" {
#define SF_RTF 2
#define SF_RTFNOOBJS 3
#define SF_TEXTIZED 4
#define SF_UNICODE 16
#define SF_USECODEPAGE 32
#define SF_NCRFORNONASCII 64
#define SF_RTFVAL 0x0700
#define SFF_PWD 0x0800
#define SFF_KEEPDOCINFO 0x1000
#define SFF_PERSISTVIEWSCALE 0x2000
#define SFF_PLAINRTF 0x4000
#define SFF_SELECTION 0x8000
#define WB_CLASSIFY 3
@ -110,6 +124,23 @@ extern "C" {
#define EM_FINDTEXTEX (WM_USER+79)
#define EM_GETWORDBREAKPROCEX (WM_USER+80)
#define EM_SETWORDBREAKPROCEX (WM_USER+81)
/* RichEdit 2.0 messages */
#define EM_SETUNDOLIMIT (WM_USER+82)
#define EM_REDO (WM_USER+84)
#define EM_CANREDO (WM_USER+85)
#define EM_GETUNDONAME (WM_USER+86)
#define EM_GETREDONAME (WM_USER+87)
#define EM_STOPGROUPTYPING (WM_USER+88)
#define EM_GETTEXTLENGTHEX (WM_USER+95)
#define EM_SETLANGOPTIONS (WM_USER+120)
#define EM_GETLANGOPTIONS (WM_USER+121)
#define EM_GETIMECOMPMODE (WM_USER+122)
#define EM_SETTYPOGRAPHYOPTIONS (WM_USER+202)
#define EM_GETTYPOGRAPHYOPTIONS (WM_USER+203)
#define EM_SETFONTSIZE (WM_USER+223)
#define EM_GETZOOM (WM_USER+224)
#define EM_SETZOOM (WM_USER+225)
#define EN_CORRECTTEXT 1797
#define EN_DROPFILES 1795
#define EN_IMECHANGE 1799
@ -329,6 +360,20 @@ typedef struct _punctuation {
LPSTR szPunctuation;
} PUNCTUATION;
typedef LONG (*EDITWORDBREAKPROCEX)(char*,LONG,BYTE,INT);
/* Defines for EM_SETTYPOGRAPHYOPTIONS */
#define TO_ADVANCEDTYPOGRAPHY 1
#define TO_SIMPLELINEBREAK 2
/* Defines for GETTEXTLENGTHEX */
#define GTL_DEFAULT 0
#define GTL_USECRLF 1
#define GTL_PRECISE 2
#define GTL_CLOSE 4
#define GTL_NUMCHARS 8
#define GTL_NUMBYTES 16
typedef struct _gettextlengthex {
DWORD flags;
UINT codepage;
} GETTEXTLENGTHEX;
#ifdef UNICODE
typedef CHARFORMATW CHARFORMAT;
typedef CHARFORMAT2W CHARFORMAT2;