diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-03-13 23:00:16 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-03-13 23:00:16 +0300 |
| commit | 5289f34254d5ca894cb0ccf6a0834b4d0a5f1e58 (patch) | |
| tree | 3b2acbf059a954f951e5469b8e1bd2416bccca2c /winsup | |
| parent | 73ea29f42ce627a42e646c1256b2dd31b51a0afc (diff) | |
* 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.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/basetyps.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/richedit.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 4489891fc..3f5f3942f 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -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 diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h index a7bf0dfc1..e1e36501b 100644 --- a/winsup/w32api/include/basetyps.h +++ b/winsup/w32api/include/basetyps.h @@ -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& diff --git a/winsup/w32api/include/richedit.h b/winsup/w32api/include/richedit.h index bafc1e2a8..58acceaf5 100644 --- a/winsup/w32api/include/richedit.h +++ b/winsup/w32api/include/richedit.h @@ -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") diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 2be75cb80..9a3d045e3 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -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; |