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

Diff of /emacs/src/xterm.c

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

revision 1.889 by cyd, Wed Nov 16 05:49:18 2005 UTC revision 1.890 by cyd, Wed Nov 16 16:38:48 2005 UTC
# Line 7362  x_bitmap_icon (f, file) Line 7362  x_bitmap_icon (f, file)
7362        /* Create the GNU bitmap and mask if necessary.  */        /* Create the GNU bitmap and mask if necessary.  */
7363        if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0)        if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0)
7364          {          {
7365              int rc = -1;
7366    
7367  #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)  #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
7368            FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id  #ifdef USE_GTK
7369              = x_create_bitmap_from_xpm_data (f, gnu_bits);            if (xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
7370                return 0;
7371  #else  #else
7372            FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id            rc = x_create_bitmap_from_xpm_data (f, gnu_xpm_bits);
7373              = x_create_bitmap_from_data (f, gnu_bits,            if (rc != -1)
7374                                           gnu_width, gnu_height);              FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id = rc;
7375  #endif /*  (HAVE_XPM) && defined (HAVE_X_WINDOWS) */  #endif /* USE_GTK */
7376            x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id);  #endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
7377    
7378              /* If all else fails, use the (black and white) xbm image. */
7379              if (rc == -1)
7380                {
7381                  rc = x_create_bitmap_from_data (f, gnu_xbm_bits,
7382                                                  gnu_xbm_width, gnu_xbm_height);
7383                  if (rc == -1)
7384                    return 1;
7385    
7386                  FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id = rc;
7387                  x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id);
7388                }
7389          }          }
7390    
7391        /* The first time we create the GNU bitmap and mask,        /* The first time we create the GNU bitmap and mask,

Legend:
Removed from v.1.889  
changed lines
  Added in v.1.890

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