1 files changed, 20 insertions, 19 deletions

diff --git a/src/fltk_binding/c_fl_group.cpp b/src/fltk_binding/c_fl_group.cpp
index 44aeb34..c227169 100644
--- a/src/fltk_binding/c_fl_group.cpp
+++ b/src/fltk_binding/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);
 }