callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

label: Remove wrap width leftovers

Browse Source 
They're not used anymore, so we can just delete all of this code.
This commit is contained in:
Benjamin Otte 2011-04-18 02:40:40 +02:00
parent 2ecab7b90d
commit 403815f96f
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtklabel.c
View File

@ -279,7 +279,6 @@ struct _GtkLabelPrivate
guint mnemonic_keyval; guint mnemonic_keyval;
gint wrap_width;
gint width_chars; gint width_chars;
gint max_width_chars; gint max_width_chars;
}; };
@ -461,7 +460,6 @@ static void gtk_label_clear_select_info (GtkLabel *label);
static void gtk_label_update_cursor (GtkLabel *label); static void gtk_label_update_cursor (GtkLabel *label);
static void gtk_label_clear_layout (GtkLabel *label); static void gtk_label_clear_layout (GtkLabel *label);
static void gtk_label_ensure_layout (GtkLabel *label); static void gtk_label_ensure_layout (GtkLabel *label);
static void gtk_label_invalidate_wrap_width (GtkLabel *label);
static void gtk_label_select_region_index (GtkLabel *label, static void gtk_label_select_region_index (GtkLabel *label,
gint anchor_index, gint anchor_index,
gint end_index); gint end_index);
@ -1260,7 +1258,6 @@ gtk_label_init (GtkLabel *label)
priv->width_chars = -1; priv->width_chars = -1;
priv->max_width_chars = -1; priv->max_width_chars = -1;
priv->wrap_width = -1;
priv->label = NULL; priv->label = NULL;
priv->jtype = GTK_JUSTIFY_LEFT; priv->jtype = GTK_JUSTIFY_LEFT;
@ -2970,7 +2967,6 @@ gtk_label_set_width_chars (GtkLabel *label,
{ {
priv->width_chars = n_chars; priv->width_chars = n_chars;
g_object_notify (G_OBJECT (label), "width-chars"); g_object_notify (G_OBJECT (label), "width-chars");
gtk_label_invalidate_wrap_width (label);
gtk_widget_queue_resize (GTK_WIDGET (label)); gtk_widget_queue_resize (GTK_WIDGET (label));
} }
} }
@ -3018,7 +3014,6 @@ gtk_label_set_max_width_chars (GtkLabel *label,
priv->max_width_chars = n_chars; priv->max_width_chars = n_chars;
g_object_notify (G_OBJECT (label), "max-width-chars"); g_object_notify (G_OBJECT (label), "max-width-chars");
gtk_label_invalidate_wrap_width (label);
gtk_widget_queue_resize (GTK_WIDGET (label)); gtk_widget_queue_resize (GTK_WIDGET (label));
} }
} }
@ -3283,14 +3278,6 @@ gtk_label_get_measuring_layout (GtkLabel * label,
return copy; return copy;
} }
static void
gtk_label_invalidate_wrap_width (GtkLabel *label)
{
GtkLabelPrivate *priv = label->priv;
priv->wrap_width = -1;
}
static void static void
gtk_label_update_layout_width (GtkLabel *label) gtk_label_update_layout_width (GtkLabel *label)
{ {
@ -3872,7 +3859,6 @@ gtk_label_style_updated (GtkWidget *widget)
/* We have to clear the layout, fonts etc. may have changed */ /* We have to clear the layout, fonts etc. may have changed */
gtk_label_clear_layout (label); gtk_label_clear_layout (label);
gtk_label_invalidate_wrap_width (label);
} }
static void static void