Updated

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

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 03a38a2cafaa4710b88d37d339b2b5154cd2fd6b..0d73be129e7c7428e093f9db90b6e01492f2c715 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -1,8 +1,12 @@
 #ifndef GTK_TEXT_TAG_H
 #define GTK_TEXT_TAG_H
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <gdk/gdk.h>
+#include <gtk/gtkenums.h>
+
+/* Not needed, retained for compatibility -Yosh */
+#include <gtk/gtkobject.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,6 +24,8 @@ typedef struct _GtkTextAttributes GtkTextAttributes;
 #define GTK_IS_TEXT_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG))
 #define GTK_TEXT_TAG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
 
+#define GTK_TYPE_TEXT_ATTRIBUTES     (gtk_text_attributes_get_type ())
+
 typedef struct _GtkTextTag GtkTextTag;
 typedef struct _GtkTextTagClass GtkTextTagClass;
 
@@ -110,6 +116,7 @@ typedef struct _GtkTextAppearance GtkTextAppearance;
 
 struct _GtkTextAppearance
 {
+  /*< public >*/
   GdkColor bg_color;
   GdkColor fg_color;
   GdkBitmap *bg_stipple;
@@ -118,11 +125,13 @@ struct _GtkTextAppearance
   /* super/subscript rise, can be negative */
   gint rise;
 
+  /*< private >*/
   /* I'm not sure this can really be used without breaking some things
    * an app might do :-/
    */
   gpointer padding1;
-  
+
+  /*< public >*/
   guint underline : 4;          /* PangoUnderline */
   guint strikethrough : 1;
 
@@ -140,6 +149,7 @@ struct _GtkTextAppearance
   guint inside_selection : 1;
   guint is_text : 1;
 
+  /*< private >*/
   guint pad1 : 1;
   guint pad2 : 1;
   guint pad3 : 1;
@@ -148,8 +158,10 @@ struct _GtkTextAppearance
 
 struct _GtkTextAttributes
 {
+  /*< private >*/
   guint refcount;
 
+  /*< public >*/
   GtkTextAppearance appearance;
 
   GtkJustification justification;
@@ -181,11 +193,13 @@ struct _GtkTextAttributes
 
   PangoLanguage *language;
 
+  /*< private >*/
   /* I'm not sure this can really be used without breaking some things
    * an app might do :-/
    */
   gpointer padding1;
-  
+
+  /*< public >*/
   /* hide the text  */
   guint invisible : 1;
 
@@ -200,6 +214,7 @@ struct _GtkTextAttributes
   /* colors are allocated etc. */
   guint realized : 1;
 
+  /*< private >*/
   guint pad1 : 1;
   guint pad2 : 1;
   guint pad3 : 1;
@@ -213,6 +228,8 @@ void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
 void               gtk_text_attributes_unref       (GtkTextAttributes *values);
 void               gtk_text_attributes_ref         (GtkTextAttributes *values);
 
+GType              gtk_text_attributes_get_type    (void);
+
 
 #ifdef __cplusplus
 }