some sun compile fixes the need clipboard code patch from Dekel ans some other fixes

[lyx.git] / src / WorkArea.C

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 1e6604ff1a880905f4ece5f7fdafd8ff37f9a5dd..5a5917b4e77ce8febf02547c828147b90a3f14c3 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -363,7 +363,8 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
 static string clipboard_selection;
 static bool clipboard_read = false;
 
-static
+extern "C" {
+       static
 int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
                        void const * data, long size) 
 {
@@ -372,12 +373,12 @@ int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
         
        clipboard_selection.reserve(size);
        for (int i = 0; i < size; ++i) {
-               clipboard_selection.push_back(static_cast<char*>(data)[i]);
+               clipboard_selection += static_cast<char const *>(data)[i];
        }
        clipboard_read = true;
        return 0;
 }
-
+}
 
 string WorkArea::getClipboard() const 
 {