[ctypes-commit] ctypes/win32/com ole.py,1.7,1.8

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/win32/com
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10591

Modified Files:
	ole.py 
Log Message:
Fix wrong definition of OLESTR - found by Jürgen Urner.


Index: ole.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/win32/com/ole.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ole.py	16 Jul 2004 15:53:48 -0000	1.7
--- ole.py	22 Mar 2005 12:11:28 -0000	1.8
***************
*** 2,6 ****
  from ctypes.com import IUnknown, STDMETHOD, HRESULT, GUID
  from ctypes.com.storage import IStream, IStorage
! from ctypes.wintypes import BYTE, WORD, DWORD, MSG, SIZE, SIZEL, RECTL, RECT, OLESTR, HANDLE, \
       LPWSTR, BOOL, HWND, HMENU, HDC
  
--- 2,6 ----
  from ctypes.com import IUnknown, STDMETHOD, HRESULT, GUID
  from ctypes.com.storage import IStream, IStorage
! from ctypes.wintypes import BYTE, WORD, DWORD, MSG, SIZE, SIZEL, RECTL, RECT, LPOLESTR, HANDLE, \
       LPWSTR, BOOL, HWND, HMENU, HDC
  
***************
*** 88,92 ****
      STDMETHOD(HRESULT, "RequestBorderSpace", POINTER(BORDERWIDTHS)),
      STDMETHOD(HRESULT, "SetBorderSpace", POINTER(BORDERWIDTHS)),
!     STDMETHOD(HRESULT, "SetActiveObject", POINTER(IOleInPlaceActiveObject), POINTER(OLESTR))]
  
  IOleInPlaceActiveObject._methods_ = IOleWindow._methods_ + [
--- 88,92 ----
      STDMETHOD(HRESULT, "RequestBorderSpace", POINTER(BORDERWIDTHS)),
      STDMETHOD(HRESULT, "SetBorderSpace", POINTER(BORDERWIDTHS)),
!     STDMETHOD(HRESULT, "SetActiveObject", POINTER(IOleInPlaceActiveObject), LPOLESTR)]
  
  IOleInPlaceActiveObject._methods_ = IOleWindow._methods_ + [
***************
*** 108,112 ****
          STDMETHOD(HRESULT, "SetMenu", HMENU, HOLEMENU, HWND),
          STDMETHOD(HRESULT, "RemoveMenus", HMENU),
!         STDMETHOD(HRESULT, "SetStatusText", POINTER(OLESTR)),
          STDMETHOD(HRESULT, "EnableModeless", BOOL),
          STDMETHOD(HRESULT, "TranslateAccelerator", POINTER(MSG), WORD),
--- 108,112 ----
          STDMETHOD(HRESULT, "SetMenu", HMENU, HOLEMENU, HWND),
          STDMETHOD(HRESULT, "RemoveMenus", HMENU),
!         STDMETHOD(HRESULT, "SetStatusText", LPOLESTR),
          STDMETHOD(HRESULT, "EnableModeless", BOOL),
          STDMETHOD(HRESULT, "TranslateAccelerator", POINTER(MSG), WORD),