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

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

Browse Source 
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.)
This commit is contained in:
Owen Taylor
2000-06-21 16:26:50 +00:00
committed by Owen Taylor
parent dd46dfaae3
commit c319839d8e
9 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
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> Wed Jun 21 11:41:43 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c

14
gtk/testgtk.c
View File

@ -5840,7 +5840,6 @@ create_text (void)
GtkWidget *separator; GtkWidget *separator;
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *text; GtkWidget *text;
GdkFont *font;
FILE *infile; FILE *infile;
@ -5886,28 +5885,21 @@ create_text (void)
gtk_text_freeze (GTK_TEXT (text)); gtk_text_freeze (GTK_TEXT (text));
font = NULL;
for (i=0; i<ntext_colors; i++) 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); 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++) 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, &text_colors[j].color, &text_colors[i].color,
"XYZ", -1); "XYZ", -1);
} }
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -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"); infile = fopen("testgtk.c", "r");
if (infile) if (infile)

14
tests/testgtk.c
View File

@ -5840,7 +5840,6 @@ create_text (void)
GtkWidget *separator; GtkWidget *separator;
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *text; GtkWidget *text;
GdkFont *font;
FILE *infile; FILE *infile;
@ -5886,28 +5885,21 @@ create_text (void)
gtk_text_freeze (GTK_TEXT (text)); gtk_text_freeze (GTK_TEXT (text));
font = NULL;
for (i=0; i<ntext_colors; i++) 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); 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++) 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, &text_colors[j].color, &text_colors[i].color,
"XYZ", -1); "XYZ", -1);
} }
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, "\n", -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"); infile = fopen("testgtk.c", "r");
if (infile) if (infile)