Copied my 6812 fix port for gtk3

Integrated from gramps40 branch

git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@22525 4ae1f11a-8b86-4847-b8af-ab372f36d1fd