src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m

rev 54096 : 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
rev 54097 : 8259869: [macOS] Remove desktop module dependencies on JNF Reference APIs
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

*** 22,32 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #import <Cocoa/Cocoa.h>
- #import <JavaNativeFoundation/JavaNativeFoundation.h>
  
  #import "AWTWindow.h"
  #import "AWTView.h"
  #import "CPopupMenu.h"
  #import "ThreadUtilities.h"
--- 22,31 ----
*** 58,84 ****
  JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeCreatePopupMenu
  (JNIEnv *env, jobject peer) {
  
      __block CPopupMenu *aCPopupMenu = nil;
  
! JNF_COCOA_ENTER(env);
  
!     jobject cPeerObjGlobal = JNFNewGlobalRef(env, peer);
  
      [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          aCPopupMenu = [[CPopupMenu alloc] initWithPeer:cPeerObjGlobal];
      }];
  
! JNF_COCOA_EXIT(env);
  
      return ptr_to_jlong(aCPopupMenu);
  }
  
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeShowPopupMenu
  (JNIEnv *env, jobject peer, jlong menuPtr, jint x, jint y) {
  
!     JNF_COCOA_ENTER(env);
  
      CPopupMenu* cPopupMenu = (CPopupMenu*)jlong_to_ptr(menuPtr);
  
      [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
          NSPoint loc = ConvertNSScreenPoint(env, NSMakePoint(x, y));
--- 57,83 ----
  JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeCreatePopupMenu
  (JNIEnv *env, jobject peer) {
  
      __block CPopupMenu *aCPopupMenu = nil;
  
! JNI_COCOA_ENTER(env);
  
!     jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer);
  
      [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          aCPopupMenu = [[CPopupMenu alloc] initWithPeer:cPeerObjGlobal];
      }];
  
! JNI_COCOA_EXIT(env);
  
      return ptr_to_jlong(aCPopupMenu);
  }
  
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeShowPopupMenu
  (JNIEnv *env, jobject peer, jlong menuPtr, jint x, jint y) {
  
!     JNI_COCOA_ENTER(env);
  
      CPopupMenu* cPopupMenu = (CPopupMenu*)jlong_to_ptr(menuPtr);
  
      [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
          NSPoint loc = ConvertNSScreenPoint(env, NSMakePoint(x, y));
*** 86,94 ****
          [[cPopupMenu menu] popUpMenuPositioningItem: nil
                                           atLocation: loc
                                               inView: nil];
      }];
  
!     JNF_COCOA_EXIT(env);
  
  }
  
--- 85,93 ----
          [[cPopupMenu menu] popUpMenuPositioningItem: nil
                                           atLocation: loc
                                               inView: nil];
      }];
  
!     JNI_COCOA_EXIT(env);
  
  }