Travelling and standing waves in magnetoconvection