/tmp/cvsX7MHVx

[~andy/gtk] / gtk / gtktextmark.h

diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 07ce2672a8b93fad83b69ac171a3d47c061b2d29..851123c4ac0bcae4fc50c0d98baf839278ae7e4d 100644 (file)
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -47,12 +47,10 @@
  *
  */
 
-#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 */
+G_BEGIN_DECLS
 
 /* The GtkTextMark data type */
 
@@ -77,6 +75,11 @@ 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;
@@ -85,16 +88,12 @@ 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);
+G_CONST_RETURN 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);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif