From ac0c655f3f2a8e47b0cca877aabae66421c58187 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 15 Jul 2008 18:34:59 +0000 Subject: Migrate CompEditor, CompEditorPage, and the various subclasses from BonoboUI to GtkUIManager. See bug #542125. svn path=/branches/kill-bonobo/; revision=35746 --- calendar/gui/dialogs/memo-editor.h | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'calendar/gui/dialogs/memo-editor.h') diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h index 76f8ccb5df..ab229584e5 100644 --- a/calendar/gui/dialogs/memo-editor.h +++ b/calendar/gui/dialogs/memo-editor.h @@ -28,12 +28,26 @@ #include #include "comp-editor.h" -#define TYPE_MEMO_EDITOR (memo_editor_get_type ()) -#define MEMO_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEMO_EDITOR, MemoEditor)) -#define MEMO_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEMO_EDITOR, \ - MemoEditorClass)) -#define IS_MEMO_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEMO_EDITOR)) -#define IS_MEMO_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEMO_EDITOR)) +/* Standard GObject macros */ +#define TYPE_MEMO_EDITOR \ + (memo_editor_get_type ()) +#define MEMO_EDITOR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), TYPE_MEMO_EDITOR, MemoEditor)) +#define MEMO_EDITOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), TYPE_MEMO_EDITOR, MemoEditorClass)) +#define IS_MEMO_EDITOR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), TYPE_MEMO_EDITOR)) +#define IS_MEMO_EDITOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), TYPE_MEMO_EDITOR)) +#define MEMO_EDITOR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), TYPE_MEMO_EDITOR, MemoEditorClass)) + +G_BEGIN_DECLS typedef struct _MemoEditor MemoEditor; typedef struct _MemoEditorClass MemoEditorClass; @@ -41,8 +55,6 @@ typedef struct _MemoEditorPrivate MemoEditorPrivate; struct _MemoEditor { CompEditor parent; - - /* Private data */ MemoEditorPrivate *priv; }; @@ -50,10 +62,10 @@ struct _MemoEditorClass { CompEditorClass parent_class; }; -GType memo_editor_get_type (void); -MemoEditor *memo_editor_construct (MemoEditor *te, - ECal *client); -MemoEditor *memo_editor_new (ECal *client, CompEditorFlags flags); +GType memo_editor_get_type (void); +CompEditor * memo_editor_new (ECal *client, + CompEditorFlags flags); +G_END_DECLS #endif /* __MEMO_EDITOR_H__ */ -- cgit v1.2.3