Merged revision 1599 from 1.4 branch and fixed also the second issue we had with disabled X11 support.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1600 dfc29bdd-3216-0410-991c-e03cc46cb475