Margaret, now that I've grown "Kombacy Marianne" for a little while now, I'm pretty convinced that it's 'Mme. de Watteville', despite having prior reservations. The very distinctive (at times) form, the tapered receptacle, the fragrance and the pink edging have convinced me it's correct. Despite the colour being rather variable, I do get the very distinct pink edging quite regularly.

The other very good photo online is the Edwin Hale Lincoln photograph of Watteville. The custodian didn't give permission to copy it here but you can search for it easily enough. He appears to have photographed florist roses from the time, so those specimens would almost certainly be glasshouse-grown. The fine detail in the photos is exceptionally clear if you zoom in.