ui/winui/button.cpp

branch
newapi
changeset 206
7ebc5a747c6f
parent 205
b1ac0dd1d38b
child 213
7e39db525fd9
--- a/ui/winui/button.cpp	Tue Oct 10 10:58:14 2023 +0200
+++ b/ui/winui/button.cpp	Wed Oct 11 10:54:24 2023 +0200
@@ -91,7 +91,7 @@
 }
 
 
-static void togglebutton_register_checked_observers(ToggleButton button, UiObject* obj, UiVar* var) {
+void togglebutton_register_checked_observers(ToggleButton button, UiObject* obj, UiVar* var) {
 	button.Checked([button, obj, var](IInspectable const& sender, RoutedEventArgs) {
 		UiInteger* i = (UiInteger*)var->value;
 		UiEvent evt = ui_create_int_event(obj, i->get(i));
@@ -99,7 +99,7 @@
 		});
 }
 
-static void togglebutton_register_unchecked_observers(ToggleButton button, UiObject* obj, UiVar* var) {
+void togglebutton_register_unchecked_observers(ToggleButton button, UiObject* obj, UiVar* var) {
 	button.Unchecked([button, obj, var](IInspectable const& sender, RoutedEventArgs) {
 		UiInteger* i = (UiInteger*)var->value;
 		UiEvent evt = ui_create_int_event(obj, i->get(i));
@@ -107,7 +107,7 @@
 		});
 }
 
-static void togglebutton_register_callback(ToggleButton button, UiObject *obj, UiToggleArgs& args) {
+void togglebutton_register_callback(ToggleButton button, UiObject *obj, UiToggleArgs& args) {
 	ui_callback callback = args.onchange;
 	void* cbdata = args.onchangedata;
 	if (callback) {
@@ -304,7 +304,7 @@
 	integer->value = value;
 }
 
-extern "C" int64_t ui_switch_get(UiInteger * integer) {
+int64_t ui_switch_get(UiInteger * integer) {
 	UiWidget* widget = (UiWidget*)integer->obj;
 	ToggleSwitch toggleButton = widget->uielement.as<ToggleSwitch>();
 	int val = toggleButton.IsOn();
@@ -312,14 +312,14 @@
 	return val;
 }
 
-extern "C" void ui_switch_set(UiInteger * integer, int64_t value) {
+void ui_switch_set(UiInteger * integer, int64_t value) {
 	UiWidget* widget = (UiWidget*)integer->obj;
 	ToggleSwitch toggleButton = widget->uielement.as<ToggleSwitch>();
 	toggleButton.IsOn((bool)value);
 	integer->value = value;
 }
 
-extern "C" int64_t ui_radio_button_get(UiInteger * integer) {
+int64_t ui_radio_button_get(UiInteger * integer) {
 	CxList* list = (CxList*)integer->obj;
 	CxIterator i = cxListIterator(list);
 	int selection = -1;
@@ -334,7 +334,7 @@
 	return selection;
 }
 
-extern "C" void ui_radio_button_set(UiInteger * integer, int64_t value) {
+void ui_radio_button_set(UiInteger * integer, int64_t value) {
 	CxList* list = (CxList*)integer->obj;
 	UiWidget* widget = (UiWidget*)cxListAt(list, value);
 	if (widget) {

mercurial