thanks to David for the feedback
(cherry picked from commit 9322e135d79228221a0f52d4a745b43cb087be3f)

Conflicts:
	modules/gui/macosx/MainWindow.m
	modules/gui/macosx/VideoView.m