aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/gnome-cal.c16
3 files changed, 15 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a79bb456e7..e8c682efe9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-24 Christopher James Lahey <clahey@helixcode.com>
+
+ * gui/Makefile.am: Added libepaned.a.
+
+ * gui/gnome-cal.c: Switched from GtkPaned to EPaned.
+
2000-05-22 Federico Mena Quintero <federico@helixcode.com>
* gui/calendar-commands.c (calendar_get_events_in_range): Removed
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 3e3e392c4f..972cb893fd 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -24,6 +24,7 @@ LINK_FLAGS = \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/e-paned/libepaned.a \
$(top_builddir)/widgets/e-text/libetext.a \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical.la
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f189d5a124..a38b1ca1cb 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -12,12 +12,12 @@
#include <sys/wait.h>
#include <fcntl.h>
#include <gtk/gtkframe.h>
-#include <gtk/gtkhpaned.h>
+#include <widgets/e-paned/e-hpaned.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmain.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkvpaned.h>
+#include <widgets/e-paned/e-vpaned.h>
#include <libgnomeui/gnome-messagebox.h>
#include <cal-util/timeutil.h>
#include "dialogs/alarm-notify-dialog.h"
@@ -159,7 +159,7 @@ setup_widgets (GnomeCalendar *gcal)
/* The First Page of the Main Notebook, containing a HPaned with the
Sub-Notebook on the left and the GtkCalendar and ToDo list on the
right. */
- gcal->hpane = gtk_hpaned_new ();
+ gcal->hpane = e_hpaned_new ();
gtk_widget_show (gcal->hpane);
gtk_notebook_append_page (GTK_NOTEBOOK (gcal->main_notebook),
gcal->hpane, gtk_label_new (""));
@@ -170,19 +170,19 @@ setup_widgets (GnomeCalendar *gcal)
FALSE);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (gcal->sub_notebook), FALSE);
gtk_widget_show (gcal->sub_notebook);
- gtk_paned_pack1 (GTK_PANED (gcal->hpane), gcal->sub_notebook,
+ e_paned_pack1 (E_PANED (gcal->hpane), gcal->sub_notebook,
TRUE, TRUE);
/* The VPaned widget, to contain the GtkCalendar & ToDo list. */
- vpane = gtk_vpaned_new ();
+ vpane = e_vpaned_new ();
gtk_widget_show (vpane);
- gtk_paned_pack2 (GTK_PANED (gcal->hpane), vpane, FALSE, TRUE);
+ e_paned_pack2 (E_PANED (gcal->hpane), vpane, FALSE, TRUE);
/* The GtkCalendar. */
w = gtk_calendar_new ();
gcal->gtk_calendar = GTK_CALENDAR (w);
gtk_widget_show (w);
- gtk_paned_pack1 (GTK_PANED (vpane), w, FALSE, TRUE);
+ e_paned_pack1 (E_PANED (vpane), w, FALSE, TRUE);
gcal->day_selected_id = gtk_signal_connect (GTK_OBJECT (gcal->gtk_calendar),
"day_selected",
(GtkSignalFunc) gnome_calendar_on_day_selected,
@@ -193,7 +193,7 @@ setup_widgets (GnomeCalendar *gcal)
/* The ToDo list. */
gcal->todo = gncal_todo_new (gcal);
- gtk_paned_pack2 (GTK_PANED (vpane), gcal->todo, TRUE, TRUE);
+ e_paned_pack2 (E_PANED (vpane), gcal->todo, TRUE, TRUE);
gtk_widget_show (gcal->todo);