enhwmf.cxx merge fix