[evolution/rendering-cleanup: 55/78] gnome-canvas: Remove render_dirty variable
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/rendering-cleanup: 55/78] gnome-canvas: Remove render_dirty variable
- Date: Tue, 19 Oct 2010 23:38:37 +0000 (UTC)
commit 7505c9e75c37b3698591ead38e33c179461bd490
Author: Benjamin Otte <otte redhat com>
Date: Sun Oct 17 15:15:42 2010 +0200
gnome-canvas: Remove render_dirty variable
It's unused. Also remove the private struct, as it's now empty.
libgnomecanvas/gnome-canvas-text.c | 29 -----------------------------
libgnomecanvas/gnome-canvas-text.h | 4 ----
2 files changed, 0 insertions(+), 33 deletions(-)
---
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index 6d5f9a0..c2c475d 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -94,10 +94,6 @@ enum {
PROP_TEXT_HEIGHT
};
-struct _GnomeCanvasTextPrivate {
- guint render_dirty : 1;
-};
-
static void gnome_canvas_text_class_init (GnomeCanvasTextClass *class);
static void gnome_canvas_text_init (GnomeCanvasText *text);
static void gnome_canvas_text_destroy (GnomeCanvasItem *object);
@@ -529,9 +525,6 @@ gnome_canvas_text_init (GnomeCanvasText *text)
text->underline_set = FALSE;
text->strike_set = FALSE;
text->rise_set = FALSE;
-
- text->priv = g_new (GnomeCanvasTextPrivate, 1);
- text->priv->render_dirty = 1;
}
/* Destroy handler for the text item */
@@ -562,9 +555,6 @@ gnome_canvas_text_destroy (GnomeCanvasItem *object)
pango_attr_list_unref (text->attr_list);
text->attr_list = NULL;
- g_free (text->priv);
- text->priv = NULL;
-
if (GNOME_CANVAS_ITEM_CLASS (parent_class)->destroy)
GNOME_CANVAS_ITEM_CLASS (parent_class)->destroy (object);
}
@@ -737,13 +727,11 @@ gnome_canvas_text_set_property (GObject *object,
text->text = g_value_dup_string (value);
pango_layout_set_text (text->layout, text->text, -1);
- text->priv->render_dirty = 1;
break;
case PROP_MARKUP:
gnome_canvas_text_set_markup (text,
g_value_get_string (value));
- text->priv->render_dirty = 1;
break;
case PROP_X:
@@ -817,7 +805,6 @@ gnome_canvas_text_set_property (GObject *object,
}
gnome_canvas_text_apply_font_desc (text);
- text->priv->render_dirty = 1;
break;
case PROP_FAMILY_SET:
@@ -836,14 +823,12 @@ gnome_canvas_text_set_property (GObject *object,
text->scale_set = TRUE;
gnome_canvas_text_apply_font_desc (text);
- text->priv->render_dirty = 1;
break;
case PROP_SCALE_SET:
text->scale_set = g_value_get_boolean (value);
gnome_canvas_text_apply_font_desc (text);
- text->priv->render_dirty = 1;
break;
case PROP_UNDERLINE:
@@ -851,14 +836,12 @@ gnome_canvas_text_set_property (GObject *object,
text->underline_set = TRUE;
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_UNDERLINE_SET:
text->underline_set = g_value_get_boolean (value);
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_STRIKETHROUGH:
@@ -866,14 +849,12 @@ gnome_canvas_text_set_property (GObject *object,
text->strike_set = TRUE;
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_STRIKETHROUGH_SET:
text->strike_set = g_value_get_boolean (value);
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_RISE:
@@ -881,14 +862,12 @@ gnome_canvas_text_set_property (GObject *object,
text->rise_set = TRUE;
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_RISE_SET:
text->rise_set = TRUE;
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_ATTRIBUTES:
@@ -899,7 +878,6 @@ gnome_canvas_text_set_property (GObject *object,
pango_attr_list_ref (text->attr_list);
gnome_canvas_text_apply_attributes (text);
- text->priv->render_dirty = 1;
break;
case PROP_ANCHOR:
@@ -925,22 +903,18 @@ gnome_canvas_text_set_property (GObject *object,
break;
}
pango_layout_set_alignment (text->layout, align);
- text->priv->render_dirty = 1;
break;
case PROP_CLIP_WIDTH:
text->clip_width = fabs (g_value_get_double (value));
- text->priv->render_dirty = 1;
break;
case PROP_CLIP_HEIGHT:
text->clip_height = fabs (g_value_get_double (value));
- text->priv->render_dirty = 1;
break;
case PROP_CLIP:
text->clip = g_value_get_boolean (value);
- text->priv->render_dirty = 1;
break;
case PROP_X_OFFSET:
@@ -964,7 +938,6 @@ gnome_canvas_text_set_property (GObject *object,
0xff);
color_changed = TRUE;
}
- text->priv->render_dirty = 1;
break;
}
@@ -989,7 +962,6 @@ gnome_canvas_text_set_property (GObject *object,
case PROP_FILL_COLOR_RGBA:
text->rgba = g_value_get_uint (value);
color_changed = TRUE;
- text->priv->render_dirty = 1;
break;
default:
@@ -1284,7 +1256,6 @@ gnome_canvas_text_set_font_desc (GnomeCanvasText *text,
text->font_desc = NULL;
gnome_canvas_text_apply_font_desc (text);
- text->priv->render_dirty = 1;
}
/* Setting the text from a Pango markup string */
diff --git a/libgnomecanvas/gnome-canvas-text.h b/libgnomecanvas/gnome-canvas-text.h
index e5f5cf4..b28430a 100644
--- a/libgnomecanvas/gnome-canvas-text.h
+++ b/libgnomecanvas/gnome-canvas-text.h
@@ -101,8 +101,6 @@ G_BEGIN_DECLS
typedef struct _GnomeCanvasText GnomeCanvasText;
typedef struct _GnomeCanvasTextClass GnomeCanvasTextClass;
-typedef struct _GnomeCanvasTextPrivate GnomeCanvasTextPrivate;
-
struct _GnomeCanvasText {
GnomeCanvasItem item;
@@ -146,8 +144,6 @@ struct _GnomeCanvasText {
guint rise_set : 1; /* Apply specified ascension/descension? */
guint scale_set : 1; /* Apply specified font scaling ratio? */
-
- GnomeCanvasTextPrivate *priv;
};
struct _GnomeCanvasTextClass {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]