From 4d503899a3dec9df8380b3981f1a7259e9d6cb8c Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Sat, 19 Sep 2020 10:43:27 -0700 Subject: [PATCH] Mods for Albrecht's 09/19/20 code review --- fluid/CodeEditor.h | 6 +++--- fluid/StyleParse.cxx | 3 ++- fluid/StyleParse.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fluid/CodeEditor.h b/fluid/CodeEditor.h index 7b7955991..bf4b7b499 100644 --- a/fluid/CodeEditor.h +++ b/fluid/CodeEditor.h @@ -1,7 +1,7 @@ // // Code editor widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2020 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -31,6 +31,8 @@ #include "StyleParse.h" class CodeEditor : public Fl_Text_Editor { + friend class StyleParse; + static Fl_Text_Display::Style_Table_Entry styletable[]; // 'style_parse()' - Parse text and produce style data. @@ -54,8 +56,6 @@ class CodeEditor : public Fl_Text_Editor { // attempt to make the fluid code editor widget honour textsize setting void textsize(Fl_Fontsize s); - - friend class StyleParse; }; class CodeViewer : public CodeEditor { diff --git a/fluid/StyleParse.cxx b/fluid/StyleParse.cxx index 97b797eaf..043f2c837 100644 --- a/fluid/StyleParse.cxx +++ b/fluid/StyleParse.cxx @@ -1,7 +1,8 @@ // -// Syntax highlighting style parser class - erco 09/16/2020 +// Syntax highlighting for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2020 by Bill Spitzak and others. +// Copyright 2020 Greg Ercolano. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this diff --git a/fluid/StyleParse.h b/fluid/StyleParse.h index e243a7e47..97755d637 100644 --- a/fluid/StyleParse.h +++ b/fluid/StyleParse.h @@ -1,7 +1,8 @@ // -// Syntax highlighting style parser class - erco 09/16/2020 +// Syntax highlighting for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2020 by Bill Spitzak and others. +// Copyright 2020 Greg Ercolano. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -56,4 +57,4 @@ public: int parse_all_else(); // all other code }; -#endif //StyleParse_h +#endif // StyleParse_h