diff options
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | mail/mail-display.c | 21 | ||||
| -rw-r--r-- | mail/mail-display.h | 5 |
4 files changed, 27 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a6355b4907..eb264985a5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,15 @@ +2000-06-01 Ettore Perazzoli <ettore@helixcode.com> + + * Makefile.am (evolution_mail_LDADD): Link with + `libemiscwidgets.a'. + + * mail-display.c (mail_display_new): Use an EScrollFrame instead + of a GtkScrolledWindow. + (mail_display_set_message): Likewise. + + * mail-display.h: Replace the GtkScrolledWindow with an + EScrollFrame. + 2000-06-01 Dan Winship <danw@helixcode.com> * component-factory.c (owner_unset_cb): Quit when the shell exits. diff --git a/mail/Makefile.am b/mail/Makefile.am index 0dd4a64deb..81724fc04e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -66,6 +66,7 @@ evolution_mail_LDADD = \ $(SHELL_OBJS) \ ../composer/libcomposer.la \ $(top_builddir)/widgets/e-paned/libepaned.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ ../widgets/e-table/libetable.a \ ../widgets/e-text/libetext.a \ $(CAMEL_OBJS_EXTRA) \ diff --git a/mail/mail-display.c b/mail/mail-display.c index 4ab6dbed02..8b07d7eaec 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -360,13 +360,13 @@ mail_display_set_message (MailDisplay *mail_display, mail_html_write (mail_display->html, stream, "</BODY></HTML>\n"); gtk_html_end (mail_display->html, stream, GTK_HTML_STREAM_OK); - adj = gtk_scrolled_window_get_vadjustment (mail_display->scroll); + adj = e_scroll_frame_get_vadjustment (mail_display->scroll); gtk_adjustment_set_value (adj, 0); - gtk_scrolled_window_set_vadjustment (mail_display->scroll, adj); + e_scroll_frame_set_vadjustment (mail_display->scroll, adj); - adj = gtk_scrolled_window_get_hadjustment (mail_display->scroll); + adj = e_scroll_frame_get_hadjustment (mail_display->scroll); gtk_adjustment_set_value (adj, 0); - gtk_scrolled_window_set_hadjustment (mail_display->scroll, adj); + e_scroll_frame_set_hadjustment (mail_display->scroll, adj); } @@ -411,12 +411,11 @@ mail_display_new (FolderBrowser *parent_folder_browser) gtk_box_set_homogeneous (GTK_BOX (mail_display), FALSE); gtk_widget_show (GTK_WIDGET (mail_display)); - scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_ALWAYS); - gtk_box_pack_start_defaults (GTK_BOX (mail_display), - GTK_WIDGET (scroll)); + scroll = e_scroll_frame_new (NULL, NULL); + e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll), GTK_SHADOW_IN); + gtk_box_pack_start_defaults (GTK_BOX (mail_display), GTK_WIDGET (scroll)); gtk_widget_show (GTK_WIDGET (scroll)); html = gtk_html_new (); @@ -430,7 +429,7 @@ mail_display_new (FolderBrowser *parent_folder_browser) gtk_container_add (GTK_CONTAINER (scroll), html); gtk_widget_show (GTK_WIDGET (html)); - mail_display->scroll = GTK_SCROLLED_WINDOW (scroll); + mail_display->scroll = E_SCROLL_FRAME (scroll); mail_display->html = GTK_HTML (html); return GTK_WIDGET (mail_display); diff --git a/mail/mail-display.h b/mail/mail-display.h index c2b50e263c..7348029c47 100644 --- a/mail/mail-display.h +++ b/mail/mail-display.h @@ -5,6 +5,9 @@ #include <gtk/gtkvbox.h> #include <gtkhtml/gtkhtml.h> + +#include "widgets/misc/e-scroll-frame.h" + #include "camel/camel-stream.h" #include "camel/camel-mime-message.h" #include "folder-browser.h" @@ -19,7 +22,7 @@ struct _MailDisplay { GtkVBox parent; - GtkScrolledWindow *scroll; + EScrollFrame *scroll; GtkHTML *html; FolderBrowser *parent_folder_browser; |