Tomotaka SUWA
t-suw****@users*****
2005年 9月 24日 (土) 09:29:34 JST
Index: AquaSKK/AsciiConversionMode.cpp diff -u AquaSKK/AsciiConversionMode.cpp:1.1.1.1.2.1 AquaSKK/AsciiConversionMode.cpp:1.1.1.1.2.2 --- AquaSKK/AsciiConversionMode.cpp:1.1.1.1.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/AsciiConversionMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: AsciiConversionMode.cpp,v 1.1.1.1.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: AsciiConversionMode.cpp,v 1.1.1.1.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include <map> #include "BIM.h" Index: AquaSKK/BIMComponent.cpp diff -u AquaSKK/BIMComponent.cpp:1.2.2.1 AquaSKK/BIMComponent.cpp:1.2.2.2 --- AquaSKK/BIMComponent.cpp:1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/BIMComponent.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: BIMComponent.cpp,v 1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: BIMComponent.cpp,v 1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,6 +21,7 @@ */ #define TARGET_API_MAC_CARBON 1 +#include <Carbon/Carbon.h> #include <vector> #include "BIM.h" #include "BIMClientServer.h" Index: AquaSKK/BS.mm diff -u AquaSKK/BS.mm:1.1.1.2 AquaSKK/BS.mm:1.1.1.2.2.1 --- AquaSKK/BS.mm:1.1.1.2 Sun Jul 17 19:50:26 2005 +++ AquaSKK/BS.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ -/* - $Id: BS.mm,v 1.1.1.2 2005/07/17 10:50:26 t-suwa Exp $ +/* -*- objc -*- + $Id: BS.mm,v 1.1.1.2.2.1 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,9 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #import <Cocoa/Cocoa.h> -int main( int argc, const char *argv[] ) +int main(int argc, const char *argv[]) { - return NSApplicationMain(argc, argv); + return NSApplicationMain(argc, argv); } Index: AquaSKK/CandidatesFrame.m diff -u AquaSKK/CandidatesFrame.m:1.1.1.1.2.1 AquaSKK/CandidatesFrame.m:1.1.1.1.2.2 --- AquaSKK/CandidatesFrame.m:1.1.1.1.2.1 Fri Sep 23 11:20:44 2005 +++ AquaSKK/CandidatesFrame.m Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CandidatesFrame.m,v 1.1.1.1.2.1 2005/09/23 02:20:44 t-suwa Exp $ +/* $Id: CandidatesFrame.m,v 1.1.1.1.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import <AppKit/AppKit.h> #import "CandidatesFrame.h" @implementation CandidatesFrame Index: AquaSKK/CandidatesManager.mm diff -u AquaSKK/CandidatesManager.mm:1.1.1.2.2.1 AquaSKK/CandidatesManager.mm:1.1.1.2.2.2 --- AquaSKK/CandidatesManager.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CandidatesManager.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: CandidatesManager.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CandidatesManager.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import <Foundation/Foundation.h> #import <AppKit/AppKit.h> #import "CandidatesView.h" #import "CandidatesWindowController.h" Index: AquaSKK/CandidatesView.mm diff -u AquaSKK/CandidatesView.mm:1.1.1.2 AquaSKK/CandidatesView.mm:1.1.1.2.2.1 --- AquaSKK/CandidatesView.mm:1.1.1.2 Sun Jul 17 19:50:26 2005 +++ AquaSKK/CandidatesView.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ -/* - $Id: CandidatesView.mm,v 1.1.1.2 2005/07/17 10:50:26 t-suwa Exp $ +/* -*- objc -*- + $Id: CandidatesView.mm,v 1.1.1.2.2.1 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,9 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import "CandidatesView.h" -#import "CandidatesWindowController.h" + +#import <AppKit/AppKit.h> #import "CandidatesFrame.h" +#import "CandidatesView.h" @implementation CandidatesView Index: AquaSKK/CandidatesWindowController.mm diff -u AquaSKK/CandidatesWindowController.mm:1.1.1.2.2.1 AquaSKK/CandidatesWindowController.mm:1.1.1.2.2.2 --- AquaSKK/CandidatesWindowController.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CandidatesWindowController.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: CandidatesWindowController.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CandidatesWindowController.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import <AppKit/AppKit.h> #import "CandidatesView.h" #import "CandidatesWindowController.h" #import "PreferencesController.h" Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.4.2.3 AquaSKK/ChangeLog:1.4.2.4 --- AquaSKK/ChangeLog:1.4.2.3 Fri Sep 23 23:09:49 2005 +++ AquaSKK/ChangeLog Sat Sep 24 09:29:33 2005 @@ -1,3 +1,9 @@ +2005-09-24 Tomotaka SUWA <t.suw****@mac*****> + + * TransparentWindow.*: KvÈt@C¾Á½ÌÅAÄxÇÁB + + * PrivateRunLoop.mm: autoreleasepool Ìú»ðÇÁB + 2005-09-23 Tomotaka SUWA <t.suw****@mac*****> * util/StringUtils.*: íB Index: AquaSKK/CharacterTranslator.cpp diff -u AquaSKK/CharacterTranslator.cpp:1.1.1.2.2.1 AquaSKK/CharacterTranslator.cpp:1.1.1.2.2.2 --- AquaSKK/CharacterTranslator.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CharacterTranslator.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CharacterTranslator.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: CharacterTranslator.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <fstream> #include <string> #include <vector> Index: AquaSKK/ChildInputMode.cpp diff -u AquaSKK/ChildInputMode.cpp:1.1.1.2.2.1 AquaSKK/ChildInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ChildInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ChildInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ChildInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ChildInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include "CppCFString.h" #include "CppCFData.h" Index: AquaSKK/ClientConfiguration.cpp diff -u AquaSKK/ClientConfiguration.cpp:1.1.1.2.2.1 AquaSKK/ClientConfiguration.cpp:1.1.1.2.2.2 --- AquaSKK/ClientConfiguration.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ClientConfiguration.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ClientConfiguration.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ClientConfiguration.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include "BIMClientServer.h" #include "CppCFString.h" @@ -53,11 +54,12 @@ CppCFData result = ServerConnectionFactory::theInstance().newConnection().send( - kBasicMessageIsSkkEggLikeNewline); + kBasicMessageIsSkkEggLikeNewline, + kAquaSKKServerRunLoopMode); if(result.getLength() == sizeof(bool)) { // Ô³ê½lͽª³µ¢¾ë¤B - result.copyData(0,sizeof(bool),&skkEggLikeNewline); + result.copyData(0, sizeof(bool), &skkEggLikeNewline); } else { skkEggLikeNewline = false; } Index: AquaSKK/ClientMessageReceiver.cpp diff -u AquaSKK/ClientMessageReceiver.cpp:1.1.1.2.2.1 AquaSKK/ClientMessageReceiver.cpp:1.1.1.2.2.2 --- AquaSKK/ClientMessageReceiver.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ClientMessageReceiver.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ClientMessageReceiver.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ClientMessageReceiver.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include "BIMClientServer.h" #include "CppCFString.h" Index: AquaSKK/CppCFData.cpp diff -u AquaSKK/CppCFData.cpp:1.1.1.2 AquaSKK/CppCFData.cpp:1.1.1.2.2.1 --- AquaSKK/CppCFData.cpp:1.1.1.2 Sun Jul 17 19:50:27 2005 +++ AquaSKK/CppCFData.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CppCFData.cpp,v 1.1.1.2 2005/07/17 10:50:27 t-suwa Exp $ +/* $Id: CppCFData.cpp,v 1.1.1.2.2.1 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include <CoreFoundation/CoreFoundation.h> #include "CppCFData.h" CppCFData::CppCFData() Index: AquaSKK/CppCFString.cpp diff -u AquaSKK/CppCFString.cpp:1.1.1.2.2.1 AquaSKK/CppCFString.cpp:1.1.1.2.2.2 --- AquaSKK/CppCFString.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppCFString.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CppCFString.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: CppCFString.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <vector> #include "CppCFString.h" Index: AquaSKK/CppMessagePortServer.cpp diff -u AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.1 AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.2 --- AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppMessagePortServer.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: CppMessagePortServer.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CppMessagePortServer.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,6 +21,7 @@ */ #include <CoreFoundation/CoreFoundation.h> +#include <CoreServices/CoreServices.h> #include <exception> #include <vector> #include "CppCFString.h" Index: AquaSKK/CppScrap.cpp diff -u AquaSKK/CppScrap.cpp:1.1.1.1.2.1 AquaSKK/CppScrap.cpp:1.1.1.1.2.2 --- AquaSKK/CppScrap.cpp:1.1.1.1.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppScrap.cpp Sat Sep 24 09:29:33 2005 @@ -7,6 +7,7 @@ * */ +#include <Carbon/Carbon.h> #include <exception> #include "CppCFData.h" #include "CppScrap.h" Index: AquaSKK/DMDictionary.cpp diff -u AquaSKK/DMDictionary.cpp:1.1.1.2.2.1 AquaSKK/DMDictionary.cpp:1.1.1.2.2.2 --- AquaSKK/DMDictionary.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/DMDictionary.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: DMDictionary.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: DMDictionary.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -23,6 +23,7 @@ Directory ManegerÎ@2002.09.25 Shin_ichi Abe. */ +#include <Carbon/Carbon.h> #include <fstream> #include <vector> #include "CppCFString.h" Index: AquaSKK/Foundation.mm diff -u AquaSKK/Foundation.mm:1.1.1.2.2.1 AquaSKK/Foundation.mm:1.1.1.2.2.2 --- AquaSKK/Foundation.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/Foundation.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: Foundation.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: Foundation.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,12 +20,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import <AppKit/AppKit.h> #import "Foundation.h" #import "CandidatesView.h" #import "CandidatesWindowController.h" #import "UserDicSaver.h" #import "PreferencesController.h" +#include <Carbon/Carbon.h> #include <string> #include <vector> #include <map> Index: AquaSKK/HanAscInputMode.cpp diff -u AquaSKK/HanAscInputMode.cpp:1.1.1.2.2.1 AquaSKK/HanAscInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/HanAscInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/HanAscInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: HanAscInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: HanAscInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <map> Index: AquaSKK/HanKataInputMode.cpp diff -u AquaSKK/HanKataInputMode.cpp:1.1.1.2.2.1 AquaSKK/HanKataInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/HanKataInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/HanKataInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: HanKataInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: HanKataInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <map> Index: AquaSKK/HiraganaInputMode.cpp diff -u AquaSKK/HiraganaInputMode.cpp:1.1.1.2.2.1 AquaSKK/HiraganaInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/HiraganaInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/HiraganaInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: HiraganaInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: HiraganaInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,10 +18,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <map> -#include "BIM.h" #include "CppCFString.h" #include "CppCFData.h" #include "InputMode.h" Index: AquaSKK/IMSessionInputMode.cpp diff -u AquaSKK/IMSessionInputMode.cpp:1.1.1.2.2.1 AquaSKK/IMSessionInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/IMSessionInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/IMSessionInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: IMSessionInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: IMSessionInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include "BIM.h" #include "BIMInputEvents.h" Index: AquaSKK/KanaTreeController.cpp diff -u AquaSKK/KanaTreeController.cpp:1.1.1.2.2.1 AquaSKK/KanaTreeController.cpp:1.1.1.2.2.2 --- AquaSKK/KanaTreeController.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/KanaTreeController.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: KanaTreeController.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: KanaTreeController.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <iostream> #include <fstream> #include <string> Index: AquaSKK/KanaTreeElement.cpp diff -u AquaSKK/KanaTreeElement.cpp:1.1.1.2.2.1 AquaSKK/KanaTreeElement.cpp:1.1.1.2.2.2 --- AquaSKK/KanaTreeElement.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/KanaTreeElement.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: KanaTreeElement.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: KanaTreeElement.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <vector> #include "CppCFString.h" #include "KanaTreeElement.h" Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.1.1.2.2.1 AquaSKK/KanjiConversionMode.cpp:1.1.1.2.2.2 --- AquaSKK/KanjiConversionMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/KanjiConversionMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: KanjiConversionMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: KanjiConversionMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include <map> #include "BIM.h" Index: AquaSKK/OkuriganaEntry.cpp diff -u AquaSKK/OkuriganaEntry.cpp:1.1.1.2.2.1 AquaSKK/OkuriganaEntry.cpp:1.1.1.2.2.2 --- AquaSKK/OkuriganaEntry.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/OkuriganaEntry.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: OkuriganaEntry.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: OkuriganaEntry.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <vector> #include "CppCFString.h" #include "OkuriganaEntry.h" Index: AquaSKK/ParentInputMode.cpp diff -u AquaSKK/ParentInputMode.cpp:1.1.1.2.2.1 AquaSKK/ParentInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ParentInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ParentInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ParentInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ParentInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <cassert> Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.1.1.2.2.2 AquaSKK/PreferencesController.mm:1.1.1.2.2.3 --- AquaSKK/PreferencesController.mm:1.1.1.2.2.2 Fri Sep 23 22:29:10 2005 +++ AquaSKK/PreferencesController.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.1.1.2.2.2 2005/09/23 13:29:10 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.1.1.2.2.3 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,8 +20,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import <AppKit/AppKit.h> #import "PreferencesController.h" +#include <Carbon/Carbon.h> #include <string> #include <vector> #include <map> @@ -140,7 +142,7 @@ CppCFData data(&skkegglikenewline, sizeof(bool)); ClientConnectionFactory::theInstance().newConnection().send( - kBasicMessageIsSkkEggLikeNewline, data, kAquaSKKClientRunLoopMode); + kBasicMessageIsSkkEggLikeNewline, data); [self saveUserDefault:self]; } Index: AquaSKK/PrivateRunLoop.cpp diff -u AquaSKK/PrivateRunLoop.cpp:1.1.2.1 AquaSKK/PrivateRunLoop.cpp:removed --- AquaSKK/PrivateRunLoop.cpp:1.1.2.1 Fri Sep 23 11:27:44 2005 +++ AquaSKK/PrivateRunLoop.cpp Sat Sep 24 09:29:34 2005 @@ -1,84 +0,0 @@ -/* - $Id: PrivateRunLoop.cpp,v 1.1.2.1 2005/09/23 02:27:44 t-suwa Exp $ - - MacOS X implementation of the SKK input method. - - Copyright (C) 2005 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 - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include <CoreFoundation/CoreFoundation.h> -#include <CoreServices/CoreServices.h> -#include "PrivateRunLoop.h" - -PrivateRunLoop::PrivateRunLoop( - const CFStringRef mode, CFRunLoopSourceRef runLoopSource) - : mode_(mode), runLoop_(0) -{ - // Û - runLoopSource_ = (CFRunLoopSourceRef)CFRetain(runLoopSource); - - // ^XN(=Xbh)®¹ÊmpÌbZ[WL [ð쬷é - MPCreateQueue(¬ifyQueue_); - - // ^XNðç¹é - MPCreateTask(PrivateRunLoop::entryPoint, - this, - 0, - notifyQueue_, - NULL, - NULL, - 0, - &taskID_); -} - -PrivateRunLoop::~PrivateRunLoop() -{ - // ^XNð~ßé - CFRunLoopStop(runLoop_); - - // ®SÉ®¹·éÌðÒ - MPWaitOnQueue(notifyQueue_, NULL, NULL, NULL, kDurationForever); - MPDeleteQueue(notifyQueue_); - - // jü - CFRelease(runLoopSource_); -} - -// ^XN{Ì -OSStatus PrivateRunLoop::entryPoint(void* param) -{ - PrivateRunLoop* self = (PrivateRunLoop*)param; - self->runLoop_ = CFRunLoopGetCurrent(); - - // ÄÎÛðÇÁ - CFRunLoopAddSource(self->runLoop_, - self->runLoopSource_, - self->mode_); - - // CFRunLoopStop() ªÄÎêéÜÅCxgð·é - SInt32 result; - do { - result = CFRunLoopRunInMode(self->mode_, 1, true); - } while(result != kCFRunLoopRunStopped); - - // ãn - CFRunLoopRemoveSource(self->runLoop_, - self->runLoopSource_, - self->mode_); - - return 0; -} Index: AquaSKK/PrivateRunLoop.mm diff -u /dev/null AquaSKK/PrivateRunLoop.mm:1.1.2.1 --- /dev/null Sat Sep 24 09:29:34 2005 +++ AquaSKK/PrivateRunLoop.mm Sat Sep 24 09:29:33 2005 @@ -0,0 +1,91 @@ +/* -*- objc -*- + $Id: PrivateRunLoop.mm,v 1.1.2.1 2005/09/24 00:29:33 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + + Copyright (C) 2005 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import <Foundation/NSAutoreleasePool.h> + +#include <CoreFoundation/CoreFoundation.h> +#include <CoreServices/CoreServices.h> +#include "PrivateRunLoop.h" + +PrivateRunLoop::PrivateRunLoop( + const CFStringRef mode, CFRunLoopSourceRef runLoopSource) + : mode_(mode), runLoop_(0) +{ + // Û + runLoopSource_ = (CFRunLoopSourceRef)CFRetain(runLoopSource); + + // ^XN(=Xbh)®¹ÊmpÌbZ[WL [ð쬷é + MPCreateQueue(¬ifyQueue_); + + // ^XNðç¹é + MPCreateTask(PrivateRunLoop::entryPoint, + this, + 0, + notifyQueue_, + NULL, + NULL, + 0, + &taskID_); +} + +PrivateRunLoop::~PrivateRunLoop() +{ + // ^XNð~ßé + CFRunLoopStop(runLoop_); + + // ®SÉ®¹·éÌðÒ + MPWaitOnQueue(notifyQueue_, NULL, NULL, NULL, kDurationForever); + MPDeleteQueue(notifyQueue_); + + // jü + CFRelease(runLoopSource_); +} + +// ^XN{Ì +OSStatus PrivateRunLoop::entryPoint(void* param) +{ + // autorelease pool ðú»µÈ¢ÆA[NµÄµÜ¤ + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + PrivateRunLoop* self = (PrivateRunLoop*)param; + self->runLoop_ = CFRunLoopGetCurrent(); + + // ÄÎÛðÇÁ + CFRunLoopAddSource(self->runLoop_, + self->runLoopSource_, + self->mode_); + + // CFRunLoopStop() ªÄÎêéÜÅCxgð·é + SInt32 result; + do { + result = CFRunLoopRunInMode(self->mode_, 1, true); + } while(result != kCFRunLoopRunStopped); + + // ãn + CFRunLoopRemoveSource(self->runLoop_, + self->runLoopSource_, + self->mode_); + + [pool release]; + + return 0; +} Index: AquaSKK/SKKDictionary.cpp diff -u AquaSKK/SKKDictionary.cpp:1.1.1.2.2.1 AquaSKK/SKKDictionary.cpp:1.1.1.2.2.2 --- AquaSKK/SKKDictionary.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/SKKDictionary.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: SKKDictionary.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: SKKDictionary.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <map> #include <vector> #include <iostream> Index: AquaSKK/SKKServer.cpp diff -u AquaSKK/SKKServer.cpp:1.1.1.2.2.2 AquaSKK/SKKServer.cpp:1.1.1.2.2.3 --- AquaSKK/SKKServer.cpp:1.1.1.2.2.2 Fri Sep 23 23:09:49 2005 +++ AquaSKK/SKKServer.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: SKKServer.cpp,v 1.1.1.2.2.2 2005/09/23 14:09:49 t-suwa Exp $ +/* $Id: SKKServer.cpp,v 1.1.1.2.2.3 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <iostream> #include <string> #include <vector> Index: AquaSKK/ServerConnection.cpp diff -u AquaSKK/ServerConnection.cpp:1.1.1.2.2.1 AquaSKK/ServerConnection.cpp:1.1.1.2.2.2 --- AquaSKK/ServerConnection.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ServerConnection.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ServerConnection.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ServerConnection.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,12 +20,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> +#include "BIMClientServer.h" #include "CppCFString.h" #include "CppCFData.h" #include "CppMessagePortConnection.h" #include "ServerConnection.h" -#include "BIMClientServer.h" ServerConnection::ServerConnection(const CppCFString& port) throw(std::exception) Index: AquaSKK/ServerConnectionFactory.cpp diff -u AquaSKK/ServerConnectionFactory.cpp:1.1.1.2.2.1 AquaSKK/ServerConnectionFactory.cpp:1.1.1.2.2.2 --- AquaSKK/ServerConnectionFactory.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ServerConnectionFactory.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ServerConnectionFactory.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ServerConnectionFactory.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <vector> #include "BIMClientServer.h" #include "CppCFString.h" Index: AquaSKK/ServerMessageReceiver.mm diff -u AquaSKK/ServerMessageReceiver.mm:1.1.1.2.2.1 AquaSKK/ServerMessageReceiver.mm:1.1.1.2.2.2 --- AquaSKK/ServerMessageReceiver.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ServerMessageReceiver.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: ServerMessageReceiver.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ServerMessageReceiver.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -26,6 +26,7 @@ #import "PreferencesController.h" #import "UserDicSaver.h" +#include <Carbon/Carbon.h> #include <string> #include <vector> #include <map> @@ -236,7 +237,7 @@ bool isSkkEggLikeNewline = [[PreferencesController sharedController] isSkkEggLikeNewline] ? true : false; - return CppCFData(&isSkkEggLikeNewline,sizeof(bool)); + return CppCFData(&isSkkEggLikeNewline, sizeof(bool)); } CppCFData ServerMessageReceiver::fetchCompletions(const CppCFData& attachment) Index: AquaSKK/SkkConfig.cpp diff -u AquaSKK/SkkConfig.cpp:1.1.1.2.2.1 AquaSKK/SkkConfig.cpp:1.1.1.2.2.2 --- AquaSKK/SkkConfig.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/SkkConfig.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - * $Id: SkkConfig.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + * $Id: SkkConfig.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ * * KeymapConfig.cpp * AquaSKK @@ -9,6 +9,7 @@ * */ +#include <CoreFoundation/CoreFoundation.h> #include <sys/types.h> #include <pwd.h> #include <iostream> Index: AquaSKK/Skkserv.cpp diff -u AquaSKK/Skkserv.cpp:1.1.1.2.2.1 AquaSKK/Skkserv.cpp:1.1.1.2.2.2 --- AquaSKK/Skkserv.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/Skkserv.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: Skkserv.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: Skkserv.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <Carbon/Carbon.h> #include <iostream> #include <string> #include <vector> Index: AquaSKK/TransparentWindow.h diff -u /dev/null AquaSKK/TransparentWindow.h:1.1.1.2.2.2 --- /dev/null Sat Sep 24 09:29:34 2005 +++ AquaSKK/TransparentWindow.h Sat Sep 24 09:29:33 2005 @@ -0,0 +1,26 @@ +/* -*- objc -*- + $Id: TransparentWindow.h,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + --------- + + MacOS X implementation of the SKK input method. + Copyright (C) 2002 phonohawk + + 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + + @ interface TransparentWindow : NSWindow +{ +} + @ end Index: AquaSKK/TransparentWindow.m diff -u /dev/null AquaSKK/TransparentWindow.m:1.1.1.2.2.2 --- /dev/null Sat Sep 24 09:29:34 2005 +++ AquaSKK/TransparentWindow.m Sat Sep 24 09:29:33 2005 @@ -0,0 +1,38 @@ +/* + $Id: TransparentWindow.m,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + --------- + + MacOS X implementation of the SKK input method. + Copyright (C) 2002 phonohawk + + 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import <AppKit/AppKit.h> +#import "TransparentWindow.h" + + @ implementation TransparentWindow + +- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag +{ + NSWindow *obj = [super initWithContentRect:contentRect + styleMask:NSBorderlessWindowMask + backing:backingType + defer:flag]; + [obj setOpaque:NO]; + return obj; +} + + @ end Index: AquaSKK/UserDicSaver.mm diff -u AquaSKK/UserDicSaver.mm:1.1.1.2.2.1 AquaSKK/UserDicSaver.mm:1.1.1.2.2.2 --- AquaSKK/UserDicSaver.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/UserDicSaver.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: UserDicSaver.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: UserDicSaver.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import <AppKit/AppKit.h> #import "UserDicSaver.h" #include <iostream> Index: AquaSKK/WordRegisterMode.cpp diff -u AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.1 AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.2 --- AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/WordRegisterMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: WordRegisterMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: WordRegisterMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <map> Index: AquaSKK/ZenAscInputMode.cpp diff -u AquaSKK/ZenAscInputMode.cpp:1.1.1.2.2.1 AquaSKK/ZenAscInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ZenAscInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ZenAscInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ZenAscInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ZenAscInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <map> Index: AquaSKK/ZenKataInputMode.cpp diff -u AquaSKK/ZenKataInputMode.cpp:1.1.1.2.2.1 AquaSKK/ZenKataInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ZenKataInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ZenKataInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ZenKataInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ZenKataInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <CoreFoundation/CoreFoundation.h> #include <string> #include <vector> #include <map>