aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c16
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c26
-rw-r--r--calendar/gui/e-meeting-time-sel.c10
-rw-r--r--composer/e-msg-composer.c22
-rw-r--r--composer/e-msg-composer.h2
-rw-r--r--mail/folder-browser.c4
-rw-r--r--mail/message-list.c2
-rw-r--r--shell/e-shell-config-offline.c19
-rw-r--r--shell/e-shell-folder-creation-dialog.c17
-rw-r--r--shell/e-shell-folder-selection-dialog.c18
-rw-r--r--shell/e-shell-view.c23
-rw-r--r--shell/evolution-storage-set-view-factory.c22
-rw-r--r--widgets/misc/e-multi-config-dialog.c2
14 files changed, 92 insertions, 95 deletions
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index cb6cbc4213..2459d5a157 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -722,7 +722,7 @@ e_contact_list_editor_create_table(gchar *name,
static void
add_email_cb (GtkWidget *w, EContactListEditor *editor)
{
- GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor->table));
+ GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (editor->table));
const char *text = gtk_entry_get_text (GTK_ENTRY(editor->email_entry));
if (text && *text) {
@@ -855,7 +855,7 @@ table_drag_data_received_cb (ETable *table, int row, int col,
GtkSelectionData *selection_data,
guint info, guint time, EContactListEditor *editor)
{
- GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor->table));
+ GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (editor->table));
char *target_type;
gboolean changed = FALSE;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index a426153909..fd3576451e 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -25,9 +25,9 @@
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
+#include <gtk/gtkscrolledwindow.h>
#include <gal/e-table/e-table-scrolled.h>
#include <gal/e-table/e-table-model.h>
-#include <gal/widgets/e-scroll-frame.h>
#include <gal/widgets/e-popup-menu.h>
#include <gal/widgets/e-gui-utils.h>
#include <gal/menus/gal-view-factory-etable.h>
@@ -1125,7 +1125,7 @@ minicard_right_click (EMinicardView *minicard_view_item, GdkEvent *event, EAddre
static void
create_minicard_view (EAddressbookView *view)
{
- GtkWidget *scrollframe;
+ GtkWidget *scrolled_window;
GtkWidget *alphabet;
GtkWidget *minicard_view;
GtkWidget *minicard_hbox;
@@ -1151,15 +1151,15 @@ create_minicard_view (EAddressbookView *view)
view->object = G_OBJECT(minicard_view);
view->widget = minicard_hbox;
- scrollframe = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
- gtk_container_add (GTK_CONTAINER (scrollframe), minicard_view);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), minicard_view);
- gtk_box_pack_start(GTK_BOX(minicard_hbox), scrollframe, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(minicard_hbox), scrolled_window, TRUE, TRUE, 0);
alphabet = create_alphabet(view);
if (alphabet) {
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);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index eccab36641..a6ff4c39bc 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -54,6 +54,7 @@
#include <glib/gunicode.h>
#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkscrolledwindow.h>
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
@@ -73,7 +74,6 @@
#include <glade/glade.h>
#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.h>
#include <gal/e-text/e-entry.h>
#include <gal/util/e-iconv.h>
@@ -1124,10 +1124,10 @@ show_attachments (EMsgComposer *composer,
gboolean show)
{
if (show) {
- gtk_widget_show (composer->attachment_scroll_frame);
+ gtk_widget_show (composer->attachment_scrolled_window);
gtk_widget_show (composer->attachment_bar);
} else {
- gtk_widget_hide (composer->attachment_scroll_frame);
+ gtk_widget_hide (composer->attachment_scrolled_window);
gtk_widget_hide (composer->attachment_bar);
}
@@ -2569,7 +2569,7 @@ init (EMsgComposer *composer)
composer->address_dialog = NULL;
composer->attachment_bar = NULL;
- composer->attachment_scroll_frame = NULL;
+ composer->attachment_scrolled_window = NULL;
composer->persist_file_interface = CORBA_OBJECT_NIL;
composer->persist_stream_interface = CORBA_OBJECT_NIL;
@@ -2830,18 +2830,18 @@ create_composer (int visible_mask)
/* Attachment editor, wrapped into an EScrollFrame. We don't
show it for now. */
- composer->attachment_scroll_frame = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (composer->attachment_scroll_frame),
- GTK_SHADOW_IN);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (composer->attachment_scroll_frame),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ composer->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
+ GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (composer->attachment_scrolled_window),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
composer->attachment_bar = e_msg_composer_attachment_bar_new (NULL);
GTK_WIDGET_SET_FLAGS (composer->attachment_bar, GTK_CAN_FOCUS);
- gtk_container_add (GTK_CONTAINER (composer->attachment_scroll_frame),
+ gtk_container_add (GTK_CONTAINER (composer->attachment_scrolled_window),
composer->attachment_bar);
gtk_box_pack_start (GTK_BOX (vbox),
- composer->attachment_scroll_frame,
+ composer->attachment_scrolled_window,
FALSE, FALSE, GNOME_PAD_SMALL);
g_signal_connect (composer->attachment_bar, "changed",
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index d064d3485f..21a1d6dc41 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -62,7 +62,7 @@ struct _EMsgComposer {
GtkWidget *editor;
GtkWidget *attachment_bar;
- GtkWidget *attachment_scroll_frame;
+ GtkWidget *attachment_scrolled_window;
GtkWidget *address_dialog;
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index a29031d84b..eaf1bae3a6 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1106,7 +1106,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;
@@ -1120,7 +1120,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);
}
diff --git a/mail/message-list.c b/mail/message-list.c
index 1d442c52f5..4223dbdcc9 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1243,7 +1243,7 @@ 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);
diff --git a/shell/e-shell-config-offline.c b/shell/e-shell-config-offline.c
index ab97b5204a..1342abbbb2 100644
--- a/shell/e-shell-config-offline.c
+++ b/shell/e-shell-config-offline.c
@@ -34,8 +34,7 @@
#include <gconf/gconf-client.h>
-#include <gal/widgets/e-scroll-frame.h>
-
+#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtksignal.h>
@@ -135,7 +134,7 @@ GtkWidget *
e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *control)
{
PageData *page_data;
- GtkWidget *scroll_frame;
+ GtkWidget *scrolled_window;
g_return_val_if_fail (E_IS_SHELL (shell), NULL);
@@ -151,12 +150,12 @@ e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *con
g_signal_connect (page_data->storage_set_view, "checkboxes_changed",
G_CALLBACK (storage_set_view_checkboxes_changed_callback), page_data);
- scroll_frame = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_container_add (GTK_CONTAINER (scroll_frame), page_data->storage_set_view);
- gtk_widget_show (scroll_frame);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), page_data->storage_set_view);
+ gtk_widget_show (scrolled_window);
page_data->config_control = control;
@@ -165,5 +164,5 @@ e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *con
g_object_weak_ref (G_OBJECT (page_data->config_control), config_control_destroy_notify, page_data);
- return scroll_frame;
+ return scrolled_window;
}
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 0ba0dfe2be..9fe4f1efec 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -32,14 +32,13 @@
#include <gtk/gtkdialog.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkscrolledwindow.h>
#include <glade/glade-xml.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.h>
-
#include "e-storage-set.h"
#include "e-storage-set-view.h"
#include "e-shell-utils.h"
@@ -313,7 +312,7 @@ add_storage_set_view (GtkWidget *dialog,
{
EStorageSet *storage_set;
GtkWidget *storage_set_view;
- GtkWidget *scroll_frame;
+ GtkWidget *scrolled_window;
GtkWidget *vbox;
storage_set = e_shell_get_storage_set (shell);
@@ -329,14 +328,14 @@ add_storage_set_view (GtkWidget *dialog,
vbox = glade_xml_get_widget (gui, "main_vbox");
- scroll_frame = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
- gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), storage_set_view);
- gtk_widget_show (scroll_frame);
+ gtk_widget_show (scrolled_window);
gtk_widget_show (storage_set_view);
return storage_set_view;
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index c744f237c9..56b993ccf1 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.c
@@ -36,12 +36,12 @@
#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
-#include <gal/widgets/e-scroll-frame.h>
#include <gal/widgets/e-gui-utils.h>
#include <gtk/gtksignal.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkstock.h>
+#include <gtk/gtkscrolledwindow.h>
#include <string.h>
@@ -384,7 +384,7 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
gboolean allow_creation)
{
EShellFolderSelectionDialogPrivate *priv;
- GtkWidget *scroll_frame;
+ GtkWidget *scrolled_window;
GtkWidget *caption_label;
int i;
char *filename;
@@ -468,18 +468,18 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
if (default_uri != NULL)
set_default_folder (folder_selection_dialog, default_uri);
- scroll_frame = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_container_add (GTK_CONTAINER (scroll_frame), priv->storage_set_view);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), priv->storage_set_view);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (folder_selection_dialog)->vbox),
- scroll_frame, TRUE, TRUE, 2);
+ scrolled_window, TRUE, TRUE, 2);
gtk_widget_show (priv->storage_set_view);
- gtk_widget_show (scroll_frame);
+ gtk_widget_show (scrolled_window);
GTK_WIDGET_SET_FLAGS (priv->storage_set_view, GTK_CAN_FOCUS);
gtk_widget_grab_focus (priv->storage_set_view);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 0710189fc3..69e26e77ba 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -64,6 +64,7 @@
#include <libgnomeui/gnome-window-icon.h>
#include <libgnomeui/gnome-app.h>
+#include <gtk/gtkscrolledwindow.h>
#include <gconf/gconf-client.h>
#include <bonobo/bonobo-socket.h>
@@ -75,9 +76,7 @@
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.h>
-
static BonoboWindowClass *parent_class = NULL;
struct _View {
@@ -1108,7 +1107,7 @@ setup_storage_set_subwindow (EShellView *shell_view)
EShellViewPrivate *priv;
GtkWidget *storage_set_view;
GtkWidget *vbox;
- GtkWidget *scroll_frame;
+ GtkWidget *scrolled_window;
priv = shell_view->priv;
@@ -1121,28 +1120,28 @@ setup_storage_set_subwindow (EShellView *shell_view)
g_signal_connect (storage_set_view, "folder_context_menu_popped_down",
G_CALLBACK (folder_context_menu_popped_down_cb), shell_view);
- scroll_frame = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame),
- GTK_SHADOW_IN);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), storage_set_view);
vbox = gtk_vbox_new (FALSE, 0);
priv->storage_set_title_bar = e_title_bar_new (_("Folders"));
gtk_box_pack_start (GTK_BOX (vbox), priv->storage_set_title_bar, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
g_signal_connect (priv->storage_set_title_bar, "button_clicked",
G_CALLBACK (storage_set_view_button_clicked_cb), shell_view);
gtk_widget_show (storage_set_view);
gtk_widget_show (priv->storage_set_title_bar);
- gtk_widget_show (scroll_frame);
+ gtk_widget_show (scrolled_window);
priv->storage_set_view_box = vbox;
priv->storage_set_view = storage_set_view;
diff --git a/shell/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c
index 38f5a72f38..7782d4cb5e 100644
--- a/shell/evolution-storage-set-view-factory.c
+++ b/shell/evolution-storage-set-view-factory.c
@@ -30,7 +30,7 @@
#include "evolution-storage-set-view-factory.h"
-#include <gal/widgets/e-scroll-frame.h>
+#include <gtk/gtkscrolledwindow.h>
BonoboControl *
@@ -40,7 +40,7 @@ evolution_storage_set_view_factory_new_view (EShell *shell)
GtkWidget *storage_set_view;
BonoboControl *control;
EvolutionStorageSetView *storage_set_view_interface;
- GtkWidget *scroll_frame;
+ GtkWidget *scrolled_window;
g_return_val_if_fail (shell != NULL, NULL);
g_return_val_if_fail (E_IS_SHELL (shell), NULL);
@@ -55,19 +55,19 @@ evolution_storage_set_view_factory_new_view (EShell *shell)
return NULL;
}
- scroll_frame = e_scroll_frame_new (NULL, NULL);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame),
- GTK_SHADOW_IN);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), storage_set_view);
- gtk_widget_show (scroll_frame);
+ gtk_widget_show (scrolled_window);
gtk_widget_show (storage_set_view);
- control = bonobo_control_new (scroll_frame);
+ control = bonobo_control_new (scrolled_window);
bonobo_object_add_interface (BONOBO_OBJECT (control), BONOBO_OBJECT (storage_set_view_interface));
return control;
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 6e8a91e3fa..5411cd1413 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -391,7 +391,7 @@ init (EMultiConfigDialog *multi_config_dialog)
e_table_extras_add_cell (extras, "vbox", vbox);
list_e_table = e_table_scrolled_new (list_e_table_model, extras, list_e_table_spec, NULL);
- e_scroll_frame_set_policy (E_SCROLL_FRAME (list_e_table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (list_e_table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
g_signal_connect (e_table_scrolled_get_table (E_TABLE_SCROLLED (list_e_table)),
"cursor_change", G_CALLBACK (table_cursor_change_callback), multi_config_dialog);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 20:35:07 +0800