mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STR 2936: FLUID: option to ignore syntax check in DeclBlock

Browse Source
This commit is contained in:
Matthias Melcher 2023-01-26 16:23:35 +01:00
parent 1581662d00
commit e2028c66fe
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fluid/Fl_Function_Type.cxx
View File

@ -1401,23 +1401,28 @@ void Fl_DeclBlock_Type::open() {
declblock_panel->show(); declblock_panel->show();
const char* message = 0; const char* message = 0;
for (;;) { // repeat as long as there are errors for (;;) { // repeat as long as there are errors
if (message) fl_alert("%s", message);
for (;;) { for (;;) {
Fl_Widget* w = Fl::readqueue(); Fl_Widget* w = Fl::readqueue();
if (w == declblock_panel_cancel) goto BREAK2; if (w == declblock_panel_cancel) goto BREAK2;
else if (w == declblock_panel_ok) break; else if (w == declblock_panel_ok) break;
else if (!w) Fl::wait(); else if (!w) Fl::wait();
} }
const char*c = decl_before_input->value(); const char* a = decl_before_input->value();
while (isspace(*c)) c++; while (isspace(*a)) a++;
message = c_check(c&&c[0]=='#' ? c+1 : c); const char* b = decl_after_input->value();
if (message) continue; while (isspace(*b)) b++;
name(c); message = c_check(a&&a[0]=='#' ? a+1 : a);
c = decl_after_input->value(); if (!message)
while (isspace(*c)) c++; message = c_check(b&&b[0]=='#' ? b+1 : b);
message = c_check(c&&c[0]=='#' ? c+1 : c); if (message) {
if (message) continue; int v = fl_choice("%s", "try again", "keep anyway", "cancel", message);
storestring(c,after); printf("%d\n", v);
if (v==0) continue; // try again
if (v==1) ; // keep input
if (v==2) goto BREAK2;
}
name(a);
storestring(b, after);
if (public_ != declblock_public_choice->value()) { if (public_ != declblock_public_choice->value()) {
set_modflag(1); set_modflag(1);
public_ = declblock_public_choice->value(); public_ = declblock_public_choice->value();

6
src/fl_ask.cxx
View File

@ -208,8 +208,10 @@ int fl_ask(const char *fmt, ...) {
\param[in] b0 text label for right button 0 \param[in] b0 text label for right button 0
\param[in] b1 text label for middle button 1 (can be 0) \param[in] b1 text label for middle button 1 (can be 0)
\param[in] b2 text label for left button 2 (can be 0) \param[in] b2 text label for left button 2 (can be 0)
\retval 0 if the button with \p b0 text is pushed \retval 0 if the button with \p b0 text is pushed or the user pressed
\retval 1 if the button with \p b1 text is pushed the \c Escape key or clicked the window close button
\retval 1 if the button with \p b1 text is pushed or the user pressed
the \c Return key
\retval 2 if the button with \p b2 text is pushed \retval 2 if the button with \p b2 text is pushed
*/ */
int fl_choice(const char *fmt, const char *b0, const char *b1, const char *b2, ...) { int fl_choice(const char *fmt, const char *b0, const char *b1, const char *b2, ...) {