[Emacs-diffs] Changes to emacs/src/xterm.c

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.871 emacs/src/xterm.c:1.872
*** emacs/src/xterm.c:1.871     Sun Aug  7 12:33:19 2005
--- emacs/src/xterm.c   Sat Aug 13 09:48:36 2005
***************
*** 9250,9256 ****
  #endif
      }
  
! #ifdef USE_X_TOOLKIT /* same as in x_wm_set_window_state.  */
  
    {
      Arg al[1];
--- 9250,9268 ----
  #endif
      }
  
! 
! #ifdef USE_GTK
!   {
!     GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
!     GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap);
!     GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask);
!     GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL);
! 
!     gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp);
!     return;
!   }
! 
! #elif defined (USE_X_TOOLKIT) /* same as in x_wm_set_window_state.  */
  
    {
      Arg al[1];
***************
*** 9260,9271 ****
      XtSetValues (f->output_data.x->widget, al, 1);
    }
  
! #else /* not USE_X_TOOLKIT */
  
    f->output_data.x->wm_hints.flags |= (IconPixmapHint | IconMaskHint);
    XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints);
  
! #endif /* not USE_X_TOOLKIT */
  }
  
  void
--- 9272,9283 ----
      XtSetValues (f->output_data.x->widget, al, 1);
    }
  
! #else /* not USE_X_TOOLKIT && not USE_GTK */
  
    f->output_data.x->wm_hints.flags |= (IconPixmapHint | IconMaskHint);
    XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints);
  
! #endif /* not USE_X_TOOLKIT && not USE_GTK */
  }
  
  void