Mercurial > emacs
comparison src/xfns.c @ 58463:86fddd350b35
* gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to
x-use-old-gtk-file-dialog.
* xfns.c: Define x_use_old_gtk_file_dialog.
(syms_of_xfns): Rename use-old-gtk-file-dialog to x-... Move it
outside ifdef USE_GTK.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Tue, 23 Nov 2004 19:56:55 +0000 |
parents | c163562b2d59 |
children | 0096c58ce34a 549734260e34 f2ebccfa87d4 |
comparison
equal
deleted
inserted
replaced
58462:8d3f889b4462 | 58463:86fddd350b35 |
---|---|
148 char *gray_bitmap_bits = gray_bits; | 148 char *gray_bitmap_bits = gray_bits; |
149 | 149 |
150 /* Non-zero means we're allowed to display an hourglass cursor. */ | 150 /* Non-zero means we're allowed to display an hourglass cursor. */ |
151 | 151 |
152 int display_hourglass_p; | 152 int display_hourglass_p; |
153 | |
154 /* Non-zero means prompt with the old GTK file selection dialog. */ | |
155 | |
156 int x_use_old_gtk_file_dialog; | |
153 | 157 |
154 /* The background and shape of the mouse pointer, and shape when not | 158 /* The background and shape of the mouse pointer, and shape when not |
155 over text or in the modeline. */ | 159 over text or in the modeline. */ |
156 | 160 |
157 Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape; | 161 Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape; |
5572 PIXEL_SIZE field of the name, font finding mechanism gets faster for | 5576 PIXEL_SIZE field of the name, font finding mechanism gets faster for |
5573 such a font. This is especially effective for such large fonts as | 5577 such a font. This is especially effective for such large fonts as |
5574 Chinese, Japanese, and Korean. */); | 5578 Chinese, Japanese, and Korean. */); |
5575 Vx_pixel_size_width_font_regexp = Qnil; | 5579 Vx_pixel_size_width_font_regexp = Qnil; |
5576 | 5580 |
5581 /* This is not ifdef:ed, so other builds than GTK can customize it. */ | |
5582 DEFVAR_BOOL ("x-use-old-gtk-file-dialog", &x_use_old_gtk_file_dialog, | |
5583 doc: /* *Non-nil means prompt with the old GTK file selection dialog. | |
5584 If nil or if the file selection dialog is not available, the new GTK file | |
5585 chooser is used instead. To turn off all file dialogs set the | |
5586 variable `use-file-dialog'. */); | |
5587 x_use_old_gtk_file_dialog = 0; | |
5588 | |
5577 #ifdef USE_X_TOOLKIT | 5589 #ifdef USE_X_TOOLKIT |
5578 Fprovide (intern ("x-toolkit"), Qnil); | 5590 Fprovide (intern ("x-toolkit"), Qnil); |
5579 #ifdef USE_MOTIF | 5591 #ifdef USE_MOTIF |
5580 Fprovide (intern ("motif"), Qnil); | 5592 Fprovide (intern ("motif"), Qnil); |
5581 | 5593 |
5590 is not an X toolkit in that sense (USE_X_TOOLKIT is not defined). | 5602 is not an X toolkit in that sense (USE_X_TOOLKIT is not defined). |
5591 But for a user it is a toolkit for X, and indeed, configure | 5603 But for a user it is a toolkit for X, and indeed, configure |
5592 accepts --with-x-toolkit=gtk. */ | 5604 accepts --with-x-toolkit=gtk. */ |
5593 Fprovide (intern ("x-toolkit"), Qnil); | 5605 Fprovide (intern ("x-toolkit"), Qnil); |
5594 Fprovide (intern ("gtk"), Qnil); | 5606 Fprovide (intern ("gtk"), Qnil); |
5595 | |
5596 #ifdef HAVE_GTK_FILE_BOTH | |
5597 DEFVAR_BOOL ("use-old-gtk-file-dialog", &use_old_gtk_file_dialog, | |
5598 doc: /* *Non-nil means that the old GTK file selection dialog is used. | |
5599 If nil the new GTK file chooser is used instead. To turn off | |
5600 all file dialogs set the variable `use-file-dialog'. */); | |
5601 use_old_gtk_file_dialog = 0; | |
5602 #endif | |
5603 | 5607 |
5604 DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, | 5608 DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, |
5605 doc: /* Version info for GTK+. */); | 5609 doc: /* Version info for GTK+. */); |
5606 { | 5610 { |
5607 char gtk_version[40]; | 5611 char gtk_version[40]; |