--- src/xrdb.c +++ src/xrdb.c 2007-01-12 16:39:37.000000000 +0100 @@ -53,6 +53,9 @@ Boston, MA 02111-1307, USA. */ #include #include #include +#ifdef USE_X_TOOLKIT +#include +#endif #ifdef VMS #include "vms-pwd.h" #else @@ -604,6 +607,15 @@ x_load_resources (display, xrm_string, m XrmPutLineResource (&rdb, line); #endif /* not USE_MOTIF */ +#ifdef USE_X_TOOLKIT + if ((db = XtScreenDatabase(DefaultScreenOfDisplay (display)))) + { + XrmCombineDatabase (rdb, &db, FALSE); + rdb = db; + } + else + { +#endif /* not USE_X_TOOLKIT */ user_database = get_user_db (display); @@ -646,6 +658,10 @@ x_load_resources (display, xrm_string, m XrmMergeDatabases (db, &rdb); } +#ifdef USE_X_TOOLKIT + } /* (db != XtScreenDatabase()) */ +#endif /* not USE_X_TOOLKIT */ + return rdb; }