Updates and fixes to Wacom calibrator

The Wacom calibrator was left in a non-working state with the gtk4 port, bring it up to a working state again and fix some easy bugs.