From a patch submitted by Murray Cumming <Murray.Cumming@mybau.com>

2001-02-17  Christopher James Lahey  <clahey@ximian.com>

	From a patch submitted by Murray Cumming <Murray.Cumming@mybau.com>

	* gal/util/e-util.h, gal/util/e-xml-utils.h,
	gal/widgets/e-canvas-utils.h, gal/widgets/e-colors.h,
	gal/widgets/e-cursors.h, gal/widgets/e-gui-utils.h,
	gal/widgets/e-popup-menu.h, gal/widgets/e-printable.h,
	gal/widgets/gtk-combo-stack.h: Added GNOME_DECLS.

svn path=/trunk/; revision=8267

8 files changed, 39 insertions, 0 deletions

diff --git a/e-util/e-util.h b/e-util/e-util.h
index 5e8e250799..4e93639e9c 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -5,6 +5,11 @@
 #include <gtk/gtktypeutils.h>
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #define E_MAKE_TYPE(l,str,t,ci,i,parent) \
 GtkType l##_get_type(void)\
 {\
@@ -88,6 +93,11 @@ void      e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT              (GtkObject
 								    gpointer       func_data,
 								    GtkArg        *args);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
 #define e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT
 
 void    e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT  (GtkObject     *object,
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index d08e99afb0..bdcd756f3b 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -26,6 +26,8 @@
 #include <gnome.h>
 #include <gnome-xml/tree.h>
 
+BEGIN_GNOME_DECLS
+
 xmlNode *e_xml_get_child_by_name                     (const xmlNode *parent,
                                                       const xmlChar *child_name);
 /* lang set to NULL means use the current locale. */
@@ -87,4 +89,6 @@ void      e_xml_set_string_prop_by_name              (xmlNode       *parent,
 gchar    *e_xml_get_translated_string_prop_by_name   (const xmlNode *parent,
                                                       const xmlChar *prop_name);
 
+END_GNOME_DECLS
+
 #endif /* __E_XML_UTILS__ */
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
index 6c426fb676..402b0048c6 100644
--- a/widgets/misc/e-canvas-utils.h
+++ b/widgets/misc/e-canvas-utils.h
@@ -24,8 +24,13 @@
 #define __E_CANVAS_UTILS__
 
 #include <gnome.h>
+
+BEGIN_GNOME_DECLS
+
 void e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy);
 void e_canvas_item_show_area     (GnomeCanvasItem *item, double x1, double y1, double x2, double y2);
 void e_canvas_item_show_area_delayed     (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay);
 
+END_GNOME_DECLS
+
 #endif /* __E_CANVAS_UTILS__ */
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
index 08fa67dd67..590a89995c 100644
--- a/widgets/misc/e-colors.h
+++ b/widgets/misc/e-colors.h
@@ -1,6 +1,8 @@
 #ifndef GNOME_APP_LIBS_COLOR_H
 #define GNOME_APP_LIBS_COLOR_H
 
+BEGIN_GNOME_DECLS
+
 void     e_color_init       (void);
 
 /* Return the pixel value for the given red, green and blue */
@@ -10,4 +12,6 @@ void     e_color_alloc_gdk  (GdkColor *color);
 
 extern GdkColor e_white, e_dark_gray, e_black;
 
+END_GNOME_DECLS
+
 #endif /* GNOME_APP_LIBS_COLOR_H */
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index 5373c942bb..a8374d6506 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -3,6 +3,8 @@
 
 #include <gdk/gdk.h>
 
+BEGIN_GNOME_DECLS
+
 typedef enum {
 	E_CURSOR_FAT_CROSS,
 	E_CURSOR_THIN_CROSS,
@@ -37,4 +39,6 @@ G_STMT_START {									     \
 
 GdkCursor *e_cursor_get (ECursorType type);
 
+END_GNOME_DECLS
+
 #endif /* GNOME_APP_LIB_CURSORS_H */
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
index 8ccc8d5df5..d11d0a77fb 100644
--- a/widgets/misc/e-gui-utils.h
+++ b/widgets/misc/e-gui-utils.h
@@ -6,6 +6,8 @@
 
 #include <libgnomeui/gnome-messagebox.h>
 
+BEGIN_GNOME_DECLS
+
 void  e_popup_menu                   (GtkMenu *menu, GdkEvent *event);
 void  e_auto_kill_popup_menu_on_hide (GtkMenu *menu);
 void  e_notice                       (GtkWindow *window, const char *type, const char *format, ...);
@@ -17,4 +19,6 @@ void e_container_focus_nth_entry     (GtkContainer *container,
 gint e_container_change_tab_order    (GtkContainer *container,
 				      GList        *widgets);
 
+END_GNOME_DECLS
+
 #endif /* GAL_GUI_UTILS_H */
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index ef872ba39f..61839902f6 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -4,6 +4,8 @@
 
 #include <gtk/gtkwidget.h>
 
+BEGIN_GNOME_DECLS
+
 typedef struct _EPopupMenu EPopupMenu;
 
 struct _EPopupMenu {
@@ -25,4 +27,6 @@ void     e_popup_menu_run     (EPopupMenu     *menu_list,
 			       guint32         hide_mask,
 			       void           *closure);
 
+END_GNOME_DECLS
+
 #endif /* E_POPUP_MENU_H */
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
index 18e6ec8472..581b1e6f63 100644
--- a/widgets/misc/e-printable.h
+++ b/widgets/misc/e-printable.h
@@ -13,6 +13,8 @@
 #include <gtk/gtkobject.h>
 #include <libgnomeprint/gnome-print.h>
 
+BEGIN_GNOME_DECLS
+
 #define E_PRINTABLE_TYPE        (e_printable_get_type ())
 #define E_PRINTABLE(o)          (GTK_CHECK_CAST ((o), E_PRINTABLE_TYPE, EPrintable))
 #define E_PRINTABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_PRINTABLE_TYPE, EPrintableClass))
@@ -69,4 +71,6 @@ gboolean    e_printable_will_fit            (EPrintable        *e_printable,
 					     gdouble            max_height,
 					     gboolean           quantized);
 
+END_GNOME_DECLS
+
 #endif /* _E_PRINTABLE_H_ */