[Emacs-diffs] Changes to emacs/src/macmenu.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.11.2.1 emacs/src/macmenu.c:1.11.2.2
*** emacs/src/macmenu.c:1.11.2.1        Fri Apr 16 12:50:48 2004
--- emacs/src/macmenu.c Mon Jun 28 07:29:22 2004
***************
*** 1424,1430 ****
  
        for (i = 0; i < previous_menu_items_used; i++)
        if (menu_items_used == i
!           || (!Fequal (previous_items[i], XVECTOR (menu_items)->contents[i])))
          break;
        if (i == menu_items_used && i == previous_menu_items_used && i != 0)
        {
--- 1424,1431 ----
  
        for (i = 0; i < previous_menu_items_used; i++)
        if (menu_items_used == i
!           || (NILP (Fequal (previous_items[i],
!                             XVECTOR (menu_items)->contents[i]))))
          break;
        if (i == menu_items_used && i == previous_menu_items_used && i != 0)
        {
***************
*** 1783,1793 ****
    pos.h = x;
    pos.v = y;
  
! #if TARGET_API_MAC_CARBON
!   SetPort (GetWindowPort (FRAME_MAC_WINDOW (f)));
! #else
!   SetPort (FRAME_MAC_WINDOW (f));
! #endif
  
    LocalToGlobal (&pos);
  
--- 1784,1790 ----
    pos.h = x;
    pos.v = y;
  
!   SetPortWindowPort (FRAME_MAC_WINDOW (f));
  
    LocalToGlobal (&pos);
  
***************
*** 1941,1951 ****
  
    window_ptr = GetNewCWindow (DIALOG_WINDOW_RESOURCE, NULL, (WindowPtr) -1);
  
! #if TARGET_API_MAC_CARBON
!   SetPort (GetWindowPort (window_ptr));
! #else
!   SetPort (window_ptr);
! #endif
  
    TextFont (0);
    /* Left and right margins in the dialog are 13 pixels each.*/
--- 1938,1944 ----
  
    window_ptr = GetNewCWindow (DIALOG_WINDOW_RESOURCE, NULL, (WindowPtr) -1);
  
!   SetPortWindowPort (window_ptr);
  
    TextFont (0);
    /* Left and right margins in the dialog are 13 pixels each.*/
***************
*** 1963,1973 ****
    SizeWindow (window_ptr, dialog_width, 78, 0);
    ShowWindow (window_ptr);
  
! #if TARGET_API_MAC_CARBON
!   SetPort (GetWindowPort (window_ptr));
! #else
!   SetPort (window_ptr);
! #endif
  
    TextFont (0);
  
--- 1956,1962 ----
    SizeWindow (window_ptr, dialog_width, 78, 0);
    ShowWindow (window_ptr);
  
!   SetPortWindowPort (window_ptr);
  
    TextFont (0);