GtkImage: Use gtk_widget_render_icon_pixbuf()

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

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index cfc4b8b0cc3da15a3a72571d2d13679e695a7c67..20d631af9eb023e5348df0b2f53a42ac330ceb62 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -47,15 +47,17 @@
  *
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_TEXT_TAG_H__
 #define __GTK_TEXT_TAG_H__
 
-#include <glib-object.h>
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
 
 G_BEGIN_DECLS
 
@@ -80,13 +82,13 @@ struct _GtkTextTag
 {
   GObject parent_instance;
 
-  GtkTextTagTable *table;
+  GtkTextTagTable *GSEAL (table);
 
-  char *name;                   /* Name of this tag.  This field is actually
+  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 priority;         /* Priority of this tag within widget.  0
+  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. */
@@ -98,35 +100,36 @@ struct _GtkTextTag
    * defaults if no tag specifies an override.
    */
 
-  GtkTextAttributes *values;
+  GtkTextAttributes *GSEAL (values);
   
   /* Flags for whether a given value is set; if a value is unset, then
    * this tag does not affect it.
    */
-  guint bg_color_set : 1;
-  guint bg_stipple_set : 1;
-  guint fg_color_set : 1;
-  guint scale_set : 1;
-  guint fg_stipple_set : 1;
-  guint justification_set : 1;
-  guint left_margin_set : 1;
-  guint indent_set : 1;
-  guint rise_set : 1;
-  guint strikethrough_set : 1;
-  guint right_margin_set : 1;
-  guint pixels_above_lines_set : 1;
-  guint pixels_below_lines_set : 1;
-  guint pixels_inside_wrap_set : 1;
-  guint tabs_set : 1;
-  guint underline_set : 1;
-  guint wrap_mode_set : 1;
-  guint bg_full_height_set : 1;
-  guint invisible_set : 1;
-  guint editable_set : 1;
-  guint language_set : 1;
-  guint pg_bg_color_set : 1;
-  guint pad1 : 1;
-  guint pad2 : 1;
+  guint GSEAL (bg_color_set) : 1;
+  guint GSEAL (fg_color_set) : 1;
+  guint GSEAL (scale_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;
 };
 
 struct _GtkTextTagClass
@@ -166,8 +169,6 @@ struct _GtkTextAppearance
   /*< public >*/
   GdkColor bg_color;
   GdkColor fg_color;
-  GdkBitmap *bg_stipple;
-  GdkBitmap *fg_stipple;
 
   /* super/subscript rise, can be negative */
   gint rise;
@@ -255,9 +256,6 @@ struct _GtkTextAttributes
   /* can edit this text */
   guint editable : 1;
 
-  /* colors are allocated etc. */
-  guint realized : 1;
-
   /*< private >*/
   guint pad1 : 1;
   guint pad2 : 1;