adapting the CVWidgetMS branch to changes in master… (to be continued)

Signed-off-by: nuss <st9fan@gmail.com>