diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2003-04-24 06:03:57 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-04-24 06:03:57 +0800 |
| commit | 00566a768f8a6204651ddaf8add226aa315807e8 (patch) | |
| tree | de7ccf00b9fdd25d485e5b9015ec40a79d07dbbb /calendar/gui/e-day-view.c | |
| parent | d6d875d02faf911e1b4ddb1cfe9b1eb44b009b95 (diff) | |
| download | gsoc2013-evolution-00566a768f8a6204651ddaf8add226aa315807e8.tar.gz gsoc2013-evolution-00566a768f8a6204651ddaf8add226aa315807e8.tar.zst gsoc2013-evolution-00566a768f8a6204651ddaf8add226aa315807e8.zip | |
Fixes #41641
2003-04-23 Hans Petter Jansson <hpj@ximian.com>
Fixes #41641
* gui/e-day-view.c (e_day_view_focus_in): Remove assert an old
input method code.
(e_day_view_focus_out): Ditto.
(e_day_view_reshape_long_event): Set input method context.
(e_day_view_reshape_day_event): Ditto.
(e_day_view_on_editing_started): Let EText handle the context popup.
(e_day_view_on_editing_stopped): Turn off EText's handling of context
popup.
* gui/e-week-view.c (e_week_view_reshape_event_span): Set input
method context.
(e_week_view_on_text_item_event): Let the EText item handle
right-click context popup if we're editing it.
(e_week_view_on_editing_started): Let the EText item handle the
context popup.
(e_weeK_view_on_editing_stopped): Turn off EText's handling of
context popup.
svn path=/trunk/; revision=20947
Diffstat (limited to 'calendar/gui/e-day-view.c')
| -rw-r--r-- | calendar/gui/e-day-view.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 27b512a63a..3ea9a37617 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1433,14 +1433,6 @@ e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event) gtk_widget_queue_draw (day_view->top_canvas); gtk_widget_queue_draw (day_view->main_canvas); - g_assert (GTK_WIDGET_REALIZED (day_view->main_canvas)); -#if 0 - /* FIXME when gal is fixed */ - if (E_CANVAS (day_view->main_canvas)->ic) - gdk_im_begin (E_CANVAS (day_view->main_canvas)->ic, - GTK_LAYOUT (day_view->main_canvas)->bin_window); -#endif - return FALSE; } @@ -1461,14 +1453,6 @@ e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event) gtk_widget_queue_draw (day_view->top_canvas); gtk_widget_queue_draw (day_view->main_canvas); - g_assert (GTK_WIDGET_REALIZED (day_view->main_canvas)); - -#if 0 - /* FIXME when gal is fixed */ - if (E_CANVAS (day_view->main_canvas)->ic) - gdk_im_end (); -#endif - return FALSE; } @@ -5298,6 +5282,7 @@ e_day_view_reshape_long_event (EDayView *day_view, "use_ellipsis", TRUE, "draw_background", FALSE, "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0), + "im_context", E_CANVAS (day_view->top_canvas)->im_context, NULL); g_signal_connect (event->canvas_item, "event", G_CALLBACK (e_day_view_on_text_item_event), day_view); @@ -5455,6 +5440,7 @@ e_day_view_reshape_day_event (EDayView *day_view, "use_ellipsis", TRUE, "draw_background", FALSE, "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0), + "im_context", E_CANVAS (day_view->main_canvas)->im_context, NULL); g_signal_connect (event->canvas_item, "event", G_CALLBACK (e_day_view_on_text_item_event), day_view); @@ -6206,6 +6192,8 @@ e_day_view_on_editing_started (EDayView *day_view, e_day_view_reshape_main_canvas_resize_bars (day_view); } + g_object_set (item, "handle_popup", TRUE, NULL); + gtk_signal_emit (GTK_OBJECT (day_view), e_day_view_signals[SELECTION_CHANGED]); } @@ -6255,6 +6243,7 @@ e_day_view_on_editing_stopped (EDayView *day_view, day_view->resize_bars_event_day = -1; day_view->resize_bars_event_num = -1; + g_object_set (event->canvas_item, "handle_popup", FALSE, NULL); g_object_get (G_OBJECT (event->canvas_item), "text", &text, NULL); |