Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2214/squeak/platforms/Mac OS/vm
Modified Files:
sqMacUIAppleEvents.c
Log Message:
3.7.3b4 Update for normalized unicode pathnames
Index: sqMacUIAppleEvents.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacUIAppleEvents.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqMacUIAppleEvents.c 2 Dec 2003 04:52:56 -0000 1.2
--- sqMacUIAppleEvents.c 23 Apr 2004 20:46:38 -0000 1.3
***************
*** 10,13 ****
--- 10,14 ----
*
* NOTES:
+ * 3.7.3b2 Apr 10th, 2004 JMM Tetsuya HAYASHI <te...@st...> encoding for image name at startup time.
*/
***************
*** 24,27 ****
--- 25,29 ----
int getFirstImageNameIfPossible(AEDesc *fileList);
void processDocumentsButExcludeOne(AEDesc *fileList,long whichToExclude);
+ UInt32 getEncoding();
/*** Apple Event Handlers ***/
***************
*** 83,87 ****
CopyPascalStringToC(name,cname);
! SetShortImageNameViaString(cname,gCurrentVMEncoding);
SetImageName( &workingDirectory);
--- 85,89 ----
CopyPascalStringToC(name,cname);
! SetShortImageNameViaString(cname,getEncoding());
SetImageName( &workingDirectory);
***************
*** 137,141 ****
strcpy(shortImageName, "Squeak.image");
CopyCStringToPascal(shortImageName,workingDirectory.name);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
SetImageName(&workingDirectory);
fileSpec = workingDirectory;
--- 139,143 ----
strcpy(shortImageName, "Squeak.image");
CopyCStringToPascal(shortImageName,workingDirectory.name);
! SetShortImageNameViaString(shortImageName,getEncoding());
SetImageName(&workingDirectory);
fileSpec = workingDirectory;
***************
*** 151,155 ****
CopyPascalStringToC(fileSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
SetImageName(&fileSpec);
}
--- 153,157 ----
CopyPascalStringToC(fileSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,getEncoding());
SetImageName(&fileSpec);
}
***************
*** 276,280 ****
CopyPascalStringToC(fileSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
if (IsImageName(shortImageName) || finderInformation.fdType == 'STim')
--- 278,282 ----
CopyPascalStringToC(fileSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,getEncoding());
if (IsImageName(shortImageName) || finderInformation.fdType == 'STim')
***************
*** 296,297 ****
--- 298,307 ----
}
+ UInt32 getEncoding() {
+ #if TARGET_API_MAC_CARBON
+ return CFStringGetSystemEncoding();
+ #else
+ return 0;
+ #endif
+ }
+
|
