diff options
author | Owen Taylor <otaylor@redhat.com> | 2000-06-21 16:26:50 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-06-21 16:26:50 +0000 |
commit | c319839d8eaced155a4330a6cb0dfbd68b5156a1 (patch) | |
tree | b1a93a66c705bd00cbe149d32ff1ff2120d02f1c | |
parent | dd46dfaae3e568c49461417fade72e9880522c8e (diff) | |
download | gdk-pixbuf-c319839d8eaced155a4330a6cb0dfbd68b5156a1.tar.gz |
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.)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/testgtk.c | 14 | ||||
-rw-r--r-- | tests/testgtk.c | 14 |
9 files changed, 48 insertions, 22 deletions
@@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 207c30323..209aa509f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 207c30323..209aa509f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 207c30323..209aa509f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 207c30323..209aa509f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 207c30323..209aa509f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 207c30323..209aa509f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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> * gtk/gtkentry.c gtk/gtkimcontextsimple.c gtk/gtklabel.c diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 04e6c0822..5088f705d 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.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) diff --git a/tests/testgtk.c b/tests/testgtk.c index 04e6c0822..5088f705d 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.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) |