summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2022-12-11 11:00:08 -0800
committerGreg Ercolano <erco@seriss.com>2022-12-11 11:00:08 -0800
commit6a047855db3f2086771147682e4d09611b50cbe1 (patch)
tree60836c661c13b75bcaa633819d7fec19a358aee0
parent821d2fdf821cc4f8dd78865e6fe8e492a14468ef (diff)
Move utf-8 box drawing string into .cxx
It was decided today it is ok to use utf-8 strings in source, so consolidating.
-rw-r--r--test/unittest_unicode.cxx17
-rw-r--r--test/unittest_unicode_utf8.h14
2 files changed, 15 insertions, 16 deletions
diff --git a/test/unittest_unicode.cxx b/test/unittest_unicode.cxx
index 65cec32e5..65cea5628 100644
--- a/test/unittest_unicode.cxx
+++ b/test/unittest_unicode.cxx
@@ -14,6 +14,8 @@
// https://www.fltk.org/bugs.php
//
+// FLTK DEVS: utf-8 encoding must be enabled to edit this file.
+
#include "unittests.h"
#include <FL/Fl.H>
@@ -24,14 +26,25 @@
#include <FL/Fl_Hor_Value_Slider.H>
#include <FL/fl_draw.H>
-#include "unittest_unicode_utf8.h" // defines utf8_box_test[]
+static const char *utf8_box_test =
+ "╳╳ ██ ▏▏┏━━┓ ╔══╗ ╔═╦═╗ ██████\n"
+ "╳╳ ██ ▏▏┃ ┃ ║ ║ ╠═╬═╣ ██ ██\n"
+ "╳╳ ██ ▏▏┗━━┛ ╚══╝ ╚═╩═╝ ██████\n"
+ "\n"
+ "underbar: ______\n"
+ " overbar: ‾‾‾‾‾‾\n"
+ "\n"
+ "underbar/overbar alternate:\n"
+ "\n"
+ "___‾‾‾___‾‾‾___‾‾‾___‾‾‾___\n"
+ "‾‾‾___‾‾‾___‾‾‾___‾‾‾___‾‾‾\n";
+
static const char *helptext =
"In this test, ideally the box's lines should all be touching "
"without white space between. Underbar and overbars should both "
"be visible and not touching. All the above should be unaffected "
"by different font sizes and font settings.";
-
class UnicodeBoxTest : public Fl_Group {
Fl_Text_Buffer *textbuffer;
Fl_Text_Display *textdisplay;
diff --git a/test/unittest_unicode_utf8.h b/test/unittest_unicode_utf8.h
deleted file mode 100644
index d2504fb76..000000000
--- a/test/unittest_unicode_utf8.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// FLTK DEVS: utf-8 encoding must be enabled to edit this file.
-
-static const char *utf8_box_test =
- "╳╳ ██ ▏▏┏━━┓ ╔══╗ ╔═╦═╗ ██████\n"
- "╳╳ ██ ▏▏┃ ┃ ║ ║ ╠═╬═╣ ██ ██\n"
- "╳╳ ██ ▏▏┗━━┛ ╚══╝ ╚═╩═╝ ██████\n"
- "\n"
- "underbar: ______\n"
- " overbar: ‾‾‾‾‾‾\n"
- "\n"
- "underbar/overbar alternate:\n"
- "\n"
- "___‾‾‾___‾‾‾___‾‾‾___‾‾‾___\n"
- "‾‾‾___‾‾‾___‾‾‾___‾‾‾___‾‾‾\n";