In the interests of readability and consistent style...

68 files changed, 449 insertions, 374 deletions

diff --git a/c_fl_box.cpp b/c_fl_box.cpp
index 01685f8..eeee320 100644
--- a/c_fl_box.cpp
+++ b/c_fl_box.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_box.h"
 
 
-my_fl_box new_fl_box(int x, int y, int w, int h, char * label) {
-    Fl_Box *box = new Fl_Box(x, y, w, h, label);
-    return box;
+BOX new_fl_box(int x, int y, int w, int h, char* label) {
+    Fl_Box *b = new Fl_Box(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_box(my_fl_box f) {
-    delete reinterpret_cast<Fl_Box*>(f);
+void free_fl_box(BOX b) {
+    delete reinterpret_cast<Fl_Box*>(b);
 }
 
diff --git a/c_fl_box.h b/c_fl_box.h
index e21f875..df7b629 100644
--- a/c_fl_box.h
+++ b/c_fl_box.h
@@ -4,11 +4,11 @@
 #define FL_BOX_GUARD
 
 
-typedef void* my_fl_box;
+typedef void* BOX;
 
 
-extern "C" my_fl_box new_fl_box(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_box(my_fl_box f);
+extern "C" BOX new_fl_box(int x, int y, int w, int h, char * label);
+extern "C" void free_fl_box(BOX b);
 
 
 #endif
diff --git a/c_fl_button.cpp b/c_fl_button.cpp
index dd4286e..621656c 100644
--- a/c_fl_button.cpp
+++ b/c_fl_button.cpp
@@ -4,28 +4,28 @@
 #include "c_fl_button.h"
 
 
-my_fl_button new_fl_button(int x, int y, int w, int h, char * label) {
-    Fl_Button *button = new Fl_Button(x, y, w, h, label);
-    return button;
+BUTTON new_fl_button(int x, int y, int w, int h, char* label) {
+    Fl_Button *b = new Fl_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_button(my_fl_button f) {
-    delete reinterpret_cast<Fl_Button*>(f);
+void free_fl_button(BUTTON b) {
+    delete reinterpret_cast<Fl_Button*>(b);
 }
 
 
-int fl_button_get_state(my_fl_button b) {
+int fl_button_get_state(BUTTON b) {
     return reinterpret_cast<Fl_Button*>(b)->value();
 }
 
 
-void fl_button_set_state(my_fl_button b, int s) {
+void fl_button_set_state(BUTTON b, int s) {
     reinterpret_cast<Fl_Button*>(b)->value(s);
 }
 
 
-void fl_button_set_only(my_fl_button b) {
+void fl_button_set_only(BUTTON b) {
     reinterpret_cast<Fl_Button*>(b)->setonly();
 }
 
diff --git a/c_fl_button.h b/c_fl_button.h
index 21e18dc..239689a 100644
--- a/c_fl_button.h
+++ b/c_fl_button.h
@@ -4,15 +4,15 @@
 #define FL_BUTTON_GUARD
 
 
-typedef void* my_fl_button;
+typedef void* BUTTON;
 
 
-extern "C" my_fl_button new_fl_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_button(my_fl_button f);
+extern "C" BUTTON new_fl_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_button(BUTTON b);
 
-extern "C" int fl_button_get_state(my_fl_button b);
-extern "C" void fl_button_set_state(my_fl_button b, int s);
-extern "C" void fl_button_set_only(my_fl_button b);
+extern "C" int fl_button_get_state(BUTTON b);
+extern "C" void fl_button_set_state(BUTTON b, int s);
+extern "C" void fl_button_set_only(BUTTON b);
 
 
 #endif
diff --git a/c_fl_check_button.cpp b/c_fl_check_button.cpp
index 2eafd0f..e737942 100644
--- a/c_fl_check_button.cpp
+++ b/c_fl_check_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_check_button.h"
 
 
-my_fl_check_button new_fl_check_button(int x, int y, int w, int h, char * label) {
-    Fl_Check_Button *button = new Fl_Check_Button(x, y, w, h, label);
-    return button;
+CHECKBUTTON new_fl_check_button(int x, int y, int w, int h, char* label) {
+    Fl_Check_Button *b = new Fl_Check_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_check_button(my_fl_check_button b) {
+void free_fl_check_button(CHECKBUTTON b) {
     delete reinterpret_cast<Fl_Check_Button*>(b);
 }
 
diff --git a/c_fl_check_button.h b/c_fl_check_button.h
index 23834df..f44b5ec 100644
--- a/c_fl_check_button.h
+++ b/c_fl_check_button.h
@@ -4,11 +4,11 @@
 #define FL_CHECK_BUTTON_GUARD
 
 
-typedef void* my_fl_check_button;
+typedef void* CHECKBUTTON;
 
 
-extern "C" my_fl_check_button new_fl_check_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_check_button(my_fl_check_button b);
+extern "C" CHECKBUTTON new_fl_check_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_check_button(CHECKBUTTON b);
 
 
 #endif
diff --git a/c_fl_double_window.cpp b/c_fl_double_window.cpp
index 7a9899c..67d0736 100644
--- a/c_fl_double_window.cpp
+++ b/c_fl_double_window.cpp
@@ -4,24 +4,24 @@
 #include "c_fl_double_window.h"
 
 
-my_fl_double_window new_fl_double_window(int x, int y, int w, int h, char * label) {
-    Fl_Double_Window *window = new Fl_Double_Window(x, y, w, h, label);
-    return window;
+DOUBLEWINDOW new_fl_double_window(int x, int y, int w, int h, char* label) {
+    Fl_Double_Window *d = new Fl_Double_Window(x, y, w, h, label);
+    return d;
 }
 
 
-my_fl_double_window new_fl_double_window2(int w, int h) {
-    Fl_Double_Window *window = new Fl_Double_Window(w, h);
-    return window;
+DOUBLEWINDOW new_fl_double_window2(int w, int h) {
+    Fl_Double_Window *d = new Fl_Double_Window(w, h);
+    return d;
 }
 
 
-void free_fl_double_window(my_fl_double_window f) {
-    delete reinterpret_cast<Fl_Double_Window*>(f);
+void free_fl_double_window(DOUBLEWINDOW d) {
+    delete reinterpret_cast<Fl_Double_Window*>(d);
 }
 
 
-void fl_double_window_show(my_fl_double_window f) {
-    reinterpret_cast<Fl_Double_Window*>(f)->show();
+void fl_double_window_show(DOUBLEWINDOW d) {
+    reinterpret_cast<Fl_Double_Window*>(d)->show();
 }
 
diff --git a/c_fl_double_window.h b/c_fl_double_window.h
index eb6784d..81b136a 100644
--- a/c_fl_double_window.h
+++ b/c_fl_double_window.h
@@ -4,14 +4,14 @@
 #define FL_DOUBLE_WINDOW_GUARD
 
 
-typedef void* my_fl_double_window;
+typedef void* DOUBLEWINDOW;
 
 
-extern "C" my_fl_double_window new_fl_double_window(int x, int y, int w, int h, char * label);
-extern "C" my_fl_double_window new_fl_double_window2(int w, int h);
-extern "C" void free_fl_double_window(my_fl_double_window f);
+extern "C" DOUBLEWINDOW new_fl_double_window(int x, int y, int w, int h, char* label);
+extern "C" DOUBLEWINDOW new_fl_double_window2(int w, int h);
+extern "C" void free_fl_double_window(DOUBLEWINDOW d);
 
-extern "C" void fl_double_window_show(my_fl_double_window f);
+extern "C" void fl_double_window_show(DOUBLEWINDOW d);
 
 
 #endif
diff --git a/c_fl_group.cpp b/c_fl_group.cpp
index 44aeb34..c227169 100644
--- a/c_fl_group.cpp
+++ b/c_fl_group.cpp
@@ -3,50 +3,51 @@
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Widget.H>
 #include "c_fl_group.h"
+#include "c_fl_widget.h"
 
 
-my_fl_group new_fl_group(int x, int y, int w, int h, char * label) {
-    Fl_Group *group = new Fl_Group(x, y, w, h, label);
-    return group;
+GROUP new_fl_group(int x, int y, int w, int h, char* label) {
+    Fl_Group *g = new Fl_Group(x, y, w, h, label);
+    return g;
 }
 
 
-void free_fl_group(my_fl_group f) {
-    delete reinterpret_cast<Fl_Group*>(f);
+void free_fl_group(GROUP g) {
+    delete reinterpret_cast<Fl_Group*>(g);
 }
 
 
-void fl_group_end(my_fl_group f) {
-    reinterpret_cast<Fl_Group*>(f)->end();
+void fl_group_end(GROUP g) {
+    reinterpret_cast<Fl_Group*>(g)->end();
 }
 
 
-void fl_group_add(my_fl_group f, void * item) {
-    reinterpret_cast<Fl_Group*>(f)->add(reinterpret_cast<Fl_Widget*>(item));
+void fl_group_add(GROUP g, WIDGET item) {
+    reinterpret_cast<Fl_Group*>(g)->add(reinterpret_cast<Fl_Widget*>(item));
 }
 
 
-void fl_group_clear(my_fl_group f) {
-    reinterpret_cast<Fl_Group*>(f)->clear();
+void fl_group_clear(GROUP g) {
+    reinterpret_cast<Fl_Group*>(g)->clear();
 }
 
 
-int fl_group_find(my_fl_group f, void * item) {
-    return reinterpret_cast<Fl_Group*>(f)->find(reinterpret_cast<Fl_Widget*>(item));
+int fl_group_find(GROUP g, WIDGET item) {
+    return reinterpret_cast<Fl_Group*>(g)->find(reinterpret_cast<Fl_Widget*>(item));
 }
 
 
-void fl_group_insert(my_fl_group f, void * item, int place) {
-    reinterpret_cast<Fl_Group*>(f)->insert(*(reinterpret_cast<Fl_Widget*>(item)), place);
+void fl_group_insert(GROUP g, WIDGET item, int place) {
+    reinterpret_cast<Fl_Group*>(g)->insert(*(reinterpret_cast<Fl_Widget*>(item)), place);
 }
 
 
-void fl_group_remove(my_fl_group f, void * item) {
-    reinterpret_cast<Fl_Group*>(f)->remove(reinterpret_cast<Fl_Widget*>(item));
+void fl_group_remove(GROUP g, WIDGET item) {
+    reinterpret_cast<Fl_Group*>(g)->remove(reinterpret_cast<Fl_Widget*>(item));
 }
 
 
-void fl_group_remove2(my_fl_group f, int place) {
-    reinterpret_cast<Fl_Group*>(f)->remove(place);
+void fl_group_remove2(GROUP g, int place) {
+    reinterpret_cast<Fl_Group*>(g)->remove(place);
 }
 
diff --git a/c_fl_group.h b/c_fl_group.h
index 8fbd671..d75641e 100644
--- a/c_fl_group.h
+++ b/c_fl_group.h
@@ -3,21 +3,23 @@
 #ifndef FL_GROUP_GUARD
 #define FL_GROUP_GUARD
 
+#include "c_fl_widget.h"
 
-typedef void* my_fl_group;
 
+typedef void* GROUP;
 
-extern "C" my_fl_group new_fl_group(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_group(my_fl_group f);
 
-extern "C" void fl_group_end(my_fl_group f);
+extern "C" GROUP new_fl_group(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_group(GROUP g);
 
-extern "C" void fl_group_add(my_fl_group f, void * item);
-extern "C" void fl_group_clear(my_fl_group f);
-extern "C" int fl_group_find(my_fl_group f, void * item);
-extern "C" void fl_group_insert(my_fl_group f, void * item, int place);
-extern "C" void fl_group_remove(my_fl_group f, void * item);
-extern "C" void fl_group_remove2(my_fl_group f, int place);
+extern "C" void fl_group_end(GROUP g);
+
+extern "C" void fl_group_add(GROUP g, WIDGET item);
+extern "C" void fl_group_clear(GROUP g);
+extern "C" int fl_group_find(GROUP g, WIDGET item);
+extern "C" void fl_group_insert(GROUP g, WIDGET item, int place);
+extern "C" void fl_group_remove(GROUP g, WIDGET item);
+extern "C" void fl_group_remove2(GROUP g, int place);
 
 
 #endif
diff --git a/c_fl_input.cpp b/c_fl_input.cpp
index 8504e56..4ee251c 100644
--- a/c_fl_input.cpp
+++ b/c_fl_input.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_input.h"
 
 
-my_fl_input new_fl_input(int x, int y, int w, int h, char * label) {
-    Fl_Input *input = new Fl_Input(x, y, w, h, label);
-    return input;
+INPUT new_fl_input(int x, int y, int w, int h, char* label) {
+    Fl_Input *i = new Fl_Input(x, y, w, h, label);
+    return i;
 }
 
 
-void free_fl_input(my_fl_input f) {
-    delete reinterpret_cast<Fl_Input*>(f);
+void free_fl_input(INPUT i) {
+    delete reinterpret_cast<Fl_Input*>(i);
 }
 
diff --git a/c_fl_input.h b/c_fl_input.h
index 6cec6ec..b3b1190 100644
--- a/c_fl_input.h
+++ b/c_fl_input.h
@@ -4,11 +4,11 @@
 #define FL_INPUT_GUARD
 
 
-typedef void* my_fl_input;
+typedef void* INPUT;
 
 
-extern "C" my_fl_input new_fl_input(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_input(my_fl_input f);
+extern "C" INPUT new_fl_input(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_input(INPUT i);
 
 
 #endif
diff --git a/c_fl_light_button.cpp b/c_fl_light_button.cpp
index 31faff3..daa99ef 100644
--- a/c_fl_light_button.cpp
+++ b/c_fl_light_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_light_button.h"
 
 
-my_fl_light_button new_fl_light_button(int x, int y, int w, int h, char * label) {
-    Fl_Light_Button *button = new Fl_Light_Button(x, y, w, h, label);
-    return button;
+LIGHTBUTTON new_fl_light_button(int x, int y, int w, int h, char* label) {
+    Fl_Light_Button *b = new Fl_Light_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_light_button(my_fl_light_button b) {
+void free_fl_light_button(LIGHTBUTTON b) {
     delete reinterpret_cast<Fl_Light_Button*>(b);
 }
 
diff --git a/c_fl_light_button.h b/c_fl_light_button.h
index 0aa8bd8..f8c005d 100644
--- a/c_fl_light_button.h
+++ b/c_fl_light_button.h
@@ -4,11 +4,11 @@
 #define FL_LIGHT_BUTTON_GUARD
 
 
-typedef void* my_fl_light_button;
+typedef void* LIGHTBUTTON;
 
 
-extern "C" my_fl_light_button new_fl_light_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_light_button(my_fl_light_button b);
+extern "C" LIGHTBUTTON new_fl_light_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_light_button(LIGHTBUTTON b);
 
 
 #endif
diff --git a/c_fl_radio_button.cpp b/c_fl_radio_button.cpp
index 56f16c9..1cac323 100644
--- a/c_fl_radio_button.cpp
+++ b/c_fl_radio_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_radio_button.h"
 
 
-my_fl_radio_button new_fl_radio_button(int x, int y, int w, int h, char * label) {
-    Fl_Radio_Button *button = new Fl_Radio_Button(x, y, w, h, label);
-    return button;
+RADIOBUTTON new_fl_radio_button(int x, int y, int w, int h, char* label) {
+    Fl_Radio_Button *b = new Fl_Radio_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_radio_button(my_fl_radio_button b) {
+void free_fl_radio_button(RADIOBUTTON b) {
     delete reinterpret_cast<Fl_Radio_Button*>(b);
 }
 
diff --git a/c_fl_radio_button.h b/c_fl_radio_button.h
index 06c3afc..d9ea819 100644
--- a/c_fl_radio_button.h
+++ b/c_fl_radio_button.h
@@ -4,11 +4,11 @@
 #define FL_RADIO_BUTTON_GUARD
 
 
-typedef void* my_fl_radio_button;
+typedef void* RADIOBUTTON;
 
 
-extern "C" my_fl_radio_button new_fl_radio_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_radio_button(my_fl_radio_button b);
+extern "C" RADIOBUTTON new_fl_radio_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_radio_button(RADIOBUTTON b);
 
 
 #endif
diff --git a/c_fl_radio_light_button.cpp b/c_fl_radio_light_button.cpp
index 82fafd6..7dd4a5f 100644
--- a/c_fl_radio_light_button.cpp
+++ b/c_fl_radio_light_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_radio_light_button.h"
 
 
-my_fl_radio_light_button new_fl_radio_light_button(int x, int y, int w, int h, char * label) {
-    Fl_Radio_Light_Button *button = new Fl_Radio_Light_Button(x, y, w, h, label);
-    return button;
+RADIOLIGHTBUTTON new_fl_radio_light_button(int x, int y, int w, int h, char* label) {
+    Fl_Radio_Light_Button *b = new Fl_Radio_Light_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_radio_light_button(my_fl_radio_light_button b) {
+void free_fl_radio_light_button(RADIOLIGHTBUTTON b) {
     delete reinterpret_cast<Fl_Radio_Light_Button*>(b);
 }
 
diff --git a/c_fl_radio_light_button.h b/c_fl_radio_light_button.h
index 21bc675..ee5f2a1 100644
--- a/c_fl_radio_light_button.h
+++ b/c_fl_radio_light_button.h
@@ -4,11 +4,11 @@
 #define FL_RADIO_LIGHT_BUTTON_GUARD
 
 
-typedef void* my_fl_radio_light_button;
+typedef void* RADIOLIGHTBUTTON;
 
 
-extern "C" my_fl_radio_light_button new_fl_radio_light_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_radio_light_button(my_fl_radio_light_button b);
+extern "C" RADIOLIGHTBUTTON new_fl_radio_light_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_radio_light_button(RADIOLIGHTBUTTON b);
 
 
 #endif
diff --git a/c_fl_radio_round_button.cpp b/c_fl_radio_round_button.cpp
index 9e7943c..9e94244 100644
--- a/c_fl_radio_round_button.cpp
+++ b/c_fl_radio_round_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_radio_round_button.h"
 
 
-my_fl_radio_round_button new_fl_radio_round_button(int x, int y, int w, int h, char * label) {
-    Fl_Radio_Round_Button *button = new Fl_Radio_Round_Button(x, y, w, h, label);
-    return button;
+RADIOROUNDBUTTON new_fl_radio_round_button(int x, int y, int w, int h, char* label) {
+    Fl_Radio_Round_Button *b = new Fl_Radio_Round_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_radio_round_button(my_fl_radio_round_button b) {
+void free_fl_radio_round_button(RADIOROUNDBUTTON b) {
     delete reinterpret_cast<Fl_Radio_Round_Button*>(b);
 }
 
diff --git a/c_fl_radio_round_button.h b/c_fl_radio_round_button.h
index acf3936..34f1189 100644
--- a/c_fl_radio_round_button.h
+++ b/c_fl_radio_round_button.h
@@ -4,11 +4,11 @@
 #define FL_RADIO_ROUND_BUTTON_GUARD
 
 
-typedef void* my_fl_radio_round_button;
+typedef void* RADIOROUNDBUTTON;
 
 
-extern "C" my_fl_radio_round_button new_fl_radio_round_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_radio_round_button(my_fl_radio_round_button b);
+extern "C" RADIOROUNDBUTTON new_fl_radio_round_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_radio_round_button(RADIOROUNDBUTTON b);
 
 
 #endif
diff --git a/c_fl_repeat_button.cpp b/c_fl_repeat_button.cpp
index d81f301..eafefde 100644
--- a/c_fl_repeat_button.cpp
+++ b/c_fl_repeat_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_repeat_button.h"
 
 
-my_fl_repeat_button new_fl_repeat_button(int x, int y, int w, int h, char * label) {
-    Fl_Repeat_Button *button = new Fl_Repeat_Button(x, y, w, h, label);
-    return button;
+REPEATBUTTON new_fl_repeat_button(int x, int y, int w, int h, char* label) {
+    Fl_Repeat_Button *b = new Fl_Repeat_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_repeat_button(my_fl_repeat_button b) {
+void free_fl_repeat_button(REPEATBUTTON b) {
     delete reinterpret_cast<Fl_Repeat_Button*>(b);
 }
 
diff --git a/c_fl_repeat_button.h b/c_fl_repeat_button.h
index 9712f41..d899730 100644
--- a/c_fl_repeat_button.h
+++ b/c_fl_repeat_button.h
@@ -4,11 +4,11 @@
 #define FL_REPEAT_BUTTON_GUARD
 
 
-typedef void* my_fl_repeat_button;
+typedef void* REPEATBUTTON;
 
 
-extern "C" my_fl_repeat_button new_fl_repeat_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_repeat_button(my_fl_repeat_button b);
+extern "C" REPEATBUTTON new_fl_repeat_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_repeat_button(REPEATBUTTON b);
 
 
 #endif
diff --git a/c_fl_return_button.cpp b/c_fl_return_button.cpp
index fb0ade2..5f87fb3 100644
--- a/c_fl_return_button.cpp
+++ b/c_fl_return_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_return_button.h"
 
 
-my_fl_return_button new_fl_return_button(int x, int y, int w, int h, char * label) {
-    Fl_Return_Button *button = new Fl_Return_Button(x, y, w, h, label);
-    return button;
+RETURNBUTTON new_fl_return_button(int x, int y, int w, int h, char* label) {
+    Fl_Return_Button *b = new Fl_Return_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_return_button(my_fl_return_button b) {
+void free_fl_return_button(RETURNBUTTON b) {
     delete reinterpret_cast<Fl_Return_Button*>(b);
 }
 
diff --git a/c_fl_return_button.h b/c_fl_return_button.h
index 84274af..558e9dc 100644
--- a/c_fl_return_button.h
+++ b/c_fl_return_button.h
@@ -4,11 +4,11 @@
 #define FL_RETURN_BUTTON_GUARD
 
 
-typedef void* my_fl_return_button;
+typedef void* RETURNBUTTON;
 
 
-extern "C" my_fl_return_button new_fl_return_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_return_button(my_fl_return_button b);
+extern "C" RETURNBUTTON new_fl_return_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_return_button(RETURNBUTTON b);
 
 
 #endif
diff --git a/c_fl_round_button.cpp b/c_fl_round_button.cpp
index aec7ada..b33448f 100644
--- a/c_fl_round_button.cpp
+++ b/c_fl_round_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_round_button.h"
 
 
-my_fl_round_button new_fl_round_button(int x, int y, int w, int h, char * label) {
-    Fl_Round_Button *button = new Fl_Round_Button(x, y, w, h, label);
-    return button;
+ROUNDBUTTON new_fl_round_button(int x, int y, int w, int h, char* label) {
+    Fl_Round_Button *b = new Fl_Round_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_round_button(my_fl_round_button b) {
+void free_fl_round_button(ROUNDBUTTON b) {
     delete reinterpret_cast<Fl_Round_Button*>(b);
 }
 
diff --git a/c_fl_round_button.h b/c_fl_round_button.h
index 3cca483..36113a4 100644
--- a/c_fl_round_button.h
+++ b/c_fl_round_button.h
@@ -4,11 +4,11 @@
 #define FL_ROUND_BUTTON_GUARD
 
 
-typedef void* my_fl_round_button;
+typedef void* ROUNDBUTTON;
 
 
-extern "C" my_fl_round_button new_fl_round_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_round_button(my_fl_round_button b);
+extern "C" ROUNDBUTTON new_fl_round_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_round_button(ROUNDBUTTON b);
 
 
 #endif
diff --git a/c_fl_text_display.cpp b/c_fl_text_display.cpp
index 72fd5c9..95d5727 100644
--- a/c_fl_text_display.cpp
+++ b/c_fl_text_display.cpp
@@ -4,43 +4,43 @@
 #include "c_fl_text_display.h"
 
 
-my_fl_text_display new_fl_text_display(int x, int y, int w, int h, char *  label) {
-    Fl_Text_Display *text = new Fl_Text_Display(x, y, w, h, label);
-    return text;
+TEXTDISPLAY new_fl_text_display(int x, int y, int w, int h, char*  label) {
+    Fl_Text_Display *td = new Fl_Text_Display(x, y, w, h, label);
+    return td;
 }
 
 
-void free_fl_text_display(my_fl_text_display td) {
+void free_fl_text_display(TEXTDISPLAY td) {
     delete reinterpret_cast<Fl_Text_Display*>(td);
 }
 
 
-int fl_text_display_get_text_color(my_fl_text_display td) {
+int fl_text_display_get_text_color(TEXTDISPLAY td) {
     return reinterpret_cast<Fl_Text_Display*>(td)->textcolor();
 }
 
 
-void fl_text_display_set_text_color(my_fl_text_display td, int c) {
+void fl_text_display_set_text_color(TEXTDISPLAY td, int c) {
     reinterpret_cast<Fl_Text_Display*>(td)->textcolor(static_cast<Fl_Color>(c));
 }
 
 
-int fl_text_display_get_text_font(my_fl_text_display td) {
+int fl_text_display_get_text_font(TEXTDISPLAY td) {
     return reinterpret_cast<Fl_Text_Display*>(td)->textfont();
 }
 
 
-void fl_text_display_set_text_font(my_fl_text_display td, int f) {
+void fl_text_display_set_text_font(TEXTDISPLAY td, int f) {
     reinterpret_cast<Fl_Text_Display*>(td)->textfont(static_cast<Fl_Font>(f));
 }
 
 
-int fl_text_display_get_text_size(my_fl_text_display td) {
+int fl_text_display_get_text_size(TEXTDISPLAY td) {
     return reinterpret_cast<Fl_Text_Display*>(td)->textsize();
 }
 
 
-void fl_text_display_set_text_size(my_fl_text_display td, int s) {
+void fl_text_display_set_text_size(TEXTDISPLAY td, int s) {
     reinterpret_cast<Fl_Text_Display*>(td)->textsize(static_cast<Fl_Fontsize>(s));
 }
 
diff --git a/c_fl_text_display.h b/c_fl_text_display.h
index 57812d2..2c1019f 100644
--- a/c_fl_text_display.h
+++ b/c_fl_text_display.h
@@ -4,18 +4,18 @@
 #define FL_TEXT_DISPLAY_GUARD
 
 
-typedef void* my_fl_text_display;
+typedef void* TEXTDISPLAY;
 
 
-extern "C" my_fl_text_display new_fl_text_display(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_text_display(my_fl_text_display td);
+extern "C" TEXTDISPLAY new_fl_text_display(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_text_display(TEXTDISPLAY td);
 
-extern "C" int fl_text_display_get_text_color(my_fl_text_display td);
-extern "C" void fl_text_display_set_text_color(my_fl_text_display td, int c);
-extern "C" int fl_text_display_get_text_font(my_fl_text_display td);
-extern "C" void fl_text_display_set_text_font(my_fl_text_display td, int f);
-extern "C" int fl_text_display_get_text_size(my_fl_text_display td);
-extern "C" void fl_text_display_set_text_size(my_fl_text_display td, int s);
+extern "C" int fl_text_display_get_text_color(TEXTDISPLAY td);
+extern "C" void fl_text_display_set_text_color(TEXTDISPLAY td, int c);
+extern "C" int fl_text_display_get_text_font(TEXTDISPLAY td);
+extern "C" void fl_text_display_set_text_font(TEXTDISPLAY td, int f);
+extern "C" int fl_text_display_get_text_size(TEXTDISPLAY td);
+extern "C" void fl_text_display_set_text_size(TEXTDISPLAY td, int s);
 
 
 #endif
diff --git a/c_fl_toggle_button.cpp b/c_fl_toggle_button.cpp
index db89a86..d52e72e 100644
--- a/c_fl_toggle_button.cpp
+++ b/c_fl_toggle_button.cpp
@@ -4,13 +4,13 @@
 #include "c_fl_toggle_button.h"
 
 
-my_fl_toggle_button new_fl_toggle_button(int x, int y, int w, int h, char * label) {
-    Fl_Toggle_Button *button = new Fl_Toggle_Button(x, y, w, h, label);
-    return button;
+TOGGLEBUTTON new_fl_toggle_button(int x, int y, int w, int h, char* label) {
+    Fl_Toggle_Button *b = new Fl_Toggle_Button(x, y, w, h, label);
+    return b;
 }
 
 
-void free_fl_toggle_button(my_fl_toggle_button b) {
+void free_fl_toggle_button(TOGGLEBUTTON b) {
     delete reinterpret_cast<Fl_Toggle_Button*>(b);
 }
 
diff --git a/c_fl_toggle_button.h b/c_fl_toggle_button.h
index a5d7f13..ed86ed4 100644
--- a/c_fl_toggle_button.h
+++ b/c_fl_toggle_button.h
@@ -4,11 +4,11 @@
 #define FL_TOGGLE_BUTTON_GUARD
 
 
-typedef void* my_fl_toggle_button;
+typedef void* TOGGLEBUTTON;
 
 
-extern "C" my_fl_toggle_button new_fl_toggle_button(int x, int y, int w, int h, char * label);
-extern "C" void free_fl_toggle_button(my_fl_toggle_button b);
+extern "C" TOGGLEBUTTON new_fl_toggle_button(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_toggle_button(TOGGLEBUTTON b);
 
 
 #endif
diff --git a/c_fl_widget.cpp b/c_fl_widget.cpp
index 8a9e897..53c14c8 100644
--- a/c_fl_widget.cpp
+++ b/c_fl_widget.cpp
@@ -4,42 +4,42 @@
 #include "c_fl_widget.h"
 
 
-int fl_widget_get_box(my_fl_widget w) {
+int fl_widget_get_box(WIDGET w) {
     return reinterpret_cast<Fl_Widget*>(w)->box();
 }
 
 
-void fl_widget_set_box(my_fl_widget w, int b) {
+void fl_widget_set_box(WIDGET w, int b) {
     reinterpret_cast<Fl_Widget*>(w)->box(static_cast<Fl_Boxtype>(b));
 }
 
 
-int fl_widget_get_label_font(my_fl_widget w) {
+int fl_widget_get_label_font(WIDGET w) {
     return reinterpret_cast<Fl_Widget*>(w)->labelfont();
 }
 
 
-void fl_widget_set_label_font(my_fl_widget w, int f) {
+void fl_widget_set_label_font(WIDGET w, int f) {
     reinterpret_cast<Fl_Widget*>(w)->labelfont(static_cast<Fl_Font>(f));
 }
 
 
-int fl_widget_get_label_size(my_fl_widget w) {
+int fl_widget_get_label_size(WIDGET w) {
     return reinterpret_cast<Fl_Widget*>(w)->labelsize();
 }
 
 
-void fl_widget_set_label_size(my_fl_widget w, int s) {
+void fl_widget_set_label_size(WIDGET w, int s) {
     reinterpret_cast<Fl_Widget*>(w)->labelsize(static_cast<Fl_Fontsize>(s));
 }
 
 
-int fl_widget_get_label_type(my_fl_widget w) {
+int fl_widget_get_label_type(WIDGET w) {
     return reinterpret_cast<Fl_Widget*>(w)->labeltype();
 }
 
 
-void fl_widget_set_label_type(my_fl_widget w, int l) {
+void fl_widget_set_label_type(WIDGET w, int l) {
     reinterpret_cast<Fl_Widget*>(w)->labeltype(static_cast<Fl_Labeltype>(l));
 }
 
diff --git a/c_fl_widget.h b/c_fl_widget.h
index 9fb5385..423e66c 100644
--- a/c_fl_widget.h
+++ b/c_fl_widget.h
@@ -4,17 +4,17 @@
 #define FL_WIDGET_GUARD
 
 
-typedef void* my_fl_widget;
+typedef void* WIDGET;
 
 
-extern "C" int fl_widget_get_box(my_fl_widget w);
-extern "C" void fl_widget_set_box(my_fl_widget w, int b);
-extern "C" int fl_widget_get_label_font(my_fl_widget w);
-extern "C" void fl_widget_set_label_font(my_fl_widget w, int f);
-extern "C" int fl_widget_get_label_size(my_fl_widget w);
-extern "C" void fl_widget_set_label_size(my_fl_widget w, int s);
-extern "C" int fl_widget_get_label_type(my_fl_widget w);
-extern "C" void fl_widget_set_label_type(my_fl_widget w, int l);
+extern "C" int fl_widget_get_box(WIDGET w);
+extern "C" void fl_widget_set_box(WIDGET w, int b);
+extern "C" int fl_widget_get_label_font(WIDGET w);
+extern "C" void fl_widget_set_label_font(WIDGET w, int f);
+extern "C" int fl_widget_get_label_size(WIDGET w);
+extern "C" void fl_widget_set_label_size(WIDGET w, int s);
+extern "C" int fl_widget_get_label_type(WIDGET w);
+extern "C" void fl_widget_set_label_type(WIDGET w, int l);
 
 
 #endif
diff --git a/c_fl_window.cpp b/c_fl_window.cpp
index 64a1c38..f409e34 100644
--- a/c_fl_window.cpp
+++ b/c_fl_window.cpp
@@ -4,24 +4,24 @@
 #include "c_fl_window.h"
 
 
-my_fl_window new_fl_window(int x, int y, int w, int h, char * label) {
-    Fl_Window *window = new Fl_Window(x, y, w, h, label);
-    return window;
+WINDOW new_fl_window(int x, int y, int w, int h, char* label) {
+    Fl_Window *n = new Fl_Window(x, y, w, h, label);
+    return n;
 }
 
 
-my_fl_window new_fl_window2(int w, int h) {
-    Fl_Window *window = new Fl_Window(w, h);
-    return window;
+WINDOW new_fl_window2(int w, int h) {
+    Fl_Window *n = new Fl_Window(w, h);
+    return n;
 }
 
 
-void free_fl_window(my_fl_window f) {
-    delete reinterpret_cast<Fl_Window*>(f);
+void free_fl_window(WINDOW n) {
+    delete reinterpret_cast<Fl_Window*>(n);
 }
 
 
-void fl_window_show(my_fl_window f) {
-    reinterpret_cast<Fl_Window*>(f)->show();
+void fl_window_show(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->show();
 }
 
diff --git a/c_fl_window.h b/c_fl_window.h
index 2d03c4e..658d3ef 100644
--- a/c_fl_window.h
+++ b/c_fl_window.h
@@ -4,14 +4,14 @@
 #define FL_WINDOW_GUARD
 
 
-typedef void* my_fl_window;
+typedef void* WINDOW;
 
 
-extern "C" my_fl_window new_fl_window(int x, int y, int w, int h, char * label);
-extern "C" my_fl_window new_fl_window2(int w, int h);
-extern "C" void free_fl_window(my_fl_window f);
+extern "C" WINDOW new_fl_window(int x, int y, int w, int h, char* label);
+extern "C" WINDOW new_fl_window2(int w, int h);
+extern "C" void free_fl_window(WINDOW n);
 
-extern "C" void fl_window_show(my_fl_window f);
+extern "C" void fl_window_show(WINDOW n);
 
 
 #endif
diff --git a/fltk-widgets-boxes.adb b/fltk-widgets-boxes.adb
index a176c30..8f1f759 100644
--- a/fltk-widgets-boxes.adb
+++ b/fltk-widgets-boxes.adb
@@ -10,17 +10,19 @@ package body FLTK.Widgets.Boxes is
 
     function new_fl_box
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_box, "new_fl_box");
 
-    procedure free_fl_box (B : in System.Address);
+    procedure free_fl_box
+           (B : in System.Address);
     pragma Import (C, free_fl_box, "free_fl_box");
 
 
 
 
-    procedure Finalize (This : in out Box) is
+    procedure Finalize
+           (This : in out Box) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_box (This.Void_Ptr);
@@ -31,14 +33,13 @@ package body FLTK.Widgets.Boxes is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Box is
 
         VP : System.Address;
 
     begin
-
         VP := new_fl_box
                    (Interfaces.C.int (X),
                     Interfaces.C.int (Y),
@@ -46,7 +47,6 @@ package body FLTK.Widgets.Boxes is
                     Interfaces.C.int (H),
                     Interfaces.C.To_C (Label));
         return (Ada.Finalization.Limited_Controlled with Void_Ptr => VP);
-
     end Create;
 
 
diff --git a/fltk-widgets-boxes.ads b/fltk-widgets-boxes.ads
index 4b27e1e..2f1c78e 100644
--- a/fltk-widgets-boxes.ads
+++ b/fltk-widgets-boxes.ads
@@ -6,7 +6,10 @@ package FLTK.Widgets.Boxes is
     type Box is new Widget with private;
 
 
-    function Create (X, Y, W, H : Integer; Label : String) return Box;
+    function Create
+           (X, Y, W, H : in Integer;
+            Label      : in String)
+        return Box;
 
 
 private
@@ -15,7 +18,8 @@ private
     type Box is new Widget with null record;
 
 
-    overriding procedure Finalize (This : in out Box);
+    overriding procedure Finalize
+           (This : in out Box);
 
 
 end FLTK.Widgets.Boxes;
diff --git a/fltk-widgets-buttons-enter.adb b/fltk-widgets-buttons-enter.adb
index 89b6c2f..a5e2c07 100644
--- a/fltk-widgets-buttons-enter.adb
+++ b/fltk-widgets-buttons-enter.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Enter is
 
     function new_fl_return_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_return_button, "new_fl_return_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Enter is
 
 
 
-    procedure Finalize (This : in out Enter_Button) is
+    procedure Finalize
+           (This : in out Enter_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_return_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Enter is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Enter_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-enter.ads b/fltk-widgets-buttons-enter.ads
index 8649130..302e1bb 100644
--- a/fltk-widgets-buttons-enter.ads
+++ b/fltk-widgets-buttons-enter.ads
@@ -1,6 +1,6 @@
 
 
---  Return Buttons, but return is a reserved word, so it's Enter Buttons instead
+--  Return Buttons, but return is a reserved word, so they're Enter Buttons instead
 package FLTK.Widgets.Buttons.Enter is
 
 
@@ -8,8 +8,8 @@ package FLTK.Widgets.Buttons.Enter is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Enter_Button;
 
 
@@ -19,7 +19,8 @@ private
     type Enter_Button is new Button with null record;
 
 
-    overriding procedure Finalize (This : in out Enter_Button);
+    overriding procedure Finalize
+           (This : in out Enter_Button);
 
 
 end FLTK.Widgets.Buttons.Enter;
diff --git a/fltk-widgets-buttons-light-check.adb b/fltk-widgets-buttons-light-check.adb
index 319db9f..ebaf9ce 100644
--- a/fltk-widgets-buttons-light-check.adb
+++ b/fltk-widgets-buttons-light-check.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Light.Check is
 
     function new_fl_check_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_check_button, "new_fl_check_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Light.Check is
 
 
 
-    procedure Finalize (This : in out Check_Button) is
+    procedure Finalize
+           (This : in out Check_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_check_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Light.Check is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Check_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-light-check.ads b/fltk-widgets-buttons-light-check.ads
index 77ac0e6..cdf9b18 100644
--- a/fltk-widgets-buttons-light-check.ads
+++ b/fltk-widgets-buttons-light-check.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Light.Check is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Check_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Check_Button is new Light_Button with null record;
 
 
-    overriding procedure Finalize (This : in out Check_Button);
+    overriding procedure Finalize
+           (This : in out Check_Button);
 
 
 end FLTK.Widgets.Buttons.Light.Check;
diff --git a/fltk-widgets-buttons-light-radio.adb b/fltk-widgets-buttons-light-radio.adb
index 779b612..6f99f05 100644
--- a/fltk-widgets-buttons-light-radio.adb
+++ b/fltk-widgets-buttons-light-radio.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Light.Radio is
 
     function new_fl_radio_light_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_radio_light_button, "new_fl_radio_light_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Light.Radio is
 
 
 
-    procedure Finalize (This : in out Radio_Light_Button) is
+    procedure Finalize
+           (This : in out Radio_Light_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_radio_light_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Light.Radio is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Radio_Light_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-light-radio.ads b/fltk-widgets-buttons-light-radio.ads
index 2fef2ab..df7195f 100644
--- a/fltk-widgets-buttons-light-radio.ads
+++ b/fltk-widgets-buttons-light-radio.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Light.Radio is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Radio_Light_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Radio_Light_Button is new Light_Button with null record;
 
 
-    overriding procedure Finalize (This : in out Radio_Light_Button);
+    overriding procedure Finalize
+           (This : in out Radio_Light_Button);
 
 
 end FLTK.Widgets.Buttons.Light.Radio;
diff --git a/fltk-widgets-buttons-light-round-radio.adb b/fltk-widgets-buttons-light-round-radio.adb
index 5852581..9fc8076 100644
--- a/fltk-widgets-buttons-light-round-radio.adb
+++ b/fltk-widgets-buttons-light-round-radio.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Light.Round.Radio is
 
     function new_fl_radio_round_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_radio_round_button, "new_fl_radio_round_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Light.Round.Radio is
 
 
 
-    procedure Finalize (This : in out Radio_Round_Button) is
+    procedure Finalize
+           (This : in out Radio_Round_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_radio_round_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Light.Round.Radio is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Radio_Round_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-light-round-radio.ads b/fltk-widgets-buttons-light-round-radio.ads
index 666f944..3889d49 100644
--- a/fltk-widgets-buttons-light-round-radio.ads
+++ b/fltk-widgets-buttons-light-round-radio.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Light.Round.Radio is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Radio_Round_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Radio_Round_Button is new Round_Button with null record;
 
 
-    overriding procedure Finalize (This : in out Radio_Round_Button);
+    overriding procedure Finalize
+           (This : in out Radio_Round_Button);
 
 
 end FLTK.Widgets.Buttons.Light.Round.Radio;
diff --git a/fltk-widgets-buttons-light-round.adb b/fltk-widgets-buttons-light-round.adb
index a9510ab..555dcc4 100644
--- a/fltk-widgets-buttons-light-round.adb
+++ b/fltk-widgets-buttons-light-round.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Light.Round is
 
     function new_fl_round_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_round_button, "new_fl_round_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Light.Round is
 
 
 
-    procedure Finalize (This : in out Round_Button) is
+    procedure Finalize
+           (This : in out Round_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_round_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Light.Round is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Round_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-light-round.ads b/fltk-widgets-buttons-light-round.ads
index 18d72d0..5e1e1f7 100644
--- a/fltk-widgets-buttons-light-round.ads
+++ b/fltk-widgets-buttons-light-round.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Light.Round is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Round_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Round_Button is new Light_Button with null record;
 
 
-    overriding procedure Finalize (This : in out Round_Button);
+    overriding procedure Finalize
+           (This : in out Round_Button);
 
 
 end FLTK.Widgets.Buttons.Light.Round;
diff --git a/fltk-widgets-buttons-light.adb b/fltk-widgets-buttons-light.adb
index f31f3a9..18e179d 100644
--- a/fltk-widgets-buttons-light.adb
+++ b/fltk-widgets-buttons-light.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Light is
 
     function new_fl_light_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_light_button, "new_fl_light_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Light is
 
 
 
-    procedure Finalize (This : in out Light_Button) is
+    procedure Finalize
+           (This : in out Light_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_light_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Light is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Light_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-light.ads b/fltk-widgets-buttons-light.ads
index d0c733d..5a2c48a 100644
--- a/fltk-widgets-buttons-light.ads
+++ b/fltk-widgets-buttons-light.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Light is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Light_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Light_Button is new Button with null record;
 
 
-    overriding procedure Finalize (This : in out Light_Button);
+    overriding procedure Finalize
+           (This : in out Light_Button);
 
 
 end FLTK.Widgets.Buttons.Light;
diff --git a/fltk-widgets-buttons-radio.adb b/fltk-widgets-buttons-radio.adb
index cd8d1ce..4a26178 100644
--- a/fltk-widgets-buttons-radio.adb
+++ b/fltk-widgets-buttons-radio.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Radio is
 
     function new_fl_radio_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_radio_button, "new_fl_radio_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Radio is
 
 
 
-    procedure Finalize (This : in out Radio_Button) is
+    procedure Finalize
+           (This : in out Radio_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_radio_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Radio is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Radio_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-radio.ads b/fltk-widgets-buttons-radio.ads
index 3681e05..49e8259 100644
--- a/fltk-widgets-buttons-radio.ads
+++ b/fltk-widgets-buttons-radio.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Radio is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Radio_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Radio_Button is new Button with null record;
 
 
-    overriding procedure Finalize (This : in out Radio_Button);
+    overriding procedure Finalize
+           (This : in out Radio_Button);
 
 
 end FLTK.Widgets.Buttons.Radio;
diff --git a/fltk-widgets-buttons-repeat.adb b/fltk-widgets-buttons-repeat.adb
index 66e3e3d..55644cb 100644
--- a/fltk-widgets-buttons-repeat.adb
+++ b/fltk-widgets-buttons-repeat.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Repeat is
 
     function new_fl_repeat_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_repeat_button, "new_fl_repeat_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Repeat is
 
 
 
-    procedure Finalize (This : in out Repeat_Button) is
+    procedure Finalize
+           (This : in out Repeat_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_repeat_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Repeat is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Repeat_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-repeat.ads b/fltk-widgets-buttons-repeat.ads
index 277a783..baac3f4 100644
--- a/fltk-widgets-buttons-repeat.ads
+++ b/fltk-widgets-buttons-repeat.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Repeat is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Repeat_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Repeat_Button is new Button with null record;
 
 
-    overriding procedure Finalize (This : in out Repeat_Button);
+    overriding procedure Finalize
+           (This : in out Repeat_Button);
 
 
 end FLTK.Widgets.Buttons.Repeat;
diff --git a/fltk-widgets-buttons-toggle.adb b/fltk-widgets-buttons-toggle.adb
index 1347845..b6e7dc2 100644
--- a/fltk-widgets-buttons-toggle.adb
+++ b/fltk-widgets-buttons-toggle.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Toggle is
 
     function new_fl_toggle_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_toggle_button, "new_fl_toggle_button");
 
@@ -21,7 +21,8 @@ package body FLTK.Widgets.Buttons.Toggle is
 
 
 
-    procedure Finalize (This : in out Toggle_Button) is
+    procedure Finalize
+           (This : in out Toggle_Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_toggle_button (This.Void_Ptr);
@@ -32,8 +33,8 @@ package body FLTK.Widgets.Buttons.Toggle is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Toggle_Button is
 
         VP : System.Address;
diff --git a/fltk-widgets-buttons-toggle.ads b/fltk-widgets-buttons-toggle.ads
index 7f99872..ce6e36b 100644
--- a/fltk-widgets-buttons-toggle.ads
+++ b/fltk-widgets-buttons-toggle.ads
@@ -7,8 +7,8 @@ package FLTK.Widgets.Buttons.Toggle is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Toggle_Button;
 
 
@@ -18,7 +18,8 @@ private
     type Toggle_Button is new Button with null record;
 
 
-    overriding procedure Finalize (This : in out Toggle_Button);
+    overriding procedure Finalize
+           (This : in out Toggle_Button);
 
 
 end FLTK.Widgets.Buttons.Toggle;
diff --git a/fltk-widgets-buttons.adb b/fltk-widgets-buttons.adb
index 504c73f..d74718a 100644
--- a/fltk-widgets-buttons.adb
+++ b/fltk-widgets-buttons.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons is
 
     function new_fl_button
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_button, "new_fl_button");
 
@@ -35,7 +35,8 @@ package body FLTK.Widgets.Buttons is
 
 
 
-    procedure Finalize (This : in out Button) is
+    procedure Finalize
+           (This : in out Button) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_button (This.Void_Ptr);
@@ -46,8 +47,8 @@ package body FLTK.Widgets.Buttons is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Button is
 
         VP : System.Address;
@@ -76,8 +77,8 @@ package body FLTK.Widgets.Buttons is
 
 
     procedure Set_State
-           (B : in Button'Class;
-            S : in State) is
+           (B : in out Button'Class;
+            S : in     State) is
     begin
         fl_button_set_state (B.Void_Ptr, State'Pos (S));
     end Set_State;
@@ -86,7 +87,7 @@ package body FLTK.Widgets.Buttons is
 
 
     procedure Set_Only
-           (B : in Button'Class) is
+           (B : in out Button'Class) is
     begin
         fl_button_set_only (B.Void_Ptr);
     end Set_Only;
diff --git a/fltk-widgets-buttons.ads b/fltk-widgets-buttons.ads
index 63329b8..8469bcc 100644
--- a/fltk-widgets-buttons.ads
+++ b/fltk-widgets-buttons.ads
@@ -8,8 +8,8 @@ package FLTK.Widgets.Buttons is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Button;
 
 
@@ -19,12 +19,12 @@ package FLTK.Widgets.Buttons is
 
 
     procedure Set_State
-           (B : in Button'Class;
-            S : in State);
+           (B : in out Button'Class;
+            S : in     State);
 
 
     procedure Set_Only
-           (B : in Button'Class);
+           (B : in out Button'Class);
 
 
 private
@@ -33,7 +33,8 @@ private
     type Button is new Widget with null record;
 
 
-    overriding procedure Finalize (This : in out Button);
+    overriding procedure Finalize
+           (This : in out Button);
 
 
 end FLTK.Widgets.Buttons;
diff --git a/fltk-widgets-groups-text_displays.adb b/fltk-widgets-groups-text_displays.adb
index 8d08fbb..ccee7c5 100644
--- a/fltk-widgets-groups-text_displays.adb
+++ b/fltk-widgets-groups-text_displays.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
     function new_fl_text_display
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_text_display, "new_fl_text_display");
 
@@ -58,7 +58,8 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
 
-    procedure Finalize (This : in out Text_Display) is
+    procedure Finalize
+           (This : in out Text_Display) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_text_display (This.Void_Ptr);
@@ -90,7 +91,7 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
     function Get_Text_Color
-           (TD : in Text_Display)
+           (TD : in Text_Display'Class)
         return Color is
     begin
         return Color (fl_text_display_get_text_color (TD.Void_Ptr));
@@ -100,8 +101,8 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
     procedure Set_Text_Color
-           (TD : in Text_Display;
-            C : in Color) is
+           (TD : in out Text_Display'Class;
+            C  : in     Color) is
     begin
         fl_text_display_set_text_color (TD.Void_Ptr, Interfaces.C.int (C));
     end Set_Text_Color;
@@ -110,7 +111,7 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
     function Get_Text_Font
-           (TD : in Text_Display)
+           (TD : in Text_Display'Class)
         return Font_Kind is
     begin
         return Font_Kind'Val (fl_text_display_get_text_font (TD.Void_Ptr));
@@ -120,8 +121,8 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
     procedure Set_Text_Font
-           (TD : in Text_Display;
-            F : in Font_Kind) is
+           (TD : in out Text_Display'Class;
+            F  : in     Font_Kind) is
     begin
         fl_text_display_set_text_font (TD.Void_Ptr, Font_Kind'Pos (F));
     end Set_Text_Font;
@@ -130,7 +131,7 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
     function Get_Text_Size
-           (TD : in Text_Display)
+           (TD : in Text_Display'Class)
         return Font_Size is
     begin
         return Font_Size (fl_text_display_get_text_size (TD.Void_Ptr));
@@ -140,8 +141,8 @@ package body FLTK.Widgets.Groups.Text_Displays is
 
 
     procedure Set_Text_Size
-           (TD : in Text_Display;
-            S : in Font_Size) is
+           (TD : in out Text_Display'Class;
+            S  : in     Font_Size) is
     begin
         fl_text_display_set_text_size (TD.Void_Ptr, Interfaces.C.int (S));
     end Set_Text_Size;
diff --git a/fltk-widgets-groups-text_displays.ads b/fltk-widgets-groups-text_displays.ads
index e5391d1..bc50ae1 100644
--- a/fltk-widgets-groups-text_displays.ads
+++ b/fltk-widgets-groups-text_displays.ads
@@ -16,33 +16,33 @@ package FLTK.Widgets.Groups.Text_Displays is
 
 
     function Get_Text_Color
-           (TD : in Text_Display)
+           (TD : in Text_Display'Class)
         return Color;
 
 
     procedure Set_Text_Color
-           (TD : in Text_Display;
-            C : in Color);
+           (TD : in out Text_Display'Class;
+            C  : in     Color);
 
 
     function Get_Text_Font
-           (TD : in Text_Display)
+           (TD : in Text_Display'Class)
         return Font_Kind;
 
 
     procedure Set_Text_Font
-           (TD : in Text_Display;
-            F : in Font_Kind);
+           (TD : in out Text_Display'Class;
+            F  : in     Font_Kind);
 
 
     function Get_Text_Size
-           (TD : in Text_Display)
+           (TD : in Text_Display'Class)
         return Font_Size;
 
 
     procedure Set_Text_Size
-           (TD : in Text_Display;
-            S : in Font_Size);
+           (TD : in out Text_Display'Class;
+            S  : in     Font_Size);
 
 
 private
@@ -51,7 +51,8 @@ private
     type Text_Display is new Group with null record;
 
 
-    overriding procedure Finalize (This : in out Text_Display);
+    overriding procedure Finalize
+           (This : in out Text_Display);
 
 
 end FLTK.Widgets.Groups.Text_Displays;
diff --git a/fltk-widgets-groups-windows-double.adb b/fltk-widgets-groups-windows-double.adb
index 4d46d7e..21eeab3 100644
--- a/fltk-widgets-groups-windows-double.adb
+++ b/fltk-widgets-groups-windows-double.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Groups.Windows.Double is
 
     function new_fl_double_window
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_double_window, "new_fl_double_window");
 
@@ -30,13 +30,15 @@ package body FLTK.Widgets.Groups.Windows.Double is
 
 
 
-    procedure fl_group_end (G : in System.Address);
+    procedure fl_group_end
+           (G : in System.Address);
     pragma Import (C, fl_group_end, "fl_group_end");
 
 
 
 
-    procedure Finalize (This : in out Double_Window) is
+    procedure Finalize
+           (This : in out Double_Window) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_double_window (This.Void_Ptr);
@@ -47,8 +49,8 @@ package body FLTK.Widgets.Groups.Windows.Double is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Double_Window is
 
         VP : System.Address;
diff --git a/fltk-widgets-groups-windows-double.ads b/fltk-widgets-groups-windows-double.ads
index 6876508..a276e48 100644
--- a/fltk-widgets-groups-windows-double.ads
+++ b/fltk-widgets-groups-windows-double.ads
@@ -6,10 +6,19 @@ package FLTK.Widgets.Groups.Windows.Double is
     type Double_Window is new Window with private;
 
 
-    function Create (X, Y, W, H : Integer; Label : String) return Double_Window;
-    function Create (W, H : in Integer) return Double_Window;
+    function Create
+           (X, Y, W, H : in Integer;
+            Label      : in String)
+        return Double_Window;
 
-    procedure Show (W : in Double_Window);
+
+    function Create
+           (W, H : in Integer)
+        return Double_Window;
+
+
+    procedure Show
+           (W : in Double_Window);
 
 
 private
@@ -18,7 +27,8 @@ private
     type Double_Window is new Window with null record;
 
 
-    overriding procedure Finalize (This : in out Double_Window);
+    overriding procedure Finalize
+           (This : in out Double_Window);
 
 
 end FLTK.Widgets.Groups.Windows.Double;
diff --git a/fltk-widgets-groups-windows.adb b/fltk-widgets-groups-windows.adb
index c304521..806ebf3 100644
--- a/fltk-widgets-groups-windows.adb
+++ b/fltk-widgets-groups-windows.adb
@@ -10,29 +10,35 @@ package body FLTK.Widgets.Groups.Windows is
 
     function new_fl_window
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_window, "new_fl_window");
 
-    function new_fl_window2 (W, H : in Interfaces.C.int) return System.Address;
+    function new_fl_window2
+           (W, H : in Interfaces.C.int)
+        return System.Address;
     pragma Import (C, new_fl_window2, "new_fl_window2");
 
-    procedure free_fl_window (W : in System.Address);
+    procedure free_fl_window
+           (W : in System.Address);
     pragma Import (C, free_fl_window, "free_fl_window");
 
-    procedure fl_window_show (W : in System.Address);
+    procedure fl_window_show
+           (W : in System.Address);
     pragma Import (C, fl_window_show, "fl_window_show");
 
 
 
 
-    procedure fl_group_end (G : in System.Address);
+    procedure fl_group_end
+           (G : in System.Address);
     pragma Import (C, fl_group_end, "fl_group_end");
 
 
 
 
-    procedure Finalize (This : in out Window) is
+    procedure Finalize
+           (This : in out Window) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_window (This.Void_Ptr);
@@ -43,14 +49,13 @@ package body FLTK.Widgets.Groups.Windows is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Window is
 
         VP : System.Address;
 
     begin
-
         VP := new_fl_window
                    (Interfaces.C.int (X),
                     Interfaces.C.int (Y),
@@ -59,14 +64,17 @@ package body FLTK.Widgets.Groups.Windows is
                     Interfaces.C.To_C (Label));
         fl_group_end (VP);
         return (Ada.Finalization.Limited_Controlled with Void_Ptr => VP);
-
     end Create;
 
 
 
 
-    function Create (W, H : in Integer) return Window is
+    function Create
+           (W, H : in Integer)
+        return Window is
+
         VP : System.Address;
+
     begin
         VP := new_fl_window2 (Interfaces.C.int (W), Interfaces.C.int (H));
         fl_group_end (VP);
@@ -76,7 +84,8 @@ package body FLTK.Widgets.Groups.Windows is
 
 
 
-    procedure Show (W : in Window) is
+    procedure Show
+           (W : in Window) is
     begin
         fl_window_show (W.Void_Ptr);
     end Show;
diff --git a/fltk-widgets-groups-windows.ads b/fltk-widgets-groups-windows.ads
index 69d2df4..8c0f1e4 100644
--- a/fltk-widgets-groups-windows.ads
+++ b/fltk-widgets-groups-windows.ads
@@ -6,10 +6,19 @@ package FLTK.Widgets.Groups.Windows is
     type Window is new Group with private;
 
 
-    function Create (X, Y, W, H : Integer; Label : String) return Window;
-    function Create (W, H : in Integer) return Window;
+    function Create
+           (X, Y, W, H : in Integer;
+            Label      : in String)
+        return Window;
 
-    procedure Show (W : in Window);
+
+    function Create
+           (W, H : in Integer)
+        return Window;
+
+
+    procedure Show
+           (W : in Window);
 
 
 private
@@ -18,7 +27,8 @@ private
     type Window is new Group with null record;
 
 
-    overriding procedure Finalize (This : in out Window);
+    overriding procedure Finalize
+           (This : in out Window);
 
 
 end FLTK.Widgets.Groups.Windows;
diff --git a/fltk-widgets-groups.adb b/fltk-widgets-groups.adb
index b3322b7..0098842 100644
--- a/fltk-widgets-groups.adb
+++ b/fltk-widgets-groups.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Groups is
 
     function new_fl_group
            (X, Y, W, H : in Interfaces.C.int;
-            L          : in Interfaces.C.char_array)
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_group, "new_fl_group");
 
@@ -52,7 +52,8 @@ package body FLTK.Widgets.Groups is
 
 
 
-    procedure Finalize (This : in out Group) is
+    procedure Finalize
+           (This : in out Group) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_group (This.Void_Ptr);
@@ -84,8 +85,8 @@ package body FLTK.Widgets.Groups is
 
 
     procedure Add
-           (This : Group'Class;
-            Item : Widget'Class) is
+           (This : in out Group'Class;
+            Item : in     Widget'Class) is
     begin
         fl_group_add (This.Void_Ptr, Item.Void_Ptr);
     end Add;
@@ -94,7 +95,7 @@ package body FLTK.Widgets.Groups is
 
 
     procedure Clear
-           (This : Group'Class) is
+           (This : in out Group'Class) is
     begin
         fl_group_clear (This.Void_Ptr);
     end Clear;
@@ -103,8 +104,8 @@ package body FLTK.Widgets.Groups is
 
 
     function Find
-           (This : Group'Class;
-            Item : Widget'Class)
+           (This : in Group'Class;
+            Item : in Widget'Class)
         return Index is
     begin
         return Index (fl_group_find (This.Void_Ptr, Item.Void_Ptr));
@@ -114,9 +115,9 @@ package body FLTK.Widgets.Groups is
 
 
     procedure Insert
-           (This  : Group'Class;
-            Item  : Widget'Class;
-            Place : Index) is
+           (This  : in out Group'Class;
+            Item  : in     Widget'Class;
+            Place : in     Index) is
     begin
         fl_group_insert
                (This.Void_Ptr,
@@ -128,8 +129,8 @@ package body FLTK.Widgets.Groups is
 
 
     procedure Remove
-           (This : Group'Class;
-            Item : Widget'Class) is
+           (This : in out Group'Class;
+            Item : in     Widget'Class) is
     begin
         fl_group_remove (This.Void_Ptr, Item.Void_Ptr);
     end Remove;
@@ -138,8 +139,8 @@ package body FLTK.Widgets.Groups is
 
 
     procedure Remove
-           (This  : Group'Class;
-            Place : Index) is
+           (This  : in out Group'Class;
+            Place : in     Index) is
     begin
         fl_group_remove2 (This.Void_Ptr, Interfaces.C.int (Place));
     end Remove;
diff --git a/fltk-widgets-groups.ads b/fltk-widgets-groups.ads
index bf4891f..61a2a6e 100644
--- a/fltk-widgets-groups.ads
+++ b/fltk-widgets-groups.ads
@@ -8,40 +8,40 @@ package FLTK.Widgets.Groups is
 
 
     function Create
-           (X, Y, W, H : Integer;
-            Label      : String)
+           (X, Y, W, H : in Integer;
+            Label      : in String)
         return Group;
 
 
     procedure Add
-           (This : Group'Class;
-            Item : Widget'Class);
+           (This : in out Group'Class;
+            Item : in     Widget'Class);
 
 
     procedure Clear
-           (This : Group'Class);
+           (This : in out Group'Class);
 
 
     function Find
-           (This : Group'Class;
-            Item : Widget'Class)
+           (This : in Group'Class;
+            Item : in Widget'Class)
         return Index;
 
 
     procedure Insert
-           (This  : Group'Class;
-            Item  : Widget'Class;
-            Place : Index);
+           (This  : in out Group'Class;
+            Item  : in     Widget'Class;
+            Place : in     Index);
 
 
     procedure Remove
-           (This : Group'Class;
-            Item : Widget'Class);
+           (This : in out Group'Class;
+            Item : in     Widget'Class);
 
 
     procedure Remove
-           (This  : Group'Class;
-            Place : Index);
+           (This  : in out Group'Class;
+            Place : in     Index);
 
 
 private
@@ -50,7 +50,8 @@ private
     type Group is new Widget with null record;
 
 
-    overriding procedure Finalize (This : in out Group);
+    overriding procedure Finalize
+           (This : in out Group);
 
 
 end FLTK.Widgets.Groups;
diff --git a/fltk-widgets-inputs.adb b/fltk-widgets-inputs.adb
index 436ef36..e378684 100644
--- a/fltk-widgets-inputs.adb
+++ b/fltk-widgets-inputs.adb
@@ -9,18 +9,20 @@ package body FLTK.Widgets.Inputs is
 
 
     function new_fl_input
-           (X, Y, W, H : Interfaces.C.int;
-            L          : Interfaces.C.char_array)
+           (X, Y, W, H : in Interfaces.C.int;
+            Label      : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_input, "new_fl_input");
 
-    procedure free_fl_input (F : in System.Address);
+    procedure free_fl_input
+           (F : in System.Address);
     pragma Import (C, free_fl_input, "free_fl_input");
 
 
 
 
-    procedure Finalize (This : in out Input) is
+    procedure Finalize
+           (This : in out Input) is
     begin
         if (This.Void_Ptr /= System.Null_Address) then
             free_fl_input (This.Void_Ptr);
@@ -30,8 +32,13 @@ package body FLTK.Widgets.Inputs is
 
 
 
-    function Create (X, Y, W, H : Integer; Label : String) return Input is
+    function Create
+           (X, Y, W, H : in Integer;
+            Label      : in String)
+        return Input is
+
         VP : System.Address;
+
     begin
         VP := new_fl_input
                    (Interfaces.C.int (X),
diff --git a/fltk-widgets-inputs.ads b/fltk-widgets-inputs.ads
index e0661f1..82a6915 100644
--- a/fltk-widgets-inputs.ads
+++ b/fltk-widgets-inputs.ads
@@ -6,7 +6,10 @@ package FLTK.Widgets.Inputs is
     type Input is new Widget with private;
 
 
-    function Create (X, Y, W, H : Integer; Label : String) return Input;
+    function Create
+           (X, Y, W, H : in Integer;
+            Label      : in String)
+        return Input;
 
 
 private
@@ -15,7 +18,8 @@ private
     type Input is new Widget with null record;
 
 
-    overriding procedure Finalize (This : in out Input);
+    overriding procedure Finalize
+           (This : in out Input);
 
 
 end FLTK.Widgets.Inputs;
diff --git a/fltk-widgets.adb b/fltk-widgets.adb
index cd91841..ff46bb5 100644
--- a/fltk-widgets.adb
+++ b/fltk-widgets.adb
@@ -50,7 +50,8 @@ package body FLTK.Widgets is
 
 
 
-    procedure Initialize (This : in out Widget) is
+    procedure Initialize
+           (This : in out Widget) is
     begin
         This.Void_Ptr := System.Null_Address;
     end Initialize;
@@ -69,8 +70,8 @@ package body FLTK.Widgets is
 
 
     procedure Set_Box
-           (W : in Widget'Class;
-            B : in Box_Kind) is
+           (W : in out Widget'Class;
+            B : in     Box_Kind) is
     begin
         fl_widget_set_box (W.Void_Ptr, Box_Kind'Pos (B));
     end Set_Box;
@@ -89,8 +90,8 @@ package body FLTK.Widgets is
 
 
     procedure Set_Label_Font
-           (W : in Widget'Class;
-            F : in Font_Kind) is
+           (W : in out Widget'Class;
+            F : in     Font_Kind) is
     begin
         fl_widget_set_label_font (W.Void_Ptr, Font_Kind'Pos (F));
     end Set_Label_Font;
@@ -109,8 +110,8 @@ package body FLTK.Widgets is
 
 
     procedure Set_Label_Size
-           (W : in Widget'Class;
-            S : in Font_Size) is
+           (W : in out Widget'Class;
+            S : in     Font_Size) is
     begin
         fl_widget_set_label_size (W.Void_Ptr, Interfaces.C.int (S));
     end Set_Label_Size;
@@ -129,8 +130,8 @@ package body FLTK.Widgets is
 
 
     procedure Set_Label_Type
-           (W : in Widget'Class;
-            L : in Label_Kind) is
+           (W : in out Widget'Class;
+            L : in     Label_Kind) is
     begin
         fl_widget_set_label_type (W.Void_Ptr, Label_Kind'Pos (L));
     end Set_Label_Type;
diff --git a/fltk-widgets.ads b/fltk-widgets.ads
index 3cbef76..de9afdb 100644
--- a/fltk-widgets.ads
+++ b/fltk-widgets.ads
@@ -30,8 +30,8 @@ package FLTK.Widgets is
 
 
     procedure Set_Box
-           (W : in Widget'Class;
-            B : in Box_Kind);
+           (W : in out Widget'Class;
+            B : in     Box_Kind);
 
 
     function Get_Label_Font
@@ -40,8 +40,8 @@ package FLTK.Widgets is
 
 
     procedure Set_Label_Font
-           (W : in Widget'Class;
-            F : in Font_Kind);
+           (W : in out Widget'Class;
+            F : in     Font_Kind);
 
 
     function Get_Label_Size
@@ -50,8 +50,8 @@ package FLTK.Widgets is
 
 
     procedure Set_Label_Size
-           (W : in Widget'Class;
-            S : in Font_Size);
+           (W : in out Widget'Class;
+            S : in     Font_Size);
 
 
     function Get_Label_Type
@@ -60,8 +60,8 @@ package FLTK.Widgets is
 
 
     procedure Set_Label_Type
-           (W : in Widget'Class;
-            L : in Label_Kind);
+           (W : in out Widget'Class;
+            L : in     Label_Kind);
 
 
 private
@@ -73,7 +73,8 @@ private
         end record;
 
 
-    overriding procedure Initialize (This : in out Widget);
+    overriding procedure Initialize
+           (This : in out Widget);
 
 
 end FLTK.Widgets;