Make the toolbar look like a standard GNOME toolbar my putting it into

a GtkFrame.  Also, make sure it cannot be dragged to the left or right
of the dock, because with the current non-BonoboUIHandler system we
use it causes bad bad things to happen.

svn path=/trunk/; revision=3319

4 files changed, 35 insertions, 6 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d18ac9e750..d96a698e6c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* gui/calendar-commands.c (calendar_control_activate): Put the
+	toolbar into a frame to make it look like standard GNOME toolbars.
+	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not
+	do evil things when its moved to the left or the right of the
+	window.
+
 2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
 
 	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index afc8580d09..96896810e6 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -540,7 +540,7 @@ calendar_control_activate (BonoboControl *control,
 			   GnomeCalendar *cal)
 {
 	Bonobo_UIHandler  remote_uih;
-	GtkWidget *toolbar;
+	GtkWidget *toolbar, *toolbar_frame;
 	GnomeUIBuilderData uibdata;
 	BonoboUIHandler *uih = bonobo_control_get_ui_handler (control);
 	gchar *page_name;
@@ -588,9 +588,16 @@ calendar_control_activate (BonoboControl *control,
 
 	gtk_widget_show_all (toolbar);
 
+	toolbar_frame = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME (toolbar_frame), GTK_SHADOW_OUT);
+	gtk_container_add (GTK_CONTAINER (toolbar_frame), toolbar);
+	gtk_widget_show (toolbar_frame);
+
+	gtk_widget_show_all (toolbar_frame);
+
 	bonobo_ui_handler_dock_add (uih, "/Toolbar",
-				    bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_control_new (toolbar))),
-				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE,
+				    bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_control_new (toolbar_frame))),
+				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL,
 				    GNOME_DOCK_TOP,
 				    1, 1, 0);
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f3c517850d..f7cd9db3dc 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* folder-browser-factory.c (control_activate): Put the toolbar
+	into a frame to make it look like standard GNOME toolbars.  Also,
+	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
+	evil things when its moved to the left or the right of the window.
+
 2000-05-31  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* mail-config.c: Configuration dialog now allows 
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index aa8407f019..3f492374bb 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -57,7 +57,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih)
 {
 	Bonobo_UIHandler  remote_uih;
 	BonoboControl *toolbar_control;
-	GtkWidget *toolbar, *folder_browser;
+	GtkWidget *toolbar, *toolbar_frame, *folder_browser;
 
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
 	bonobo_ui_handler_set_container (uih, remote_uih);		
@@ -97,10 +97,17 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih)
 
 	gtk_widget_show_all (toolbar);
 
-	toolbar_control = bonobo_control_new (toolbar);
+	toolbar_frame = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME (toolbar_frame), GTK_SHADOW_OUT);
+	gtk_container_add (GTK_CONTAINER (toolbar_frame), toolbar);
+	gtk_widget_show (toolbar_frame);
+
+	gtk_widget_show_all (toolbar_frame);
+
+	toolbar_control = bonobo_control_new (toolbar_frame);
 	bonobo_ui_handler_dock_add (uih, "/Toolbar",
 				    bonobo_object_corba_objref (BONOBO_OBJECT (toolbar_control)),
-				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE,
+				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL,
 				    GNOME_DOCK_TOP,
 				    1, 1, 0);
 }