Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / GPainter.C

diff --git a/src/frontends/gtk/GPainter.C b/src/frontends/gtk/GPainter.C
index 8e6a6b5620ff8f53af3c1cf48391e08894a3b07d..7b87fc1cc4804b94ee84cf5bdf0c4b35a7463b18 100644 (file)
--- a/src/frontends/gtk/GPainter.C
+++ b/src/frontends/gtk/GPainter.C
@@ -9,7 +9,11 @@
  */
 
 #include <config.h>
-#include <gtkmm.h>
+
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
 #include "GPainter.h"
 #include "debug.h"
@@ -25,17 +29,20 @@
 
 #include "support/lstrings.h"
 
-#include <boost/scoped_array.hpp>
+#include <gtkmm.h>
+#include <gdk/gdkx.h>
 
 #include <X11/Xft/Xft.h>
 
+#include <boost/scoped_array.hpp>
+
 #include <cmath>
 
 using std::string;
 
 namespace font_metrics {
 
-int width(wchar_t const *s, size_t n, LyXFont const & f);
+int width(wchar_t const * s, size_t n, LyXFont const & f);
 
 } // namespace font_metrics