apply back 335 and 336, will need to update deps and put a zip out

[xonotic/netradiant.git] / radiant / main.cpp

diff --git a/radiant/main.cpp b/radiant/main.cpp
index 0f7b434d879d2f038968cfd60085394a67f63414..7e004003f17fd6d0256876251d72e0ebdebb14b2 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #include <gtk/gtk.h>
 #endif
 
 #include <gtk/gtk.h>

+#include <gtk/gtkgl.h>

 #include <glib/gi18n.h>
 #include "stdafx.h"
 #include <assert.h>
 #include <glib/gi18n.h>
 #include "stdafx.h"
 #include <assert.h>


@@ -44,6 +45,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "watchbsp.h"
 #include "filters.h"
 
 #include "watchbsp.h"
 #include "filters.h"

+#include "glwidget.h"

 
 bool g_bBuildList = false;
 int g_argc;
 
 bool g_bBuildList = false;
 int g_argc;


@@ -503,6 +505,11 @@ int main( int argc, char* argv[] ) {
 //  gtk_disable_setlocale();
 
   gtk_init(&argc, &argv);
 //  gtk_disable_setlocale();
 
   gtk_init(&argc, &argv);

+  gtk_gl_init(&argc, &argv);
+  gdk_gl_init(&argc, &argv);
+
+  // TODO: Find a better place to call this.
+  gtk_glwidget_create_font();

 
   if ((ptr = getenv ("Q3R_LIBGL")) != NULL)
     libgl = ptr;
 
   if ((ptr = getenv ("Q3R_LIBGL")) != NULL)
     libgl = ptr;