* merged r22231 from uforadiant: 'use gtk default font instead of defined ones for linux/windows (which could happen to be not installed)'

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/1.5@327 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
mattn 2009-02-01 16:09:49 +00:00
parent 2abefddf8a
commit 0176733736

View file

@ -3311,11 +3311,12 @@ void GlobalGL_sharedContextCreated()
GlobalShaderCache().realise();
Textures_Realise();
#ifdef __linux__
g_font = glfont_create("fixed 8");
#else
g_font = glfont_create("courier 8");
#endif
/* use default font here (Sans 10 is gtk default) */
GtkSettings *settings = gtk_settings_get_default();
gchar *fontname;
g_object_get(settings, "gtk-font-name", &fontname, NULL);
g_font = glfont_create(fontname);
GlobalOpenGL().m_font = g_font.getDisplayList();
GlobalOpenGL().m_fontHeight = g_font.getPixelHeight();
}