* renamed class LoadModule into CLoadModule because LoadModule is already a registere...

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

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 6af2cf8f69854028ae087b79b817054ae9840cde..ad0035ebb6d4d68cc677542d868ba38a8b35f862 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -502,11 +502,11 @@ void gamemode_set(const char* gamemode)
 
 #include "os/dir.h"
 
-class LoadModule
+class CLoadModule
 {
   const char* m_path;
 public:
-  LoadModule(const char* path) : m_path(path)
+  CLoadModule(const char* path) : m_path(path)
   {
   }
   void operator()(const char* name) const
@@ -532,7 +532,7 @@ const char* const c_library_extension =
 
 void Radiant_loadModules(const char* path)
 {
-  Directory_forEach(path, MatchFileExtension<LoadModule>(c_library_extension, LoadModule(path)));
+  Directory_forEach(path, MatchFileExtension<CLoadModule>(c_library_extension, CLoadModule(path)));
 }
 
 void Radiant_loadModulesFromRoot(const char* directory)
@@ -2574,6 +2574,7 @@ GtkWidget* create_main_statusbar(GtkWidget *pStatusLabel[c_count_status])
     gtk_frame_set_shadow_type(frame, GTK_SHADOW_IN);
 
     GtkLabel* label = GTK_LABEL(gtk_label_new ("Label"));
+       gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_misc_set_padding(GTK_MISC(label), 4, 2);
     gtk_widget_show(GTK_WIDGET(label));
@@ -3310,7 +3311,11 @@ void GlobalGL_sharedContextCreated()
   GlobalShaderCache().realise();
   Textures_Realise();
 
+#ifdef __linux__
+  g_font = glfont_create("fixed 8");
+#else
   g_font = glfont_create("courier 8");
+#endif
   GlobalOpenGL().m_font = g_font.getDisplayList();
   GlobalOpenGL().m_fontHeight = g_font.getPixelHeight();
 }