summaryrefslogtreecommitdiff
path: root/gtk/gtkcellrenderertext.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtkcellrenderertext.c')
-rw-r--r--gtk/gtkcellrenderertext.c57
1 files changed, 31 insertions, 26 deletions
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 5fd484a5ee..f0b44453e1 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -133,7 +133,7 @@ static guint text_cell_renderer_signals [LAST_SIGNAL];
#define GTK_CELL_RENDERER_TEXT_PATH "gtk-cell-renderer-text-path"
-struct _GtkCellRendererTextPriv
+struct _GtkCellRendererTextPrivate
{
GtkWidget *entry;
@@ -187,12 +187,12 @@ G_DEFINE_TYPE_WITH_CODE (GtkCellRendererText, gtk_cell_renderer_text, GTK_TYPE_C
static void
gtk_cell_renderer_text_init (GtkCellRendererText *celltext)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
GtkCellRenderer *cell = GTK_CELL_RENDERER (celltext);
celltext->priv = G_TYPE_INSTANCE_GET_PRIVATE (celltext,
GTK_TYPE_CELL_RENDERER_TEXT,
- GtkCellRendererTextPriv);
+ GtkCellRendererTextPrivate);
priv = celltext->priv;
gtk_cell_renderer_set_alignment (cell, 0.0, 0.5);
@@ -645,14 +645,14 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
G_TYPE_STRING,
G_TYPE_STRING);
- g_type_class_add_private (object_class, sizeof (GtkCellRendererTextPriv));
+ g_type_class_add_private (object_class, sizeof (GtkCellRendererTextPrivate));
}
static void
gtk_cell_renderer_text_finalize (GObject *object)
{
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
pango_font_description_free (priv->font);
@@ -696,7 +696,7 @@ gtk_cell_renderer_text_get_property (GObject *object,
GParamSpec *pspec)
{
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
switch (param_id)
{
@@ -887,7 +887,7 @@ static void
set_bg_color (GtkCellRendererText *celltext,
GdkColor *color)
{
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
if (color)
{
@@ -916,7 +916,7 @@ static void
set_fg_color (GtkCellRendererText *celltext,
GdkColor *color)
{
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
if (color)
{
@@ -1020,7 +1020,7 @@ static void
set_font_description (GtkCellRendererText *celltext,
PangoFontDescription *font_desc)
{
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
GObject *object = G_OBJECT (celltext);
PangoFontDescription *new_font_desc;
PangoFontMask old_mask, new_mask, changed_mask, set_changed_mask;
@@ -1072,7 +1072,7 @@ gtk_cell_renderer_text_set_property (GObject *object,
GParamSpec *pspec)
{
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (object);
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
switch (param_id)
{
@@ -1433,7 +1433,7 @@ get_layout (GtkCellRendererText *celltext,
GdkRectangle *cell_area,
GtkCellRendererState flags)
{
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
PangoAttrList *attr_list;
PangoLayout *layout;
PangoUnderline uline;
@@ -1574,7 +1574,7 @@ get_size (GtkCellRenderer *cell,
gint *height)
{
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
PangoRectangle rect;
gint xpad, ypad;
gint cell_width, cell_height;
@@ -1588,7 +1588,7 @@ get_size (GtkCellRenderer *cell,
PangoFontDescription *font_desc;
gint row_height;
- font_desc = pango_font_description_copy_static (widget->style->font_desc);
+ font_desc = pango_font_description_copy_static (gtk_widget_get_style (widget)->font_desc);
pango_font_description_merge_static (font_desc, priv->font, TRUE);
if (priv->scale_set)
@@ -1642,7 +1642,9 @@ get_size (GtkCellRenderer *cell,
gint char_width;
context = pango_layout_get_context (layout);
- metrics = pango_context_get_metrics (context, widget->style->font_desc, pango_context_get_language (context));
+ metrics = pango_context_get_metrics (context,
+ gtk_widget_get_style (widget)->font_desc,
+ pango_context_get_language (context));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
pango_font_metrics_unref (metrics);
@@ -1697,7 +1699,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell,
{
GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
- GtkCellRendererTextPriv *priv = celltext->priv;
+ GtkCellRendererTextPrivate *priv = celltext->priv;
PangoLayout *layout;
GtkStateType state;
gint x_offset = 0;
@@ -1760,7 +1762,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell,
else if (priv->wrap_width == -1)
pango_layout_set_width (layout, -1);
- gtk_paint_layout (widget->style,
+ gtk_paint_layout (gtk_widget_get_style (widget),
window,
state,
TRUE,
@@ -1778,7 +1780,7 @@ static void
gtk_cell_renderer_text_editing_done (GtkCellEditable *entry,
gpointer data)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
const gchar *path;
const gchar *new_text;
gboolean canceled;
@@ -1822,7 +1824,7 @@ gtk_cell_renderer_text_editing_done (GtkCellEditable *entry,
static gboolean
popdown_timeout (gpointer data)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
priv = GTK_CELL_RENDERER_TEXT (data)->priv;
@@ -1838,7 +1840,7 @@ static void
gtk_cell_renderer_text_popup_unmap (GtkMenu *menu,
gpointer data)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
priv = GTK_CELL_RENDERER_TEXT (data)->priv;
@@ -1856,7 +1858,7 @@ gtk_cell_renderer_text_populate_popup (GtkEntry *entry,
GtkMenu *menu,
gpointer data)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
priv = GTK_CELL_RENDERER_TEXT (data)->priv;
@@ -1877,7 +1879,7 @@ gtk_cell_renderer_text_focus_out_event (GtkWidget *entry,
GdkEvent *event,
gpointer data)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
priv = GTK_CELL_RENDERER_TEXT (data)->priv;
@@ -1905,7 +1907,7 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell,
{
GtkRequisition requisition;
GtkCellRendererText *celltext;
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
gfloat xalign, yalign;
celltext = GTK_CELL_RENDERER_TEXT (cell);
@@ -1995,7 +1997,7 @@ void
gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
gint number_of_rows)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
GtkCellRenderer *cell;
g_return_if_fail (GTK_IS_CELL_RENDERER_TEXT (renderer));
@@ -2032,8 +2034,9 @@ gtk_cell_renderer_text_get_width (GtkCellSizeRequest *cell,
gint *minimum_size,
gint *natural_size)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
GtkCellRendererText *celltext;
+ GtkStyle *style;
PangoLayout *layout;
PangoContext *context;
PangoFontMetrics *metrics;
@@ -2053,6 +2056,8 @@ gtk_cell_renderer_text_get_width (GtkCellSizeRequest *cell,
celltext = GTK_CELL_RENDERER_TEXT (cell);
priv = celltext->priv;
+ style = gtk_widget_get_style (widget);
+
gtk_cell_renderer_get_padding (GTK_CELL_RENDERER (cell), &xpad, NULL);
layout = get_layout (celltext, widget, NULL, 0);
@@ -2068,7 +2073,7 @@ gtk_cell_renderer_text_get_width (GtkCellSizeRequest *cell,
/* Fetch the average size of a charachter */
context = pango_layout_get_context (layout);
- metrics = pango_context_get_metrics (context, widget->style->font_desc,
+ metrics = pango_context_get_metrics (context, style->font_desc,
pango_context_get_language (context));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
@@ -2124,7 +2129,7 @@ gtk_cell_renderer_text_get_height_for_width (GtkCellSizeRequest *cell,
gint *minimum_height,
gint *natural_height)
{
- GtkCellRendererTextPriv *priv;
+ GtkCellRendererTextPrivate *priv;
GtkCellRendererText *celltext;
PangoLayout *layout;
gint text_height, xpad, ypad;
View Lorry Controller Status