guii2

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

src/BufferView2.C

@@ -14,7 +14,7 @@
 #include "buffer.h"
 #include "lyxcursor.h"
 #include "lyxtext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "bufferlist.h"
 #include "lyxscreen.h"
 #include "LaTeX.h"

src/BufferView_pimpl.C

@@ -10,7 +10,7 @@
 #include "lyxtext.h"
 #include "lyxrow.h"
 #include "paragraph.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "commandtags.h"
 #include "lyxfunc.h"
 #include "debug.h"

src/ChangeLog

@@ -1,16 +1,44 @@
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
-	* src/Makefile.am:
-	* src/PainterBase.C:
-	* src/PainterBase.h:
-	* src/Painter.C:
-	* src/Painter.h:
-	* src/WorkArea.C:
-	* src/WorkArea.h:
-	* src/screen.C:
-	* src/tabular.C:
-	* src/text.C:
-	* src/text2.C: move Painter to frontends/
+	* BufferView2.C:
+	* BufferView_pimpl.C:
+	* FontLoader.C:
+	* LyXView.h:
+	* LyXView.C:
+	* Makefile.am:
+	* WorkArea.C:
+	* XFormsView.h:
+	* XFormsView.C:
+	* buffer.C:
+	* bufferlist.C:
+	* bufferview_funcs.C:
+	* converter.C: 
+	* importer.C: 
+	* lyx_cb.C:
+	* lyx_gui.C:
+	* lyx_main.C:
+	* lyx_find.C:
+	* lyxfunc.C:
+	* lyxvc.C:
+	* minibuffer.C:
+	* text.C:
+	* text2.C:
+	* trans.C:
+	* vc-backend.C: move LyX/XFormsView into frontends/
+ 
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* Makefile.am:
+	* PainterBase.C:
+	* PainterBase.h:
+	* Painter.C:
+	* Painter.h:
+	* WorkArea.C:
+	* WorkArea.h:
+	* screen.C:
+	* tabular.C:
+	* text.C:
+	* text2.C: move Painter to frontends/
  
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 

src/FontLoader.C

@@ -21,7 +21,7 @@
 #include "debug.h"
 #include "lyxrc.h"	// lyxrc.font_*
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/GUIRunTime.h"
 
 using std::endl;

src/Makefile.am

@@ -76,8 +76,6 @@ lyx_SOURCES = \
 	Lsstream.h \
 	LyXAction.C \
 	LyXAction.h \
-	LyXView.C \
-	LyXView.h \
 	MenuBackend.C \
 	MenuBackend.h \
 	ParagraphParameters.C \
@@ -95,8 +93,6 @@ lyx_SOURCES = \
 	ToolbarDefaults.h \
 	WorkArea.C \
 	WorkArea.h \
-	XFormsView.C \
-	XFormsView.h \
 	box.h \
 	box.C \
 	broken_headers.h \
@@ -218,8 +214,6 @@ lyx_SOURCES = \
 	undo.h \
 	undo_funcs.C \
 	undo_funcs.h \
-	undostack.C \
-	undostack.h \
 	vc-backend.C \
 	vc-backend.h \
 	version.C \

src/WorkArea.C

@@ -16,7 +16,7 @@
 
 #include "WorkArea.h"
 #include "debug.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxrc.h" // lyxrc.show_banner
 #include "version.h" // lyx_version
 
@@ -574,12 +574,10 @@ int WorkArea::event_cb(XEvent * xev)
 		case SelectionRequest:
 			lyxerr[Debug::GUI] << "X requested selection." << endl;
 			selectionRequested.emit();
-//			ret = 1;
 			break;
 		case SelectionClear:
 			lyxerr[Debug::GUI] << "Lost selection." << endl;
 			selectionLost.emit();
-//			ret = 1;
 			break;
 	}
 	return ret;

src/buffer.C

@@ -31,7 +31,7 @@
 #include "version.h"
 #include "LaTeX.h"
 #include "Chktex.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
 #include "lyxtext.h"
@@ -735,7 +735,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		LyXLex nylex(0, 0);
 		nylex.setStream(istr);
 		inset->read(this, nylex);
-
 		par->insertInset(pos, inset, font);
 		++pos;
 		insertErtContents(par, pos);
@@ -1768,7 +1767,6 @@ bool Buffer::save() const
 		*/
 
 		// Should probably have some more error checking here.
-		// Should be cleaned up in 0.13, at least a bit.
 		// Doing it this way, also makes the inodes stay the same.
 		// This is still not a very good solution, in particular we
 		// might loose the owner of the backup.
@@ -3610,7 +3608,6 @@ void Buffer::simpleDocBookOnePar(ostream & os,
 }
 
 
-// This should be enabled when the Chktex class is implemented. (Asger)
 // chktex should be run with these flags disabled: 3, 22, 25, 30, 38(?)
 // Other flags: -wall -v0 -x
 int Buffer::runChktex()

src/bufferlist.C

@@ -28,7 +28,7 @@
 #include "bufferview_funcs.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "vc-backend.h"
 #include "TextCache.h"
 #include "lyxtextclasslist.h"

src/bufferview_funcs.C

@@ -15,7 +15,7 @@
 #endif
 
 #include "bufferview_funcs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "paragraph.h"
 #include "lyxfont.h"
@@ -206,7 +206,7 @@ string const currentState(BufferView * bv)
 }
 
 
-/* -------> Does the actual toggle job of the XxxCB() calls above.
+/* Does the actual toggle job of the calls above.
  * Also shows the current font state.
  */
 void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)

src/converter.C

@@ -21,7 +21,7 @@
 #include "buffer.h"
 #include "bufferview_funcs.h"
 #include "LaTeX.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyx_cb.h" // ShowMessage()
 #include "gettext.h"
 #include "BufferView.h"

src/frontends/ChangeLog

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

src/frontends/Liason.C

@@ -18,7 +18,7 @@
 #include "lyxrc.h"
 #include "PrinterParams.h"
 
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "buffer.h"
 #include "exporter.h"

src/frontends/LyXView.C

@@ -14,7 +14,7 @@
 #pragma implementation
 #endif
 
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "minibuffer.h"
 #include "debug.h"
 #include "intl.h"

src/frontends/Makefile.am

@@ -31,4 +31,6 @@ libfrontends_la_SOURCES = \
 	Timeout.C \
 	Timeout.h \
 	Toolbar.C \
-	Toolbar.h
+	Toolbar.h \
+	LyXView.C \
+	LyXView.h

src/frontends/controllers/ChangeLog

@@ -1,3 +1,36 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* ControlAboutlyx.C:
+	* ControlBibitem.C:
+	* ControlBibtex.C:
+	* ControlCharacter.C:
+	* ControlCitation.C:
+	* ControlCommand.C:
+	* ControlConnections.C:
+	* ControlERT.C:
+	* ControlError.C:
+	* ControlExternal.C:
+	* ControlFloat.C:
+	* ControlForks.C:
+	* ControlGraphics.C:
+	* ControlInclude.C:
+	* ControlIndex.C:
+	* ControlLog.C:
+	* ControlMinipage.C:
+	* ControlPreamble.C:
+	* ControlPrint.C:
+	* ControlRef.C:
+	* ControlSearch.C:
+	* ControlSendto.C:
+	* ControlShowFile.C:
+	* ControlSpellchecker.C:
+	* ControlTabularCreate.C:
+	* ControlTexinfo.C:
+	* ControlThesaurus.C:
+	* ControlToc.C:
+	* ControlUrl.C:
+	* ControlVCLog.C: LyXView moved into frontends
+ 
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* ControlExternal.C: add scoped_ptr.hpp

src/frontends/controllers/ControlAboutlyx.C

@@ -18,7 +18,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlAboutlyx.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "Lsstream.h"
 #include "BufferView.h"
 #include "gettext.h"

src/frontends/controllers/ControlBibitem.C

@@ -23,7 +23,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlBibitem.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "BufferView.h"
 

src/frontends/controllers/ControlBibtex.C

@@ -24,7 +24,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlBibtex.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "lyxrc.h"

src/frontends/controllers/ControlCharacter.C

@@ -20,7 +20,7 @@
 #include "buffer.h"
 #include "Dialogs.h"
 #include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "bufferview_funcs.h" // ToggleAndShow
 #include "gettext.h"
 #include "language.h"

src/frontends/controllers/ControlCitation.C

@@ -23,7 +23,7 @@
 #include "ControlCitation.h"
 #include "buffer.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 
 // need to #include this in _one_ of the ControlCommand-derived classses in
 // order to instantiate

src/frontends/controllers/ControlCommand.C

@@ -23,7 +23,7 @@
 #include "ControlInset.tmpl"
 #include "buffer.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 #include "BufferView.h"
 

src/frontends/controllers/ControlConnections.C

@@ -20,7 +20,7 @@
 #include "ViewBase.h"
 #include "ControlConnections.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 
 using SigC::slot;

src/frontends/controllers/ControlERT.C

@@ -22,7 +22,7 @@
 #include "ControlERT.h"
 #include "ControlInset.tmpl"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "BufferView.h"
 

src/frontends/controllers/ControlError.C

@@ -22,7 +22,7 @@
 #include "ControlError.h"
 #include "ControlInset.tmpl"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "insets/inseterror.h"
 

src/frontends/controllers/ControlExternal.C

@@ -25,7 +25,7 @@
 #include "ControlInset.tmpl"
 #include "Dialogs.h"
 #include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "ViewBase.h"
 #include "buffer.h"
 #include "frontends/Alert.h"

src/frontends/controllers/ControlFloat.C

@@ -20,7 +20,7 @@
 #include "ControlFloat.h"
 #include "ControlInset.tmpl"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "insets/insetfloat.h"

src/frontends/controllers/ControlForks.C

@@ -17,7 +17,7 @@
 #include "ViewBase.h"
 
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 
 #include "frontends/Dialogs.h"

src/frontends/controllers/ControlGraphics.C

@@ -30,7 +30,7 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "gettext.h"
 #include "lyxrc.h"
 

src/frontends/controllers/ControlInclude.C

@@ -23,7 +23,7 @@
 #include "Alert.h"
 #include "BufferView.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 #include "gettext.h"
 #include "helper_funcs.h"

src/frontends/controllers/ControlIndex.C

@@ -22,7 +22,7 @@
 #include "ControlIndex.h"
 #include "buffer.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 
 using SigC::slot;
 

src/frontends/controllers/ControlLog.C

@@ -21,7 +21,7 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlLog.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "Dialogs.h"
 #include "lyxrc.h"
 #include "BufferView.h"

src/frontends/controllers/ControlMinipage.C

@@ -22,7 +22,7 @@
 #include "ControlMinipage.h"
 #include "ControlInset.tmpl"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "helper_funcs.h"

src/frontends/controllers/ControlPreamble.C

@@ -15,7 +15,7 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlPreamble.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "Dialogs.h"
 #include "buffer.h"
 #include "lyxrc.h"

src/frontends/controllers/ControlPrint.C

@@ -23,7 +23,7 @@
 #include "ControlPrint.h"
 #include "buffer.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "PrinterParams.h"
 #include "Liason.h"
 #include "helper_funcs.h"

src/frontends/controllers/ControlRef.C

@@ -22,11 +22,12 @@
 #include "ButtonControllerBase.h"
 #include "ControlRef.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "lyxfunc.h"
 #include "bufferlist.h"
 #include "support/filetools.h" // MakeAbsPath, MakeDisplayPath
+#include "debug.h"
 
 using SigC::slot;
 using std::vector;

src/frontends/controllers/ControlSearch.C

@@ -22,7 +22,7 @@
 #include "ControlSearch.h"
 #include "Dialogs.h"
 #include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "lyxfind.h"
 #include "debug.h"

src/frontends/controllers/ControlSendto.C

@@ -17,7 +17,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlSendto.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "buffer.h"
 #include "converter.h"

src/frontends/controllers/ControlShowFile.C

@@ -17,7 +17,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlShowFile.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "support/filetools.h" // FileSearch

src/frontends/controllers/ControlSpellchecker.C

@@ -33,7 +33,7 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxtext.h"
 #include "gettext.h"
 #include "support/lstrings.h"

src/frontends/controllers/ControlTabularCreate.C

@@ -21,7 +21,7 @@
 #include "ControlTabularCreate.h"
 #include "BufferView.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
 

src/frontends/controllers/ControlTexinfo.C

@@ -21,7 +21,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlTexinfo.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "support/filetools.h" // FileSearch

src/frontends/controllers/ControlThesaurus.C

@@ -17,7 +17,7 @@
 #include "ControlThesaurus.h"
 #include "Dialogs.h"
 #include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfind.h"
 #include "buffer.h"
 #include "debug.h"

src/frontends/controllers/ControlToc.C

@@ -22,7 +22,7 @@
 #include "ControlToc.h"
 #include "buffer.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h" // tostr
 #include "gettext.h"

src/frontends/controllers/ControlUrl.C

@@ -21,7 +21,7 @@
 #include "ButtonControllerBase.h"
 #include "ControlUrl.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 
 using SigC::slot;

src/frontends/controllers/ControlVCLog.C

@@ -25,7 +25,7 @@
 #include "ControlVCLog.h"
 #include "buffer.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "Dialogs.h"
 #include "lyxrc.h"
 #include "support/lyxlib.h"

src/frontends/gnome/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* FileDialog.C: LyXView moved into frontends/
+ 
 2002-04-09  Michael A. Koziarski  <michael@koziarski.com>
 
 	* dialoges/GERT.glade

src/frontends/gnome/Dialogs.C

@@ -17,7 +17,7 @@
 #include "gettext.h"
 
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "gnomeBC.h"
 #include "Tooltips.h"
 #include "GUI.h"

src/frontends/gnome/FileDialog.C

@@ -23,7 +23,7 @@
 
 #include <sigc++/signal_system.h>
 
-#include "LyXView.h" // This is only needed while we have the xforms part!
+#include "frontends/LyXView.h" // This is only needed while we have the xforms part!
 #include "bufferview_funcs.h"
 // FileDialog::Private
 

src/frontends/qt2/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* QtLyXView.h: moved into frontends/
+ 
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* QDocument.h: use more specific smart_ptr header.

src/frontends/qt2/QtLyXView.h

@@ -10,4 +10,4 @@
  */
 
 #undef emit
-#include "LyXView.h"
+#include "frontends/LyXView.h"

src/frontends/xforms/ChangeLog

@@ -1,3 +1,24 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* DropDown.h:
+	* FileDialog.C:
+	* FormBaseDeprecated.C:
+	* FormDocument.C:
+	* FormIndex.C:
+	* FormInset.C:
+	* FormMathsBitmap.C:
+	* FormMathsDelim.C:
+	* FormMathsMatrix.C:
+	* FormMathsPanel.C:
+	* FormParagraph.C:
+	* FormPreferences.C:
+	* FormPrint.C:
+	* FormTabular.C:
+	* Makefile.am:
+	* XFormsView.h:
+	* XFormsView.C: LyXView is now in frontends/,
+	XFormsView moved to here
+	 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* Makefile.am:

src/frontends/xforms/DropDown.h

@@ -14,7 +14,7 @@
 #pragma interface
 #endif
 
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include <sigc++/signal_system.h>
 #include "LString.h"
 #include FORMS_H_LOCATION

src/frontends/xforms/FileDialog.C

@@ -17,7 +17,7 @@
 // temp. hack until Allow/prohibitInput is not
 // needed any more in src/ - for now it's simplest
 // to leave it there
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "bufferview_funcs.h"
 #include "gettext.h"
 #include "commandtags.h"

src/frontends/xforms/FormBaseDeprecated.C

@@ -18,7 +18,7 @@
 #include "xforms_resize.h"
 #include "GUIRunTime.h"
 #include "Tooltips.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxrc.h"
 #include "support/LAssert.h"
 
@@ -98,7 +98,7 @@ void FormBaseDeprecated::show()
 	}
 
 	fl_freeze_form(form());
-	update();  // make sure its up-to-date
+	update();
 	fl_unfreeze_form(form());
 
 	if (form()->visible) {

src/frontends/xforms/FormDocument.C

@@ -27,7 +27,7 @@
 #include "bmtable.h"
 #include "language.h"
 #include "frnt_lang.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 #include "lyxrc.h"
 #include "BufferView.h"

src/frontends/xforms/FormIndex.C

@@ -15,7 +15,7 @@
 #include "xformsBC.h"
 #include "ControlIndex.h"
 #include "FormIndex.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "form_index.h"
 
 typedef FormCB<ControlIndex, FormDB<FD_form_index> > base_class;

src/frontends/xforms/FormInset.C

@@ -15,7 +15,7 @@
 #endif
 
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "FormInset.h"
 #include "xformsBC.h"
 

src/frontends/xforms/FormMathsBitmap.C

@@ -21,7 +21,7 @@
 #include "FormMathsBitmap.h"
 
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
 #include "xforms_helpers.h"

src/frontends/xforms/FormMathsDelim.C

@@ -18,7 +18,7 @@
 #include "FormMathsDelim.h"
 #include "form_maths_delim.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
 #include "support/lstrings.h"

src/frontends/xforms/FormMathsMatrix.C

@@ -20,7 +20,7 @@
 #include "FormMathsMatrix.h"
 #include "form_maths_matrix.h"
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "Lsstream.h"
 #include "lyxfunc.h"
 #include "support/LAssert.h"

src/frontends/xforms/FormMathsPanel.C

@@ -16,7 +16,7 @@
 #endif
 
 #include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "FormMathsPanel.h"
 #include "form_maths_panel.h"
 #include "MathsSymbols.h"

src/frontends/xforms/FormParagraph.C

@@ -18,7 +18,7 @@
 #include "form_paragraph.h"
 #include "Dialogs.h"
 #include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "lyxtext.h"
 #include "xforms_helpers.h"

src/frontends/xforms/FormPreferences.C

@@ -20,7 +20,7 @@
 #include "buffer.h"
 #include "converter.h"
 #include "debug.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "language.h"
 #include "frnt_lang.h"
 #include "lyxfunc.h"

src/frontends/xforms/FormPrint.C

@@ -18,7 +18,7 @@
 #include "FormPrint.h"
 #include "form_print.h"
 
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 
 #include "PrinterParams.h"
 

src/frontends/xforms/FormTabular.C

@@ -16,7 +16,7 @@
 
 #include "FormTabular.h"
 #include "form_tabular.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "Dialogs.h"
 #include "buffer.h"
 #include "xforms_helpers.h"

src/frontends/xforms/Makefile.am

@@ -208,8 +208,10 @@ libxforms_la_SOURCES = \
 	Toolbar_pimpl.h \
 	Tooltips.C \
 	Tooltips.h \
-	XPainter.h \
+	XFormsView.C \
+	XFormsView.h \
 	XPainter.C \
+	XPainter.h \
 	xforms_helpers.C \
 	xforms_helpers.h \
 	xforms_resize.C \

src/frontends/xforms/XFormsView.h

@@ -18,7 +18,7 @@
 
 #include FORMS_H_LOCATION
 
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 
 /**
   This class is the form containing the view of the buffer. The actual buffer

src/importer.C

@@ -18,7 +18,7 @@
 
 #include "importer.h"
 #include "converter.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 
 #include "bufferlist.h"

src/insets/ChangeLog

@@ -1,3 +1,23 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* insetbib.C:
+	* insetcite.C:
+	* inseterror.C:
+	* insetert.C:
+	* insetexternal.C:
+	* insetfloat.C:
+	* insetfloatlist.C:
+	* insetgraphics.C:
+	* insetinclude.C:
+	* insetindex.C:
+	* insetminipage.C:
+	* insetparent.C:
+	* insetref.C:
+	* insettabular.C:
+	* insettext.C:
+	* insettoc.C:
+	* inseturl.C: LyXView moved into frontends/
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* inset.C:

src/insets/insetbib.C

@@ -12,7 +12,7 @@
 #include "lyxtext.h"
 #include "lyxrc.h"
 #include "font.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxtextclasslist.h"
 
 #include "frontends/Dialogs.h"

src/insets/insetcite.C

@@ -17,7 +17,7 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "debug.h"
 #include "gettext.h"
 

src/insets/inseterror.C

@@ -19,7 +19,7 @@
 #include "lyxfont.h"
 #include "gettext.h"
 #include "inseterror.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 #include "frontends/Dialogs.h"
 

src/insets/insetert.C

@@ -19,7 +19,7 @@
 #include "language.h"
 #include "buffer.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxtext.h"
 #include "debug.h"
 #include "lyxtextclasslist.h"

src/insets/insetexternal.C

@@ -18,7 +18,7 @@
 #include "ExternalTemplate.h"
 #include "BufferView.h"
 #include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyx_main.h"
 #include "LaTeXFeatures.h"
 #include "gettext.h"

src/insets/insetfloat.C

@@ -26,7 +26,7 @@
 #include "debug.h"
 #include "Floating.h"
 #include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 
 using std::ostream;

src/insets/insetfloatlist.C

@@ -8,7 +8,7 @@
 #include "FloatList.h"
 #include "LaTeXFeatures.h"
 #include "frontends/Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "buffer.h"
 #include "gettext.h"

src/insets/insetgraphics.C

@@ -81,7 +81,7 @@ TODO Before initial production release:
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsImage.h"
 
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxtext.h"
 #include "buffer.h"
 #include "BufferView.h"

src/insets/insetinclude.C

@@ -10,7 +10,7 @@
 #include "BufferView.h"
 #include "debug.h"
 #include "lyxrc.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "LaTeXFeatures.h"
 #include "gettext.h"
 #include "lyxtextclasslist.h"

src/insets/insetindex.C

@@ -6,7 +6,7 @@
 
 #include "insetindex.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 #include "LaTeXFeatures.h"
 #include "gettext.h"

src/insets/insetminipage.C

@@ -17,7 +17,7 @@
 #include "gettext.h"
 #include "lyxfont.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 #include "lyxtext.h"
 #include "insets/insettext.h"

src/insets/insetparent.C

@@ -20,7 +20,7 @@
 #include "insetparent.h"
 #include "support/filetools.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "support/LOstream.h"
 #include "commandtags.h"
 #include "buffer.h"

src/insets/insetref.C

@@ -10,7 +10,7 @@
 #include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 #include "lyxfunc.h"
 #include "BufferView.h"

src/insets/insettabular.C

@@ -25,7 +25,7 @@
 #include "frontends/Painter.h"
 #include "font.h"
 #include "lyxtext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "insets/insettext.h"
 #include "debug.h"
 #include "gettext.h"

src/insets/insettext.C

@@ -21,7 +21,7 @@
 #include "lyxfont.h"
 #include "commandtags.h"
 #include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "lyxtextclasslist.h"
 #include "LaTeXFeatures.h"

src/insets/insettoc.C

@@ -7,7 +7,7 @@
 #include "gettext.h"
 #include "insettoc.h"
 #include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 #include "debug.h"
 #include "buffer.h"

src/insets/inseturl.C

@@ -7,7 +7,7 @@
 #include "inseturl.h"
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "debug.h"
 #include "frontends/Dialogs.h"
 #include "support/lstrings.h"

src/lyx_cb.C

@@ -17,7 +17,7 @@
 #include "bufferview_funcs.h"
 #include "debug.h"
 #include "lastfiles.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "gettext.h"

src/lyx_gui.C

@@ -20,7 +20,7 @@
 #include "lyx_main.h"
 #include "debug.h"
 #include "version.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "buffer.h"
 #include "BufferView.h"
 #include "lyxserver.h"
@@ -90,7 +90,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
 	lyxerr << etxt << " id: " << xeev->resourceid << endl;
 	// By doing an abort we get a nice backtrace. (hopefully)
 	lyx::abort();
-	return 0; // Solaris CC wants us to return something
+	return 0;
 }
 
 }

src/lyx_main.C

@@ -17,7 +17,7 @@
 
 #include "lyx_main.h"
 #include "lyx_gui.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 #include "lyxrc.h"
 #include "buffer.h"

src/lyxfind.C

@@ -6,7 +6,7 @@
 
 #include "lyxtext.h"
 #include "lyxfind.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 #include "support/textutils.h"
 #include "support/lstrings.h"

src/lyxfunc.C

@@ -36,7 +36,7 @@
 #include "bufferview_funcs.h"
 #include "minibuffer.h"
 #include "vspace.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "FloatList.h"
 #include "converter.h"
 #include "exporter.h"

src/lyxvc.C

@@ -10,7 +10,7 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "lyxfunc.h"
 
 #include "frontends/Alert.h"

src/mathed/ChangeLog

@@ -1,3 +1,8 @@
+2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
+
+	* formula.C:
+	* formulabase.C: LyXView moved into frontends/
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* formula.C:

src/mathed/formula.C

@@ -35,7 +35,7 @@
 #include "support/LAssert.h"
 #include "support/systemcall.h"
 #include "support/filetools.h" // LibFileSearch
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 #include "lyxrc.h"
 #include "math_hullinset.h"

src/mathed/formulabase.C

@@ -33,7 +33,7 @@
 #include "debug.h"
 #include "math_support.h"
 #include "support/lstrings.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 #include "font.h"
 #include "Lsstream.h"

src/minibuffer.C

@@ -20,14 +20,14 @@
 
 // FIXME: temporary
 #include "frontends/xforms/DropDown.h"
+#include "frontends/xforms/XFormsView.h"
 
 #include "minibuffer.h"
 
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "LyXView.h"
-#include "XFormsView.h"
+#include "frontends/LyXView.h"
 #include "gettext.h"
 #include "LyXAction.h"
 #include "BufferView.h"

src/text.C

@@ -19,7 +19,7 @@
 #include "buffer.h"
 #include "debug.h"
 #include "lyxrc.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 #include "tracer.h"
 #include "font.h"

src/text2.C

@@ -18,13 +18,12 @@
 #include "LString.h"
 #include "paragraph.h"
 #include "lyxtextclasslist.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "undo_funcs.h"
 #include "buffer.h"
 #include "bufferparams.h"
 #include "gettext.h"
 #include "BufferView.h"
-#include "LyXView.h"
 #include "CutAndPaste.h"
 #include "frontends/Painter.h"
 #include "font.h"