]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcellrenderertext.c
filechooser: Show FUSE mounted locations in shortcuts
[~andy/gtk] / gtk / gtkcellrenderertext.c
index 7155010110f3dcf0634c39a76e0a4a0d2e680d10..3399bb2be0450e7f63164e1200b3fb9b4a7e9a00 100644 (file)
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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/>.
  */
 
-#include <stdlib.h>
+#include "config.h"
+
 #include "gtkcellrenderertext.h"
+
+#include <stdlib.h>
+
+#include "gtkeditable.h"
+#include "gtkentry.h"
+#include "gtksizerequest.h"
+#include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtktreeprivate.h"
+#include "a11y/gtktextcellaccessible.h"
+
+
+/**
+ * SECTION:gtkcellrenderertext
+ * @Short_description: Renders text in a cell
+ * @Title: GtkCellRendererText
+ *
+ * A #GtkCellRendererText renders a given text in its cell, using the font, color and
+ * style information provided by its properties. The text will be ellipsized if it is
+ * too long and the #GtkCellRendererText:ellipsize property allows it.
+ *
+ * If the #GtkCellRenderer:mode is %GTK_CELL_RENDERER_MODE_EDITABLE,
+ * the #GtkCellRendererText allows to edit its text using an entry.
+ */
 
-static void gtk_cell_renderer_text_init       (GtkCellRendererText      *celltext);
-static void gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class);
+
+static void gtk_cell_renderer_text_finalize   (GObject                  *object);
 
 static void gtk_cell_renderer_text_get_property  (GObject                  *object,
                                                  guint                     param_id,
                                                  GValue                   *value,
-                                                 GParamSpec               *pspec,
-                                                 const gchar              *trailer);
+                                                 GParamSpec               *pspec);
 static void gtk_cell_renderer_text_set_property  (GObject                  *object,
                                                  guint                     param_id,
                                                  const GValue             *value,
-                                                 GParamSpec               *pspec,
-                                                 const gchar              *trailer);
-static void gtk_cell_renderer_text_get_size   (GtkCellRenderer          *cell,
-                                              GtkWidget                *widget,
-                                              gint                     *width,
-                                              gint                     *height);
+                                                 GParamSpec               *pspec);
 static void gtk_cell_renderer_text_render     (GtkCellRenderer          *cell,
-                                              GdkWindow                *window,
+                                              cairo_t                  *cr,
                                               GtkWidget                *widget,
-                                              GdkRectangle             *background_area,
-                                              GdkRectangle             *cell_area,
-                                              GdkRectangle             *expose_area,
-                                              guint                     flags);
+                                              const GdkRectangle       *background_area,
+                                              const GdkRectangle       *cell_area,
+                                              GtkCellRendererState      flags);
+
+static GtkCellEditable *gtk_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
+                                                             GdkEvent             *event,
+                                                             GtkWidget            *widget,
+                                                             const gchar          *path,
+                                                             const GdkRectangle   *background_area,
+                                                             const GdkRectangle   *cell_area,
+                                                             GtkCellRendererState  flags);
+
+static void       gtk_cell_renderer_text_get_preferred_width            (GtkCellRenderer       *cell,
+                                                                         GtkWidget             *widget,
+                                                                         gint                  *minimal_size,
+                                                                         gint                  *natural_size);
+static void       gtk_cell_renderer_text_get_preferred_height           (GtkCellRenderer       *cell,
+                                                                         GtkWidget             *widget,
+                                                                         gint                  *minimal_size,
+                                                                         gint                  *natural_size);
+static void       gtk_cell_renderer_text_get_preferred_height_for_width (GtkCellRenderer       *cell,
+                                                                         GtkWidget             *widget,
+                                                                         gint                   width,
+                                                                         gint                  *minimum_height,
+                                                                         gint                  *natural_height);
+static void       gtk_cell_renderer_text_get_aligned_area               (GtkCellRenderer       *cell,
+                                                                        GtkWidget             *widget,
+                                                                        GtkCellRendererState   flags,
+                                                                        const GdkRectangle    *cell_area,
+                                                                        GdkRectangle          *aligned_area);
+
+
 
+enum {
+  EDITED,
+  LAST_SIGNAL
+};
 
 enum {
-  PROP_ZERO,
+  PROP_0,
+
   PROP_TEXT,
-  PROP_FONT,
+  PROP_MARKUP,
+  PROP_ATTRIBUTES,
+  PROP_SINGLE_PARAGRAPH_MODE,
+  PROP_WIDTH_CHARS,
+  PROP_MAX_WIDTH_CHARS,
+  PROP_WRAP_WIDTH,
+  PROP_ALIGN,
+  PROP_PLACEHOLDER_TEXT,
+
+  /* Style args */
   PROP_BACKGROUND,
-  PROP_BACKGROUND_GDK,
   PROP_FOREGROUND,
+  PROP_BACKGROUND_GDK,
   PROP_FOREGROUND_GDK,
+  PROP_BACKGROUND_RGBA,
+  PROP_FOREGROUND_RGBA,
+  PROP_FONT,
+  PROP_FONT_DESC,
+  PROP_FAMILY,
+  PROP_STYLE,
+  PROP_VARIANT,
+  PROP_WEIGHT,
+  PROP_STRETCH,
+  PROP_SIZE,
+  PROP_SIZE_POINTS,
+  PROP_SCALE,
+  PROP_EDITABLE,
   PROP_STRIKETHROUGH,
   PROP_UNDERLINE,
-  PROP_EDITABLE,
-  PROP_ITALIC,
-  PROP_BOLD
+  PROP_RISE,
+  PROP_LANGUAGE,
+  PROP_ELLIPSIZE,
+  PROP_WRAP_MODE,
+  
+  /* Whether-a-style-arg-is-set args */
+  PROP_BACKGROUND_SET,
+  PROP_FOREGROUND_SET,
+  PROP_FAMILY_SET,
+  PROP_STYLE_SET,
+  PROP_VARIANT_SET,
+  PROP_WEIGHT_SET,
+  PROP_STRETCH_SET,
+  PROP_SIZE_SET,
+  PROP_SCALE_SET,
+  PROP_EDITABLE_SET,
+  PROP_STRIKETHROUGH_SET,
+  PROP_UNDERLINE_SET,
+  PROP_RISE_SET,
+  PROP_LANGUAGE_SET,
+  PROP_ELLIPSIZE_SET,
+  PROP_ALIGN_SET
 };
 
-GtkType
-gtk_cell_renderer_text_get_type (void)
+static guint text_cell_renderer_signals [LAST_SIGNAL];
+
+#define GTK_CELL_RENDERER_TEXT_PATH "gtk-cell-renderer-text-path"
+
+struct _GtkCellRendererTextPrivate
 {
-  static GtkType cell_text_type = 0;
+  GtkWidget *entry;
 
-  if (!cell_text_type)
-    {
-      static const GTypeInfo cell_text_info =
-      {
-        sizeof (GtkCellRendererTextClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) gtk_cell_renderer_text_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (GtkCellRendererText),
-       0,              /* n_preallocs */
-        (GInstanceInitFunc) gtk_cell_renderer_text_init,
-      };
-
-      cell_text_type = g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererText", &cell_text_info, 0);
-    }
+  PangoAttrList        *extra_attrs;
+  GdkRGBA               foreground;
+  GdkRGBA               background;
+  PangoAlignment        align;
+  PangoEllipsizeMode    ellipsize;
+  PangoFontDescription *font;
+  PangoLanguage        *language;
+  PangoUnderline        underline_style;
+  PangoWrapMode         wrap_mode;
 
-  return cell_text_type;
-}
+  gchar *text;
+  gchar *placeholder_text;
+
+  gdouble font_scale;
+
+  gint rise;
+  gint fixed_height_rows;
+  gint width_chars;
+  gint max_width_chars;
+  gint wrap_width;
+
+  guint in_entry_menu     : 1;
+  guint strikethrough     : 1;
+  guint editable          : 1;
+  guint scale_set         : 1;
+  guint foreground_set    : 1;
+  guint background_set    : 1;
+  guint underline_set     : 1;
+  guint rise_set          : 1;
+  guint strikethrough_set : 1;
+  guint editable_set      : 1;
+  guint calc_fixed_height : 1;
+  guint single_paragraph  : 1;
+  guint language_set      : 1;
+  guint markup_set        : 1;
+  guint ellipsize_set     : 1;
+  guint align_set         : 1;
+
+  gulong focus_out_id;
+  gulong populate_popup_id;
+  gulong entry_menu_popdown_timeout;
+};
+
+G_DEFINE_TYPE (GtkCellRendererText, gtk_cell_renderer_text, GTK_TYPE_CELL_RENDERER)
 
 static void
 gtk_cell_renderer_text_init (GtkCellRendererText *celltext)
 {
-  celltext->attr_list = pango_attr_list_new ();
-  GTK_CELL_RENDERER (celltext)->xalign = 0.0;
-  GTK_CELL_RENDERER (celltext)->yalign = 0.5;
-  GTK_CELL_RENDERER (celltext)->xpad = 2;
-  GTK_CELL_RENDERER (celltext)->ypad = 2;
-  celltext->underline = FALSE;
+  GtkCellRendererTextPrivate *priv;
+  GtkCellRenderer *cell = GTK_CELL_RENDERER (celltext);
+
+  celltext->priv = G_TYPE_INSTANCE_GET_PRIVATE (celltext,
+                                                GTK_TYPE_CELL_RENDERER_TEXT,
+                                                GtkCellRendererTextPrivate);
+  priv = celltext->priv;
+
+  gtk_cell_renderer_set_alignment (cell, 0.0, 0.5);
+  gtk_cell_renderer_set_padding (cell, 2, 2);
+  priv->font_scale = 1.0;
+  priv->fixed_height_rows = -1;
+  priv->font = pango_font_description_new ();
+
+  priv->width_chars = -1;
+  priv->max_width_chars = -1;
+  priv->wrap_width = -1;
+  priv->wrap_mode = PANGO_WRAP_CHAR;
+  priv->align = PANGO_ALIGN_LEFT;
+  priv->align_set = FALSE;
 }
 
 static void
@@ -105,340 +237,2047 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
 
+  object_class->finalize = gtk_cell_renderer_text_finalize;
+  
   object_class->get_property = gtk_cell_renderer_text_get_property;
   object_class->set_property = gtk_cell_renderer_text_set_property;
 
-  cell_class->get_size = gtk_cell_renderer_text_get_size;
   cell_class->render = gtk_cell_renderer_text_render;
+  cell_class->start_editing = gtk_cell_renderer_text_start_editing;
+  cell_class->get_preferred_width = gtk_cell_renderer_text_get_preferred_width;
+  cell_class->get_preferred_height = gtk_cell_renderer_text_get_preferred_height;
+  cell_class->get_preferred_height_for_width = gtk_cell_renderer_text_get_preferred_height_for_width;
+  cell_class->get_aligned_area = gtk_cell_renderer_text_get_aligned_area;
+
+  g_object_class_install_property (object_class,
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        P_("Text"),
+                                                        P_("Text to render"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
-                                  PROP_TEXT,
-                                  g_param_spec_string ("text",
-                                                       _("Text String"),
-                                                       _("The text of the renderer."),
-                                                       "",
-                                                       G_PARAM_READABLE |
-                                                       G_PARAM_WRITABLE));
+                                   PROP_MARKUP,
+                                   g_param_spec_string ("markup",
+                                                        P_("Markup"),
+                                                        P_("Marked up text to render"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+                                  PROP_ATTRIBUTES,
+                                  g_param_spec_boxed ("attributes",
+                                                      P_("Attributes"),
+                                                      P_("A list of style attributes to apply to the text of the renderer"),
+                                                      PANGO_TYPE_ATTR_LIST,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_SINGLE_PARAGRAPH_MODE,
+                                   g_param_spec_boolean ("single-paragraph-mode",
+                                                         P_("Single Paragraph Mode"),
+                                                         P_("Whether to keep all text in a single paragraph"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
   
   g_object_class_install_property (object_class,
-                                  PROP_FONT,
-                                  g_param_spec_string ("font",
-                                                       _("Font String"),
-                                                       _("The string of the font."),
-                                                       "",
-                                                       G_PARAM_WRITABLE));
+                                   PROP_BACKGROUND,
+                                   g_param_spec_string ("background",
+                                                        P_("Background color name"),
+                                                        P_("Background color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  /**
+   * GtkCellRendererText:background-gdk:
+   *
+   * Background color as a #GdkColor
+   *
+   * Deprecated: 3.4: Use #GtkCellRendererText:background-rgba instead.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND_GDK,
+                                   g_param_spec_boxed ("background-gdk",
+                                                       P_("Background color"),
+                                                       P_("Background color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+  /**
+   * GtkCellRendererText:background-rgba:
+   *
+   * Background color as a #GdkRGBA
+   *
+   * Since: 3.0
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_BACKGROUND_RGBA,
+                                   g_param_spec_boxed ("background-rgba",
+                                                       P_("Background color as RGBA"),
+                                                       P_("Background color as a GdkRGBA"),
+                                                       GDK_TYPE_RGBA,
+                                                       GTK_PARAM_READWRITE));
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND,
+                                   g_param_spec_string ("foreground",
+                                                        P_("Foreground color name"),
+                                                        P_("Foreground color as a string"),
+                                                        NULL,
+                                                        GTK_PARAM_WRITABLE));
+
+  /**
+   * GtkCellRendererText:foreground-gdk:
+   *
+   * Foreground color as a #GdkColor
+   *
+   * Deprecated: 3.4: Use #GtkCellRendererText:foreground-rgba instead.
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND_GDK,
+                                   g_param_spec_boxed ("foreground-gdk",
+                                                       P_("Foreground color"),
+                                                       P_("Foreground color as a GdkColor"),
+                                                       GDK_TYPE_COLOR,
+                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+  /**
+   * GtkCellRendererText:foreground-rgba:
+   *
+   * Foreground color as a #GdkRGBA
+   *
+   * Since: 3.0
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_FOREGROUND_RGBA,
+                                   g_param_spec_boxed ("foreground-rgba",
+                                                       P_("Foreground color as RGBA"),
+                                                       P_("Foreground color as a GdkRGBA"),
+                                                       GDK_TYPE_RGBA,
+                                                       GTK_PARAM_READWRITE));
+
+
+  g_object_class_install_property (object_class,
+                                   PROP_EDITABLE,
+                                   g_param_spec_boolean ("editable",
+                                                         P_("Editable"),
+                                                         P_("Whether the text can be modified by the user"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FONT,
+                                   g_param_spec_string ("font",
+                                                        P_("Font"),
+                                                        P_("Font description as a string, e.g. \"Sans Italic 12\""),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FONT_DESC,
+                                   g_param_spec_boxed ("font-desc",
+                                                       P_("Font"),
+                                                       P_("Font description as a PangoFontDescription struct"),
+                                                       PANGO_TYPE_FONT_DESCRIPTION,
+                                                       GTK_PARAM_READWRITE));
+
   
   g_object_class_install_property (object_class,
-                                  PROP_BACKGROUND,
-                                  g_param_spec_string ("background",
-                                                       _("Background Color string"),
-                                                       _("The color for the background of the text."),
-                                                       "white",
-                                                       G_PARAM_WRITABLE));
+                                   PROP_FAMILY,
+                                   g_param_spec_string ("family",
+                                                        P_("Font family"),
+                                                        P_("Name of the font family, e.g. Sans, Helvetica, Times, Monospace"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_STYLE,
+                                   g_param_spec_enum ("style",
+                                                      P_("Font style"),
+                                                      P_("Font style"),
+                                                      PANGO_TYPE_STYLE,
+                                                      PANGO_STYLE_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_VARIANT,
+                                   g_param_spec_enum ("variant",
+                                                     P_("Font variant"),
+                                                     P_("Font variant"),
+                                                      PANGO_TYPE_VARIANT,
+                                                      PANGO_VARIANT_NORMAL,
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
-                                  PROP_FOREGROUND,
-                                  g_param_spec_string ("foreground",
-                                                       _("Foreground Color string"),
-                                                       _("The color for the background of the text."),
-                                                       "black",
-                                                       G_PARAM_WRITABLE));
+                                   PROP_WEIGHT,
+                                   g_param_spec_int ("weight",
+                                                     P_("Font weight"),
+                                                     P_("Font weight"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     PANGO_WEIGHT_NORMAL,
+                                                     GTK_PARAM_READWRITE));
+
+   g_object_class_install_property (object_class,
+                                   PROP_STRETCH,
+                                   g_param_spec_enum ("stretch",
+                                                      P_("Font stretch"),
+                                                      P_("Font stretch"),
+                                                      PANGO_TYPE_STRETCH,
+                                                      PANGO_STRETCH_NORMAL,
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
-                                  PROP_STRIKETHROUGH,
-                                  g_param_spec_boolean ("strikethrough",
-                                                        _("Strikethrough"),
-                                                        _("Draw a line through the text."),
-                                                        FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                   PROP_SIZE,
+                                   g_param_spec_int ("size",
+                                                     P_("Font size"),
+                                                     P_("Font size"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_SIZE_POINTS,
+                                   g_param_spec_double ("size-points",
+                                                        P_("Font points"),
+                                                        P_("Font size in points"),
+                                                        0.0,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (object_class,
+                                   PROP_SCALE,
+                                   g_param_spec_double ("scale",
+                                                        P_("Font scale"),
+                                                        P_("Font scaling factor"),
+                                                        0.0,
+                                                        G_MAXDOUBLE,
+                                                        1.0,
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
-                                  PROP_UNDERLINE,
-                                  g_param_spec_boolean ("underline",
-                                                        _("Underline"),
-                                                        _("Underline the text."),
-                                                        FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                   PROP_RISE,
+                                   g_param_spec_int ("rise",
+                                                     P_("Rise"),
+                                                     P_("Offset of text above the baseline "
+                                                       "(below the baseline if rise is negative)"),
+                                                     -G_MAXINT,
+                                                     G_MAXINT,
+                                                     0,
+                                                     GTK_PARAM_READWRITE));
+
+
+  g_object_class_install_property (object_class,
+                                   PROP_STRIKETHROUGH,
+                                   g_param_spec_boolean ("strikethrough",
+                                                         P_("Strikethrough"),
+                                                         P_("Whether to strike through the text"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
-                                  PROP_EDITABLE,
-                                  g_param_spec_boolean ("editable",
-                                                        _("Editable"),
-                                                        _("Make the text editable."),
-                                                        FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                   PROP_UNDERLINE,
+                                   g_param_spec_enum ("underline",
+                                                      P_("Underline"),
+                                                      P_("Style of underline for this text"),
+                                                      PANGO_TYPE_UNDERLINE,
+                                                      PANGO_UNDERLINE_NONE,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_LANGUAGE,
+                                   g_param_spec_string ("language",
+                                                        P_("Language"),
+                                                        P_("The language this text is in, as an ISO code. "
+                                                          "Pango can use this as a hint when rendering the text. "
+                                                          "If you don't understand this parameter, you probably don't need it"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkCellRendererText:ellipsize:
+   *
+   * Specifies the preferred place to ellipsize the string, if the cell renderer 
+   * does not have enough room to display the entire string. Setting it to 
+   * %PANGO_ELLIPSIZE_NONE turns off ellipsizing. See the wrap-width property
+   * for another way of making the text fit into a given width.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_ELLIPSIZE,
+                                   g_param_spec_enum ("ellipsize",
+                                                     P_("Ellipsize"),
+                                                     P_("The preferred place to ellipsize the string, "
+                                                        "if the cell renderer does not have enough room "
+                                                        "to display the entire string"),
+                                                     PANGO_TYPE_ELLIPSIZE_MODE,
+                                                     PANGO_ELLIPSIZE_NONE,
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCellRendererText:width-chars:
+   * 
+   * The desired width of the cell, in characters. If this property is set to
+   * -1, the width will be calculated automatically, otherwise the cell will
+   * request either 3 characters or the property value, whichever is greater.
+   * 
+   * Since: 2.6
+   **/
+  g_object_class_install_property (object_class,
+                                   PROP_WIDTH_CHARS,
+                                   g_param_spec_int ("width-chars",
+                                                     P_("Width In Characters"),
+                                                     P_("The desired width of the label, in characters"),
+                                                     -1,
+                                                     G_MAXINT,
+                                                     -1,
+                                                     GTK_PARAM_READWRITE));
   
+
+  /**
+   * GtkCellRendererText:max-width-chars:
+   * 
+   * The desired maximum width of the cell, in characters. If this property 
+   * is set to -1, the width will be calculated automatically.
+   *
+   * For cell renderers that ellipsize or wrap text; this property
+   * controls the maximum reported width of the cell. The
+   * cell should not receive any greater allocation unless it is
+   * set to expand in its #GtkCellLayout and all of the cell's siblings
+   * have received their natural width.
+   *
+   * Since: 3.0
+   **/
   g_object_class_install_property (object_class,
-                                  PROP_ITALIC,
-                                  g_param_spec_boolean ("italic",
-                                                        _("Italic"),
-                                                        _("Make the text italic."),
-                                                        FALSE,
-                                                        G_PARAM_WRITABLE));
+                                   PROP_MAX_WIDTH_CHARS,
+                                   g_param_spec_int ("max-width-chars",
+                                                     P_("Maximum Width In Characters"),
+                                                     P_("The maximum width of the cell, in characters"),
+                                                     -1,
+                                                     G_MAXINT,
+                                                     -1,
+                                                     GTK_PARAM_READWRITE));
   
+  /**
+   * GtkCellRendererText:wrap-mode:
+   *
+   * Specifies how to break the string into multiple lines, if the cell 
+   * renderer does not have enough room to display the entire string. 
+   * This property has no effect unless the wrap-width property is set.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_WRAP_MODE,
+                                   g_param_spec_enum ("wrap-mode",
+                                                     P_("Wrap mode"),
+                                                     P_("How to break the string into multiple lines, "
+                                                        "if the cell renderer does not have enough room "
+                                                        "to display the entire string"),
+                                                     PANGO_TYPE_WRAP_MODE,
+                                                     PANGO_WRAP_CHAR,
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCellRendererText:wrap-width:
+   *
+   * Specifies the minimum width at which the text is wrapped. The wrap-mode property can 
+   * be used to influence at what character positions the line breaks can be placed.
+   * Setting wrap-width to -1 turns wrapping off.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                  PROP_WRAP_WIDTH,
+                                  g_param_spec_int ("wrap-width",
+                                                    P_("Wrap width"),
+                                                    P_("The width at which the text is wrapped"),
+                                                    -1,
+                                                    G_MAXINT,
+                                                    -1,
+                                                    GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCellRendererText:alignment:
+   *
+   * Specifies how to align the lines of text with respect to each other. 
+   *
+   * Note that this property describes how to align the lines of text in 
+   * case there are several of them. The "xalign" property of #GtkCellRenderer, 
+   * on the other hand, sets the horizontal alignment of the whole text.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_ALIGN,
+                                   g_param_spec_enum ("alignment",
+                                                     P_("Alignment"),
+                                                     P_("How to align the lines"),
+                                                     PANGO_TYPE_ALIGNMENT,
+                                                     PANGO_ALIGN_LEFT,
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCellRendererText:placeholder-text:
+   *
+   * The text that will be displayed in the #GtkCellRenderer if
+   * #GtkCellRendererText:editable is %TRUE and the cell is empty.
+   *
+   * Since 3.6
+   */
   g_object_class_install_property (object_class,
-                                  PROP_BOLD,
-                                  g_param_spec_boolean ("bold",
-                                                        _("Bold"),
-                                                        _("Make the text bold."),
-                                                        FALSE,
-                                                        G_PARAM_WRITABLE));
+                                   PROP_PLACEHOLDER_TEXT,
+                                   g_param_spec_string ("placeholder-text",
+                                                        P_("Placeholder text"),
+                                                        P_("Text rendered when an editable cell is empty"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+
+  /* Style props are set or not */
+
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
+
+  ADD_SET_PROP ("background-set", PROP_BACKGROUND_SET,
+                P_("Background set"),
+                P_("Whether this tag affects the background color"));
+
+  ADD_SET_PROP ("foreground-set", PROP_FOREGROUND_SET,
+                P_("Foreground set"),
+                P_("Whether this tag affects the foreground color"));
+  
+  ADD_SET_PROP ("editable-set", PROP_EDITABLE_SET,
+                P_("Editability set"),
+                P_("Whether this tag affects text editability"));
+
+  ADD_SET_PROP ("family-set", PROP_FAMILY_SET,
+                P_("Font family set"),
+                P_("Whether this tag affects the font family"));  
+
+  ADD_SET_PROP ("style-set", PROP_STYLE_SET,
+                P_("Font style set"),
+                P_("Whether this tag affects the font style"));
+
+  ADD_SET_PROP ("variant-set", PROP_VARIANT_SET,
+                P_("Font variant set"),
+                P_("Whether this tag affects the font variant"));
+
+  ADD_SET_PROP ("weight-set", PROP_WEIGHT_SET,
+                P_("Font weight set"),
+                P_("Whether this tag affects the font weight"));
+
+  ADD_SET_PROP ("stretch-set", PROP_STRETCH_SET,
+                P_("Font stretch set"),
+                P_("Whether this tag affects the font stretch"));
+
+  ADD_SET_PROP ("size-set", PROP_SIZE_SET,
+                P_("Font size set"),
+                P_("Whether this tag affects the font size"));
+
+  ADD_SET_PROP ("scale-set", PROP_SCALE_SET,
+                P_("Font scale set"),
+                P_("Whether this tag scales the font size by a factor"));
+  
+  ADD_SET_PROP ("rise-set", PROP_RISE_SET,
+                P_("Rise set"),
+                P_("Whether this tag affects the rise"));
+
+  ADD_SET_PROP ("strikethrough-set", PROP_STRIKETHROUGH_SET,
+                P_("Strikethrough set"),
+                P_("Whether this tag affects strikethrough"));
+
+  ADD_SET_PROP ("underline-set", PROP_UNDERLINE_SET,
+                P_("Underline set"),
+                P_("Whether this tag affects underlining"));
+
+  ADD_SET_PROP ("language-set", PROP_LANGUAGE_SET,
+                P_("Language set"),
+                P_("Whether this tag affects the language the text is rendered as"));
+
+  ADD_SET_PROP ("ellipsize-set", PROP_ELLIPSIZE_SET,
+                P_("Ellipsize set"),
+                P_("Whether this tag affects the ellipsize mode"));
+
+  ADD_SET_PROP ("align-set", PROP_ALIGN_SET,
+                P_("Align set"),
+                P_("Whether this tag affects the alignment mode"));
+
+  /**
+   * GtkCellRendererText::edited:
+   * @renderer: the object which received the signal
+   * @path: the path identifying the edited cell
+   * @new_text: the new text
+   *
+   * This signal is emitted after @renderer has been edited.
+   *
+   * It is the responsibility of the application to update the model
+   * and store @new_text at the position indicated by @path.
+   */
+  text_cell_renderer_signals [EDITED] =
+    g_signal_new (I_("edited"),
+                 G_OBJECT_CLASS_TYPE (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkCellRendererTextClass, edited),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__STRING_STRING,
+                 G_TYPE_NONE, 2,
+                 G_TYPE_STRING,
+                 G_TYPE_STRING);
+
+  g_type_class_add_private (object_class, sizeof (GtkCellRendererTextPrivate));
+
+  gtk_cell_renderer_class_set_accessible_type (cell_class, GTK_TYPE_TEXT_CELL_ACCESSIBLE);
+}
+
+static void
+gtk_cell_renderer_text_finalize (GObject *object)
+{
+  GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+
+  pango_font_description_free (priv->font);
+
+  g_free (priv->text);
+  g_free (priv->placeholder_text);
+
+  if (priv->extra_attrs)
+    pango_attr_list_unref (priv->extra_attrs);
+
+  if (priv->language)
+    g_object_unref (priv->language);
+
+  g_clear_object (&priv->entry);
+
+  G_OBJECT_CLASS (gtk_cell_renderer_text_parent_class)->finalize (object);
+}
+
+static PangoFontMask
+get_property_font_set_mask (guint prop_id)
+{
+  switch (prop_id)
+    {
+    case PROP_FAMILY_SET:
+      return PANGO_FONT_MASK_FAMILY;
+    case PROP_STYLE_SET:
+      return PANGO_FONT_MASK_STYLE;
+    case PROP_VARIANT_SET:
+      return PANGO_FONT_MASK_VARIANT;
+    case PROP_WEIGHT_SET:
+      return PANGO_FONT_MASK_WEIGHT;
+    case PROP_STRETCH_SET:
+      return PANGO_FONT_MASK_STRETCH;
+    case PROP_SIZE_SET:
+      return PANGO_FONT_MASK_SIZE;
+    }
+
+  return 0;
 }
 
 static void
 gtk_cell_renderer_text_get_property (GObject        *object,
                                     guint           param_id,
                                     GValue         *value,
-                                    GParamSpec     *pspec,
-                                    const gchar    *trailer)
+                                    GParamSpec     *pspec)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
-  PangoAttrIterator *attr_iter;
-  PangoAttribute *attr;
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
   switch (param_id)
     {
     case PROP_TEXT:
-      g_value_set_string (value, celltext->text);
+      g_value_set_string (value, priv->text);
       break;
-    case PROP_STRIKETHROUGH:
-      attr_iter = pango_attr_list_get_iterator (celltext->attr_list);
-      attr = pango_attr_iterator_get (attr_iter,
-                                     PANGO_ATTR_STRIKETHROUGH);
-      g_value_set_boolean (value, ((PangoAttrInt*) attr)->value);
-      break;
-    case PROP_UNDERLINE:
-      g_value_set_boolean (value, celltext->underline);
+
+    case PROP_ATTRIBUTES:
+      g_value_set_boxed (value, priv->extra_attrs);
       break;
-    case PROP_EDITABLE:
-      g_value_set_boolean (value, celltext->editable);
+
+    case PROP_SINGLE_PARAGRAPH_MODE:
+      g_value_set_boolean (value, priv->single_paragraph);
       break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+
+    case PROP_BACKGROUND_GDK:
+      {
+        GdkColor color;
+
+        color.red = (guint16) (priv->background.red * 65535);
+        color.green = (guint16) (priv->background.green * 65535);
+        color.blue = (guint16) (priv->background.blue * 65535);
+
+        g_value_set_boxed (value, &color);
+      }
       break;
-    }
-}
 
+    case PROP_FOREGROUND_GDK:
+      {
+        GdkColor color;
 
-static void
-gtk_cell_renderer_text_set_property (GObject      *object,
-                                    guint         param_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec,
-                                    const gchar  *trailer)
-{
-  GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
+        color.red = (guint16) (priv->foreground.red * 65535);
+        color.green = (guint16) (priv->foreground.green * 65535);
+        color.blue = (guint16) (priv->foreground.blue * 65535);
 
-  GdkColor color;
-  PangoFontDescription *font_desc;
-  gchar *string;
-  PangoAttribute *attribute;
-  gchar *font;
+        g_value_set_boxed (value, &color);
+      }
+      break;
 
-  switch (param_id)
-    {
-    case PROP_TEXT:
-      g_free (celltext->text);
-      celltext->text = g_value_dup_string (value);
+    case PROP_BACKGROUND_RGBA:
+      g_value_set_boxed (value, &priv->background);
+      break;
+
+    case PROP_FOREGROUND_RGBA:
+      g_value_set_boxed (value, &priv->foreground);
       break;
+
     case PROP_FONT:
-      font = g_value_get_string (value);
+        g_value_take_string (value, pango_font_description_to_string (priv->font));
+      break;
+      
+    case PROP_FONT_DESC:
+      g_value_set_boxed (value, priv->font);
+      break;
 
-      if (font)
-       {
-         font_desc = pango_font_description_from_string (font);
-         attribute = pango_attr_font_desc_new (font_desc);
-         attribute->start_index = 0;
-         attribute->end_index = G_MAXINT;
-         pango_font_description_free (font_desc);
-         pango_attr_list_change (celltext->attr_list,
-                                 attribute);
-       }
+    case PROP_FAMILY:
+      g_value_set_string (value, pango_font_description_get_family (priv->font));
       break;
-    case PROP_BACKGROUND:
-      string = g_value_get_string (value);
-      if (string && gdk_color_parse (string, &color))
-       {
-         attribute = pango_attr_background_new (color.red,
-                                                color.green,
-                                                color.blue);
-         attribute->start_index = 0;
-         attribute->end_index = G_MAXINT;
-         pango_attr_list_change (celltext->attr_list,
-                                 attribute);
-       }
+
+    case PROP_STYLE:
+      g_value_set_enum (value, pango_font_description_get_style (priv->font));
       break;
-    case PROP_BACKGROUND_GDK:
+
+    case PROP_VARIANT:
+      g_value_set_enum (value, pango_font_description_get_variant (priv->font));
       break;
-    case PROP_FOREGROUND:
-      string = g_value_get_string (value);
-      if (string && gdk_color_parse (string, &color))
-       {
-         attribute = pango_attr_foreground_new (color.red,
-                                                color.green,
-                                                color.blue);
-         attribute->start_index = 0;
-         attribute->end_index = G_MAXINT;
-         pango_attr_list_change (celltext->attr_list,
-                                 attribute);
-       }
+
+    case PROP_WEIGHT:
+      g_value_set_int (value, pango_font_description_get_weight (priv->font));
       break;
-    case PROP_FOREGROUND_GDK:
+
+    case PROP_STRETCH:
+      g_value_set_enum (value, pango_font_description_get_stretch (priv->font));
+      break;
+
+    case PROP_SIZE:
+      g_value_set_int (value, pango_font_description_get_size (priv->font));
+      break;
+
+    case PROP_SIZE_POINTS:
+      g_value_set_double (value, ((double)pango_font_description_get_size (priv->font)) / (double)PANGO_SCALE);
+      break;
+
+    case PROP_SCALE:
+      g_value_set_double (value, priv->font_scale);
       break;
+      
+    case PROP_EDITABLE:
+      g_value_set_boolean (value, priv->editable);
+      break;
+
     case PROP_STRIKETHROUGH:
-      attribute = pango_attr_strikethrough_new (g_value_get_boolean (value));
-      attribute->start_index = 0;
-      attribute->end_index = G_MAXINT;
-      pango_attr_list_change (celltext->attr_list,
-                             attribute);
+      g_value_set_boolean (value, priv->strikethrough);
       break;
+
     case PROP_UNDERLINE:
-      celltext->underline = g_value_get_boolean (value);
-      attribute = pango_attr_underline_new (celltext->underline ?
-                                           PANGO_UNDERLINE_SINGLE :
-                                           PANGO_UNDERLINE_NONE);
-      attribute->start_index = 0;
-      attribute->end_index = G_MAXINT;
-      pango_attr_list_change (celltext->attr_list,
-                             attribute);
+      g_value_set_enum (value, priv->underline_style);
       break;
-    case PROP_EDITABLE:
+
+    case PROP_RISE:
+      g_value_set_int (value, priv->rise);
+      break;  
+
+    case PROP_LANGUAGE:
+      g_value_set_static_string (value, pango_language_to_string (priv->language));
       break;
-    case PROP_ITALIC:
-      attribute = pango_attr_style_new (g_value_get_boolean (value) ?
-                                       PANGO_STYLE_ITALIC :
-                                       PANGO_STYLE_NORMAL);
-      attribute->start_index = 0;
-      attribute->end_index = G_MAXINT;
-      pango_attr_list_change (celltext->attr_list,
-                             attribute);
-      break;
-    case PROP_BOLD:
-      attribute = pango_attr_weight_new (g_value_get_boolean (value) ?
-                                        PANGO_WEIGHT_BOLD :
-                                        PANGO_WEIGHT_NORMAL);
-      attribute->start_index = 0;
-      attribute->end_index = G_MAXINT;
-      pango_attr_list_change (celltext->attr_list,
-                             attribute);
+
+    case PROP_ELLIPSIZE:
+      g_value_set_enum (value, priv->ellipsize);
       break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      
+    case PROP_WRAP_MODE:
+      g_value_set_enum (value, priv->wrap_mode);
       break;
-    }
-}
 
-GtkCellRenderer *
-gtk_cell_renderer_text_new (void)
-{
-  return GTK_CELL_RENDERER (gtk_type_new (gtk_cell_renderer_text_get_type ()));
-}
+    case PROP_WRAP_WIDTH:
+      g_value_set_int (value, priv->wrap_width);
+      break;
+      
+    case PROP_ALIGN:
+      g_value_set_enum (value, priv->align);
+      break;
 
-static void
-gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
-                                GtkWidget       *widget,
-                                gint            *width,
-                                gint            *height)
-{
-  GtkCellRendererText *celltext = (GtkCellRendererText *)cell;
-  PangoRectangle rect;
-  PangoLayout *layout;
-  PangoAttribute *attr;
-  PangoUnderline underline;
+    case PROP_BACKGROUND_SET:
+      g_value_set_boolean (value, priv->background_set);
+      break;
 
-  layout = gtk_widget_create_pango_layout (widget, celltext->text);
-  underline = celltext->underline ?
-    PANGO_UNDERLINE_DOUBLE :
-    PANGO_UNDERLINE_NONE;
+    case PROP_FOREGROUND_SET:
+      g_value_set_boolean (value, priv->foreground_set);
+      break;
 
-  attr = pango_attr_underline_new (underline);
-  attr->start_index = 0;
-  attr->end_index = G_MAXINT;
+    case PROP_FAMILY_SET:
+    case PROP_STYLE_SET:
+    case PROP_VARIANT_SET:
+    case PROP_WEIGHT_SET:
+    case PROP_STRETCH_SET:
+    case PROP_SIZE_SET:
+      {
+       PangoFontMask mask = get_property_font_set_mask (param_id);
+       g_value_set_boolean (value, (pango_font_description_get_set_fields (priv->font) & mask) != 0);
+       
+       break;
+      }
 
-  pango_attr_list_change (celltext->attr_list, attr);
-  pango_layout_set_attributes (layout, celltext->attr_list);
-  pango_layout_set_width (layout, -1);
-  pango_layout_get_pixel_extents (layout, NULL, &rect);
+    case PROP_SCALE_SET:
+      g_value_set_boolean (value, priv->scale_set);
+      break;
+      
+    case PROP_EDITABLE_SET:
+      g_value_set_boolean (value, priv->editable_set);
+      break;
 
-  if (width)
-    *width = GTK_CELL_RENDERER (celltext)->xpad * 2 + rect.width;
+    case PROP_STRIKETHROUGH_SET:
+      g_value_set_boolean (value, priv->strikethrough_set);
+      break;
 
-  if (height)
-    *height = GTK_CELL_RENDERER (celltext)->ypad * 2 + rect.height;
+    case PROP_UNDERLINE_SET:
+      g_value_set_boolean (value, priv->underline_set);
+      break;
 
-  g_object_unref (G_OBJECT (layout));
-}
+    case  PROP_RISE_SET:
+      g_value_set_boolean (value, priv->rise_set);
+      break;
 
-static void
-gtk_cell_renderer_text_render (GtkCellRenderer    *cell,
-                              GdkWindow          *window,
-                              GtkWidget          *widget,
-                              GdkRectangle       *background_area,
-                              GdkRectangle       *cell_area,
-                              GdkRectangle       *expose_area,
-                              guint               flags)
+    case PROP_LANGUAGE_SET:
+      g_value_set_boolean (value, priv->language_set);
+      break;
 
-{
-  GtkCellRendererText *celltext = (GtkCellRendererText *) cell;
-  PangoRectangle rect;
-  PangoLayout *layout;
-  PangoAttribute *attr;
-  PangoUnderline underline;
+    case PROP_ELLIPSIZE_SET:
+      g_value_set_boolean (value, priv->ellipsize_set);
+      break;
 
-  gint real_xoffset;
-  gint real_yoffset;
+    case PROP_ALIGN_SET:
+      g_value_set_boolean (value, priv->align_set);
+      break;
+      
+    case PROP_WIDTH_CHARS:
+      g_value_set_int (value, priv->width_chars);
+      break;  
 
-  GdkGC *font_gc = NULL;
+    case PROP_MAX_WIDTH_CHARS:
+      g_value_set_int (value, priv->max_width_chars);
+      break;  
 
-  if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
-    font_gc = widget->style->fg_gc [GTK_STATE_SELECTED];
-  else
-    font_gc = widget->style->fg_gc [GTK_STATE_NORMAL];
+    case PROP_PLACEHOLDER_TEXT:
+      g_value_set_string (value, priv->placeholder_text);
+      break;
 
-  layout = gtk_widget_create_pango_layout (widget, celltext->text);
+    case PROP_BACKGROUND:
+    case PROP_FOREGROUND:
+    case PROP_MARKUP:
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
 
-  if (celltext->underline)
-    underline = PANGO_UNDERLINE_SINGLE;
-  else
-    underline = PANGO_UNDERLINE_NONE;
 
-  attr = pango_attr_underline_new (underline);
-  attr->start_index = 0;
-  attr->end_index = G_MAXINT;
-  pango_attr_list_change (celltext->attr_list, attr);
-  pango_layout_set_attributes (layout, celltext->attr_list);
+static void
+set_bg_color (GtkCellRendererText *celltext,
+              GdkRGBA             *rgba)
+{
+  GtkCellRendererTextPrivate *priv = celltext->priv;
 
-  pango_layout_set_width (layout, -1);
-  pango_layout_get_pixel_extents (layout, NULL, &rect);
+  if (rgba)
+    {
+      if (!priv->background_set)
+        {
+          priv->background_set = TRUE;
+          g_object_notify (G_OBJECT (celltext), "background-set");
+        }
 
-  if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT)
-    underline = (celltext->underline) ? PANGO_UNDERLINE_DOUBLE:PANGO_UNDERLINE_SINGLE;
+      priv->background = *rgba;
+    }
   else
-    underline = (celltext->underline) ? PANGO_UNDERLINE_SINGLE:PANGO_UNDERLINE_NONE;
+    {
+      if (priv->background_set)
+        {
+          priv->background_set = FALSE;
+          g_object_notify (G_OBJECT (celltext), "background-set");
+        }
+    }
+}
 
-  attr = pango_attr_underline_new (underline);
-  attr->start_index = 0;
-  attr->end_index = G_MAXINT;
-  pango_attr_list_change (celltext->attr_list, attr);
-  pango_layout_set_attributes (layout, celltext->attr_list);
 
-  gdk_gc_set_clip_rectangle (font_gc, cell_area);
+static void
+set_fg_color (GtkCellRendererText *celltext,
+              GdkRGBA             *rgba)
+{
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+
+  if (rgba)
+    {
+      if (!priv->foreground_set)
+        {
+          priv->foreground_set = TRUE;
+          g_object_notify (G_OBJECT (celltext), "foreground-set");
+        }
 
-  real_xoffset = cell->xalign * (cell_area->width - rect.width - (2 * cell->xpad));
-  real_xoffset = MAX (real_xoffset, 0) + cell->xpad;
-  real_yoffset = cell->yalign * (cell_area->height - rect.height - (2 * cell->ypad));
-  real_yoffset = MAX (real_yoffset, 0) + cell->ypad;
+      priv->foreground = *rgba;
+    }
+  else
+    {
+      if (priv->foreground_set)
+        {
+          priv->foreground_set = FALSE;
+          g_object_notify (G_OBJECT (celltext), "foreground-set");
+        }
+    }
+}
+
+static PangoFontMask
+set_font_desc_fields (PangoFontDescription *desc,
+                     PangoFontMask         to_set)
+{
+  PangoFontMask changed_mask = 0;
+  
+  if (to_set & PANGO_FONT_MASK_FAMILY)
+    {
+      const char *family = pango_font_description_get_family (desc);
+      if (!family)
+       {
+         family = "sans";
+         changed_mask |= PANGO_FONT_MASK_FAMILY;
+       }
+
+      pango_font_description_set_family (desc, family);
+    }
+  if (to_set & PANGO_FONT_MASK_STYLE)
+    pango_font_description_set_style (desc, pango_font_description_get_style (desc));
+  if (to_set & PANGO_FONT_MASK_VARIANT)
+    pango_font_description_set_variant (desc, pango_font_description_get_variant (desc));
+  if (to_set & PANGO_FONT_MASK_WEIGHT)
+    pango_font_description_set_weight (desc, pango_font_description_get_weight (desc));
+  if (to_set & PANGO_FONT_MASK_STRETCH)
+    pango_font_description_set_stretch (desc, pango_font_description_get_stretch (desc));
+  if (to_set & PANGO_FONT_MASK_SIZE)
+    {
+      gint size = pango_font_description_get_size (desc);
+      if (size <= 0)
+       {
+         size = 10 * PANGO_SCALE;
+         changed_mask |= PANGO_FONT_MASK_SIZE;
+       }
+      
+      pango_font_description_set_size (desc, size);
+    }
+
+  return changed_mask;
+}
+
+static void
+notify_set_changed (GObject       *object,
+                   PangoFontMask  changed_mask)
+{
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family-set");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style-set");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant-set");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight-set");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch-set");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    g_object_notify (object, "size-set");
+}
+
+static void
+notify_fields_changed (GObject       *object,
+                      PangoFontMask  changed_mask)
+{
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    g_object_notify (object, "size");
+}
+
+static void
+set_font_description (GtkCellRendererText  *celltext,
+                      PangoFontDescription *font_desc)
+{
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+  GObject *object = G_OBJECT (celltext);
+  PangoFontDescription *new_font_desc;
+  PangoFontMask old_mask, new_mask, changed_mask, set_changed_mask;
+  
+  if (font_desc)
+    new_font_desc = pango_font_description_copy (font_desc);
+  else
+    new_font_desc = pango_font_description_new ();
+
+  old_mask = pango_font_description_get_set_fields (priv->font);
+  new_mask = pango_font_description_get_set_fields (new_font_desc);
+
+  changed_mask = old_mask | new_mask;
+  set_changed_mask = old_mask ^ new_mask;
+
+  pango_font_description_free (priv->font);
+  priv->font = new_font_desc;
+  
+  g_object_freeze_notify (object);
+
+  g_object_notify (object, "font-desc");
+  g_object_notify (object, "font");
+  
+  if (changed_mask & PANGO_FONT_MASK_FAMILY)
+    g_object_notify (object, "family");
+  if (changed_mask & PANGO_FONT_MASK_STYLE)
+    g_object_notify (object, "style");
+  if (changed_mask & PANGO_FONT_MASK_VARIANT)
+    g_object_notify (object, "variant");
+  if (changed_mask & PANGO_FONT_MASK_WEIGHT)
+    g_object_notify (object, "weight");
+  if (changed_mask & PANGO_FONT_MASK_STRETCH)
+    g_object_notify (object, "stretch");
+  if (changed_mask & PANGO_FONT_MASK_SIZE)
+    {
+      g_object_notify (object, "size");
+      g_object_notify (object, "size-points");
+    }
+
+  notify_set_changed (object, set_changed_mask);
+  
+  g_object_thaw_notify (object);
+}
+
+static void
+gtk_cell_renderer_text_set_property (GObject      *object,
+                                    guint         param_id,
+                                    const GValue *value,
+                                    GParamSpec   *pspec)
+{
+  GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+
+  switch (param_id)
+    {
+    case PROP_TEXT:
+      g_free (priv->text);
+
+      if (priv->markup_set)
+        {
+          if (priv->extra_attrs)
+            pango_attr_list_unref (priv->extra_attrs);
+          priv->extra_attrs = NULL;
+          priv->markup_set = FALSE;
+        }
+
+      priv->text = g_value_dup_string (value);
+      g_object_notify (object, "text");
+      break;
+
+    case PROP_ATTRIBUTES:
+      if (priv->extra_attrs)
+       pango_attr_list_unref (priv->extra_attrs);
+
+      priv->extra_attrs = g_value_get_boxed (value);
+      if (priv->extra_attrs)
+        pango_attr_list_ref (priv->extra_attrs);
+      break;
+    case PROP_MARKUP:
+      {
+       const gchar *str;
+       gchar *text = NULL;
+       GError *error = NULL;
+       PangoAttrList *attrs = NULL;
+
+       str = g_value_get_string (value);
+       if (str && !pango_parse_markup (str,
+                                       -1,
+                                       0,
+                                       &attrs,
+                                       &text,
+                                       NULL,
+                                       &error))
+         {
+           g_warning ("Failed to set text from markup due to error parsing markup: %s",
+                      error->message);
+           g_error_free (error);
+           return;
+         }
+
+       g_free (priv->text);
+
+       if (priv->extra_attrs)
+         pango_attr_list_unref (priv->extra_attrs);
+
+       priv->text = text;
+       priv->extra_attrs = attrs;
+        priv->markup_set = TRUE;
+      }
+      break;
+
+    case PROP_SINGLE_PARAGRAPH_MODE:
+      priv->single_paragraph = g_value_get_boolean (value);
+      break;
+      
+    case PROP_BACKGROUND:
+      {
+        GdkRGBA rgba;
+
+        if (!g_value_get_string (value))
+          set_bg_color (celltext, NULL);       /* reset to background_set to FALSE */
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+          set_bg_color (celltext, &rgba);
+        else
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "background-gdk");
+      }
+      break;
+      
+    case PROP_FOREGROUND:
+      {
+        GdkRGBA rgba;
+
+        if (!g_value_get_string (value))
+          set_fg_color (celltext, NULL);       /* reset to foreground_set to FALSE */
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+          set_fg_color (celltext, &rgba);
+        else
+          g_warning ("Don't know color `%s'", g_value_get_string (value));
+
+        g_object_notify (object, "foreground-gdk");
+      }
+      break;
+
+    case PROP_BACKGROUND_GDK:
+      {
+        GdkColor *color;
+
+        color = g_value_get_boxed (value);
+        if (color)
+          {
+            GdkRGBA rgba;
+
+            rgba.red = color->red / 65535.;
+            rgba.green = color->green / 65535.;
+            rgba.blue = color->blue / 65535.;
+            rgba.alpha = 1;
+
+            set_bg_color (celltext, &rgba);
+          }
+        else
+          {
+            set_bg_color (celltext, NULL);
+          }
+      }
+      break;
+
+    case PROP_FOREGROUND_GDK:
+      {
+        GdkColor *color;
+
+        color = g_value_get_boxed (value);
+        if (color)
+          {
+            GdkRGBA rgba;
+
+            rgba.red = color->red / 65535.;
+            rgba.green = color->green / 65535.;
+            rgba.blue = color->blue / 65535.;
+            rgba.alpha = 1;
+
+            set_fg_color (celltext, &rgba);
+          }
+        else
+          {
+            set_fg_color (celltext, NULL);
+          }
+      }
+      break;
+
+    case PROP_BACKGROUND_RGBA:
+      /* This notifies the GObject itself. */
+      set_bg_color (celltext, g_value_get_boxed (value));
+      break;
+
+    case PROP_FOREGROUND_RGBA:
+      /* This notifies the GObject itself. */
+      set_fg_color (celltext, g_value_get_boxed (value));
+      break;
+
+    case PROP_FONT:
+      {
+        PangoFontDescription *font_desc = NULL;
+        const gchar *name;
+
+        name = g_value_get_string (value);
+
+        if (name)
+          font_desc = pango_font_description_from_string (name);
+
+        set_font_description (celltext, font_desc);
+
+       pango_font_description_free (font_desc);
+        
+       if (priv->fixed_height_rows != -1)
+         priv->calc_fixed_height = TRUE;
+      }
+      break;
+
+    case PROP_FONT_DESC:
+      set_font_description (celltext, g_value_get_boxed (value));
+      
+      if (priv->fixed_height_rows != -1)
+       priv->calc_fixed_height = TRUE;
+      break;
+
+    case PROP_FAMILY:
+    case PROP_STYLE:
+    case PROP_VARIANT:
+    case PROP_WEIGHT:
+    case PROP_STRETCH:
+    case PROP_SIZE:
+    case PROP_SIZE_POINTS:
+      {
+       PangoFontMask old_set_mask = pango_font_description_get_set_fields (priv->font);
+       
+       switch (param_id)
+         {
+         case PROP_FAMILY:
+           pango_font_description_set_family (priv->font,
+                                              g_value_get_string (value));
+           break;
+         case PROP_STYLE:
+           pango_font_description_set_style (priv->font,
+                                             g_value_get_enum (value));
+           break;
+         case PROP_VARIANT:
+           pango_font_description_set_variant (priv->font,
+                                               g_value_get_enum (value));
+           break;
+         case PROP_WEIGHT:
+           pango_font_description_set_weight (priv->font,
+                                              g_value_get_int (value));
+           break;
+         case PROP_STRETCH:
+           pango_font_description_set_stretch (priv->font,
+                                               g_value_get_enum (value));
+           break;
+         case PROP_SIZE:
+           pango_font_description_set_size (priv->font,
+                                            g_value_get_int (value));
+           g_object_notify (object, "size-points");
+           break;
+         case PROP_SIZE_POINTS:
+           pango_font_description_set_size (priv->font,
+                                            g_value_get_double (value) * PANGO_SCALE);
+           g_object_notify (object, "size");
+           break;
+         }
+       
+       if (priv->fixed_height_rows != -1)
+         priv->calc_fixed_height = TRUE;
+       
+       notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (priv->font));
+       g_object_notify (object, "font-desc");
+       g_object_notify (object, "font");
+
+       break;
+      }
+      
+    case PROP_SCALE:
+      priv->font_scale = g_value_get_double (value);
+      priv->scale_set = TRUE;
+      if (priv->fixed_height_rows != -1)
+       priv->calc_fixed_height = TRUE;
+      g_object_notify (object, "scale-set");
+      break;
+      
+    case PROP_EDITABLE:
+      priv->editable = g_value_get_boolean (value);
+      priv->editable_set = TRUE;
+      if (priv->editable)
+        g_object_set (celltext, "mode", GTK_CELL_RENDERER_MODE_EDITABLE, NULL);
+      else
+        g_object_set (celltext, "mode", GTK_CELL_RENDERER_MODE_INERT, NULL);
+      g_object_notify (object, "editable-set");
+      break;
+
+    case PROP_STRIKETHROUGH:
+      priv->strikethrough = g_value_get_boolean (value);
+      priv->strikethrough_set = TRUE;
+      g_object_notify (object, "strikethrough-set");
+      break;
+
+    case PROP_UNDERLINE:
+      priv->underline_style = g_value_get_enum (value);
+      priv->underline_set = TRUE;
+      g_object_notify (object, "underline-set");
+            
+      break;
+
+    case PROP_RISE:
+      priv->rise = g_value_get_int (value);
+      priv->rise_set = TRUE;
+      g_object_notify (object, "rise-set");
+      if (priv->fixed_height_rows != -1)
+       priv->calc_fixed_height = TRUE;
+      break;  
+
+    case PROP_LANGUAGE:
+      priv->language_set = TRUE;
+      if (priv->language)
+        g_object_unref (priv->language);
+      priv->language = pango_language_from_string (g_value_get_string (value));
+      g_object_notify (object, "language-set");
+      break;
+
+    case PROP_ELLIPSIZE:
+      priv->ellipsize = g_value_get_enum (value);
+      priv->ellipsize_set = TRUE;
+      g_object_notify (object, "ellipsize-set");
+      break;
+      
+    case PROP_WRAP_MODE:
+      priv->wrap_mode = g_value_get_enum (value);
+      break;
+      
+    case PROP_WRAP_WIDTH:
+      priv->wrap_width = g_value_get_int (value);
+      break;
+            
+    case PROP_WIDTH_CHARS:
+      priv->width_chars = g_value_get_int (value);
+      break;  
+
+    case PROP_MAX_WIDTH_CHARS:
+      priv->max_width_chars = g_value_get_int (value);
+      break;  
+
+    case PROP_ALIGN:
+      priv->align = g_value_get_enum (value);
+      priv->align_set = TRUE;
+      g_object_notify (object, "align-set");
+      break;
+
+    case PROP_BACKGROUND_SET:
+      priv->background_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_FOREGROUND_SET:
+      priv->foreground_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_FAMILY_SET:
+    case PROP_STYLE_SET:
+    case PROP_VARIANT_SET:
+    case PROP_WEIGHT_SET:
+    case PROP_STRETCH_SET:
+    case PROP_SIZE_SET:
+      if (!g_value_get_boolean (value))
+       {
+         pango_font_description_unset_fields (priv->font,
+                                              get_property_font_set_mask (param_id));
+       }
+      else
+       {
+         PangoFontMask changed_mask;
+         
+         changed_mask = set_font_desc_fields (priv->font,
+                                              get_property_font_set_mask (param_id));
+         notify_fields_changed (G_OBJECT (celltext), changed_mask);
+       }
+      break;
+
+    case PROP_SCALE_SET:
+      priv->scale_set = g_value_get_boolean (value);
+      break;
+      
+    case PROP_EDITABLE_SET:
+      priv->editable_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_STRIKETHROUGH_SET:
+      priv->strikethrough_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_UNDERLINE_SET:
+      priv->underline_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_RISE_SET:
+      priv->rise_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_LANGUAGE_SET:
+      priv->language_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_ELLIPSIZE_SET:
+      priv->ellipsize_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_ALIGN_SET:
+      priv->align_set = g_value_get_boolean (value);
+      break;
+
+    case PROP_PLACEHOLDER_TEXT:
+      g_free (priv->placeholder_text);
+      priv->placeholder_text = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+/**
+ * gtk_cell_renderer_text_new:
+ * 
+ * Creates a new #GtkCellRendererText. Adjust how text is drawn using
+ * object properties. Object properties can be
+ * set globally (with g_object_set()). Also, with #GtkTreeViewColumn,
+ * you can bind a property to a value in a #GtkTreeModel. For example,
+ * you can bind the "text" property on the cell renderer to a string
+ * value in the model, thus rendering a different string in each row
+ * of the #GtkTreeView
+ * 
+ * Return value: the new cell renderer
+ **/
+GtkCellRenderer *
+gtk_cell_renderer_text_new (void)
+{
+  return g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, NULL);
+}
+
+static inline gboolean
+show_placeholder_text (GtkCellRendererText *celltext)
+{
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+
+  return priv->editable && priv->placeholder_text &&
+    (!priv->text || !priv->text[0]);
+}
+
+static void
+add_attr (PangoAttrList  *attr_list,
+          PangoAttribute *attr)
+{
+  attr->start_index = 0;
+  attr->end_index = G_MAXINT;
+  
+  pango_attr_list_insert (attr_list, attr);
+}
+
+static PangoLayout*
+get_layout (GtkCellRendererText *celltext,
+            GtkWidget           *widget,
+            const GdkRectangle  *cell_area,
+            GtkCellRendererState flags)
+{
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+  PangoAttrList *attr_list;
+  PangoLayout *layout;
+  PangoUnderline uline;
+  gint xpad;
+  gboolean placeholder_layout = show_placeholder_text (celltext);
+
+  layout = gtk_widget_create_pango_layout (widget, placeholder_layout ?
+                                           priv->placeholder_text : priv->text);
+
+  gtk_cell_renderer_get_padding (GTK_CELL_RENDERER (celltext), &xpad, NULL);
+
+  if (priv->extra_attrs)
+    attr_list = pango_attr_list_copy (priv->extra_attrs);
+  else
+    attr_list = pango_attr_list_new ();
+
+  pango_layout_set_single_paragraph_mode (layout, priv->single_paragraph);
+
+  if (!placeholder_layout && cell_area)
+    {
+      /* Add options that affect appearance but not size */
+      
+      /* note that background doesn't go here, since it affects
+       * background_area not the PangoLayout area
+       */
+      
+      if (priv->foreground_set
+         && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
+        {
+          PangoColor color;
+
+          color.red = (guint16) (priv->foreground.red * 65535);
+          color.green = (guint16) (priv->foreground.green * 65535);
+          color.blue = (guint16) (priv->foreground.blue * 65535);
+
+          add_attr (attr_list,
+                    pango_attr_foreground_new (color.red, color.green, color.blue));
+        }
+
+      if (priv->strikethrough_set)
+        add_attr (attr_list,
+                  pango_attr_strikethrough_new (priv->strikethrough));
+    }
+  else if (placeholder_layout)
+    {
+      PangoColor color;
+      GtkStyleContext *context;
+      GdkRGBA fg = { 0.5, 0.5, 0.5 };
+
+      context = gtk_widget_get_style_context (widget);
+      gtk_style_context_lookup_color (context, "placeholder_text_color", &fg);
+
+      color.red = CLAMP (fg.red * 65535. + 0.5, 0, 65535);
+      color.green = CLAMP (fg.green * 65535. + 0.5, 0, 65535);
+      color.blue = CLAMP (fg.blue * 65535. + 0.5, 0, 65535);
+
+      add_attr (attr_list,
+                pango_attr_foreground_new (color.red, color.green, color.blue));
+    }
+
+  add_attr (attr_list, pango_attr_font_desc_new (priv->font));
+
+  if (priv->scale_set &&
+      priv->font_scale != 1.0)
+    add_attr (attr_list, pango_attr_scale_new (priv->font_scale));
+  
+  if (priv->underline_set)
+    uline = priv->underline_style;
+  else
+    uline = PANGO_UNDERLINE_NONE;
+
+  if (priv->language_set)
+    add_attr (attr_list, pango_attr_language_new (priv->language));
+  
+  if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT)
+    {
+      switch (uline)
+        {
+        case PANGO_UNDERLINE_NONE:
+          uline = PANGO_UNDERLINE_SINGLE;
+          break;
+
+        case PANGO_UNDERLINE_SINGLE:
+          uline = PANGO_UNDERLINE_DOUBLE;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (uline != PANGO_UNDERLINE_NONE)
+    add_attr (attr_list, pango_attr_underline_new (priv->underline_style));
+
+  if (priv->rise_set)
+    add_attr (attr_list, pango_attr_rise_new (priv->rise));
+
+  /* Now apply the attributes as they will effect the outcome
+   * of pango_layout_get_extents() */
+  pango_layout_set_attributes (layout, attr_list);
+  pango_attr_list_unref (attr_list);
+
+  if (priv->ellipsize_set)
+    pango_layout_set_ellipsize (layout, priv->ellipsize);
+  else
+    pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
+
+  if (priv->wrap_width != -1)
+    {
+      PangoRectangle rect;
+      gint           width, text_width;
+
+      pango_layout_get_extents (layout, NULL, &rect);
+      text_width = rect.width;
+
+      if (cell_area)
+       width = (cell_area->width - xpad * 2) * PANGO_SCALE;
+      else
+       width = priv->wrap_width * PANGO_SCALE;
+
+      width = MIN (width, text_width);
+
+      pango_layout_set_width (layout, width);
+      pango_layout_set_wrap (layout, priv->wrap_mode);
+    }
+  else
+    {
+      pango_layout_set_width (layout, -1);
+      pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
+    }
+
+  if (priv->align_set)
+    pango_layout_set_alignment (layout, priv->align);
+  else
+    {
+      PangoAlignment align;
+
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+       align = PANGO_ALIGN_RIGHT;
+      else
+       align = PANGO_ALIGN_LEFT;
+
+      pango_layout_set_alignment (layout, align);
+    }
+  
+  return layout;
+}
+
+
+static void
+get_size (GtkCellRenderer    *cell,
+         GtkWidget          *widget,
+         const GdkRectangle *cell_area,
+         PangoLayout        *layout,
+         gint               *x_offset,
+         gint               *y_offset,
+         gint               *width,
+         gint               *height)
+{
+  GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+  PangoRectangle rect;
+  gint xpad, ypad;
+  gint cell_width, cell_height;
+
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+
+  if (priv->calc_fixed_height)
+    {
+      GtkStyleContext *style_context;
+      GtkStateFlags state;
+      PangoContext *context;
+      PangoFontMetrics *metrics;
+      PangoFontDescription *font_desc;
+      gint row_height;
+
+      style_context = gtk_widget_get_style_context (widget);
+      state = gtk_widget_get_state_flags (widget);
+
+      gtk_style_context_get (style_context, state, "font", &font_desc, NULL);
+      pango_font_description_merge_static (font_desc, priv->font, TRUE);
+
+      if (priv->scale_set)
+       pango_font_description_set_size (font_desc,
+                                        priv->font_scale * pango_font_description_get_size (font_desc));
+
+      context = gtk_widget_get_pango_context (widget);
+
+      metrics = pango_context_get_metrics (context,
+                                          font_desc,
+                                          pango_context_get_language (context));
+      row_height = (pango_font_metrics_get_ascent (metrics) +
+                   pango_font_metrics_get_descent (metrics));
+      pango_font_metrics_unref (metrics);
+
+      pango_font_description_free (font_desc);
+
+      gtk_cell_renderer_get_fixed_size (cell, &cell_width, &cell_height);
+
+      gtk_cell_renderer_set_fixed_size (cell,
+                                       cell_width, 2 * ypad +
+                                       priv->fixed_height_rows * PANGO_PIXELS (row_height));
+      
+      if (height)
+       {
+         *height = cell_height;
+         height = NULL;
+       }
+      priv->calc_fixed_height = FALSE;
+      if (width == NULL)
+       return;
+    }
+  
+  if (layout)
+    g_object_ref (layout);
+  else
+    layout = get_layout (celltext, widget, NULL, 0);
+
+  pango_layout_get_pixel_extents (layout, NULL, &rect);
+
+  if (cell_area)
+    {
+      gfloat xalign, yalign;
+
+      gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
+
+      rect.height = MIN (rect.height, cell_area->height - 2 * ypad);
+      rect.width  = MIN (rect.width, cell_area->width - 2 * xpad);
+
+      if (x_offset)
+       {
+         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+           *x_offset = (1.0 - xalign) * (cell_area->width - (rect.width + (2 * xpad)));
+         else 
+           *x_offset = xalign * (cell_area->width - (rect.width + (2 * xpad)));
+
+         if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->wrap_width != -1)
+           *x_offset = MAX(*x_offset, 0);
+       }
+      if (y_offset)
+       {
+         *y_offset = yalign * (cell_area->height - (rect.height + (2 * ypad)));
+         *y_offset = MAX (*y_offset, 0);
+       }
+    }
+  else
+    {
+      if (x_offset) *x_offset = 0;
+      if (y_offset) *y_offset = 0;
+    }
+
+  if (height)
+    *height = ypad * 2 + rect.height;
+
+  if (width)
+    *width = xpad * 2 + rect.width;
+
+  g_object_unref (layout);
+}
+
+static void
+gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
+                              cairo_t              *cr,
+                              GtkWidget            *widget,
+                              const GdkRectangle   *background_area,
+                              const GdkRectangle   *cell_area,
+                              GtkCellRendererState  flags)
+
+{
+  GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
+  GtkCellRendererTextPrivate *priv = celltext->priv;
+  GtkStyleContext *context;
+  PangoLayout *layout;
+  gint x_offset = 0;
+  gint y_offset = 0;
+  gint xpad, ypad;
+  PangoRectangle rect;
+
+  layout = get_layout (celltext, widget, cell_area, flags);
+  get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
+  context = gtk_widget_get_style_context (widget);
+
+  if (priv->background_set && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
+    {
+      gdk_cairo_rectangle (cr, background_area);
+      gdk_cairo_set_source_rgba (cr, &priv->background);
+      cairo_fill (cr);
+    }
+
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+
+  if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
+    pango_layout_set_width (layout,
+                           (cell_area->width - x_offset - 2 * xpad) * PANGO_SCALE);
+  else if (priv->wrap_width == -1)
+    pango_layout_set_width (layout, -1);
+
+  pango_layout_get_pixel_extents (layout, NULL, &rect);
+  x_offset = x_offset - rect.x;
+
+  cairo_save (cr);
+
+  gdk_cairo_rectangle (cr, cell_area);
+  cairo_clip (cr);
+
+  gtk_render_layout (context, cr,
+                     cell_area->x + x_offset + xpad,
+                     cell_area->y + y_offset + ypad,
+                     layout);
+
+  cairo_restore (cr);
+
+  g_object_unref (layout);
+}
+
+static void
+gtk_cell_renderer_text_editing_done (GtkCellEditable *entry,
+                                    gpointer         data)
+{
+  GtkCellRendererTextPrivate *priv;
+  const gchar *path;
+  const gchar *new_text;
+  gboolean canceled;
+
+  priv = GTK_CELL_RENDERER_TEXT (data)->priv;
+
+  g_clear_object (&priv->entry);
+
+  if (priv->focus_out_id > 0)
+    {
+      g_signal_handler_disconnect (entry, priv->focus_out_id);
+      priv->focus_out_id = 0;
+    }
+
+  if (priv->populate_popup_id > 0)
+    {
+      g_signal_handler_disconnect (entry, priv->populate_popup_id);
+      priv->populate_popup_id = 0;
+    }
+
+  if (priv->entry_menu_popdown_timeout)
+    {
+      g_source_remove (priv->entry_menu_popdown_timeout);
+      priv->entry_menu_popdown_timeout = 0;
+    }
+
+  g_object_get (entry,
+                "editing-canceled", &canceled,
+                NULL);
+  gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (data), canceled);
+
+  if (canceled)
+    return;
+
+  path = g_object_get_data (G_OBJECT (entry), GTK_CELL_RENDERER_TEXT_PATH);
+  new_text = gtk_entry_get_text (GTK_ENTRY (entry));
+
+  g_signal_emit (data, text_cell_renderer_signals[EDITED], 0, path, new_text);
+}
+
+static gboolean
+popdown_timeout (gpointer data)
+{
+  GtkCellRendererTextPrivate *priv;
+
+  priv = GTK_CELL_RENDERER_TEXT (data)->priv;
+
+  priv->entry_menu_popdown_timeout = 0;
+
+  if (!gtk_widget_has_focus (priv->entry))
+    gtk_cell_renderer_text_editing_done (GTK_CELL_EDITABLE (priv->entry), data);
+
+  return FALSE;
+}
+
+static void
+gtk_cell_renderer_text_popup_unmap (GtkMenu *menu,
+                                    gpointer data)
+{
+  GtkCellRendererTextPrivate *priv;
+
+  priv = GTK_CELL_RENDERER_TEXT (data)->priv;
+
+  priv->in_entry_menu = FALSE;
+
+  if (priv->entry_menu_popdown_timeout)
+    return;
+
+  priv->entry_menu_popdown_timeout = gdk_threads_add_timeout (500, popdown_timeout,
+                                                    data);
+}
+
+static void
+gtk_cell_renderer_text_populate_popup (GtkEntry *entry,
+                                       GtkMenu  *menu,
+                                       gpointer  data)
+{
+  GtkCellRendererTextPrivate *priv;
+
+  priv = GTK_CELL_RENDERER_TEXT (data)->priv;
+
+  if (priv->entry_menu_popdown_timeout)
+    {
+      g_source_remove (priv->entry_menu_popdown_timeout);
+      priv->entry_menu_popdown_timeout = 0;
+    }
+
+  priv->in_entry_menu = TRUE;
+
+  g_signal_connect (menu, "unmap",
+                    G_CALLBACK (gtk_cell_renderer_text_popup_unmap), data);
+}
+
+static gboolean
+gtk_cell_renderer_text_focus_out_event (GtkWidget *entry,
+                                       GdkEvent  *event,
+                                       gpointer   data)
+{
+  GtkCellRendererTextPrivate *priv;
+
+  priv = GTK_CELL_RENDERER_TEXT (data)->priv;
+
+  if (priv->in_entry_menu)
+    return FALSE;
+
+  g_object_set (entry,
+                "editing-canceled", TRUE,
+                NULL);
+  gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
+  gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
+
+  /* entry needs focus-out-event */
+  return FALSE;
+}
+
+static GtkCellEditable *
+gtk_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
+                                     GdkEvent             *event,
+                                     GtkWidget            *widget,
+                                     const gchar          *path,
+                                     const GdkRectangle   *background_area,
+                                     const GdkRectangle   *cell_area,
+                                     GtkCellRendererState  flags)
+{
+  GtkCellRendererText *celltext;
+  GtkCellRendererTextPrivate *priv;
+  gfloat xalign, yalign;
+
+  celltext = GTK_CELL_RENDERER_TEXT (cell);
+  priv = celltext->priv;
+
+  /* If the cell isn't editable we return NULL. */
+  if (priv->editable == FALSE)
+    return NULL;
+
+  gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
+
+  priv->entry = gtk_entry_new ();
+  g_object_ref_sink (G_OBJECT (priv->entry));
+
+  gtk_entry_set_has_frame (GTK_ENTRY (priv->entry), FALSE);
+  gtk_entry_set_alignment (GTK_ENTRY (priv->entry), xalign);
+
+  if (priv->text)
+    gtk_entry_set_text (GTK_ENTRY (priv->entry), priv->text);
+  g_object_set_data_full (G_OBJECT (priv->entry), I_(GTK_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free);
+  
+  gtk_editable_select_region (GTK_EDITABLE (priv->entry), 0, -1);
+
+  priv->in_entry_menu = FALSE;
+  if (priv->entry_menu_popdown_timeout)
+    {
+      g_source_remove (priv->entry_menu_popdown_timeout);
+      priv->entry_menu_popdown_timeout = 0;
+    }
+
+  g_signal_connect (priv->entry,
+                   "editing-done",
+                   G_CALLBACK (gtk_cell_renderer_text_editing_done),
+                   celltext);
+  priv->focus_out_id = g_signal_connect_after (priv->entry, "focus-out-event",
+                                              G_CALLBACK (gtk_cell_renderer_text_focus_out_event),
+                                              celltext);
+  priv->populate_popup_id =
+    g_signal_connect (priv->entry, "populate-popup",
+                      G_CALLBACK (gtk_cell_renderer_text_populate_popup),
+                      celltext);
+  gtk_widget_show (priv->entry);
+
+  return GTK_CELL_EDITABLE (priv->entry);
+}
+
+/**
+ * gtk_cell_renderer_text_set_fixed_height_from_font:
+ * @renderer: A #GtkCellRendererText
+ * @number_of_rows: Number of rows of text each cell renderer is allocated, or -1
+ * 
+ * Sets the height of a renderer to explicitly be determined by the "font" and
+ * "y_pad" property set on it.  Further changes in these properties do not
+ * affect the height, so they must be accompanied by a subsequent call to this
+ * function.  Using this function is unflexible, and should really only be used
+ * if calculating the size of a cell is too slow (ie, a massive number of cells
+ * displayed).  If @number_of_rows is -1, then the fixed height is unset, and
+ * the height is determined by the properties again.
+ **/
+void
+gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
+                                                  gint                 number_of_rows)
+{
+  GtkCellRendererTextPrivate *priv;
+  GtkCellRenderer *cell;
+
+  g_return_if_fail (GTK_IS_CELL_RENDERER_TEXT (renderer));
+  g_return_if_fail (number_of_rows == -1 || number_of_rows > 0);
+
+  cell = GTK_CELL_RENDERER (renderer);
+  priv = renderer->priv;
+
+  if (number_of_rows == -1)
+    {
+      gint width, height;
+
+      gtk_cell_renderer_get_fixed_size (cell, &width, &height);
+      gtk_cell_renderer_set_fixed_size (cell, width, -1);
+    }
+  else
+    {
+      priv->fixed_height_rows = number_of_rows;
+      priv->calc_fixed_height = TRUE;
+    }
+}
+
+static void
+gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
+                                            GtkWidget       *widget,
+                                            gint            *minimum_size,
+                                            gint            *natural_size)
+{
+  GtkCellRendererTextPrivate *priv;
+  GtkCellRendererText        *celltext;
+  PangoLayout                *layout;
+  PangoContext               *context;
+  PangoFontMetrics           *metrics;
+  PangoRectangle              rect;
+  gint char_width, text_width, ellipsize_chars, xpad;
+  gint min_width, nat_width;
+
+  /* "width-chars" Hard-coded minimum width:
+   *    - minimum size should be MAX (width-chars, strlen ("..."));
+   *    - natural size should be MAX (width-chars, strlen (label->text));
+   *
+   * "wrap-width" User specified natural wrap width
+   *    - minimum size should be MAX (width-chars, 0)
+   *    - natural size should be MIN (wrap-width, strlen (label->text))
+   */
+
+  celltext = GTK_CELL_RENDERER_TEXT (cell);
+  priv = celltext->priv;
+
+  gtk_cell_renderer_get_padding (cell, &xpad, NULL);
+
+  layout = get_layout (celltext, widget, NULL, 0);
+
+  /* Fetch the length of the complete unwrapped text */
+  pango_layout_set_width (layout, -1);
+  pango_layout_get_extents (layout, NULL, &rect);
+  text_width = rect.width;
+
+  /* Fetch the average size of a charachter */
+  context = pango_layout_get_context (layout);
+  metrics = pango_context_get_metrics (context,
+                                       pango_context_get_font_description (context),
+                                       pango_context_get_language (context));
+
+  char_width = pango_font_metrics_get_approximate_char_width (metrics);
+
+  pango_font_metrics_unref (metrics);
+  g_object_unref (layout);
+
+  /* enforce minimum width for ellipsized labels at ~3 chars */
+  if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
+    ellipsize_chars = 3;
+  else
+    ellipsize_chars = 0;
+
+  if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->width_chars > 0)
+    min_width = xpad * 2 +
+      MIN (PANGO_PIXELS_CEIL (text_width),
+           (PANGO_PIXELS (char_width) * MAX (priv->width_chars, ellipsize_chars)));
+  /* If no width-chars set, minimum for wrapping text will be the wrap-width */
+  else if (priv->wrap_width > -1)
+    min_width = xpad * 2 + rect.x + MIN (PANGO_PIXELS_CEIL (text_width), priv->wrap_width);
+  else
+    min_width = xpad * 2 + rect.x + PANGO_PIXELS_CEIL (text_width);
+
+  if (priv->width_chars > 0)
+    nat_width = xpad * 2 +
+      MAX ((PANGO_PIXELS (char_width) * priv->width_chars), PANGO_PIXELS_CEIL (text_width));
+  else
+    nat_width = xpad * 2 + PANGO_PIXELS_CEIL (text_width);
+
+  nat_width = MAX (nat_width, min_width);
+
+  if (priv->max_width_chars > 0)
+    {
+      gint max_width = xpad * 2 + PANGO_PIXELS (char_width) * priv->max_width_chars;
+      
+      min_width = MIN (min_width, max_width);
+      nat_width = MIN (nat_width, max_width);
+    }
+
+  if (minimum_size)
+    *minimum_size = min_width;
+
+  if (natural_size)
+    *natural_size = nat_width;
+}
+
+static void
+gtk_cell_renderer_text_get_preferred_height_for_width (GtkCellRenderer *cell,
+                                                       GtkWidget       *widget,
+                                                       gint             width,
+                                                       gint            *minimum_height,
+                                                       gint            *natural_height)
+{
+  GtkCellRendererText *celltext;
+  PangoLayout         *layout;
+  gint                 text_height, xpad, ypad;
+
+
+  celltext = GTK_CELL_RENDERER_TEXT (cell);
+
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+
+  layout = get_layout (celltext, widget, NULL, 0);
+
+  pango_layout_set_width (layout, (width - xpad * 2) * PANGO_SCALE);
+  pango_layout_get_pixel_size (layout, NULL, &text_height);
+
+  if (minimum_height)
+    *minimum_height = text_height + ypad * 2;
+
+  if (natural_height)
+    *natural_height = text_height + ypad * 2;
+
+  g_object_unref (layout);
+}
+
+static void
+gtk_cell_renderer_text_get_preferred_height (GtkCellRenderer *cell,
+                                             GtkWidget       *widget,
+                                             gint            *minimum_size,
+                                             gint            *natural_size)
+{
+  gint min_width;
+
+  /* Thankfully cell renderers dont rotate, so they only have to do
+   * height-for-width and not the opposite. Here we have only to return
+   * the height for the base minimum width of the renderer.
+   *
+   * Note this code path wont be followed by GtkTreeView which is
+   * height-for-width specifically.
+   */
+  gtk_cell_renderer_get_preferred_width (cell, widget, &min_width, NULL);
+  gtk_cell_renderer_text_get_preferred_height_for_width (cell, widget, min_width,
+                                                         minimum_size, natural_size);
+}
+
+static void
+gtk_cell_renderer_text_get_aligned_area (GtkCellRenderer       *cell,
+                                        GtkWidget             *widget,
+                                        GtkCellRendererState   flags,
+                                        const GdkRectangle    *cell_area,
+                                        GdkRectangle          *aligned_area)
+{
+  GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
+  PangoLayout *layout;
+  gint x_offset = 0;
+  gint y_offset = 0;
 
-  gdk_draw_layout (window,
-                  font_gc,
-                  cell_area->x + real_xoffset,
-                  cell_area->y + real_yoffset,
-                  layout);
+  layout = get_layout (celltext, widget, cell_area, flags);
+  get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, 
+           &aligned_area->width, &aligned_area->height);
 
-  g_object_unref (G_OBJECT (layout));
+  aligned_area->x = cell_area->x + x_offset;
+  aligned_area->y = cell_area->y + y_offset;
 
-  gdk_gc_set_clip_rectangle (font_gc, NULL);
+  g_object_unref (layout);
 }