anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 11:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix breakage caused by bad commits.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15033 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2006-09-17 14:58:42 +00:00
parent 87adf196c1
commit 8ebf862adb
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/gtk/GScreen.C
View File

@ -32,16 +32,18 @@
#include "frontends/font_metrics.h" #include "frontends/font_metrics.h"
#include "frontends/Painter.h" #include "frontends/Painter.h"
#include "frontends/WorkArea.h"
#include "insets/insettext.h" #include "insets/insettext.h"
#include <algorithm> #include <algorithm>
// FIXME: defined in X.h, spuriously pulled in by some gui headers
#undef CursorShape
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {
using lyx::frontend::CursorShape; //using lyx::frontend::CursorShape;
GScreen::GScreen(GWorkArea & o) GScreen::GScreen(GWorkArea & o)
: owner_(o) : owner_(o)

3
src/frontends/gtk/GScreen.h
View File

@ -16,6 +16,9 @@
#include <gtkmm.h> #include <gtkmm.h>
// FIXME: defined in X.h, spuriously pulled in by some gui headers
#undef CursorShape
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {

2
src/frontends/gtk/GWorkArea.C
View File

@ -28,6 +28,8 @@
#include "funcrequest.h" #include "funcrequest.h"
#include "LColor.h" #include "LColor.h"
#include "WorkArea.h" #include "WorkArea.h"
#include "Gui.h"
#include "Selection.h"
using boost::shared_ptr; using boost::shared_ptr;

3
src/frontends/gtk/GWorkArea.h
View File

@ -21,6 +21,9 @@
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
// FIXME: defined in X.h, spuriously pulled in by some gui headers
#undef CursorShape
class LColor_color; class LColor_color;
class LyXView; class LyXView;

3
src/frontends/gtk/GuiImplementation.C
View File

@ -24,6 +24,9 @@
#include "GView.h" #include "GView.h"
#include "BufferView.h" #include "BufferView.h"
// FIXME: defined in X.h, spuriously pulled in by some gui headers
#undef CursorShape
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {

4
src/frontends/qt3/QWorkArea.C
View File

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