}
}
-namespace
-{
- GLFont g_font(0, 0, 0, 0);
-}
-
void GlobalGL_sharedContextCreated()
{
+ GLFont *g_font = NULL;
+
// report OpenGL information
globalOutputStream() << "GL_VENDOR: " << reinterpret_cast<const char*>(glGetString (GL_VENDOR)) << "\n";
globalOutputStream() << "GL_RENDERER: " << reinterpret_cast<const char*>(glGetString (GL_RENDERER)) << "\n";
#ifdef WIN32
/* win32 is dodgy here, just use courier new then */
- g_font = glfont_create("courier new 8");
+ g_font = glfont_create("arial 9");
#else
- /* 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);
#endif
- GlobalOpenGL().m_font = g_font.getDisplayList();
- GlobalOpenGL().m_fontHeight = g_font.getPixelHeight();
- GlobalOpenGL().m_fontAscent = g_font.getPixelAscent();
- GlobalOpenGL().m_fontDescent = g_font.getPixelDescent();
+ GlobalOpenGL().m_font = g_font;
}
void GlobalGL_sharedContextDestroyed()