treeview: remove extra padding handling

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

diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h
index a7547005ac34ac696cf9b76e88fb5e8956cbbe35..95bb1780f9a1f741e74effb11195da191b9ba30b 100644 (file)
--- a/gtk/gtktexttagprivate.h
+++ b/gtk/gtktexttagprivate.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -27,10 +25,64 @@
 #ifndef __GTK_TEXT_TAG_PRIVATE_H__
 #define __GTK_TEXT_TAG_PRIVATE_H__
 
-#include <gtk/gtktexttag.h>
+#include <gtk/gtk.h>
 
 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
 
+
+struct _GtkTextTagPrivate
+{
+  GtkTextTagTable *table;
+
+  char *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
+                         * 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 *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 fg_color_set : 1;
+  guint scale_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;
+
+  /* Whether these margins accumulate or override */
+  guint accumulative_margin : 1;
+
+  guint pad1 : 1;
+};
+
+
 /* values should already have desired defaults; this function will override
  * the defaults with settings in the given tags, which should be sorted in
  * ascending order of priority
@@ -41,16 +93,6 @@ void _gtk_text_attributes_fill_from_tags   (GtkTextAttributes   *values,
 void _gtk_text_tag_array_sort              (GtkTextTag         **tag_array_p,
                                             guint                len);
 
-/* ensure colors are allocated, etc. for drawing */
-void                _gtk_text_attributes_realize   (GtkTextAttributes *values,
-                                                    GdkColormap       *cmap,
-                                                    GdkVisual         *visual);
-
-/* free the stuff again */
-void                _gtk_text_attributes_unrealize (GtkTextAttributes *values,
-                                                    GdkColormap       *cmap,
-                                                    GdkVisual         *visual);
-
 gboolean _gtk_text_tag_affects_size               (GtkTextTag *tag);
 gboolean _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag);