Change of plans. The toplevel GnomeApp is now generated with Glade instead

2000-06-01  Federico Mena Quintero  <federico@helixcode.com>

	* gui/event-editor-dialog.glade: Change of plans.  The toplevel
	GnomeApp is now generated with Glade instead of being created in
	the program code.  Otherwise we can't migrate the accelerators to
	the new toplevel and they won't work.

	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.
	This lets us use the GnomeApp created by libglade and still have
	signals and stuff.

	* gui/event-editor.c (create_menu): Tell the UI handler that the
	menubar is the GnomeApp's existing one, not to create a new one.
	(create_toolbar): Tell the UI handler to use the GnomeApp's
	existing toolbar.
	(event_editor_focus): New function to raise/focus an event editor.

	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
	event_editor_focus().

svn path=/trunk/; revision=3348

1 files changed, 7 insertions, 5 deletions

diff --git a/calendar/gui/event-editor.h b/calendar/gui/event-editor.h
index 401f2142e2..a1d50a0dff 100644
--- a/calendar/gui/event-editor.h
+++ b/calendar/gui/event-editor.h
@@ -25,7 +25,7 @@
 #define __EVENT_EDITOR_DIALOG_H__
 
 #include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-app.h>
+#include <gtk/gtkobject.h>
 #include "gnome-cal.h"
 
 
@@ -41,14 +41,14 @@ typedef struct _EventEditor EventEditor;
 typedef struct _EventEditorClass EventEditorClass;
 
 struct _EventEditor {
-	GnomeApp app;
+	GtkObject object;
 
 	/* Private data */
 	gpointer priv;
 };
 
 struct _EventEditorClass {
-	GnomeAppClass parent_class;
+	GtkObjectClass parent_class;
 
 	/* Notification signals */
 
@@ -57,12 +57,14 @@ struct _EventEditorClass {
 
 
 GtkType event_editor_get_type (void);
-GtkWidget *event_editor_construct (EventEditor *ee, GnomeCalendar *gcal);
+EventEditor *event_editor_construct (EventEditor *ee);
 
-GtkWidget *event_editor_new (GnomeCalendar *gcal);
+EventEditor *event_editor_new (void);
 
 void event_editor_set_ical_object (EventEditor *ee, iCalObject *ico);
 
+void event_editor_focus (EventEditor *ee);
+
 #if 0
 /* Convenience function to create and show a new event editor for an
  * event that goes from day_begin to day_end of the specified day.