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

[Steven Tamm]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.14 emacs/src/macmenu.c:1.15
*** emacs/src/macmenu.c:1.14    Fri May 14 03:07:12 2004
--- emacs/src/macmenu.c Sun May 30 00:18:41 2004
***************
*** 1784,1794 ****
    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);
  
***************
*** 1942,1952 ****
  
    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.*/
***************
*** 1964,1974 ****
    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);