From af88b4208b120fb446f6ae42a1dcb36eb5af5c7a Mon Sep 17 00:00:00 2001 From: divverent Date: Sat, 7 Feb 2009 10:37:51 +0000 Subject: [PATCH] ------------------------------------------------------------------------ r327 | mattn | 2009-02-01 17:09:49 +0100 (Sun, 01 Feb 2009) | 1 line * 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/netradiant/trunk@180 61c419a2-8eb2-4b30-bcec-8cead039b335 --- radiant/mainframe.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 6c449190..2b71c923 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -3321,13 +3321,12 @@ void GlobalGL_sharedContextCreated() GlobalShaderCache().realise(); Textures_Realise(); -#if defined(WIN32) - g_font = glfont_create("courier new 8"); -#elif defined(__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(); } -- 2.39.2