comparison 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
comparison
equal deleted inserted replaced
777:e65d9cf16707 778:2923009caf47
13 #include "console-gtk.h" 13 #include "console-gtk.h"
14 #include "objects-gtk.h" 14 #include "objects-gtk.h"
15 #include "gtk-xemacs.h" 15 #include "gtk-xemacs.h"
16 #include "window.h" 16 #include "window.h"
17 #include "faces.h" 17 #include "faces.h"
18 #include "event-gtk.h"
18 19
19 extern Lisp_Object Vmodeline_face; 20 extern Lisp_Object Vmodeline_face;
20 extern Lisp_Object Vscrollbar_on_left_p; 21 extern Lisp_Object Vscrollbar_on_left_p;
21 22
22 EXFUN (Fmake_image_instance, 4); 23 EXFUN (Fmake_image_instance, 4);
55 56
56 return xemacs_type; 57 return xemacs_type;
57 } 58 }
58 59
59 static GtkWidgetClass *parent_class; 60 static GtkWidgetClass *parent_class;
60
61 extern gint emacs_gtk_button_event_handler(GtkWidget *widget, GdkEventButton *event);
62 extern gint emacs_gtk_key_event_handler(GtkWidget *widget, GdkEventKey *event);
63 extern gint emacs_gtk_motion_event_handler(GtkWidget *widget, GdkEventMotion *event);
64 61
65 static void 62 static void
66 gtk_xemacs_class_init (GtkXEmacsClass *class) 63 gtk_xemacs_class_init (GtkXEmacsClass *class)
67 { 64 {
68 GtkWidgetClass *widget_class; 65 GtkWidgetClass *widget_class;
133 /* From objects-gtk.c */ 130 /* From objects-gtk.c */
134 extern Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp); 131 extern Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp);
135 132
136 #define convert_font(f) __get_gtk_font_truename (f, 0) 133 #define convert_font(f) __get_gtk_font_truename (f, 0)
137 134
135 #ifdef SMASH_FACE_FALLBACKS
138 static void 136 static void
139 smash_face_fallbacks (struct frame *f, GtkStyle *style) 137 smash_face_fallbacks (struct frame *f, GtkStyle *style)
140 { 138 {
141 #define FROB(face,prop,slot) do { \ 139 #define FROB(face,prop,slot) do { \
142 Lisp_Object fallback = Qnil; \ 140 Lisp_Object fallback = Qnil; \
174 FROB_FACE (Vgui_element_face, text, mid); 172 FROB_FACE (Vgui_element_face, text, mid);
175 173
176 #undef FROB 174 #undef FROB
177 #undef FROB_FACE 175 #undef FROB_FACE
178 } 176 }
177 #endif /* SMASH_FACE_FALLBACKS */
179 178
180 #ifdef HAVE_SCROLLBARS 179 #ifdef HAVE_SCROLLBARS
181 static void 180 static void
182 smash_scrollbar_specifiers (struct frame *f, GtkStyle *style) 181 smash_scrollbar_specifiers (struct frame *f, GtkStyle *style)
183 { 182 {
233 parent_class->style_set (widget, previous_style); 232 parent_class->style_set (widget, previous_style);
234 233
235 if (x->f) 234 if (x->f)
236 { 235 {
237 __nuke_background_items (widget); 236 __nuke_background_items (widget);
238 #if 0 237 #ifdef SMASH_FACE_FALLBACKS
239 smash_face_fallbacks (x->f, new_style); 238 smash_face_fallbacks (x->f, new_style);
240 #endif 239 #endif
241 #ifdef HAVE_SCROLLBARS 240 #ifdef HAVE_SCROLLBARS
242 smash_scrollbar_specifiers (x->f, new_style); 241 smash_scrollbar_specifiers (x->f, new_style);
243 #endif 242 #endif