Merge branch 'main' of https://github.com/jgriffitts/cfltk

MoAlyousef · May 24, 2024 · bdb03ac · bdb03ac
2 parents 7bb48aa + acac9c8
commit bdb03ac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/fltk b/fltk
diff --git a/include/cfl_misc.h b/include/cfl_misc.h
@@ -219,6 +219,8 @@ void Fl_Input_Choice_clear(Fl_Input_Choice *self);
 
 const char *Fl_Input_Choice_value(const Fl_Input_Choice *self);
 
+int Fl_Input_Choice_value2(Fl_Input_Choice *self);
+
 void Fl_Input_Choice_set_value(Fl_Input_Choice *self, const char *val);
 
 void Fl_Input_Choice_set_value2(Fl_Input_Choice *self, int val);

diff --git a/src/cfl_misc.cpp b/src/cfl_misc.cpp
@@ -466,6 +466,11 @@ const char *Fl_Input_Choice_value(const Fl_Input_Choice *self) {
     return ret;
 }
 
+int Fl_Input_Choice_value2(Fl_Input_Choice *self) {
+    LOCK(auto ret = self->menu()->value());
+    return ret;
+}
+
 void Fl_Input_Choice_set_value(Fl_Input_Choice *self, const char *val) {
     LOCK(self->value(val));
 }
+2 −0		CHANGES.txt
+6 −0		CMake/FLTKConfig.cmake.in
+42 −24		CMake/options.cmake
+1 −2		CMake/resources.cmake
+7 −4		FL/Enumerations.H
+6 −1		FL/Fl_Menu_Bar.H
+1 −0		FL/Fl_Sys_Menu_Bar.H
+13 −0		FL/fl_attr.h
+11 −6		README.Wayland.txt
+1 −1		README.txt
+1 −1		configure.ac
+1 −2		documentation/src/bundled-libs.dox
+8 −2		documentation/src/events.dox
+13 −13		documentation/src/wayland.dox
+64 −18		examples/CMakeLists.txt
+2 −3		examples/OpenGL3-glut-test.cxx
+1 −3		examples/OpenGL3test.cxx
+34 −13		png/ANNOUNCE
+31 −1		png/CHANGES
+7 −5		png/README
+3 −3		png/libpng-manual.txt
+5 −5		png/libpng.3
+2 −2		png/libpngpf.3
+1 −1		png/png.5
+20 −23		png/png.c
+12 −13		png/png.h
+1 −1		png/pngconf.h
+1 −1		png/pnglibconf.h
+8 −0		png/pngpread.c
+0 −11		png/pngprefix.h
+5 −1		png/pngread.c
+12 −16		png/pngrtran.c
+37 −1		src/Fl_MacOS_Sys_Menu_Bar.mm
+8 −0		src/Fl_Menu_Bar.cxx
+6 −0		src/Fl_Sys_Menu_Bar.cxx
+1 −0		src/Fl_Sys_Menu_Bar_Driver.H
+1 −1		src/Fl_Text_Editor.cxx
+1 −2		src/Fl_cocoa.mm
+31 −2		src/Fl_x.cxx
+7 −7		src/Makefile
+1 −0		src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H
+1 −0		src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
+8 −15		src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
+33 −26		src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+4 −1		src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
+86 −43		src/fl_contrast.cxx
+2 −2		test/Makefile
+57 −17		test/contrast.cxx
+3 −3		test/cube.cxx