[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32fns.c
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32fns.c |
Date: |
Fri, 22 Mar 2002 19:35:23 -0500 |
Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.164 emacs/src/w32fns.c:1.165
*** emacs/src/w32fns.c:1.164 Fri Mar 22 17:45:41 2002
--- emacs/src/w32fns.c Fri Mar 22 19:35:23 2002
***************
*** 5677,5689 ****
x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
"menuBar", "MenuBar", RES_TYPE_NUMBER);
- #ifdef HAVE_IMAGES
x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
"toolBar", "ToolBar", RES_TYPE_NUMBER);
! #else
! x_default_parameter (f, parms, Qtool_bar_lines, make_number (0),
! "toolBar", "ToolBar", RES_TYPE_NUMBER);
! #endif
x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
"bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);
x_default_parameter (f, parms, Qtitle, Qnil,
--- 5677,5685 ----
x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
"menuBar", "MenuBar", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
"toolBar", "ToolBar", RES_TYPE_NUMBER);
!
x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
"bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);
x_default_parameter (f, parms, Qtitle, Qnil,
***************
*** 8509,8515 ****
}
- #ifdef HAVE_IMAGES
DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0,
doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT).
PIXELS non-nil means return the size in pixels, otherwise return the
--- 8505,8510 ----
***************
*** 8566,8572 ****
return mask;
}
- #endif
/***********************************************************************
--- 8561,8566 ----
***************
*** 10585,10591 ****
#endif /* TODO */
- #ifdef HAVE_IMAGES /* TODO */
/***********************************************************************
Algorithms
***********************************************************************/
--- 10579,10584 ----
***************
*** 11019,11030 ****
return 0;
#endif
}
- #endif
/***********************************************************************
PBM (mono, gray, color)
***********************************************************************/
- #ifdef HAVE_PBM
static int pbm_image_p P_ ((Lisp_Object object));
static int pbm_load P_ ((struct frame *f, struct image *img));
--- 11012,11021 ----
***************
*** 11396,11402 ****
xfree (contents);
return 1;
}
- #endif /* HAVE_PBM */
/***********************************************************************
--- 11387,11392 ----
***************
*** 15260,15266 ****
set_frame_fontset_func = x_set_font;
check_window_system_func = check_w32;
- #ifdef IMAGES
/* Images. */
Qxbm = intern ("xbm");
staticpro (&Qxbm);
--- 15250,15255 ----
***************
*** 15292,15298 ****
staticpro (&QCindex);
Qpbm = intern ("pbm");
staticpro (&Qpbm);
- #endif
#if HAVE_XPM
Qxpm = intern ("xpm");
--- 15281,15286 ----
***************
*** 15319,15329 ****
staticpro (&Qpng);
#endif
- #ifdef HAVE_IMAGES
defsubr (&Sclear_image_cache);
defsubr (&Simage_size);
defsubr (&Simage_mask_p);
- #endif
#if GLYPH_DEBUG
defsubr (&Simagep);
--- 15307,15315 ----
***************
*** 15352,15360 ****
image_types = NULL;
Vimage_types = Qnil;
- #if HAVE_PBM
define_image_type (&pbm_type);
- #endif
#if 0 /* TODO : Image support for W32 */
define_image_type (&xbm_type);
--- 15338,15344 ----
***************
*** 15372,15378 ****
#if HAVE_TIFF
define_image_type (&tiff_type);
#endif
!
#if HAVE_GIF
define_image_type (&gif_type);
#endif
--- 15356,15362 ----
#if HAVE_TIFF
define_image_type (&tiff_type);
#endif
!
#if HAVE_GIF
define_image_type (&gif_type);
#endif
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Juanma Barranquero, 2002/03/08
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Juanma Barranquero, 2002/03/08
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Juanma Barranquero, 2002/03/08
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/03/16
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/03/20
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Kim F. Storm, 2002/03/21
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/03/21
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/03/22
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/03/22
- [Emacs-diffs] Changes to emacs/src/w32fns.c,
Jason Rumney <=
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/03/24