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

GtkFontChooser: Add deprecated calls to the test

Browse Source
This commit is contained in:
Alberto Ruiz
2011-04-28 00:58:36 +01:00
committed by Matthias Clasen
parent 1a2ef4db60
commit 29a0685ee8
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkfontchooser.c
View File

@ -160,7 +160,7 @@ enum {
FACE_COLUMN, FACE_COLUMN,
PREVIEW_TEXT_COLUMN, PREVIEW_TEXT_COLUMN,
PREVIEW_TITLE_COLUMN, PREVIEW_TITLE_COLUMN,
/*FIXME: Remove two strings after deprecation removal */ /*FIXME: Remove these two strings for 4.0 */
FAMILY_NAME_COLUMN, FAMILY_NAME_COLUMN,
FACE_NAME_COLUMN FACE_NAME_COLUMN
}; };
@ -194,9 +194,9 @@ static void
gtk_font_selection_class_init (GtkFontSelectionClass *klass) gtk_font_selection_class_init (GtkFontSelectionClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
#if 0 #if 0
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
widget_class->screen_changed = gtk_font_selection_screen_changed; widget_class->screen_changed = gtk_font_selection_screen_changed;
widget_class->style_updated = gtk_font_selection_style_updated; widget_class->style_updated = gtk_font_selection_style_updated;
#endif #endif
@ -422,10 +422,19 @@ set_range_marks (GtkFontSelectionPrivate *priv,
priv->ignore_slider = TRUE; priv->ignore_slider = TRUE;
} }
if (!priv->_size_model)
/* FIXME: Ought to be removed for 4.0 to just populate the marks */
if (priv->_size_model)
{ {
for (i=0; i<length; i++)
gtk_scale_add_mark (GTK_SCALE (size_slider),
(gdouble) sizes[i],
GTK_POS_BOTTOM, NULL);
}
else
{
/* FIXME: This populates the size list for the
* deprecated size list tree view.
* Should be removed for 4.0
*/
GString *size_str = g_string_new (NULL); GString *size_str = g_string_new (NULL);
gtk_list_store_clear (priv->_size_model); gtk_list_store_clear (priv->_size_model);
@ -447,13 +456,6 @@ set_range_marks (GtkFontSelectionPrivate *priv,
} }
g_string_free (size_str, TRUE); g_string_free (size_str, TRUE);
} }
else
{
for (i=0; i<length; i++)
gtk_scale_add_mark (GTK_SCALE (size_slider),
(gdouble) sizes[i],
GTK_POS_BOTTOM, NULL);
}
} }
void void

15
tests/testfontselection.c
View File

@ -25,11 +25,26 @@
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *fontsel;
gtk_init (NULL, NULL); gtk_init (NULL, NULL);
dialog = gtk_font_selection_dialog_new (NULL); dialog = gtk_font_selection_dialog_new (NULL);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new (TRUE, 6);
gtk_container_add (GTK_CONTAINER (window), vbox);
fontsel = gtk_font_selection_dialog_get_font_selection (GTK_FONT_SELECTION_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (window), gtk_font_selection_get_size_list (GTK_FONT_SELECTION (fontsel)));
gtk_container_add (GTK_CONTAINER (window), gtk_font_selection_get_family_list (GTK_FONT_SELECTION (fontsel)));
gtk_container_add (GTK_CONTAINER (window), gtk_font_selection_get_face_list (GTK_FONT_SELECTION (fontsel)));
gtk_widget_show_all (window);
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);