Commit c319839d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Finish the job Elliot started of removing font setting test for text

Wed Jun 21 12:24:28 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/testgtk.c (create_text): Finish the job Elliot started
	of removing font setting test for text widget. (Since text widget
	and GdkFont are not deprecated, and cause portability problems.)
parent dd46dfaa
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
Wed Jun 21 12:24:28 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Finish the job Elliot started
of removing font setting test for text widget. (Since text widget
and GdkFont are not deprecated, and cause portability problems.)
Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c
......
......@@ -5840,7 +5840,6 @@ create_text (void)
GtkWidget *separator;
GtkWidget *scrolled_window;
GtkWidget *text;
GdkFont *font;
FILE *infile;
......@@ -5886,28 +5885,21 @@ create_text (void)
gtk_text_freeze (GTK_TEXT (text));
font = NULL;
for (i=0; i<ntext_colors; i++)
{
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL,
text_colors[i].name, -1);
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, "\t", -1);
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\t", -1);
for (j=0; j<ntext_colors; j++)
{
gtk_text_insert (GTK_TEXT (text), font,
gtk_text_insert (GTK_TEXT (text), NULL,
&text_colors[j].color, &text_colors[i].color,
"XYZ", -1);
}
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -1);
}
/* The Text widget will reference count the font, so we
* unreference it here
*/
gdk_font_unref (font);
infile = fopen("testgtk.c", "r");
if (infile)
......
......@@ -5840,7 +5840,6 @@ create_text (void)
GtkWidget *separator;
GtkWidget *scrolled_window;
GtkWidget *text;
GdkFont *font;
FILE *infile;
......@@ -5886,28 +5885,21 @@ create_text (void)
gtk_text_freeze (GTK_TEXT (text));
font = NULL;
for (i=0; i<ntext_colors; i++)
{
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL,
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL,
text_colors[i].name, -1);
gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, "\t", -1);
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\t", -1);
for (j=0; j<ntext_colors; j++)
{
gtk_text_insert (GTK_TEXT (text), font,
gtk_text_insert (GTK_TEXT (text), NULL,
&text_colors[j].color, &text_colors[i].color,
"XYZ", -1);
}
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -1);
}
/* The Text widget will reference count the font, so we
* unreference it here
*/
gdk_font_unref (font);
infile = fopen("testgtk.c", "r");
if (infile)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment