* include/richedit.h (RICHEDIT_CLASS): UNICODE it.
* include/shlobj.h (IContextMenu2): Put methods in right order. * include/basetyps.h (REFGUID, REFIID, REFCLSID): Check for CINTERFACE before defining.
This commit is contained in:
parent
73ea29f42c
commit
5289f34254
|
@ -1,3 +1,10 @@
|
|||
2002-03-14 Gunnar Degnbol <gdegnbol@users.sourceforge.net>
|
||||
|
||||
* include/richedit.h (RICHEDIT_CLASS): UNICODE it.
|
||||
* include/shlobj.h (IContextMenu2): Put methods in right order.
|
||||
* include/basetyps.h (REFGUID, REFIID, REFCLSID): Check for
|
||||
CINTERFACE before defining.
|
||||
|
||||
2002-03-09 Danny Smith <dannysmith@users.sourceforge.net>
|
||||
|
||||
* include/accctrl.h: Add #pragma GCC system_header
|
||||
|
|
|
@ -108,7 +108,7 @@ typedef unsigned long error_status_t;
|
|||
typedef unsigned long PROPID;
|
||||
|
||||
#ifndef _REFGUID_DEFINED
|
||||
#ifdef __cplusplus
|
||||
#if defined (__cplusplus) && !defined (CINTERFACE)
|
||||
#define REFGUID const GUID&
|
||||
#define REFIID const IID&
|
||||
#define REFCLSID const CLSID&
|
||||
|
|
|
@ -9,7 +9,11 @@ extern "C" {
|
|||
#endif
|
||||
#pragma pack(push,4)
|
||||
|
||||
#ifdef UNICODE
|
||||
#define RICHEDIT_CLASS L"RichEdit20W"
|
||||
#else
|
||||
#define RICHEDIT_CLASS "RichEdit20A"
|
||||
#endif
|
||||
#define CF_RTF TEXT("Rich Text Format")
|
||||
#define CF_RTFNOOBJS TEXT("Rich Text Format Without Objects")
|
||||
#define CF_RETEXTOBJ TEXT("RichEdit Text and Objects")
|
||||
|
|
|
@ -417,9 +417,9 @@ DECLARE_INTERFACE_(IContextMenu2,IUnknown)
|
|||
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
STDMETHOD(QueryContextMenu)(THIS_ HMENU,UINT,UINT,UINT,UINT) PURE;
|
||||
STDMETHOD(HandleMenuMsg)(THIS_ UINT,WPARAM,LPARAM) PURE;
|
||||
STDMETHOD(InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO) PURE;
|
||||
STDMETHOD(GetCommandString)(THIS_ UINT,UINT,PUINT,LPSTR,UINT) PURE;
|
||||
STDMETHOD(GetCommandString)(THIS_ UINT,UINT,PUINT,LPSTR,UINT) PURE;
|
||||
STDMETHOD(HandleMenuMsg)(THIS_ UINT,WPARAM,LPARAM) PURE;
|
||||
};
|
||||
typedef IContextMenu2 *LPCONTEXTMENU2;
|
||||
|
||||
|
|
Loading…
Reference in New Issue