2001-06-17 Dave Peticolas <dave@krondo.com>

* src/register/gnome/gnucash-style.c (gnucash_font_load): new func
	If gdk_fontset_load doesn't work, try gdk_font_load.
	(gnucash_style_set_register_font_name): use gnucash_font_load
	(gnucash_style_set_register_hint_font_name): use gnucash_font_load


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4713 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-06-17 10:54:57 +00:00
parent 8f858dced6
commit 1622755e74
2 changed files with 20 additions and 4 deletions

View File

@ -1,5 +1,10 @@
2001-06-17 Dave Peticolas <dave@krondo.com>
* src/register/gnome/gnucash-style.c (gnucash_font_load): new func
If gdk_fontset_load doesn't work, try gdk_font_load.
(gnucash_style_set_register_font_name): use gnucash_font_load
(gnucash_style_set_register_hint_font_name): use gnucash_font_load
* src/FileDialog.c (gncFileSave): save the window state on a save
(gncFileQuerySave): don't provide cancel option when the ui can't

View File

@ -743,6 +743,17 @@ gnucash_style_unref (SheetBlockStyle *style)
g_warning ("Unbalanced Style ref/unref");
}
static GdkFont *
gnucash_font_load (const char *name)
{
GdkFont *font;
font = gdk_fontset_load (name);
if (font) return font;
return gdk_font_load (name);
}
void
gnucash_style_set_register_font_name (const char *name)
{
@ -756,7 +767,7 @@ gnucash_style_set_register_font_name (const char *name)
}
if (register_font_name != NULL)
gnucash_register_font = gdk_fontset_load (register_font_name);
gnucash_register_font = gnucash_font_load (register_font_name);
if (gnucash_register_font == NULL)
{
@ -766,7 +777,7 @@ gnucash_style_set_register_font_name (const char *name)
g_free (register_font_name);
register_font_name = NULL;
gnucash_register_font = gdk_fontset_load (name);
gnucash_register_font = gnucash_font_load (name);
}
g_assert (gnucash_register_font != NULL);
@ -788,7 +799,7 @@ gnucash_style_set_register_hint_font_name (const char *name)
if (register_hint_font_name != NULL)
gnucash_register_hint_font =
gdk_fontset_load (register_hint_font_name);
gnucash_font_load (register_hint_font_name);
if (gnucash_register_hint_font == NULL)
{
@ -798,7 +809,7 @@ gnucash_style_set_register_hint_font_name (const char *name)
g_free (register_hint_font_name);
register_hint_font_name = NULL;
gnucash_register_hint_font = gdk_fontset_load (name);
gnucash_register_hint_font = gnucash_font_load (name);
}
g_assert (gnucash_register_hint_font != NULL);