diff options
41 files changed, 244 insertions, 0 deletions
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h index 1e13ff4f04..60c0341fe7 100644 --- a/widgets/table/e-cell-checkbox.h +++ b/widgets/table/e-cell-checkbox.h @@ -3,6 +3,8 @@ #include <gal/e-table/e-cell-toggle.h> +BEGIN_GNOME_DECLS + #define E_CELL_CHECKBOX_TYPE (e_cell_checkbox_get_type ()) #define E_CELL_CHECKBOX(o) (GTK_CHECK_CAST ((o), E_CELL_CHECKBOX_TYPE, ECellCheckbox)) #define E_CELL_CHECKBOX_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_CHECKBOX_TYPE, ECellCheckboxClass)) @@ -20,5 +22,7 @@ typedef struct { GtkType e_cell_checkbox_get_type (void); ECell *e_cell_checkbox_new (void); +END_GNOME_DECLS + #endif /* _E_CELL_CHECKBOX_H_ */ diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h index 0dece367e3..25bde7a85a 100644 --- a/widgets/table/e-cell-date.h +++ b/widgets/table/e-cell-date.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-cell-text.h> +BEGIN_GNOME_DECLS + #define E_CELL_DATE_TYPE (e_cell_date_get_type ()) #define E_CELL_DATE(o) (GTK_CHECK_CAST ((o), E_CELL_DATE_TYPE, ECellDate)) #define E_CELL_DATE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_TYPE, ECellDateClass)) @@ -25,4 +27,6 @@ typedef struct { GtkType e_cell_date_get_type (void); ECell *e_cell_date_new (const char *fontname, GtkJustification justify); +END_GNOME_DECLS + #endif /* _E_CELL_DATE_H_ */ diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h index 8ac54b64b4..b9124bb2b0 100644 --- a/widgets/table/e-cell-number.h +++ b/widgets/table/e-cell-number.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-cell-text.h> +BEGIN_GNOME_DECLS + #define E_CELL_NUMBER_TYPE (e_cell_number_get_type ()) #define E_CELL_NUMBER(o) (GTK_CHECK_CAST ((o), E_CELL_NUMBER_TYPE, ECellNumber)) #define E_CELL_NUMBER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_NUMBER_TYPE, ECellNumberClass)) @@ -25,4 +27,6 @@ typedef struct { GtkType e_cell_number_get_type (void); ECell *e_cell_number_new (const char *fontname, GtkJustification justify); +END_GNOME_DECLS + #endif /* _E_CELL_NUMBER_H_ */ diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h index 229d316642..db976a4eb6 100644 --- a/widgets/table/e-cell-size.h +++ b/widgets/table/e-cell-size.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-cell-text.h> +BEGIN_GNOME_DECLS + #define E_CELL_SIZE_TYPE (e_cell_size_get_type ()) #define E_CELL_SIZE(o) (GTK_CHECK_CAST ((o), E_CELL_SIZE_TYPE, ECellSize)) #define E_CELL_SIZE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_SIZE_TYPE, ECellSizeClass)) @@ -25,4 +27,6 @@ typedef struct { GtkType e_cell_size_get_type (void); ECell *e_cell_size_new (const char *fontname, GtkJustification justify); +END_GNOME_DECLS + #endif /* _E_CELL_SIZE_H_ */ diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index 706be9150d..78e9576a07 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -27,6 +27,8 @@ #include <libgnomeui/gnome-canvas.h> #include <gal/e-table/e-cell.h> +BEGIN_GNOME_DECLS + #define E_CELL_TEXT_TYPE (e_cell_text_get_type ()) #define E_CELL_TEXT(o) (GTK_CHECK_CAST ((o), E_CELL_TEXT_TYPE, ECellText)) #define E_CELL_TEXT_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_TEXT_TYPE, ECellTextClass)) @@ -71,6 +73,8 @@ GtkType e_cell_text_get_type (void); ECell *e_cell_text_new (const char *fontname, GtkJustification justify); ECell *e_cell_text_construct(ECellText *cell, const char *fontname, GtkJustification justify); +END_GNOME_DECLS + #endif /* _E_CELL_TEXT_H_ */ diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index a30b6ec7b1..0916970b00 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -5,6 +5,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gal/e-table/e-cell.h> +BEGIN_GNOME_DECLS + #define E_CELL_TOGGLE_TYPE (e_cell_toggle_get_type ()) #define E_CELL_TOGGLE(o) (GTK_CHECK_CAST ((o), E_CELL_TOGGLE_TYPE, ECellToggle)) #define E_CELL_TOGGLE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_TOGGLE_TYPE, ECellToggleClass)) @@ -30,6 +32,8 @@ ECell *e_cell_toggle_new (int border, int n_states, GdkPixbuf **images void e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf **images); +END_GNOME_DECLS + #endif /* _E_CELL_TOGGLE_H_ */ diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h index 21ead2f05a..7b2d007159 100644 --- a/widgets/table/e-cell-tree.h +++ b/widgets/table/e-cell-tree.h @@ -10,6 +10,8 @@ #include <libgnomeui/gnome-canvas.h> #include <gal/e-table/e-cell.h> +BEGIN_GNOME_DECLS + #define E_CELL_TREE_TYPE (e_cell_tree_get_type ()) #define E_CELL_TREE(o) (GTK_CHECK_CAST ((o), E_CELL_TREE_TYPE, ECellTree)) #define E_CELL_TREE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_TREE_TYPE, ECellTreeClass)) @@ -42,6 +44,9 @@ void e_cell_tree_construct (ECellTree *ect, gboolean draw_lines, ECell *subcell); + +END_GNOME_DECLS + #endif /* _E_CELL_TREE_H_ */ diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index 40ffae96ae..b9927114bb 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -7,6 +7,8 @@ #include <gal/e-table/e-table-model.h> #include <gal/e-table/e-table-tooltip.h> +BEGIN_GNOME_DECLS + #define E_CELL_TYPE (e_cell_get_type ()) #define E_CELL(o) (GTK_CHECK_CAST ((o), E_CELL_TYPE, ECell)) #define E_CELL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CELL_TYPE, ECellClass)) @@ -106,4 +108,6 @@ int e_cell_height (ECellView *ecell_view, int model_col, int view_col, void *e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row); void e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context); +END_GNOME_DECLS + #endif /* _E_CELL_H_ */ diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index a238d69670..f4412cb0ea 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -9,6 +9,8 @@ #include <gal/e-table/e-table-item.h> #include <gal/e-table/e-table-selection-model.h> +BEGIN_GNOME_DECLS + #define E_TABLE_CLICK_TO_ADD_TYPE (e_table_click_to_add_get_type ()) #define E_TABLE_CLICK_TO_ADD(o) (GTK_CHECK_CAST ((o), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAdd)) #define E_TABLE_CLICK_TO_ADD_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAddClass)) @@ -48,4 +50,6 @@ GtkType e_table_click_to_add_get_type (void); void e_table_click_to_add_commit (ETableClickToAdd *etcta); +END_GNOME_DECLS + #endif /* _E_TABLE_CLICK_TO_ADD_H_ */ diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h index c1c26175c7..98b489b7c0 100644 --- a/widgets/table/e-table-col-dnd.h +++ b/widgets/table/e-table-col-dnd.h @@ -1,10 +1,14 @@ #ifndef _E_TABLE_COL_DND_H_ #define _E_TABLE_COL_DND_H_ +BEGIN_GNOME_DECLS + #define TARGET_ETABLE_COL_TYPE "application/x-etable-column-header" enum { TARGET_ETABLE_COL_HEADER }; +END_GNOME_DECLS + #endif /* _E_TABLE_COL_DND_H_ */ diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index fd15108ab9..036b317d69 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -5,6 +5,10 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gal/e-table/e-cell.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_COL_TYPE (e_table_col_get_type ()) #define E_TABLE_COL(o) (GTK_CHECK_CAST ((o), E_TABLE_COL_TYPE, ETableCol)) #define E_TABLE_COL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_COL_TYPE, ETableColClass)) @@ -58,5 +62,10 @@ ETableCol *e_table_col_new_with_pixbuf (int col_idx, const char *text, void e_table_col_destroy (ETableCol *etc); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + #endif /* _E_TABLE_COL_H_ */ diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index c19ea5b3d0..ff334ec1b1 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -5,6 +5,11 @@ #include <gtk/gtkobject.h> #include <gnome-xml/tree.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + #define E_TABLE_COLUMN_SPECIFICATION_TYPE (e_table_column_specification_get_type ()) #define E_TABLE_COLUMN_SPECIFICATION(o) (GTK_CHECK_CAST ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecification)) #define E_TABLE_COLUMN_SPECIFICATION_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecificationClass)) @@ -38,4 +43,8 @@ void e_table_column_specification_load_from_node (ETableC xmlNode *e_table_column_specification_save_to_node (ETableColumnSpecification *state, xmlNode *parent); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_COLUMN_SPECIFICATION_H_ */ diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h index a6c215b895..9df83238ee 100644 --- a/widgets/table/e-table-config-field.h +++ b/widgets/table/e-table-config-field.h @@ -6,6 +6,8 @@ #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-specification.h> +BEGIN_GNOME_DECLS + #define E_TABLE_CONFIG_FIELD_TYPE (e_table_config_field_get_type ()) #define E_TABLE_CONFIG_FIELD(o) (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_FIELD_TYPE, ETableConfigField)) #define E_TABLE_CONFIG_FIELD_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_FIELD_TYPE, ETableConfigFieldClass)) @@ -40,4 +42,6 @@ ETableConfigField *e_table_config_field_construct (ETableConfigField *field, ETableSortInfo *sort_info, gboolean grouping); +END_GNOME_DECLS + #endif /* _E_TABLE_CONFIG_FIELD_H_ */ diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index e33aab33bf..28eb8600e2 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -7,6 +7,8 @@ #include <gal/e-table/e-table-specification.h> #include <gal/widgets/gtk-combo-text.h> +BEGIN_GNOME_DECLS + #define E_TABLE_CONFIG_TYPE (e_table_config_get_type ()) #define E_TABLE_CONFIG(o) (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_TYPE, ETableConfig)) #define E_TABLE_CONFIG_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_TYPE, ETableConfigClass)) @@ -71,4 +73,6 @@ ETableConfig *e_table_config_construct (ETableConfig *etco, ETableState *state); void e_table_config_raise (ETableConfig *config); +END_GNOME_DECLS + #endif /* _E_TABLE_CONFIG_H */ diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h index 01208da1aa..6c01e17a69 100644 --- a/widgets/table/e-table-defines.h +++ b/widgets/table/e-table-defines.h @@ -1,6 +1,10 @@ #ifndef __E_TABLE_DEFINES__ #define __E_TABLE_DEFINES__ 1 +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define BUTTON_HEIGHT 10 #define BUTTON_PADDING 2 #define GROUP_INDENT (BUTTON_HEIGHT + (BUTTON_PADDING * 2)) @@ -21,4 +25,9 @@ typedef enum E_TABLE_CURSOR_SPREADSHEET, } ETableCursorMode; +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + #endif diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index 65b2fb18a5..d39fe9066f 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -6,6 +6,8 @@ #include <gal/e-table/e-cell.h> #include <gdk-pixbuf/gdk-pixbuf.h> +BEGIN_GNOME_DECLS + #define E_TABLE_EXTRAS_TYPE (e_table_extras_get_type ()) #define E_TABLE_EXTRAS(o) (GTK_CHECK_CAST ((o), E_TABLE_EXTRAS_TYPE, ETableExtras)) #define E_TABLE_EXTRAS_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_EXTRAS_TYPE, ETableExtrasClass)) @@ -45,4 +47,6 @@ void e_table_extras_add_pixbuf (ETableExtras *extras, GdkPixbuf *e_table_extras_get_pixbuf (ETableExtras *extras, char *id); +END_GNOME_DECLS + #endif /* _E_TABLE_EXTRAS_H_ */ diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 3951a9ae72..d91c36d52b 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -6,6 +6,8 @@ #include <gnome-xml/tree.h> #include <gal/e-table/e-table-header.h> +BEGIN_GNOME_DECLS + #define E_TABLE_FIELD_CHOOSER_ITEM_TYPE (e_table_field_chooser_item_get_type ()) #define E_TABLE_FIELD_CHOOSER_ITEM(o) (GTK_CHECK_CAST ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItem)) #define E_TABLE_FIELD_CHOOSER_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItemClass)) @@ -43,4 +45,6 @@ typedef struct { GtkType e_table_field_chooser_item_get_type (void); +END_GNOME_DECLS + #endif /* _E_TABLE_FIELD_CHOOSER_ITEM_H_ */ diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index 69f6f9fc97..d273ac94b2 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-table-group.h> #include <gal/e-table/e-table-item.h> +BEGIN_GNOME_DECLS + #define E_TABLE_GROUP_CONTAINER_TYPE (e_table_group_container_get_type ()) #define E_TABLE_GROUP_CONTAINER(o) (GTK_CHECK_CAST ((o), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainer)) #define E_TABLE_GROUP_CONTAINER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainerClass)) @@ -66,4 +68,6 @@ void e_table_group_container_construct (GnomeCanvasGroup *parent, ETable GtkType e_table_group_container_get_type (void); +END_GNOME_DECLS + #endif /* _E_TABLE_GROUP_CONTAINER_H_ */ diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index 34e8fcbb2e..f941b79dcd 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -7,6 +7,8 @@ #include <gal/e-table/e-table-sorted-variable.h> #include <gal/e-table/e-table-item.h> +BEGIN_GNOME_DECLS + #define E_TABLE_GROUP_LEAF_TYPE (e_table_group_leaf_get_type ()) #define E_TABLE_GROUP_LEAF(o) (GTK_CHECK_CAST ((o), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeaf)) #define E_TABLE_GROUP_LEAF_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeafClass)) @@ -48,5 +50,7 @@ ETableGroup *e_table_group_leaf_new (GnomeCanvasGroup *parent, GtkType e_table_group_leaf_get_type (void); +END_GNOME_DECLS + #endif /* _E_TABLE_GROUP_LEAF_H_ */ diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index 41a6c60d95..64ebc37ff0 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -10,6 +10,8 @@ #include <gal/util/e-util.h> #include <gal/widgets/e-printable.h> +BEGIN_GNOME_DECLS + #define E_TABLE_GROUP_TYPE (e_table_group_get_type ()) #define E_TABLE_GROUP(o) (GTK_CHECK_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup)) #define E_TABLE_GROUP_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_TYPE, ETableGroupClass)) @@ -133,4 +135,6 @@ void e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure); +END_GNOME_DECLS + #endif /* _E_TABLE_GROUP_H_ */ diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index 1c2941c602..6186037d5d 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-table-header.h> #include <gal/e-table/e-table-sort-info.h> +BEGIN_GNOME_DECLS + #define E_TABLE_HEADER_ITEM_TYPE (e_table_header_item_get_type ()) #define E_TABLE_HEADER_ITEM(o) (GTK_CHECK_CAST ((o), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItem)) #define E_TABLE_HEADER_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItemClass)) @@ -76,4 +78,6 @@ typedef struct { GtkType e_table_header_item_get_type (void); +END_GNOME_DECLS + #endif /* _E_TABLE_HEADER_ITEM_H_ */ diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index d05c850a83..62f66e4bd3 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -25,6 +25,11 @@ #define E_TABLE_HEADER_UTILS_H #include <gal/e-table/e-table-col.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + double e_table_header_compute_height (ETableCol *ecol, GtkStyle *style, GdkFont *font); @@ -53,5 +58,8 @@ void e_table_draw_elided_string (GdkDrawable *drawable, gboolean center); +#ifdef __cplusplus +} +#endif /* __cplusplus */ #endif diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h index 92ee20c731..c186a8c48c 100644 --- a/widgets/table/e-table-header.h +++ b/widgets/table/e-table-header.h @@ -7,6 +7,10 @@ #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-col.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + typedef struct _ETableHeader ETableHeader; #define E_TABLE_HEADER_TYPE (e_table_header_get_type ()) @@ -82,5 +86,9 @@ GList *e_table_header_get_selected_indexes (ETableHeader *eth); void e_table_header_update_horizontal (ETableHeader *eth); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_HEADER_H_ */ diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index a7ba08ad55..50a5849313 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -10,6 +10,8 @@ #include <gal/e-table/e-table-tooltip.h> #include <gal/widgets/e-printable.h> +BEGIN_GNOME_DECLS + #define E_TABLE_ITEM_TYPE (e_table_item_get_type ()) #define E_TABLE_ITEM(o) (GTK_CHECK_CAST ((o), E_TABLE_ITEM_TYPE, ETableItem)) #define E_TABLE_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_ITEM_TYPE, ETableItemClass)) @@ -139,4 +141,6 @@ void e_table_item_compute_location (ETableItem *eti, int *col); +END_GNOME_DECLS + #endif /* _E_TABLE_ITEM_H_ */ diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index b58614d150..21febaf992 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -4,6 +4,10 @@ #include <gtk/gtkobject.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_MODEL_TYPE (e_table_model_get_type ()) #define E_TABLE_MODEL(o) (GTK_CHECK_CAST ((o), E_TABLE_MODEL_TYPE, ETableModel)) #define E_TABLE_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_MODEL_TYPE, ETableModelClass)) @@ -92,4 +96,8 @@ void e_table_model_cell_changed (ETableModel *e_table_model, int col, void e_table_model_row_inserted (ETableModel *e_table_model, int row); void e_table_model_row_deleted (ETableModel *e_table_model, int row); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_MODEL_H_ */ diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h index 1ac32fa6d6..2636f018ab 100644 --- a/widgets/table/e-table-one.h +++ b/widgets/table/e-table-one.h @@ -4,6 +4,11 @@ #include <gal/e-table/e-table-model.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + #define E_TABLE_ONE_TYPE (e_table_one_get_type ()) #define E_TABLE_ONE(o) (GTK_CHECK_CAST ((o), E_TABLE_ONE_TYPE, ETableOne)) #define E_TABLE_ONE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_ONE_TYPE, ETableOneClass)) @@ -26,5 +31,9 @@ GtkType e_table_one_get_type (void); ETableModel *e_table_one_new (ETableModel *source); void e_table_one_commit (ETableOne *one); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_ONE_H_ */ diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index b4e08ed6fe..2bfa5c6e7d 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -7,6 +7,10 @@ #include <gal/e-table/e-table-defines.h> #include <gal/e-table/e-table-sorter.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SELECTION_MODEL_TYPE (e_table_selection_model_get_type ()) #define E_TABLE_SELECTION_MODEL(o) (GTK_CHECK_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel)) #define E_TABLE_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModelClass)) @@ -75,4 +79,9 @@ void e_table_selection_model_invert_selection (ETableSelecti ETableSelectionModel *e_table_selection_model_new (void); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + #endif /* _E_TABLE_SELECTION_MODEL_H_ */ diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index ca44464325..cf5ec6d4f2 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -4,6 +4,10 @@ #include <gal/e-table/e-table-model.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SIMPLE_TYPE (e_table_simple_get_type ()) #define E_TABLE_SIMPLE(o) (GTK_CHECK_CAST ((o), E_TABLE_SIMPLE_TYPE, ETableSimple)) #define E_TABLE_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SIMPLE_TYPE, ETableSimpleClass)) @@ -57,5 +61,9 @@ ETableModel *e_table_simple_new (ETableSimpleColumnCountFn col_count, ETableSimpleValueToStringFn value_to_string, void *data); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_SIMPLE_H_ */ diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h index c79eb019b3..a2cd4f43a0 100644 --- a/widgets/table/e-table-sort-info.h +++ b/widgets/table/e-table-sort-info.h @@ -5,6 +5,10 @@ #include <gtk/gtkobject.h> #include <gnome-xml/tree.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SORT_INFO_TYPE (e_table_sort_info_get_type ()) #define E_TABLE_SORT_INFO(o) (GTK_CHECK_CAST ((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfo)) #define E_TABLE_SORT_INFO_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass)) @@ -72,4 +76,8 @@ xmlNode *e_table_sort_info_save_to_node (ETableSortInfo *info, xmlNode *parent); ETableSortInfo *e_table_sort_info_duplicate (ETableSortInfo *info); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_SORT_INFO_H_ */ diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index 0a2ad744af..a3030eb3d7 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -8,6 +8,10 @@ #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-header.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SORTED_VARIABLE_TYPE (e_table_sorted_variable_get_type ()) #define E_TABLE_SORTED_VARIABLE(o) (GTK_CHECK_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable)) #define E_TABLE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass)) @@ -38,4 +42,8 @@ typedef struct { GtkType e_table_sorted_variable_get_type (void); ETableModel *e_table_sorted_variable_new (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_SORTED_VARIABLE_H_ */ diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index 97246f7d0b..390141b3c1 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -5,6 +5,10 @@ #include <gal/e-table/e-table-model.h> #include <gal/e-table/e-table-subset.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SORTED_TYPE (e_table_sorted_get_type ()) #define E_TABLE_SORTED(o) (GTK_CHECK_CAST ((o), E_TABLE_SORTED_TYPE, ETableSorted)) #define E_TABLE_SORTED_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_TYPE, ETableSortedClass)) @@ -26,4 +30,8 @@ GtkType e_table_sorted_get_type (void); ETableModel *e_table_sorted_new (ETableModel *etm, int col, GCompareFunc compare); void e_table_sorted_resort (ETableSorted *ets, int col, GCompareFunc compare); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_SORTED_H_ */ diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h index 2f4c5bdf9d..67c9d275d3 100644 --- a/widgets/table/e-table-sorter.h +++ b/widgets/table/e-table-sorter.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-header.h> +BEGIN_GNOME_DECLS + #define E_TABLE_SORTER_TYPE (e_table_sorter_get_type ()) #define E_TABLE_SORTER(o) (GTK_CHECK_CAST ((o), E_TABLE_SORTER_TYPE, ETableSorter)) #define E_TABLE_SORTER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTER_TYPE, ETableSorterClass)) @@ -45,4 +47,6 @@ gint e_table_sorter_sorted_to_model (ETableSorter *sorter, int row); gboolean e_table_sorter_needs_sorting (ETableSorter *sorter); +END_GNOME_DECLS + #endif /* _E_TABLE_SORTER_H_ */ diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 7c73936079..feba63cc7a 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -8,6 +8,10 @@ #include <gal/e-table/e-table-column-specification.h> #include <gal/e-table/e-table-defines.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SPECIFICATION_TYPE (e_table_specification_get_type ()) #define E_TABLE_SPECIFICATION(o) (GTK_CHECK_CAST ((o), E_TABLE_SPECIFICATION_TYPE, ETableSpecification)) #define E_TABLE_SPECIFICATION_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SPECIFICATION_TYPE, ETableSpecificationClass)) @@ -52,4 +56,8 @@ xmlNode *e_table_specification_save_to_node (ETableSpecificatio xmlDoc *doc); ETableSpecification *e_table_specification_duplicate (ETableSpecification *spec); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_SPECIFICATION_H_ */ diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index 906bbedb3f..446d560fff 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -6,6 +6,11 @@ #include <gnome-xml/tree.h> #include <gal/e-table/e-table-sort-info.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + #define E_TABLE_STATE_TYPE (e_table_state_get_type ()) #define E_TABLE_STATE(o) (GTK_CHECK_CAST ((o), E_TABLE_STATE_TYPE, ETableState)) #define E_TABLE_STATE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_STATE_TYPE, ETableStateClass)) @@ -42,4 +47,8 @@ xmlNode *e_table_state_save_to_node (ETableState *state, xmlNode *parent); ETableState *e_table_state_duplicate (ETableState *state); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_STATE_H_ */ diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h index 73387d859c..5436fbb8f2 100644 --- a/widgets/table/e-table-subset-variable.h +++ b/widgets/table/e-table-subset-variable.h @@ -5,6 +5,10 @@ #include <gtk/gtkobject.h> #include <gal/e-table/e-table-subset.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SUBSET_VARIABLE_TYPE (e_table_subset_variable_get_type ()) #define E_TABLE_SUBSET_VARIABLE(o) (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariable)) #define E_TABLE_SUBSET_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariableClass)) @@ -44,5 +48,10 @@ void e_table_subset_variable_decrement (ETableSubsetVariable *ets, gint amount); void e_table_subset_variable_set_allocation (ETableSubsetVariable *ets, gint total); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + #endif /* _E_TABLE_SUBSET_VARIABLE_H_ */ diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h index 763b0aa0b4..6521751637 100644 --- a/widgets/table/e-table-subset.h +++ b/widgets/table/e-table-subset.h @@ -5,6 +5,10 @@ #include <gtk/gtkobject.h> #include <gal/e-table/e-table-model.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TABLE_SUBSET_TYPE (e_table_subset_get_type ()) #define E_TABLE_SUBSET(o) (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_TYPE, ETableSubset)) #define E_TABLE_SUBSET_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_TYPE, ETableSubsetClass)) @@ -36,5 +40,9 @@ ETableModel *e_table_subset_construct (ETableSubset *ets, ETableModel *source, i ETableModel *e_table_subset_get_toplevel (ETableSubset *table_model); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TABLE_SUBSET_H_ */ diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h index 4bc3e5f8eb..3a100af5ab 100644 --- a/widgets/table/e-table-tooltip.h +++ b/widgets/table/e-table-tooltip.h @@ -4,6 +4,8 @@ #include <libgnomeui/gnome-canvas.h> +BEGIN_GNOME_DECLS + typedef struct { GtkWidget *window; gint timer; @@ -14,4 +16,6 @@ typedef struct { GnomeCanvasItem *eti; } ETableTooltip; +END_GNOME_DECLS + #endif diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h index e7e125a6af..ab0378473a 100644 --- a/widgets/table/e-table-tree.h +++ b/widgets/table/e-table-tree.h @@ -1,6 +1,8 @@ #ifndef _E_TABLE_TREE_H_ #define _E_TABLE_TREE_H_ +BEGIN_GNOME_DECLS + typedef struct { char *title; @@ -16,4 +18,6 @@ typedef struct { ETableGroup *e_table_group_new (const char *title, ETableModel *table); ETableGroup *e_table_group_new_leaf (const char *title); +END_GNOME_DECLS + #endif /* _E_TABLE_TREE_H_ */ diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index 74af306642..50bd8064a5 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -5,6 +5,11 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gal/e-table/e-table-model.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + #define E_TREE_MODEL_TYPE (e_tree_model_get_type ()) #define E_TREE_MODEL(o) (GTK_CHECK_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel)) #define E_TREE_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass)) @@ -133,4 +138,8 @@ void e_tree_model_node_traverse (ETreeModel *model, ETreePath *path, ETree void e_tree_model_show_node (ETreeModel *etm, ETreePath* node); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TREE_MODEL_H */ diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index f726cb6db7..797de7c8a7 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -6,6 +6,10 @@ #include <gal/e-table/e-tree-model.h> #include <gal/e-table/e-table-simple.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define E_TREE_SIMPLE_TYPE (e_tree_simple_get_type ()) #define E_TREE_SIMPLE(o) (GTK_CHECK_CAST ((o), E_TREE_SIMPLE_TYPE, ETreeSimple)) #define E_TREE_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TREE_SIMPLE_TYPE, ETreeSimpleClass)) @@ -56,4 +60,8 @@ ETreeModel *e_tree_simple_new (ETableSimpleColumnCountFn col_count, ETreeSimpleIsEditableFn is_editable, gpointer model_data); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _E_TREE_SIMPLE_H_ */ diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index 865af30065..a86ea9f602 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -8,6 +8,8 @@ #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-header.h> +BEGIN_GNOME_DECLS + #define E_TREE_SORTED_VARIABLE_TYPE (e_tree_sorted_variable_get_type ()) #define E_TREE_SORTED_VARIABLE(o) (GTK_CHECK_CAST ((o), E_TREE_SORTED_VARIABLE_TYPE, ETreeSortedVariable)) #define E_TREE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TREE_SORTED_VARIABLE_TYPE, ETreeSortedVariableClass)) @@ -55,5 +57,6 @@ void e_tree_sorted_variable_decrement (ETreeSortedVariable *ets, gint amount); void e_tree_sorted_variable_set_allocation (ETreeSortedVariable *ets, gint total); +END_GNOME_DECLS #endif /* _E_TREE_SORTED_VARIABLE_H_ */ |