* 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.
This commit is contained in:
Danny Smith 2003-05-13 02:05:12 +00:00
parent a8833ac1ff
commit b823fca9ba
3 changed files with 12 additions and 5 deletions

View File

@ -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> 2003-05-12 Earnie Boyd <earnie@users.sf.net>
* include/commctrl.h: (MCSC_BACKGROUND, MCSC_TEXT, MCSC_TITLEBK, * include/commctrl.h: (MCSC_BACKGROUND, MCSC_TEXT, MCSC_TITLEBK,

View File

@ -1,6 +1,6 @@
#ifndef _DOCOBJ_H #ifndef _DOCOBJ_H
#define _DOCOBJ_H #define _DOCOBJ_H
#if __GNUC__ >=3 #if __GNUC__ >= 3
#pragma GCC system_header #pragma GCC system_header
#endif #endif
@ -71,8 +71,7 @@ typedef struct _tagOLECMD {
} OLECMD; } OLECMD;
typedef interface IOleInPlaceSite *LPOLEINPLACESITE; typedef interface IOleInPlaceSite *LPOLEINPLACESITE;
/* typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS; typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS;
in oleidl.h */
EXTERN_C const IID IID_IContinueCallback; EXTERN_C const IID IID_IContinueCallback;
EXTERN_C const IID IID_IEnumOleDocumentViews; EXTERN_C const IID IID_IEnumOleDocumentViews;
@ -102,6 +101,8 @@ DECLARE_INTERFACE_(IOleDocumentView,IUnknown)
STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE; STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE;
}; };
DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView);
EXTERN_C const IID IID_IOleDocument; EXTERN_C const IID IID_IOleDocument;
#undef INTERFACE #undef INTERFACE
#define INTERFACE IOleDocument #define INTERFACE IOleDocument

View File

@ -18,7 +18,6 @@ typedef interface IOleClientSite *LPOLECLIENTSITE;
typedef interface IOleObject *LPOLEOBJECT; typedef interface IOleObject *LPOLEOBJECT;
typedef interface IDropTarget *LPDROPTARGET; typedef interface IDropTarget *LPDROPTARGET;
typedef interface IDropSource *LPDROPSOURCE; typedef interface IDropSource *LPDROPSOURCE;
typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS;
typedef interface IEnumOleUndoUnits *LPENUMOLEUNDOUNITS; typedef interface IEnumOleUndoUnits *LPENUMOLEUNDOUNITS;
typedef interface IEnumOLEVERB *LPENUMOLEVERB; typedef interface IEnumOLEVERB *LPENUMOLEVERB;
typedef interface IOleWindow *LPOLEWINDOW; typedef interface IOleWindow *LPOLEWINDOW;
@ -82,7 +81,6 @@ typedef struct tagOIFI {
UINT cAccelEntries; UINT cAccelEntries;
}OLEINPLACEFRAMEINFO,*LPOLEINPLACEFRAMEINFO; }OLEINPLACEFRAMEINFO,*LPOLEINPLACEFRAMEINFO;
/*DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView);*/
DECLARE_ENUMERATOR(OLEVERB); DECLARE_ENUMERATOR(OLEVERB);
typedef IEnumOLEVERB IEnumOleVerb; typedef IEnumOLEVERB IEnumOleVerb;