[pywin32-checkins] pywin32/win32/Lib win32gui_struct.py,1.9,1.10

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20607/win32/Lib

Modified Files:
	win32gui_struct.py 
Log Message:
64-bit fixes

Index: win32gui_struct.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32gui_struct.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32gui_struct.py	2 Jul 2006 23:28:46 -0000	1.9
--- win32gui_struct.py	6 Sep 2007 06:44:05 -0000	1.10
***************
*** 44,48 ****
  # structure to avoid the caller needing to explicitly check validity
  # (None is used if the mask excludes/should exclude the value)
! menuitem_fmt = '9iP2i'
  
  def PackMENUITEMINFO(fType=None, fState=None, wID=None, hSubMenu=None,
--- 44,48 ----
  # structure to avoid the caller needing to explicitly check validity
  # (None is used if the mask excludes/should exclude the value)
! menuitem_fmt = '5i5PiP'
  
  def PackMENUITEMINFO(fType=None, fState=None, wID=None, hSubMenu=None,
***************
*** 97,100 ****
--- 97,101 ----
          cch = 0
      # Create the struct.
+     # 'P' format does not accept PyHANDLE's !
      item = struct.pack(
                  menuitem_fmt,
***************
*** 104,114 ****
                  fState,
                  wID,
!                 hSubMenu,
!                 hbmpChecked,
!                 hbmpUnchecked,
                  dwItemData,
                  lptext,
                  cch,
!                 hbmpItem
                  )
      # Now copy the string to a writable buffer, so that the result
--- 105,115 ----
                  fState,
                  wID,
!                 long(hSubMenu),
!                 long(hbmpChecked),
!                 long(hbmpUnchecked),
                  dwItemData,
                  lptext,
                  cch,
!                 long(hbmpItem)
                  )
      # Now copy the string to a writable buffer, so that the result