1 files changed, 94 insertions, 7 deletions

diff --git a/body/c_fl_scroll.cpp b/body/c_fl_scroll.cpp
index 3707b52..325d8cf 100644
--- a/body/c_fl_scroll.cpp
+++ b/body/c_fl_scroll.cpp
@@ -6,22 +6,18 @@
 
 #include <FL/Fl_Scroll.H>
 #include "c_fl_scroll.h"
+#include "c_fl.h"
 
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void scroll_extra_init_hook(void * aobj, int x, int y, int w, int h, const char * l);
 void fl_scroll_extra_init(void * adaobj, int x, int y, int w, int h, const char * label) {
     scroll_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void scroll_extra_final_hook(void * aobj);
-void fl_scroll_extra_final(void * adaobj) {
-    scroll_extra_final_hook(adaobj);
-}
-
 
 
 
@@ -33,6 +29,16 @@ extern "C" int widget_handle_hook(void * ud, int e);
 
 
 
+//  Non-friend protected access
+
+class Friend_Scroll : Fl_Scroll {
+public:
+    using Fl_Scroll::bbox;
+};
+
+
+
+
 //  Attaching all relevant hooks and friends
 
 class My_Scroll : public Fl_Scroll {
@@ -65,7 +71,11 @@ SCROLL new_fl_scroll(int x, int y, int w, int h, char* label) {
 }
 
 void free_fl_scroll(SCROLL s) {
-    delete static_cast<My_Scroll*>(s);
+    if (fl_inside_callback) {
+        fl_delete_widget(s);
+    } else {
+        delete static_cast<My_Scroll*>(s);
+    }
 }
 
 
@@ -108,6 +118,83 @@ void fl_scroll_set_size(SCROLL s, int t) {
 
 
 
+void fl_scroll_resize(SCROLL s, int x, int y, int w, int h) {
+    static_cast<Fl_Scroll*>(s)->resize(x, y, w, h);
+}
+
+void fl_scroll_recalc_scrollbars(SCROLL s,
+    int &cb_x, int &cb_y, int &cb_w, int &cb_h,
+    int &ib_x, int &ib_y, int &ib_w, int &ib_h,
+    int &ic_x, int &ic_y, int &ic_w, int &ic_h,
+    int &chneed, int &cvneed,
+    int &hs_x,    int &hs_y,     int &hs_w,     int &hs_h,
+    int &hs_size, int &hs_total, int &hs_first, int &hs_pos,
+    int &vs_x,    int &vs_y,     int &vs_w,     int &vs_h,
+    int &vs_size, int &vs_total, int &vs_first, int &vs_pos,
+    int &ssize)
+{
+#if FLTK_ABI_VERSION >= 10303
+    Fl_Scroll::ScrollInfo my_info;
+    static_cast<Fl_Scroll*>(s)->recalc_scrollbars(my_info);
+
+    cb_x = my_info.child.l;
+    cb_y = my_info.child.t;
+    cb_w = my_info.child.r - my_info.child.l;
+    cb_h = my_info.child.b - my_info.child.t;
+
+    ib_x = my_info.innerbox.x;
+    ib_y = my_info.innerbox.y;
+    ib_w = my_info.innerbox.w;
+    ib_h = my_info.innerbox.h;
+
+    ic_x = my_info.innerchild.x;
+    ic_y = my_info.innerchild.y;
+    ic_w = my_info.innerchild.w;
+    ic_h = my_info.innerchild.h;
+
+    chneed = my_info.hneeded;
+    cvneed = my_info.vneeded;
+
+    hs_x = my_info.hscroll.x;
+    hs_y = my_info.hscroll.y;
+    hs_w = my_info.hscroll.w;
+    hs_h = my_info.hscroll.h;
+    hs_size  = my_info.hscroll.size;
+    hs_total = my_info.hscroll.total;
+    hs_first = my_info.hscroll.first;
+    hs_pos   = my_info.hscroll.pos;
+
+    vs_x = my_info.vscroll.x;
+    vs_y = my_info.vscroll.y;
+    vs_w = my_info.vscroll.w;
+    vs_h = my_info.vscroll.h;
+    vs_size  = my_info.vscroll.size;
+    vs_total = my_info.vscroll.total;
+    vs_first = my_info.vscroll.first;
+    vs_pos   = my_info.vscroll.pos;
+
+    ssize = my_info.scrollsize;
+#else
+    (void)(s);
+    (void)(cb_x); (void)(cb_y); (void)(cb_w); (void)(cb_h);
+    (void)(ib_x); (void)(ib_y); (void)(ib_w); (void)(ib_h);
+    (void)(ic_x); (void)(ic_y); (void)(ic_w); (void)(ic_h);
+    (void)(chneed); (void)(cvneed);
+    (void)(hs_x); (void)(hs_y); (void)(hs_w); (void)(hs_h);
+    (void)(hs_size); (void)(hs_total); (void)(hs_first); (void)(hs_pos);
+    (void)(vs_x); (void)(vs_y); (void)(vs_w); (void)(vs_h);
+    (void)(vs_size); (void)(vs_total); (void)(vs_first); (void)(vs_pos);
+    (void)(ssize);
+#endif
+}
+
+
+
+
+void fl_scroll_bbox(SCROLL s, int &x, int &y, int &w, int &h) {
+    (static_cast<Fl_Scroll*>(s)->*(&Friend_Scroll::bbox))(x, y, w, h);
+}
+
 void fl_scroll_draw(SCROLL s) {
     static_cast<My_Scroll*>(s)->Fl_Scroll::draw();
 }