/[emacs]/emacs/src/w32fns.c
ViewVC logotype

Diff of /emacs/src/w32fns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.164 by jasonr, Fri Mar 22 22:45:41 2002 UTC revision 1.165 by jasonr, Sat Mar 23 00:35:23 2002 UTC
# Line 5677  This function is an internal primitive-- Line 5677  This function is an internal primitive--
5677        
5678    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
5679                         "menuBar", "MenuBar", RES_TYPE_NUMBER);                         "menuBar", "MenuBar", RES_TYPE_NUMBER);
 #ifdef HAVE_IMAGES  
5680    x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),    x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
5681                         "toolBar", "ToolBar", RES_TYPE_NUMBER);                         "toolBar", "ToolBar", RES_TYPE_NUMBER);
5682  #else  
   x_default_parameter (f, parms, Qtool_bar_lines, make_number (0),  
                        "toolBar", "ToolBar", RES_TYPE_NUMBER);  
 #endif  
5683    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
5684                         "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);                         "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);
5685    x_default_parameter (f, parms, Qtitle, Qnil,    x_default_parameter (f, parms, Qtitle, Qnil,
# Line 8509  image_spec_value (spec, key, found) Line 8505  image_spec_value (spec, key, found)
8505  }  }
8506            
8507    
 #ifdef HAVE_IMAGES  
8508  DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0,  DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0,
8509         doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT).         doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT).
8510  PIXELS non-nil means return the size in pixels, otherwise return the  PIXELS non-nil means return the size in pixels, otherwise return the
# Line 8566  or omitted means use the selected frame. Line 8561  or omitted means use the selected frame.
8561    
8562    return mask;    return mask;
8563  }  }
 #endif  
8564    
8565    
8566  /***********************************************************************  /***********************************************************************
# Line 10585  colors_in_color_table (n) Line 10579  colors_in_color_table (n)
10579  #endif /* TODO */  #endif /* TODO */
10580    
10581    
 #ifdef HAVE_IMAGES /* TODO */  
10582  /***********************************************************************  /***********************************************************************
10583                                Algorithms                                Algorithms
10584   ***********************************************************************/   ***********************************************************************/
# Line 11019  x_build_heuristic_mask (f, img, how) Line 11012  x_build_heuristic_mask (f, img, how)
11012    return 0;    return 0;
11013  #endif  #endif
11014  }  }
 #endif  
11015    
11016  /***********************************************************************  /***********************************************************************
11017                         PBM (mono, gray, color)                         PBM (mono, gray, color)
11018   ***********************************************************************/   ***********************************************************************/
 #ifdef HAVE_PBM  
11019    
11020  static int pbm_image_p P_ ((Lisp_Object object));  static int pbm_image_p P_ ((Lisp_Object object));
11021  static int pbm_load P_ ((struct frame *f, struct image *img));  static int pbm_load P_ ((struct frame *f, struct image *img));
# Line 11396  pbm_load (f, img) Line 11387  pbm_load (f, img)
11387    xfree (contents);    xfree (contents);
11388    return 1;    return 1;
11389  }  }
 #endif /* HAVE_PBM */  
11390    
11391    
11392  /***********************************************************************  /***********************************************************************
# Line 15260  versions of Windows) characters.  */); Line 15250  versions of Windows) characters.  */);
15250    set_frame_fontset_func = x_set_font;    set_frame_fontset_func = x_set_font;
15251    check_window_system_func = check_w32;    check_window_system_func = check_w32;
15252    
 #ifdef IMAGES  
15253    /* Images.  */    /* Images.  */
15254    Qxbm = intern ("xbm");    Qxbm = intern ("xbm");
15255    staticpro (&Qxbm);    staticpro (&Qxbm);
# Line 15292  versions of Windows) characters.  */); Line 15281  versions of Windows) characters.  */);
15281    staticpro (&QCindex);    staticpro (&QCindex);
15282    Qpbm = intern ("pbm");    Qpbm = intern ("pbm");
15283    staticpro (&Qpbm);    staticpro (&Qpbm);
 #endif  
15284    
15285  #if HAVE_XPM  #if HAVE_XPM
15286    Qxpm = intern ("xpm");    Qxpm = intern ("xpm");
# Line 15319  versions of Windows) characters.  */); Line 15307  versions of Windows) characters.  */);
15307    staticpro (&Qpng);    staticpro (&Qpng);
15308  #endif  #endif
15309    
 #ifdef HAVE_IMAGES  
15310    defsubr (&Sclear_image_cache);    defsubr (&Sclear_image_cache);
15311    defsubr (&Simage_size);    defsubr (&Simage_size);
15312    defsubr (&Simage_mask_p);    defsubr (&Simage_mask_p);
 #endif  
15313    
15314  #if GLYPH_DEBUG  #if GLYPH_DEBUG
15315    defsubr (&Simagep);    defsubr (&Simagep);
# Line 15352  init_xfns () Line 15338  init_xfns ()
15338    image_types = NULL;    image_types = NULL;
15339    Vimage_types = Qnil;    Vimage_types = Qnil;
15340    
 #if HAVE_PBM  
15341    define_image_type (&pbm_type);    define_image_type (&pbm_type);
 #endif  
15342    
15343  #if 0 /* TODO : Image support for W32 */  #if 0 /* TODO : Image support for W32 */
15344    define_image_type (&xbm_type);    define_image_type (&xbm_type);
# Line 15372  init_xfns () Line 15356  init_xfns ()
15356  #if HAVE_TIFF  #if HAVE_TIFF
15357    define_image_type (&tiff_type);    define_image_type (&tiff_type);
15358  #endif  #endif
15359      
15360  #if HAVE_GIF  #if HAVE_GIF
15361    define_image_type (&gif_type);    define_image_type (&gif_type);
15362  #endif  #endif

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.165

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26