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

[Steven Tamm]

Index: emacs/src/frame.c
diff -c emacs/src/frame.c:1.310 emacs/src/frame.c:1.311
*** emacs/src/frame.c:1.310     Tue Nov 16 15:35:14 2004
--- emacs/src/frame.c   Mon Dec 27 17:27:30 2004
***************
*** 2815,2822 ****
        XSETINT (icon_top, 0);
      }
  
- #ifndef HAVE_CARBON
-   /* MAC_TODO: fullscreen */
    if (FRAME_VISIBLE_P (f) && fullscreen_is_being_set)
      {
        /* If the frame is visible already and the fullscreen parameter is
--- 2815,2820 ----
***************
*** 2832,2838 ****
        if (new_top != f->top_pos || new_left != f->left_pos)
          x_set_offset (f, new_left, new_top, 1);
      }
- #endif
  
    /* Don't set these parameters unless they've been explicitly
       specified.  The window might be mapped or resized while we're in
--- 2830,2835 ----
***************
*** 2993,3006 ****
    store_in_alist (alistptr, Qdisplay,
                  XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element));
  
- #ifndef HAVE_CARBON
- /* A Mac Window is identified by a struct, not an integer.  */
    if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO 
(f)->root_window)
      tem = Qnil;
    else
      XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc);
    store_in_alist (alistptr, Qparent_id, tem);
- #endif
  }
  
  
--- 2990,3000 ----
***************
*** 3012,3018 ****
       struct frame *f;
       Lisp_Object new_value, old_value;
  {
- #ifndef HAVE_CARBON
    if (NILP (new_value))
      f->want_fullscreen = FULLSCREEN_NONE;
    else if (EQ (new_value, Qfullboth))
--- 3006,3011 ----
***************
*** 3021,3027 ****
      f->want_fullscreen = FULLSCREEN_WIDTH;
    else if (EQ (new_value, Qfullheight))
      f->want_fullscreen = FULLSCREEN_HEIGHT;
- #endif
  }
  
  
--- 3014,3019 ----
***************
*** 3141,3147 ****
    if (XINT (arg) == f->border_width)
      return;
  
! #ifndef HAVE_CARBON
    if (FRAME_X_WINDOW (f) != 0)
      error ("Cannot change the border width of a window");
  #endif /* MAC_TODO */
--- 3133,3139 ----
    if (XINT (arg) == f->border_width)
      return;
  
! #ifndef MAC_OS
    if (FRAME_X_WINDOW (f) != 0)
      error ("Cannot change the border width of a window");
  #endif /* MAC_TODO */
***************
*** 4052,4058 ****
    DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
               doc: /* Default position of scroll bars on this window-system.  
*/);
  #ifdef HAVE_WINDOW_SYSTEM
! #if defined(HAVE_NTGUI) || defined(HAVE_CARBON)
    /* MS-Windows has scroll bars on the right by default.  */
    Vdefault_frame_scroll_bars = Qright;
  #else
--- 4044,4050 ----
    DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
               doc: /* Default position of scroll bars on this window-system.  
*/);
  #ifdef HAVE_WINDOW_SYSTEM
! #if defined(HAVE_NTGUI) || defined(MAC_OS)
    /* MS-Windows has scroll bars on the right by default.  */
    Vdefault_frame_scroll_bars = Qright;
  #else