A lot of typesafety in the older C UI code.
Some checks failed
CI / ubuntu-latest-html-tests (push) Has been cancelled
CI / ubuntu-latest-no-tls (push) Has been cancelled
CI / ubuntu-latest-mbedtls2 (push) Has been cancelled
CI / ubuntu-latest-openssl-3 (push) Has been cancelled
CI / ubuntu-latest-with-old-std (push) Has been cancelled
CI / ubuntu-20-04-openssl-1-1 (push) Has been cancelled
CI / alpine-mbedtls-3_6_0 (push) Has been cancelled
CI / macOS-13-openssl-1-1 (push) Has been cancelled
CI / macOS-13-openssl-3 (push) Has been cancelled
CI / freebsd-14-openssl-3 (push) Has been cancelled
CI / windows-mbedtls (push) Has been cancelled

More to come.
This commit is contained in:
2025-08-12 02:09:40 -04:00
parent 06a2b527a6
commit b4600db393
7 changed files with 131 additions and 130 deletions

View File

@ -78,9 +78,9 @@ static void filemenu_cb(Fl_Widget*, void *data)
} else if (strcmp((char*)data, "ou") == 0) {
a_UIcmd_focus_location(popup_bw);
} else if (strcmp((char*)data, "cw") == 0) {
a_Timeout_add(0.0, a_UIcmd_close_bw, popup_bw);
Timeout::add(0.0, [=]{ a_UIcmd_close_bw( popup_bw ); } );
} else if (strcmp((char*)data, "ed") == 0) {
a_Timeout_add(0.0, a_UIcmd_close_all_bw, NULL);
Timeout::add(0.0, [=]{ a_UIcmd_close_all_bw( nullptr ); } );
}
}
@ -330,7 +330,7 @@ static void Menu_simple_popup_cb(void *data)
if (m && m->callback())
m->do_callback((Fl_Widget *)data);
a_Timeout_remove();
Timeout::remove();
}
static void Menu_popup_cb(void *data)
@ -346,7 +346,7 @@ static void Menu_popup_cb(void *data)
if (picked->callback())
picked->do_callback((Fl_Widget *)(d->menu));
}
a_Timeout_remove();
Timeout::remove();
}
/**
@ -427,7 +427,7 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url,
}
pm[3].user_data(popup_url.get());
a_Timeout_add(0.0, Menu_popup_cb, (void*)&page_data);
Timeout::add(0.0, [&]{ Menu_popup_cb( &page_data ); } );
}
static Fl_Menu_Item link_menu_[] = {
@ -558,7 +558,7 @@ void a_Menu_link_popup(BrowserWindow *bw, const DilloUrl *url, const DilloUrl *p
Menu_set_link_menu_user_data(popup_url.get(), page_url);
a_Timeout_add(0.0, Menu_popup_cb, (void*)&link_data);
Timeout::add(0.0, [&]{ Menu_popup_cb( &link_data ); } );
}
/**
@ -616,7 +616,7 @@ void a_Menu_image_popup(BrowserWindow *bw, const DilloUrl *url,
pm[7].deactivate();
}
a_Timeout_add(0.0, Menu_popup_cb, (void*)&image_data);
Timeout::add(0.0, [&]{ Menu_popup_cb( &image_data ); } );
}
/**
@ -643,7 +643,7 @@ void a_Menu_form_popup(BrowserWindow *bw, const DilloUrl *page_url,
hiddens_visible = hidvis;
pm[2].label(hiddens_visible ? "Hide hiddens": "Show hiddens");
a_Timeout_add(0.0, Menu_popup_cb, (void*)&form_data);
Timeout::add(0.0, [&]{ Menu_popup_cb( &form_data ); } );
}
/**
@ -675,7 +675,7 @@ void a_Menu_file_popup(BrowserWindow *bw, void *v_wid)
popup_url.reset();
//pm->label(wid->visible() ? NULL : "File");
a_Timeout_add(0.0, Menu_simple_popup_cb, (void*)pm);
Timeout::add(0.0, [=]{ Menu_simple_popup_cb( pm ); } );
}
/**
@ -698,7 +698,7 @@ void a_Menu_bugmeter_popup(BrowserWindow *bw, const DilloUrl *url)
popup_bw = bw;
popup_url = a_Url_dup(url);
a_Timeout_add(0.0, Menu_simple_popup_cb, (void*)pm);
Timeout::add(0.0, [=]{ Menu_simple_popup_cb( pm ); } );
}
/**
@ -735,7 +735,7 @@ void a_Menu_history_popup(BrowserWindow *bw, int x, int y, int direction)
pm[i].label(FL_NORMAL_LABEL, a_History_get_title(history_list[i], 1));
pm[i].callback(Menu_history_cb, INT2VOIDP(i+1));
}
a_Timeout_add(0.0, Menu_simple_popup_cb, (void*)pm);
Timeout::add(0.0, [=]{ Menu_simple_popup_cb( pm ); } );
}
/**