diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-05-13 06:05:12 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-05-13 06:05:12 +0400 |
| commit | b823fca9ba6e05eb8382a7f9c765d7752ecb553d (patch) | |
| tree | 4ba904a24c981ac45423cf079bc12e9b98e46550 | |
| parent | a8833ac1ff740c9d03cdc0e8a3ae5a132a5d7d0b (diff) | |
* include/oleidl.h (LPENUMOLEDOCUMENTVIEWS): Remove typedef.
(IEnumOleDocumentViews): Remove commented out DECLARE_ENUMERATOR.
* include/docobj.h (LPENUMOLEDOCUMENTVIEWS): Add typedef (previously
commented out).
(IEnumOleDocumentViews): Add definition using DECLARE_ENUMERATOR.
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/docobj.h | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/oleidl.h | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 46c7852f6..c8adea6be 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2003-05-13 Danny Smith <dannysmith@users.sourceforge.net> + + * include/oleidl.h (LPENUMOLEDOCUMENTVIEWS): Remove typedef. + (IEnumOleDocumentViews): Remove commented out DECLARE_ENUMERATOR. + * include/docobj.h (LPENUMOLEDOCUMENTVIEWS): Add typedef (previously + commented out). + (IEnumOleDocumentViews): Add definition using DECLARE_ENUMERATOR. + 2003-05-12 Earnie Boyd <earnie@users.sf.net> * include/commctrl.h: (MCSC_BACKGROUND, MCSC_TEXT, MCSC_TITLEBK, diff --git a/winsup/w32api/include/docobj.h b/winsup/w32api/include/docobj.h index 0e16c6b90..27055dd84 100644 --- a/winsup/w32api/include/docobj.h +++ b/winsup/w32api/include/docobj.h @@ -1,6 +1,6 @@ #ifndef _DOCOBJ_H #define _DOCOBJ_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -71,8 +71,7 @@ typedef struct _tagOLECMD { } OLECMD; typedef interface IOleInPlaceSite *LPOLEINPLACESITE; -/* typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS; - in oleidl.h */ +typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS; EXTERN_C const IID IID_IContinueCallback; EXTERN_C const IID IID_IEnumOleDocumentViews; @@ -102,6 +101,8 @@ DECLARE_INTERFACE_(IOleDocumentView,IUnknown) STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE; }; +DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView); + EXTERN_C const IID IID_IOleDocument; #undef INTERFACE #define INTERFACE IOleDocument diff --git a/winsup/w32api/include/oleidl.h b/winsup/w32api/include/oleidl.h index 4754a44f3..1fbc56afd 100644 --- a/winsup/w32api/include/oleidl.h +++ b/winsup/w32api/include/oleidl.h @@ -18,7 +18,6 @@ typedef interface IOleClientSite *LPOLECLIENTSITE; typedef interface IOleObject *LPOLEOBJECT; typedef interface IDropTarget *LPDROPTARGET; typedef interface IDropSource *LPDROPSOURCE; -typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS; typedef interface IEnumOleUndoUnits *LPENUMOLEUNDOUNITS; typedef interface IEnumOLEVERB *LPENUMOLEVERB; typedef interface IOleWindow *LPOLEWINDOW; @@ -82,7 +81,6 @@ typedef struct tagOIFI { UINT cAccelEntries; }OLEINPLACEFRAMEINFO,*LPOLEINPLACEFRAMEINFO; -/*DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView);*/ DECLARE_ENUMERATOR(OLEVERB); typedef IEnumOLEVERB IEnumOleVerb; |