X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextmark.h;h=a68a3aeb156e048cf59a748af437bd96b2cd3198;hb=a97178af65072e98605b2ce168ee4cc36f684ca2;hp=07ce2672a8b93fad83b69ac171a3d47c061b2d29;hpb=f4b31ff5e6564e8d07f3ae14f378c6f9a8626203;p=~andy%2Fgtk

diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 07ce2672a..a68a3aeb1 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -47,14 +47,14 @@
  *
  */
 
-#ifndef GTK_TEXT_MARK_H
-#define GTK_TEXT_MARK_H
+#ifndef __GTK_TEXT_MARK_H__
+#define __GTK_TEXT_MARK_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
-/* The GtkTextMark data type */
+G_BEGIN_DECLS
 
 typedef struct _GtkTextMark      GtkTextMark;
 typedef struct _GtkTextMarkClass GtkTextMarkClass;
@@ -70,6 +70,7 @@ struct _GtkTextMark
 {
   GObject parent_instance;
 
+  /*< private >*/
   gpointer segment;
 };
 
@@ -77,25 +78,26 @@ struct _GtkTextMarkClass
 {
   GObjectClass parent_class;
 
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GType        gtk_text_mark_get_type   (void) G_GNUC_CONST;
-
-void           gtk_text_mark_set_visible (GtkTextMark *mark,
-                                          gboolean     setting);
-gboolean       gtk_text_mark_get_visible (GtkTextMark *mark);
-
-/* FIXME gconst */
-const char  *  gtk_text_mark_get_name    (GtkTextMark *mark);
-gboolean       gtk_text_mark_get_deleted (GtkTextMark *mark);
-GtkTextBuffer* gtk_text_mark_get_buffer  (GtkTextMark *mark);
-gboolean       gtk_text_mark_get_left_gravity (GtkTextMark *mark);
+GType                 gtk_text_mark_get_type         (void) G_GNUC_CONST;
 
+GtkTextMark          *gtk_text_mark_new              (const gchar *name,
+                                                      gboolean     left_gravity);
+void                  gtk_text_mark_set_visible      (GtkTextMark *mark,
+                                                      gboolean     setting);
+gboolean              gtk_text_mark_get_visible      (GtkTextMark *mark);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
+const gchar *         gtk_text_mark_get_name         (GtkTextMark *mark);
+gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
+GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
+gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
 
+G_END_DECLS
 
+#endif  /* __GTK_TEXT_MARK_H__ */