Updates for compiling with Gtk+ 3.0 (--with-x-toolkit=gtk3).