summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-02-09 22:26:04 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-02-09 22:26:04 +0000
commit74ae6a352aab559117ad0c376753ef3e6afba55d (patch)
treedb4fc264215e37271bd201f019c637d42ecafd1c /examples
parent8e43d209d9aa71cf7588314e59e28e0404a5b37e (diff)
downloadpango-74ae6a352aab559117ad0c376753ef3e6afba55d.tar.gz
updates.
Wed Feb 9 14:04:35 2000 Owen Taylor <otaylor@redhat.com> * TODO: updates. * docs/*: Added some docs on font handling, both general and for X.
Diffstat (limited to 'examples')
-rw-r--r--examples/pangox_aliases6
-rw-r--r--examples/viewer.c13
2 files changed, 4 insertions, 15 deletions
diff --git a/examples/pangox_aliases b/examples/pangox_aliases
index 7285f512..069a17f0 100644
--- a/examples/pangox_aliases
+++ b/examples/pangox_aliases
@@ -2,7 +2,7 @@
#
# family style variant weight stretch XLFD
-sans normal normal normal normal "-urw-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--16-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--16-*-*-*-*-*-johab-1,-*-fixed-medium-r-normal--12-*-*-*-*-*-*-*,-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0,-tamil-tscakaram-medium-r-normal--*-120-*-*-*-*-tscii-0"
-
-serif normal normal normal normal "-adobe-times-medium-r-normal--*-*-*-*-*-*-*-*"
+sans normal normal normal normal "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,-tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0"
+serif normal normal normal normal "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,-tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0"
+monospace normal normal normal normal "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,-tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0"
diff --git a/examples/viewer.c b/examples/viewer.c
index de707e3e..22d483ce 100644
--- a/examples/viewer.c
+++ b/examples/viewer.c
@@ -850,7 +850,7 @@ make_families_menu ()
}
}
- families = g_list_reverse (families);
+ families = g_list_sort (families, (GCompareFunc)strcmp);
combo = gtk_combo_new ();
gtk_combo_set_popdown_strings (GTK_COMBO (combo), families);
@@ -953,17 +953,6 @@ main (int argc, char **argv)
font = pango_context_load_font (context, &font_description, font_size);
-#if 0
- /* We hard code a font globally for now
- */
- font = pango_x_load_font (GDK_DISPLAY(),
- /* "-misc-fixed-medium-r-semicondensed--13-*-*-*-c-*-iso10646-1," */
- "-tamil-tscakaram-medium-r-normal--*-120-*-*-*-*-tscii-0,"
- "-gnu-unifont-medium-r-normal--*-160-*-*-c-*-iso10646-1,"
- "-*-*-medium-r-normal--*-160-*-*-*-*-*-*");
-#endif
-
-
/* Create the user interface
*/
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);