diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-17 02:24:31 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:19 +0800 |
commit | dfc4205ce569594e83772ac8e0c04f5ca8c2a019 (patch) | |
tree | 5c8eac525f7468f36781c74b1730431950cc7df6 /widgets/table/e-cell-combo.h | |
parent | 30a590ae89a3fbba28a2296606dd7141136b5f21 (diff) | |
download | gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.tar gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.tar.gz gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.tar.bz2 gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.tar.lz gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.tar.xz gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.tar.zst gsoc2013-evolution-dfc4205ce569594e83772ac8e0c04f5ca8c2a019.zip |
libetable cleanups.
Diffstat (limited to 'widgets/table/e-cell-combo.h')
-rw-r--r-- | widgets/table/e-cell-combo.h | 47 |
1 files changed, 34 insertions, 13 deletions
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h index 728addeed9..ec77dcd6f0 100644 --- a/widgets/table/e-cell-combo.h +++ b/widgets/table/e-cell-combo.h @@ -33,29 +33,50 @@ #include <table/e-cell-popup.h> -#define E_CELL_COMBO_TYPE (e_cell_combo_get_type ()) -#define E_CELL_COMBO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_COMBO_TYPE, ECellCombo)) -#define E_CELL_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_COMBO_TYPE, ECellComboClass)) -#define E_IS_CELL_COMBO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_COMBO_TYPE)) -#define E_IS_CELL_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE)) +/* Standard GObject macros */ +#define E_TYPE_CELL_COMBO \ + (e_cell_combo_get_type ()) +#define E_CELL_COMBO(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_CELL_COMBO, ECellCombo)) +#define E_CELL_COMBO_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_CELL_COMBO, ECellComboClass)) +#define E_IS_CELL_COMBO(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_CELL_COMBO)) +#define E_IS_CELL_COMBO_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_CELL_COMBO)) +#define E_CELL_COMBO_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_CELL_COMBO, ECellComboClass)) -typedef struct { +G_BEGIN_DECLS + +typedef struct _ECellCombo ECellCombo; +typedef struct _ECellComboClass ECellComboClass; + +struct _ECellCombo { ECellPopup parent; GtkWidget *popup_window; GtkWidget *popup_scrolled_window; GtkWidget *popup_tree_view; -} ECellCombo; +}; -typedef struct { +struct _ECellComboClass { ECellPopupClass parent_class; -} ECellComboClass; +}; -GType e_cell_combo_get_type (void); -ECell *e_cell_combo_new (void); +GType e_cell_combo_get_type (void) G_GNUC_CONST; +ECell * e_cell_combo_new (void); /* These must be UTF-8. */ -void e_cell_combo_set_popdown_strings (ECellCombo *ecc, - GList *strings); +void e_cell_combo_set_popdown_strings + (ECellCombo *ecc, + GList *strings); + +G_END_DECLS #endif /* _E_CELL_COMBO_H_ */ |