mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 03:36:39 +00:00
Fix breakage caused by bad commits.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15033 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
87adf196c1
commit
8ebf862adb
@ -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)
|
||||
|
@ -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 {
|
||||
|
||||
|
@ -28,6 +28,8 @@
|
||||
#include "funcrequest.h"
|
||||
#include "LColor.h"
|
||||
#include "WorkArea.h"
|
||||
#include "Gui.h"
|
||||
#include "Selection.h"
|
||||
|
||||
using boost::shared_ptr;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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 {
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user