Update to reflect changes in EphyTopicSelector api. Wrap the topic

2003-03-30  David Bordoley <bordoley@msu.edu>

	* src/bookmarks/ephy-bookmark-properties.c: (build_ui):
	Update to reflect changes in EphyTopicSelector api. Wrap the
	topic selector in a GtkScrolledWindow.

	* src/bookmarks/ephy-bookmarks-editor.c: (cmd_add_topic),
	(cmd_rename), (cmd_open_bookmarks_in_tabs), (cmd_open_bookmarks_in_browser),
	(cmd_delete), (cmd_bookmark_properties), (cmd_select_all),
	(ephy_bookmarks_editor_dispose), (keyword_node_selected_cb),
	(ephy_bookmarks_editor_construct), (ephy_bookmarks_editor_update_menu):
	Update to reflect changes in EphyNodeView api. Wrap bm_view
	and key_view in GtkScrolledWindows.
	s/_Open In New Window/_Open in New Window and s/Open In New _Tabs/Open in New _Tab.

	* src/bookmarks/ephy-new-bookmark.c: (build_editing_table):
	Update to reflect changes in EphyTopicSelector api. Wrap the
	topic selector in a GtkScrolledWindow.

	* src/bookmarks/ephy-node-view.c: (ephy_node_view_get_type),
	(ephy_node_view_construct), (ephy_node_view_new),
	(ephy_node_view_add_column), (ephy_node_view_add_icon_column),
	(ephy_node_view_get_selection), (ephy_node_view_has_focus),
	(ephy_node_view_set_browse_mode), (ephy_node_view_select_node),
	(ephy_node_view_enable_drag_dest), (ephy_node_view_enable_drag_source),
	(ephy_node_view_set_hinted), (ephy_node_view_edit):
	* src/bookmarks/ephy-node-view.h:
	Inherit from GtkTreeView instead of GtkScrolledWindow and
	change methods to reflect the change. Allow for better/easier keynav.
	Return a GtkWidget from ephy_node_view_new to be consistent with GTK.

	* src/bookmarks/ephy-topics-selector.c: (ephy_topics_selector_get_type),
	(mneumonic_activated), (ephy_topics_build_ui), (ephy_topics_selector_new):
	* src/bookmarks/ephy-topics-selector.h:
	Inherit from GtkTreeView instead of GtkScrolledWindow and
	change methods to reflect the change. Allow for better/easier keynav.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 7a03a2d41..fcf1cd23e 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -29,6 +29,7 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmisc.h>
+#include <gtk/gtkscrolledwindow.h>
 #include <libgnome/gnome-i18n.h>
 
 static void ephy_bookmark_properties_class_init (EphyBookmarkPropertiesClass *klass);
@@ -278,7 +279,7 @@ set_window_icon (EphyBookmarkProperties *editor)
 static void
 build_ui (EphyBookmarkProperties *editor)
 {
-	GtkWidget *table, *label, *entry, *topics_selector;
+	GtkWidget *table, *label, *entry, *topics_selector, *scrolled_window;
 	char *str;
 	const char *tmp;
 
@@ -341,11 +342,20 @@ build_ui (EphyBookmarkProperties *editor)
 	gtk_widget_show (label);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-	
+
 	topics_selector = ephy_topics_selector_new (editor->priv->bookmarks,
 						    editor->priv->bookmark);
 	gtk_widget_show (topics_selector);
 	editor->priv->topics_selector = topics_selector;
+	scrolled_window = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
+					"hadjustment", NULL,
+					"vadjustment", NULL,
+					"hscrollbar_policy", GTK_POLICY_AUTOMATIC,
+					"vscrollbar_policy", GTK_POLICY_AUTOMATIC,
+					"shadow_type", GTK_SHADOW_IN,
+					NULL);
+	gtk_widget_show (scrolled_window);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), topics_selector);
 	label = gtk_label_new (NULL);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
 	str = g_strconcat ("<b>", _("To_pics:"), "</b>", NULL);
@@ -354,7 +364,7 @@ build_ui (EphyBookmarkProperties *editor)
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), topics_selector);
 	gtk_widget_show (label);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), topics_selector, 1, 2, 2, 3,
+	gtk_table_attach (GTK_TABLE (table), scrolled_window, 1, 2, 2, 3,
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox),