# HG changeset patch
# User wmperry
# Date 991274718 0
# Node ID ec73ae6e772b95ae69511afaca55a33f529a7b00
# Parent  ea7687dc2b340d9965bba943a7f7c8350926765e
[xemacs-hg @ 2001-05-31 02:05:16 by wmperry]
Fix GTK auto-generation elisp files...

diff -r ea7687dc2b34 -r ec73ae6e772b lisp/ChangeLog
--- a/lisp/ChangeLog	Thu May 31 02:01:47 2001 +0000
+++ b/lisp/ChangeLog	Thu May 31 02:05:18 2001 +0000
@@ -1,3 +1,17 @@
+2001-05-30  William M. Perry  <wmperry@gnu.org>
+
+	* gtk-marshal.el: Make sure that we use 'const' instead of 'CONST'
+	in the generated file.  Put in a comment at the top of the
+	generated file that it _IS_ auto-generated, and should not be
+	edited by hand.
+	
+
+	* gtk-widget-accessors.el (define-widget-accessors): Use
+	wtaerror() instead of signal_simple_error.
+	(import-widget-accessors): Put in a comment at the top of the
+	generated file that it _IS_ auto-generated, and should not be
+	edited by hand.
+
 2001-05-10   Daiki Ueno  <ueno@unixuser.org>
 
 	* font-lock.el (font-lock-compile-keywords): Rewrite as a side
diff -r ea7687dc2b34 -r ec73ae6e772b lisp/gtk-marshal.el
--- a/lisp/gtk-marshal.el	Thu May 31 02:01:47 2001 +0000
+++ b/lisp/gtk-marshal.el	Thu May 31 02:05:18 2001 +0000
@@ -71,10 +71,12 @@
     (insert "}\n")))
 
 (save-excursion
-  (find-file "../../src/emacs-marshals.c")
+  (find-file "../src/emacs-marshals.c")
   (erase-buffer)
   (setq defined-marshallers nil)
 
+  (insert "/* This file was automatically generated by ../lisp/gtk-marshal.el */\n"
+	  "/* DO NOT EDIT BY HAND!!! */\n")
   (insert "#define GTK_VALUE_ARRAY(x) GTK_VALUE_POINTER(x)\n\n")
   (insert "#define GTK_VALUE_LIST(x) GTK_VALUE_POINTER(x)\n\n")
 
@@ -276,7 +278,7 @@
 	void *fn = NULL;
 	initialize_marshaller_storage ();
 
-	if (gethash (func_name, marshaller_hashtable, (CONST void **)&fn))
+	if (gethash (func_name, marshaller_hashtable, (const void **)&fn))
 	{
 		return (fn);
 	}
diff -r ea7687dc2b34 -r ec73ae6e772b lisp/gtk-widget-accessors.el
--- a/lisp/gtk-widget-accessors.el	Thu May 31 02:01:47 2001 +0000
+++ b/lisp/gtk-widget-accessors.el	Thu May 31 02:05:18 2001 +0000
@@ -1,4 +1,4 @@
-(globally-declare-fboundp
+'(globally-declare-fboundp
  '(gtk-fundamental-type))
 
 (require 'gtk-ffi)
@@ -66,7 +66,7 @@
        "\n"
        (format "\tif (!GTK_IS_%s (XGTK_OBJECT (obj)->object))\n" wrapper)
        "\t{\n"
-       (format "\t\tsignal_simple_error (\"Object is not a %s\", obj);\n" gtk-class)
+       (format "\t\twtaerror (\"Object is not a %s\", obj);\n" gtk-class)
        "\t};\n"
        "\n"
        (format "\tthe_obj = GTK_%s (XGTK_OBJECT (obj)->object);\n" wrapper)
@@ -112,6 +112,8 @@
 	(c-mode-hook nil))
     (find-file file))
   (erase-buffer)
+  (insert "/* This file was automatically generated by ../lisp/gtk-widget-accessors.el */\n"
+	  "/* DO NOT EDIT BY HAND!!! */\n")
   (let ((c-funcs nil))
     (while description
       (setq c-funcs (nconc (define-widget-accessors
@@ -133,7 +135,7 @@
 		(funcall sym))))
 
 (import-widget-accessors
- "../../src/emacs-widget-accessors.c"
+ "../src/emacs-widget-accessors.c"
  "syms_of_widget_accessors "
 
  'GtkAdjustment "ADJUSTMENT" "adjustment"