gtktexttag: Move public members to private header

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

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 39c9f73d92cf2e13f71398f9ce5ed5711c4ac918..cca6f4df0cf6cbc1b2ffbcf4540663316f856e36 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -58,9 +58,6 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
 
 G_BEGIN_DECLS
 
@@ -78,63 +75,15 @@ typedef struct _GtkTextAttributes GtkTextAttributes;
 
 #define GTK_TYPE_TEXT_ATTRIBUTES     (gtk_text_attributes_get_type ())
 
-typedef struct _GtkTextTag GtkTextTag;
-typedef struct _GtkTextTagClass GtkTextTagClass;
+typedef struct _GtkTextTag             GtkTextTag;
+typedef struct _GtkTextTagPrivate      GtkTextTagPrivate;
+typedef struct _GtkTextTagClass        GtkTextTagClass;
 
 struct _GtkTextTag
 {
   GObject parent_instance;
 
-  GtkTextTagTable *GSEAL (table);
-
-  char *GSEAL (name);           /* Name of this tag.  This field is actually
-                                 * a pointer to the key from the entry in
-                                 * tkxt->tagTable, so it needn't be freed
-                                 * explicitly. */
-  int GSEAL (priority);  /* Priority of this tag within widget.  0
-                         * means lowest priority.  Exactly one tag
-                         * has each integer value between 0 and
-                         * numTags-1. */
-  /*
-   * Information for displaying text with this tag.  The information
-   * belows acts as an override on information specified by lower-priority
-   * tags.  If no value is specified, then the next-lower-priority tag
-   * on the text determins the value.  The text widget itself provides
-   * defaults if no tag specifies an override.
-   */
-
-  GtkTextAttributes *GSEAL (values);
-  
-  /* Flags for whether a given value is set; if a value is unset, then
-   * this tag does not affect it.
-   */
-  guint GSEAL (bg_color_set) : 1;
-  guint GSEAL (bg_stipple_set) : 1;
-  guint GSEAL (fg_color_set) : 1;
-  guint GSEAL (scale_set) : 1;
-  guint GSEAL (fg_stipple_set) : 1;
-  guint GSEAL (justification_set) : 1;
-  guint GSEAL (left_margin_set) : 1;
-  guint GSEAL (indent_set) : 1;
-  guint GSEAL (rise_set) : 1;
-  guint GSEAL (strikethrough_set) : 1;
-  guint GSEAL (right_margin_set) : 1;
-  guint GSEAL (pixels_above_lines_set) : 1;
-  guint GSEAL (pixels_below_lines_set) : 1;
-  guint GSEAL (pixels_inside_wrap_set) : 1;
-  guint GSEAL (tabs_set) : 1;
-  guint GSEAL (underline_set) : 1;
-  guint GSEAL (wrap_mode_set) : 1;
-  guint GSEAL (bg_full_height_set) : 1;
-  guint GSEAL (invisible_set) : 1;
-  guint GSEAL (editable_set) : 1;
-  guint GSEAL (language_set) : 1;
-  guint GSEAL (pg_bg_color_set) : 1;
-
-  /* Whether these margins accumulate or override */
-  guint GSEAL (accumulative_margin) : 1;
-
-  guint GSEAL (pad1) : 1;
+  GtkTextTagPrivate *priv;
 };
 
 struct _GtkTextTagClass
@@ -174,8 +123,6 @@ struct _GtkTextAppearance
   /*< public >*/
   GdkColor bg_color;
   GdkColor fg_color;
-  GdkBitmap *bg_stipple;
-  GdkBitmap *fg_stipple;
 
   /* super/subscript rise, can be negative */
   gint rise;
@@ -263,9 +210,6 @@ struct _GtkTextAttributes
   /* can edit this text */
   guint editable : 1;
 
-  /* colors are allocated etc. */
-  guint realized : 1;
-
   /*< private >*/
   guint pad1 : 1;
   guint pad2 : 1;