aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/text')
-rw-r--r--widgets/text/a11y/gal-a11y-e-text.c2
-rw-r--r--widgets/text/e-reflow.c18
-rw-r--r--widgets/text/e-text-model.c4
-rw-r--r--widgets/text/e-text.c12
4 files changed, 18 insertions, 18 deletions
diff --git a/widgets/text/a11y/gal-a11y-e-text.c b/widgets/text/a11y/gal-a11y-e-text.c
index f5939670f2..99fb4e8a94 100644
--- a/widgets/text/a11y/gal-a11y-e-text.c
+++ b/widgets/text/a11y/gal-a11y-e-text.c
@@ -439,7 +439,7 @@ et_get_text_before_offset (AtkText *text,
break;
case ATK_TEXT_BOUNDARY_WORD_START:
end = find_word_start (full_text, offset - 1, -1);
- start = find_word_start (full_text, end - 1, -1) ;
+ start = find_word_start (full_text, end - 1, -1);
break;
case ATK_TEXT_BOUNDARY_WORD_END:
end = find_word_end (full_text, offset, -1);
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index cae0f4d3e4..441102ac0f 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -89,7 +89,7 @@ e_reflow_pick_line (EReflow *reflow, double x)
return x;
}
-static int
+static gint
er_find_item (EReflow *reflow, GnomeCanvasItem *item)
{
gint i;
@@ -162,7 +162,7 @@ static gboolean
do_adjustment (gpointer user_data)
{
gint row;
- GtkAdjustment *adj ;
+ GtkAdjustment *adj;
gfloat value, min_value, max_value;
EReflow *reflow = user_data;
@@ -389,7 +389,7 @@ item_removed (EReflowModel *model, gint i, EReflow *reflow)
if (reflow->items[i])
gtk_object_destroy (GTK_OBJECT (reflow->items[i]));
- memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (int));
+ memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (gint));
memmove (reflow->items + i, reflow->items + i + 1, (reflow->count - i - 1) * sizeof (GnomeCanvasItem *));
reflow->count --;
@@ -424,7 +424,7 @@ items_inserted (EReflowModel *model, gint position, gint count, EReflow *reflow)
reflow->heights = g_renew (int, reflow->heights, reflow->allocated_count);
reflow->items = g_renew (GnomeCanvasItem *, reflow->items, reflow->allocated_count);
}
- memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (int));
+ memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (gint));
memmove (reflow->items + position + count, reflow->items + position, (reflow->count - position - count) * sizeof (GnomeCanvasItem *));
for (i = position; i < position + count; i++) {
reflow->items[i] = NULL;
@@ -1126,7 +1126,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
i /= column_width + E_REFLOW_FULL_GUTTER;
running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
- for ( ; i < reflow->column_count; i++) {
+ for (; i < reflow->column_count; i++) {
if ( running_width > x + width )
break;
x_rect = running_width;
@@ -1161,7 +1161,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
i /= column_width + E_REFLOW_FULL_GUTTER;
running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
- for ( ; i < reflow->column_count; i++) {
+ for (; i < reflow->column_count; i++) {
if ( running_width > x + width )
break;
x_rect = running_width;
@@ -1271,14 +1271,14 @@ e_reflow_point (GnomeCanvasItem *item,
if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point)
distance = GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point (item, x, y, cx, cy, actual_item);
- if ((int) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item)
+ if ((gint) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item)
return distance;
*actual_item = item;
return 0;
#if 0
if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) {
- float n_x;
+ gfloat n_x;
n_x = x;
n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER));
@@ -1337,7 +1337,7 @@ e_reflow_reflow( GnomeCanvasItem *item, gint flags )
e_canvas_item_request_parent_reflow(item);
}
-static int
+static gint
e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
{
gint row;
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 1bc2090caa..e1a0fca438 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -234,7 +234,7 @@ e_text_model_real_insert_length (ETextModel *model, gint position, const gchar *
for (p = text, l = 0;
l < length;
- p = g_utf8_next_char (p), l ++) ;
+ p = g_utf8_next_char (p), l ++);
byte_length = p - text;
@@ -264,7 +264,7 @@ e_text_model_real_delete (ETextModel *model, gint position, gint length)
for (p = offs, l = 0;
l < length;
- p = g_utf8_next_char (p), l ++) ;
+ p = g_utf8_next_char (p), l ++);
byte_length = p - offs;
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 12a1668410..f6371aa551 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1994,8 +1994,8 @@ _do_tooltip (gpointer data)
gdk_window_get_origin (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas)->window, &canvas_x, &canvas_y);
pixel_origin.x += canvas_x;
pixel_origin.y += canvas_y;
- pixel_origin.x -= (int) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
- pixel_origin.y -= (int) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
+ pixel_origin.x -= (gint) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
+ pixel_origin.y -= (gint) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
tooltip_window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_container_set_border_width (GTK_CONTAINER (tooltip_window), 1);
@@ -2798,7 +2798,7 @@ e_text_reset_im_context (EText *text)
/* fixme: */
-static int
+static gint
next_word (EText *text, gint start)
{
gchar *p = g_utf8_offset_to_pointer (text->text, start);
@@ -2827,7 +2827,7 @@ next_word (EText *text, gint start)
return g_utf8_pointer_to_offset (text->text, p);
}
-static int
+static gint
find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line)
{
gchar *p;
@@ -2861,7 +2861,7 @@ find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line
/* direction = TRUE (move forward), FALSE (move backward)
Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */
-static int
+static gint
_get_updated_position (EText *text, gboolean direction)
{
PangoLogAttr *log_attrs = NULL;
@@ -2927,7 +2927,7 @@ _get_updated_position (EText *text, gboolean direction)
-static int
+static gint
_get_position(EText *text, ETextEventProcessorCommand *command)
{
gint length, obj_num;
generated by cgit (git 2.34.1) at 2024-11-16 17:46:17 +0800