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

Diff of /emacs/src/xfns.c

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

revision 1.610 by jhd, Wed May 12 09:24:02 2004 UTC revision 1.611 by teirllm, Sat Jul 24 12:49:40 2004 UTC
# Line 2633  x_window (f) Line 2633  x_window (f)
2633  #endif /* not USE_GTK */  #endif /* not USE_GTK */
2634  #endif /* not USE_X_TOOLKIT */  #endif /* not USE_X_TOOLKIT */
2635    
2636    /* Verify that the icon position args for this window are valid.  */
2637    
2638    static void
2639    x_icon_verify (f, parms)
2640         struct frame *f;
2641         Lisp_Object parms;
2642    {
2643      Lisp_Object icon_x, icon_y;
2644    
2645      /* Set the position of the icon.  Note that twm groups all
2646         icons in an icon window.  */
2647      icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
2648      icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
2649      if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
2650        {
2651          CHECK_NUMBER (icon_x);
2652          CHECK_NUMBER (icon_y);
2653        }
2654      else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
2655        error ("Both left and top icon corners of icon must be specified");
2656    }
2657    
2658  /* Handle the icon stuff for this window.  Perhaps later we might  /* Handle the icon stuff for this window.  Perhaps later we might
2659     want an x_set_icon_position which can be called interactively as     want an x_set_icon_position which can be called interactively as
2660     well.  */     well.  */
# Line 3117  This function is an internal primitive-- Line 3139  This function is an internal primitive--
3139    tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);    tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
3140    f->no_split = minibuffer_only || EQ (tem, Qt);    f->no_split = minibuffer_only || EQ (tem, Qt);
3141    
3142      x_icon_verify (f, parms);
3143    
3144    /* Create the X widget or window.  */    /* Create the X widget or window.  */
3145  #ifdef USE_X_TOOLKIT  #ifdef USE_X_TOOLKIT
3146    x_window (f, window_prompting, minibuffer_only);    x_window (f, window_prompting, minibuffer_only);

Legend:
Removed from v.1.610  
changed lines
  Added in v.1.611

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