Fix breakage caused by bad commits.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15033 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index 702b5bb44d64bb87841668733a6c439449c4a5f4..ecd5707efae9853b32cf3775e6e7a859fdcbadac 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -32,16 +32,18 @@
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
-#include "frontends/WorkArea.h"
 
 #include "insets/insettext.h"
 
 #include <algorithm>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 
-using lyx::frontend::CursorShape;
+       //using lyx::frontend::CursorShape;
 
 GScreen::GScreen(GWorkArea & o)
        : owner_(o)

diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h
index fc717ae71e2b1b18c4fdea374d67bcb0628adb66..94f35afa3b45b3c4ee84c5b4fcdb7073f63c9f8f 100644 (file)
--- a/src/frontends/gtk/GScreen.h
+++ b/src/frontends/gtk/GScreen.h
@@ -16,6 +16,9 @@
 
 #include <gtkmm.h>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C
index 19d973e8ca44637ceb1d67d51a9a97b956022357..3867841a25708c5104ad9a1f417841998abde050 100644 (file)
--- a/src/frontends/gtk/GWorkArea.C
+++ b/src/frontends/gtk/GWorkArea.C
@@ -28,6 +28,8 @@
 #include "funcrequest.h"
 #include "LColor.h"
 #include "WorkArea.h"
+#include "Gui.h"
+#include "Selection.h"
 
 using boost::shared_ptr;
 

diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h
index f8d83e567a1abcc1f7507a9ef0a63d21527b345a..3ee079c23a3b0a8e5cb9456935c57d605bd54f62 100644 (file)
--- a/src/frontends/gtk/GWorkArea.h
+++ b/src/frontends/gtk/GWorkArea.h
@@ -21,6 +21,9 @@
 
 #include <X11/Xft/Xft.h>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 class LColor_color;
 class LyXView;
 

diff --git a/src/frontends/gtk/GuiImplementation.C b/src/frontends/gtk/GuiImplementation.C
index 622aca7fce0da89e02d215dbfcdae97071dcdbe3..6a350c9e78103c0a6148c88f8d33e36731bf17b4 100644 (file)
--- a/src/frontends/gtk/GuiImplementation.C
+++ b/src/frontends/gtk/GuiImplementation.C
@@ -24,6 +24,9 @@
 #include "GView.h"
 #include "BufferView.h"
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt3/QWorkArea.C b/src/frontends/qt3/QWorkArea.C
index e24be3c7d5835a74362bdca86de763b7e588c5db..5a6198f1a06ac6af9987028fa7059aba32f65bc5 100644 (file)
--- a/src/frontends/qt3/QWorkArea.C
+++ b/src/frontends/qt3/QWorkArea.C
@@ -22,6 +22,8 @@
 #include "funcrequest.h"
 #include "LColor.h"
 #include "support/os.h"
+#include "frontends/Gui.h"
+#include "frontends/Selection.h"
 
 #include <qapplication.h>
 #include <qclipboard.h>
@@ -111,7 +113,7 @@ bool lyxX11EventFilter(XEvent * xev)
        case SelectionRequest:
                lyxerr[Debug::GUI] << "X requested selection." << endl;
                if (wa_ptr) {
-                       lyx::docstring const sel = wa_ptr->view().requestSelection();
+                       lyx::docstring const sel = wa_ptr->view().view()->requestSelection();
                        if (!sel.empty())
                                wa_ptr->view().gui().selection().put(sel);
                }