callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EScrollFrame --> GtkScrolledWindow

Browse Source 
svn path=/trunk/; revision=19440
This commit is contained in:
Radek Doulik
2003-01-14 16:42:58 +00:00
parent e220812ac4
commit c2c386e480
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mail/folder-browser.c
View File

@ -1108,7 +1108,7 @@ save_cursor_pos (FolderBrowser *fb)
gconf = gconf_client_get_default ();
paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (fb->message_list));
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (fb->message_list));
y += adj->value - ((paned_size - height) / 2);
return y;
@ -1122,7 +1122,7 @@ set_cursor_pos (FolderBrowser *fb, int y)
if (y == -1)
return;
adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (fb->message_list));
adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (fb->message_list));
gtk_adjustment_set_value (adj, (gfloat)y);
}
@ -2256,7 +2256,7 @@ etree_key (ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, FolderBr
if ((ev->key.state & GDK_CONTROL_MASK) != 0)
return FALSE;
vadj = e_scroll_frame_get_vadjustment (fb->mail_display->scroll);
vadj = gtk_scrolled_window_get_vadjustment (fb->mail_display->scroll);
page_size = vadj->page_size - vadj->step_increment;
switch (ev->key.keyval) {

14
mail/mail-display.c
View File

@ -2627,13 +2627,11 @@ mail_display_new (void)
gtk_box_set_homogeneous (GTK_BOX (mail_display), FALSE);
gtk_widget_show (GTK_WIDGET (mail_display));
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));
scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
gtk_box_pack_start_defaults (GTK_BOX (mail_display), scroll);
gtk_widget_show (scroll);
html = gtk_html_new ();
tok = e_searching_tokenizer_new ();
@ -2658,7 +2656,7 @@ mail_display_new (void)
gtk_selection_add_target (mail_display->invisible,
clipboard_atom, GDK_SELECTION_TYPE_STRING, 1);
mail_display->scroll = E_SCROLL_FRAME (scroll);
mail_display->scroll = GTK_SCROLLED_WINDOW (scroll);
mail_display->html = GTK_HTML (html);
g_object_ref (mail_display->html);
mail_display->last_active = NULL;

5
mail/mail-display.h
View File

@ -25,11 +25,10 @@
#define _MAIL_DISPLAY_H_
#include <gtk/gtkvbox.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-stream.h>
#include <gal/widgets/e-scroll-frame.h>
#include <camel/camel-stream.h>
#include <camel/camel-mime-message.h>
#include <camel/camel-medium.h>
@ -50,7 +49,7 @@ struct _MailDisplay {
struct _MailDisplayPrivate *priv;
EScrollFrame *scroll;
GtkScrolledWindow *scroll;
GtkHTML *html;
/* GtkHTMLStream *stream; */
gint redisplay_counter;

6
mail/message-list.c
View File

@ -1237,10 +1237,8 @@ message_list_init (GtkObject *object)
{
MessageList *message_list = MESSAGE_LIST (object);
e_scroll_frame_set_policy (E_SCROLL_FRAME (message_list),
GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal);
message_list->hidden = NULL;