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

Diff of /emacs/src/frame.c

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

revision 1.310 by monnier, Tue Nov 16 15:35:14 2004 UTC revision 1.311 by tamm, Mon Dec 27 17:27:30 2004 UTC
# Line 2815  x_set_frame_parameters (f, alist) Line 2815  x_set_frame_parameters (f, alist)
2815          XSETINT (icon_top, 0);          XSETINT (icon_top, 0);
2816      }      }
2817    
 #ifndef HAVE_CARBON  
   /* MAC_TODO: fullscreen */  
2818    if (FRAME_VISIBLE_P (f) && fullscreen_is_being_set)    if (FRAME_VISIBLE_P (f) && fullscreen_is_being_set)
2819      {      {
2820        /* If the frame is visible already and the fullscreen parameter is        /* If the frame is visible already and the fullscreen parameter is
# Line 2832  x_set_frame_parameters (f, alist) Line 2830  x_set_frame_parameters (f, alist)
2830        if (new_top != f->top_pos || new_left != f->left_pos)        if (new_top != f->top_pos || new_left != f->left_pos)
2831          x_set_offset (f, new_left, new_top, 1);          x_set_offset (f, new_left, new_top, 1);
2832      }      }
 #endif  
2833    
2834    /* Don't set these parameters unless they've been explicitly    /* Don't set these parameters unless they've been explicitly
2835       specified.  The window might be mapped or resized while we're in       specified.  The window might be mapped or resized while we're in
# Line 2993  x_report_frame_params (f, alistptr) Line 2990  x_report_frame_params (f, alistptr)
2990    store_in_alist (alistptr, Qdisplay,    store_in_alist (alistptr, Qdisplay,
2991                    XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element));                    XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element));
2992    
 #ifndef HAVE_CARBON  
 /* A Mac Window is identified by a struct, not an integer.  */  
2993    if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window)    if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window)
2994      tem = Qnil;      tem = Qnil;
2995    else    else
2996      XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc);      XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc);
2997    store_in_alist (alistptr, Qparent_id, tem);    store_in_alist (alistptr, Qparent_id, tem);
 #endif  
2998  }  }
2999    
3000    
# Line 3012  x_set_fullscreen (f, new_value, old_valu Line 3006  x_set_fullscreen (f, new_value, old_valu
3006       struct frame *f;       struct frame *f;
3007       Lisp_Object new_value, old_value;       Lisp_Object new_value, old_value;
3008  {  {
 #ifndef HAVE_CARBON  
3009    if (NILP (new_value))    if (NILP (new_value))
3010      f->want_fullscreen = FULLSCREEN_NONE;      f->want_fullscreen = FULLSCREEN_NONE;
3011    else if (EQ (new_value, Qfullboth))    else if (EQ (new_value, Qfullboth))
# Line 3021  x_set_fullscreen (f, new_value, old_valu Line 3014  x_set_fullscreen (f, new_value, old_valu
3014      f->want_fullscreen = FULLSCREEN_WIDTH;      f->want_fullscreen = FULLSCREEN_WIDTH;
3015    else if (EQ (new_value, Qfullheight))    else if (EQ (new_value, Qfullheight))
3016      f->want_fullscreen = FULLSCREEN_HEIGHT;      f->want_fullscreen = FULLSCREEN_HEIGHT;
 #endif  
3017  }  }
3018    
3019    
# Line 3141  x_set_border_width (f, arg, oldval) Line 3133  x_set_border_width (f, arg, oldval)
3133    if (XINT (arg) == f->border_width)    if (XINT (arg) == f->border_width)
3134      return;      return;
3135    
3136  #ifndef HAVE_CARBON  #ifndef MAC_OS
3137    if (FRAME_X_WINDOW (f) != 0)    if (FRAME_X_WINDOW (f) != 0)
3138      error ("Cannot change the border width of a window");      error ("Cannot change the border width of a window");
3139  #endif /* MAC_TODO */  #endif /* MAC_TODO */
# Line 4052  Setting this variable does not affect ex Line 4044  Setting this variable does not affect ex
4044    DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,    DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
4045                 doc: /* Default position of scroll bars on this window-system.  */);                 doc: /* Default position of scroll bars on this window-system.  */);
4046  #ifdef HAVE_WINDOW_SYSTEM  #ifdef HAVE_WINDOW_SYSTEM
4047  #if defined(HAVE_NTGUI) || defined(HAVE_CARBON)  #if defined(HAVE_NTGUI) || defined(MAC_OS)
4048    /* MS-Windows has scroll bars on the right by default.  */    /* MS-Windows has scroll bars on the right by default.  */
4049    Vdefault_frame_scroll_bars = Qright;    Vdefault_frame_scroll_bars = Qright;
4050  #else  #else

Legend:
Removed from v.1.310  
changed lines
  Added in v.1.311

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