fix "make dist" target

[lyx.git] / src / WorkArea.C

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 50222dc787061eab617ef949b93369dda209949a..2e7a3222ff8cec418e76c9b075567c1f20f85d6c 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -19,7 +19,6 @@
 #include "debug.h"
 #include "support/lstrings.h"
 #include "LyXView.h"
-#include "lyxfunc.h"
 
 #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
@@ -33,12 +32,16 @@ FL_OBJECT * figinset_canvas;
 // This is at least true for g++.
 //using std::abs;
 
-static inline
+namespace {
+
+inline
 void waitForX()
 {
        XSync(fl_get_display(), 0);
 }
 
+} // anon namespace
+
 
 extern "C" {
 // Just a bunch of C wrappers around static members of WorkArea
@@ -57,7 +60,6 @@ extern "C" {
 }
 
 
-
 WorkArea::WorkArea(int xpos, int ypos, int width, int height)
        : workareapixmap(0), painter_(*this)
 {
@@ -478,11 +480,12 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
 }
 
 
-static string clipboard_selection;
-static bool clipboard_read = false;
+namespace {
 
-extern "C" {
-       static
+string clipboard_selection;
+bool clipboard_read = false;
+
+extern "C"
 int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
                        void const * data, long size) 
 {
@@ -495,8 +498,8 @@ int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
        clipboard_read = true;
        return 0;
 }
-} // extern "C"
 
+} // namespace anon
 
 string const WorkArea::getClipboard() const 
 {