changes for Carbon r=pchen/a=sfraser. bug# 42100

gfx/src/mac/nsDeviceContextMac.cpp

@@ -864,7 +864,8 @@ void nsDeviceContextMac :: InitFontInfoList()
 										(TextPtr)unicodeFontName , sizeof(unicodeFontName), &actualOutputLength);	
 			unicodeFontName[actualOutputLength / sizeof(PRUnichar)] = '\0';
 
-    		FontNameKey key(unicodeFontName);
+			nsAutoString temp(unicodeFontName);
+    		FontNameKey key(temp);
 			gFontInfoList->Put(&key, (void*)fontFamily);
         }
         if (converter)

gfx/src/mac/nsWatchTask.cpp

@@ -52,8 +52,10 @@ nsWatchTask :: nsWatchTask ( )
 
 nsWatchTask :: ~nsWatchTask ( ) 
 {
+#if !TARGET_CARBON
   if ( mInstallSucceeded )
     ::VRemove ( (QElemPtr)&mTask );
+#endif
   InitCursor();
 }
 
@@ -68,6 +70,7 @@ nsWatchTask :: ~nsWatchTask ( )
 void
 nsWatchTask :: Start ( )
 {
+#if !TARGET_CARBON
   // get the watch cursor and lock it high
   CursHandle watch = ::GetCursor ( watchCursor );
   if ( !watch )
@@ -76,12 +79,13 @@ nsWatchTask :: Start ( )
   
   // setup the task
   mTask.qType = vType;
-	mTask.vblAddr = NewVBLProc((VBLProcPtr)DoWatchTask);
+  mTask.vblAddr = NewVBLProc((VBLProcPtr)DoWatchTask);
   mTask.vblCount = kRepeatInterval;
   mTask.vblPhase = 0;
   
   // install it
   mInstallSucceeded = ::VInstall((QElemPtr)&mTask) == noErr;
+#endif
 
 } // Start
 
@@ -102,7 +106,12 @@ nsWatchTask :: DoWatchTask ( nsWatchTask* inSelf )
 {
   if ( inSelf->mChecksum == 'mozz' ) {
     if ( !inSelf->mSuspended  ) {
-      if ( !inSelf->mBusy && !LMGetCrsrBusy() ) {
+      #if TARGET_CARBON
+ 	  PRBool busy = inSelf->mBusy;
+ 	  #else
+ 	  PRBool busy = inSelf->mBusy && LMGetCrsrBusy();
+ 	  #endif   
+      if ( !busy ) {
         if ( ::TickCount() - inSelf->mTicks > kTicksToShowWatch ) {
           ::SetCursor ( &(inSelf->mWatchCursor) );
           inSelf->mBusy = PR_TRUE;

lib/mac/NSRuntime/NSRuntime.exp

@@ -3,8 +3,6 @@ __del_arr
 __new_arr
 __init_arr
 __copy
-__som_check_ev
-__som_check_new
 __vt__Q23std13bad_exception		# std::bad_exception::__vt
 #__vt__Q23std9exception			# std::exception::__vt
 #what__Q23std9exceptionCFv		# std::exception::what() const

modules/libimg/src/xpcompat.cpp

@@ -29,6 +29,9 @@
  * of the XP_ library.
  */
 #include "xpcompat.h"
+#if TARGET_CARBON
+# include <time.h>
+#endif
 #include <stdlib.h>
 #include "prlog.h"
 #include "prmem.h"

widget/src/mac/nsFilePicker.cpp

@@ -496,6 +496,7 @@ nsFilePicker :: MapFilterToFileTypes ( )
 	
 	// grab the IC mappingDB so that it's a little faster looping over the file
 	// types.
+#if !TARGET_CARBON
 	icErr = ICStart(&icInstance, 'MOZZ');
 	if (icErr == noErr)
 	{
@@ -510,6 +511,7 @@ nsFilePicker :: MapFilterToFileTypes ( )
 			goto bail_w_IC;
 	}
 	else
+#endif
 		goto bail_wo_IC;
 	
 	

widget/src/mac/nsMenu.cpp

@@ -1514,7 +1514,11 @@ nsMenu::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom *
       {
         MenuHandle   nextHandle;
         nextVisibleMenu->GetNativeData((void **)&nextHandle);
-        nextMenuID = (nextHandle) ? (**nextHandle).menuID : mMacMenuID + 1;            
+        #if TARGET_CARBON
+        nextMenuID = (nextHandle) ? ::GetMenuID(nextHandle) : mMacMenuID + 1;        
+        #else
+        nextMenuID = (nextHandle) ? (**nextHandle).menuID : mMacMenuID + 1;
+        #endif
       }
       else
       {
@@ -1559,7 +1563,11 @@ nsMenu::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom *
           {
             MenuHandle   nextHandle;
             nextVisibleMenu->GetNativeData((void **)&nextHandle);
-            nextMenuID = (nextHandle) ? (**nextHandle).menuID : mMacMenuID + 1;            
+	        #if TARGET_CARBON
+	        nextMenuID = (nextHandle) ? ::GetMenuID(nextHandle) : mMacMenuID + 1;        
+	        #else
+	        nextMenuID = (nextHandle) ? (**nextHandle).menuID : mMacMenuID + 1;
+	        #endif
           }
           else
           {