src/macosx/native/sun/awt/CMenu.m

*** 53,78 ****
      [super dealloc];
  }
  //- (void)finalize { [super finalize]; }
  
  - (void)addJavaSubmenu:(CMenu *)submenu {
!     [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:submenu waitUntilDone:YES awtMode:YES];
  }
  
  - (void)addJavaMenuItem:(CMenuItem *)theMenuItem {
!     [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:theMenuItem waitUntilDone:YES awtMode:YES];
  }
  
  - (void)addNativeItem_OnAppKitThread:(CMenuItem *)itemModified {
  AWT_ASSERT_APPKIT_THREAD;
      [itemModified addNSMenuItemToMenu:[self menu]];
  }
  
  - (void)setJavaMenuTitle:(NSString *)title {
  
      if (title) {
!         [ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) onObject:self withObject:title waitUntilDone:YES awtMode:YES];
      }
  }
  
  - (void)setNativeMenuTitle_OnAppKitThread:(NSString *)title {
  AWT_ASSERT_APPKIT_THREAD;
--- 53,78 ----
      [super dealloc];
  }
  //- (void)finalize { [super finalize]; }
  
  - (void)addJavaSubmenu:(CMenu *)submenu {
!     [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) on:self withObject:submenu waitUntilDone:YES];
  }
  
  - (void)addJavaMenuItem:(CMenuItem *)theMenuItem {
!     [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) on:self withObject:theMenuItem waitUntilDone:YES];
  }
  
  - (void)addNativeItem_OnAppKitThread:(CMenuItem *)itemModified {
  AWT_ASSERT_APPKIT_THREAD;
      [itemModified addNSMenuItemToMenu:[self menu]];
  }
  
  - (void)setJavaMenuTitle:(NSString *)title {
  
      if (title) {
!         [ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) on:self withObject:title waitUntilDone:YES];
      }
  }
  
  - (void)setNativeMenuTitle_OnAppKitThread:(NSString *)title {
  AWT_ASSERT_APPKIT_THREAD;
*** 91,101 ****
      // Nothing calls this, which is good because we need a CMenuItem here.
  }
  
  - (void)deleteJavaItem:(jint)index {
  
!     [ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) onObject:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES awtMode:YES];
  }
  
  - (void)deleteNativeJavaItem_OnAppKitThread:(NSNumber *)number {
  AWT_ASSERT_APPKIT_THREAD;
  
--- 91,101 ----
      // Nothing calls this, which is good because we need a CMenuItem here.
  }
  
  - (void)deleteJavaItem:(jint)index {
  
!     [ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) on:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES];
  }
  
  - (void)deleteNativeJavaItem_OnAppKitThread:(NSNumber *)number {
  AWT_ASSERT_APPKIT_THREAD;
  
*** 137,147 ****
      CMenu *aCMenu = nil;
  
      // We use an array here only to be able to get a return value
      NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], nil];
  
!     [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) onObject:[CMenu alloc] withObject:args waitUntilDone:YES awtMode:YES];
  
      aCMenu = (CMenu *)[args objectAtIndex: 0];
  
      if (aCMenu == nil) {
          return 0L;
--- 137,147 ----
      CMenu *aCMenu = nil;
  
      // We use an array here only to be able to get a return value
      NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], nil];
  
!     [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) on:[CMenu alloc] withObject:args waitUntilDone:YES];
  
      aCMenu = (CMenu *)[args objectAtIndex: 0];
  
      if (aCMenu == nil) {
          return 0L;