diff src/gtk-xemacs.c @ 778:2923009caf47

[xemacs-hg @ 2002-03-16 10:38:59 by ben] cm.c, file-coding.c: fix warnings. .cvsignore: Those pesky *.tmp files. mule\arabic.el, mule\canna-leim.el, mule\china-util.el, mule\chinese.el, mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\devanagari.el, mule\english.el, mule\ethio-util.el, mule\ethiopic.el, mule\european.el, mule\greek.el, mule\hebrew.el, mule\indian.el, mule\japan-util.el, mule\japanese.el, mule\korea-util.el, mule\korean.el, mule\lao-util.el, mule\lao.el, mule\misc-lang.el, mule\mule-charset.el, mule\mule-cmds.el, mule\thai-util.el, mule\thai.el, mule\tibet-util.el, mule\tibetan.el, mule\viet-util.el, mule\vietnamese.el, unicode.el: Fix lots of warnings. Sync up some files to FSF 21.1. Copy over all charset definitions from FSF 21.1, convert them to our format, and stick them in the relevant files. Eventually we will actually be able to dump these files (though they may not quite work). autoload.el: Support defun*, defmacro*. mule/mule-composite.el, mule/mule-composite-stub.el: New file, stubs for nonexistent composition funs/vars. mule/viet-chars.el, dumped-lisp.el: Account for these changes. font.el, mouse.el, msw-font-menu.el, printer.el, startup.el: fix warnings.
author ben
date Sat, 16 Mar 2002 10:39:19 +0000
parents 8ae895c67ce7
children e38acbeb1cae
line wrap: on
line diff
--- a/src/gtk-xemacs.c	Fri Mar 15 11:00:56 2002 +0000
+++ b/src/gtk-xemacs.c	Sat Mar 16 10:39:19 2002 +0000
@@ -15,6 +15,7 @@
 #include "gtk-xemacs.h"
 #include "window.h"
 #include "faces.h"
+#include "event-gtk.h"
 
 extern Lisp_Object Vmodeline_face;
 extern Lisp_Object Vscrollbar_on_left_p;
@@ -58,10 +59,6 @@
 
 static GtkWidgetClass *parent_class;
 
-extern gint emacs_gtk_button_event_handler(GtkWidget *widget, GdkEventButton *event);
-extern gint emacs_gtk_key_event_handler(GtkWidget *widget, GdkEventKey *event);
-extern gint emacs_gtk_motion_event_handler(GtkWidget *widget, GdkEventMotion *event);
-
 static void
 gtk_xemacs_class_init (GtkXEmacsClass *class)
 {
@@ -135,6 +132,7 @@
 
 #define convert_font(f) __get_gtk_font_truename (f, 0)
 
+#ifdef SMASH_FACE_FALLBACKS
 static void
 smash_face_fallbacks (struct frame *f, GtkStyle *style)
 {
@@ -176,6 +174,7 @@
 #undef FROB
 #undef FROB_FACE
 }
+#endif /* SMASH_FACE_FALLBACKS */
 
 #ifdef HAVE_SCROLLBARS
 static void
@@ -235,7 +234,7 @@
   if (x->f)
     {
       __nuke_background_items (widget);
-#if 0
+#ifdef SMASH_FACE_FALLBACKS
       smash_face_fallbacks (x->f, new_style);
 #endif
 #ifdef HAVE_SCROLLBARS