aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2004-05-12 09:24:02 +0000
committerJan Djärv2004-05-12 09:24:02 +0000
commit1ec2a572459acc810137c7d48b1bb24845da8235 (patch)
tree3dfa9410831c40aed7d5b7c53ba0da64abe458be /src
parent9b44aa8b6fc92bb8e266b5959d2136ac5281a465 (diff)
downloademacs-1ec2a572459acc810137c7d48b1bb24845da8235.tar.gz
emacs-1ec2a572459acc810137c7d48b1bb24845da8235.zip
* xfns.c (syms_of_xfns): Provide x-toolkit also for GTK.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 409c8e6c7c5..d850131af81 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12004-05-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xfns.c (syms_of_xfns): Provide x-toolkit also for GTK.
4
12004-05-11 Steven Tamm <steventamm@mac.com> 52004-05-11 Steven Tamm <steventamm@mac.com>
2 6
3 * macfns.c (Fx_create_frame): Default to using tool-bar by 7 * macfns.c (Fx_create_frame): Default to using tool-bar by
diff --git a/src/xfns.c b/src/xfns.c
index 6d7f5b92f0b..931d31bcedf 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5495,6 +5495,11 @@ Chinese, Japanese, and Korean. */);
5495#endif /* USE_X_TOOLKIT */ 5495#endif /* USE_X_TOOLKIT */
5496 5496
5497#ifdef USE_GTK 5497#ifdef USE_GTK
5498 /* Provide x-toolkit also for GTK. Internally GTK does not use Xt so it
5499 is not an X toolkit in that sense (USE_X_TOOLKIT is not defined).
5500 But for a user it is a toolkit for X, and indeed, configure
5501 accepts --with-x-toolkit=gtk. */
5502 Fprovide (intern ("x-toolkit"), Qnil);
5498 Fprovide (intern ("gtk"), Qnil); 5503 Fprovide (intern ("gtk"), Qnil);
5499 5504
5500 DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, 5505 DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,