Update widgets.c from psppsheet branch