comparison src/ui-gtk.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 183866b06e0b
children e38acbeb1cae
comparison
equal deleted inserted replaced
777:e65d9cf16707 778:2923009caf47
20 #include "gui-gtk.h" 20 #include "gui-gtk.h"
21 #include "sysdll.h" 21 #include "sysdll.h"
22 #include "hash.h" 22 #include "hash.h"
23 #include "events.h" 23 #include "events.h"
24 #include "elhash.h" 24 #include "elhash.h"
25 #include "event-gtk.h"
25 26
26 /* XEmacs specific GTK types */ 27 /* XEmacs specific GTK types */
27 #include "gtk-glue.c" 28 #include "gtk-glue.c"
28 29
29 Lisp_Object Qemacs_ffip; 30 Lisp_Object Qemacs_ffip;
34 35
35 static GHashTable *dll_cache; 36 static GHashTable *dll_cache;
36 37
37 Lisp_Object gtk_type_to_lisp (GtkArg *arg); 38 Lisp_Object gtk_type_to_lisp (GtkArg *arg);
38 int lisp_to_gtk_type (Lisp_Object obj, GtkArg *arg); 39 int lisp_to_gtk_type (Lisp_Object obj, GtkArg *arg);
40 #if 0
39 void describe_gtk_arg (GtkArg *arg); 41 void describe_gtk_arg (GtkArg *arg);
42 #endif
40 guint symbol_to_enum (Lisp_Object obj, GtkType t); 43 guint symbol_to_enum (Lisp_Object obj, GtkType t);
41 static guint lisp_to_flag (Lisp_Object obj, GtkType t); 44 static guint lisp_to_flag (Lisp_Object obj, GtkType t);
42 static Lisp_Object flags_to_list (guint value, GtkType t); 45 static Lisp_Object flags_to_list (guint value, GtkType t);
43 static Lisp_Object enum_to_symbol (guint value, GtkType t); 46 static Lisp_Object enum_to_symbol (guint value, GtkType t);
44 47
365 break; \ 368 break; \
366 } \ 369 } \
367 if (freep) xfree(v); \ 370 if (freep) xfree(v); \
368 } while (0) 371 } while (0)
369 372
370 gpointer __allocate_object_storage (GtkType t) 373 static gpointer __allocate_object_storage (GtkType t)
371 { 374 {
372 size_t s = 0; 375 size_t s = 0;
373 void *rval = NULL; 376 void *rval = NULL;
374 377
375 switch (GTK_FUNDAMENTAL_TYPE (t)) 378 switch (GTK_FUNDAMENTAL_TYPE (t))
435 } 438 }
436 439
437 return (rval); 440 return (rval);
438 } 441 }
439 442
440 Lisp_Object type_to_marshaller_type (GtkType t) 443 static Lisp_Object type_to_marshaller_type (GtkType t)
441 { 444 {
442 switch (GTK_FUNDAMENTAL_TYPE (t)) 445 switch (GTK_FUNDAMENTAL_TYPE (t))
443 { 446 {
444 case GTK_TYPE_NONE: 447 case GTK_TYPE_NONE:
445 return (build_string ("NONE")); 448 return (build_string ("NONE"));
1361 vars_of_glade (); 1364 vars_of_glade ();
1362 } 1365 }
1363 1366
1364 1367
1365 /* Various utility functions */ 1368 /* Various utility functions */
1369 #if 0
1366 void describe_gtk_arg (GtkArg *arg) 1370 void describe_gtk_arg (GtkArg *arg)
1367 { 1371 {
1368 GtkArg a = *arg; 1372 GtkArg a = *arg;
1369 1373
1370 switch (GTK_FUNDAMENTAL_TYPE (a.type)) 1374 switch (GTK_FUNDAMENTAL_TYPE (a.type))
1439 1443
1440 default: 1444 default:
1441 abort(); 1445 abort();
1442 } 1446 }
1443 } 1447 }
1448 #endif
1444 1449
1445 Lisp_Object gtk_type_to_lisp (GtkArg *arg) 1450 Lisp_Object gtk_type_to_lisp (GtkArg *arg)
1446 { 1451 {
1447 switch (GTK_FUNDAMENTAL_TYPE (arg->type)) 1452 switch (GTK_FUNDAMENTAL_TYPE (arg->type))
1448 { 1453 {