update fltk

MoAlyousef · Nov 7, 2023 · 85f6655 · 85f6655
1 parent 0a963af
commit 85f6655
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/fltk b/fltk
diff --git a/include/cfl_macros.h b/include/cfl_macros.h
@@ -102,6 +102,7 @@ typedef void (*custom_draw_callback)(Fl_Widget *, void *);
     void widget##_set_deletion_callback(                                       \
         widget *self, void (*)(Fl_Widget *, void *), void *data);              \
     widget *widget##_from_dyn_ptr(Fl_Widget *ptr);                             \
+    widget *widget##_from_derived_dyn_ptr(Fl_Widget *ptr);                     \
     void widget##_super_draw(Fl_Widget *ptr, int flag);                        \
     void widget##_super_draw_first(Fl_Widget *ptr, int flag);
 
@@ -406,6 +407,9 @@ typedef void (*custom_draw_callback)(Fl_Widget *, void *);
     widget *widget##_from_dyn_ptr(Fl_Widget *ptr) {                            \
         return widget##_Derived::from_dyn_ptr(ptr);                            \
     }                                                                          \
+    widget *widget##_from_derived_dyn_ptr(Fl_Widget *ptr) {                    \
+        return widget##_Derived::from_derived_dyn_ptr(ptr);                    \
+    }                                                                          \
     void widget##_super_draw(Fl_Widget *self, int flag) {                      \
         ((widget##_Derived *)self)->super_draw = flag;                         \
     }                                                                          \

diff --git a/include/cfl_widget.hpp b/include/cfl_widget.hpp
@@ -53,6 +53,10 @@ struct Widget_Derived : public T {
         return dynamic_cast<T *>(ptr);
     }
 
+    static Widget_Derived *from_derived_dyn_ptr(Fl_Widget *ptr) {
+        return dynamic_cast<Widget_Derived *>(ptr);
+    }
+
     void widget_resize(int x, int y, int w, int h) {
         Fl_Widget::resize(x, y, w, h);
         this->redraw();
+3 −0		CHANGES.txt
+1 −1		FL/Fl_Grid.H
+10 −0		FL/Fl_Input_.H
+1 −0		fluid/CMakeLists.txt
+18 −24		fluid/Fl_Function_Type.cxx
+65 −52		fluid/Fl_Grid_Type.cxx
+2 −1		fluid/Fl_Grid_Type.h
+6 −0		fluid/Fl_Window_Type.cxx
+3 −6		fluid/code.cxx
+ −		fluid/documentation/src/fluid_flow_chart.png
+ −		fluid/documentation/src/fluid_flow_chart_800.png
+5 −1		fluid/documentation/src/index.dox
+10 −0		fluid/documentation/src/page_build_integration.dox
+27 −1		fluid/documentation/src/page_introduction.dox
+1 −1		fluid/factory.cxx
+14 −14		fluid/file.cxx
+3 −1		fluid/file.h
+6 −5		fluid/fluid.cxx
+1 −1		fluid/mergeback.cxx
+20 −4		fluid/template_panel.cxx
+23 −7		fluid/template_panel.fl
+25 −18		fluid/undo.cxx
+1 −1		fluid/widget_browser.cxx
+44 −1		fluid/widget_panel.cxx
+38 −5		fluid/widget_panel.fl
+2 −0		fluid/widget_panel.h
+8 −2		src/Fl_Input.cxx
+48 −0		src/Fl_Input_.cxx
+8 −0		src/Fl_Message.cxx
+1 −0		src/Fl_Text_Display.cxx
+7 −1		src/Fl_Text_Editor.cxx
+1 −1		src/Fl_cocoa.mm
+16 −0		src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
+1 −1		src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H