comparison src/frame-gtk.c @ 4962:e813cf16c015

merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 19a72041c5ed b3ce27ca7647
children 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
59 #define UNMAPPED_DATA_IDENTIFIER "xemacs::initially_unmapped" 59 #define UNMAPPED_DATA_IDENTIFIER "xemacs::initially_unmapped"
60 60
61 #define STUPID_X_SPECIFIC_GTK_STUFF 61 #define STUPID_X_SPECIFIC_GTK_STUFF
62 62
63 #ifdef STUPID_X_SPECIFIC_GTK_STUFF 63 #ifdef STUPID_X_SPECIFIC_GTK_STUFF
64 #include <gdk/gdkx.h> 64 #include "sysgdkx.h"
65 #endif 65 #endif
66 66
67 /* Default properties to use when creating frames. */ 67 /* Default properties to use when creating frames. */
68 Lisp_Object Vdefault_gtk_frame_plist; 68 Lisp_Object Vdefault_gtk_frame_plist;
69 69
986 FRAME_GTK_MENUBAR_DATA (f) = Qnil; 986 FRAME_GTK_MENUBAR_DATA (f) = Qnil;
987 for (i = 0; i < 3; i++) 987 for (i = 0; i < 3; i++)
988 FRAME_GTK_LISP_WIDGETS (f)[i] = Qnil; 988 FRAME_GTK_LISP_WIDGETS (f)[i] = Qnil;
989 989
990 /* 990 /*
991 Hashtables of callback data for glyphs on the frame. Make them EQ because 991 Hashtables of callback data for glyphs on the frame. [[ Make them EQ
992 we only use ints as keys. Otherwise we run into stickiness in redisplay 992 because we only use ints as keys. Otherwise we run into stickiness in
993 because internal_equal() can QUIT. See enter_redisplay_critical_section(). 993 redisplay because internal_equal() can QUIT. See
994 enter_redisplay_critical_section() ]] -- probably not true any more,
995 now that we have internal_equal_trapping_problems(). --ben
994 */ 996 */
995 FRAME_GTK_WIDGET_INSTANCE_HASH_TABLE (f) = 997 FRAME_GTK_WIDGET_INSTANCE_HASH_TABLE (f) =
996 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQ); 998 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQ);
997 FRAME_GTK_WIDGET_CALLBACK_HASH_TABLE (f) = 999 FRAME_GTK_WIDGET_CALLBACK_HASH_TABLE (f) =
998 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQ); 1000 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQ);