entry: Use GtkSelectionWindow for touch text selection

[~andy/gtk] / gtk / deprecated / gtkfontsel.c

diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
index 74054ad5b962f03c31d66c538178bdb43cae0a29..0f55825b781b2405f58f50c7089d9843b4a92e1c 100644 (file)
--- a/gtk/deprecated/gtkfontsel.c
+++ b/gtk/deprecated/gtkfontsel.c
@@ -1184,36 +1184,18 @@ gtk_font_selection_get_font_description (GtkFontSelection *fontsel)
   return font_desc;
 }
 
-/* This sets the font in the preview entry to the selected font,
- * and tries to make sure that the preview entry is a reasonable
- * size, i.e. so that the text can be seen with a bit of space to
- * spare. But it tries to avoid resizing the entry every time the
- * font changes. This also used to shrink the preview if the font
- * size was decreased, but that made it awkward if the user wanted
- * to resize the window themself.
+/* This sets the font in the preview entry to the selected font.
  */
 static void
 gtk_font_selection_update_preview (GtkFontSelection *fontsel)
 {
   GtkFontSelectionPrivate *priv = fontsel->priv;
-  gint new_height;
-  GtkRequisition old_requisition, new_requisition;
   GtkWidget *preview_entry = priv->preview_entry;
   const gchar *text;
 
-  gtk_widget_get_preferred_size (preview_entry, &old_requisition, NULL);
-
   gtk_widget_override_font (preview_entry,
                             gtk_font_selection_get_font_description (fontsel));
 
-  gtk_widget_get_preferred_size (preview_entry, &new_requisition, NULL);
-
-  /* We don't ever want to be over MAX_PREVIEW_HEIGHT pixels high. */
-  new_height = CLAMP (new_requisition.height, INITIAL_PREVIEW_HEIGHT, MAX_PREVIEW_HEIGHT);
-
-  if (new_height > old_requisition.height || new_height < old_requisition.height - 30)
-    gtk_widget_set_size_request (preview_entry, -1, new_height);
-
   /* This sets the preview text, if it hasn't been set already. */
   text = gtk_entry_get_text (GTK_ENTRY (preview_entry));
   if (strlen (text) == 0)
@@ -1293,7 +1275,7 @@ gtk_font_selection_get_size_entry (GtkFontSelection *fontsel)
  * gtk_font_selection_get_size_list:
  * @fontsel: a #GtkFontSelection
  *
- * This returns the #GtkTreeeView used to list font sizes.
+ * This returns the #GtkTreeView used to list font sizes.
  *
  * Return value: (transfer none): A #GtkWidget that is part of @fontsel
  *