Takuro Ashie
makei****@users*****
2006年 11月 30日 (木) 14:07:39 JST
Index: libtomoe-gtk/src/tomoe-window.c
diff -u libtomoe-gtk/src/tomoe-window.c:1.20 libtomoe-gtk/src/tomoe-window.c:1.21
--- libtomoe-gtk/src/tomoe-window.c:1.20 Tue Nov 28 10:38:41 2006
+++ libtomoe-gtk/src/tomoe-window.c Thu Nov 30 14:07:39 2006
@@ -65,8 +65,9 @@
static void
tomoe_window_init (TomoeWindow *window)
{
- GtkWidget *handwriting_page, *reading_search;
- GtkWidget *notebook;
+ TomoeStrokeSearch *handwriting_page;
+ TomoeReadingSearch *reading_search;
+ GtkWidget *widget, *notebook;
TomoeCanvas *canvas;
TomoeWindowPrivate *priv = TOMOE_WINDOW_GET_PRIVATE (window);
@@ -81,7 +82,10 @@
tomoe_init ();
priv->context = tomoe_context_new ();
- /*tomoe_context_load_config (priv->context, g_getenv ("TOMOE_CONFIG_FILE"));*/
+ /*
+ tomoe_context_load_config (priv->context,
+ g_getenv ("TOMOE_CONFIG_FILE"));
+ */
tomoe_context_load_config (priv->context, NULL);
gtk_window_set_title (GTK_WINDOW (window),
@@ -99,20 +103,24 @@
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), notebook);
gtk_widget_show (notebook);
- handwriting_page = tomoe_stroke_search_new ();
- priv->handwriting_page = handwriting_page;
- canvas = TOMOE_CANVAS (tomoe_stroke_search_get_canvas (TOMOE_STROKE_SEARCH (handwriting_page)));
+ /* handwriting page */
+ widget = tomoe_stroke_search_new ();
+ priv->handwriting_page = widget;
+ handwriting_page = TOMOE_STROKE_SEARCH (widget);
+ canvas = TOMOE_CANVAS (tomoe_stroke_search_get_canvas (handwriting_page));
tomoe_canvas_set_context (canvas, priv->context);
- gtk_widget_show (handwriting_page);
- tomoe_window_append_page (window, handwriting_page,
+ gtk_widget_show (widget);
+ tomoe_window_append_page (window, widget,
gtk_image_new_from_file (TOMOE_HANDWRITING_ICON),
_("Handwriting recognition"));
- reading_search = tomoe_reading_search_new ();
- priv->reading_search = reading_search;
- tomoe_reading_search_set_context (TOMOE_READING_SEARCH (reading_search), priv->context);
- gtk_widget_show (reading_search);
- tomoe_window_append_page (window, reading_search,
+ /* reading search page */
+ widget = tomoe_reading_search_new ();
+ priv->reading_search = widget;
+ reading_search = TOMOE_READING_SEARCH (reading_search);
+ tomoe_reading_search_set_context (reading_search, priv->context);
+ gtk_widget_show (widget);
+ tomoe_window_append_page (window, widget,
gtk_image_new_from_file (TOMOE_SEARCHING_ICON),
_("Search with reading "));
}