remove support for stockid parameter

diff --git a/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java b/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java
index b8e439aa2b6fc13d90f88095aee7d8a76ae3692d..1f28c879cc6f871b4c58166c21d2f0f5707d15aa 100644 (file)
--- a/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java
+++ b/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java
@@ -41,7 +41,6 @@ class ArgFuncs {
 
     MethodHandle menuitem_args_new;
     MethodHandle menuitem_args_set_label;
-    MethodHandle menuitem_args_set_stockid;
     MethodHandle menuitem_args_set_icon;
     MethodHandle menuitem_args_set_onclick;
     MethodHandle menuitem_args_set_onclickdata;
@@ -49,7 +48,6 @@ class ArgFuncs {
 
     MethodHandle menutoggleitem_args_new;
     MethodHandle menutoggleitem_args_set_label;
-    MethodHandle menutoggleitem_args_set_stockid;
     MethodHandle menutoggleitem_args_set_icon;
     MethodHandle menutoggleitem_args_set_varname;
     MethodHandle menutoggleitem_args_set_onchange;
@@ -66,7 +64,6 @@ class ArgFuncs {
 
     MethodHandle toolbar_item_args_new;
     MethodHandle toolbar_item_args_set_label;
-    MethodHandle toolbar_item_args_set_stockid;
     MethodHandle toolbar_item_args_set_icon;
     MethodHandle toolbar_item_args_set_onclick;
     MethodHandle toolbar_item_args_set_onclickdata;
@@ -75,7 +72,6 @@ class ArgFuncs {
 
     MethodHandle toolbar_toggleitem_args_new;
     MethodHandle toolbar_toggleitem_args_set_label;
-    MethodHandle toolbar_toggleitem_args_set_stockid;
     MethodHandle toolbar_toggleitem_args_set_icon;
     MethodHandle toolbar_toggleitem_args_set_varname;
     MethodHandle toolbar_toggleitem_args_set_onchange;
@@ -85,7 +81,6 @@ class ArgFuncs {
 
     MethodHandle toolbar_menu_args_new;
     MethodHandle toolbar_menu_args_set_label;
-    MethodHandle toolbar_menu_args_set_stockid;
     MethodHandle toolbar_menu_args_set_icon;
     MethodHandle toolbar_menu_args_free;
 
@@ -286,7 +281,6 @@ class ArgFuncs {
     MethodHandle button_args_set_name;
     MethodHandle button_args_set_style_class;
     MethodHandle button_args_set_label;
-    MethodHandle button_args_set_stockid;
     MethodHandle button_args_set_icon;
     MethodHandle button_args_set_labeltype;
     MethodHandle button_args_set_onclick;
@@ -311,7 +305,6 @@ class ArgFuncs {
     MethodHandle toggle_args_set_name;
     MethodHandle toggle_args_set_style_class;
     MethodHandle toggle_args_set_label;
-    MethodHandle toggle_args_set_stockid;
     MethodHandle toggle_args_set_icon;
     MethodHandle toggle_args_set_labeltype;
     MethodHandle toggle_args_set_varname;
@@ -562,7 +555,6 @@ class ArgFuncs {
 
         MemorySegment ui_menuitem_args_new_addr = lib.find("ui_menuitem_args_new").orElseThrow();
         MemorySegment ui_menuitem_args_set_label_addr = lib.find("ui_menuitem_args_set_label").orElseThrow();
-        MemorySegment ui_menuitem_args_set_stockid_addr = lib.find("ui_menuitem_args_set_stockid").orElseThrow();
         MemorySegment ui_menuitem_args_set_icon_addr = lib.find("ui_menuitem_args_set_icon").orElseThrow();
         MemorySegment ui_menuitem_args_set_onclick_addr = lib.find("ui_menuitem_args_set_onclick").orElseThrow();
         MemorySegment ui_menuitem_args_set_onclickdata_addr = lib.find("ui_menuitem_args_set_onclickdata").orElseThrow();
@@ -570,7 +562,6 @@ class ArgFuncs {
 
         MemorySegment ui_menutoggleitem_args_new_addr = lib.find("ui_menutoggleitem_args_new").orElseThrow();
         MemorySegment ui_menutoggleitem_args_set_label_addr = lib.find("ui_menutoggleitem_args_set_label").orElseThrow();
-        MemorySegment ui_menutoggleitem_args_set_stockid_addr = lib.find("ui_menutoggleitem_args_set_stockid").orElseThrow();
         MemorySegment ui_menutoggleitem_args_set_icon_addr = lib.find("ui_menutoggleitem_args_set_icon").orElseThrow();
         MemorySegment ui_menutoggleitem_args_set_varname_addr = lib.find("ui_menutoggleitem_args_set_varname").orElseThrow();
         MemorySegment ui_menutoggleitem_args_set_onchange_addr = lib.find("ui_menutoggleitem_args_set_onchange").orElseThrow();
@@ -587,7 +578,6 @@ class ArgFuncs {
 
         MemorySegment ui_toolbar_item_args_new_addr = lib.find("ui_toolbar_item_args_new").orElseThrow();
         MemorySegment ui_toolbar_item_args_set_label_addr = lib.find("ui_toolbar_item_args_set_label").orElseThrow();
-        MemorySegment ui_toolbar_item_args_set_stockid_addr = lib.find("ui_toolbar_item_args_set_stockid").orElseThrow();
         MemorySegment ui_toolbar_item_args_set_icon_addr = lib.find("ui_toolbar_item_args_set_icon").orElseThrow();
         MemorySegment ui_toolbar_item_args_set_onclick_addr = lib.find("ui_toolbar_item_args_set_onclick").orElseThrow();
         MemorySegment ui_toolbar_item_args_set_onclickdata_addr = lib.find("ui_toolbar_item_args_set_onclickdata").orElseThrow();
@@ -596,7 +586,6 @@ class ArgFuncs {
 
         MemorySegment ui_toolbar_toggleitem_args_new_addr = lib.find("ui_toolbar_toggleitem_args_new").orElseThrow();
         MemorySegment ui_toolbar_toggleitem_args_set_label_addr = lib.find("ui_toolbar_toggleitem_args_set_label").orElseThrow();
-        MemorySegment ui_toolbar_toggleitem_args_set_stockid_addr = lib.find("ui_toolbar_toggleitem_args_set_stockid").orElseThrow();
         MemorySegment ui_toolbar_toggleitem_args_set_icon_addr = lib.find("ui_toolbar_toggleitem_args_set_icon").orElseThrow();
         MemorySegment ui_toolbar_toggleitem_args_set_varname_addr = lib.find("ui_toolbar_toggleitem_args_set_varname").orElseThrow();
         MemorySegment ui_toolbar_toggleitem_args_set_onchange_addr = lib.find("ui_toolbar_toggleitem_args_set_onchange").orElseThrow();
@@ -606,7 +595,6 @@ class ArgFuncs {
 
         MemorySegment ui_toolbar_menu_args_new_addr = lib.find("ui_toolbar_menu_args_new").orElseThrow();
         MemorySegment ui_toolbar_menu_args_set_label_addr = lib.find("ui_toolbar_menu_args_set_label").orElseThrow();
-        MemorySegment ui_toolbar_menu_args_set_stockid_addr = lib.find("ui_toolbar_menu_args_set_stockid").orElseThrow();
         MemorySegment ui_toolbar_menu_args_set_icon_addr = lib.find("ui_toolbar_menu_args_set_icon").orElseThrow();
         MemorySegment ui_toolbar_menu_args_free_addr = lib.find("ui_toolbar_menu_args_free").orElseThrow();
 
@@ -808,7 +796,6 @@ class ArgFuncs {
         MemorySegment ui_button_args_set_name_addr = lib.find("ui_button_args_set_name").orElseThrow();
         MemorySegment ui_button_args_set_style_class_addr = lib.find("ui_button_args_set_style_class").orElseThrow();
         MemorySegment ui_button_args_set_label_addr = lib.find("ui_button_args_set_label").orElseThrow();
-        MemorySegment ui_button_args_set_stockid_addr = lib.find("ui_button_args_set_stockid").orElseThrow();
         MemorySegment ui_button_args_set_icon_addr = lib.find("ui_button_args_set_icon").orElseThrow();
         MemorySegment ui_button_args_set_labeltype_addr = lib.find("ui_button_args_set_labeltype").orElseThrow();
         MemorySegment ui_button_args_set_onclick_addr = lib.find("ui_button_args_set_onclick").orElseThrow();
@@ -833,7 +820,6 @@ class ArgFuncs {
         MemorySegment ui_toggle_args_set_name_addr = lib.find("ui_toggle_args_set_name").orElseThrow();
         MemorySegment ui_toggle_args_set_style_class_addr = lib.find("ui_toggle_args_set_style_class").orElseThrow();
         MemorySegment ui_toggle_args_set_label_addr = lib.find("ui_toggle_args_set_label").orElseThrow();
-        MemorySegment ui_toggle_args_set_stockid_addr = lib.find("ui_toggle_args_set_stockid").orElseThrow();
         MemorySegment ui_toggle_args_set_icon_addr = lib.find("ui_toggle_args_set_icon").orElseThrow();
         MemorySegment ui_toggle_args_set_labeltype_addr = lib.find("ui_toggle_args_set_labeltype").orElseThrow();
         MemorySegment ui_toggle_args_set_varname_addr = lib.find("ui_toggle_args_set_varname").orElseThrow();
@@ -1074,7 +1060,6 @@ class ArgFuncs {
 
         menuitem_args_new = linker.downcallHandle(ui_menuitem_args_new_addr, sigm);
         menuitem_args_set_label = linker.downcallHandle(ui_menuitem_args_set_label_addr, sigv_mm);
-        menuitem_args_set_stockid = linker.downcallHandle(ui_menuitem_args_set_stockid_addr, sigv_mm);
         menuitem_args_set_icon = linker.downcallHandle(ui_menuitem_args_set_icon_addr, sigv_mm);
         menuitem_args_set_onclick = linker.downcallHandle(ui_menuitem_args_set_onclick_addr, sigv_mm);
         menuitem_args_set_onclickdata = linker.downcallHandle(ui_menuitem_args_set_onclickdata_addr, sigv_mm);
@@ -1082,7 +1067,6 @@ class ArgFuncs {
 
         menutoggleitem_args_new = linker.downcallHandle(ui_menutoggleitem_args_new_addr, sigm);
         menutoggleitem_args_set_label = linker.downcallHandle(ui_menutoggleitem_args_set_label_addr, sigv_mm);
-        menutoggleitem_args_set_stockid = linker.downcallHandle(ui_menutoggleitem_args_set_stockid_addr, sigv_mm);
         menutoggleitem_args_set_icon = linker.downcallHandle(ui_menutoggleitem_args_set_icon_addr, sigv_mm);
         menutoggleitem_args_set_varname = linker.downcallHandle(ui_menutoggleitem_args_set_varname_addr, sigv_mm);
         menutoggleitem_args_set_onchange = linker.downcallHandle(ui_menutoggleitem_args_set_onchange_addr, sigv_mm);
@@ -1098,7 +1082,6 @@ class ArgFuncs {
         menuitemlist_args_free = linker.downcallHandle(ui_menuitemlist_args_free_addr, sigv_m);
 
         toolbar_item_args_new = linker.downcallHandle(ui_toolbar_item_args_new_addr, sigm);
-        toolbar_item_args_set_stockid = linker.downcallHandle(ui_toolbar_item_args_set_stockid_addr, sigv_mm);
         toolbar_item_args_set_icon = linker.downcallHandle(ui_toolbar_item_args_set_icon_addr, sigv_mm);
         toolbar_item_args_set_label = linker.downcallHandle(ui_toolbar_item_args_set_label_addr, sigv_mm);
         toolbar_item_args_set_onclick = linker.downcallHandle(ui_toolbar_item_args_set_onclick_addr, sigv_mm);
@@ -1107,7 +1090,6 @@ class ArgFuncs {
         toolbar_item_args_free = linker.downcallHandle(ui_toolbar_item_args_free_addr, sigv_m);
 
         toolbar_toggleitem_args_new = linker.downcallHandle(ui_toolbar_toggleitem_args_new_addr, sigm);
-        toolbar_toggleitem_args_set_stockid = linker.downcallHandle(ui_toolbar_toggleitem_args_set_stockid_addr, sigv_mm);
         toolbar_toggleitem_args_set_icon = linker.downcallHandle(ui_toolbar_toggleitem_args_set_icon_addr, sigv_mm);
         toolbar_toggleitem_args_set_label = linker.downcallHandle(ui_toolbar_toggleitem_args_set_label_addr, sigv_mm);
         toolbar_toggleitem_args_set_varname = linker.downcallHandle(ui_toolbar_toggleitem_args_set_varname_addr, sigv_mm);
@@ -1117,7 +1099,6 @@ class ArgFuncs {
         toolbar_toggleitem_args_free = linker.downcallHandle(ui_toolbar_toggleitem_args_free_addr, sigv_m);
 
         toolbar_menu_args_new = linker.downcallHandle(ui_toolbar_menu_args_new_addr, sigm);
-        toolbar_menu_args_set_stockid = linker.downcallHandle(ui_toolbar_menu_args_set_stockid_addr, sigv_mm);
         toolbar_menu_args_set_icon = linker.downcallHandle(ui_toolbar_menu_args_set_icon_addr, sigv_mm);
         toolbar_menu_args_set_label = linker.downcallHandle(ui_toolbar_menu_args_set_label_addr, sigv_mm);
         toolbar_menu_args_free = linker.downcallHandle(ui_toolbar_menu_args_free_addr, sigv_m);
@@ -1319,7 +1300,6 @@ class ArgFuncs {
         button_args_set_name = linker.downcallHandle(ui_button_args_set_name_addr, sigv_mm);
         button_args_set_style_class = linker.downcallHandle(ui_button_args_set_style_class_addr, sigv_mm);
         button_args_set_label = linker.downcallHandle(ui_button_args_set_label_addr, sigv_mm);
-        button_args_set_stockid = linker.downcallHandle(ui_button_args_set_stockid_addr, sigv_mm);
         button_args_set_icon = linker.downcallHandle(ui_button_args_set_icon_addr, sigv_mm);
         button_args_set_labeltype = linker.downcallHandle(ui_button_args_set_labeltype_addr, sigv_mi);
         button_args_set_onclick = linker.downcallHandle(ui_button_args_set_onclick_addr, sigv_mm);
@@ -1344,7 +1324,6 @@ class ArgFuncs {
         toggle_args_set_name = linker.downcallHandle(ui_toggle_args_set_name_addr, sigv_mm);
         toggle_args_set_style_class = linker.downcallHandle(ui_toggle_args_set_style_class_addr, sigv_mm);
         toggle_args_set_label = linker.downcallHandle(ui_toggle_args_set_label_addr, sigv_mm);
-        toggle_args_set_stockid = linker.downcallHandle(ui_toggle_args_set_stockid_addr, sigv_mm);
         toggle_args_set_icon = linker.downcallHandle(ui_toggle_args_set_icon_addr, sigv_mm);
         toggle_args_set_labeltype = linker.downcallHandle(ui_toggle_args_set_labeltype_addr, sigv_mi);
         toggle_args_set_varname = linker.downcallHandle(ui_toggle_args_set_varname_addr, sigv_mm);

diff --git a/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java b/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java
index dea4e13acd7170a87c71ff0b6a122c3df9587136..c53191e5fb88395b54e8040ecd1031bedd9f0acd 100644 (file)
--- a/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java
+++ b/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java
@@ -25,7 +25,6 @@ public class ButtonBuilder extends AbstractWidgetBuilder {
     private String name;
     private String styleClass;
     private String label;
-    private String stockId;
     private String icon;
     private int labelType;
     private EventHandler onClick;
@@ -116,11 +115,6 @@ public class ButtonBuilder extends AbstractWidgetBuilder {
         return this;
     }
 
-    public ButtonBuilder stockId(String stockId) {
-        this.stockId = stockId;
-        return this;
-    }
-
     public ButtonBuilder icon(String icon) {
         this.icon = icon;
         return this;
@@ -196,10 +190,6 @@ public class ButtonBuilder extends AbstractWidgetBuilder {
             MemorySegment cstr = arena.allocateFrom(label);
             ui.button_args_set_label.invoke(args, cstr);
         }
-        if(stockId != null) {
-            MemorySegment cstr = arena.allocateFrom(stockId);
-            ui.button_args_set_stockid.invoke(args, cstr);
-        }
         if(icon != null) {
             MemorySegment cstr = arena.allocateFrom(icon);
             ui.button_args_set_icon.invoke(args, cstr);

diff --git a/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java b/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java
index f66909ad03fbdf9d9a560bd4b2506eae38364496..6a5b920ed739d5c189b8ae868df05d4c50ff02a1 100644 (file)
--- a/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java
+++ b/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java
@@ -22,7 +22,6 @@ public class ToggleBuilder extends AbstractWidgetBuilder {
     private String name;
     private String styleClass;
     private String label;
-    private String stockId;
     private String icon;
     private int labelType;
     private String varname;
@@ -116,11 +115,6 @@ public class ToggleBuilder extends AbstractWidgetBuilder {
         return this;
     }
 
-    public ToggleBuilder stockId(String stockId) {
-        this.stockId = stockId;
-        return this;
-    }
-
     public ToggleBuilder icon(String icon) {
         this.icon = icon;
         return this;
@@ -206,10 +200,6 @@ public class ToggleBuilder extends AbstractWidgetBuilder {
             MemorySegment cstr = arena.allocateFrom(label);
             ui.toggle_args_set_label.invoke(args, cstr);
         }
-        if(stockId != null) {
-            MemorySegment cstr = arena.allocateFrom(stockId);
-            ui.toggle_args_set_stockid.invoke(args, cstr);
-        }
         if(icon != null) {
             MemorySegment cstr = arena.allocateFrom(icon);
             ui.toggle_args_set_icon.invoke(args, cstr);

diff --git a/ui-kotlin/src/main/kotlin/de/unixwork/ui/kotlin/Toplevel.kt b/ui-kotlin/src/main/kotlin/de/unixwork/ui/kotlin/Toplevel.kt
index 56b3960d631143a56f104a99ea048537b7dd8bc5..e5dc33fb444bb3b52ccc63411bdd72f7ea37a6e0 100644 (file)
--- a/ui-kotlin/src/main/kotlin/de/unixwork/ui/kotlin/Toplevel.kt
+++ b/ui-kotlin/src/main/kotlin/de/unixwork/ui/kotlin/Toplevel.kt
@@ -900,7 +900,6 @@ class Toplevel(obj: UiObject) {
 
     fun button(
         label: String? = null,
-        stockId: String? = null,
         icon: String? = null,
         fill: Boolean = false,
         hexpand: Boolean = false,
@@ -924,9 +923,6 @@ class Toplevel(obj: UiObject) {
         label?.let {
             button.label(it)
         }
-        stockId?.let {
-            button.stockId(it)
-        }
         icon?.let {
             button.icon(it)
         }
@@ -975,9 +971,6 @@ class Toplevel(obj: UiObject) {
         styleClass?.let {
             button.styleClass(it)
         }
-        stockId?.let {
-            button.stockId(it)
-        }
         states?.let {
             button.states(*it)
         }
@@ -990,7 +983,6 @@ class Toplevel(obj: UiObject) {
     private fun createToggleButton(
         button: ToggleBuilder,
         label: String? = null,
-        stockId: String? = null,
         icon: String? = null,
         varname: String? = null,
         value: UiInteger? = null,
@@ -1066,9 +1058,6 @@ class Toplevel(obj: UiObject) {
         styleClass?.let {
             button.styleClass(it)
         }
-        stockId?.let {
-            button.stockId(it)
-        }
         states?.let {
             button.states(*it)
         }
@@ -1080,7 +1069,6 @@ class Toplevel(obj: UiObject) {
 
     fun togglebutton(
         label: String? = null,
-        stockId: String? = null,
         icon: String? = null,
         varname: String? = null,
         value: UiInteger? = null,
@@ -1105,7 +1093,6 @@ class Toplevel(obj: UiObject) {
         return createToggleButton(
             button = Button.toggleButton(ui),
             label = label,
-            stockId = stockId,
             icon = icon,
             varname = varname,
             value = value,
@@ -1131,7 +1118,6 @@ class Toplevel(obj: UiObject) {
 
     fun checkbox(
         label: String? = null,
-        stockId: String? = null,
         icon: String? = null,
         varname: String? = null,
         value: UiInteger? = null,
@@ -1156,7 +1142,6 @@ class Toplevel(obj: UiObject) {
         return createToggleButton(
             button = Button.checkbox(ui),
             label = label,
-            stockId = stockId,
             icon = icon,
             varname = varname,
             value = value,
@@ -1182,7 +1167,6 @@ class Toplevel(obj: UiObject) {
 
     fun switch(
         label: String? = null,
-        stockId: String? = null,
         icon: String? = null,
         varname: String? = null,
         value: UiInteger? = null,
@@ -1207,7 +1191,6 @@ class Toplevel(obj: UiObject) {
         return createToggleButton(
             button = Button.switchButton(ui),
             label = label,
-            stockId = stockId,
             icon = icon,
             varname = varname,
             value = value,
@@ -1233,7 +1216,6 @@ class Toplevel(obj: UiObject) {
 
     fun radiobutton(
         label: String? = null,
-        stockId: String? = null,
         icon: String? = null,
         varname: String? = null,
         value: UiInteger? = null,
@@ -1258,7 +1240,6 @@ class Toplevel(obj: UiObject) {
         return createToggleButton(
             button = Button.radioButton(ui),
             label = label,
-            stockId = stockId,
             icon = icon,
             varname = varname,
             value = value,