aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/shortcut-bar
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/shortcut-bar')
-rw-r--r--widgets/shortcut-bar/ChangeLog6
-rw-r--r--widgets/shortcut-bar/Makefile.am1
-rw-r--r--widgets/shortcut-bar/test-shortcut-bar.c12
3 files changed, 14 insertions, 5 deletions
diff --git a/widgets/shortcut-bar/ChangeLog b/widgets/shortcut-bar/ChangeLog
index c49b12ca72..921de9a2ce 100644
--- a/widgets/shortcut-bar/ChangeLog
+++ b/widgets/shortcut-bar/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-24 Christopher James Lahey <clahey@helixcode.com>
+
+ * Makefile.am: Added libepaned.a.
+
+ * test-shortcut-bar.c: Switched from GtkPaned to EPaned.
+
2000-05-18 Damon Chaplin <damon@helixcode.com>
* e-shortcut-bar.[hc]: new signals "added_item", "removed_item",
diff --git a/widgets/shortcut-bar/Makefile.am b/widgets/shortcut-bar/Makefile.am
index 2d7189d901..6cd59470b0 100644
--- a/widgets/shortcut-bar/Makefile.am
+++ b/widgets/shortcut-bar/Makefile.am
@@ -25,6 +25,7 @@ test_shortcut_bar_SOURCES = \
test_shortcut_bar_LDADD = \
./libshortcut-bar.a \
+ $(top_builddir)/widgets/e-paned/libepaned.a \
../e-text/libetext.a \
../misc/libemiscwidgets.a \
../../e-util/libeutil.la \
diff --git a/widgets/shortcut-bar/test-shortcut-bar.c b/widgets/shortcut-bar/test-shortcut-bar.c
index 5d9ae700f3..3d3503c745 100644
--- a/widgets/shortcut-bar/test-shortcut-bar.c
+++ b/widgets/shortcut-bar/test-shortcut-bar.c
@@ -30,6 +30,8 @@
#include "e-shortcut-bar.h"
+#include <widgets/e-paned/e-hpaned.h>
+
#define NUM_SHORTCUT_TYPES 5
gchar *shortcut_types[NUM_SHORTCUT_TYPES] = {
"folder:", "file:", "calendar:", "todo:", "contacts:"
@@ -114,12 +116,12 @@ main (int argc, char *argv[])
gtk_signal_connect (GTK_OBJECT (window), "delete-event",
GTK_SIGNAL_FUNC (quit), NULL);
- hpaned = gtk_hpaned_new ();
+ hpaned = e_hpaned_new ();
gnome_app_set_contents (GNOME_APP (window), hpaned);
gtk_widget_show (hpaned);
shortcut_bar = e_shortcut_bar_new ();
- gtk_paned_pack1 (GTK_PANED (hpaned), shortcut_bar, FALSE, TRUE);
+ e_paned_pack1 (E_PANED (hpaned), shortcut_bar, FALSE, TRUE);
gtk_widget_show (shortcut_bar);
e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcut_bar),
icon_callback,
@@ -138,11 +140,11 @@ main (int argc, char *argv[])
gtk_container_set_border_width (GTK_CONTAINER (shortcut_bar), 4);
#endif
- gtk_paned_set_position (GTK_PANED (hpaned), 100);
- /*gtk_paned_set_gutter_size (GTK_PANED (hpaned), 12);*/
+ e_paned_set_position (E_PANED (hpaned), 100);
+ /*e_paned_set_gutter_size (E_PANED (hpaned), 12);*/
vbox = gtk_vbox_new (FALSE, 0);
- gtk_paned_pack2 (GTK_PANED (hpaned), vbox, TRUE, TRUE);
+ e_paned_pack2 (E_PANED (hpaned), vbox, TRUE, TRUE);
gtk_widget_show (vbox);