comparison src/if_ole.cpp @ 1569:9fbb40a1228a v7.1.282

updated for version 7.1-282
author vimboss
date Sun, 16 Mar 2008 13:54:13 +0000
parents c5871806d7e6
children 5e225f973b5d
comparison
equal deleted inserted replaced
1568:4e581f1b08da 1569:9fbb40a1228a
32 #endif 32 #endif
33 extern HWND s_hwnd; 33 extern HWND s_hwnd;
34 extern HWND vim_parent_hwnd; 34 extern HWND vim_parent_hwnd;
35 } 35 }
36 36
37 #if _MSC_VER < 1300
38 /* Work around old versions of basetsd.h which wrongly declares
39 * UINT_PTR as unsigned long */
40 # define UINT_PTR UINT
41 #endif
42
37 #include "if_ole.h" // Interface definitions 43 #include "if_ole.h" // Interface definitions
38 #include "iid_ole.c" // UUID definitions (compile here) 44 #include "iid_ole.c" // UUID definitions (compile here)
39 45
40 /* Supply function prototype to work around bug in Mingw oleauto.h header */ 46 /* Supply function prototype to work around bug in Mingw oleauto.h header */
41 #ifdef __MINGW32__ 47 #ifdef __MINGW32__
105 111
106 // IVim members 112 // IVim members
107 STDMETHOD(SendKeys)(BSTR keys); 113 STDMETHOD(SendKeys)(BSTR keys);
108 STDMETHOD(Eval)(BSTR expr, BSTR *result); 114 STDMETHOD(Eval)(BSTR expr, BSTR *result);
109 STDMETHOD(SetForeground)(void); 115 STDMETHOD(SetForeground)(void);
110 STDMETHOD(GetHwnd)(UINT *result); 116 STDMETHOD(GetHwnd)(UINT_PTR *result);
111 117
112 private: 118 private:
113 // Constructor is private - create using CVim::Create() 119 // Constructor is private - create using CVim::Create()
114 CVim() : ref(0), typeinfo(0) {}; 120 CVim() : ref(0), typeinfo(0) {};
115 121
286 member, flags, dispparams, 292 member, flags, dispparams,
287 result, excepinfo, argerr); 293 result, excepinfo, argerr);
288 } 294 }
289 295
290 STDMETHODIMP 296 STDMETHODIMP
291 CVim::GetHwnd(UINT *result) 297 CVim::GetHwnd(UINT_PTR *result)
292 { 298 {
293 *result = (UINT) s_hwnd; 299 *result = (UINT_PTR)s_hwnd;
294 return S_OK; 300 return S_OK;
295 } 301 }
296 302
297 STDMETHODIMP 303 STDMETHODIMP
298 CVim::SetForeground(void) 304 CVim::SetForeground(void)