From 82eb9509e9e273e8e9e7e584553ccc49f476d4a3 Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Mon, 20 Jan 2025 00:42:19 +1300 Subject: Filled holes in Fl_Text_Editor binding and make key/modifier/shortcut/flag representations more in line with C++ --- src/c_fl_sys_menu_bar.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/c_fl_sys_menu_bar.cpp') diff --git a/src/c_fl_sys_menu_bar.cpp b/src/c_fl_sys_menu_bar.cpp index d67bf87..fbd6e34 100644 --- a/src/c_fl_sys_menu_bar.cpp +++ b/src/c_fl_sys_menu_bar.cpp @@ -63,26 +63,22 @@ int fl_sys_menu_bar_add(SYSMENUBAR m, const char * t) { return static_cast(m)->add(t); } -int fl_sys_menu_bar_add2(SYSMENUBAR m, const char * t, unsigned long s, void * u, unsigned long f) { +int fl_sys_menu_bar_add2(SYSMENUBAR m, const char * t, int s, void * u, int f) { return static_cast(m)->add(t, s, u==0?0:reinterpret_cast(&menu_item_callback_hook), u, f); } -int fl_sys_menu_bar_add3(SYSMENUBAR m, const char * t, const char * s, void * u, unsigned long f) { +int fl_sys_menu_bar_add3(SYSMENUBAR m, const char * t, const char * s, void * u, int f) { return static_cast(m)->add(t, s, u==0?0:reinterpret_cast(&menu_item_callback_hook), u, f); } -int fl_sys_menu_bar_insert(SYSMENUBAR m, int p, const char * t, unsigned long s, - void * u, unsigned long f) -{ +int fl_sys_menu_bar_insert(SYSMENUBAR m, int p, const char * t, int s, void * u, int f) { return static_cast(m)->insert(p, t, s, u==0?0:reinterpret_cast(&menu_item_callback_hook), u, f); } -int fl_sys_menu_bar_insert2(SYSMENUBAR m, int p, const char * t, const char * s, - void * u, unsigned long f) -{ +int fl_sys_menu_bar_insert2(SYSMENUBAR m, int p, const char * t, const char * s, void * u, int f) { return static_cast(m)->insert(p, t, s, u==0?0:reinterpret_cast(&menu_item_callback_hook), u, f); } @@ -121,15 +117,15 @@ void fl_sys_menu_bar_replace(SYSMENUBAR m, int i, const char * t) { static_cast(m)->replace(i, t); } -void fl_sys_menu_bar_shortcut(SYSMENUBAR m, int i, unsigned long s) { +void fl_sys_menu_bar_shortcut(SYSMENUBAR m, int i, int s) { static_cast(m)->shortcut(i, s); } -unsigned long fl_sys_menu_bar_get_mode(SYSMENUBAR m, int i) { +int fl_sys_menu_bar_get_mode(SYSMENUBAR m, int i) { return static_cast(m)->mode(i); } -void fl_sys_menu_bar_set_mode(SYSMENUBAR m, int i, unsigned long f) { +void fl_sys_menu_bar_set_mode(SYSMENUBAR m, int i, int f) { static_cast(m)->mode(i, f); } -- cgit