[uim] r7087 committed - * Merge r7086 from trunk.

[codesite-noreply]

Revision: 7087
Author:   ek.kato
Date:     Sun May 15 06:02:28 2011
Log:      * Merge r7086 from trunk.
http://code.google.com/p/uim/source/detail?r=7087

Modified:
 /branches/1.7/gtk/uim-cand-win-gtk.c
 /branches/1.7/helper/candwin-gtk.c

=======================================
--- /branches/1.7/gtk/uim-cand-win-gtk.c        Fri May 13 23:08:40 2011
+++ /branches/1.7/gtk/uim-cand-win-gtk.c        Sun May 15 06:02:28 2011
@@ -900,11 +900,7 @@

   cwin->sub_window.text_view = text_view = gtk_text_view_new();
   gtk_text_view_set_editable(GTK_TEXT_VIEW(text_view), FALSE);
-#if GTK_CHECK_VERSION(2, 90, 0)
   gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_view),  
GTK_WRAP_WORD_CHAR);
-#else
-  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_view), GTK_WRAP_WORD);
-#endif
   gtk_widget_show(text_view);

   gtk_container_add(GTK_CONTAINER(scrwin), text_view);
=======================================
--- /branches/1.7/helper/candwin-gtk.c  Sat Feb 12 04:56:34 2011
+++ /branches/1.7/helper/candwin-gtk.c  Sun May 15 06:02:28 2011
@@ -1013,7 +1013,7 @@

   cwin->sub_window.text_view = text_view = gtk_text_view_new();
   gtk_text_view_set_editable(GTK_TEXT_VIEW(text_view), FALSE);
-  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_view), GTK_WRAP_WORD);
+  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_view),  
GTK_WRAP_WORD_CHAR);
   gtk_widget_show(text_view);

   gtk_container_add(GTK_CONTAINER(scrwin), text_view);