Revision: 7024 Author: ek.kato Date: Sun May 8 08:05:21 2011 Log: * xim/Makefile.am : Define USE_GTK3_CANDWIN if default_toolkit is gtk3. * xim/canddisp.cpp (DEFAULT_CANDWIN_PROG) : Add uim-candwin-gtk3.
http://code.google.com/p/uim/source/detail?r=7024 Modified: /trunk/xim/Makefile.am /trunk/xim/canddisp.cpp ======================================= --- /trunk/xim/Makefile.am Sat Sep 26 11:30:24 2009 +++ /trunk/xim/Makefile.am Sun May 8 08:05:21 2011 @@ -15,6 +15,9 @@ if DEFAULT_TOOLKIT_GTK uim_xim_CPPFLAGS += -DUSE_GTK_CANDWIN endif +if DEFAULT_TOOLKIT_GTK3 +uim_xim_CPPFLAGS += -DUSE_GTK3_CANDWIN +endif if DEFAULT_TOOLKIT_QT uim_xim_CPPFLAGS += -DUSE_QT_CANDWIN endif ======================================= --- /trunk/xim/canddisp.cpp Sun May 1 21:20:23 2011 +++ /trunk/xim/canddisp.cpp Sun May 8 08:05:21 2011 @@ -57,6 +57,8 @@ #define DEFAULT_CANDWIN_PROG (UIM_LIBEXECDIR "/uim-candwin-qt4") #elif defined(USE_GTK_CANDWIN) && defined(USE_GTK2) #define DEFAULT_CANDWIN_PROG (UIM_LIBEXECDIR "/uim-candwin-gtk") +#elif defined(USE_GTK3_CANDWIN) + #define DEFAULT_CANDWIN_PROG (UIM_LIBEXECDIR "/uim-candwin-gtk3") #else #define DEFAULT_CANDWIN_PROG NULL #endif
