Commit 5190c739 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

Massive reindentation and reformatting. Arg alignment and comments still

2000-10-30  Havoc Pennington  <hp@redhat.com>

	* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
	gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
	gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
	gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
	gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
	gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
	gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
	gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
	gtktexttypes.h, gtktextview.c, gtktextview.h:

	Massive reindentation and reformatting. Arg alignment and comments
	still need fixing in various places.
parent ad8cdea4
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c,
gtktextbuffer.h, gtktextchild.c, gtktextchild.h,
gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h,
gtktextiter.c, gtktextiter.h, gtktextiterprivate.h,
gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h,
gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h,
gtktexttag.c, gtktexttag.h, gtktexttagprivate.h,
gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c,
gtktexttypes.h, gtktextview.c, gtktextview.h:
Massive reindentation and reformatting. Arg alignment and comments
still need fixing in various places.
2000-10-30 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.h, gtk/gtktextview.c: Change run action signals
......
This diff is collapsed.
......@@ -38,34 +38,34 @@ void gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
/* View stuff */
GtkTextLine *gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
gpointer view_id,
gint ypixel,
gint *line_top_y);
gpointer view_id,
gint ypixel,
gint *line_top_y);
gint gtk_text_btree_find_line_top (GtkTextBTree *tree,
GtkTextLine *line,
gpointer view_id);
GtkTextLine *line,
gpointer view_id);
void gtk_text_btree_add_view (GtkTextBTree *tree,
GtkTextLayout *layout);
GtkTextLayout *layout);
void gtk_text_btree_remove_view (GtkTextBTree *tree,
gpointer view_id);
gpointer view_id);
void gtk_text_btree_invalidate_region (GtkTextBTree *tree,
const GtkTextIter *start,
const GtkTextIter *end);
const GtkTextIter *start,
const GtkTextIter *end);
void gtk_text_btree_get_view_size (GtkTextBTree *tree,
gpointer view_id,
gint *width,
gint *height);
gpointer view_id,
gint *width,
gint *height);
gboolean gtk_text_btree_is_valid (GtkTextBTree *tree,
gpointer view_id);
gpointer view_id);
gboolean gtk_text_btree_validate (GtkTextBTree *tree,
gpointer view_id,
gint max_pixels,
gint *y,
gint *old_height,
gint *new_height);
gpointer view_id,
gint max_pixels,
gint *y,
gint *old_height,
gint *new_height);
void gtk_text_btree_validate_line (GtkTextBTree *tree,
GtkTextLine *line,
gpointer view_id);
GtkTextLine *line,
gpointer view_id);
/* Tag */
......@@ -133,29 +133,29 @@ gboolean gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
/* Manipulate marks */
GtkTextMark *gtk_text_btree_set_mark (GtkTextBTree *tree,
GtkTextMark *existing_mark,
const gchar *name,
gboolean left_gravity,
const GtkTextIter *index,
const gchar *name,
gboolean left_gravity,
const GtkTextIter *index,
gboolean should_exist);
void gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
const gchar *name);
const gchar *name);
void gtk_text_btree_remove_mark (GtkTextBTree *tree,
GtkTextMark *segment);
GtkTextMark *segment);
gboolean gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
GtkTextIter *start,
GtkTextIter *end);
GtkTextIter *start,
GtkTextIter *end);
void gtk_text_btree_place_cursor (GtkTextBTree *tree,
const GtkTextIter *where);
const GtkTextIter *where);
gboolean gtk_text_btree_mark_is_insert (GtkTextBTree *tree,
GtkTextMark *segment);
GtkTextMark *segment);
gboolean gtk_text_btree_mark_is_selection_bound (GtkTextBTree *tree,
GtkTextMark *segment);
GtkTextMark *segment);
GtkTextMark *gtk_text_btree_get_mark_by_name (GtkTextBTree *tree,
const gchar *name);
const gchar *name);
GtkTextLine * gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree,
GtkTextTag *tag);
GtkTextTag *tag);
GtkTextLine * gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
GtkTextTag *tag);
GtkTextTag *tag);
/* Lines */
......@@ -177,12 +177,12 @@ struct _GtkTextLineData {
*/
struct _GtkTextLine {
GtkTextBTreeNode *parent; /* Pointer to parent node containing
* line. */
GtkTextLine *next; /* Next in linked list of lines with
GtkTextBTreeNode *parent; /* Pointer to parent node containing
* line. */
GtkTextLine *next; /* Next in linked list of lines with
* same parent node in B-tree. NULL
* means end of list. */
GtkTextLineSegment *segments; /* First in ordered list of segments
GtkTextLineSegment *segments; /* First in ordered list of segments
* that make up the line. */
GtkTextLineData *views; /* data stored here by views */
};
......
This diff is collapsed.
......@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
......@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_BUFFER_H
......@@ -44,7 +44,7 @@ extern "C" {
typedef struct _GtkTextBTree GtkTextBTree;
#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type())
#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type ())
#define GTK_TEXT_BUFFER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
#define GTK_TEXT_BUFFER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
#define GTK_IS_TEXT_BUFFER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_BUFFER))
......
......@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
*
*
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
......@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
*
*
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
......@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
*
*
*/
#include "gtktextchild.h"
......@@ -59,30 +59,30 @@ pixbuf_segment_cleanup_func (GtkTextLineSegment *seg,
}
static int
pixbuf_segment_delete_func(GtkTextLineSegment *seg,
GtkTextLine *line,
gboolean tree_gone)
pixbuf_segment_delete_func (GtkTextLineSegment *seg,
GtkTextLine *line,
gboolean tree_gone)
{
if (seg->body.pixbuf.pixbuf)
g_object_unref(G_OBJECT (seg->body.pixbuf.pixbuf));
g_object_unref (G_OBJECT (seg->body.pixbuf.pixbuf));
g_free(seg);
g_free (seg);
return 0;
}
static void
pixbuf_segment_check_func(GtkTextLineSegment *seg,
GtkTextLine *line)
pixbuf_segment_check_func (GtkTextLineSegment *seg,
GtkTextLine *line)
{
if (seg->next == NULL)
g_error("pixbuf segment is the last segment in a line");
g_error ("pixbuf segment is the last segment in a line");
if (seg->byte_count != 3)
g_error("pixbuf segment has byte count of %d", seg->byte_count);
g_error ("pixbuf segment has byte count of %d", seg->byte_count);
if (seg->char_count != 1)
g_error("pixbuf segment has char count of %d", seg->char_count);
g_error ("pixbuf segment has char count of %d", seg->char_count);
}
......@@ -97,8 +97,8 @@ GtkTextLineSegmentClass gtk_text_pixbuf_type = {
};
#define PIXBUF_SEG_SIZE ((unsigned) (G_STRUCT_OFFSET(GtkTextLineSegment, body) \
+ sizeof(GtkTextPixbuf)))
#define PIXBUF_SEG_SIZE ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
+ sizeof (GtkTextPixbuf)))
GtkTextLineSegment *
_gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
......@@ -114,11 +114,11 @@ _gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
seg->byte_count = 3; /* We convert to the 0xFFFD "unknown character",
a 3-byte sequence in UTF-8 */
seg->char_count = 1;
seg->body.pixbuf.pixbuf = pixbuf;
g_object_ref (G_OBJECT (pixbuf));
return seg;
}
......@@ -128,7 +128,7 @@ child_segment_cleanup_func (GtkTextLineSegment *seg,
GtkTextLine *line)
{
seg->body.child.line = line;
return seg;
}
......@@ -147,13 +147,13 @@ child_segment_check_func (GtkTextLineSegment *seg,
GtkTextLine *line)
{
if (seg->next == NULL)
g_error("child segment is the last segment in a line");
g_error ("child segment is the last segment in a line");
if (seg->byte_count != 3)
g_error("child segment has byte count of %d", seg->byte_count);
g_error ("child segment has byte count of %d", seg->byte_count);
if (seg->char_count != 1)
g_error("child segment has char count of %d", seg->char_count);
g_error ("child segment has char count of %d", seg->char_count);
}
GtkTextLineSegmentClass gtk_text_child_type = {
......@@ -167,7 +167,7 @@ GtkTextLineSegmentClass gtk_text_child_type = {
};
#define WIDGET_SEG_SIZE ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
+ sizeof(GtkTextChildBody)))
+ sizeof (GtkTextChildBody)))
GtkTextLineSegment *
_gtk_widget_segment_new (void)
......@@ -184,21 +184,21 @@ _gtk_widget_segment_new (void)
* a 3-byte sequence in UTF-8
*/
seg->char_count = 1;
seg->body.child.ref_count = 1;
seg->body.child.widgets = NULL;
seg->body.child.tree = NULL;
seg->body.child.line = NULL;
return seg;
}
void
_gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
GtkWidget *child)
GtkWidget *child)
{
g_assert (widget_segment->type = &gtk_text_child_type);
widget_segment->body.child.widgets =
g_slist_prepend (widget_segment->body.child.widgets,
child);
......@@ -208,7 +208,7 @@ _gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
void
_gtk_widget_segment_remove (GtkTextLineSegment *widget_segment,
GtkWidget *child)
GtkWidget *child)
{
g_assert (widget_segment->type = &gtk_text_child_type);
......@@ -240,7 +240,7 @@ _gtk_widget_segment_unref (GtkTextLineSegment *widget_segment)
if (widget_segment->body.child.tree == NULL)
g_warning ("widget segment destroyed while still in btree");
tmp_list = widget_segment->body.child.widgets;
while (tmp_list)
{
......@@ -259,7 +259,7 @@ void
gtk_text_child_anchor_ref (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
g_return_if_fail (seg->type = &gtk_text_child_type);
g_return_if_fail (seg->body.child.ref_count > 0);
......@@ -270,7 +270,7 @@ void
gtk_text_child_anchor_unref (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
g_return_if_fail (seg->type = &gtk_text_child_type);
g_return_if_fail (seg->body.child.ref_count > 0);
......@@ -283,9 +283,9 @@ gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor)
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
GList *list = NULL;
GSList *iter;
g_return_val_if_fail (seg->type = &gtk_text_child_type, NULL);
iter = seg->body.child.widgets;
while (iter != NULL)
{
......@@ -304,7 +304,7 @@ gboolean
gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
g_return_val_if_fail (seg->type = &gtk_text_child_type, TRUE);
return seg->body.child.tree == NULL;
......
......@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
......@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_CHILD_H
......
......@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
*
*
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
......@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
*
*
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
......@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
*
*
*/
#ifndef GTK_TEXT_CHILD_PRIVATE_H
......
This diff is collapsed.
......@@ -7,9 +7,9 @@
*
* This file can be used under your choice of two licenses, the LGPL
* and the original Tk license.
*
*
* LGPL:
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
......@@ -30,7 +30,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
*
*
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
......@@ -40,13 +40,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
*
*
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
......@@ -94,15 +94,15 @@ extern "C" {
* x/y/width/height - Region of the layout to render. x,y must be inside
* the drawable.
*/
void gtk_text_layout_draw (GtkTextLayout *layout,
GtkWidget *widget,
GdkDrawable *drawable,
gint x_offset,
gint y_offset,
gint x,
gint y,
gint width,
gint height);
void gtk_text_layout_draw (GtkTextLayout *layout,
GtkWidget *widget,
GdkDrawable *drawable,
gint x_offset,
gint y_offset,
gint x,
gint y,
gint width,
gint height);
......@@ -110,4 +110,4 @@ void gtk_text_layout_draw (GtkTextLayout *layout,
}
#endif /* __cplusplus */
#endif /* GTK_TEXT_DISPLAY_H */
#endif /* GTK_TEXT_DISPLAY_H */
This diff is collapsed.
......@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
......@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_ITER_H
......@@ -59,7 +59,7 @@ struct _GtkTextIter {
/* This is primarily intended for language bindings that want to avoid
a "buffer" argument to text insertions, deletions, etc. */
GtkTextBuffer *gtk_text_iter_get_buffer(const GtkTextIter *iter);
GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
/*
* Life cycle
......@@ -178,12 +178,12 @@ gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data);
gboolean gtk_text_iter_forward_find_char (GtkTextIter *iter,
GtkTextCharPredicate pred,
gpointer user_data);
GtkTextCharPredicate pred,
gpointer user_data);
gboolean gtk_text_iter_backward_find_char (GtkTextIter *iter,
GtkTextCharPredicate pred,
gpointer user_data);
GtkTextCharPredicate pred,
gpointer user_data);
gboolean gtk_text_iter_forward_search (const GtkTextIter *iter,
const gchar *str,
......
......@@ -21,7 +21,7 @@ gint gtk_text_iter_get_segment_char (const GtkTextIter
/* debug */
void gtk_text_iter_check(const GtkTextIter *iter);
void gtk_text_iter_check (const GtkTextIter *iter);
#ifdef __cplusplus
}
......
This diff is collapsed.
......@@ -9,9 +9,9 @@
*
* This file can be used under your choice of two licenses, the LGPL
* and the original Tk license.
*
*
* LGPL:
*
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
......@@ -32,7 +32,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
*
*
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
......@@ -42,13 +42,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
*
*
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
......@@ -87,7 +87,7 @@ extern "C" {
* use by the text widget, and the text canvas item,
* but that's all. We may have to install it so the
* canvas item can use it, but users are not supposed
* to use it.
* to use it.
*/
#include <gtk/gtktextbuffer.h>
......@@ -99,7 +99,7 @@ extern "C" {
typedef struct _GtkTextLine GtkTextLine;
typedef struct _GtkTextLineData GtkTextLineData;
#define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type())
#define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type ())
#define GTK_TEXT_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
#define GTK_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
#define GTK_IS_TEXT_LAYOUT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_LAYOUT))
......@@ -115,15 +115,15 @@ typedef struct _GtkTextAttrAppearance GtkTextAttrAppearance;
struct _GtkTextLayout
{
GtkObject parent_instance;
/* width of the display area on-screen,
* i.e. pixels we should wrap to fit inside. */
gint screen_width;
/* width/height of the total logical area being layed out */
gint width;
gint height;
/* Pixel offsets from the left and from the top to be used when we
* draw; these allow us to create left/top margins. We don't need
* anything special for bottom/right margins, because those don't
......@@ -131,29 +131,29 @@ struct _GtkTextLayout
*/
/* gint left_edge; */
/* gint top_edge; */
GtkTextBuffer *buffer;
/* Default style used if no tags override it */
GtkTextAttributes *default_style;
/* Pango contexts used for creating layouts */
PangoContext *ltr_context;
PangoContext *rtl_context;
/* A cache of one style; this is used to ensure
* we don't constantly regenerate the style
* over long runs with the same style. */