Include files outside of the extern "C" block. Makes some C++ compiler

2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
	gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
	gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
	gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
	gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
	gtk/gtktypeutils.h: Include files outside of the extern "C"
	block. Makes some C++ compiler happy. Reported by Denis Vakatov
	<vakatov@peony.nlm.nih.gov>.

	I really hope not to have caused a merging nightmare for all
	the branches out there. Otherwise I'll be available for crucifixion.

15 files changed, 49 insertions, 46 deletions

diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h
index 396821bed3..2ca8c24ac0 100644
--- a/gtk/gtkhsv.h
+++ b/gtk/gtkhsv.h
@@ -31,14 +31,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#include <gtk/gtkwidget.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <gtk/gtkwidget.h>
-
-
 #define GTK_TYPE_HSV            (gtk_hsv_get_type ())
 #define GTK_HSV(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
 #define GTK_HSV_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSV, GtkHSV))
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index 0c594c3c85..72085302ed 100644
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -1,10 +1,6 @@
 #ifndef GTK_TEXT_BTREE_H
 #define GTK_TEXT_BTREE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktextmark.h>
@@ -12,6 +8,9 @@ extern "C" {
 #include <gtk/gtktextsegment.h>
 #include <gtk/gtktextiter.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 GtkTextBTree  *gtk_text_btree_new        (GtkTextTagTable *table,
                                           GtkTextBuffer   *buffer);
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index c57354b17b..a8ef0eb651 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -1,6 +1,11 @@
 #ifndef GTK_TEXT_BUFFER_H
 #define GTK_TEXT_BUFFER_H
 
+#include <gtk/gtkwidget.h>
+#include <gtk/gtktexttagtable.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextmark.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -10,11 +15,6 @@ extern "C" {
  * GtkTextBTree is the PRIVATE internal representation of it.
  */
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktexttagtable.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmark.h>
-
 typedef struct _GtkTextBTree GtkTextBTree;
 
 #define GTK_TYPE_TEXT_BUFFER            (gtk_text_buffer_get_type())
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 9ce8fd5fc5..3344a5a8d4 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -1,12 +1,12 @@
 #ifndef GTK_TEXT_CHILD_H
 #define GTK_TEXT_CHILD_H
 
+#include <gtk/gtktexttypes.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktexttypes.h>
-
 typedef struct _GtkTextPixmap GtkTextPixmap;
 
 struct _GtkTextPixmap {
diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h
index 8f43b6da03..66110d127d 100644
--- a/gtk/gtktextdisplay.h
+++ b/gtk/gtktextdisplay.h
@@ -1,6 +1,8 @@
 #ifndef GTK_TEXT_DISPLAY_H
 #define GTK_TEXT_DISPLAY_H
 
+#include <gtk/gtktextlayout.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -10,8 +12,6 @@ extern "C" {
   uses GtkTextLayout
 */
 
-#include <gtk/gtktextlayout.h>
-
 /* The drawable should be pre-initialized to your preferred
    background. */
 void gtk_text_layout_draw (GtkTextLayout *layout,
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 1b93220263..2e86e47b0d 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -1,6 +1,8 @@
 #ifndef GTK_TEXT_ITER_H
 #define GTK_TEXT_ITER_H
 
+#include <gtk/gtktexttag.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -11,8 +13,6 @@ extern "C" {
  * are changed.
  */
 
-#include <gtk/gtktexttag.h>
-
 typedef struct _GtkTextBuffer GtkTextBuffer;
 
 struct _GtkTextIter {
diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h
index 4a83c643a6..6a23a3e8f9 100644
--- a/gtk/gtktextiterprivate.h
+++ b/gtk/gtktextiterprivate.h
@@ -1,12 +1,12 @@
 #ifndef GTK_TEXT_ITER_PRIVATE_H
 #define GTK_TEXT_ITER_PRIVATE_H
 
+#include <gtk/gtktextiter.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktextiter.h>
-
 GtkTextLineSegment *gtk_text_iter_get_indexable_segment(const GtkTextIter *iter);
 GtkTextLineSegment *gtk_text_iter_get_any_segment(const GtkTextIter *iter);
 
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index ffe2700608..457d36f929 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -1,6 +1,10 @@
 #ifndef GTK_TEXT_LAYOUT_H
 #define GTK_TEXT_LAYOUT_H
 
+#include <gtk/gtktextbuffer.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextbtree.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -12,11 +16,6 @@ extern "C" {
  * to use it. 
  */
 
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextbtree.h>
-
-
 #define GTK_TYPE_TEXT_LAYOUT             (gtk_text_layout_get_type())
 #define GTK_TEXT_LAYOUT(obj)             (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
 #define GTK_TEXT_LAYOUT_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h
index 578e68036b..08b64fac00 100644
--- a/gtk/gtktextmarkprivate.h
+++ b/gtk/gtktextmarkprivate.h
@@ -1,13 +1,12 @@
 #ifndef GTK_TEXT_MARK_PRIVATE_H
 #define GTK_TEXT_MARK_PRIVATE_H
 
+#include <gtk/gtktexttypes.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktexttypes.h>
-
-
 #define GTK_IS_TEXT_MARK(mark) (((GtkTextLineSegment*)mark)->type == &gtk_text_left_mark_type || \
                                 ((GtkTextLineSegment*)mark)->type == &gtk_text_right_mark_type)
 
diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h
index d3fe77e82a..4d2d99a784 100644
--- a/gtk/gtktextsegment.h
+++ b/gtk/gtktextsegment.h
@@ -1,6 +1,11 @@
 #ifndef GTK_TEXT_SEGMENT_H
 #define GTK_TEXT_SEGMENT_H
 
+#include <gtk/gtktexttag.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextmarkprivate.h>
+#include <gtk/gtktextchild.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -15,11 +20,6 @@ extern "C" {
 /* This header has the segment type, and two specific segments
    (character and toggle segments) */
 
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmarkprivate.h>
-#include <gtk/gtktextchild.h>
-
 /* Information a BTree stores about a tag. */
 typedef struct _GtkTextTagInfo GtkTextTagInfo;
 struct _GtkTextTagInfo {
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 6fed3c7d71..7fac2e185f 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -1,13 +1,13 @@
 #ifndef GTK_TEXT_TAG_H
 #define GTK_TEXT_TAG_H
 
+#include <gtk/gtkobject.h>
+#include <gdk/gdk.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtkobject.h>
-#include <gdk/gdk.h>
-
 typedef struct _GtkTextIter GtkTextIter;
 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
 typedef struct _GtkTextTagTable GtkTextTagTable;
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 6624b60abf..fee66bd722 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -1,12 +1,12 @@
 #ifndef GTK_TEXT_TAG_TABLE_H
 #define GTK_TEXT_TAG_TABLE_H
 
+#include <gtk/gtktexttag.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktexttag.h>
-
 #define GTK_TYPE_TEXT_TAG_TABLE            (gtk_text_tag_table_get_type())
 #define GTK_TEXT_TAG_TABLE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
 #define GTK_TEXT_TAG_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index 65c3cf0653..19d72a1209 100644
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -1,15 +1,15 @@
 #ifndef GTK_TEXT_TYPES_H
 #define GTK_TEXT_TYPES_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib.h>
 
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktexttagprivate.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 typedef struct _GtkTextLine GtkTextLine;
 typedef struct _GtkTextCounter GtkTextCounter;
 typedef struct _GtkTextLineSegment GtkTextLineSegment;
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 002d3cd01f..8af1a9e7f1 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -1,14 +1,14 @@
 #ifndef GTK_TEXT_VIEW_H
 #define GTK_TEXT_VIEW_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtktextbuffer.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 typedef enum {
   GTK_TEXT_MOVEMENT_CHAR,       /* move by forw/back chars */
   GTK_TEXT_MOVEMENT_POSITIONS,  /* move by left/right chars */
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index bb84258deb..528c4f3b87 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -95,10 +95,18 @@ typedef GBaseInitFunc		GtkClassInitFunc;
 typedef GInstanceInitFunc	GtkObjectInitFunc;
 
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 /* Builtin Types
  */
 #include <gtk/gtktypebuiltins.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* --- typedefs --- */
 /* here we come with some necessary forward declarations for structures and