diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify-dialog.c | 26 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 013e9620a5..0eefb533c1 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -25,6 +25,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtkspinbutton.h> #include <gtk/gtksignal.h> +#include <gtk/gtkscrolledwindow.h> #include <gtk/gtkwindow.h> #include <libgnome/gnome-i18n.h> #if 0 @@ -34,7 +35,6 @@ #include <glade/glade.h> #include <e-util/e-time-utils.h> #include <gal/widgets/e-unicode.h> -#include <gal/widgets/e-scroll-frame.h> #include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml-stream.h> #include "cal-util/timeutil.h" @@ -171,7 +171,7 @@ url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointe GtkWidget * make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow) { - GtkWidget *html, *frame; + GtkWidget *html, *scrolled_window; gtk_widget_push_colormap (gdk_rgb_get_colormap ()); @@ -187,24 +187,24 @@ make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shado gtk_widget_pop_colormap(); - frame = e_scroll_frame_new(NULL, NULL); + scrolled_window = gtk_scrolled_window_new(NULL, NULL); - e_scroll_frame_set_policy(E_SCROLL_FRAME(frame), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); - e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (frame), - GTK_SHADOW_IN); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_SHADOW_IN); - gtk_widget_set_size_request (frame, 300, 200); + gtk_widget_set_size_request (scrolled_window, 300, 200); - gtk_container_add(GTK_CONTAINER (frame), html); + gtk_container_add(GTK_CONTAINER (scrolled_window), html); - gtk_widget_show_all(frame); + gtk_widget_show_all(scrolled_window); - g_object_set_data (G_OBJECT (frame), "html", html); - return frame; + g_object_set_data (G_OBJECT (scrolled_window), "html", html); + return scrolled_window; } static void diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 45de3b3389..4085ac120a 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -339,8 +339,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em mts->etable = GTK_WIDGET (e_meeting_model_etable_from_model (mts->model, EVOLUTION_ETSPECDIR "/e-meeting-time-sel.etspec", filename)); - e_scroll_frame_set_policy (E_SCROLL_FRAME (mts->etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (mts->etable), 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mts->etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER); + gtk_scrolled_window_set_scrollbar_spacing (GTK_SCROLLED_WINDOW (mts->etable), 0); real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable)); g_signal_connect (real_table->sort_info, "sort_info_changed", G_CALLBACK (sort_info_changed_cb), mts); @@ -695,9 +695,9 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em g_signal_connect (GTK_LAYOUT (mts->display_main)->vadjustment, "changed", G_CALLBACK (e_meeting_time_selector_vadjustment_changed), mts); - g_signal_connect (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable)), "value_changed", + g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (mts->etable)), "value_changed", G_CALLBACK (e_meeting_time_selector_table_vadjustment_changed), mts); - g_signal_connect (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable)), "changed", + g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (mts->etable)), "changed", G_CALLBACK (e_meeting_time_selector_table_vadjustment_changed), mts); e_meeting_time_selector_recalc_grid (mts); @@ -1003,7 +1003,7 @@ e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment, { GtkAdjustment *adj; - adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts->etable)); + adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (mts->etable)); if (adj->value != adjustment->value) { adj->value = adjustment->value; gtk_adjustment_value_changed (adj); |