467 files changed, 769 insertions, 167 deletions

diff --git a/body/c_fl.cpp b/body/c_fl.cpp
new file mode 100644
index 0000000..ec5f7e5
--- /dev/null
+++ b/body/c_fl.cpp
@@ -0,0 +1,134 @@
+
+
+//  Programmed by Jedidiah Barber
+//  Released into the public domain
+
+
+#include <FL/Enumerations.H>
+#include <FL/Fl.H>
+#include "c_fl.h"
+
+
+
+
+const short fl_align_center             = FL_ALIGN_CENTER;
+const short fl_align_top                = FL_ALIGN_TOP;
+const short fl_align_bottom             = FL_ALIGN_BOTTOM;
+const short fl_align_left               = FL_ALIGN_LEFT;
+const short fl_align_right              = FL_ALIGN_RIGHT;
+const short fl_align_inside             = FL_ALIGN_INSIDE;
+const short fl_align_text_over_image    = FL_ALIGN_TEXT_OVER_IMAGE;
+const short fl_align_image_over_text    = FL_ALIGN_IMAGE_OVER_TEXT;
+const short fl_align_clip               = FL_ALIGN_CLIP;
+const short fl_align_wrap               = FL_ALIGN_WRAP;
+const short fl_align_image_next_to_text = FL_ALIGN_IMAGE_NEXT_TO_TEXT;
+const short fl_align_text_next_to_image = FL_ALIGN_TEXT_NEXT_TO_IMAGE;
+const short fl_align_image_backdrop     = FL_ALIGN_IMAGE_BACKDROP;
+const short fl_align_top_left           = FL_ALIGN_TOP_LEFT;
+const short fl_align_top_right          = FL_ALIGN_TOP_RIGHT;
+const short fl_align_bottom_left        = FL_ALIGN_BOTTOM_LEFT;
+const short fl_align_bottom_right       = FL_ALIGN_BOTTOM_RIGHT;
+const short fl_align_left_top           = FL_ALIGN_LEFT_TOP;
+const short fl_align_right_top          = FL_ALIGN_RIGHT_TOP;
+const short fl_align_left_bottom        = FL_ALIGN_LEFT_BOTTOM;
+const short fl_align_right_bottom       = FL_ALIGN_RIGHT_BOTTOM;
+const short fl_align_nowrap             = FL_ALIGN_NOWRAP;
+const short fl_align_all_position       = FL_ALIGN_POSITION_MASK;
+const short fl_align_all_image          = FL_ALIGN_IMAGE_MASK;
+
+
+
+
+const short fl_mod_command = FL_COMMAND >> 16;
+
+
+
+
+size_t c_pointer_size() {
+    return sizeof(void*);
+}
+
+
+
+
+unsigned int fl_enum_rgb_color(unsigned char r, unsigned char g, unsigned char b) {
+    return fl_rgb_color(r, g, b);
+}
+
+
+
+
+int fl_abi_check(int v) {
+    return Fl::abi_check(v);
+}
+
+int fl_abi_version() {
+    return Fl::abi_version();
+}
+
+int fl_api_version() {
+    return Fl::api_version();
+}
+
+double fl_version() {
+    return Fl::version();
+}
+
+
+
+
+void fl_awake() {
+    Fl::awake();
+}
+
+void fl_lock() {
+    Fl::lock();
+}
+
+void fl_unlock() {
+    Fl::unlock();
+}
+
+
+
+
+int fl_get_damage() {
+    return Fl::damage();
+}
+
+void fl_set_damage(int v) {
+    Fl::damage(v);
+}
+
+void fl_flush() {
+    Fl::flush();
+}
+
+void fl_redraw() {
+    Fl::redraw();
+}
+
+
+
+
+int fl_check() {
+    return Fl::check();
+}
+
+int fl_ready() {
+    return Fl::ready();
+}
+
+int fl_wait() {
+    return Fl::wait();
+}
+
+int fl_wait2(double s) {
+    return Fl::wait(s);
+}
+
+int fl_run() {
+    return Fl::run();
+}
+
+
diff --git a/body/c_fl.h b/body/c_fl.h
new file mode 100644
index 0000000..9f79979
--- /dev/null
+++ b/body/c_fl.h
@@ -0,0 +1,72 @@
+
+
+//  Programmed by Jedidiah Barber
+//  Released into the public domain
+
+
+#ifndef FL_GUARD
+#define FL_GUARD
+
+
+extern "C" const short fl_align_center;
+extern "C" const short fl_align_top;
+extern "C" const short fl_align_bottom;
+extern "C" const short fl_align_left;
+extern "C" const short fl_align_right;
+extern "C" const short fl_align_inside;
+extern "C" const short fl_align_text_over_image;
+extern "C" const short fl_align_image_over_text;
+extern "C" const short fl_align_clip;
+extern "C" const short fl_align_wrap;
+extern "C" const short fl_align_image_next_to_text;
+extern "C" const short fl_align_text_next_to_image;
+extern "C" const short fl_align_image_backdrop;
+extern "C" const short fl_align_top_left;
+extern "C" const short fl_align_top_right;
+extern "C" const short fl_align_bottom_left;
+extern "C" const short fl_align_bottom_right;
+extern "C" const short fl_align_left_top;
+extern "C" const short fl_align_right_top;
+extern "C" const short fl_align_left_bottom;
+extern "C" const short fl_align_right_bottom;
+extern "C" const short fl_align_nowrap;
+extern "C" const short fl_align_all_position;
+extern "C" const short fl_align_all_image;
+
+
+extern "C" const short fl_mod_command;
+
+
+extern "C" size_t c_pointer_size();
+
+
+extern "C" unsigned int fl_enum_rgb_color(unsigned char r, unsigned char g, unsigned char b);
+
+
+extern "C" int fl_abi_check(int v);
+extern "C" int fl_abi_version();
+extern "C" int fl_api_version();
+extern "C" double fl_version();
+
+
+extern "C" void fl_awake();
+extern "C" void fl_lock();
+extern "C" void fl_unlock();
+
+
+extern "C" int fl_get_damage();
+extern "C" void fl_set_damage(int v);
+extern "C" void fl_flush();
+extern "C" void fl_redraw();
+
+
+extern "C" int fl_check();
+extern "C" int fl_ready();
+extern "C" int fl_wait();
+extern "C" int fl_wait2(double s);
+extern "C" int fl_run();
+
+
+#endif
+
+
diff --git a/src/c_fl_adjuster.cpp b/body/c_fl_adjuster.cpp
index 37a52cd..37a52cd 100644
--- a/src/c_fl_adjuster.cpp
+++ b/body/c_fl_adjuster.cpp
diff --git a/src/c_fl_adjuster.h b/body/c_fl_adjuster.h
index fbaa5ec..fbaa5ec 100644
--- a/src/c_fl_adjuster.h
+++ b/body/c_fl_adjuster.h
diff --git a/src/c_fl_ask.cpp b/body/c_fl_ask.cpp
index 20af2e3..20af2e3 100644
--- a/src/c_fl_ask.cpp
+++ b/body/c_fl_ask.cpp
diff --git a/src/c_fl_ask.h b/body/c_fl_ask.h
index f68bc85..f68bc85 100644
--- a/src/c_fl_ask.h
+++ b/body/c_fl_ask.h
diff --git a/src/c_fl_bitmap.cpp b/body/c_fl_bitmap.cpp
index 01077b2..01077b2 100644
--- a/src/c_fl_bitmap.cpp
+++ b/body/c_fl_bitmap.cpp
diff --git a/src/c_fl_bitmap.h b/body/c_fl_bitmap.h
index f5f6e15..f5f6e15 100644
--- a/src/c_fl_bitmap.h
+++ b/body/c_fl_bitmap.h
diff --git a/src/c_fl_bmp_image.cpp b/body/c_fl_bmp_image.cpp
index f068b8f..f068b8f 100644
--- a/src/c_fl_bmp_image.cpp
+++ b/body/c_fl_bmp_image.cpp
diff --git a/src/c_fl_bmp_image.h b/body/c_fl_bmp_image.h
index e857fb7..e857fb7 100644
--- a/src/c_fl_bmp_image.h
+++ b/body/c_fl_bmp_image.h
diff --git a/src/c_fl_box.cpp b/body/c_fl_box.cpp
index e9c170d..e9c170d 100644
--- a/src/c_fl_box.cpp
+++ b/body/c_fl_box.cpp
diff --git a/src/c_fl_box.h b/body/c_fl_box.h
index 5143c3f..5143c3f 100644
--- a/src/c_fl_box.h
+++ b/body/c_fl_box.h
diff --git a/src/c_fl_browser.cpp b/body/c_fl_browser.cpp
index bf700b7..bf700b7 100644
--- a/src/c_fl_browser.cpp
+++ b/body/c_fl_browser.cpp
diff --git a/src/c_fl_browser.h b/body/c_fl_browser.h
index 2729303..2729303 100644
--- a/src/c_fl_browser.h
+++ b/body/c_fl_browser.h
diff --git a/src/c_fl_browser_.cpp b/body/c_fl_browser_.cpp
index 58eaa3d..58eaa3d 100644
--- a/src/c_fl_browser_.cpp
+++ b/body/c_fl_browser_.cpp
diff --git a/src/c_fl_browser_.h b/body/c_fl_browser_.h
index ed1157e..ed1157e 100644
--- a/src/c_fl_browser_.h
+++ b/body/c_fl_browser_.h
diff --git a/src/c_fl_button.cpp b/body/c_fl_button.cpp
index 409b190..409b190 100644
--- a/src/c_fl_button.cpp
+++ b/body/c_fl_button.cpp
diff --git a/src/c_fl_button.h b/body/c_fl_button.h
index f644a50..f644a50 100644
--- a/src/c_fl_button.h
+++ b/body/c_fl_button.h
diff --git a/src/c_fl_cairo_window.cpp b/body/c_fl_cairo_window.cpp
index 4bf75f0..4bf75f0 100644
--- a/src/c_fl_cairo_window.cpp
+++ b/body/c_fl_cairo_window.cpp
diff --git a/src/c_fl_cairo_window.h b/body/c_fl_cairo_window.h
index d004d16..d004d16 100644
--- a/src/c_fl_cairo_window.h
+++ b/body/c_fl_cairo_window.h
diff --git a/src/c_fl_chart.cpp b/body/c_fl_chart.cpp
index c065327..c065327 100644
--- a/src/c_fl_chart.cpp
+++ b/body/c_fl_chart.cpp
diff --git a/src/c_fl_chart.h b/body/c_fl_chart.h
index bd524c3..bd524c3 100644
--- a/src/c_fl_chart.h
+++ b/body/c_fl_chart.h
diff --git a/src/c_fl_check_browser.cpp b/body/c_fl_check_browser.cpp
index 947dc63..947dc63 100644
--- a/src/c_fl_check_browser.cpp
+++ b/body/c_fl_check_browser.cpp
diff --git a/src/c_fl_check_browser.h b/body/c_fl_check_browser.h
index e9e832e..e9e832e 100644
--- a/src/c_fl_check_browser.h
+++ b/body/c_fl_check_browser.h
diff --git a/src/c_fl_check_button.cpp b/body/c_fl_check_button.cpp
index 8dab449..8dab449 100644
--- a/src/c_fl_check_button.cpp
+++ b/body/c_fl_check_button.cpp
diff --git a/src/c_fl_check_button.h b/body/c_fl_check_button.h
index cfa6bff..cfa6bff 100644
--- a/src/c_fl_check_button.h
+++ b/body/c_fl_check_button.h
diff --git a/src/c_fl_choice.cpp b/body/c_fl_choice.cpp
index 4b03532..4b03532 100644
--- a/src/c_fl_choice.cpp
+++ b/body/c_fl_choice.cpp
diff --git a/src/c_fl_choice.h b/body/c_fl_choice.h
index 031e67e..031e67e 100644
--- a/src/c_fl_choice.h
+++ b/body/c_fl_choice.h
diff --git a/src/c_fl_clock.cpp b/body/c_fl_clock.cpp
index e2df99c..e2df99c 100644
--- a/src/c_fl_clock.cpp
+++ b/body/c_fl_clock.cpp
diff --git a/src/c_fl_clock.h b/body/c_fl_clock.h
index 4b07d7e..4b07d7e 100644
--- a/src/c_fl_clock.h
+++ b/body/c_fl_clock.h
diff --git a/src/c_fl_clock_output.cpp b/body/c_fl_clock_output.cpp
index a34b1c4..a34b1c4 100644
--- a/src/c_fl_clock_output.cpp
+++ b/body/c_fl_clock_output.cpp
diff --git a/src/c_fl_clock_output.h b/body/c_fl_clock_output.h
index 6098b25..6098b25 100644
--- a/src/c_fl_clock_output.h
+++ b/body/c_fl_clock_output.h
diff --git a/src/c_fl_color_chooser.cpp b/body/c_fl_color_chooser.cpp
index 31551b8..31551b8 100644
--- a/src/c_fl_color_chooser.cpp
+++ b/body/c_fl_color_chooser.cpp
diff --git a/src/c_fl_color_chooser.h b/body/c_fl_color_chooser.h
index 22f9bc7..22f9bc7 100644
--- a/src/c_fl_color_chooser.h
+++ b/body/c_fl_color_chooser.h
diff --git a/src/c_fl_copy_surface.cpp b/body/c_fl_copy_surface.cpp
index a13b314..a13b314 100644
--- a/src/c_fl_copy_surface.cpp
+++ b/body/c_fl_copy_surface.cpp
diff --git a/src/c_fl_copy_surface.h b/body/c_fl_copy_surface.h
index 81d14b8..81d14b8 100644
--- a/src/c_fl_copy_surface.h
+++ b/body/c_fl_copy_surface.h
diff --git a/src/c_fl_counter.cpp b/body/c_fl_counter.cpp
index 9fe5d20..9fe5d20 100644
--- a/src/c_fl_counter.cpp
+++ b/body/c_fl_counter.cpp
diff --git a/src/c_fl_counter.h b/body/c_fl_counter.h
index b5b4a8b..b5b4a8b 100644
--- a/src/c_fl_counter.h
+++ b/body/c_fl_counter.h
diff --git a/src/c_fl_dial.cpp b/body/c_fl_dial.cpp
index af83c21..af83c21 100644
--- a/src/c_fl_dial.cpp
+++ b/body/c_fl_dial.cpp
diff --git a/src/c_fl_dial.h b/body/c_fl_dial.h
index b642abd..b642abd 100644
--- a/src/c_fl_dial.h
+++ b/body/c_fl_dial.h
diff --git a/src/c_fl_display_device.cpp b/body/c_fl_display_device.cpp
index f4f53bf..f4f53bf 100644
--- a/src/c_fl_display_device.cpp
+++ b/body/c_fl_display_device.cpp
diff --git a/src/c_fl_display_device.h b/body/c_fl_display_device.h
index 1cf530c..1cf530c 100644
--- a/src/c_fl_display_device.h
+++ b/body/c_fl_display_device.h
diff --git a/src/c_fl_double_window.cpp b/body/c_fl_double_window.cpp
index 67db73b..67db73b 100644
--- a/src/c_fl_double_window.cpp
+++ b/body/c_fl_double_window.cpp
diff --git a/src/c_fl_double_window.h b/body/c_fl_double_window.h
index c6f4cc8..c6f4cc8 100644
--- a/src/c_fl_double_window.h
+++ b/body/c_fl_double_window.h
diff --git a/src/c_fl_draw.cpp b/body/c_fl_draw.cpp
index 488a73f..488a73f 100644
--- a/src/c_fl_draw.cpp
+++ b/body/c_fl_draw.cpp
diff --git a/src/c_fl_draw.h b/body/c_fl_draw.h
index d719903..d719903 100644
--- a/src/c_fl_draw.h
+++ b/body/c_fl_draw.h
diff --git a/src/c_fl_error.cpp b/body/c_fl_error.cpp
index e38481a..e38481a 100644
--- a/src/c_fl_error.cpp
+++ b/body/c_fl_error.cpp
diff --git a/src/c_fl_error.h b/body/c_fl_error.h
index 1d4bc76..1d4bc76 100644
--- a/src/c_fl_error.h
+++ b/body/c_fl_error.h
diff --git a/src/c_fl_event.cpp b/body/c_fl_event.cpp
index 59a22df..59a22df 100644
--- a/src/c_fl_event.cpp
+++ b/body/c_fl_event.cpp
diff --git a/src/c_fl_event.h b/body/c_fl_event.h
index cc1f930..cc1f930 100644
--- a/src/c_fl_event.h
+++ b/body/c_fl_event.h
diff --git a/src/c_fl_file_browser.cpp b/body/c_fl_file_browser.cpp
index 2e4f4c9..2e4f4c9 100644
--- a/src/c_fl_file_browser.cpp
+++ b/body/c_fl_file_browser.cpp
diff --git a/src/c_fl_file_browser.h b/body/c_fl_file_browser.h
index 67e1489..67e1489 100644
--- a/src/c_fl_file_browser.h
+++ b/body/c_fl_file_browser.h
diff --git a/src/c_fl_file_chooser.cpp b/body/c_fl_file_chooser.cpp
index bdb35b0..bdb35b0 100644
--- a/src/c_fl_file_chooser.cpp
+++ b/body/c_fl_file_chooser.cpp
diff --git a/src/c_fl_file_chooser.h b/body/c_fl_file_chooser.h
index 17ee63c..17ee63c 100644
--- a/src/c_fl_file_chooser.h
+++ b/body/c_fl_file_chooser.h
diff --git a/src/c_fl_file_input.cpp b/body/c_fl_file_input.cpp
index 8d0b15f..8d0b15f 100644
--- a/src/c_fl_file_input.cpp
+++ b/body/c_fl_file_input.cpp
diff --git a/src/c_fl_file_input.h b/body/c_fl_file_input.h
index df05cbb..df05cbb 100644
--- a/src/c_fl_file_input.h
+++ b/body/c_fl_file_input.h
diff --git a/src/c_fl_filename.cpp b/body/c_fl_filename.cpp
index 300f4ff..300f4ff 100644
--- a/src/c_fl_filename.cpp
+++ b/body/c_fl_filename.cpp
diff --git a/src/c_fl_filename.h b/body/c_fl_filename.h
index 0839293..0839293 100644
--- a/src/c_fl_filename.h
+++ b/body/c_fl_filename.h
diff --git a/src/c_fl_fill_dial.cpp b/body/c_fl_fill_dial.cpp
index 47833c1..47833c1 100644
--- a/src/c_fl_fill_dial.cpp
+++ b/body/c_fl_fill_dial.cpp
diff --git a/src/c_fl_fill_dial.h b/body/c_fl_fill_dial.h
index 00a8094..00a8094 100644
--- a/src/c_fl_fill_dial.h
+++ b/body/c_fl_fill_dial.h
diff --git a/src/c_fl_fill_slider.cpp b/body/c_fl_fill_slider.cpp
index 49834d4..49834d4 100644
--- a/src/c_fl_fill_slider.cpp
+++ b/body/c_fl_fill_slider.cpp
diff --git a/src/c_fl_fill_slider.h b/body/c_fl_fill_slider.h
index d208d93..d208d93 100644
--- a/src/c_fl_fill_slider.h
+++ b/body/c_fl_fill_slider.h
diff --git a/src/c_fl_float_input.cpp b/body/c_fl_float_input.cpp
index eedfa36..eedfa36 100644
--- a/src/c_fl_float_input.cpp
+++ b/body/c_fl_float_input.cpp
diff --git a/src/c_fl_float_input.h b/body/c_fl_float_input.h
index 5ee1689..5ee1689 100644
--- a/src/c_fl_float_input.h
+++ b/body/c_fl_float_input.h
diff --git a/src/c_fl_gif_image.cpp b/body/c_fl_gif_image.cpp
index 9ab5519..9ab5519 100644
--- a/src/c_fl_gif_image.cpp
+++ b/body/c_fl_gif_image.cpp
diff --git a/src/c_fl_gif_image.h b/body/c_fl_gif_image.h
index 4d340cd..4d340cd 100644
--- a/src/c_fl_gif_image.h
+++ b/body/c_fl_gif_image.h
diff --git a/src/c_fl_gl_window.cpp b/body/c_fl_gl_window.cpp
index 3d6cbd5..3d6cbd5 100644
--- a/src/c_fl_gl_window.cpp
+++ b/body/c_fl_gl_window.cpp
diff --git a/src/c_fl_gl_window.h b/body/c_fl_gl_window.h
index 6177db6..6177db6 100644
--- a/src/c_fl_gl_window.h
+++ b/body/c_fl_gl_window.h
diff --git a/src/c_fl_graphics_driver.cpp b/body/c_fl_graphics_driver.cpp
index 56bcf62..56bcf62 100644
--- a/src/c_fl_graphics_driver.cpp
+++ b/body/c_fl_graphics_driver.cpp
diff --git a/src/c_fl_graphics_driver.h b/body/c_fl_graphics_driver.h
index e070235..e070235 100644
--- a/src/c_fl_graphics_driver.h
+++ b/body/c_fl_graphics_driver.h
diff --git a/src/c_fl_group.cpp b/body/c_fl_group.cpp
index 62bee03..62bee03 100644
--- a/src/c_fl_group.cpp
+++ b/body/c_fl_group.cpp
diff --git a/src/c_fl_group.h b/body/c_fl_group.h
index af4559d..af4559d 100644
--- a/src/c_fl_group.h
+++ b/body/c_fl_group.h
diff --git a/src/c_fl_help_dialog.cpp b/body/c_fl_help_dialog.cpp
index 850fb07..850fb07 100644
--- a/src/c_fl_help_dialog.cpp
+++ b/body/c_fl_help_dialog.cpp
diff --git a/src/c_fl_help_dialog.h b/body/c_fl_help_dialog.h
index ddabce8..ddabce8 100644
--- a/src/c_fl_help_dialog.h
+++ b/body/c_fl_help_dialog.h
diff --git a/src/c_fl_help_view.cpp b/body/c_fl_help_view.cpp
index aa2fd65..aa2fd65 100644
--- a/src/c_fl_help_view.cpp
+++ b/body/c_fl_help_view.cpp
diff --git a/src/c_fl_help_view.h b/body/c_fl_help_view.h
index b16b344..b16b344 100644
--- a/src/c_fl_help_view.h
+++ b/body/c_fl_help_view.h
diff --git a/src/c_fl_hold_browser.cpp b/body/c_fl_hold_browser.cpp
index 023e9ec..023e9ec 100644
--- a/src/c_fl_hold_browser.cpp
+++ b/body/c_fl_hold_browser.cpp
diff --git a/src/c_fl_hold_browser.h b/body/c_fl_hold_browser.h
index 6f295c6..6f295c6 100644
--- a/src/c_fl_hold_browser.h
+++ b/body/c_fl_hold_browser.h
diff --git a/src/c_fl_hor_fill_slider.cpp b/body/c_fl_hor_fill_slider.cpp
index 9cd6ae2..9cd6ae2 100644
--- a/src/c_fl_hor_fill_slider.cpp
+++ b/body/c_fl_hor_fill_slider.cpp
diff --git a/src/c_fl_hor_fill_slider.h b/body/c_fl_hor_fill_slider.h
index d698a93..d698a93 100644
--- a/src/c_fl_hor_fill_slider.h
+++ b/body/c_fl_hor_fill_slider.h
diff --git a/src/c_fl_hor_nice_slider.cpp b/body/c_fl_hor_nice_slider.cpp
index 29b271d..29b271d 100644
--- a/src/c_fl_hor_nice_slider.cpp
+++ b/body/c_fl_hor_nice_slider.cpp
diff --git a/src/c_fl_hor_nice_slider.h b/body/c_fl_hor_nice_slider.h
index a4e3bc1..a4e3bc1 100644
--- a/src/c_fl_hor_nice_slider.h
+++ b/body/c_fl_hor_nice_slider.h
diff --git a/src/c_fl_hor_value_slider.cpp b/body/c_fl_hor_value_slider.cpp
index cff16f6..cff16f6 100644
--- a/src/c_fl_hor_value_slider.cpp
+++ b/body/c_fl_hor_value_slider.cpp
diff --git a/src/c_fl_hor_value_slider.h b/body/c_fl_hor_value_slider.h
index 6257313..6257313 100644
--- a/src/c_fl_hor_value_slider.h
+++ b/body/c_fl_hor_value_slider.h
diff --git a/src/c_fl_horizontal_slider.cpp b/body/c_fl_horizontal_slider.cpp
index 6a0ac22..6a0ac22 100644
--- a/src/c_fl_horizontal_slider.cpp
+++ b/body/c_fl_horizontal_slider.cpp
diff --git a/src/c_fl_horizontal_slider.h b/body/c_fl_horizontal_slider.h
index 96dd11a..96dd11a 100644
--- a/src/c_fl_horizontal_slider.h
+++ b/body/c_fl_horizontal_slider.h
diff --git a/src/c_fl_image.cpp b/body/c_fl_image.cpp
index 328c187..328c187 100644
--- a/src/c_fl_image.cpp
+++ b/body/c_fl_image.cpp
diff --git a/src/c_fl_image.h b/body/c_fl_image.h
index ee96b7a..ee96b7a 100644
--- a/src/c_fl_image.h
+++ b/body/c_fl_image.h
diff --git a/src/c_fl_image_surface.cpp b/body/c_fl_image_surface.cpp
index 51df5fb..51df5fb 100644
--- a/src/c_fl_image_surface.cpp
+++ b/body/c_fl_image_surface.cpp
diff --git a/src/c_fl_image_surface.h b/body/c_fl_image_surface.h
index a4ffd65..a4ffd65 100644
--- a/src/c_fl_image_surface.h
+++ b/body/c_fl_image_surface.h
diff --git a/src/c_fl_input.cpp b/body/c_fl_input.cpp
index 6fa6b2d..6fa6b2d 100644
--- a/src/c_fl_input.cpp
+++ b/body/c_fl_input.cpp
diff --git a/src/c_fl_input.h b/body/c_fl_input.h
index 06a8a0c..06a8a0c 100644
--- a/src/c_fl_input.h
+++ b/body/c_fl_input.h
diff --git a/src/c_fl_input_.cpp b/body/c_fl_input_.cpp
index 7fe0556..7fe0556 100644
--- a/src/c_fl_input_.cpp
+++ b/body/c_fl_input_.cpp
diff --git a/src/c_fl_input_.h b/body/c_fl_input_.h
index 689894e..689894e 100644
--- a/src/c_fl_input_.h
+++ b/body/c_fl_input_.h
diff --git a/src/c_fl_input_choice.cpp b/body/c_fl_input_choice.cpp
index 247e8eb..247e8eb 100644
--- a/src/c_fl_input_choice.cpp
+++ b/body/c_fl_input_choice.cpp
diff --git a/src/c_fl_input_choice.h b/body/c_fl_input_choice.h
index a7ee0c3..a7ee0c3 100644
--- a/src/c_fl_input_choice.h
+++ b/body/c_fl_input_choice.h
diff --git a/src/c_fl_int_input.cpp b/body/c_fl_int_input.cpp
index 8f780d7..8f780d7 100644
--- a/src/c_fl_int_input.cpp
+++ b/body/c_fl_int_input.cpp
diff --git a/src/c_fl_int_input.h b/body/c_fl_int_input.h
index e36cfaa..e36cfaa 100644
--- a/src/c_fl_int_input.h
+++ b/body/c_fl_int_input.h
diff --git a/src/c_fl_jpeg_image.cpp b/body/c_fl_jpeg_image.cpp
index 63cbe8d..63cbe8d 100644
--- a/src/c_fl_jpeg_image.cpp
+++ b/body/c_fl_jpeg_image.cpp
diff --git a/src/c_fl_jpeg_image.h b/body/c_fl_jpeg_image.h
index 013ae37..013ae37 100644
--- a/src/c_fl_jpeg_image.h
+++ b/body/c_fl_jpeg_image.h
diff --git a/src/c_fl_label.cpp b/body/c_fl_label.cpp
index 2200c51..2200c51 100644
--- a/src/c_fl_label.cpp
+++ b/body/c_fl_label.cpp
diff --git a/src/c_fl_label.h b/body/c_fl_label.h
index 806aa72..806aa72 100644
--- a/src/c_fl_label.h
+++ b/body/c_fl_label.h
diff --git a/src/c_fl_light_button.cpp b/body/c_fl_light_button.cpp
index e11ce64..e11ce64 100644
--- a/src/c_fl_light_button.cpp
+++ b/body/c_fl_light_button.cpp
diff --git a/src/c_fl_light_button.h b/body/c_fl_light_button.h
index 5d604d2..5d604d2 100644
--- a/src/c_fl_light_button.h
+++ b/body/c_fl_light_button.h
diff --git a/src/c_fl_line_dial.cpp b/body/c_fl_line_dial.cpp
index 388264f..388264f 100644
--- a/src/c_fl_line_dial.cpp
+++ b/body/c_fl_line_dial.cpp
diff --git a/src/c_fl_line_dial.h b/body/c_fl_line_dial.h
index f7b49ca..f7b49ca 100644
--- a/src/c_fl_line_dial.h
+++ b/body/c_fl_line_dial.h
diff --git a/src/c_fl_menu.cpp b/body/c_fl_menu.cpp
index e42e985..e42e985 100644
--- a/src/c_fl_menu.cpp
+++ b/body/c_fl_menu.cpp
diff --git a/src/c_fl_menu.h b/body/c_fl_menu.h
index 17ae326..17ae326 100644
--- a/src/c_fl_menu.h
+++ b/body/c_fl_menu.h
diff --git a/src/c_fl_menu_bar.cpp b/body/c_fl_menu_bar.cpp
index 5e73675..5e73675 100644
--- a/src/c_fl_menu_bar.cpp
+++ b/body/c_fl_menu_bar.cpp
diff --git a/src/c_fl_menu_bar.h b/body/c_fl_menu_bar.h
index ae99467..ae99467 100644
--- a/src/c_fl_menu_bar.h
+++ b/body/c_fl_menu_bar.h
diff --git a/src/c_fl_menu_button.cpp b/body/c_fl_menu_button.cpp
index abe9712..abe9712 100644
--- a/src/c_fl_menu_button.cpp
+++ b/body/c_fl_menu_button.cpp
diff --git a/src/c_fl_menu_button.h b/body/c_fl_menu_button.h
index d567e4f..d567e4f 100644
--- a/src/c_fl_menu_button.h
+++ b/body/c_fl_menu_button.h
diff --git a/src/c_fl_menu_window.cpp b/body/c_fl_menu_window.cpp
index cae1bf9..cae1bf9 100644
--- a/src/c_fl_menu_window.cpp
+++ b/body/c_fl_menu_window.cpp
diff --git a/src/c_fl_menu_window.h b/body/c_fl_menu_window.h
index 020a377..020a377 100644
--- a/src/c_fl_menu_window.h
+++ b/body/c_fl_menu_window.h
diff --git a/src/c_fl_menuitem.cpp b/body/c_fl_menuitem.cpp
index b72c065..b72c065 100644
--- a/src/c_fl_menuitem.cpp
+++ b/body/c_fl_menuitem.cpp
diff --git a/src/c_fl_menuitem.h b/body/c_fl_menuitem.h
index 1e63c60..1e63c60 100644
--- a/src/c_fl_menuitem.h
+++ b/body/c_fl_menuitem.h
diff --git a/src/c_fl_multi_browser.cpp b/body/c_fl_multi_browser.cpp
index 18bf5e8..18bf5e8 100644
--- a/src/c_fl_multi_browser.cpp
+++ b/body/c_fl_multi_browser.cpp
diff --git a/src/c_fl_multi_browser.h b/body/c_fl_multi_browser.h
index 29d18ec..29d18ec 100644
--- a/src/c_fl_multi_browser.h
+++ b/body/c_fl_multi_browser.h
diff --git a/src/c_fl_multiline_input.cpp b/body/c_fl_multiline_input.cpp
index ee99a13..ee99a13 100644
--- a/src/c_fl_multiline_input.cpp
+++ b/body/c_fl_multiline_input.cpp
diff --git a/src/c_fl_multiline_input.h b/body/c_fl_multiline_input.h
index ba4e723..ba4e723 100644
--- a/src/c_fl_multiline_input.h
+++ b/body/c_fl_multiline_input.h
diff --git a/src/c_fl_multiline_output.cpp b/body/c_fl_multiline_output.cpp
index 2401fc7..2401fc7 100644
--- a/src/c_fl_multiline_output.cpp
+++ b/body/c_fl_multiline_output.cpp
diff --git a/src/c_fl_multiline_output.h b/body/c_fl_multiline_output.h
index 43fee90..43fee90 100644
--- a/src/c_fl_multiline_output.h
+++ b/body/c_fl_multiline_output.h
diff --git a/src/c_fl_nice_slider.cpp b/body/c_fl_nice_slider.cpp
index 082bbfc..082bbfc 100644
--- a/src/c_fl_nice_slider.cpp
+++ b/body/c_fl_nice_slider.cpp
diff --git a/src/c_fl_nice_slider.h b/body/c_fl_nice_slider.h
index 2da3207..2da3207 100644
--- a/src/c_fl_nice_slider.h
+++ b/body/c_fl_nice_slider.h
diff --git a/src/c_fl_output.cpp b/body/c_fl_output.cpp
index 2e937dd..2e937dd 100644
--- a/src/c_fl_output.cpp
+++ b/body/c_fl_output.cpp
diff --git a/src/c_fl_output.h b/body/c_fl_output.h
index 174c32e..174c32e 100644
--- a/src/c_fl_output.h
+++ b/body/c_fl_output.h
diff --git a/src/c_fl_overlay_window.cpp b/body/c_fl_overlay_window.cpp
index 0d434c3..0d434c3 100644
--- a/src/c_fl_overlay_window.cpp
+++ b/body/c_fl_overlay_window.cpp
diff --git a/src/c_fl_overlay_window.h b/body/c_fl_overlay_window.h
index a94bbec..a94bbec 100644
--- a/src/c_fl_overlay_window.h
+++ b/body/c_fl_overlay_window.h
diff --git a/src/c_fl_pack.cpp b/body/c_fl_pack.cpp
index e7cace9..e7cace9 100644
--- a/src/c_fl_pack.cpp
+++ b/body/c_fl_pack.cpp
diff --git a/src/c_fl_pack.h b/body/c_fl_pack.h
index a8bfe75..a8bfe75 100644
--- a/src/c_fl_pack.h
+++ b/body/c_fl_pack.h
diff --git a/src/c_fl_paged_device.cpp b/body/c_fl_paged_device.cpp
index f8f7d60..f8f7d60 100644
--- a/src/c_fl_paged_device.cpp
+++ b/body/c_fl_paged_device.cpp
diff --git a/src/c_fl_paged_device.h b/body/c_fl_paged_device.h
index 90befcf..90befcf 100644
--- a/src/c_fl_paged_device.h
+++ b/body/c_fl_paged_device.h
diff --git a/src/c_fl_pixmap.cpp b/body/c_fl_pixmap.cpp
index 6ebcb56..6ebcb56 100644
--- a/src/c_fl_pixmap.cpp
+++ b/body/c_fl_pixmap.cpp
diff --git a/src/c_fl_pixmap.h b/body/c_fl_pixmap.h
index ceba284..ceba284 100644
--- a/src/c_fl_pixmap.h
+++ b/body/c_fl_pixmap.h
diff --git a/src/c_fl_png_image.cpp b/body/c_fl_png_image.cpp
index a4a6d71..a4a6d71 100644
--- a/src/c_fl_png_image.cpp
+++ b/body/c_fl_png_image.cpp
diff --git a/src/c_fl_png_image.h b/body/c_fl_png_image.h
index 83344e0..83344e0 100644
--- a/src/c_fl_png_image.h
+++ b/body/c_fl_png_image.h
diff --git a/src/c_fl_pnm_image.cpp b/body/c_fl_pnm_image.cpp
index 1550998..1550998 100644
--- a/src/c_fl_pnm_image.cpp
+++ b/body/c_fl_pnm_image.cpp
diff --git a/src/c_fl_pnm_image.h b/body/c_fl_pnm_image.h
index 6feeff9..6feeff9 100644
--- a/src/c_fl_pnm_image.h
+++ b/body/c_fl_pnm_image.h
diff --git a/src/c_fl_positioner.cpp b/body/c_fl_positioner.cpp
index ce23b64..ce23b64 100644
--- a/src/c_fl_positioner.cpp
+++ b/body/c_fl_positioner.cpp
diff --git a/src/c_fl_positioner.h b/body/c_fl_positioner.h
index 9fd96d4..9fd96d4 100644
--- a/src/c_fl_positioner.h
+++ b/body/c_fl_positioner.h
diff --git a/src/c_fl_postscript_file_device.cpp b/body/c_fl_postscript_file_device.cpp
index 480d273..480d273 100644
--- a/src/c_fl_postscript_file_device.cpp
+++ b/body/c_fl_postscript_file_device.cpp
diff --git a/src/c_fl_postscript_file_device.h b/body/c_fl_postscript_file_device.h
index f4d6d31..f4d6d31 100644
--- a/src/c_fl_postscript_file_device.h
+++ b/body/c_fl_postscript_file_device.h
diff --git a/src/c_fl_preferences.cpp b/body/c_fl_preferences.cpp
index d2b0d2c..d2b0d2c 100644
--- a/src/c_fl_preferences.cpp
+++ b/body/c_fl_preferences.cpp
diff --git a/src/c_fl_preferences.h b/body/c_fl_preferences.h
index 9f77dfb..9f77dfb 100644
--- a/src/c_fl_preferences.h
+++ b/body/c_fl_preferences.h
diff --git a/src/c_fl_printer.cpp b/body/c_fl_printer.cpp
index 94f31d5..94f31d5 100644
--- a/src/c_fl_printer.cpp
+++ b/body/c_fl_printer.cpp
diff --git a/src/c_fl_printer.h b/body/c_fl_printer.h
index 90f070d..90f070d 100644
--- a/src/c_fl_printer.h
+++ b/body/c_fl_printer.h
diff --git a/src/c_fl_progress.cpp b/body/c_fl_progress.cpp
index 21a7a2d..21a7a2d 100644
--- a/src/c_fl_progress.cpp
+++ b/body/c_fl_progress.cpp
diff --git a/src/c_fl_progress.h b/body/c_fl_progress.h
index d75e136..d75e136 100644
--- a/src/c_fl_progress.h
+++ b/body/c_fl_progress.h
diff --git a/src/c_fl_radio_button.cpp b/body/c_fl_radio_button.cpp
index 486c354..486c354 100644
--- a/src/c_fl_radio_button.cpp
+++ b/body/c_fl_radio_button.cpp
diff --git a/src/c_fl_radio_button.h b/body/c_fl_radio_button.h
index 53bdd57..53bdd57 100644
--- a/src/c_fl_radio_button.h
+++ b/body/c_fl_radio_button.h
diff --git a/src/c_fl_radio_light_button.cpp b/body/c_fl_radio_light_button.cpp
index f6da99e..f6da99e 100644
--- a/src/c_fl_radio_light_button.cpp
+++ b/body/c_fl_radio_light_button.cpp
diff --git a/src/c_fl_radio_light_button.h b/body/c_fl_radio_light_button.h
index 217bd69..217bd69 100644
--- a/src/c_fl_radio_light_button.h
+++ b/body/c_fl_radio_light_button.h
diff --git a/src/c_fl_radio_round_button.cpp b/body/c_fl_radio_round_button.cpp
index b09e1f3..b09e1f3 100644
--- a/src/c_fl_radio_round_button.cpp
+++ b/body/c_fl_radio_round_button.cpp
diff --git a/src/c_fl_radio_round_button.h b/body/c_fl_radio_round_button.h
index bea7076..bea7076 100644
--- a/src/c_fl_radio_round_button.h
+++ b/body/c_fl_radio_round_button.h
diff --git a/src/c_fl_repeat_button.cpp b/body/c_fl_repeat_button.cpp
index c3eb582..c3eb582 100644
--- a/src/c_fl_repeat_button.cpp
+++ b/body/c_fl_repeat_button.cpp
diff --git a/src/c_fl_repeat_button.h b/body/c_fl_repeat_button.h
index 5750a60..5750a60 100644
--- a/src/c_fl_repeat_button.h
+++ b/body/c_fl_repeat_button.h
diff --git a/src/c_fl_return_button.cpp b/body/c_fl_return_button.cpp
index 2c315d1..2c315d1 100644
--- a/src/c_fl_return_button.cpp
+++ b/body/c_fl_return_button.cpp
diff --git a/src/c_fl_return_button.h b/body/c_fl_return_button.h
index c9f4d62..c9f4d62 100644
--- a/src/c_fl_return_button.h
+++ b/body/c_fl_return_button.h
diff --git a/src/c_fl_rgb_image.cpp b/body/c_fl_rgb_image.cpp
index 65afbf9..65afbf9 100644
--- a/src/c_fl_rgb_image.cpp
+++ b/body/c_fl_rgb_image.cpp
diff --git a/src/c_fl_rgb_image.h b/body/c_fl_rgb_image.h
index a09b58e..a09b58e 100644
--- a/src/c_fl_rgb_image.h
+++ b/body/c_fl_rgb_image.h
diff --git a/src/c_fl_roller.cpp b/body/c_fl_roller.cpp
index 1c65422..1c65422 100644
--- a/src/c_fl_roller.cpp
+++ b/body/c_fl_roller.cpp
diff --git a/src/c_fl_roller.h b/body/c_fl_roller.h
index a864d71..a864d71 100644
--- a/src/c_fl_roller.h
+++ b/body/c_fl_roller.h
diff --git a/src/c_fl_round_button.cpp b/body/c_fl_round_button.cpp
index e6a9c43..e6a9c43 100644
--- a/src/c_fl_round_button.cpp
+++ b/body/c_fl_round_button.cpp
diff --git a/src/c_fl_round_button.h b/body/c_fl_round_button.h
index cbbaf9f..cbbaf9f 100644
--- a/src/c_fl_round_button.h
+++ b/body/c_fl_round_button.h
diff --git a/src/c_fl_round_clock.cpp b/body/c_fl_round_clock.cpp
index 0036c00..0036c00 100644
--- a/src/c_fl_round_clock.cpp
+++ b/body/c_fl_round_clock.cpp
diff --git a/src/c_fl_round_clock.h b/body/c_fl_round_clock.h
index 475a5d0..475a5d0 100644
--- a/src/c_fl_round_clock.h
+++ b/body/c_fl_round_clock.h
diff --git a/src/c_fl_screen.cpp b/body/c_fl_screen.cpp
index 88550bd..88550bd 100644
--- a/src/c_fl_screen.cpp
+++ b/body/c_fl_screen.cpp
diff --git a/src/c_fl_screen.h b/body/c_fl_screen.h
index 9b4d4ec..9b4d4ec 100644
--- a/src/c_fl_screen.h
+++ b/body/c_fl_screen.h
diff --git a/src/c_fl_scroll.cpp b/body/c_fl_scroll.cpp
index 5fd3240..5fd3240 100644
--- a/src/c_fl_scroll.cpp
+++ b/body/c_fl_scroll.cpp
diff --git a/src/c_fl_scroll.h b/body/c_fl_scroll.h
index fe8674e..fe8674e 100644
--- a/src/c_fl_scroll.h
+++ b/body/c_fl_scroll.h
diff --git a/src/c_fl_scrollbar.cpp b/body/c_fl_scrollbar.cpp
index 2ebdb27..2ebdb27 100644
--- a/src/c_fl_scrollbar.cpp
+++ b/body/c_fl_scrollbar.cpp
diff --git a/src/c_fl_scrollbar.h b/body/c_fl_scrollbar.h
index 870f256..870f256 100644
--- a/src/c_fl_scrollbar.h
+++ b/body/c_fl_scrollbar.h
diff --git a/src/c_fl_secret_input.cpp b/body/c_fl_secret_input.cpp
index b3205cb..b3205cb 100644
--- a/src/c_fl_secret_input.cpp
+++ b/body/c_fl_secret_input.cpp
diff --git a/src/c_fl_secret_input.h b/body/c_fl_secret_input.h
index ea171d8..ea171d8 100644
--- a/src/c_fl_secret_input.h
+++ b/body/c_fl_secret_input.h
diff --git a/src/c_fl_select_browser.cpp b/body/c_fl_select_browser.cpp
index 5993703..5993703 100644
--- a/src/c_fl_select_browser.cpp
+++ b/body/c_fl_select_browser.cpp
diff --git a/src/c_fl_select_browser.h b/body/c_fl_select_browser.h
index f72b8de..f72b8de 100644
--- a/src/c_fl_select_browser.h
+++ b/body/c_fl_select_browser.h
diff --git a/src/c_fl_shared_image.cpp b/body/c_fl_shared_image.cpp
index bb17632..bb17632 100644
--- a/src/c_fl_shared_image.cpp
+++ b/body/c_fl_shared_image.cpp
diff --git a/src/c_fl_shared_image.h b/body/c_fl_shared_image.h
index dbe0352..dbe0352 100644
--- a/src/c_fl_shared_image.h
+++ b/body/c_fl_shared_image.h
diff --git a/src/c_fl_simple_counter.cpp b/body/c_fl_simple_counter.cpp
index cf42d03..cf42d03 100644
--- a/src/c_fl_simple_counter.cpp
+++ b/body/c_fl_simple_counter.cpp
diff --git a/src/c_fl_simple_counter.h b/body/c_fl_simple_counter.h
index 397b488..397b488 100644
--- a/src/c_fl_simple_counter.h
+++ b/body/c_fl_simple_counter.h
diff --git a/src/c_fl_single_window.cpp b/body/c_fl_single_window.cpp
index efafdc4..efafdc4 100644
--- a/src/c_fl_single_window.cpp
+++ b/body/c_fl_single_window.cpp
diff --git a/src/c_fl_single_window.h b/body/c_fl_single_window.h
index 85e6e29..85e6e29 100644
--- a/src/c_fl_single_window.h
+++ b/body/c_fl_single_window.h
diff --git a/src/c_fl_slider.cpp b/body/c_fl_slider.cpp
index 449988c..449988c 100644
--- a/src/c_fl_slider.cpp
+++ b/body/c_fl_slider.cpp
diff --git a/src/c_fl_slider.h b/body/c_fl_slider.h
index 63c6ac3..63c6ac3 100644
--- a/src/c_fl_slider.h
+++ b/body/c_fl_slider.h
diff --git a/src/c_fl_spinner.cpp b/body/c_fl_spinner.cpp
index 67a5312..67a5312 100644
--- a/src/c_fl_spinner.cpp
+++ b/body/c_fl_spinner.cpp
diff --git a/src/c_fl_spinner.h b/body/c_fl_spinner.h
index 7447c33..7447c33 100644
--- a/src/c_fl_spinner.h
+++ b/body/c_fl_spinner.h
diff --git a/src/c_fl_static.cpp b/body/c_fl_static.cpp
index ad4cfe9..ad4cfe9 100644
--- a/src/c_fl_static.cpp
+++ b/body/c_fl_static.cpp
diff --git a/src/c_fl_static.h b/body/c_fl_static.h
index 692750b..692750b 100644
--- a/src/c_fl_static.h
+++ b/body/c_fl_static.h
diff --git a/src/c_fl_surface_device.cpp b/body/c_fl_surface_device.cpp
index 9836a04..9836a04 100644
--- a/src/c_fl_surface_device.cpp
+++ b/body/c_fl_surface_device.cpp
diff --git a/src/c_fl_surface_device.h b/body/c_fl_surface_device.h
index 97096c6..97096c6 100644
--- a/src/c_fl_surface_device.h
+++ b/body/c_fl_surface_device.h
diff --git a/src/c_fl_sys_menu_bar.cpp b/body/c_fl_sys_menu_bar.cpp
index fbd6e34..fbd6e34 100644
--- a/src/c_fl_sys_menu_bar.cpp
+++ b/body/c_fl_sys_menu_bar.cpp
diff --git a/src/c_fl_sys_menu_bar.h b/body/c_fl_sys_menu_bar.h
index 1bde8f2..1bde8f2 100644
--- a/src/c_fl_sys_menu_bar.h
+++ b/body/c_fl_sys_menu_bar.h
diff --git a/src/c_fl_tabs.cpp b/body/c_fl_tabs.cpp
index df7327f..df7327f 100644
--- a/src/c_fl_tabs.cpp
+++ b/body/c_fl_tabs.cpp
diff --git a/src/c_fl_tabs.h b/body/c_fl_tabs.h
index 3226b2d..3226b2d 100644
--- a/src/c_fl_tabs.h
+++ b/body/c_fl_tabs.h
diff --git a/src/c_fl_text_buffer.cpp b/body/c_fl_text_buffer.cpp
index 2322984..2322984 100644
--- a/src/c_fl_text_buffer.cpp
+++ b/body/c_fl_text_buffer.cpp
diff --git a/src/c_fl_text_buffer.h b/body/c_fl_text_buffer.h
index ce4c262..ce4c262 100644
--- a/src/c_fl_text_buffer.h
+++ b/body/c_fl_text_buffer.h
diff --git a/src/c_fl_text_display.cpp b/body/c_fl_text_display.cpp
index 654d6ce..654d6ce 100644
--- a/src/c_fl_text_display.cpp
+++ b/body/c_fl_text_display.cpp
diff --git a/src/c_fl_text_display.h b/body/c_fl_text_display.h
index ece9a6a..ece9a6a 100644
--- a/src/c_fl_text_display.h
+++ b/body/c_fl_text_display.h
diff --git a/src/c_fl_text_editor.cpp b/body/c_fl_text_editor.cpp
index 6138cb2..6138cb2 100644
--- a/src/c_fl_text_editor.cpp
+++ b/body/c_fl_text_editor.cpp
diff --git a/src/c_fl_text_editor.h b/body/c_fl_text_editor.h
index 3f57921..3f57921 100644
--- a/src/c_fl_text_editor.h
+++ b/body/c_fl_text_editor.h
diff --git a/src/c_fl_tile.cpp b/body/c_fl_tile.cpp
index 81f820a..81f820a 100644
--- a/src/c_fl_tile.cpp
+++ b/body/c_fl_tile.cpp
diff --git a/src/c_fl_tile.h b/body/c_fl_tile.h
index 3254558..3254558 100644
--- a/src/c_fl_tile.h
+++ b/body/c_fl_tile.h
diff --git a/src/c_fl_tiled_image.cpp b/body/c_fl_tiled_image.cpp
index 0fbea0f..0fbea0f 100644
--- a/src/c_fl_tiled_image.cpp
+++ b/body/c_fl_tiled_image.cpp
diff --git a/src/c_fl_tiled_image.h b/body/c_fl_tiled_image.h
index 9eee3dd..9eee3dd 100644
--- a/src/c_fl_tiled_image.h
+++ b/body/c_fl_tiled_image.h
diff --git a/src/c_fl_toggle_button.cpp b/body/c_fl_toggle_button.cpp
index d396f37..d396f37 100644
--- a/src/c_fl_toggle_button.cpp
+++ b/body/c_fl_toggle_button.cpp
diff --git a/src/c_fl_toggle_button.h b/body/c_fl_toggle_button.h
index bdb86b1..bdb86b1 100644
--- a/src/c_fl_toggle_button.h
+++ b/body/c_fl_toggle_button.h
diff --git a/src/c_fl_tooltip.cpp b/body/c_fl_tooltip.cpp
index 8819da4..8819da4 100644
--- a/src/c_fl_tooltip.cpp
+++ b/body/c_fl_tooltip.cpp
diff --git a/src/c_fl_tooltip.h b/body/c_fl_tooltip.h
index 055a11f..055a11f 100644
--- a/src/c_fl_tooltip.h
+++ b/body/c_fl_tooltip.h
diff --git a/src/c_fl_valuator.cpp b/body/c_fl_valuator.cpp
index 3b4ebba..3b4ebba 100644
--- a/src/c_fl_valuator.cpp
+++ b/body/c_fl_valuator.cpp
diff --git a/src/c_fl_valuator.h b/body/c_fl_valuator.h
index 81107bc..81107bc 100644
--- a/src/c_fl_valuator.h
+++ b/body/c_fl_valuator.h
diff --git a/src/c_fl_value_input.cpp b/body/c_fl_value_input.cpp
index 3d19845..3d19845 100644
--- a/src/c_fl_value_input.cpp
+++ b/body/c_fl_value_input.cpp
diff --git a/src/c_fl_value_input.h b/body/c_fl_value_input.h
index f9eeff2..f9eeff2 100644
--- a/src/c_fl_value_input.h
+++ b/body/c_fl_value_input.h
diff --git a/src/c_fl_value_output.cpp b/body/c_fl_value_output.cpp
index 5e42996..5e42996 100644
--- a/src/c_fl_value_output.cpp
+++ b/body/c_fl_value_output.cpp
diff --git a/src/c_fl_value_output.h b/body/c_fl_value_output.h
index e333ff8..e333ff8 100644
--- a/src/c_fl_value_output.h
+++ b/body/c_fl_value_output.h
diff --git a/src/c_fl_value_slider.cpp b/body/c_fl_value_slider.cpp
index ac7498c..ac7498c 100644
--- a/src/c_fl_value_slider.cpp
+++ b/body/c_fl_value_slider.cpp
diff --git a/src/c_fl_value_slider.h b/body/c_fl_value_slider.h
index b07a827..b07a827 100644
--- a/src/c_fl_value_slider.h
+++ b/body/c_fl_value_slider.h
diff --git a/src/c_fl_widget.cpp b/body/c_fl_widget.cpp
index 6eda9e3..6eda9e3 100644
--- a/src/c_fl_widget.cpp
+++ b/body/c_fl_widget.cpp
diff --git a/src/c_fl_widget.h b/body/c_fl_widget.h
index 9634ba4..9634ba4 100644
--- a/src/c_fl_widget.h
+++ b/body/c_fl_widget.h
diff --git a/src/c_fl_window.cpp b/body/c_fl_window.cpp
index 806e66f..806e66f 100644
--- a/src/c_fl_window.cpp
+++ b/body/c_fl_window.cpp
diff --git a/src/c_fl_window.h b/body/c_fl_window.h
index ed6ebdd..ed6ebdd 100644
--- a/src/c_fl_window.h
+++ b/body/c_fl_window.h
diff --git a/src/c_fl_wizard.cpp b/body/c_fl_wizard.cpp
index e29995a..e29995a 100644
--- a/src/c_fl_wizard.cpp
+++ b/body/c_fl_wizard.cpp
diff --git a/src/c_fl_wizard.h b/body/c_fl_wizard.h
index fb710ec..fb710ec 100644
--- a/src/c_fl_wizard.h
+++ b/body/c_fl_wizard.h
diff --git a/src/c_fl_xbm_image.cpp b/body/c_fl_xbm_image.cpp
index 2ecd890..2ecd890 100644
--- a/src/c_fl_xbm_image.cpp
+++ b/body/c_fl_xbm_image.cpp
diff --git a/src/c_fl_xbm_image.h b/body/c_fl_xbm_image.h
index 668d3f8..668d3f8 100644
--- a/src/c_fl_xbm_image.h
+++ b/body/c_fl_xbm_image.h
diff --git a/src/c_fl_xpm_image.cpp b/body/c_fl_xpm_image.cpp
index fcf60c2..fcf60c2 100644
--- a/src/c_fl_xpm_image.cpp
+++ b/body/c_fl_xpm_image.cpp
diff --git a/src/c_fl_xpm_image.h b/body/c_fl_xpm_image.h
index a925c33..a925c33 100644
--- a/src/c_fl_xpm_image.h
+++ b/body/c_fl_xpm_image.h
diff --git a/src/fltk-asks.adb b/body/fltk-asks.adb
index bd09fac..bd09fac 100644
--- a/src/fltk-asks.adb
+++ b/body/fltk-asks.adb
diff --git a/src/fltk-devices-graphics.adb b/body/fltk-devices-graphics.adb
index f97cebe..f97cebe 100644
--- a/src/fltk-devices-graphics.adb
+++ b/body/fltk-devices-graphics.adb
diff --git a/src/fltk-devices-surface-copy.adb b/body/fltk-devices-surface-copy.adb
index 7bb1c66..7bb1c66 100644
--- a/src/fltk-devices-surface-copy.adb
+++ b/body/fltk-devices-surface-copy.adb
diff --git a/src/fltk-devices-surface-display.adb b/body/fltk-devices-surface-display.adb
index ad35012..ad35012 100644
--- a/src/fltk-devices-surface-display.adb
+++ b/body/fltk-devices-surface-display.adb
diff --git a/src/fltk-devices-surface-image.adb b/body/fltk-devices-surface-image.adb
index e9e7de4..e9e7de4 100644
--- a/src/fltk-devices-surface-image.adb
+++ b/body/fltk-devices-surface-image.adb
diff --git a/src/fltk-devices-surface-paged-postscript.adb b/body/fltk-devices-surface-paged-postscript.adb
index fa9f66d..fa9f66d 100644
--- a/src/fltk-devices-surface-paged-postscript.adb
+++ b/body/fltk-devices-surface-paged-postscript.adb
diff --git a/src/fltk-devices-surface-paged-printers.adb b/body/fltk-devices-surface-paged-printers.adb
index 3e605c8..3e605c8 100644
--- a/src/fltk-devices-surface-paged-printers.adb
+++ b/body/fltk-devices-surface-paged-printers.adb
diff --git a/src/fltk-devices-surface-paged.adb b/body/fltk-devices-surface-paged.adb
index 829974a..829974a 100644
--- a/src/fltk-devices-surface-paged.adb
+++ b/body/fltk-devices-surface-paged.adb
diff --git a/src/fltk-devices-surface.adb b/body/fltk-devices-surface.adb
index a6ef6cc..a6ef6cc 100644
--- a/src/fltk-devices-surface.adb
+++ b/body/fltk-devices-surface.adb
diff --git a/src/fltk-draw.adb b/body/fltk-draw.adb
index 8e98a7f..8e98a7f 100644
--- a/src/fltk-draw.adb
+++ b/body/fltk-draw.adb
diff --git a/src/fltk-environment.adb b/body/fltk-environment.adb
index 22cf676..22cf676 100644
--- a/src/fltk-environment.adb
+++ b/body/fltk-environment.adb
diff --git a/src/fltk-errors.adb b/body/fltk-errors.adb
index ef31002..ef31002 100644
--- a/src/fltk-errors.adb
+++ b/body/fltk-errors.adb
diff --git a/src/fltk-event.adb b/body/fltk-event.adb
index 4521fc2..4521fc2 100644
--- a/src/fltk-event.adb
+++ b/body/fltk-event.adb
diff --git a/src/fltk-file_choosers.adb b/body/fltk-file_choosers.adb
index 5662f8a..5662f8a 100644
--- a/src/fltk-file_choosers.adb
+++ b/body/fltk-file_choosers.adb
diff --git a/src/fltk-filenames.adb b/body/fltk-filenames.adb
index 7674323..7674323 100644
--- a/src/fltk-filenames.adb
+++ b/body/fltk-filenames.adb
diff --git a/src/fltk-help_dialogs.adb b/body/fltk-help_dialogs.adb
index fc5ab07..fc5ab07 100644
--- a/src/fltk-help_dialogs.adb
+++ b/body/fltk-help_dialogs.adb
diff --git a/src/fltk-images-bitmaps-xbm.adb b/body/fltk-images-bitmaps-xbm.adb
index eb8c093..eb8c093 100644
--- a/src/fltk-images-bitmaps-xbm.adb
+++ b/body/fltk-images-bitmaps-xbm.adb
diff --git a/src/fltk-images-bitmaps.adb b/body/fltk-images-bitmaps.adb
index 90150c9..90150c9 100644
--- a/src/fltk-images-bitmaps.adb
+++ b/body/fltk-images-bitmaps.adb
diff --git a/src/fltk-images-pixmaps-gif.adb b/body/fltk-images-pixmaps-gif.adb
index 535debf..535debf 100644
--- a/src/fltk-images-pixmaps-gif.adb
+++ b/body/fltk-images-pixmaps-gif.adb
diff --git a/src/fltk-images-pixmaps-xpm.adb b/body/fltk-images-pixmaps-xpm.adb
index 006c8b4..006c8b4 100644
--- a/src/fltk-images-pixmaps-xpm.adb
+++ b/body/fltk-images-pixmaps-xpm.adb
diff --git a/src/fltk-images-pixmaps.adb b/body/fltk-images-pixmaps.adb
index 2e66d2f..2e66d2f 100644
--- a/src/fltk-images-pixmaps.adb
+++ b/body/fltk-images-pixmaps.adb
diff --git a/src/fltk-images-rgb-bmp.adb b/body/fltk-images-rgb-bmp.adb
index 01669eb..01669eb 100644
--- a/src/fltk-images-rgb-bmp.adb
+++ b/body/fltk-images-rgb-bmp.adb
diff --git a/src/fltk-images-rgb-jpeg.adb b/body/fltk-images-rgb-jpeg.adb
index 17debb5..17debb5 100644
--- a/src/fltk-images-rgb-jpeg.adb
+++ b/body/fltk-images-rgb-jpeg.adb
diff --git a/src/fltk-images-rgb-png.adb b/body/fltk-images-rgb-png.adb
index 67befe3..67befe3 100644
--- a/src/fltk-images-rgb-png.adb
+++ b/body/fltk-images-rgb-png.adb
diff --git a/src/fltk-images-rgb-pnm.adb b/body/fltk-images-rgb-pnm.adb
index 362b8d6..362b8d6 100644
--- a/src/fltk-images-rgb-pnm.adb
+++ b/body/fltk-images-rgb-pnm.adb
diff --git a/src/fltk-images-rgb.adb b/body/fltk-images-rgb.adb
index 19a7952..19a7952 100644
--- a/src/fltk-images-rgb.adb
+++ b/body/fltk-images-rgb.adb
diff --git a/src/fltk-images-shared.adb b/body/fltk-images-shared.adb
index d475cc3..d475cc3 100644
--- a/src/fltk-images-shared.adb
+++ b/body/fltk-images-shared.adb
diff --git a/src/fltk-images-tiled.adb b/body/fltk-images-tiled.adb
index 6bed730..6bed730 100644
--- a/src/fltk-images-tiled.adb
+++ b/body/fltk-images-tiled.adb
diff --git a/src/fltk-images.adb b/body/fltk-images.adb
index 19a1f86..19a1f86 100644
--- a/src/fltk-images.adb
+++ b/body/fltk-images.adb
diff --git a/src/fltk-labels.adb b/body/fltk-labels.adb
index 006db6b..006db6b 100644
--- a/src/fltk-labels.adb
+++ b/body/fltk-labels.adb
diff --git a/src/fltk-menu_items.adb b/body/fltk-menu_items.adb
index d68eb60..d68eb60 100644
--- a/src/fltk-menu_items.adb
+++ b/body/fltk-menu_items.adb
diff --git a/src/fltk-screen.adb b/body/fltk-screen.adb
index ad25cbe..ad25cbe 100644
--- a/src/fltk-screen.adb
+++ b/body/fltk-screen.adb
diff --git a/src/fltk-show_argv.adb b/body/fltk-show_argv.adb
index 52e22e2..52e22e2 100644
--- a/src/fltk-show_argv.adb
+++ b/body/fltk-show_argv.adb
diff --git a/src/fltk-show_argv.ads b/body/fltk-show_argv.ads
index 231b875..231b875 100644
--- a/src/fltk-show_argv.ads
+++ b/body/fltk-show_argv.ads
diff --git a/src/fltk-static.adb b/body/fltk-static.adb
index 56b30c0..56b30c0 100644
--- a/src/fltk-static.adb
+++ b/body/fltk-static.adb
diff --git a/src/fltk-static_callback_conversions.adb b/body/fltk-static_callback_conversions.adb
index ceb0e62..ceb0e62 100644
--- a/src/fltk-static_callback_conversions.adb
+++ b/body/fltk-static_callback_conversions.adb
diff --git a/src/fltk-static_callback_conversions.ads b/body/fltk-static_callback_conversions.ads
index 1e10c03..1e10c03 100644
--- a/src/fltk-static_callback_conversions.ads
+++ b/body/fltk-static_callback_conversions.ads
diff --git a/src/fltk-text_buffers.adb b/body/fltk-text_buffers.adb
index 1afa2a7..1afa2a7 100644
--- a/src/fltk-text_buffers.adb
+++ b/body/fltk-text_buffers.adb
diff --git a/src/fltk-tooltips.adb b/body/fltk-tooltips.adb
index ccdb649..ccdb649 100644
--- a/src/fltk-tooltips.adb
+++ b/body/fltk-tooltips.adb
diff --git a/src/fltk-widget_callback_conversions.adb b/body/fltk-widget_callback_conversions.adb
index 29f920e..29f920e 100644
--- a/src/fltk-widget_callback_conversions.adb
+++ b/body/fltk-widget_callback_conversions.adb
diff --git a/src/fltk-widget_callback_conversions.ads b/body/fltk-widget_callback_conversions.ads
index 09932b4..09932b4 100644
--- a/src/fltk-widget_callback_conversions.ads
+++ b/body/fltk-widget_callback_conversions.ads
diff --git a/src/fltk-widgets-boxes.adb b/body/fltk-widgets-boxes.adb
index e412131..e412131 100644
--- a/src/fltk-widgets-boxes.adb
+++ b/body/fltk-widgets-boxes.adb
diff --git a/src/fltk-widgets-buttons-enter.adb b/body/fltk-widgets-buttons-enter.adb
index 3a9e026..3a9e026 100644
--- a/src/fltk-widgets-buttons-enter.adb
+++ b/body/fltk-widgets-buttons-enter.adb
diff --git a/src/fltk-widgets-buttons-light-check.adb b/body/fltk-widgets-buttons-light-check.adb
index de35223..de35223 100644
--- a/src/fltk-widgets-buttons-light-check.adb
+++ b/body/fltk-widgets-buttons-light-check.adb
diff --git a/src/fltk-widgets-buttons-light-radio.adb b/body/fltk-widgets-buttons-light-radio.adb
index 9aef7bd..9aef7bd 100644
--- a/src/fltk-widgets-buttons-light-radio.adb
+++ b/body/fltk-widgets-buttons-light-radio.adb
diff --git a/src/fltk-widgets-buttons-light-round-radio.adb b/body/fltk-widgets-buttons-light-round-radio.adb
index b277922..b277922 100644
--- a/src/fltk-widgets-buttons-light-round-radio.adb
+++ b/body/fltk-widgets-buttons-light-round-radio.adb
diff --git a/src/fltk-widgets-buttons-light-round.adb b/body/fltk-widgets-buttons-light-round.adb
index 172c112..172c112 100644
--- a/src/fltk-widgets-buttons-light-round.adb
+++ b/body/fltk-widgets-buttons-light-round.adb
diff --git a/src/fltk-widgets-buttons-light.adb b/body/fltk-widgets-buttons-light.adb
index 3e4791a..3e4791a 100644
--- a/src/fltk-widgets-buttons-light.adb
+++ b/body/fltk-widgets-buttons-light.adb
diff --git a/src/fltk-widgets-buttons-radio.adb b/body/fltk-widgets-buttons-radio.adb
index b51af60..b51af60 100644
--- a/src/fltk-widgets-buttons-radio.adb
+++ b/body/fltk-widgets-buttons-radio.adb
diff --git a/src/fltk-widgets-buttons-repeat.adb b/body/fltk-widgets-buttons-repeat.adb
index eda24fd..eda24fd 100644
--- a/src/fltk-widgets-buttons-repeat.adb
+++ b/body/fltk-widgets-buttons-repeat.adb
diff --git a/src/fltk-widgets-buttons-toggle.adb b/body/fltk-widgets-buttons-toggle.adb
index a93fa36..a93fa36 100644
--- a/src/fltk-widgets-buttons-toggle.adb
+++ b/body/fltk-widgets-buttons-toggle.adb
diff --git a/src/fltk-widgets-buttons.adb b/body/fltk-widgets-buttons.adb
index 11a57de..1e7ef60 100644
--- a/src/fltk-widgets-buttons.adb
+++ b/body/fltk-widgets-buttons.adb
@@ -226,6 +226,14 @@ package body FLTK.Widgets.Buttons is
     --  API Subprograms  --
     -----------------------
 
+    function Is_On
+           (This : in Button)
+        return Boolean is
+    begin
+        return This.Get_State = On;
+    end Is_On;
+
+
     function Get_State
            (This : in Button)
         return State is
diff --git a/src/fltk-widgets-charts.adb b/body/fltk-widgets-charts.adb
index 2d4615d..2d4615d 100644
--- a/src/fltk-widgets-charts.adb
+++ b/body/fltk-widgets-charts.adb
diff --git a/src/fltk-widgets-clocks-updated-round.adb b/body/fltk-widgets-clocks-updated-round.adb
index 4f4487b..4f4487b 100644
--- a/src/fltk-widgets-clocks-updated-round.adb
+++ b/body/fltk-widgets-clocks-updated-round.adb
diff --git a/src/fltk-widgets-clocks-updated.adb b/body/fltk-widgets-clocks-updated.adb
index 8b7d5e6..8b7d5e6 100644
--- a/src/fltk-widgets-clocks-updated.adb
+++ b/body/fltk-widgets-clocks-updated.adb
diff --git a/src/fltk-widgets-clocks.adb b/body/fltk-widgets-clocks.adb
index 08be495..08be495 100644
--- a/src/fltk-widgets-clocks.adb
+++ b/body/fltk-widgets-clocks.adb
diff --git a/src/fltk-widgets-groups-browsers-check.adb b/body/fltk-widgets-groups-browsers-check.adb
index 730dcd4..730dcd4 100644
--- a/src/fltk-widgets-groups-browsers-check.adb
+++ b/body/fltk-widgets-groups-browsers-check.adb
diff --git a/src/fltk-widgets-groups-browsers-textline-choice.adb b/body/fltk-widgets-groups-browsers-textline-choice.adb
index 95df2f2..95df2f2 100644
--- a/src/fltk-widgets-groups-browsers-textline-choice.adb
+++ b/body/fltk-widgets-groups-browsers-textline-choice.adb
diff --git a/src/fltk-widgets-groups-browsers-textline-file.adb b/body/fltk-widgets-groups-browsers-textline-file.adb
index e45396c..e45396c 100644
--- a/src/fltk-widgets-groups-browsers-textline-file.adb
+++ b/body/fltk-widgets-groups-browsers-textline-file.adb
diff --git a/src/fltk-widgets-groups-browsers-textline-hold.adb b/body/fltk-widgets-groups-browsers-textline-hold.adb
index 4c91322..4c91322 100644
--- a/src/fltk-widgets-groups-browsers-textline-hold.adb
+++ b/body/fltk-widgets-groups-browsers-textline-hold.adb
diff --git a/src/fltk-widgets-groups-browsers-textline-multi.adb b/body/fltk-widgets-groups-browsers-textline-multi.adb
index ddcfd0a..ddcfd0a 100644
--- a/src/fltk-widgets-groups-browsers-textline-multi.adb
+++ b/body/fltk-widgets-groups-browsers-textline-multi.adb
diff --git a/src/fltk-widgets-groups-browsers-textline.adb b/body/fltk-widgets-groups-browsers-textline.adb
index b7b3077..b7b3077 100644
--- a/src/fltk-widgets-groups-browsers-textline.adb
+++ b/body/fltk-widgets-groups-browsers-textline.adb
diff --git a/src/fltk-widgets-groups-browsers.adb b/body/fltk-widgets-groups-browsers.adb
index 36b9f2f..36b9f2f 100644
--- a/src/fltk-widgets-groups-browsers.adb
+++ b/body/fltk-widgets-groups-browsers.adb
diff --git a/src/fltk-widgets-groups-color_choosers.adb b/body/fltk-widgets-groups-color_choosers.adb
index 15f34ed..15f34ed 100644
--- a/src/fltk-widgets-groups-color_choosers.adb
+++ b/body/fltk-widgets-groups-color_choosers.adb
diff --git a/src/fltk-widgets-groups-help_views.adb b/body/fltk-widgets-groups-help_views.adb
index 6435c0f..6435c0f 100644
--- a/src/fltk-widgets-groups-help_views.adb
+++ b/body/fltk-widgets-groups-help_views.adb
diff --git a/src/fltk-widgets-groups-input_choices.adb b/body/fltk-widgets-groups-input_choices.adb
index 4ee6ffd..4ee6ffd 100644
--- a/src/fltk-widgets-groups-input_choices.adb
+++ b/body/fltk-widgets-groups-input_choices.adb
diff --git a/src/fltk-widgets-groups-packed.adb b/body/fltk-widgets-groups-packed.adb
index 126da76..126da76 100644
--- a/src/fltk-widgets-groups-packed.adb
+++ b/body/fltk-widgets-groups-packed.adb
diff --git a/src/fltk-widgets-groups-scrolls.adb b/body/fltk-widgets-groups-scrolls.adb
index a4885dc..a4885dc 100644
--- a/src/fltk-widgets-groups-scrolls.adb
+++ b/body/fltk-widgets-groups-scrolls.adb
diff --git a/src/fltk-widgets-groups-spinners.adb b/body/fltk-widgets-groups-spinners.adb
index d73d3e9..d73d3e9 100644
--- a/src/fltk-widgets-groups-spinners.adb
+++ b/body/fltk-widgets-groups-spinners.adb
diff --git a/src/fltk-widgets-groups-tabbed.adb b/body/fltk-widgets-groups-tabbed.adb
index 360b824..360b824 100644
--- a/src/fltk-widgets-groups-tabbed.adb
+++ b/body/fltk-widgets-groups-tabbed.adb
diff --git a/src/fltk-widgets-groups-text_displays-text_editors.adb b/body/fltk-widgets-groups-text_displays-text_editors.adb
index 15066f9..15066f9 100644
--- a/src/fltk-widgets-groups-text_displays-text_editors.adb
+++ b/body/fltk-widgets-groups-text_displays-text_editors.adb
diff --git a/src/fltk-widgets-groups-text_displays.adb b/body/fltk-widgets-groups-text_displays.adb
index 011d841..011d841 100644
--- a/src/fltk-widgets-groups-text_displays.adb
+++ b/body/fltk-widgets-groups-text_displays.adb
diff --git a/src/fltk-widgets-groups-tiled.adb b/body/fltk-widgets-groups-tiled.adb
index 9bbf394..9bbf394 100644
--- a/src/fltk-widgets-groups-tiled.adb
+++ b/body/fltk-widgets-groups-tiled.adb
diff --git a/src/fltk-widgets-groups-windows-double-cairo.adb b/body/fltk-widgets-groups-windows-double-cairo.adb
index 897c206..897c206 100644
--- a/src/fltk-widgets-groups-windows-double-cairo.adb
+++ b/body/fltk-widgets-groups-windows-double-cairo.adb
diff --git a/src/fltk-widgets-groups-windows-double-overlay.adb b/body/fltk-widgets-groups-windows-double-overlay.adb
index c4460f1..c4460f1 100644
--- a/src/fltk-widgets-groups-windows-double-overlay.adb
+++ b/body/fltk-widgets-groups-windows-double-overlay.adb
diff --git a/src/fltk-widgets-groups-windows-double.adb b/body/fltk-widgets-groups-windows-double.adb
index 90a17f3..90a17f3 100644
--- a/src/fltk-widgets-groups-windows-double.adb
+++ b/body/fltk-widgets-groups-windows-double.adb
diff --git a/src/fltk-widgets-groups-windows-opengl.adb b/body/fltk-widgets-groups-windows-opengl.adb
index da2434c..da2434c 100644
--- a/src/fltk-widgets-groups-windows-opengl.adb
+++ b/body/fltk-widgets-groups-windows-opengl.adb
diff --git a/src/fltk-widgets-groups-windows-single-menu.adb b/body/fltk-widgets-groups-windows-single-menu.adb
index 063961e..063961e 100644
--- a/src/fltk-widgets-groups-windows-single-menu.adb
+++ b/body/fltk-widgets-groups-windows-single-menu.adb
diff --git a/src/fltk-widgets-groups-windows-single.adb b/body/fltk-widgets-groups-windows-single.adb
index 109c07e..109c07e 100644
--- a/src/fltk-widgets-groups-windows-single.adb
+++ b/body/fltk-widgets-groups-windows-single.adb
diff --git a/src/fltk-widgets-groups-windows.adb b/body/fltk-widgets-groups-windows.adb
index 3a07d96..3a07d96 100644
--- a/src/fltk-widgets-groups-windows.adb
+++ b/body/fltk-widgets-groups-windows.adb
diff --git a/src/fltk-widgets-groups-wizards.adb b/body/fltk-widgets-groups-wizards.adb
index eb604a1..eb604a1 100644
--- a/src/fltk-widgets-groups-wizards.adb
+++ b/body/fltk-widgets-groups-wizards.adb
diff --git a/src/fltk-widgets-groups.adb b/body/fltk-widgets-groups.adb
index e7c8780..e7c8780 100644
--- a/src/fltk-widgets-groups.adb
+++ b/body/fltk-widgets-groups.adb
diff --git a/src/fltk-widgets-inputs-text-file.adb b/body/fltk-widgets-inputs-text-file.adb
index c7e4919..c7e4919 100644
--- a/src/fltk-widgets-inputs-text-file.adb
+++ b/body/fltk-widgets-inputs-text-file.adb
diff --git a/src/fltk-widgets-inputs-text-floating_point.adb b/body/fltk-widgets-inputs-text-floating_point.adb
index c7982d2..c7982d2 100644
--- a/src/fltk-widgets-inputs-text-floating_point.adb
+++ b/body/fltk-widgets-inputs-text-floating_point.adb
diff --git a/src/fltk-widgets-inputs-text-multiline.adb b/body/fltk-widgets-inputs-text-multiline.adb
index 27e0def..27e0def 100644
--- a/src/fltk-widgets-inputs-text-multiline.adb
+++ b/body/fltk-widgets-inputs-text-multiline.adb
diff --git a/src/fltk-widgets-inputs-text-outputs-multiline.adb b/body/fltk-widgets-inputs-text-outputs-multiline.adb
index 4d8ade8..4d8ade8 100644
--- a/src/fltk-widgets-inputs-text-outputs-multiline.adb
+++ b/body/fltk-widgets-inputs-text-outputs-multiline.adb
diff --git a/src/fltk-widgets-inputs-text-outputs.adb b/body/fltk-widgets-inputs-text-outputs.adb
index 48e697f..48e697f 100644
--- a/src/fltk-widgets-inputs-text-outputs.adb
+++ b/body/fltk-widgets-inputs-text-outputs.adb
diff --git a/src/fltk-widgets-inputs-text-secret.adb b/body/fltk-widgets-inputs-text-secret.adb
index ab821d4..ab821d4 100644
--- a/src/fltk-widgets-inputs-text-secret.adb
+++ b/body/fltk-widgets-inputs-text-secret.adb
diff --git a/src/fltk-widgets-inputs-text-whole_number.adb b/body/fltk-widgets-inputs-text-whole_number.adb
index e5b0f85..e5b0f85 100644
--- a/src/fltk-widgets-inputs-text-whole_number.adb
+++ b/body/fltk-widgets-inputs-text-whole_number.adb
diff --git a/src/fltk-widgets-inputs-text.adb b/body/fltk-widgets-inputs-text.adb
index efed39c..efed39c 100644
--- a/src/fltk-widgets-inputs-text.adb
+++ b/body/fltk-widgets-inputs-text.adb
diff --git a/src/fltk-widgets-inputs.adb b/body/fltk-widgets-inputs.adb
index 0d3a3fe..0d3a3fe 100644
--- a/src/fltk-widgets-inputs.adb
+++ b/body/fltk-widgets-inputs.adb
diff --git a/src/fltk-widgets-menus-choices.adb b/body/fltk-widgets-menus-choices.adb
index e4b52ad..e4b52ad 100644
--- a/src/fltk-widgets-menus-choices.adb
+++ b/body/fltk-widgets-menus-choices.adb
diff --git a/src/fltk-widgets-menus-menu_bars-systemwide.adb b/body/fltk-widgets-menus-menu_bars-systemwide.adb
index bccdc2e..bccdc2e 100644
--- a/src/fltk-widgets-menus-menu_bars-systemwide.adb
+++ b/body/fltk-widgets-menus-menu_bars-systemwide.adb
diff --git a/src/fltk-widgets-menus-menu_bars.adb b/body/fltk-widgets-menus-menu_bars.adb
index f1dba40..f1dba40 100644
--- a/src/fltk-widgets-menus-menu_bars.adb
+++ b/body/fltk-widgets-menus-menu_bars.adb
diff --git a/src/fltk-widgets-menus-menu_buttons.adb b/body/fltk-widgets-menus-menu_buttons.adb
index b526e49..b526e49 100644
--- a/src/fltk-widgets-menus-menu_buttons.adb
+++ b/body/fltk-widgets-menus-menu_buttons.adb
diff --git a/src/fltk-widgets-menus.adb b/body/fltk-widgets-menus.adb
index 034cd4c..034cd4c 100644
--- a/src/fltk-widgets-menus.adb
+++ b/body/fltk-widgets-menus.adb
diff --git a/src/fltk-widgets-positioners.adb b/body/fltk-widgets-positioners.adb
index 053d731..053d731 100644
--- a/src/fltk-widgets-positioners.adb
+++ b/body/fltk-widgets-positioners.adb
diff --git a/src/fltk-widgets-progress_bars.adb b/body/fltk-widgets-progress_bars.adb
index b82fef6..b82fef6 100644
--- a/src/fltk-widgets-progress_bars.adb
+++ b/body/fltk-widgets-progress_bars.adb
diff --git a/src/fltk-widgets-valuators-adjusters.adb b/body/fltk-widgets-valuators-adjusters.adb
index 89294e0..89294e0 100644
--- a/src/fltk-widgets-valuators-adjusters.adb
+++ b/body/fltk-widgets-valuators-adjusters.adb
diff --git a/src/fltk-widgets-valuators-counters-simple.adb b/body/fltk-widgets-valuators-counters-simple.adb
index f1d39b8..f1d39b8 100644
--- a/src/fltk-widgets-valuators-counters-simple.adb
+++ b/body/fltk-widgets-valuators-counters-simple.adb
diff --git a/src/fltk-widgets-valuators-counters.adb b/body/fltk-widgets-valuators-counters.adb
index e04e180..e04e180 100644
--- a/src/fltk-widgets-valuators-counters.adb
+++ b/body/fltk-widgets-valuators-counters.adb
diff --git a/src/fltk-widgets-valuators-dials-fill.adb b/body/fltk-widgets-valuators-dials-fill.adb
index ba378be..ba378be 100644
--- a/src/fltk-widgets-valuators-dials-fill.adb
+++ b/body/fltk-widgets-valuators-dials-fill.adb
diff --git a/src/fltk-widgets-valuators-dials-line.adb b/body/fltk-widgets-valuators-dials-line.adb
index c20a828..c20a828 100644
--- a/src/fltk-widgets-valuators-dials-line.adb
+++ b/body/fltk-widgets-valuators-dials-line.adb
diff --git a/src/fltk-widgets-valuators-dials.adb b/body/fltk-widgets-valuators-dials.adb
index 6dc9e69..6dc9e69 100644
--- a/src/fltk-widgets-valuators-dials.adb
+++ b/body/fltk-widgets-valuators-dials.adb
diff --git a/src/fltk-widgets-valuators-rollers.adb b/body/fltk-widgets-valuators-rollers.adb
index 912d374..912d374 100644
--- a/src/fltk-widgets-valuators-rollers.adb
+++ b/body/fltk-widgets-valuators-rollers.adb
diff --git a/src/fltk-widgets-valuators-sliders-fill.adb b/body/fltk-widgets-valuators-sliders-fill.adb
index faeef64..faeef64 100644
--- a/src/fltk-widgets-valuators-sliders-fill.adb
+++ b/body/fltk-widgets-valuators-sliders-fill.adb
diff --git a/src/fltk-widgets-valuators-sliders-horizontal.adb b/body/fltk-widgets-valuators-sliders-horizontal.adb
index fdb722c..fdb722c 100644
--- a/src/fltk-widgets-valuators-sliders-horizontal.adb
+++ b/body/fltk-widgets-valuators-sliders-horizontal.adb
diff --git a/src/fltk-widgets-valuators-sliders-horizontal_fill.adb b/body/fltk-widgets-valuators-sliders-horizontal_fill.adb
index 5b681a3..5b681a3 100644
--- a/src/fltk-widgets-valuators-sliders-horizontal_fill.adb
+++ b/body/fltk-widgets-valuators-sliders-horizontal_fill.adb
diff --git a/src/fltk-widgets-valuators-sliders-horizontal_nice.adb b/body/fltk-widgets-valuators-sliders-horizontal_nice.adb
index 3e3d89d..3e3d89d 100644
--- a/src/fltk-widgets-valuators-sliders-horizontal_nice.adb
+++ b/body/fltk-widgets-valuators-sliders-horizontal_nice.adb
diff --git a/src/fltk-widgets-valuators-sliders-nice.adb b/body/fltk-widgets-valuators-sliders-nice.adb
index b9bc449..b9bc449 100644
--- a/src/fltk-widgets-valuators-sliders-nice.adb
+++ b/body/fltk-widgets-valuators-sliders-nice.adb
diff --git a/src/fltk-widgets-valuators-sliders-scrollbars.adb b/body/fltk-widgets-valuators-sliders-scrollbars.adb
index 26d9049..26d9049 100644
--- a/src/fltk-widgets-valuators-sliders-scrollbars.adb
+++ b/body/fltk-widgets-valuators-sliders-scrollbars.adb
diff --git a/src/fltk-widgets-valuators-sliders-value-horizontal.adb b/body/fltk-widgets-valuators-sliders-value-horizontal.adb
index fd91800..fd91800 100644
--- a/src/fltk-widgets-valuators-sliders-value-horizontal.adb
+++ b/body/fltk-widgets-valuators-sliders-value-horizontal.adb
diff --git a/src/fltk-widgets-valuators-sliders-value.adb b/body/fltk-widgets-valuators-sliders-value.adb
index 9d32529..9d32529 100644
--- a/src/fltk-widgets-valuators-sliders-value.adb
+++ b/body/fltk-widgets-valuators-sliders-value.adb
diff --git a/src/fltk-widgets-valuators-sliders.adb b/body/fltk-widgets-valuators-sliders.adb
index b81729f..b81729f 100644
--- a/src/fltk-widgets-valuators-sliders.adb
+++ b/body/fltk-widgets-valuators-sliders.adb
diff --git a/src/fltk-widgets-valuators-value_inputs.adb b/body/fltk-widgets-valuators-value_inputs.adb
index 6091d55..6091d55 100644
--- a/src/fltk-widgets-valuators-value_inputs.adb
+++ b/body/fltk-widgets-valuators-value_inputs.adb
diff --git a/src/fltk-widgets-valuators-value_outputs.adb b/body/fltk-widgets-valuators-value_outputs.adb
index 935e021..935e021 100644
--- a/src/fltk-widgets-valuators-value_outputs.adb
+++ b/body/fltk-widgets-valuators-value_outputs.adb
diff --git a/src/fltk-widgets-valuators.adb b/body/fltk-widgets-valuators.adb
index 4b8db3f..0cf8d65 100644
--- a/src/fltk-widgets-valuators.adb
+++ b/body/fltk-widgets-valuators.adb
@@ -198,13 +198,16 @@ package body FLTK.Widgets.Valuators is
         pragma Assert (Userdata /= Null_Pointer);
         Ada_Obj := Valuator_Convert.To_Pointer (Storage.To_Address (Userdata));
         declare
+            --  God this whole Format method is sketchy as hell.
+            --  ...what? This is the area to declare things and that needed declaring.
             String_Result : String := Ada_Obj.Format;
         begin
             if String_Result'Length <= FLTK.Buffer_Size then
-                Interfaces.C.Strings.Update (Buffer, 0, String_Result);
+                Interfaces.C.Strings.Update (Buffer, 0, Interfaces.C.To_C (String_Result), False);
                 return String_Result'Length;
             else
-                Interfaces.C.Strings.Update (Buffer, 0, String_Result (1 .. Buffer_Size));
+                Interfaces.C.Strings.Update
+                    (Buffer, 0, Interfaces.C.To_C (String_Result (1 .. Buffer_Size)), False);
                 return Interfaces.C.int (FLTK.Buffer_Size);
             end if;
         end;
diff --git a/src/fltk-widgets.adb b/body/fltk-widgets.adb
index a312641..a312641 100644
--- a/src/fltk-widgets.adb
+++ b/body/fltk-widgets.adb
diff --git a/src/fltk.adb b/body/fltk.adb
index f302b47..d729364 100644
--- a/src/fltk.adb
+++ b/body/fltk.adb
@@ -122,6 +122,24 @@ package body FLTK is
 
 
 
+    function "+"
+           (Left, Right : in Alignment)
+        return Alignment is
+    begin
+        return Left or Right;
+    end "+";
+
+
+    function "-"
+           (Left, Right : in Alignment)
+        return Alignment is
+    begin
+        return Left and (not Right);
+    end "-";
+
+
+
+
     function Press
            (Key : in Pressable_Key)
         return Keypress is
diff --git a/doc/fl_button.html b/doc/fl_button.html
index 9397807..cc7b94d 100644
--- a/doc/fl_button.html
+++ b/doc/fl_button.html
@@ -214,6 +214,10 @@ procedure Set_State
 char value() const;
 </pre></td>
 <td><pre>
+function Is_On
+       (This : in Button)
+    return Boolean;
+
 function Get_State
        (This : in Button)
     return State;
diff --git a/fltkada.gpr b/fltkada.gpr
index 7fbd78d..d174937 100644
--- a/fltkada.gpr
+++ b/fltkada.gpr
@@ -5,7 +5,7 @@ library project FLTKAda is
 
     for Languages use ("Ada", "C++");
 
-    for Source_Dirs use ("src");
+    for Source_Dirs use ("body", "spec");
     for Object_Dir use "obj";
     for Library_Dir use "lib";
     for Library_Name use "fltkada";
diff --git a/src/fltk-asks.ads b/spec/fltk-asks.ads
index fc6e150..fc6e150 100644
--- a/src/fltk-asks.ads
+++ b/spec/fltk-asks.ads
diff --git a/src/fltk-devices-graphics.ads b/spec/fltk-devices-graphics.ads
index f9d1a7c..f9d1a7c 100644
--- a/src/fltk-devices-graphics.ads
+++ b/spec/fltk-devices-graphics.ads
diff --git a/src/fltk-devices-surface-copy.ads b/spec/fltk-devices-surface-copy.ads
index 41d331b..41d331b 100644
--- a/src/fltk-devices-surface-copy.ads
+++ b/spec/fltk-devices-surface-copy.ads
diff --git a/src/fltk-devices-surface-display.ads b/spec/fltk-devices-surface-display.ads
index b581be7..b581be7 100644
--- a/src/fltk-devices-surface-display.ads
+++ b/spec/fltk-devices-surface-display.ads
diff --git a/src/fltk-devices-surface-image.ads b/spec/fltk-devices-surface-image.ads
index 961a9b2..961a9b2 100644
--- a/src/fltk-devices-surface-image.ads
+++ b/spec/fltk-devices-surface-image.ads
diff --git a/src/fltk-devices-surface-paged-postscript.ads b/spec/fltk-devices-surface-paged-postscript.ads
index a7ea51c..a7ea51c 100644
--- a/src/fltk-devices-surface-paged-postscript.ads
+++ b/spec/fltk-devices-surface-paged-postscript.ads
diff --git a/src/fltk-devices-surface-paged-printers.ads b/spec/fltk-devices-surface-paged-printers.ads
index c0bc34e..c0bc34e 100644
--- a/src/fltk-devices-surface-paged-printers.ads
+++ b/spec/fltk-devices-surface-paged-printers.ads
diff --git a/src/fltk-devices-surface-paged.ads b/spec/fltk-devices-surface-paged.ads
index b445c62..b445c62 100644
--- a/src/fltk-devices-surface-paged.ads
+++ b/spec/fltk-devices-surface-paged.ads
diff --git a/src/fltk-devices-surface.ads b/spec/fltk-devices-surface.ads
index f70d1e8..f70d1e8 100644
--- a/src/fltk-devices-surface.ads
+++ b/spec/fltk-devices-surface.ads
diff --git a/src/fltk-devices.ads b/spec/fltk-devices.ads
index d9ce5b1..d9ce5b1 100644
--- a/src/fltk-devices.ads
+++ b/spec/fltk-devices.ads
diff --git a/src/fltk-draw.ads b/spec/fltk-draw.ads
index cedd4da..cedd4da 100644
--- a/src/fltk-draw.ads
+++ b/spec/fltk-draw.ads
diff --git a/src/fltk-environment.ads b/spec/fltk-environment.ads
index 4bb807b..4bb807b 100644
--- a/src/fltk-environment.ads
+++ b/spec/fltk-environment.ads
diff --git a/src/fltk-errors.ads b/spec/fltk-errors.ads
index 6cdea54..6cdea54 100644
--- a/src/fltk-errors.ads
+++ b/spec/fltk-errors.ads
diff --git a/src/fltk-event.ads b/spec/fltk-event.ads
index 3b0dec9..3b0dec9 100644
--- a/src/fltk-event.ads
+++ b/spec/fltk-event.ads
diff --git a/src/fltk-file_choosers.ads b/spec/fltk-file_choosers.ads
index 927ae04..927ae04 100644
--- a/src/fltk-file_choosers.ads
+++ b/spec/fltk-file_choosers.ads
diff --git a/src/fltk-filenames.ads b/spec/fltk-filenames.ads
index 2872b8c..2872b8c 100644
--- a/src/fltk-filenames.ads
+++ b/spec/fltk-filenames.ads
diff --git a/src/fltk-help_dialogs.ads b/spec/fltk-help_dialogs.ads
index 655e357..655e357 100644
--- a/src/fltk-help_dialogs.ads
+++ b/spec/fltk-help_dialogs.ads
diff --git a/src/fltk-images-bitmaps-xbm.ads b/spec/fltk-images-bitmaps-xbm.ads
index 0887666..0887666 100644
--- a/src/fltk-images-bitmaps-xbm.ads
+++ b/spec/fltk-images-bitmaps-xbm.ads
diff --git a/src/fltk-images-bitmaps.ads b/spec/fltk-images-bitmaps.ads
index d8730a2..d8730a2 100644
--- a/src/fltk-images-bitmaps.ads
+++ b/spec/fltk-images-bitmaps.ads
diff --git a/src/fltk-images-pixmaps-gif.ads b/spec/fltk-images-pixmaps-gif.ads
index 7084a13..7084a13 100644
--- a/src/fltk-images-pixmaps-gif.ads
+++ b/spec/fltk-images-pixmaps-gif.ads
diff --git a/src/fltk-images-pixmaps-xpm.ads b/spec/fltk-images-pixmaps-xpm.ads
index d5bae5a..d5bae5a 100644
--- a/src/fltk-images-pixmaps-xpm.ads
+++ b/spec/fltk-images-pixmaps-xpm.ads
diff --git a/src/fltk-images-pixmaps.ads b/spec/fltk-images-pixmaps.ads
index 14e3f94..14e3f94 100644
--- a/src/fltk-images-pixmaps.ads
+++ b/spec/fltk-images-pixmaps.ads
diff --git a/src/fltk-images-rgb-bmp.ads b/spec/fltk-images-rgb-bmp.ads
index 4eb9e1b..4eb9e1b 100644
--- a/src/fltk-images-rgb-bmp.ads
+++ b/spec/fltk-images-rgb-bmp.ads
diff --git a/src/fltk-images-rgb-jpeg.ads b/spec/fltk-images-rgb-jpeg.ads
index 0349b01..0349b01 100644
--- a/src/fltk-images-rgb-jpeg.ads
+++ b/spec/fltk-images-rgb-jpeg.ads
diff --git a/src/fltk-images-rgb-png.ads b/spec/fltk-images-rgb-png.ads
index 23890b3..23890b3 100644
--- a/src/fltk-images-rgb-png.ads
+++ b/spec/fltk-images-rgb-png.ads
diff --git a/src/fltk-images-rgb-pnm.ads b/spec/fltk-images-rgb-pnm.ads
index d72706b..d72706b 100644
--- a/src/fltk-images-rgb-pnm.ads
+++ b/spec/fltk-images-rgb-pnm.ads
diff --git a/src/fltk-images-rgb.ads b/spec/fltk-images-rgb.ads
index 5768b3c..5768b3c 100644
--- a/src/fltk-images-rgb.ads
+++ b/spec/fltk-images-rgb.ads
diff --git a/src/fltk-images-shared.ads b/spec/fltk-images-shared.ads
index dce9254..dce9254 100644
--- a/src/fltk-images-shared.ads
+++ b/spec/fltk-images-shared.ads
diff --git a/src/fltk-images-tiled.ads b/spec/fltk-images-tiled.ads
index a7e775e..a7e775e 100644
--- a/src/fltk-images-tiled.ads
+++ b/spec/fltk-images-tiled.ads
diff --git a/src/fltk-images.ads b/spec/fltk-images.ads
index 9a02f23..9a02f23 100644
--- a/src/fltk-images.ads
+++ b/spec/fltk-images.ads
diff --git a/src/fltk-labels.ads b/spec/fltk-labels.ads
index 5e13a2e..5e13a2e 100644
--- a/src/fltk-labels.ads
+++ b/spec/fltk-labels.ads
diff --git a/src/fltk-menu_items.ads b/spec/fltk-menu_items.ads
index ac80984..ac80984 100644
--- a/src/fltk-menu_items.ads
+++ b/spec/fltk-menu_items.ads
diff --git a/src/fltk-screen.ads b/spec/fltk-screen.ads
index be28134..be28134 100644
--- a/src/fltk-screen.ads
+++ b/spec/fltk-screen.ads
diff --git a/src/fltk-static.ads b/spec/fltk-static.ads
index 98f44ba..98f44ba 100644
--- a/src/fltk-static.ads
+++ b/spec/fltk-static.ads
diff --git a/src/fltk-text_buffers.ads b/spec/fltk-text_buffers.ads
index 53b2692..53b2692 100644
--- a/src/fltk-text_buffers.ads
+++ b/spec/fltk-text_buffers.ads
diff --git a/src/fltk-tooltips.ads b/spec/fltk-tooltips.ads
index 4162358..4162358 100644
--- a/src/fltk-tooltips.ads
+++ b/spec/fltk-tooltips.ads
diff --git a/src/fltk-widgets-boxes.ads b/spec/fltk-widgets-boxes.ads
index 7e24d5f..7e24d5f 100644
--- a/src/fltk-widgets-boxes.ads
+++ b/spec/fltk-widgets-boxes.ads
diff --git a/src/fltk-widgets-buttons-enter.ads b/spec/fltk-widgets-buttons-enter.ads
index ed5ab83..ed5ab83 100644
--- a/src/fltk-widgets-buttons-enter.ads
+++ b/spec/fltk-widgets-buttons-enter.ads
diff --git a/src/fltk-widgets-buttons-light-check.ads b/spec/fltk-widgets-buttons-light-check.ads
index b6f353b..b6f353b 100644
--- a/src/fltk-widgets-buttons-light-check.ads
+++ b/spec/fltk-widgets-buttons-light-check.ads
diff --git a/src/fltk-widgets-buttons-light-radio.ads b/spec/fltk-widgets-buttons-light-radio.ads
index 02c16e9..02c16e9 100644
--- a/src/fltk-widgets-buttons-light-radio.ads
+++ b/spec/fltk-widgets-buttons-light-radio.ads
diff --git a/src/fltk-widgets-buttons-light-round-radio.ads b/spec/fltk-widgets-buttons-light-round-radio.ads
index 34f0c1b..34f0c1b 100644
--- a/src/fltk-widgets-buttons-light-round-radio.ads
+++ b/spec/fltk-widgets-buttons-light-round-radio.ads
diff --git a/src/fltk-widgets-buttons-light-round.ads b/spec/fltk-widgets-buttons-light-round.ads
index 6e07607..6e07607 100644
--- a/src/fltk-widgets-buttons-light-round.ads
+++ b/spec/fltk-widgets-buttons-light-round.ads
diff --git a/src/fltk-widgets-buttons-light.ads b/spec/fltk-widgets-buttons-light.ads
index b1a1cfa..b1a1cfa 100644
--- a/src/fltk-widgets-buttons-light.ads
+++ b/spec/fltk-widgets-buttons-light.ads
diff --git a/src/fltk-widgets-buttons-radio.ads b/spec/fltk-widgets-buttons-radio.ads
index 3aadcac..3aadcac 100644
--- a/src/fltk-widgets-buttons-radio.ads
+++ b/spec/fltk-widgets-buttons-radio.ads
diff --git a/src/fltk-widgets-buttons-repeat.ads b/spec/fltk-widgets-buttons-repeat.ads
index 37380db..37380db 100644
--- a/src/fltk-widgets-buttons-repeat.ads
+++ b/spec/fltk-widgets-buttons-repeat.ads
diff --git a/src/fltk-widgets-buttons-toggle.ads b/spec/fltk-widgets-buttons-toggle.ads
index b9c974b..b9c974b 100644
--- a/src/fltk-widgets-buttons-toggle.ads
+++ b/spec/fltk-widgets-buttons-toggle.ads
diff --git a/src/fltk-widgets-buttons.ads b/spec/fltk-widgets-buttons.ads
index 4c3b633..c5fb917 100644
--- a/src/fltk-widgets-buttons.ads
+++ b/spec/fltk-widgets-buttons.ads
@@ -40,6 +40,10 @@ package FLTK.Widgets.Buttons is
 
 
 
+    function Is_On
+           (This : in Button)
+        return Boolean;
+
     function Get_State
            (This : in Button)
         return State;
@@ -110,6 +114,7 @@ private
     with Inline;
 
 
+    pragma Inline (Is_On);
     pragma Inline (Get_State);
     pragma Inline (Set_State);
     pragma Inline (Set_Only);
diff --git a/src/fltk-widgets-charts.ads b/spec/fltk-widgets-charts.ads
index eb8d75b..eb8d75b 100644
--- a/src/fltk-widgets-charts.ads
+++ b/spec/fltk-widgets-charts.ads
diff --git a/src/fltk-widgets-clocks-updated-round.ads b/spec/fltk-widgets-clocks-updated-round.ads
index d679b0c..d679b0c 100644
--- a/src/fltk-widgets-clocks-updated-round.ads
+++ b/spec/fltk-widgets-clocks-updated-round.ads
diff --git a/src/fltk-widgets-clocks-updated.ads b/spec/fltk-widgets-clocks-updated.ads
index c0700b2..c0700b2 100644
--- a/src/fltk-widgets-clocks-updated.ads
+++ b/spec/fltk-widgets-clocks-updated.ads
diff --git a/src/fltk-widgets-clocks.ads b/spec/fltk-widgets-clocks.ads
index d5b3728..d5b3728 100644
--- a/src/fltk-widgets-clocks.ads
+++ b/spec/fltk-widgets-clocks.ads
diff --git a/src/fltk-widgets-groups-browsers-check.ads b/spec/fltk-widgets-groups-browsers-check.ads
index bd70503..bd70503 100644
--- a/src/fltk-widgets-groups-browsers-check.ads
+++ b/spec/fltk-widgets-groups-browsers-check.ads
diff --git a/src/fltk-widgets-groups-browsers-textline-choice.ads b/spec/fltk-widgets-groups-browsers-textline-choice.ads
index b3c404c..b3c404c 100644
--- a/src/fltk-widgets-groups-browsers-textline-choice.ads
+++ b/spec/fltk-widgets-groups-browsers-textline-choice.ads
diff --git a/src/fltk-widgets-groups-browsers-textline-file.ads b/spec/fltk-widgets-groups-browsers-textline-file.ads
index e679957..e679957 100644
--- a/src/fltk-widgets-groups-browsers-textline-file.ads
+++ b/spec/fltk-widgets-groups-browsers-textline-file.ads
diff --git a/src/fltk-widgets-groups-browsers-textline-hold.ads b/spec/fltk-widgets-groups-browsers-textline-hold.ads
index 7de4445..7de4445 100644
--- a/src/fltk-widgets-groups-browsers-textline-hold.ads
+++ b/spec/fltk-widgets-groups-browsers-textline-hold.ads
diff --git a/src/fltk-widgets-groups-browsers-textline-multi.ads b/spec/fltk-widgets-groups-browsers-textline-multi.ads
index f4a7df2..f4a7df2 100644
--- a/src/fltk-widgets-groups-browsers-textline-multi.ads
+++ b/spec/fltk-widgets-groups-browsers-textline-multi.ads
diff --git a/src/fltk-widgets-groups-browsers-textline.ads b/spec/fltk-widgets-groups-browsers-textline.ads
index 3ef7322..3ef7322 100644
--- a/src/fltk-widgets-groups-browsers-textline.ads
+++ b/spec/fltk-widgets-groups-browsers-textline.ads
diff --git a/src/fltk-widgets-groups-browsers.ads b/spec/fltk-widgets-groups-browsers.ads
index d7b0498..d7b0498 100644
--- a/src/fltk-widgets-groups-browsers.ads
+++ b/spec/fltk-widgets-groups-browsers.ads
diff --git a/src/fltk-widgets-groups-color_choosers.ads b/spec/fltk-widgets-groups-color_choosers.ads
index 4307acd..4307acd 100644
--- a/src/fltk-widgets-groups-color_choosers.ads
+++ b/spec/fltk-widgets-groups-color_choosers.ads
diff --git a/src/fltk-widgets-groups-help_views.ads b/spec/fltk-widgets-groups-help_views.ads
index 8cab6a7..8cab6a7 100644
--- a/src/fltk-widgets-groups-help_views.ads
+++ b/spec/fltk-widgets-groups-help_views.ads
diff --git a/src/fltk-widgets-groups-input_choices.ads b/spec/fltk-widgets-groups-input_choices.ads
index fb092de..fb092de 100644
--- a/src/fltk-widgets-groups-input_choices.ads
+++ b/spec/fltk-widgets-groups-input_choices.ads
diff --git a/src/fltk-widgets-groups-packed.ads b/spec/fltk-widgets-groups-packed.ads
index 60a6c2a..60a6c2a 100644
--- a/src/fltk-widgets-groups-packed.ads
+++ b/spec/fltk-widgets-groups-packed.ads
diff --git a/src/fltk-widgets-groups-scrolls.ads b/spec/fltk-widgets-groups-scrolls.ads
index f4cbad0..f4cbad0 100644
--- a/src/fltk-widgets-groups-scrolls.ads
+++ b/spec/fltk-widgets-groups-scrolls.ads
diff --git a/src/fltk-widgets-groups-spinners.ads b/spec/fltk-widgets-groups-spinners.ads
index 3124dc2..3124dc2 100644
--- a/src/fltk-widgets-groups-spinners.ads
+++ b/spec/fltk-widgets-groups-spinners.ads
diff --git a/src/fltk-widgets-groups-tabbed.ads b/spec/fltk-widgets-groups-tabbed.ads
index c056d29..c056d29 100644
--- a/src/fltk-widgets-groups-tabbed.ads
+++ b/spec/fltk-widgets-groups-tabbed.ads
diff --git a/src/fltk-widgets-groups-text_displays-text_editors.ads b/spec/fltk-widgets-groups-text_displays-text_editors.ads
index e6355c7..e6355c7 100644
--- a/src/fltk-widgets-groups-text_displays-text_editors.ads
+++ b/spec/fltk-widgets-groups-text_displays-text_editors.ads
diff --git a/src/fltk-widgets-groups-text_displays.ads b/spec/fltk-widgets-groups-text_displays.ads
index c56708a..c56708a 100644
--- a/src/fltk-widgets-groups-text_displays.ads
+++ b/spec/fltk-widgets-groups-text_displays.ads
diff --git a/src/fltk-widgets-groups-tiled.ads b/spec/fltk-widgets-groups-tiled.ads
index 9edaf6b..9edaf6b 100644
--- a/src/fltk-widgets-groups-tiled.ads
+++ b/spec/fltk-widgets-groups-tiled.ads
diff --git a/src/fltk-widgets-groups-windows-double-cairo.ads b/spec/fltk-widgets-groups-windows-double-cairo.ads
index 8073a81..8073a81 100644
--- a/src/fltk-widgets-groups-windows-double-cairo.ads
+++ b/spec/fltk-widgets-groups-windows-double-cairo.ads
diff --git a/src/fltk-widgets-groups-windows-double-overlay.ads b/spec/fltk-widgets-groups-windows-double-overlay.ads
index bd60292..bd60292 100644
--- a/src/fltk-widgets-groups-windows-double-overlay.ads
+++ b/spec/fltk-widgets-groups-windows-double-overlay.ads
diff --git a/src/fltk-widgets-groups-windows-double.ads b/spec/fltk-widgets-groups-windows-double.ads
index ed957ac..ed957ac 100644
--- a/src/fltk-widgets-groups-windows-double.ads
+++ b/spec/fltk-widgets-groups-windows-double.ads
diff --git a/src/fltk-widgets-groups-windows-opengl.ads b/spec/fltk-widgets-groups-windows-opengl.ads
index 2ce374d..2ce374d 100644
--- a/src/fltk-widgets-groups-windows-opengl.ads
+++ b/spec/fltk-widgets-groups-windows-opengl.ads
diff --git a/src/fltk-widgets-groups-windows-single-menu.ads b/spec/fltk-widgets-groups-windows-single-menu.ads
index 7b89f29..7b89f29 100644
--- a/src/fltk-widgets-groups-windows-single-menu.ads
+++ b/spec/fltk-widgets-groups-windows-single-menu.ads
diff --git a/src/fltk-widgets-groups-windows-single.ads b/spec/fltk-widgets-groups-windows-single.ads
index bcc08a8..bcc08a8 100644
--- a/src/fltk-widgets-groups-windows-single.ads
+++ b/spec/fltk-widgets-groups-windows-single.ads
diff --git a/src/fltk-widgets-groups-windows.ads b/spec/fltk-widgets-groups-windows.ads
index 6a3233d..6a3233d 100644
--- a/src/fltk-widgets-groups-windows.ads
+++ b/spec/fltk-widgets-groups-windows.ads
diff --git a/src/fltk-widgets-groups-wizards.ads b/spec/fltk-widgets-groups-wizards.ads
index 0ec0e39..0ec0e39 100644
--- a/src/fltk-widgets-groups-wizards.ads
+++ b/spec/fltk-widgets-groups-wizards.ads
diff --git a/src/fltk-widgets-groups.ads b/spec/fltk-widgets-groups.ads
index e66cffa..e66cffa 100644
--- a/src/fltk-widgets-groups.ads
+++ b/spec/fltk-widgets-groups.ads
diff --git a/src/fltk-widgets-inputs-text-file.ads b/spec/fltk-widgets-inputs-text-file.ads
index 1f2883b..1f2883b 100644
--- a/src/fltk-widgets-inputs-text-file.ads
+++ b/spec/fltk-widgets-inputs-text-file.ads
diff --git a/src/fltk-widgets-inputs-text-floating_point.ads b/spec/fltk-widgets-inputs-text-floating_point.ads
index db4e0ae..db4e0ae 100644
--- a/src/fltk-widgets-inputs-text-floating_point.ads
+++ b/spec/fltk-widgets-inputs-text-floating_point.ads
diff --git a/src/fltk-widgets-inputs-text-multiline.ads b/spec/fltk-widgets-inputs-text-multiline.ads
index 36de2e6..36de2e6 100644
--- a/src/fltk-widgets-inputs-text-multiline.ads
+++ b/spec/fltk-widgets-inputs-text-multiline.ads
diff --git a/src/fltk-widgets-inputs-text-outputs-multiline.ads b/spec/fltk-widgets-inputs-text-outputs-multiline.ads
index 13da14d..13da14d 100644
--- a/src/fltk-widgets-inputs-text-outputs-multiline.ads
+++ b/spec/fltk-widgets-inputs-text-outputs-multiline.ads
diff --git a/src/fltk-widgets-inputs-text-outputs.ads b/spec/fltk-widgets-inputs-text-outputs.ads
index 851451e..851451e 100644
--- a/src/fltk-widgets-inputs-text-outputs.ads
+++ b/spec/fltk-widgets-inputs-text-outputs.ads
diff --git a/src/fltk-widgets-inputs-text-secret.ads b/spec/fltk-widgets-inputs-text-secret.ads
index cd98283..cd98283 100644
--- a/src/fltk-widgets-inputs-text-secret.ads
+++ b/spec/fltk-widgets-inputs-text-secret.ads
diff --git a/src/fltk-widgets-inputs-text-whole_number.ads b/spec/fltk-widgets-inputs-text-whole_number.ads
index 9c13dc6..9c13dc6 100644
--- a/src/fltk-widgets-inputs-text-whole_number.ads
+++ b/spec/fltk-widgets-inputs-text-whole_number.ads
diff --git a/src/fltk-widgets-inputs-text.ads b/spec/fltk-widgets-inputs-text.ads
index c73e869..c73e869 100644
--- a/src/fltk-widgets-inputs-text.ads
+++ b/spec/fltk-widgets-inputs-text.ads
diff --git a/src/fltk-widgets-inputs.ads b/spec/fltk-widgets-inputs.ads
index c7f9c17..c7f9c17 100644
--- a/src/fltk-widgets-inputs.ads
+++ b/spec/fltk-widgets-inputs.ads
diff --git a/src/fltk-widgets-menus-choices.ads b/spec/fltk-widgets-menus-choices.ads
index 7a5c225..7a5c225 100644
--- a/src/fltk-widgets-menus-choices.ads
+++ b/spec/fltk-widgets-menus-choices.ads
diff --git a/src/fltk-widgets-menus-menu_bars-systemwide.ads b/spec/fltk-widgets-menus-menu_bars-systemwide.ads
index 77dba9f..77dba9f 100644
--- a/src/fltk-widgets-menus-menu_bars-systemwide.ads
+++ b/spec/fltk-widgets-menus-menu_bars-systemwide.ads
diff --git a/src/fltk-widgets-menus-menu_bars.ads b/spec/fltk-widgets-menus-menu_bars.ads
index fc4b3ce..fc4b3ce 100644
--- a/src/fltk-widgets-menus-menu_bars.ads
+++ b/spec/fltk-widgets-menus-menu_bars.ads
diff --git a/src/fltk-widgets-menus-menu_buttons.ads b/spec/fltk-widgets-menus-menu_buttons.ads
index b265d7c..b265d7c 100644
--- a/src/fltk-widgets-menus-menu_buttons.ads
+++ b/spec/fltk-widgets-menus-menu_buttons.ads
diff --git a/src/fltk-widgets-menus.ads b/spec/fltk-widgets-menus.ads
index bce29dd..bce29dd 100644
--- a/src/fltk-widgets-menus.ads
+++ b/spec/fltk-widgets-menus.ads
diff --git a/src/fltk-widgets-positioners.ads b/spec/fltk-widgets-positioners.ads
index 0603239..0603239 100644
--- a/src/fltk-widgets-positioners.ads
+++ b/spec/fltk-widgets-positioners.ads
diff --git a/src/fltk-widgets-progress_bars.ads b/spec/fltk-widgets-progress_bars.ads
index 01fe674..01fe674 100644
--- a/src/fltk-widgets-progress_bars.ads
+++ b/spec/fltk-widgets-progress_bars.ads
diff --git a/src/fltk-widgets-valuators-adjusters.ads b/spec/fltk-widgets-valuators-adjusters.ads
index c980d53..c980d53 100644
--- a/src/fltk-widgets-valuators-adjusters.ads
+++ b/spec/fltk-widgets-valuators-adjusters.ads
diff --git a/src/fltk-widgets-valuators-counters-simple.ads b/spec/fltk-widgets-valuators-counters-simple.ads
index fd7e0e6..fd7e0e6 100644
--- a/src/fltk-widgets-valuators-counters-simple.ads
+++ b/spec/fltk-widgets-valuators-counters-simple.ads
diff --git a/src/fltk-widgets-valuators-counters.ads b/spec/fltk-widgets-valuators-counters.ads
index fd3cea8..fd3cea8 100644
--- a/src/fltk-widgets-valuators-counters.ads
+++ b/spec/fltk-widgets-valuators-counters.ads
diff --git a/src/fltk-widgets-valuators-dials-fill.ads b/spec/fltk-widgets-valuators-dials-fill.ads
index fdf02a8..fdf02a8 100644
--- a/src/fltk-widgets-valuators-dials-fill.ads
+++ b/spec/fltk-widgets-valuators-dials-fill.ads
diff --git a/src/fltk-widgets-valuators-dials-line.ads b/spec/fltk-widgets-valuators-dials-line.ads
index f21d02c..f21d02c 100644
--- a/src/fltk-widgets-valuators-dials-line.ads
+++ b/spec/fltk-widgets-valuators-dials-line.ads
diff --git a/src/fltk-widgets-valuators-dials.ads b/spec/fltk-widgets-valuators-dials.ads
index 036c6f1..036c6f1 100644
--- a/src/fltk-widgets-valuators-dials.ads
+++ b/spec/fltk-widgets-valuators-dials.ads
diff --git a/src/fltk-widgets-valuators-rollers.ads b/spec/fltk-widgets-valuators-rollers.ads
index 7a5effc..7a5effc 100644
--- a/src/fltk-widgets-valuators-rollers.ads
+++ b/spec/fltk-widgets-valuators-rollers.ads
diff --git a/src/fltk-widgets-valuators-sliders-fill.ads b/spec/fltk-widgets-valuators-sliders-fill.ads
index 56d71a2..56d71a2 100644
--- a/src/fltk-widgets-valuators-sliders-fill.ads
+++ b/spec/fltk-widgets-valuators-sliders-fill.ads
diff --git a/src/fltk-widgets-valuators-sliders-horizontal.ads b/spec/fltk-widgets-valuators-sliders-horizontal.ads
index 94d6eb3..94d6eb3 100644
--- a/src/fltk-widgets-valuators-sliders-horizontal.ads
+++ b/spec/fltk-widgets-valuators-sliders-horizontal.ads
diff --git a/src/fltk-widgets-valuators-sliders-horizontal_fill.ads b/spec/fltk-widgets-valuators-sliders-horizontal_fill.ads
index be365db..be365db 100644
--- a/src/fltk-widgets-valuators-sliders-horizontal_fill.ads
+++ b/spec/fltk-widgets-valuators-sliders-horizontal_fill.ads
diff --git a/src/fltk-widgets-valuators-sliders-horizontal_nice.ads b/spec/fltk-widgets-valuators-sliders-horizontal_nice.ads
index d049586..d049586 100644
--- a/src/fltk-widgets-valuators-sliders-horizontal_nice.ads
+++ b/spec/fltk-widgets-valuators-sliders-horizontal_nice.ads
diff --git a/src/fltk-widgets-valuators-sliders-nice.ads b/spec/fltk-widgets-valuators-sliders-nice.ads
index b56c783..b56c783 100644
--- a/src/fltk-widgets-valuators-sliders-nice.ads
+++ b/spec/fltk-widgets-valuators-sliders-nice.ads
diff --git a/src/fltk-widgets-valuators-sliders-scrollbars.ads b/spec/fltk-widgets-valuators-sliders-scrollbars.ads
index 79b4c69..79b4c69 100644
--- a/src/fltk-widgets-valuators-sliders-scrollbars.ads
+++ b/spec/fltk-widgets-valuators-sliders-scrollbars.ads
diff --git a/src/fltk-widgets-valuators-sliders-value-horizontal.ads b/spec/fltk-widgets-valuators-sliders-value-horizontal.ads
index 99d3993..99d3993 100644
--- a/src/fltk-widgets-valuators-sliders-value-horizontal.ads
+++ b/spec/fltk-widgets-valuators-sliders-value-horizontal.ads
diff --git a/src/fltk-widgets-valuators-sliders-value.ads b/spec/fltk-widgets-valuators-sliders-value.ads
index f9f849f..f9f849f 100644
--- a/src/fltk-widgets-valuators-sliders-value.ads
+++ b/spec/fltk-widgets-valuators-sliders-value.ads
diff --git a/src/fltk-widgets-valuators-sliders.ads b/spec/fltk-widgets-valuators-sliders.ads
index 786a9f5..786a9f5 100644
--- a/src/fltk-widgets-valuators-sliders.ads
+++ b/spec/fltk-widgets-valuators-sliders.ads
diff --git a/src/fltk-widgets-valuators-value_inputs.ads b/spec/fltk-widgets-valuators-value_inputs.ads
index 7392e78..7392e78 100644
--- a/src/fltk-widgets-valuators-value_inputs.ads
+++ b/spec/fltk-widgets-valuators-value_inputs.ads
diff --git a/src/fltk-widgets-valuators-value_outputs.ads b/spec/fltk-widgets-valuators-value_outputs.ads
index a8447a7..a8447a7 100644
--- a/src/fltk-widgets-valuators-value_outputs.ads
+++ b/spec/fltk-widgets-valuators-value_outputs.ads
diff --git a/src/fltk-widgets-valuators.ads b/spec/fltk-widgets-valuators.ads
index 1e60f4b..1e60f4b 100644
--- a/src/fltk-widgets-valuators.ads
+++ b/spec/fltk-widgets-valuators.ads
diff --git a/src/fltk-widgets.ads b/spec/fltk-widgets.ads
index 07f9b2e..07f9b2e 100644
--- a/src/fltk-widgets.ads
+++ b/spec/fltk-widgets.ads
diff --git a/src/fltk.ads b/spec/fltk.ads
index 785ad23..6e5ef0f 100644
--- a/src/fltk.ads
+++ b/spec/fltk.ads
@@ -90,12 +90,36 @@ package FLTK is
 
 
 
+    --  This should be a bitmask, except there are magic values...
     type Alignment is private;
-    Align_Center : constant Alignment;
-    Align_Top    : constant Alignment;
-    Align_Bottom : constant Alignment;
-    Align_Left   : constant Alignment;
-    Align_Right  : constant Alignment;
+
+    function "+" (Left, Right : in Alignment) return Alignment;
+    function "-" (Left, Right : in Alignment) return Alignment;
+
+    Align_Center             : constant Alignment;
+    Align_Top                : constant Alignment;
+    Align_Bottom             : constant Alignment;
+    Align_Left               : constant Alignment;
+    Align_Right              : constant Alignment;
+    Align_Inside             : constant Alignment;
+    Align_Text_Over_Image    : constant Alignment;
+    Align_Image_Over_Text    : constant Alignment;
+    Align_Clip               : constant Alignment;
+    Align_Wrap               : constant Alignment;
+    Align_Image_Next_To_Text : constant Alignment;
+    Align_Text_Next_To_Image : constant Alignment;
+    Align_Image_Backdrop     : constant Alignment;
+    Align_Top_Left           : constant Alignment;
+    Align_Top_Right          : constant Alignment;
+    Align_Bottom_Left        : constant Alignment;
+    Align_Bottom_Right       : constant Alignment;
+    Align_Left_Top           : constant Alignment;
+    Align_Right_Top          : constant Alignment;
+    Align_Left_Bottom        : constant Alignment;
+    Align_Right_Bottom       : constant Alignment;
+    Align_Nowrap             : constant Alignment;
+    Align_All_Position       : constant Alignment;
+    Align_All_Image          : constant Alignment;
 
 
 
@@ -432,12 +456,36 @@ private
 
 
 
-    type Alignment is new Interfaces.Unsigned_16;
-    Align_Center : constant Alignment := 0;
-    Align_Top    : constant Alignment := 1;
-    Align_Bottom : constant Alignment := 2;
-    Align_Left   : constant Alignment := 4;
-    Align_Right  : constant Alignment := 8;
+    --  Default value here is Align_Center
+    type Alignment is mod 2 ** 16
+    with Default_Value => 0;
+
+    for Alignment'Size use 16;
+
+    pragma Import (C, Align_Center,             "fl_align_center");
+    pragma Import (C, Align_Top,                "fl_align_top");
+    pragma Import (C, Align_Bottom,             "fl_align_bottom");
+    pragma Import (C, Align_Left,               "fl_align_left");
+    pragma Import (C, Align_Right,              "fl_align_right");
+    pragma Import (C, Align_Inside,             "fl_align_inside");
+    pragma Import (C, Align_Text_Over_Image,    "fl_align_text_over_image");
+    pragma Import (C, Align_Image_Over_Text,    "fl_align_image_over_text");
+    pragma Import (C, Align_Clip,               "fl_align_clip");
+    pragma Import (C, Align_Wrap,               "fl_align_wrap");
+    pragma Import (C, Align_Image_Next_To_Text, "fl_align_image_next_to_text");
+    pragma Import (C, Align_Text_Next_To_Image, "fl_align_text_next_to_image");
+    pragma Import (C, Align_Image_Backdrop,     "fl_align_image_backdrop");
+    pragma Import (C, Align_Top_Left,           "fl_align_top_left");
+    pragma Import (C, Align_Top_Right,          "fl_align_top_right");
+    pragma Import (C, Align_Bottom_Left,        "fl_align_bottom_left");
+    pragma Import (C, Align_Bottom_Right,       "fl_align_bottom_right");
+    pragma Import (C, Align_Left_Top,           "fl_align_left_top");
+    pragma Import (C, Align_Right_Top,          "fl_align_right_top");
+    pragma Import (C, Align_Left_Bottom,        "fl_align_left_bottom");
+    pragma Import (C, Align_Right_Bottom,       "fl_align_right_bottom");
+    pragma Import (C, Align_Nowrap,             "fl_align_nowrap");
+    pragma Import (C, Align_All_Position,       "fl_align_all_position");
+    pragma Import (C, Align_All_Image,          "fl_align_all_image");
 
 
 
diff --git a/src/c_fl.cpp b/src/c_fl.cpp
deleted file mode 100644
index 50eed9e..0000000
--- a/src/c_fl.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-//  Programmed by Jedidiah Barber
-//  Released into the public domain
-
-
-#include <FL/Enumerations.H>
-#include <FL/Fl.H>
-#include "c_fl.h"
-
-
-
-
-const short fl_mod_command = FL_COMMAND >> 16;
-
-
-
-
-size_t c_pointer_size() {
-    return sizeof(void*);
-}
-
-
-
-
-unsigned int fl_enum_rgb_color(unsigned char r, unsigned char g, unsigned char b) {
-    return fl_rgb_color(r, g, b);
-}
-
-
-
-
-int fl_abi_check(int v) {
-    return Fl::abi_check(v);
-}
-
-int fl_abi_version() {
-    return Fl::abi_version();
-}
-
-int fl_api_version() {
-    return Fl::api_version();
-}
-
-double fl_version() {
-    return Fl::version();
-}
-
-
-
-
-void fl_awake() {
-    Fl::awake();
-}
-
-void fl_lock() {
-    Fl::lock();
-}
-
-void fl_unlock() {
-    Fl::unlock();
-}
-
-
-
-
-int fl_get_damage() {
-    return Fl::damage();
-}
-
-void fl_set_damage(int v) {
-    Fl::damage(v);
-}
-
-void fl_flush() {
-    Fl::flush();
-}
-
-void fl_redraw() {
-    Fl::redraw();
-}
-
-
-
-
-int fl_check() {
-    return Fl::check();
-}
-
-int fl_ready() {
-    return Fl::ready();
-}
-
-int fl_wait() {
-    return Fl::wait();
-}
-
-int fl_wait2(double s) {
-    return Fl::wait(s);
-}
-
-int fl_run() {
-    return Fl::run();
-}
-
-
diff --git a/src/c_fl.h b/src/c_fl.h
deleted file mode 100644
index 8ef9df5..0000000
--- a/src/c_fl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-//  Programmed by Jedidiah Barber
-//  Released into the public domain
-
-
-#ifndef FL_GUARD
-#define FL_GUARD
-
-
-extern "C" const short fl_mod_command;
-
-
-extern "C" size_t c_pointer_size();
-
-
-extern "C" unsigned int fl_enum_rgb_color(unsigned char r, unsigned char g, unsigned char b);
-
-
-extern "C" int fl_abi_check(int v);
-extern "C" int fl_abi_version();
-extern "C" int fl_api_version();
-extern "C" double fl_version();
-
-
-extern "C" void fl_awake();
-extern "C" void fl_lock();
-extern "C" void fl_unlock();
-
-
-extern "C" int fl_get_damage();
-extern "C" void fl_set_damage(int v);
-extern "C" void fl_flush();
-extern "C" void fl_redraw();
-
-
-extern "C" int fl_check();
-extern "C" int fl_ready();
-extern "C" int fl_wait();
-extern "C" int fl_wait2(double s);
-extern "C" int fl_run();
-
-
-#endif
-
-
diff --git a/test/arc.adb b/test/arc.adb
new file mode 100644
index 0000000..88d2214
--- /dev/null
+++ b/test/arc.adb
@@ -0,0 +1,149 @@
+
+
+--  Programmed by Jedidiah Barber
+--  Released into the public domain
+
+
+--  Arc drawing test program functionality duplicated in Ada
+
+
+with
+
+    FLTK.Draw,
+    FLTK.Widgets.Groups.Windows.Double,
+    FLTK.Widgets.Valuators.Sliders.Value.Horizontal;
+
+
+function Arc
+    return Integer
+is
+
+
+    package FDR renames FLTK.Draw;
+    package WD  renames FLTK.Widgets.Groups.Windows.Double;
+    package HV  renames FLTK.Widgets.Valuators.Sliders.Value.Horizontal;
+
+
+    --  More convenient to have these all as floats instead of integers
+    Arg_Values : array (Positive range <>) of aliased Long_Float :=
+        (140.0, 140.0, 50.0, 0.0, 360.0, 0.0);
+
+
+    type Drawing_Widget is new FLTK.Widgets.Widget with null record;
+
+    procedure Draw
+           (This : in out Drawing_Widget) is
+    begin
+        FDR.Push_Clip (This.Get_X, This.Get_Y, This.Get_W, This.Get_H);
+        FDR.Set_Color (FLTK.Dark3_Color);
+        FDR.Rect_Fill (This.Get_X, This.Get_Y, This.Get_W, This.Get_H);
+        FDR.Push_Matrix;
+        if Arg_Values (6) > 0.001 then
+            FDR.Translate
+               (Long_Float (This.Get_X) + Long_Float (This.Get_W) / 2.0,
+                Long_Float (This.Get_Y) + Long_Float (This.Get_H) / 2.0);
+            FDR.Rotate (Arg_Values (6));
+            FDR.Translate
+               (-1.0 * (Long_Float (This.Get_X) + Long_Float (This.Get_W) / 2.0),
+                -1.0 * (Long_Float (This.Get_Y) + Long_Float (This.Get_H) / 2.0));
+        end if;
+        FDR.Set_Color (FLTK.White_Color);
+        FDR.Translate (Long_Float (This.Get_X), Long_Float (This.Get_Y));
+        FDR.Begin_Complex_Polygon;
+        FDR.Arc (Arg_Values (1), Arg_Values (2), Arg_Values (3), Arg_Values (4), Arg_Values (5));
+        FDR.Gap;
+        FDR.Arc (140.0, 140.0, 20.0, 0.0, -360.0);
+        FDR.End_Complex_Polygon;
+        FDR.Set_Color (FLTK.Red_Color);
+        FDR.Begin_Line;
+        FDR.Arc (Arg_Values (1), Arg_Values (2), Arg_Values (3), Arg_Values (4), Arg_Values (5));
+        FDR.End_Line;
+        FDR.Pop_Matrix;
+        FDR.Pop_Clip;
+    end Draw;
+
+
+    The_Window : WD.Double_Window := WD.Forge.Create (300, 460, "Arc Testing");
+
+    The_Drawing : Drawing_Widget :=
+       (FLTK.Widgets.Forge.Create (The_Window, 10, 10, 280, 280)
+        with null record);
+
+
+    type My_Slider is new HV.Horizontal_Value_Slider with record
+        Index : Integer range Arg_Values'Range;
+    end record;
+
+
+    --  Trying out some stack allocation for this one
+
+    Slider_One   : aliased My_Slider :=
+       (HV.Forge.Create (The_Window, 50, 300, 240, 25, "X")
+        with Index => 1);
+
+    Slider_Two   : aliased My_Slider :=
+       (HV.Forge.Create (The_Window, 50, 325, 240, 25, "Y")
+        with Index => 2);
+
+    Slider_Three : aliased My_Slider :=
+       (HV.Forge.Create (The_Window, 50, 350, 240, 25, "R")
+        with Index => 3);
+
+    Slider_Four  : aliased My_Slider :=
+       (HV.Forge.Create (The_Window, 50, 375, 240, 25, "start")
+        with Index => 4);
+
+    Slider_Five  : aliased My_Slider :=
+       (HV.Forge.Create (The_Window, 50, 400, 240, 25, "end")
+        with Index => 5);
+
+    Slider_Six   : aliased My_Slider :=
+       (HV.Forge.Create (The_Window, 50, 425, 240, 25, "rotate")
+        with Index => 6);
+
+
+    type Slider_Access is access all My_Slider;
+
+    Sliders : array (Positive range <>) of Slider_Access :=
+        (Slider_One'Access,  Slider_Two'Access,  Slider_Three'Access,
+         Slider_Four'Access, Slider_Five'Access, Slider_Six'Access);
+
+
+    procedure Slider_Callback
+           (Item : in out FLTK.Widgets.Widget'Class)
+    is
+        Slide : My_Slider renames My_Slider (Item);
+    begin
+        Arg_Values (Slide.Index) := Slide.Get_Value;
+        The_Drawing.Redraw;
+    end Slider_Callback;
+
+
+begin
+
+
+    for Place in Integer range 1 .. 6 loop
+        if Place <= 3 then
+            Sliders (Place).Set_Minimum (0.0);
+            Sliders (Place).Set_Maximum (300.0);
+        elsif Place = 6 then
+            Sliders (Place).Set_Minimum (0.0);
+            Sliders (Place).Set_Maximum (360.0);
+        else
+            Sliders (Place).Set_Minimum (-360.0);
+            Sliders (Place).Set_Maximum (360.0);
+        end if;
+        Sliders (Place).Set_Step_Bottom (1);
+        Sliders (Place).Set_Value (Arg_Values (Place));
+        Sliders (Place).Set_Alignment (FLTK.Align_Left);
+        Sliders (Place).Set_Callback (Slider_Callback'Unrestricted_Access);
+    end loop;
+
+    The_Window.Show_With_Args;
+
+    return FLTK.Run;
+
+
+end Arc;
+
+
diff --git a/test/ask.adb b/test/ask.adb
new file mode 100644
index 0000000..201d245
--- /dev/null
+++ b/test/ask.adb
@@ -0,0 +1,144 @@
+
+
+--  Programmed by Jedidiah Barber
+--  Released into the public domain
+
+
+--  Standard dialog test program functionality reproduced in Ada
+
+
+with
+
+    Ada.Characters.Latin_1,
+    Ada.Command_Line,
+    FLTK.Asks,
+    FLTK.Static,
+    FLTK.Widgets.Boxes,
+    FLTK.Widgets.Buttons,
+    FLTK.Widgets.Buttons.Enter,
+    FLTK.Widgets.Inputs.Text,
+    FLTK.Widgets.Groups.Windows.Double;
+
+use type
+
+    FLTK.Asks.Choice_Result,
+    FLTK.Color;
+
+
+function Ask
+    return Integer
+is
+
+
+    package Latin renames Ada.Characters.Latin_1;
+    package ACom  renames Ada.Command_Line;
+
+    package AK  renames FLTK.Asks;
+    package Stc renames FLTK.Static;
+    package BX  renames FLTK.Widgets.Boxes;
+    package BTN renames FLTK.Widgets.Buttons;
+    package ENT renames FLTK.Widgets.Buttons.Enter;
+    package INP renames FLTK.Widgets.Inputs.Text;
+    package WD  renames FLTK.Widgets.Groups.Windows.Double;
+
+
+    procedure Update_Input_Text
+           (Item : in out FLTK.Widgets.Widget'Class;
+            Text : in     String) is
+    begin
+        Item.Set_Label (Text);
+        Item.Redraw;
+    end Update_Input_Text;
+
+
+    procedure Rename_Me
+           (Item : in out FLTK.Widgets.Widget'Class)
+    is
+        Input : String := AK.Text_Input ("Input:", Item.Get_Label);
+    begin
+        Update_Input_Text (Item, Input);
+    end Rename_Me;
+
+
+    procedure Rename_Me_Pwd
+           (Item : in out FLTK.Widgets.Widget'Class)
+    is
+        Input : String := AK.Password ("Input PWD:", Item.Get_Label);
+    begin
+        Update_Input_Text (Item, Input);
+    end Rename_Me_Pwd;
+
+
+    procedure Window_Callback
+           (Item : in out FLTK.Widgets.Widget'Class)
+    is
+        Hotspot : Boolean := AK.Get_Message_Hotspot;
+        Reply   : AK.Choice_Result;
+    begin
+        AK.Set_Message_Hotspot (False);
+        AK.Set_Message_Title ("Note: No hotspot set for this dialog");
+        Reply := AK.Choice ("Are you sure you want to quit?", "Cancel", "Quit", "Dunno");
+        AK.Set_Message_Hotspot (Hotspot);
+        if Reply = AK.Second then
+            ACom.Set_Exit_Status (ACom.Success);
+            WD.Double_Window (Item).Hide;
+        elsif Reply = AK.Third then
+            AK.Message_Box ("Well, maybe you should know before we quit.");
+        end if;
+    end Window_Callback;
+
+
+    Stop : Boolean := False;
+
+    procedure Timer_Callback is
+        Change : Long_Float := 5.0;
+        Message_Icon : BX.Box_Reference := AK.Get_Message_Icon;
+        My_Color : FLTK.Color;
+    begin
+        Stc.Repeat_Timeout (Change, Timer_Callback'Unrestricted_Access);
+
+        if Stop then
+            Message_Icon.Set_Background_Color (FLTK.White_Color);
+            return;
+        end if;
+
+        My_Color := Message_Icon.Get_Background_Color;
+        My_Color := (My_Color + 1) mod 32;
+        if My_Color = Message_Icon.Get_Label_Color then
+            My_Color := My_Color + 1;
+        end if;
+        Message_Icon.Set_Background_Color (My_Color);
+
+        Stop := AK.Choice
+           ("Timeout. Click the 'Close' button." & Latin.LF &
+            "Note: This message is blocked in FLTK 1.3" & Latin.LF &
+            "if another message window is open." & Latin.LF &
+            "This message should pop up every 5 seconds.",
+            "Close", "Stop these funny popups") = AK.Second;
+    end Timer_Callback;
+
+
+    The_Window : WD.Double_Window := WD.Forge.Create (200, 105, "Ask Test");
+
+    Button_One : ENT.Enter_Button := ENT.Forge.Create (The_Window, 20, 10, 160, 35, "Test text");
+    Button_Two : BTN.Button       := BTN.Forge.Create (The_Window, 20, 50, 160, 35, "MyPassword");
+
+
+begin
+
+
+    Button_One.Set_Callback (Rename_Me'Unrestricted_Access);
+    Button_Two.Set_Callback (Rename_Me_Pwd'Unrestricted_Access);
+
+    The_Window.Set_Resizable (Button_One);
+    The_Window.Set_Callback (Window_Callback'Unrestricted_Access);
+    The_Window.Show_With_Args;
+
+    Stc.Add_Timeout (5.0, Timer_Callback'Unrestricted_Access);
+
+    return FLTK.Run;
+
+
+end Ask;
+
+
diff --git a/test/bitmap.adb b/test/bitmap.adb
new file mode 100644
index 0000000..af8ddfa
--- /dev/null
+++ b/test/bitmap.adb
@@ -0,0 +1,163 @@
+
+
+--  Programmed by Jedidiah Barber
+--  Released into the public domain
+
+
+--  Bitmap label test program functionality reproduced in Ada
+
+
+with
+
+    FLTK.Images.Bitmaps,
+    FLTK.Widgets.Buttons,
+    FLTK.Widgets.Buttons.Toggle,
+    FLTK.Widgets.Groups.Windows.Double;
+
+use type
+
+    FLTK.Alignment,
+    FLTK.Widgets.Buttons.State;
+
+
+function Bitmap
+    return Integer
+is
+
+
+    package IT  renames FLTK.Images.Bitmaps;
+    package BTN renames FLTK.Widgets.Buttons;
+    package TOG renames FLTK.Widgets.Buttons.Toggle;
+    package WD  renames FLTK.Widgets.Groups.Windows.Double;
+
+
+    Sorceress_Width  : constant Integer := 75;
+    Sorceress_Height : constant Integer := 75;
+
+
+    Sorceress_Bits : constant FLTK.Color_Component_Array :=
+    (16#fc#, 16#7e#, 16#40#, 16#20#, 16#90#, 16#00#, 16#07#, 16#80#, 16#23#, 16#00#, 16#00#, 16#c6#,
+     16#c1#, 16#41#, 16#98#, 16#b8#, 16#01#, 16#07#, 16#66#, 16#00#, 16#15#, 16#9f#, 16#03#, 16#47#,
+     16#8c#, 16#c6#, 16#dc#, 16#7b#, 16#cc#, 16#00#, 16#b0#, 16#71#, 16#0e#, 16#4d#, 16#06#, 16#66#,
+     16#73#, 16#8e#, 16#8f#, 16#01#, 16#18#, 16#c4#, 16#39#, 16#4b#, 16#02#, 16#23#, 16#0c#, 16#04#,
+     16#1e#, 16#03#, 16#0c#, 16#08#, 16#c7#, 16#ef#, 16#08#, 16#30#, 16#06#, 16#07#, 16#1c#, 16#02#,
+     16#06#, 16#30#, 16#18#, 16#ae#, 16#c8#, 16#98#, 16#3f#, 16#78#, 16#20#, 16#06#, 16#02#, 16#20#,
+     16#60#, 16#a0#, 16#c4#, 16#1d#, 16#c0#, 16#ff#, 16#41#, 16#04#, 16#fa#, 16#63#, 16#80#, 16#a1#,
+     16#a4#, 16#3d#, 16#00#, 16#84#, 16#bf#, 16#04#, 16#0f#, 16#06#, 16#fc#, 16#a1#, 16#34#, 16#6b#,
+     16#01#, 16#1c#, 16#c9#, 16#05#, 16#06#, 16#c7#, 16#06#, 16#be#, 16#11#, 16#1e#, 16#43#, 16#30#,
+     16#91#, 16#05#, 16#c3#, 16#61#, 16#02#, 16#30#, 16#1b#, 16#30#, 16#cc#, 16#20#, 16#11#, 16#00#,
+     16#c1#, 16#3c#, 16#03#, 16#20#, 16#0a#, 16#00#, 16#e8#, 16#60#, 16#21#, 16#00#, 16#61#, 16#1b#,
+     16#c1#, 16#63#, 16#08#, 16#f0#, 16#c6#, 16#c7#, 16#21#, 16#03#, 16#f8#, 16#08#, 16#e1#, 16#cf#,
+     16#0a#, 16#fc#, 16#4d#, 16#99#, 16#43#, 16#07#, 16#3c#, 16#0c#, 16#f1#, 16#9f#, 16#0b#, 16#fc#,
+     16#5b#, 16#81#, 16#47#, 16#02#, 16#16#, 16#04#, 16#31#, 16#1c#, 16#0b#, 16#1f#, 16#17#, 16#89#,
+     16#4d#, 16#06#, 16#1a#, 16#04#, 16#31#, 16#38#, 16#02#, 16#07#, 16#56#, 16#89#, 16#49#, 16#04#,
+     16#0b#, 16#04#, 16#b1#, 16#72#, 16#82#, 16#a1#, 16#54#, 16#9a#, 16#49#, 16#04#, 16#1d#, 16#66#,
+     16#50#, 16#e7#, 16#c2#, 16#f0#, 16#54#, 16#9a#, 16#58#, 16#04#, 16#0d#, 16#62#, 16#c1#, 16#1f#,
+     16#44#, 16#fc#, 16#51#, 16#90#, 16#90#, 16#04#, 16#86#, 16#63#, 16#e0#, 16#74#, 16#04#, 16#ef#,
+     16#31#, 16#1a#, 16#91#, 16#00#, 16#02#, 16#e2#, 16#c1#, 16#fd#, 16#84#, 16#f9#, 16#30#, 16#0a#,
+     16#91#, 16#00#, 16#82#, 16#a9#, 16#c0#, 16#b9#, 16#84#, 16#f9#, 16#31#, 16#16#, 16#81#, 16#00#,
+     16#42#, 16#a9#, 16#db#, 16#7f#, 16#0c#, 16#ff#, 16#1c#, 16#16#, 16#11#, 16#00#, 16#02#, 16#28#,
+     16#0b#, 16#07#, 16#08#, 16#60#, 16#1c#, 16#02#, 16#91#, 16#00#, 16#46#, 16#29#, 16#0e#, 16#00#,
+     16#00#, 16#00#, 16#10#, 16#16#, 16#11#, 16#02#, 16#06#, 16#29#, 16#04#, 16#00#, 16#00#, 16#00#,
+     16#10#, 16#16#, 16#91#, 16#06#, 16#a6#, 16#2a#, 16#04#, 16#00#, 16#00#, 16#00#, 16#18#, 16#24#,
+     16#91#, 16#04#, 16#86#, 16#2a#, 16#04#, 16#00#, 16#00#, 16#00#, 16#18#, 16#27#, 16#93#, 16#04#,
+     16#96#, 16#4a#, 16#04#, 16#00#, 16#00#, 16#00#, 16#04#, 16#02#, 16#91#, 16#04#, 16#86#, 16#4a#,
+     16#0c#, 16#00#, 16#00#, 16#00#, 16#1e#, 16#23#, 16#93#, 16#04#, 16#56#, 16#88#, 16#08#, 16#00#,
+     16#00#, 16#00#, 16#90#, 16#21#, 16#93#, 16#04#, 16#52#, 16#0a#, 16#09#, 16#80#, 16#01#, 16#00#,
+     16#d0#, 16#21#, 16#95#, 16#04#, 16#57#, 16#0a#, 16#0f#, 16#80#, 16#27#, 16#00#, 16#d8#, 16#20#,
+     16#9d#, 16#04#, 16#5d#, 16#08#, 16#1c#, 16#80#, 16#67#, 16#00#, 16#e4#, 16#01#, 16#85#, 16#04#,
+     16#79#, 16#8a#, 16#3f#, 16#00#, 16#00#, 16#00#, 16#f4#, 16#11#, 16#85#, 16#06#, 16#39#, 16#08#,
+     16#7d#, 16#00#, 16#00#, 16#18#, 16#b7#, 16#10#, 16#81#, 16#03#, 16#29#, 16#12#, 16#cb#, 16#00#,
+     16#7e#, 16#30#, 16#28#, 16#00#, 16#85#, 16#03#, 16#29#, 16#10#, 16#be#, 16#81#, 16#ff#, 16#27#,
+     16#0c#, 16#10#, 16#85#, 16#03#, 16#29#, 16#32#, 16#fa#, 16#c1#, 16#ff#, 16#27#, 16#94#, 16#11#,
+     16#85#, 16#03#, 16#28#, 16#20#, 16#6c#, 16#e1#, 16#ff#, 16#07#, 16#0c#, 16#01#, 16#85#, 16#01#,
+     16#28#, 16#62#, 16#5c#, 16#e3#, 16#8f#, 16#03#, 16#4e#, 16#91#, 16#80#, 16#05#, 16#39#, 16#40#,
+     16#f4#, 16#c2#, 16#ff#, 16#00#, 16#9f#, 16#91#, 16#84#, 16#05#, 16#31#, 16#c6#, 16#e8#, 16#07#,
+     16#7f#, 16#80#, 16#cd#, 16#00#, 16#c4#, 16#04#, 16#31#, 16#06#, 16#c9#, 16#0e#, 16#00#, 16#c0#,
+     16#48#, 16#88#, 16#e0#, 16#04#, 16#79#, 16#04#, 16#db#, 16#12#, 16#00#, 16#30#, 16#0c#, 16#c8#,
+     16#e4#, 16#04#, 16#6d#, 16#06#, 16#b6#, 16#23#, 16#00#, 16#18#, 16#1c#, 16#c0#, 16#84#, 16#04#,
+     16#25#, 16#0c#, 16#ff#, 16#c2#, 16#00#, 16#4e#, 16#06#, 16#b0#, 16#80#, 16#04#, 16#3f#, 16#8a#,
+     16#b3#, 16#83#, 16#ff#, 16#c3#, 16#03#, 16#91#, 16#84#, 16#04#, 16#2e#, 16#d8#, 16#0f#, 16#3f#,
+     16#00#, 16#00#, 16#5f#, 16#83#, 16#84#, 16#04#, 16#2a#, 16#70#, 16#fd#, 16#7f#, 16#00#, 16#00#,
+     16#c8#, 16#c0#, 16#84#, 16#04#, 16#4b#, 16#e2#, 16#2f#, 16#01#, 16#00#, 16#08#, 16#58#, 16#60#,
+     16#80#, 16#04#, 16#5b#, 16#82#, 16#ff#, 16#01#, 16#00#, 16#08#, 16#d0#, 16#a0#, 16#84#, 16#04#,
+     16#72#, 16#80#, 16#e5#, 16#00#, 16#00#, 16#08#, 16#d2#, 16#20#, 16#44#, 16#04#, 16#ca#, 16#02#,
+     16#ff#, 16#00#, 16#00#, 16#08#, 16#de#, 16#a0#, 16#44#, 16#04#, 16#82#, 16#02#, 16#6d#, 16#00#,
+     16#00#, 16#08#, 16#f6#, 16#b0#, 16#40#, 16#02#, 16#82#, 16#07#, 16#3f#, 16#00#, 16#00#, 16#08#,
+     16#44#, 16#58#, 16#44#, 16#02#, 16#93#, 16#3f#, 16#1f#, 16#00#, 16#00#, 16#30#, 16#88#, 16#4f#,
+     16#44#, 16#03#, 16#83#, 16#23#, 16#3e#, 16#00#, 16#00#, 16#00#, 16#18#, 16#60#, 16#e0#, 16#07#,
+     16#e3#, 16#0f#, 16#fe#, 16#00#, 16#00#, 16#00#, 16#70#, 16#70#, 16#e4#, 16#07#, 16#c7#, 16#1b#,
+     16#fe#, 16#01#, 16#00#, 16#00#, 16#e0#, 16#3c#, 16#e4#, 16#07#, 16#c7#, 16#e3#, 16#fe#, 16#1f#,
+     16#00#, 16#00#, 16#ff#, 16#1f#, 16#fc#, 16#07#, 16#c7#, 16#03#, 16#f8#, 16#33#, 16#00#, 16#c0#,
+     16#f0#, 16#07#, 16#ff#, 16#07#, 16#87#, 16#02#, 16#fc#, 16#43#, 16#00#, 16#60#, 16#f0#, 16#ff#,
+     16#ff#, 16#07#, 16#8f#, 16#06#, 16#be#, 16#87#, 16#00#, 16#30#, 16#f8#, 16#ff#, 16#ff#, 16#07#,
+     16#8f#, 16#14#, 16#9c#, 16#8f#, 16#00#, 16#00#, 16#fc#, 16#ff#, 16#ff#, 16#07#, 16#9f#, 16#8d#,
+     16#8a#, 16#0f#, 16#00#, 16#00#, 16#fe#, 16#ff#, 16#ff#, 16#07#, 16#bf#, 16#0b#, 16#80#, 16#1f#,
+     16#00#, 16#00#, 16#ff#, 16#ff#, 16#ff#, 16#07#, 16#7f#, 16#3a#, 16#80#, 16#3f#, 16#00#, 16#80#,
+     16#ff#, 16#ff#, 16#ff#, 16#07#, 16#ff#, 16#20#, 16#c0#, 16#3f#, 16#00#, 16#80#, 16#ff#, 16#ff#,
+     16#ff#, 16#07#, 16#ff#, 16#01#, 16#e0#, 16#7f#, 16#00#, 16#c0#, 16#ff#, 16#ff#, 16#ff#, 16#07#,
+     16#ff#, 16#0f#, 16#f8#, 16#ff#, 16#40#, 16#e0#, 16#ff#, 16#ff#, 16#ff#, 16#07#, 16#ff#, 16#ff#,
+     16#ff#, 16#ff#, 16#40#, 16#f0#, 16#ff#, 16#ff#, 16#ff#, 16#07#, 16#ff#, 16#ff#, 16#ff#, 16#ff#,
+     16#41#, 16#f0#, 16#ff#, 16#ff#, 16#ff#, 16#07#);
+
+
+    The_Window : WD.Double_Window := WD.Forge.Create (400, 400, "Sorcery of Bitmap Labels");
+
+    The_Button : BTN.Button := BTN.Forge.Create (The_Window, 140, 160, 120, 120, "Bitmap");
+
+    Left_Btn   : TOG.Toggle_Button := TOG.Forge.Create (The_Window,  25, 50,  50, 25, "left");
+    Right_Btn  : TOG.Toggle_Button := TOG.Forge.Create (The_Window,  75, 50,  50, 25, "right");
+    Top_Btn    : TOG.Toggle_Button := TOG.Forge.Create (The_Window, 125, 50,  50, 25, "top");
+    Bottom_Btn : TOG.Toggle_Button := TOG.Forge.Create (The_Window, 175, 50,  50, 25, "bottom");
+    Inside_Btn : TOG.Toggle_Button := TOG.Forge.Create (The_Window, 225, 50,  50, 25, "inside");
+    Over_Btn   : TOG.Toggle_Button := TOG.Forge.Create (The_Window,  25, 75, 100, 25, "text over");
+    Inact_Btn  : TOG.Toggle_Button := TOG.Forge.Create (The_Window, 125, 75, 100, 25, "inactive");
+
+    Sorceress : IT.Bitmap := IT.Forge.Create (Sorceress_Bits, Sorceress_Width, Sorceress_Height);
+
+
+    procedure Button_Callback
+           (Item : in out FLTK.Widgets.Widget'Class)
+    is
+        New_Align : FLTK.Alignment;
+    begin
+        if Left_Btn.Is_On   then New_Align := New_Align + FLTK.Align_Left;            end if;
+        if Right_Btn.Is_On  then New_Align := New_Align + FLTK.Align_Right;           end if;
+        if Top_Btn.Is_On    then New_Align := New_Align + FLTK.Align_Top;             end if;
+        if Bottom_Btn.Is_On then New_Align := New_Align + FLTK.Align_Bottom;          end if;
+        if Inside_Btn.Is_On then New_Align := New_Align + FLTK.Align_Inside;          end if;
+        if Over_Btn.Is_On   then New_Align := New_Align + FLTK.Align_Text_Over_Image; end if;
+        The_Button.Set_Alignment (New_Align);
+
+        if Inact_Btn.Is_On then
+            The_Button.Deactivate;
+        else
+            The_Button.Activate;
+        end if;
+
+        The_Window.Redraw;
+    end Button_Callback;
+
+
+begin
+
+
+    The_Button.Set_Image (Sorceress);
+
+    Left_Btn.Set_Callback   (Button_Callback'Unrestricted_Access);
+    Right_Btn.Set_Callback  (Button_Callback'Unrestricted_Access);
+    Top_Btn.Set_Callback    (Button_Callback'Unrestricted_Access);
+    Bottom_Btn.Set_Callback (Button_Callback'Unrestricted_Access);
+    Inside_Btn.Set_Callback (Button_Callback'Unrestricted_Access);
+    Over_Btn.Set_Callback   (Button_Callback'Unrestricted_Access);
+    Inact_Btn.Set_Callback  (Button_Callback'Unrestricted_Access);
+
+    The_Window.Set_Resizable (The_Window);
+    The_Window.Show_With_Args;
+
+    return FLTK.Run;
+
+
+end Bitmap;
+
+
diff --git a/tests.gpr b/tests.gpr
index cb95919..4670aa0 100644
--- a/tests.gpr
+++ b/tests.gpr
@@ -10,13 +10,16 @@ project Tests is
 
     for Languages use ("Ada");
 
-    for Source_Dirs use ("test/**");
+    for Source_Dirs use ("test");
     for Object_Dir use "obj";
     for Exec_Dir use "bin";
 
     for Main use
        ("adjuster.adb",
         "animated.adb",
+        "arc.adb",
+        "ask.adb",
+        "bitmap.adb",
         "compare.adb",
         "dirlist.adb",
         "page_formats.adb");
@@ -24,6 +27,9 @@ project Tests is
     package Builder is
         for Executable ("adjuster.adb")     use "adjuster";
         for Executable ("animated.adb")     use "animated";
+        for Executable ("arc.adb")          use "arc";
+        for Executable ("ask.adb")          use "ask";
+        for Executable ("bitmap.adb")       use "bitmap";
         for Executable ("compare.adb")      use "compare";
         for Executable ("dirlist.adb")      use "dirlist";
         for Executable ("page_formats.adb") use "page_formats";