Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index 50b94c707606e530ce22418f086373f268d61afd..2bd933637ac0f218fd26e918330927aa52560e91 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.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 "GScreen.h"
 
@@ -32,6 +36,8 @@
 
 #include <algorithm>
 
+namespace lyx {
+namespace frontend {
 
 GScreen::GScreen(GWorkArea & o)
        : LyXScreen(), owner_(o)
@@ -63,8 +69,7 @@ void GScreen::setCursorColor(Glib::RefPtr<Gdk::GC> gc)
 }
 
 
-void GScreen::showCursor(int x, int y,
-                        int h, Cursor_Shape shape)
+void GScreen::showCursor(int x, int y, int h, Cursor_Shape shape)
 {
        // Update the cursor color.
        setCursorColor(owner_.getGC());
@@ -143,3 +148,6 @@ void GScreen::expose(int x, int y, int w, int h)
                                          y + owner_.ypos(),
                                          w, h);
 }
+
+} // namespace frontend
+} // namespace lyx