diff --git a/src/ChangeLog b/src/ChangeLog index 67b686a831..50c3c6be06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2002-05-24 John Levon + + * ColorHandler.h: + * ColorHandler.C: + * FontInfo.h: + * FontInfo.C: moved to frontends/xforms/ + + * FontLoader.h: + * FontLoader.C: moved into frontends for GUIIzation + + * Makefile.am: + * lyx_gui.C: + * lyxfont.C: + * lyxfunc.C: changes from above + 2002-05-24 John Levon * LColor.C: remove spurious X include diff --git a/src/Makefile.am b/src/Makefile.am index fe26091047..548a41bace 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,8 +50,6 @@ lyx_SOURCES = \ Bullet.h \ Chktex.C \ Chktex.h \ - ColorHandler.C \ - ColorHandler.h \ CutAndPaste.C \ CutAndPaste.h \ DepTable.C \ @@ -60,10 +58,6 @@ lyx_SOURCES = \ FloatList.h \ Floating.C \ Floating.h \ - FontInfo.C \ - FontInfo.h \ - FontLoader.C \ - FontLoader.h \ FuncStatus.C \ FuncStatus.h \ LColor.C \ diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 2b7be48045..33aaccab30 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,10 @@ +2002-05-24 John Levon + + * Makefile.am: + * font_loader.h: placeholder + + * screen.C: use placeholder + 2002-05-23 John Levon * Makefile.am: diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index fa8e058d2c..77ed4fba86 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -36,6 +36,7 @@ libfrontends_la_SOURCES = \ LyXView.h \ WorkArea.C \ WorkArea.h \ + font_loader.h \ font_metrics.h \ screen.C \ screen.h diff --git a/src/frontends/font_loader.h b/src/frontends/font_loader.h new file mode 100644 index 0000000000..4f169af00e --- /dev/null +++ b/src/frontends/font_loader.h @@ -0,0 +1,3 @@ +// very temporary + +#include "xforms/xfont_loader.h" diff --git a/src/frontends/screen.C b/src/frontends/screen.C index e25fc3e4c0..cd4d1d4162 100644 --- a/src/frontends/screen.C +++ b/src/frontends/screen.C @@ -25,7 +25,7 @@ #include "BufferView.h" #include "font_metrics.h" #include "insets/insettext.h" -#include "ColorHandler.h" +#include "frontends/xforms/ColorHandler.h" #include "language.h" using std::max; diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 1ae9c66670..6bad5ea2ba 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,16 @@ +2002-05-24 John Levon + + * ColorHandler.h: + * ColorHandler.C: + * FontInfo.h: + * FontInfo.C: moved here + + * xfont_loader.h: + * xfont_loader.C: moved here + + * Makefile.am: + * xfont_metrics.C: changes from above + 2002-05-23 John Levon * Makefile.am: diff --git a/src/ColorHandler.C b/src/frontends/xforms/ColorHandler.C similarity index 100% rename from src/ColorHandler.C rename to src/frontends/xforms/ColorHandler.C diff --git a/src/ColorHandler.h b/src/frontends/xforms/ColorHandler.h similarity index 100% rename from src/ColorHandler.h rename to src/frontends/xforms/ColorHandler.h diff --git a/src/FontInfo.C b/src/frontends/xforms/FontInfo.C similarity index 100% rename from src/FontInfo.C rename to src/frontends/xforms/FontInfo.C diff --git a/src/FontInfo.h b/src/frontends/xforms/FontInfo.h similarity index 100% rename from src/FontInfo.h rename to src/frontends/xforms/FontInfo.h diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index 6f4ee7dddd..54e1b57c9b 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -23,6 +23,8 @@ libxforms_la_SOURCES = \ bmtable.h \ Color.C \ Color.h \ + ColorHandler.C \ + ColorHandler.h \ combox.C \ combox.h \ Dialogs.C \ @@ -31,6 +33,8 @@ libxforms_la_SOURCES = \ FeedbackController.C \ FeedbackController.h \ FileDialog.C \ + FontInfo.C \ + FontInfo.h \ FormFiledialog.h \ FormFiledialog.C \ form_filedialog.C \ @@ -214,6 +218,8 @@ libxforms_la_SOURCES = \ XFormsView.h \ XPainter.C \ XPainter.h \ + xfont_loader.C \ + xfont_loader.h \ xfont_metrics.C \ xfont_metrics.h \ xforms_helpers.C \ diff --git a/src/FontLoader.C b/src/frontends/xforms/xfont_loader.C similarity index 99% rename from src/FontLoader.C rename to src/frontends/xforms/xfont_loader.C index 8d08bb9dd8..3abaf0da6e 100644 --- a/src/FontLoader.C +++ b/src/frontends/xforms/xfont_loader.C @@ -12,10 +12,10 @@ #include // fabs() #ifdef __GNUG__ -#pragma implementation "FontLoader.h" +#pragma implementation #endif -#include "FontLoader.h" +#include "xfont_loader.h" #include "FontInfo.h" #include "gettext.h" #include "debug.h" diff --git a/src/FontLoader.h b/src/frontends/xforms/xfont_loader.h similarity index 100% rename from src/FontLoader.h rename to src/frontends/xforms/xfont_loader.h diff --git a/src/frontends/xforms/xfont_metrics.C b/src/frontends/xforms/xfont_metrics.C index f1fce05a85..1ae46957cc 100644 --- a/src/frontends/xforms/xfont_metrics.C +++ b/src/frontends/xforms/xfont_metrics.C @@ -16,7 +16,7 @@ #include "support/lstrings.h" #include "xfont_metrics.h" -#include "FontLoader.h" +#include "xfont_loader.h" #include "lyxrc.h" #include "encoding.h" #include "language.h" diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index 76ba9558eb..f1ccf52968 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,7 @@ +2002-05-24 John Levon + + * GraphicsImageXPM.C: ColorHandler moved + 2002-05-24 Juergen Vigna * GraphicsCache.h: diff --git a/src/graphics/GraphicsImageXPM.C b/src/graphics/GraphicsImageXPM.C index 44850cbaf4..a757cd3fee 100644 --- a/src/graphics/GraphicsImageXPM.C +++ b/src/graphics/GraphicsImageXPM.C @@ -15,7 +15,7 @@ #include "GraphicsImageXPM.h" #include "GraphicsParams.h" -#include "ColorHandler.h" +#include "frontends/xforms/ColorHandler.h" #include "debug.h" #include "frontends/GUIRunTime.h" // x11Display, x11Screen #include "support/filetools.h" // IsFileReadable diff --git a/src/lyx_gui.C b/src/lyx_gui.C index 188757da4c..e15c83fcb4 100644 --- a/src/lyx_gui.C +++ b/src/lyx_gui.C @@ -30,7 +30,7 @@ #include "frontends/xforms/lyxlookup.h" #endif #include "bufferlist.h" -#include "ColorHandler.h" +#include "frontends/xforms/ColorHandler.h" #include "frontends/GUIRunTime.h" #include "frontends/xforms/xforms_helpers.h" // for XformColor diff --git a/src/lyxfont.C b/src/lyxfont.C index 4958015021..67c9241ffe 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -23,7 +23,7 @@ #include "lyxrc.h" #include "lyxlex.h" #include "language.h" -#include "FontLoader.h" +#include "frontends/font_loader.h" #include "support/lstrings.h" #include "bufferparams.h" // stateText diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 5035922300..0bcf32f667 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -20,7 +20,7 @@ #include "lyxrow.h" #include "bufferlist.h" #include "BufferView.h" -#include "ColorHandler.h" +#include "frontends/xforms/ColorHandler.h" #include "lyxserver.h" #include "intl.h" #include "lyx_main.h" @@ -41,7 +41,7 @@ #include "converter.h" #include "exporter.h" #include "importer.h" -#include "FontLoader.h" +#include "frontends/font_loader.h" #include "TextCache.h" #include "lyxfind.h" #include "undo_funcs.h" diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 0c9d225d96..0cd81a4c43 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2002-05-24 John Levon + + * math_support.C: font loader moved + 2002-05-24 John Levon * formulabase.C: diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index 624a3a8d61..6c2ba5c470 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -4,7 +4,7 @@ #include "math_support.h" #include "lyxfont.h" -#include "FontLoader.h" +#include "frontends/font_loader.h" #include "frontends/font_metrics.h" #include "math_cursor.h" #include "math_defs.h"