diff --git a/src/BufferView.C b/src/BufferView.C index 26fefa39ee..41c7775141 100644 --- a/src/BufferView.C +++ b/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, diff --git a/src/BufferView2.C b/src/BufferView2.C index 996791f362..fb7c29762d 100644 --- a/src/BufferView2.C +++ b/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" diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 613cc3b363..aef9714b7d 100644 --- a/src/BufferView_pimpl.C +++ b/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" diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index cc9929b4fe..3702405385 100644 --- a/src/BufferView_pimpl.h +++ b/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" diff --git a/src/Makefile.am b/src/Makefile.am index 3624d2a11c..781714b83b 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 70fd733d9c..29b57aff26 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,12 @@ +2002-05-23 John Levon + + * WorkArea.h: + * WorkArea.C: + * Makefile.am: move here + + * screen.h: + * screen.C: move here + 2002-05-23 John Levon * Liason.C: diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index f54c3cca05..fc6ac70405 100644 --- a/src/frontends/Makefile.am +++ b/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 diff --git a/src/WorkArea.C b/src/frontends/WorkArea.C similarity index 99% rename from src/WorkArea.C rename to src/frontends/WorkArea.C index d2235da633..49ee9d69d6 100644 --- a/src/WorkArea.C +++ b/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 diff --git a/src/WorkArea.h b/src/frontends/WorkArea.h similarity index 100% rename from src/WorkArea.h rename to src/frontends/WorkArea.h diff --git a/src/screen.C b/src/frontends/screen.C similarity index 99% rename from src/screen.C rename to src/frontends/screen.C index 26ab6e7973..dbf850e110 100644 --- a/src/screen.C +++ b/src/frontends/screen.C @@ -11,16 +11,16 @@ #include #ifdef __GNUG__ -#pragma implementation "lyxscreen.h" +#pragma implementation #endif #include -#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" diff --git a/src/lyxscreen.h b/src/frontends/screen.h similarity index 100% rename from src/lyxscreen.h rename to src/frontends/screen.h diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 35834cf5b0..808180616c 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,10 @@ +2002-05-23 John Levon + + * XFormsView.C: + * lyxlookup.h: + * lyxlookup.C: + * Makefile.am: move here + 2002-05-23 John Levon * DropDown.h: diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index f32f0f37af..52b1d68cef 100644 --- a/src/frontends/xforms/Makefile.am +++ b/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 \ diff --git a/src/frontends/xforms/XFormsView.C b/src/frontends/xforms/XFormsView.C index bb73db762b..d09d6c1c2f 100644 --- a/src/frontends/xforms/XFormsView.C +++ b/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" diff --git a/src/lyxlookup.C b/src/frontends/xforms/lyxlookup.C similarity index 100% rename from src/lyxlookup.C rename to src/frontends/xforms/lyxlookup.C diff --git a/src/lyxlookup.h b/src/frontends/xforms/lyxlookup.h similarity index 100% rename from src/lyxlookup.h rename to src/frontends/xforms/lyxlookup.h diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 291df21dd5..42640ae993 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2002-05-23 John Levon + + * insettext.C: screen moved + 2002-05-23 John Levon * insetbib.C: diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 268613f621..120e260efd 100644 --- a/src/insets/insettext.C +++ b/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" diff --git a/src/lyx_gui.C b/src/lyx_gui.C index 6bfe005cfd..188757da4c 100644 --- a/src/lyx_gui.C +++ b/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" diff --git a/src/text.C b/src/text.C index 1b28196ab0..e376fff0af 100644 --- a/src/text.C +++ b/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"