more guii moving around.

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

src/BufferView.C

@@ -17,7 +17,7 @@
 #include "BufferView.h"
 #include "BufferView_pimpl.h"
 #include "lyxtext.h"
-#include "lyxscreen.h"
+#include "frontends/screen.h"
 
 
 BufferView::BufferView(LyXView * o, int xpos, int ypos,

src/BufferView2.C

@@ -16,7 +16,7 @@
 #include "lyxtext.h"
 #include "frontends/LyXView.h"
 #include "bufferlist.h"
-#include "lyxscreen.h"
+#include "frontends/screen.h"
 #include "LaTeX.h"
 #include "BufferView_pimpl.h"
 #include "language.h"

src/BufferView_pimpl.C

@@ -5,8 +5,8 @@
 #endif
 
 #include "BufferView_pimpl.h"
-#include "WorkArea.h"
-#include "lyxscreen.h"
+#include "frontends/WorkArea.h"
+#include "frontends/screen.h"
 #include "lyxtext.h"
 #include "lyxrow.h"
 #include "paragraph.h"

src/BufferView_pimpl.h

@@ -6,7 +6,8 @@
 #include "BufferView.h"
 #include "commandtags.h"
 #include "frontends/Timeout.h"
-#include "WorkArea.h"
+// FIXME remove me 
+#include "frontends/WorkArea.h"
 #include "box.h"
 #include "insets/insetspecialchar.h"
 #include "support/types.h"

src/Makefile.am

@@ -91,8 +91,6 @@ lyx_SOURCES = \
 	Thesaurus.h \
 	ToolbarDefaults.C \
 	ToolbarDefaults.h \
-	WorkArea.C \
-	WorkArea.h \
 	box.h \
 	box.C \
 	broken_headers.h \
@@ -163,13 +161,10 @@ lyx_SOURCES = \
 	lyxlex.h \
 	lyxlex_pimpl.C \
 	lyxlex_pimpl.h \
-	lyxlookup.C \
-	lyxlookup.h \
 	lyxrc.C \
 	lyxrc.h \
 	lyxrow.C \
 	lyxrow.h \
-	lyxscreen.h \
 	lyxserver.C \
 	lyxserver.h \
 	lyxtext.h \
@@ -186,7 +181,6 @@ lyx_SOURCES = \
 	paragraph.h \
 	paragraph_pimpl.C \
 	paragraph_pimpl.h \
-	screen.C \
 	sp_base.h \
 	sp_spell.C \
 	sp_ispell.h \

src/frontends/ChangeLog

@@ -1,3 +1,12 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* WorkArea.h:
+	* WorkArea.C:
+	* Makefile.am: move here
+ 
+	* screen.h:
+	* screen.C: move here
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* Liason.C:

src/frontends/Makefile.am

@@ -33,4 +33,8 @@ libfrontends_la_SOURCES = \
 	Toolbar.C \
 	Toolbar.h \
 	LyXView.C \
-	LyXView.h
+	LyXView.h \
+	WorkArea.C \
+	WorkArea.h \
+	screen.C \
+	screen.h

src/frontends/WorkArea.C

@@ -21,7 +21,7 @@
 #include "version.h" // lyx_version
 
 #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-#include "lyxlookup.h"
+#include "frontends/xforms/lyxlookup.h"
 #endif
 
 #include "support/filetools.h" // LibFileSearch

src/frontends/screen.C

@@ -11,16 +11,16 @@
 #include <config.h>
 
 #ifdef __GNUG__
-#pragma implementation "lyxscreen.h"
+#pragma implementation
 #endif
 
 #include <algorithm>
 
-#include "lyxscreen.h"
+#include "screen.h"
 #include "lyxtext.h"
 #include "lyxrow.h"
 #include "frontends/Painter.h"
-#include "WorkArea.h"
+#include "frontends/WorkArea.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "font.h"

src/frontends/xforms/ChangeLog

@@ -1,3 +1,10 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* XFormsView.C:
+	* lyxlookup.h:
+	* lyxlookup.C:
+	* Makefile.am: move here
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* DropDown.h:

src/frontends/xforms/Makefile.am

@@ -196,6 +196,8 @@ libxforms_la_SOURCES = \
 	GUIRunTime.C \
 	input_validators.C \
 	input_validators.h \
+	lyxlookup.C \
+	lyxlookup.h \
 	MathsSymbols.C \
 	MathsSymbols.h \
 	Menubar_pimpl.C \

src/frontends/xforms/XFormsView.C

@@ -16,7 +16,7 @@
 
 #include "XFormsView.h"
 #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-#include "lyxlookup.h"
+#include "frontends/xforms/lyxlookup.h"
 #endif
 #include "minibuffer.h"
 #include "debug.h"

src/insets/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* insettext.C: screen moved
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* insetbib.C:

src/insets/insettext.C

@@ -35,7 +35,7 @@
 #include "lyxrc.h"
 #include "intl.h"
 #include "trans_mgr.h"
-#include "lyxscreen.h"
+#include "frontends/screen.h"
 #include "gettext.h"
 #include "lyxfunc.h"
 #include "ParagraphParameters.h"

src/lyx_gui.C

@@ -27,7 +27,7 @@
 #include "lyxrc.h"
 #include "gettext.h"
 #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-#include "lyxlookup.h"
+#include "frontends/xforms/lyxlookup.h"
 #endif
 #include "bufferlist.h"
 #include "ColorHandler.h"

src/text.C

@@ -21,10 +21,10 @@
 #include "lyxrc.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
+#include "frontends/screen.h"
 #include "tracer.h"
 #include "font.h"
 #include "encoding.h"
-#include "lyxscreen.h"
 #include "bufferview_funcs.h"
 #include "BufferView.h"
 #include "language.h"