Re: Let's tell we are using GTK+

[Terje Rosten]

* Kenichi Handa
| 
| As "gtk" stands for "Gimp ToolKit", "gtk-toolkit" sounds strange to
| me.

Agree. Updated patches follows.

Please apply.

Thanks,

 - Terje


src/ part:

Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.590
diff -c -r1.590 xfns.c
*** src/xfns.c  31 Jul 2003 16:10:53 -0000      1.590
--- src/xfns.c  6 Aug 2003 07:42:47 -0000
***************
*** 125,130 ****
--- 125,138 ----
  
  #endif /* USE_X_TOOLKIT */
  
+ #ifdef USE_GTK
+ 
+ /* GTK+ version info */
+ 
+ static Lisp_Object Vgtk_version_string;
+ 
+ #endif /* USE_GTK */
+ 
  #ifdef HAVE_X11R4
  #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
  #else
***************
*** 10885,10890 ****
--- 10893,10911 ----
    Vmotif_version_string = build_string (XmVERSION_STRING);
  #endif /* USE_MOTIF */
  #endif /* USE_X_TOOLKIT */
+ 
+ #ifdef USE_GTK
+   Fprovide (intern ("gtk"), Qnil);
+ 
+   DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
+              doc: /* Version info for GTK+.  */);
+   {
+     char gtk_version[12];
+     sprintf (gtk_version, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
+              GTK_MICRO_VERSION);
+     Vgtk_version_string = build_string (gtk_version);
+   }
+ #endif /* USE_GTK */
  
    /* X window properties.  */
    defsubr (&Sx_change_window_property);
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.3331
diff -c -r1.3331 ChangeLog
*** src/ChangeLog       31 Jul 2003 16:10:53 -0000      1.3331
--- src/ChangeLog       6 Aug 2003 07:42:48 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-08-06  Terje Rosten <address@hidden>
+ 
+       * xfns.c (Vgtk_version_string): New variable.
+       (syms_of_xfns): DEFVAR_LISP it. Provide gtk.
+ 
  2003-07-31  Jan Djärv  <address@hidden>
  
        * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.


lisp/ part:


Index: lisp/version.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/version.el,v
retrieving revision 2.32
diff -c -r2.32 version.el
*** lisp/version.el     4 Feb 2003 12:12:31 -0000       2.32
--- lisp/version.el     6 Aug 2003 07:42:27 -0000
***************
*** 62,67 ****
--- 62,69 ----
                 (cond ((featurep 'motif)
                        (concat ", " (substring motif-version-string 4)))
                       ((featurep 'x-toolkit) ", X toolkit")
+                      ((featurep 'gtk)
+                       (concat ", GTK+ " gtk-version-string))
                       (t ""))
                 (if (and (boundp 'x-toolkit-scroll-bars)
                          (memq x-toolkit-scroll-bars '(xaw xaw3d)))
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.5328
diff -c -r1.5328 ChangeLog
*** lisp/ChangeLog      6 Aug 2003 01:11:11 -0000       1.5328
--- lisp/ChangeLog      6 Aug 2003 07:42:32 -0000
***************
*** 1,3 ****
--- 1,7 ----
+ 2003-08-06 Terje Rosten <address@hidden>
+ 
+       * version.el (emacs-version): Check for gtk. Include gtk version info.
+ 
  2003-08-05  Richard M. Stallman  <address@hidden>
  
        * emacs-lisp/testcover.el (noreturn): Report error if does return.