t-suw****@users*****
t-suw****@users*****
2007年 9月 22日 (土) 08:35:02 JST
Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.44 AquaSKK/ChangeLog:1.45 --- AquaSKK/ChangeLog:1.44 Wed Sep 19 22:57:17 2007 +++ AquaSKK/ChangeLog Sat Sep 22 08:35:01 2007 @@ -1,3 +1,8 @@ +2007-09-22 Tomotaka SUWA <t.suw****@mac*****> + + * KotoeriDictionary.cpp: æ¤ç´¢çµæãåãåºãã¿ã¤ãã + typeUnicodeText ã«çµ±ä¸ãã¦ã³ã³ãã¤ã©ãã£ã¬ã¯ãã£ããé¤å»ã + 2007-09-19 Tomotaka SUWA <t.suw****@mac*****> * BIMInputEvents.cpp (BIMHandleOffsetToPos): ã»ãã·ã§ã³ãã³ãã«ãè¦ Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.17 AquaSKK/Info-AquaSKKInputMethod.plist:1.18 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.17 Wed Sep 19 22:57:17 2007 +++ AquaSKK/Info-AquaSKKInputMethod.plist Sat Sep 22 08:35:01 2007 @@ -23,7 +23,7 @@ <key>CFBundleSignature</key> <string>askk</string> <key>CFBundleVersion</key> - <string>2007-09-18</string> + <string>2007-09-22</string> <key>CSResourcesFileMapped</key> <true/> <key>tsInputMethodIconFileKey</key> Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.17 AquaSKK/Info-AquaSKKServer.plist:1.18 --- AquaSKK/Info-AquaSKKServer.plist:1.17 Wed Sep 19 22:57:17 2007 +++ AquaSKK/Info-AquaSKKServer.plist Sat Sep 22 08:35:01 2007 @@ -23,7 +23,7 @@ <key>CFBundleSignature</key> <string>askk</string> <key>CFBundleVersion</key> - <string>2007-09-18</string> + <string>2007-09-22</string> <key>NSMainNibFile</key> <string>Principal</string> <key>NSPrincipalClass</key> Index: AquaSKK/KotoeriDictionary.cpp diff -u AquaSKK/KotoeriDictionary.cpp:1.6 AquaSKK/KotoeriDictionary.cpp:1.7 --- AquaSKK/KotoeriDictionary.cpp:1.6 Thu Sep 20 00:10:20 2007 +++ AquaSKK/KotoeriDictionary.cpp Sat Sep 22 08:35:01 2007 @@ -1,10 +1,10 @@ /* - $Id: KotoeriDictionary.cpp,v 1.6 2007/09/19 15:10:20 t-suwa Exp $ + $Id: KotoeriDictionary.cpp,v 1.7 2007/09/21 23:35:01 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002 phonohawk - Copyright (C) 2005-2006 Tomotaka SUWA <t.suw****@mac*****> + Copyright (C) 2005-2007 Tomotaka SUWA <t.suw****@mac*****> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -130,11 +130,7 @@ // Get one data from AERecord status = AEGetParamPtr(&dataList, kDCMJapaneseHyokiTag, -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - typeUTF16ExternalRepresentation, -#else typeUnicodeText, -#endif &actualType, dataBuffer, kMaxKanjiLengthInAppleJapaneseDictionary, @@ -145,13 +141,9 @@ if(status != noErr) break; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - CppCFString tmp(CppCFData(dataBuffer, actualSize).getData()); -#else CFStringRef entry = CFStringCreateWithBytes(0, dataBuffer, actualSize, kCFStringEncodingUnicode, 0); CppCFString tmp(entry); CFRelease(entry); -#endif result += '/'; result += tmp.encode().toStdString(kCFStringEncodingUTF8);