diff options
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c index 80f21411890..a180c08e6da 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -6,7 +6,7 @@ This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -72,8 +72,13 @@ Boston, MA 02110-1301, USA. */ #include <X11/Shell.h> #ifndef USE_MOTIF +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Paned.h> +#include <X11/Xaw3d/Label.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Paned.h> #include <X11/Xaw/Label.h> +#endif /* HAVE_XAW3D */ #endif /* USE_MOTIF */ #ifdef USG @@ -1847,9 +1852,9 @@ x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass, build_string (foreground_p ? "foreground" : "background"), - empty_string, + empty_unibyte_string, build_string ("verticalScrollBar"), - empty_string); + empty_unibyte_string); if (!STRINGP (tem)) { /* If nothing has been specified, scroll bars will use a @@ -3505,6 +3510,7 @@ FRAME nil means use the selected frame. */) x_catch_errors (dpy); XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), RevertToParent, CurrentTime); + x_ewmh_activate_frame (f); x_uncatch_errors (); UNBLOCK_INPUT; |