aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/eventedit.c2
-rw-r--r--calendar/eventedit.h12
-rw-r--r--calendar/gui/eventedit.c2
-rw-r--r--calendar/gui/eventedit.h12
5 files changed, 27 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ced0d7c6ad..5ef00cfd37 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+1998-04-07 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * eventedit.c: Removed unused global variable parent_class.
+
+ * eventedit.h: Renamed gtk_window field to window.
+ Made the parent_class field in the EventEditorClass structure be a
+ GtkWindowClass, not a gnome property box class.
+ Added prototype for event_editor_get_type().
+
1998-04-06 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gncal-week-view.c (gncal_week_view_new): Use the new
diff --git a/calendar/eventedit.c b/calendar/eventedit.c
index 7846eab86e..f2158b50f4 100644
--- a/calendar/eventedit.c
+++ b/calendar/eventedit.c
@@ -13,7 +13,6 @@
#include "timeutil.h"
static void event_editor_init (EventEditor *ee);
-GtkWindow *parent_class;
/* Note: do not i18n these strings, they are part of the vCalendar protocol */
char *class_names [] = { "PUBLIC", "PRIVATE", "CONFIDENTIAL" };
@@ -34,7 +33,6 @@ event_editor_get_type (void)
(GtkArgGetFunc) NULL,
};
event_editor_type = gtk_type_unique (gtk_window_get_type (), &event_editor_info);
- parent_class = gtk_type_class (gtk_window_get_type ());
}
return event_editor_type;
}
diff --git a/calendar/eventedit.h b/calendar/eventedit.h
index 2396d302f6..45e966d034 100644
--- a/calendar/eventedit.h
+++ b/calendar/eventedit.h
@@ -12,12 +12,14 @@
BEGIN_GNOME_DECLS
+
#define EVENT_EDITOR(obj) GTK_CHECK_CAST(obj, event_editor_get_type(), EventEditor)
#define EVENT_EDITOR_CLASS(class) GTK_CHECK_CAST_CLASS(class, event_editor_get_type(), EventEditorClass)
#define IS_EVENT_EDITOR(obj) GTK_CHECK_TYPE(obj, event_editor_get_type())
+
typedef struct {
- GtkWindow gtk_window;
+ GtkWindow window;
GtkWidget *notebook;
GtkWidget *hbox;
GtkWidget *vbox;
@@ -41,10 +43,14 @@ typedef struct {
} EventEditor;
typedef struct {
- GnomePropertyBoxClass parent_class;
+ GtkWindowClass parent_class;
} EventEditorClass;
-GtkWidget *event_editor_new (GnomeCalendar *owner, iCalObject *);
+
+guint event_editor_get_type (void);
+GtkWidget *event_editor_new (GnomeCalendar *owner, iCalObject *);
+
END_GNOME_DECLS
+
#endif
diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c
index 7846eab86e..f2158b50f4 100644
--- a/calendar/gui/eventedit.c
+++ b/calendar/gui/eventedit.c
@@ -13,7 +13,6 @@
#include "timeutil.h"
static void event_editor_init (EventEditor *ee);
-GtkWindow *parent_class;
/* Note: do not i18n these strings, they are part of the vCalendar protocol */
char *class_names [] = { "PUBLIC", "PRIVATE", "CONFIDENTIAL" };
@@ -34,7 +33,6 @@ event_editor_get_type (void)
(GtkArgGetFunc) NULL,
};
event_editor_type = gtk_type_unique (gtk_window_get_type (), &event_editor_info);
- parent_class = gtk_type_class (gtk_window_get_type ());
}
return event_editor_type;
}
diff --git a/calendar/gui/eventedit.h b/calendar/gui/eventedit.h
index 2396d302f6..45e966d034 100644
--- a/calendar/gui/eventedit.h
+++ b/calendar/gui/eventedit.h
@@ -12,12 +12,14 @@
BEGIN_GNOME_DECLS
+
#define EVENT_EDITOR(obj) GTK_CHECK_CAST(obj, event_editor_get_type(), EventEditor)
#define EVENT_EDITOR_CLASS(class) GTK_CHECK_CAST_CLASS(class, event_editor_get_type(), EventEditorClass)
#define IS_EVENT_EDITOR(obj) GTK_CHECK_TYPE(obj, event_editor_get_type())
+
typedef struct {
- GtkWindow gtk_window;
+ GtkWindow window;
GtkWidget *notebook;
GtkWidget *hbox;
GtkWidget *vbox;
@@ -41,10 +43,14 @@ typedef struct {
} EventEditor;
typedef struct {
- GnomePropertyBoxClass parent_class;
+ GtkWindowClass parent_class;
} EventEditorClass;
-GtkWidget *event_editor_new (GnomeCalendar *owner, iCalObject *);
+
+guint event_editor_get_type (void);
+GtkWidget *event_editor_new (GnomeCalendar *owner, iCalObject *);
+
END_GNOME_DECLS
+
#endif