Doubtful. China is a nuclear (and world) power and trading partner. Much caution was advised.
Iran, otoh, is an outlaw terorist regime with a relatively weak (and non-nuclear) military.
They won't be handled with kid gloves.
Perhaps. Or, will political correctness take over once again. Of course, most believe Bush is just looking for a way to tangle with Iran.