Commit 255e4140 authored by Jan Djärv's avatar Jan Djärv

* 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.
parent 6f8a2742
2004-11-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* 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.
2004-11-23 Kim F. Storm <storm@cua.dk> 2004-11-23 Kim F. Storm <storm@cua.dk>
* dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P) * dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P)
......
...@@ -1122,10 +1122,6 @@ create_dialog (wv, select_cb, deactivate_cb) ...@@ -1122,10 +1122,6 @@ create_dialog (wv, select_cb, deactivate_cb)
/*********************************************************************** /***********************************************************************
File dialog functions File dialog functions
***********************************************************************/ ***********************************************************************/
#ifdef HAVE_GTK_FILE_BOTH
int use_old_gtk_file_dialog;
#endif
/* Function that is called when the file dialog pops down. /* Function that is called when the file dialog pops down.
W is the dialog widget, RESPONSE is the response code. W is the dialog widget, RESPONSE is the response code.
USER_DATA is what we passed in to g_signal_connect (pointer to int). */ USER_DATA is what we passed in to g_signal_connect (pointer to int). */
...@@ -1311,7 +1307,9 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) ...@@ -1311,7 +1307,9 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
xg_get_file_func func; xg_get_file_func func;
#ifdef HAVE_GTK_FILE_BOTH #ifdef HAVE_GTK_FILE_BOTH
if (use_old_gtk_file_dialog) extern int x_use_old_gtk_file_dialog;
if (x_use_old_gtk_file_dialog)
w = xg_get_file_with_selection (f, prompt, default_filename, w = xg_get_file_with_selection (f, prompt, default_filename,
mustmatch_p, only_dir_p, &func); mustmatch_p, only_dir_p, &func);
else else
......
...@@ -151,6 +151,10 @@ char *gray_bitmap_bits = gray_bits; ...@@ -151,6 +151,10 @@ char *gray_bitmap_bits = gray_bits;
int display_hourglass_p; int display_hourglass_p;
/* Non-zero means prompt with the old GTK file selection dialog. */
int x_use_old_gtk_file_dialog;
/* The background and shape of the mouse pointer, and shape when not /* The background and shape of the mouse pointer, and shape when not
over text or in the modeline. */ over text or in the modeline. */
...@@ -5574,6 +5578,14 @@ such a font. This is especially effective for such large fonts as ...@@ -5574,6 +5578,14 @@ such a font. This is especially effective for such large fonts as
Chinese, Japanese, and Korean. */); Chinese, Japanese, and Korean. */);
Vx_pixel_size_width_font_regexp = Qnil; Vx_pixel_size_width_font_regexp = Qnil;
/* This is not ifdef:ed, so other builds than GTK can customize it. */
DEFVAR_BOOL ("x-use-old-gtk-file-dialog", &x_use_old_gtk_file_dialog,
doc: /* *Non-nil means prompt with the old GTK file selection dialog.
If nil or if the file selection dialog is not available, the new GTK file
chooser is used instead. To turn off all file dialogs set the
variable `use-file-dialog'. */);
x_use_old_gtk_file_dialog = 0;
#ifdef USE_X_TOOLKIT #ifdef USE_X_TOOLKIT
Fprovide (intern ("x-toolkit"), Qnil); Fprovide (intern ("x-toolkit"), Qnil);
#ifdef USE_MOTIF #ifdef USE_MOTIF
...@@ -5593,14 +5605,6 @@ Chinese, Japanese, and Korean. */); ...@@ -5593,14 +5605,6 @@ Chinese, Japanese, and Korean. */);
Fprovide (intern ("x-toolkit"), Qnil); Fprovide (intern ("x-toolkit"), Qnil);
Fprovide (intern ("gtk"), Qnil); Fprovide (intern ("gtk"), Qnil);
#ifdef HAVE_GTK_FILE_BOTH
DEFVAR_BOOL ("use-old-gtk-file-dialog", &use_old_gtk_file_dialog,
doc: /* *Non-nil means that the old GTK file selection dialog is used.
If nil the new GTK file chooser is used instead. To turn off
all file dialogs set the variable `use-file-dialog'. */);
use_old_gtk_file_dialog = 0;
#endif
DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
doc: /* Version info for GTK+. */); doc: /* Version info for GTK+. */);
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment