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 3d4c6fecfc944a9b97a26d69d59c286c88bed79b..2bd933637ac0f218fd26e918330927aa52560e91 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -5,28 +5,39 @@
  *
  * \author Huang Ying
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
-#include <gtkmm.h>
 
-#include <algorithm>
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
 
-#include "frontends/screen.h"
-#include "frontends/font_metrics.h"
-#include "GWorkArea.h"
 #include "GScreen.h"
-#include "lyxtext.h"
-#include "lyxrow.h"
-#include "Painter.h"
-#include "WorkArea.h"
+
+#include "GWorkArea.h"
+
 #include "buffer.h"
 #include "BufferView.h"
-#include "insets/insettext.h"
-#include "language.h"
 #include "debug.h"
+#include "language.h"
+#include "LColor.h"
+#include "lyxtext.h"
+#include "lyxrow.h"
+
+#include "frontends/screen.h"
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+#include "frontends/WorkArea.h"
 
+#include "insets/insettext.h"
+
+#include <algorithm>
+
+namespace lyx {
+namespace frontend {
 
 GScreen::GScreen(GWorkArea & o)
        : LyXScreen(), owner_(o)
@@ -44,6 +55,12 @@ GScreen::~GScreen()
 }
 
 
+WorkArea & GScreen::workarea() const
+{
+       return owner_;
+}
+
+
 void GScreen::setCursorColor(Glib::RefPtr<Gdk::GC> gc)
 {
        Gdk::Color * clr = owner_.getColorHandler().
@@ -52,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());
@@ -132,3 +148,6 @@ void GScreen::expose(int x, int y, int w, int h)
                                          y + owner_.ypos(),
                                          w, h);
 }
+
+} // namespace frontend
+} // namespace lyx